Merge branch 'format/filenames' into beta

master
Raymonzut 5 years ago
commit 8e671bf733
No known key found for this signature in database
GPG Key ID: 97CF2D8BE2C69FC7
  1. 2
      client/src/components/AboutMe.vue
  2. 2
      client/src/components/Answer.vue
  3. 12
      client/src/components/QA.vue
  4. 2
      client/src/components/Question.vue
  5. 4
      client/src/router/index.js
  6. 6
      client/src/views/Home.vue
  7. 0
      client/src/views/Posts.vue

@ -18,7 +18,7 @@
import me from '../me.js' import me from '../me.js'
export default { export default {
name: 'aboutme', name: 'AboutMe',
computed: { computed: {
age: me.age age: me.age
} }

@ -6,7 +6,7 @@
<script> <script>
export default { export default {
name: 'answer', name: 'Answer',
props: { props: {
a: String a: String
} }

@ -1,19 +1,19 @@
<template> <template>
<div id='qa'> <div id='qa'>
<question :q='q'/> <Question :q='q'></Question>
<answer :a='a'/> <Answer :a='a'></Answer>
</div> </div>
</template> </template>
<script> <script>
import question from './question.vue' import Question from './Question.vue'
import answer from './answer.vue' import Answer from './Answer.vue'
export default { export default {
name: 'qa', name: 'QA',
components: { components: {
question, question,
answer, Answer,
}, },
props: { props: {
q: String, q: String,

@ -6,7 +6,7 @@
<script> <script>
export default { export default {
name: 'question', name: 'Question',
props: { props: {
q: String q: String
} }

@ -1,7 +1,7 @@
import Vue from 'vue' 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'
Vue.use(VueRouter) Vue.use(VueRouter)
@ -14,7 +14,7 @@ const routes = [
{ {
path: "/posts", path: "/posts",
name: "Posts", name: "Posts",
component: posts, component: Posts,
}, },
] ]

@ -1,17 +1,17 @@
<template> <template>
<div id="home"> <div id="home">
<h1>Home</h1> <h1>Home</h1>
<aboutme/> <AboutMe></AboutMe>
</div> </div>
</template> </template>
<script> <script>
import aboutme from '@/components/aboutme' import AboutMe from '@/components/AboutMe'
export default { export default {
name: "Home", name: "Home",
components: { components: {
aboutme AboutMe
}, },
} }
</script> </script>

Loading…
Cancel
Save