Merge branch 'features/QAPage' into beta

master
Raymonzut 5 years ago
commit 549e0cb7bf
No known key found for this signature in database
GPG Key ID: 97CF2D8BE2C69FC7
  1. 3
      client/src/App.vue
  2. 6
      client/src/router/index.js
  3. 25
      client/src/views/QAPage.vue

@ -2,7 +2,8 @@
<div id="app"> <div id="app">
<div id="nav"> <div id="nav">
<router-link to="/">Home</router-link> | <router-link to="/">Home</router-link> |
<router-link to="/posts">Posts</router-link> <router-link to="/posts">Posts</router-link> |
<router-link to="/qa">QA</router-link>
</div> </div>
<router-view /> <router-view />
</div> </div>

@ -2,6 +2,7 @@ import Vue from 'vue'
import VueRouter from 'vue-router' import VueRouter from 'vue-router'
import Home from '../views/Home.vue' import Home from '../views/Home.vue'
import Posts from '../views/Posts.vue' import Posts from '../views/Posts.vue'
import QAPage from '../views/QAPage'
Vue.use(VueRouter) Vue.use(VueRouter)
@ -16,6 +17,11 @@ const routes = [
name: "Posts", name: "Posts",
component: Posts, component: Posts,
}, },
{
path: "/qa",
name: "QA",
component: QAPage
},
] ]
const router = new VueRouter({ const router = new VueRouter({

@ -0,0 +1,25 @@
<template>
<div id="QAPage">
<QA
q="What is this site about? "
a="This site is about me and the stuff I make "
></QA>
<QA
q="Why is it still so empty?"
a="Because I am framework hopping "
></QA>
</div>
</template>
<script>
import QA from '@/components/QA'
export default {
name: "QAPAge",
components: { QA }
}
</script>
<style scoped></style>
Loading…
Cancel
Save