another pre-release (#53)

backend/db/seeds/04-responses.js

@@ -28,7 +28,7 @@ exports.seed = async knex => {
     for (let i = 1; i <= len; i += 1) {
         responsesToPush.push(responses.shift())
         if (i % batchSize === 0 || i > responses.length) {
-            await knex('responses').insert(responsesToPush)
+            // await knex('responses').insert(responsesToPush)
             responsesToPush = []
         }
     }

backend/package-lock.json

@@ -1,7 +1,7 @@
 {
     "name": "siimee-backend",
     "version": "1.0.0",
-    "lockfileVersion": 2,
+    "lockfileVersion": 1,
     "requires": true,
     "packages": {
         "": {
@@ -9597,8 +9597,7 @@
             "version": "5.3.1",
             "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
             "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
-            "dev": true,
-            "requires": {}
+            "dev": true
         },
         "acorn-walk": {
             "version": "8.1.0",
@@ -9638,7 +9637,11 @@
             "dependencies": {
                 "ansi-regex": {
                     "version": "4.1.0",
+<<<<<<< HEAD
                     "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+=======
+                    "resolved": "",
+>>>>>>> b0c2120 (another pre-release (#53))
                     "dev": true
                 },
                 "emoji-regex": {
@@ -10713,6 +10716,7 @@
             "version": "3.2.7",
             "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
             "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+            "dev": true,
             "requires": {
                 "ms": "^2.1.1"
             }
@@ -12958,7 +12962,8 @@
         "ms": {
             "version": "2.1.3",
             "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-            "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+            "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+            "dev": true
         },
         "mysql": {
             "version": "2.18.1",
@@ -14577,14 +14582,6 @@
                 }
             }
         },
-        "string_decoder": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-            "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-            "requires": {
-                "safe-buffer": "~5.1.0"
-            }
-        },
         "string-width": {
             "version": "4.2.2",
             "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
@@ -14596,6 +14593,14 @@
                 "strip-ansi": "^6.0.0"
             }
         },
+        "string_decoder": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+            "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+            "requires": {
+                "safe-buffer": "~5.1.0"
+            }
+        },
         "strip-ansi": {
             "version": "6.0.0",
             "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",

frontend/src/components/PairsList.vue

@@ -2,24 +2,41 @@
 section.pairs-list
     article(v-if='pairs.length')
         template(v-for='pair in pairs')
-            w-flex().align-center.flex-start
+            w-flex.align-center.flex-start
                 router-link.pair.w-flex.align-center.flex-start(
-    :to='`/profile/${pair.profile.pid}`')
+                    :to='`/profile/${pair.profile.pid}`'
+                )
                     .dot--icon
                     .avatar
                     .idCard
                         h3 {{ pair.profile.name }} {{ pair.profile.pid }}
                         p registered nurse
 
-                w-menu( left v-model='showMenu')
+                w-menu(left v-model='showMenu')
                     template(#activator)
-                        w-button.mr3(@click='showMenu = !showMenu' icon="icon-dots-three-horizontal")
-                    w-flex()
-                        router-link(
-                            :to='`/chat/${pair.profile.pid}`')
-                            w-button.mx2(@click='showMenu = false' bg-color="success" tile icon="icon-chat") Chat
-                        w-button.mx2.icon-calendar(@click='showMenu = false' bg-color="info" tile icon="icon-calendar") Calendar
-                        w-button.mx2(@click='showMenu = false' bg-color="primary" icon="icon-cross")
+                        w-button.mr3(
+                            @click='showMenu = !showMenu'
+                            icon='icon-dots-three-horizontal'
+                        )
+                    w-flex
+                        router-link(:to='`/chat/${pair.profile.pid}`')
+                            w-button.mx2(
+                                @click='showMenu = false'
+                                bg-color='success'
+                                icon='icon-chat'
+                                tile
+                            ) Chat
+                        w-button.mx2.icon-calendar(
+                            @click='showMenu = false'
+                            bg-color='info'
+                            icon='icon-calendar'
+                            tile
+                        ) Calendar
+                        w-button.mx2(
+                            @click='showMenu = false'
+                            bg-color='primary'
+                            icon='icon-cross'
+                        )
 
     p(v-else) No {{ tabName }} profiles.
 </template>

frontend/src/components/onboarding/Aspects.vue

@@ -0,0 +1,48 @@
+<template lang="pug">
+w-card.aspects.w-flex.column
+    form.questionnaire(@submit.prevent='this.$emit("handle-submit")')
+        QuestionResponse(
+            :question='question'
+            @updated='updateRadio'
+            v-for='question in aspectQuestions'
+        )
+        w-button.ma1.grow(bg-color='success' type='submit')
+            w-icon.mr1 wi-check
+            | SUBMIT ANSWERS
+</template>
+
+<script>
+import QuestionResponse from './QuestionResponse.vue'
+const answered = [null, null, null, null, null, null]
+
+export default {
+    name: 'Aspects',
+    components: {
+        QuestionResponse,
+    },
+    props: {
+        aspectQuestions: {
+            required: true,
+            type: Array,
+        },
+    },
+    emits: ['handle-submit', 'update-answers'],
+    async created() {
+        this.aspectQuestions.forEach((q, i) => {
+            console.log(`Aspect #${i}: ${JSON.stringify(q)}`)
+        })
+    },
+    methods: {
+        updateRadio(onRadioSelect) {
+            answered[onRadioSelect.id - 1] = onRadioSelect.answer
+            this.$emit('update-answers', {
+                key: 'Aspects',
+                question: {
+                    response_key_prompt: 'aspects',
+                },
+                answer: answered,
+            })
+        },
+    },
+}
+</script>

frontend/src/components/onboarding/FormDropdown.vue

@@ -1,10 +1,10 @@
 <template lang="pug">
 .role
-    span(style='text-align:center;') {{ parsedPrompt.start }}
-    span(style='text-align:center;') {{ parsedPrompt.mid }}
+    span(style='text-align: center') {{ parsedPrompt.start }}
+    span(style='text-align: center') {{ parsedPrompt.mid }}
     w-select.mt4(:items='items' placeholder='i am' v-model='selection')
     br
-    p(style='text-align:center;') {{ parsedPrompt.end }}
+    p(style='text-align: center') {{ parsedPrompt.end }}
     w-button.ma1.grow(@click='handleSubmit') NEXT
 </template>
 
@@ -28,7 +28,8 @@ export default {
         },
     },
     created() {
-        const parsedPromptArr = this.question.response_key_prompt.split('[break]')
+        const parsedPromptArr =
+            this.question.response_key_prompt.split('[break]')
         this.parsedPrompt.start = parsedPromptArr[0]
         this.parsedPrompt.mid = parsedPromptArr[1]
         this.parsedPrompt.end = parsedPromptArr[2]

frontend/src/components/onboarding/FormInput.vue

@@ -8,9 +8,9 @@
         :placeholder='question.placeholder'
         @keyup.enter='handleSubmit({ question, input })'
         type='text'
+        v-focus
         v-if='question.survey_stage !== "image" && question.survey_stage !== "blurb" && question.survey_stage !== "password"'
         v-model='input'
-        v-focus
     )
     input.pass(
         :placeholder='question.placeholder'
@@ -18,8 +18,8 @@
         style='-webkit-text-security: circle'
         type='password'
         v-else-if='question.survey_stage === "password"'
-        v-model='input'
         v-focus
+        v-model='input'
     )
     w-button.ma1.grow(
         @click='submitImage'

frontend/src/components/onboarding/Splash.vue

@@ -15,7 +15,7 @@ w-flex.column
         text
         xl
     ) SIGN UP
-    router-link(to="/login")
+    router-link(to='/login')
         w-button.ma1.grow.next-btn(
             :height='50'
             :width='315'

frontend/src/entities/survey/survey.js

@@ -28,6 +28,30 @@ const _formatAspectQuestions = steps => {
         .filter(step => step != null)
 }
 
+const SCORED = [1, 2, 3, 4, 5, 6]
+const _isScored = id => SCORED.includes(id)
+const _makeCategoryFriendly = responseCategory => {
+    const labels = responseCategory.split('_vs_')
+    labels.forEach((a, i) => {
+        if (a.indexOf('_') == -1) return
+        labels[i] = a.split('_').join(' ')
+    })
+    return labels
+}
+const _formatAspectQuestions = steps => {
+    return steps
+        .map(q => {
+            if (!_isScored(q.response_key_id)) return null
+            return {
+                id: q.response_key_id,
+                question: q.response_key_prompt,
+                labels: _makeCategoryFriendly(q.response_key_category),
+                answer: null,
+            }
+        })
+        .filter(step => step != null)
+}
+
 class Survey extends _baseRecord {
     constructor(questionSteps) {
         super()

frontend/src/main.js

@@ -8,7 +8,8 @@ import components from './wave'
 import App from './App.vue'
 import MainNav from './components/MainNav.vue'
 
-const DEV = import.meta.env.VITE_DEV == 'true'
+// const DEV = import.meta.env.VITE_DEV == 'true'
+const DEV = false
 
 /**
  * Check between route changes for login/timeout

frontend/src/services/chat.service.js

@@ -116,7 +116,10 @@ class Chatter {
         } catch (error) {
             console.error('[chatter]', error)
         }
-        const channelHistory = pastMessages && pastMessages.channels ? pastMessages.channels[channel] : null
+        const channelHistory =
+            pastMessages && pastMessages.channels
+                ? pastMessages.channels[channel]
+                : null
         console.log('channelHistory :>> ', channelHistory)
         return channelHistory
             ? channelHistory.map(msg => ({

frontend/src/utils/lang.js

@@ -32,7 +32,7 @@ const auth = {
 // Easily reorder steps of survey here:
 const allSteps = {
     usa: {
-        email: 'email',
+        splash: 'splash',
         name: 'name',
         seeking: 'seeking',
         password: 'password',

frontend/src/utils/survey.js

@@ -15,6 +15,10 @@ class SurveyFactory {
                 existingResponses[categoryKey] =
                     responsesByCategory[categoryKey]
             }
+            const responseKeyLike = formatStep(match, step)
+            const withComponent = associateWithComponent(responseKeyLike)
+            console.log('withComponent :>> ', withComponent)
+            return withComponent
         })
         // Adds form drop down options to each responseKey
         Object.keys(existingResponses).forEach(inputKey => {

frontend/src/views/ChatView.vue

@@ -2,13 +2,13 @@
 main.view--chat
     header.mb6(v-if='profile && grouping')
         h3 chatting with:
-        span {{ target.profile_id }} | 
-        span(v-if="grouping.revealedFromNotification.length")
-            span(v-for="revealed in grouping.revealedFromNotification")
-                span(v-if="revealed.profile_id === target.profile_id")
-                    span {{ revealed[revealed.tag_description] }} | 
+        span {{ target.profile_id }} |
+        span(v-if='grouping.revealedFromNotification.length')
+            span(v-for='revealed in grouping.revealedFromNotification')
+                span(v-if='revealed.profile_id === target.profile_id')
+                    span {{ revealed[revealed.tag_description] }} |
         span(v-else)
-            span  {{ grouping.profile.user_name }} | {{ grouping.profile.user_email }}
+            span {{ grouping.profile.user_name }} | {{ grouping.profile.user_email }}
         h3 logged in as:
         p {{ profile.id }} | {{ profile._profile.user_name }} | {{ profile._profile.user_email }}
         //- p subscriptions: {{ profile.chatter.subscriptions }}
@@ -20,18 +20,22 @@ main.view--chat
                 button(@click='reveal(8)') reveal my email
                 // TODO: Remove later, only for testing
                 button(@click='checkData()') check data
-            span(v-if="grouping.revealed[profile.id.value]")
+            span(v-if='grouping.revealed[profile.id.value]')
                 p you revealed:
-                ul(v-for="reveal in [...new Set(grouping.revealed[profile.id.value])]")
+                ul(
+                    v-for='reveal in [...new Set(grouping.revealed[profile.id.value])]'
+                )
                     li {{ reveal.description }}
-            span(v-if="grouping.revealed[target.profile_id]")
+            span(v-if='grouping.revealed[target.profile_id]')
                 p they revealed:
-                ul(v-for="reveal in grouping.revealed[target.profile_id]")
+                ul(v-for='reveal in grouping.revealed[target.profile_id]')
                     li {{ reveal.description }}: {{ target[reveal.description] }}
-            span(v-if="grouping.revealedFromNotification.length")
+            span(v-if='grouping.revealedFromNotification.length')
                 p recently revealed:
-                ul(v-for="revealed in grouping.revealedFromNotification")
-                    li(v-if="revealed[revealed.tag_description] !== profile._profile[revealed.tag_description]") {{ revealed.tag_description }}: {{ revealed[revealed.tag_description] }}
+                ul(v-for='revealed in grouping.revealedFromNotification')
+                    li(
+                        v-if='revealed[revealed.tag_description] !== profile._profile[revealed.tag_description]'
+                    ) {{ revealed.tag_description }}: {{ revealed[revealed.tag_description] }}
 
     article
         template(v-if='isLoading')

frontend/src/views/OnboardingView.vue

@@ -2,6 +2,7 @@
 main.view--onboarding
     article(
         style='display: flex; flex-direction: column; align-items: center'
+<<<<<<< HEAD
         v-if='currentStep !== survey.steps.length'
     )
         .answers(v-for='(value, key) in answered')
@@ -31,20 +32,41 @@ main.view--onboarding
 
     article(v-else)
         SurveyCompleteView(:answers='answered' :surveySteps='survey.steps')
+=======
+        v-if='survey'
+    )
+        .step(v-for='(step, i) in survey.steps')
+            component(
+                :aspect-questions='step.component == "Aspects" ? survey.aspectQuestions : null'
+                :is='step.component'
+                :question='step'
+                @handle-submit='onSubmit'
+                @update-answers='updateAnswers'
+                v-if='step && currentStep == i'
+            )
+>>>>>>> b0c2120 (another pre-release (#53))
 </template>
 
 <script>
 import { Authenticator } from '../services/auth.service.js'
 import { surveyFactory } from '@/utils'
+<<<<<<< HEAD
 import stepViews from '@/components/onboarding'
 import SurveyCompleteView from './SurveyCompleteView.vue'
 let hashedAccessToken = null
 let currentProfileId = null
+=======
+import { allSteps } from '@/utils/lang'
+import stepViews from '@/components/onboarding'
+>>>>>>> b0c2120 (another pre-release (#53))
 
+// import savesurveybyprfileid - call it on submit
+// paginate to save every steps answers
 export default {
     name: 'OnboardingView',
     components: {
         ...stepViews,
+<<<<<<< HEAD
         SurveyCompleteView,
     },
     data: () => ({
@@ -71,10 +93,23 @@ export default {
             this.goToStep(0)
         }
     },
+=======
+    },
+    data: () => ({
+        answered: {},
+        aspectQuestions: [],
+        currentStep: 0,
+        survey: null,
+    }),
+    async created() {
+        this.survey = await surveyFactory.createSurvey(allSteps['usa'])
+    },
+>>>>>>> b0c2120 (another pre-release (#53))
     methods: {
         onSubmit() {
             console.log(JSON.stringify(this.answered))
         },
+<<<<<<< HEAD
         async goToStep(num) {
             this.currentStep = num
         },
@@ -140,6 +175,21 @@ export default {
             } else {
                 this.goToStep(this.currentStep + 1)
             }
+=======
+        goToStep(num) {
+            this.currentStep = num
+        },
+        updateAnswers(payload) {
+            // null payload is passed on splash page
+            if (payload) {
+                const k = payload.question.response_key_prompt
+                this.answered[k] = payload.answer
+                console.log(`${k}:`, this.answered[k])
+                console.log(`Updated answers: ${JSON.stringify(this.answered)}`)
+                if (k === 'aspects') return
+            }
+            this.goToStep(this.currentStep + 1)
+>>>>>>> b0c2120 (another pre-release (#53))
         },
     },
 }
@@ -157,9 +207,12 @@ export default {
     article
         height: 100vh
 
+<<<<<<< HEAD
     .answers
         text-align: center
 
+=======
+>>>>>>> b0c2120 (another pre-release (#53))
     .w-button
             display: flex
             width: 315px