Преглед изворни кода

:pencil2: Fixed merge issues

tags/0.0.4
tomit4 пре 2 година
родитељ
комит
fbc60c92c1
2 измењених фајлова са 3 додато и 4 уклоњено
  1. 1
    0
      frontend/src/router/guards.js
  2. 2
    4
      frontend/src/views/OnboardingView.vue

+ 1
- 0
frontend/src/router/guards.js Прегледај датотеку

47
     ) {
47
     ) {
48
         await currentProfile.login(
48
         await currentProfile.login(
49
             sessionData.profileId,
49
             sessionData.profileId,
50
+            // NOTE: probably not correct...
50
             WaveUI.notify,
51
             WaveUI.notify,
51
             sessionData.accessToken,
52
             sessionData.accessToken,
52
         )
53
         )

+ 2
- 4
frontend/src/views/OnboardingView.vue Прегледај датотеку

30
             p(v-if='currentStep != 0') You have completed: {{ currentStep }} / {{ survey?.steps?.length }} survey steps
30
             p(v-if='currentStep != 0') You have completed: {{ currentStep }} / {{ survey?.steps?.length }} survey steps
31
 
31
 
32
     article(v-else)
32
     article(v-else)
33
-        // TODO: format answers and surveySteps on created based off of existing responses
34
-        SurveyCompleteView(:answers='answered' :surveySteps='survey.steps' :responses='responses')
33
+        SurveyCompleteView(:surveySteps='survey.steps' :responses='responses')
35
 </template>
34
 </template>
36
 
35
 
37
 <script>
36
 <script>
56
         invalidResponse: false,
55
         invalidResponse: false,
57
     }),
56
     }),
58
     async created() {
57
     async created() {
59
-        // TODO: Troubleshoot bug where memberships are not returned from backend with 500 err
60
         // TODO: Troubleshoot bug where not all responses are returned at SurveyCompleteView
58
         // TODO: Troubleshoot bug where not all responses are returned at SurveyCompleteView
61
         console.log('currentProfile :=>', currentProfile)
59
         console.log('currentProfile :=>', currentProfile)
62
         this.survey = await surveyFactory.createSurvey()
60
         this.survey = await surveyFactory.createSurvey()
63
         hashedAccessToken = this.grabStoredCookie('siimee_access')
61
         hashedAccessToken = this.grabStoredCookie('siimee_access')
64
-        console.log('currentProfile.isLoggedIn :=>', currentProfile.isLoggedIn)
65
         try {
62
         try {
66
             const sessionData = await this.verifySession(hashedAccessToken)
63
             const sessionData = await this.verifySession(hashedAccessToken)
67
             await currentProfile.login(
64
             await currentProfile.login(
118
             })
115
             })
119
         },
116
         },
120
         async updateAnswers(payload) {
117
         async updateAnswers(payload) {
118
+            console.log('this.survey.steps :=>', this.survey.steps)
121
             if (payload) {
119
             if (payload) {
122
                 const k = payload.question.survey_stage
120
                 const k = payload.question.survey_stage
123
                 this.answered[k] = payload.input
121
                 this.answered[k] = payload.input

Loading…
Откажи
Сачувај