Merge remote-tracking branch 'origin/master'

This commit is contained in:
thilo 2020-03-22 19:54:28 +01:00
commit b3b8a10d92
9 changed files with 23 additions and 9 deletions

View File

@ -6,7 +6,7 @@ stages:
cache:
paths:
- node_modules/
key: "$CI_BUILD_REPO"
key: "$CI_COMMIT_REF_NAME"
deploy-prod:
stage: deploy

View File

@ -11,6 +11,9 @@
export default {
mounted() {
this.$store.commit("init")
if (!this.$store.state.surveyCompletedOnce) {
this.$router.push("/")
}
},
}
</script>

View File

@ -98,6 +98,7 @@
this.$router.push("/questionnaire/" + nextQuestion)
}
else {
this.$store.commit("setSurveyCompleted")
router.push('/results')
}
}

View File

@ -6,6 +6,7 @@ Vue.use(Vuex)
export default new Vuex.Store({
state: {
surveyCompletedOnce: false,
answers: [],
questions: []
},
@ -16,6 +17,9 @@ export default new Vuex.Store({
answerQuestion(state, pl) {
this.state.answers[pl.id] = pl.answer
},
setSurveyCompleted() {
this.state.surveyCompletedOnce = true
},
init() {
axios.get('https://avian-safeguard-214619.firebaseio.com/questions.json')
.then(res => {

View File

@ -5,12 +5,12 @@
@media screen and (min-width : 906px) {
.help {
width: 30%;
width: 600px;
margin-left: auto;
margin-right: auto;
}
}
button {
width: 80%;
margin-bottom: 5%;
@ -43,6 +43,7 @@
this.$router.push("/questionnaire/" + nextQuestion)
}
else {
this.$store.commit("setSurveyCompleted")
router.push('/results')
}
},

View File

@ -5,10 +5,10 @@
justify-content: center;
padding: 0.5em;
}
@media screen and (min-width : 906px) {
.home {
width: 30%;
width: 600px;
margin-left: auto;
margin-right: auto;
}

View File

@ -40,13 +40,12 @@
<style scoped>
@media screen and (min-width : 906px) {
.questionnaire {
width: 30%;
width: 600px;
margin-left: auto;
margin-right: auto;
}
}
#back-button {
position: absolute;
margin-left: 2%;

View File

@ -4,6 +4,9 @@
<p class="risk-chance alert" v-if="risk >= 66">hoch</p>
<p class="risk-chance warning" v-if="risk >= 33 && risk < 66">durchschnittlich</p>
<p class="risk-chance success" v-if="risk < 33">niedrig</p>
<p class="text-center"><router-link style="text-decoration:none" to="/">
Zurück zum Anfang
</router-link></p>
<p v-if="bad.length > 0">Auf Folgendes sollten Sie achten:</p>
<div v-for="card in bad" v-bind:key="card.description" class="card-advice alert">
<div class="card-advice-title">{{ card.title }}</div>
@ -75,7 +78,7 @@
@media screen and (min-width : 906px) {
.results {
width: 30%;
width: 600px;
margin-left: auto;
margin-right: auto;
}
@ -114,4 +117,7 @@
.risk-chance.alert {
color: #E94A47;
}
.text-center {
text-align: center;
}
</style>

View File

@ -9,7 +9,7 @@
@media screen and (min-width : 906px) {
.warning {
width: 30%;
width: 600px;
margin-left: auto;
margin-right: auto;
}