Merge remote-tracking branch 'origin/master'

.gitlab-ci.yml

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

src/App.vue

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

src/components/Question.vue

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

src/store/index.js

@@ -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 => {

src/views/HelpPage.vue

@@ -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')
                 }
             },

src/views/Home.vue

@@ -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;
     }

src/views/Questionnaire.vue

@@ -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%;

src/views/Results.vue

@@ -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>

src/views/Warning.vue

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