last save

backend/db/data-generator/classes.js

@@ -3,7 +3,8 @@ class User {
         this.user_id = id
         this.user_name = ''
         this.user_email = ''
-        this.user_media = ''
+        // TODO: user_media
+        // this.user_media = ''
         this.is_admin = false
         this.is_poster = false
     }

backend/db/data-generator/index.js

@@ -30,7 +30,7 @@ const write = async (batchNum, outputDataObject) => {
     await fs.writeFile(`${config.mockOutputPath}_${batchNum}.js`, '', () => {})
     fs.appendFile(
         `${config.mockOutputPath}_${batchNum}.js`,
-        config.header + 'export default ' + JSON.stringify(outputDataObject),
+        config.header + 'module.exports = ' + JSON.stringify(outputDataObject),
         err => {
             if (err) {
                 console.error(err)
@@ -72,7 +72,8 @@ const generateUsers = () => {
         for (let i=0; i < 3; i++) {
             mediaArray.push(random.media())
         }
-        user.user_media = mediaArray
+        // TODO: make this a table
+        // user.user_media = mediaArray
     })
     console.log('COMPLETED: Generated Users...')
     return users

backend/knexfile.js

@@ -5,10 +5,10 @@ module.exports = {
         client: 'mysql',
         connection: {
             host: 'localhost',
-            port: 3306,
+            port: 3307,
             user: 'root',
-            password: 'root',
-            database: 'test',
+            password: 'potato',
+            database: 'potato',
         },
         pool: {
             min: 2,

backend/lib/services/match.js

@@ -112,6 +112,8 @@ module.exports = class MatchService extends Schmervice.Service {
         // You only need to engage from one side
         engageEveryone(seekerPeople)
         engageEveryone(posterPeople)
+        // TODO: Test this, probably bug
+
         Object.values(peopleById).forEach(person => {
             if (person.fiance) {
                 person.fiance.fiance = null

backend/lib/services/matchqueue.js

@@ -30,7 +30,7 @@ module.exports = class MatchQueueService extends Schmervice.Service {
             seeker: {},
         }
         queueEntries.forEach(entry => {
-            const type = entry.user.is_poster == 0 ? 'poster' : 'seeker'
+            const type = entry.user.is_poster == 1 ? 'poster' : 'seeker'
             if (!queueByProfileId[type][entry.profile_id]) {
                 queueByProfileId[type][entry.profile_id] = []
             }

backend/server/manifest.js

@@ -80,6 +80,7 @@ module.exports = new Confidence.Store({
                                 user: process.env.DB_USER,
                                 password: process.env.DB_ROOT_PASSWORD,
                                 database: process.env.DB_NAME,
+                                port: 3307
                             },
                         },
                     },

docker-compose.yml

@@ -10,7 +10,7 @@ services:
           MYSQL_ROOT_PASSWORD: "${DB_ROOT_PASSWORD}"
           MYSQL_DATABASE: "${DB_NAME}"
         ports:
-          - '3306:3306'
+          - '3307:3306'
 
 volumes:
     siimee_db:

frontend/src/components/Messages.vue

@@ -1,6 +1,6 @@
 <template lang="pug">
 .sidebar__messages
-  h4.message__title {{ title }}
+  h5.message__title {{ title }}
   router-link(
       :to="'/chats/' + user.uid" 
       v-for='user in users' 
@@ -38,6 +38,7 @@ export default {
     &__messages
         padding: 20px 10px
         /* overflow-y: scroll */
+        text-align: left
         a
             color: black
             text-decoration: none
@@ -55,13 +56,20 @@ export default {
             object-fit: cover
             width: 70px
             height: 70px
+            border-radius: 50%
 
 .message
     &__title
         color: #fd5068
+        text-transform: uppercase
         margin-bottom: 10px
     &__right
         margin-left: 10px
     &__name
-        margin-bottom: 10px
+        padding-top: 5px
+        font-weight: 600
+    &__content
+        padding-top: 10px
+        line-height: 1em
+        
 </style>

frontend/src/components/Sidebar.vue

@@ -2,8 +2,9 @@
 
 aside.sidebar.p-1
     h3 Messages
-    input
-    label search
+    .search
+        input
+        label search
 
     messages(:title="title" :users="users")
 </template>
@@ -38,4 +39,13 @@ export default {
 aside.sidebar
     background-color: yellow
     height: 100vh
+    h3
+        padding: 2vh
+
+.search
+    display: flex
+    flex-direction: row
+    input
+        border: 0
+
 </style>

frontend/src/components/form.vue

@@ -109,9 +109,14 @@ const isValid = step => {
 const next = e => {
     const validity = isValid(state.step - 1)
     if (validity.error) return console.error(validity.error)
-
+    // TODO: make steps work, 
+    // console.log('next', )
     // Save or next
     if (state.step === props.form.length) {
+        // TODO: call survey service
+        // TODO: in the survey service, create a save function
+        // call service from here, pass it profile id as argument
+        // profileId = answers['what-is-your-user-id']
         alert('saved...')
         resetAnswers()
         state.step = 1

frontend/src/entities/survey/survey.js

@@ -3,14 +3,26 @@ import { _baseRecord } from '..'
 import { surveySchema } from './survey.schema'
 
 class Survey extends _baseRecord {
-    constructor(questionArray) {
+    constructor(questionSteps) {
         super()
 
         this.type = this.constructor.name.toLowerCase()
 
         /**  Fields */
-        this.steps = questionArray // ! required
-
+        this.steps = [
+            [
+                {
+                    id: 0,
+                    type: 'input-string',
+                    question: 'what is your user id',
+                    responses: null,
+                    description: null,
+                    category: null,
+                }
+            ],
+            ...Object.values(questionSteps),
+        ] // ! required
+        
         return this
     }
 

frontend/src/services/survey.service.js

@@ -8,52 +8,85 @@ import { Survey } from '../entities/survey'
  * @param {number} profileId
  * @returns {array} instantiated Profile objects (see: /entites/profile)
  */
-const fetchSurveyByProfileId = profileId => {
-    // const surveyForProfileId = await db.get(`/user/${profileId}/profiles`)
-    const myquestions = [
-        [
-            {
-                id: 1,
-                type: 'input-string',
-                question: 'whats your favorite color',
-                responses: null,
-            },
-        ],
-        [
-            {
-                id: 2,
-                type: 'tag-cloud',
-                question: 'whats your favorite number',
-                responses: ['1', '2', '3'],
-            },
-        ],
-        [
-            {
-                id: 3,
-                type: 'checklist',
-                question: 'what is your current status',
-                responses: ['employed', 'unemployed', 'degenerate', 'alien'],
-            },
-        ],
-        [
-            {
-                id: 4,
-                type: 'slide',
-                question: 'choose a num',
-                responses: null,
-            },
-        ],
-        [
-            {
-                id: 5,
-                type: 'checklist',
-                question: 'pick a status',
-                responses: ['cry', 'sad', 'mad', 'numb'],
-            },
-        ],
-    ]
-    const mysurvey = new Survey(myquestions)
+const fetchSurveyByProfileId = async profileId => {
+    const myquestions = await db.get(`/survey/questions`)
+    // const myquestions = [
+    //     [
+    //         {
+    //             id: 1,
+    //             type: 'input-string',
+    //             question: 'whats your favorite color',
+    //             responses: null,
+    //         },
+    //     ],
+    // [
+    //     {
+    //     "response_key_id": 1,
+    //     "response_key_category": "grit",
+    //     "response_key_prompt": "what is your name",
+    //     "response_key_description": null
+    //     },
+    // ],
+    //     [
+    //         {
+    //             id: 2,
+    //             type: 'tag-cloud',
+    //             question: 'whats your favorite number',
+    //             responses: ['1', '2', '3'],
+    //         },
+    //     ],
+    //     [
+    //         {
+    //             id: 3,
+    //             type: 'checklist',
+    //             question: 'what is your current status',
+    //             responses: ['employed', 'unemployed', 'degenerate', 'alien'],
+    //         },
+    //     ],
+    //     [
+    //         {
+    //             id: 4,
+    //             type: 'slide',
+    //             question: 'choose a num',
+    //             responses: null,
+    //         },
+    //     ],
+    //     [
+    //         {
+    //             id: 5,
+    //             type: 'checklist',
+    //             question: 'pick a status',
+    //             responses: ['cry', 'sad', 'mad', 'numb'],
+    //         },
+    //     ],
+    // ]
+    const allsteps = { 'step-1': [], 'step-2': [], 'step-3': [], 'step-4': [] }
+    let counter = 0
+
+    for (let i = 0; i < myquestions.length; i++) {
+        const question = myquestions[i]
+        const reformatted = {
+            id: question.response_key_id,
+            type: 'input-string',
+            question: question.response_key_prompt,
+            responses: null,
+            description: question.response_key_description,
+            category: question.response_key_category,
+        }
+        counter = counter + 1
+        // TODO: check for step array before pushing
+        if (i < 4 * counter && i >= 4 * (counter - 1)) {
+            allsteps[`step-${counter}`].push(reformatted)
+        }
+    }
+    const mysurvey = new Survey(allsteps)
+
     return mysurvey
 }
 
+// TODO: saveSurveyByProfileID - needs await, db.post
+const saveSurveyByProfileID = async profileID => {
+    const myresponses = await db.post(`/${profileId}/respond`)
+}
+
 export { fetchSurveyByProfileId }

frontend/src/views/Profile.vue

@@ -1,13 +1,18 @@
 <template lang="pug">
-article#profile
-    h1 Profile Page
+sidebar
+main.f-col.start.w-full
+    article#profile
+        h1 Profile Page
+    main-nav
 </template>
 
 <script>
-
+import sidebar from '../components/Sidebar.vue'
+import mainNav from '../components/MainNav.vue'
 
 export default {
     name: 'Profile',
+    components: { sidebar, mainNav },
     data() {
         return {
             requesting: false,

frontend/src/views/Survey.vue

@@ -3,7 +3,7 @@ sidebar
 main.f-col.start.w-full
     article.match
         h1 Survey Page
-        siimeform(:form="validSurvey.steps")
+        siimeform(v-if="validSurvey && validSurvey.steps" :form="validSurvey.steps")
     mainNav
 </template>
 
@@ -15,8 +15,13 @@ import { fetchSurveyByProfileId } from '../services'
 
 export default {
     components: { siimeform, sidebar, mainNav },
-    computed: { 
-        validSurvey: () => fetchSurveyByProfileId(),
+    data() {
+        return { 
+            validSurvey: null,
+        }
+    },
+    async created() {
+        this.validSurvey = await fetchSurveyByProfileId()
     },
 }
 </script>