:wrench: Fixed survey after rebase

frontend/src/utils/lang.js

@@ -29,13 +29,19 @@ const auth = {
     invalidInputPrompt: null,
 }
 
+// This has to be in order for survey (DO NOT TOUCH)
+const initialSteps = {
+    splash: 'splash',
+    email: 'email',
+    name: 'name',
+    seeking: 'seeking',
+    password: 'password',
+}
+
 // Easily reorder steps of survey here:
 const allSteps = {
     usa: {
-        splash: 'splash',
-        name: 'name',
-        seeking: 'seeking',
-        password: 'password',
+        ...initialSteps,
         aspect01: 'aspect-1',
         aspect02: 'aspect-2',
         aspect03: 'aspect-3',

frontend/src/views/OnboardingView.vue

@@ -2,12 +2,12 @@
 main.view--onboarding
     article(
         style='display: flex; flex-direction: column; align-items: center'
-        v-if='currentStep !== survey.steps.length'
+        v-if='currentStep !== survey?.steps?.length'
     )
         .answers(v-for='(value, key) in answered')
             span(v-if='key == "name" && value && currentStep == 2') Hi {{ value }}!
         br
-        .step(v-for='(step, i) in survey.steps')
+        .step(v-for='(step, i) in survey?.steps')
             component(
                 :answered='answered'
                 :currentStep='currentStep'
@@ -15,7 +15,7 @@ main.view--onboarding
                 :question='step'
                 :responses='responses'
                 :survey='survey'
-                :surveyStepsCount='survey.steps.length'
+                :surveyStepsCount='survey?.steps?.length'
                 @handle-submit='onSubmit'
                 @update-answers='updateAnswers'
                 v-if='step && currentStep == i'
@@ -27,10 +27,10 @@ main.view--onboarding
             p {{ survey.steps[currentStep].invalidInputPrompt }}
 
         footer
-            p(v-if='currentStep != 0') You have completed: {{ currentStep }} / {{ survey.steps.length }} survey steps
+            p(v-if='currentStep != 0') You have completed: {{ currentStep }} / {{ survey?.steps?.length }} survey steps
 
     article(v-else)
-        SurveyCompleteView(:answers='answered' :surveySteps='survey.steps')
+        SurveyCompleteView(:answers='answered' :surveySteps='survey?.steps')
 </template>
 
 <script>