Merge branch 'master' into 'css_mobile'

# Conflicts:
#   src/components/Question.vue
#   src/router/index.js
#   src/store/index.js
#   src/views/Questionnaire.vue
This commit is contained in:
Thilo Billerbeck 2020-03-21 21:57:45 +01:00
commit 9910c2382a
7 changed files with 165 additions and 34 deletions

View file

@ -1,8 +1,9 @@
import Vue from 'vue'
import VueRouter from 'vue-router'
import Home from '../views/Home.vue'
import Warning from '../views/Warning.vue'
import Questionnaire from "@/views/Questionnaire.vue";
import Warning from '../views/Warning'
import Questionnaire from "@/views/Questionnaire";
import Results from "@/views/Results";
Vue.use(VueRouter)
@ -21,6 +22,11 @@ const routes = [
path: '/questionnaire',
name: 'Fragebogen',
component: Questionnaire
},
{
path: '/results',
name: 'Ergebnisse',
component: Results
}
]