Merge branch 'master' of http://gitea.yvvas.com:4000/fyindr/siimee

backend/db/data-generator/classes.js

@@ -3,8 +3,6 @@ class User {
         this.user_id = id
         this.user_name = ''
         this.user_email = ''
-        // TODO: user_media
-        // this.user_media = ''
         this.is_admin = false
         this.is_poster = false
     }
@@ -13,6 +11,7 @@ class Profile {
     constructor(id, override) {
         this.user_id = override?.user_id ? override.user_id : id
         this.profile_id = override?.profile_id ? override.profile_id + id : id
+        this.user_media = ''
     }
 }
 class Response {

backend/db/data-generator/config.js

@@ -1,12 +1,12 @@
-const mockOutputPath = './db/generated/_batch'
+const mockOutputPath = './db/generated'
 const magic = 1000
 
 // Insert here how many users you would like to generate:
-const total = 100
-const batchSize = 20
+const total = 30
+const batchSize = 10
 
 // Amount of responses for a complete survey
-const questions = 13
+const questions = 7
 
 // Seekers per 100 profiles
 const percentageOfSeekers = 90

backend/db/data-generator/index.js

@@ -5,7 +5,7 @@ const classes = require('./classes')
 const score = require('./score')
 
 let batchCount = 1 // Counter to track how many things we've generated
-let extraProfilesToGenerate = 0
+let extraProfilesToGenerate = 1
 let extraProfileCount = 0 // Counter to track how many EXTRA profiles we've generated
 let generatedResponseCount = 0 // Counter to track every response generated
 
@@ -27,10 +27,13 @@ for (let i = 0; i < Object.keys(possibleResponses).length; i++) {
  * Our initial file setup
  */
 const write = async (batchNum, outputDataObject) => {
-    await fs.writeFile(`${config.mockOutputPath}_${batchNum}.js`, '', () => {})
+    const filename = `_batch_${batchNum}.js`
+    await fs.writeFile(`${config.mockOutputPath}/${filename}`, '', () => {})
     fs.appendFile(
-        `${config.mockOutputPath}_${batchNum}.js`,
-        config.header + 'module.exports = ' + JSON.stringify(outputDataObject),
+        `${config.mockOutputPath}/${filename}`,
+        config.header +
+            'module.exports = ' +
+            JSON.stringify(outputDataObject, null, '  '),
         err => {
             if (err) {
                 console.error(err)
@@ -67,13 +70,6 @@ const generateUsers = () => {
         }
         user.user_name = random.name() + ' ' + random.name()
         user.user_email = random.email()
-
-        var mediaArray = []
-        for (let i=0; i < 3; i++) {
-            mediaArray.push(random.media())
-        }
-        // TODO: make this a table
-        // user.user_media = mediaArray
     })
     console.log('COMPLETED: Generated Users...')
     return users
@@ -87,6 +83,13 @@ const generateProfiles = jobPosterIds => {
         starting: config.batchSize * batchCount,
         profile_id: extraProfileCount,
     })
+    profiles.forEach(profile => {
+        var mediaArray = []
+        for (let i = 0; i < 3; i++) {
+            mediaArray.push(random.media())
+        }
+        profile.user_media = mediaArray
+    })
     // Generate extra job posting profiles
     // attributed to random user.is_poster === true
     // TODO: Clean this up. Hard to read...
@@ -104,6 +107,11 @@ const generateProfiles = jobPosterIds => {
             extras = [...extras, ...generatedExtraProfiles]
         }
         extras.forEach(profile => {
+            var mediaArray = []
+            for (let i = 0; i < 3; i++) {
+                mediaArray.push(random.media())
+            }
+            profile.user_media = mediaArray
             profiles.push(profile)
             extraProfileCount++
         })
@@ -142,6 +150,11 @@ const generateResponses = profiles => {
 /**
  * Our main generator loop
  */
+const writeBarrel = async () => {
+    await fs.writeFile(`${config.mockOutputPath}/index.js`, '', () => {})
+}
+// writeBarrel()
+
 for (
     let batch = config.batchSize;
     batch <= config.total;
@@ -164,83 +177,20 @@ for (
     const responses = generateResponses(profiles)
 
     write(config.batchSize * batchCount, { users, profiles, responses })
+
+    /**
+     * Write barrel export
+     */
+    // const filename = `_batch_${config.batchSize * batchCount}.js`
+    // fs.appendFile(
+    //     `${config.mockOutputPath}/index.js`,
+    //     `export * from './${filename}'\n`,
+    //     err => {
+    //         if (err) console.error(err)
+    //     },
+    // )
+
     batchCount++
 }
 
-/**
- * Score all the profiles!
- */
-// const compareProfileResponses = (seeker, potentialMatch) => {
-//     const checkValCb = res => {
-//         const val = parseInt(res.val)
-//         return isNaN(val) ? 0 : val
-//     }
-//     const filterBy = idToCheckFor => {
-//         return responses
-//             .filter(
-//                 response =>
-//                     response.profile_id == idToCheckFor &&
-//                     response.val.length < 4,
-//             )
-//             .map(checkValCb)
-//     }
-//     const seekerResponses = filterBy(seeker.profile_id)
-//     const potentialMatchResponses = filterBy(potentialMatch.profile_id)
-//     const cachedScores = []
-//     seekerResponses.forEach(seekerResponse => {
-//         potentialMatchResponses.forEach(potentialResponse => {
-//             cachedScores.push(
-//                 preComputedScores[seekerResponse][potentialResponse],
-//             )
-//         })
-//     })
-//     return Math.round(
-//         cachedScores.reduce((a, b) => a + b) / cachedScores.length,
-//     )
-// }
-// const scoreProfile = (profile, potentialMatchList) => {
-//     return potentialMatchList
-//         .map(profileToCompare => {
-//             return {
-//                 match_queue_id: null,
-//                 profile_id: profile.profile_id,
-//                 target_id: profileToCompare.profile_id,
-//                 is_deleted: false,
-//                 score: compareProfileResponses(profile, profileToCompare),
-//             }
-//         })
-//         .sort((a, b) => a.score - b.score)
-// }
-
-// const scoreAll = () => {
-//     process.stdout.write('\nScoring Profiles')
-//     let scores = []
-//     const posterProfiles = profiles.filter(profile =>
-//         jobPosterIds.includes(profile.user_id),
-//     )
-//     const seekerProfiles = profiles.filter(
-//         profile => !jobPosterIds.includes(profile.user_id),
-//     )
-//     process.stdout.write('.')
-//     for (let i = 0; i < seekerProfiles.length; i++) {
-//         const scored = scoreProfile(seekerProfiles[i], posterProfiles)
-//         scores.push(...scored)
-//     }
-//     process.stdout.write('.')
-//     for (let j = 0; j < posterProfiles.length; j++) {
-//         const scored = scoreProfile(posterProfiles[j], seekerProfiles)
-//         scores.push(...scored)
-//     }
-//     process.stdout.write('.')
-//     console.log('\n\nCOMPLETED: Scoring Profiles...')
-//     return scores.reverse()
-// }
-
-// const match_queues = scoreAll().map((score, i) => {
-//     score.match_queue_id = i + 1
-//     // Comment out  next line to see the scores
-//     delete score.score
-//     return score
-// })
-
 console.log('---\nFINISHED...\n===\n')

backend/db/data-generator/score.js

@@ -4,52 +4,52 @@ const config = require('./config')
 
 const preComputedScores = {
     100: {
-        100: 0,
-        140: 0,
-        180: 0,
-        220: 0,
-        260: 0,
-        400: 0,
+        100: 1000,
+        140: 872,
+        180: 675,
+        220: 518,
+        260: 406,
+        400: 215,
     },
     140: {
-        100: 0,
-        140: 0,
-        180: 0,
-        220: 0,
-        260: 0,
-        400: 0,
+        100: 872,
+        140: 1000,
+        180: 938,
+        220: 828,
+        260: 723,
+        400: 486,
     },
     180: {
-        100: 0,
-        140: 0,
-        180: 0,
-        220: 0,
-        260: 0,
-        400: 0,
+        100: 675,
+        140: 938,
+        180: 1000,
+        220: 968,
+        260: 906,
+        400: 706,
     },
     220: {
-        100: 0,
-        140: 0,
-        180: 0,
-        220: 0,
-        260: 0,
-        400: 0,
+        100: 518,
+        140: 828,
+        180: 968,
+        220: 1000,
+        260: 982,
+        400: 847,
     },
     260: {
-        100: 0,
-        140: 0,
-        180: 0,
-        220: 0,
-        260: 0,
-        400: 0,
+        100: 406,
+        140: 723,
+        180: 906,
+        220: 982,
+        260: 1000,
+        400: 928,
     },
     400: {
-        100: 0,
-        140: 0,
-        180: 0,
-        220: 0,
-        260: 0,
-        400: 0,
+        100: 215,
+        140: 486,
+        180: 706,
+        220: 847,
+        260: 928,
+        400: 1000,
     },
 }
 const score2d = (a, b) => {
@@ -62,11 +62,13 @@ const score2d = (a, b) => {
             config.magic,
     )
 }
-config.scoreVals.forEach(val => {
-    config.scoreVals.forEach(v => {
-        preComputedScores[val][v] = score2d(val, v)
-    })
-})
+
+// Uncomment to rerun precompute
+// config.scoreVals.forEach(val => {
+//     config.scoreVals.forEach(v => {
+//         preComputedScores[val][v] = score2d(val, v)
+//     })
+// })
 
 module.exports = {
     precomputed: preComputedScores,

backend/db/survey-generator.js

@@ -1,13 +1,15 @@
 const fs = require('fs')
 const similarity = require('compute-cosine-similarity')
-const magic = 1000 // Multiply cosine similary by this
+const config = require('./data-generator/config.js')
 
-const not_important = '120'
-const somewhat_important = '140'
-const important = '160'
-const very_important = '180'
-const extremely_important = '200'
-const mandatory = '400'
+const magic = config.magic // Multiply cosine similary by this
+
+const not_important = config.scoreVals[0]
+const somewhat_important = config.scoreVals[1]
+const important = config.scoreVals[2]
+const very_important = config.scoreVals[3]
+const extremely_important = config.scoreVals[4]
+const mandatory = config.scoreVals[5]
 
 // -
 // 1440 - 2400 total range

frontend/package.json

@@ -30,6 +30,7 @@
         "pug-plain-loader": "^1.1.0",
         "sugarss": "^3.0.3",
         "vite": "^2.2.3",
+        "vite-fs": "^0.0.2",
         "watch": "^1.0.2"
     }
 }

frontend/src/App.vue

@@ -1,15 +1,10 @@
 <template lang="pug">
-
-
 router-view
-
 </template>
 
 <script>
 import * as sss from '@/sss/import.css'
 
-
-
 export default {
     name: 'app',
 }
@@ -38,5 +33,4 @@ html
             height: 100%
             width: 100%
             flex-direction: column
-
 </style>

frontend/src/components/ProfileCardList.vue

@@ -3,18 +3,20 @@ section.profile_card_list.w-full
     .profile_card_list_container.w-full
         .swipe(
             :config='config'
-            :key='profile.profile_id'
+            :key='profile.uid'
             @throwout='swipped(profile)'
             v-for='profile in profiles'
-            :style='{ "left": `vh` }'
         )
             .card.b-solid.rounded.p-0.bg-cover(
-                :style='{ "background-image": `url(${profile.user.user_media})` }'
-                
+                :style='{ "background-image": `url(${profile.avatar})` }'
             )
                 .card__content
-                    h3.p-1.mv-0.b-solid.rounded {{ profile.user.user_name }}
+                    h3.p-1.mv-0.b-solid.rounded {{ profile.name }}
 
+        nav.swipe_icons.w-full.f-row.between
+            h2 A
+            h2 H
+            h2 P
 </template>
 
 <script>
@@ -34,7 +36,7 @@ export default {
         },
         uid: {
             type: Number,
-            default: 1,
+            default: 9999,
         },
     },
     data: () => ({
@@ -52,7 +54,7 @@ export default {
         },
     },
     created() {
-        this.getProfile()
+        this.getUser()
     },
     methods: {
         logOut() {},
@@ -65,7 +67,7 @@ export default {
             profile.id = Date.now() + (Math.random() * 100000).toFixed()
             this.profiles.unshift({ ...profile })
         },
-        getProfile() {
+        getUser() {
             return
         },
         onRequest() {
@@ -76,32 +78,13 @@ export default {
 }
 </script>
 <style lang="postcss">
-@import '../sss/card.scss'
-
-.profile_card_list
+.profile_card_list_container
     display: flex
     justify-content: center
     margin: 5vh 0 0 0
-    position: relative
-
-
-.profile_card_list_container
-    margin: 0 auto
-    width: 30%
-    position: relative
-    .swipe
-        list-style: none
-        background: #fff
-        box-shadow: 0 0 2px rgba(0,0,0,.2), 1px 1px 1px rgba(0,0,0,.2)
-        position: absolute
-        line-height: 300px
-        text-align: center
-        border: 1px solid #ECECEC
-        border-radius: 8px
-        
 
 .swipe
-    
+    position: absolute
 
 .card
     position: relative
@@ -110,13 +93,15 @@ export default {
     max-width: 85vw
     height: 50vh
     background-position: center
-    border: 1px solid #fff
     &_content
         width: 100%
         height: 100%
     h3
         position: absolute
         bottom: 0
-        color: #fff
 
+.swipe_icons
+    position: fixed
+    bottom: 5vh
+    width: 250px
 </style>

frontend/src/router/index.js

@@ -11,7 +11,7 @@ const routes = [
     {
         path: '/',
         component: home,
-        name: 'home',
+        name: 'HomeView',
         meta: { requiresAuth: true, requiresProfile: true },
     },
     {

frontend/src/views/home.vue

@@ -2,8 +2,8 @@
 sidebar
 main.f-col.start.w-full
     article#home
-        h1(v-if="user") {{ user.user_name }}
-        profile-card-list(:uid='mypid' :profiles='swipables')
+        h1(v-if='user') {{ user.user_name }}
+        profile-card-list(:profiles='swipables' :uid='mypid')
     main-nav
 </template>
 
@@ -11,68 +11,62 @@ main.f-col.start.w-full
 import sidebar from '../components/Sidebar.vue'
 import mainNav from '../components/MainNav.vue'
 import profileCardList from '../components/ProfileCardList.vue'
-import batch20 from '../../../backend/db/generated/_batch_20.js'
+
+import batch_10 from '../../../backend/db/generated/_batch_10.js.ref'
+import batch_20 from '../../../backend/db/generated/_batch_20.js.ref'
+import batch_30 from '../../../backend/db/generated/_batch_30.js.ref'
 
 export default {
     name: 'HomeView',
     components: { profileCardList, sidebar, mainNav },
     data: () => ({
-        swipables: [   
-            // { 
-            //     user_id: 1, 
-            //     user: {
-            //         user_id: 20,
-            //         user_name: 'wravu pdjak',
-            //         user_email: '3vypx3qyj@aol.com',
-            //         is_admin: false,
-            //         is_poster: 1,
-            //     }, 
-            //     profile_id: 1 
-            // },
-        ],
+        swipables: [],
         user: null,
         mypid: null,
     }),
     created() {
         // this.mypid = auth.currentUser?.mypid || "99999";
         this.mypid = 21
-        this.getBatch()
-        const myProfile = this.getProfilesfor(this.mypid)
-        this.user = this.getUserfromProfile(myProfile)
-        console.log('this.user', this.user)
+        this.processProfiles()
     },
     methods: {
-        getBatch() {
-            const profiles = batch20.profiles
-            // .map is more readable
-            this.swipables = profiles.map((profile) => {
-                profile.user = this.getUserfromProfile(profile)
-                return profile
+        parseBatch(allBatches) {
+            const finished = { profiles: [], users: [], responses: [] }
+            allBatches.forEach(batch => {
+                const split = batch.value.split('\n')
+                split.splice(0, 5)
+                split.unshift('{')
+                const p = JSON.parse(split.join(''))
+                finished.profiles = [...p.profiles, ...finished.profiles]
+                finished.users = [...p.users, ...finished.users]
+                finished.responses = [...p.responses, ...finished.responses]
             })
-            // for loop is faster
-            // const myList = []
-            // for (let profile in profiles) {
-            //     profile.user = this.getUserfromProfile(profile)
-            //     myList.push(profile)
-            // }
-            // this.swipables = myList
-            // before you store in 31, save user info per profile
+            return finished
         },
-        getProfilesfor(pid) {
-            const profilesfromBatch = batch20.profiles
-            const profiles = profilesfromBatch.filter((profile) => {
-                return profile.profile_id === pid
+        processProfiles() {
+            const parsed = this.parseBatch([batch_10, batch_20, batch_30])
+            const findUser = profile => {
+                return parsed.users.filter(u => u.user_id == profile.user_id)[0]
+            }
+            parsed.profiles.forEach(p => {
+                // console.log(parsed)
+                const user = findUser(p)
+                p.uid = p.profile_id
+                p.name = user.user_name
+                p.email = user.user_email
+                p.avatar = p.user_media[0]
+                p.responses = parsed.responses.filter(
+                    r => r.profile_id == p.profile_id,
+                )
+                p.responses.forEach(r => {
+                    if (r.response_key_id == 7) {
+                        p.zipcode = r.val
+                    }
+                })
+                this.swipables.push(p)
             })
-            return profiles[0]
+            console.log(this.swipables)
         },
-        getUserfromProfile(profile) {
-            const users = batch20.users
-            const usersProfile = users.filter((user) => {
-                return user.user_id === profile.user_id
-            })
-            return usersProfile[0]
-        }
-
     },
 }
 </script>

frontend/vite.config.js

@@ -1,9 +1,9 @@
 import { defineConfig } from 'vite'
 import vue from '@vitejs/plugin-vue'
-
+import ViteFS from 'vite-fs'
 // https://vitejs.dev/config/
 export default defineConfig({
-    plugins: [vue()],
+    plugins: [vue(), ViteFS()],
     resolve: {
         alias: {
             '@': require('path').resolve(__dirname, 'src'),