0.0.3 release - did a bad thing merge -s ours master

.gitignore

@@ -6,4 +6,5 @@ dist-ssr
 **/.env
 .nyc_output
 **/generated/_*
-**/.vscode
+**/.vscode
+**/*.vim

backend/.env.sample

@@ -13,6 +13,7 @@ DB_TYPE=mysql
 # Extra pepper for auth encryption
 PEPPER=kosho
 APP_SECRET=mysecret
+APP_SESSION_SALT=somerandomstring
 
 
 # Config for local test dB
@@ -32,3 +33,6 @@ PSCALE_DB_BRANCH=main
 
 PSCALE_DB_USER=myuserpleasechange
 PSCALE_DB_PASSWORD=pscale_pw_abc123efg456hij789
+
+# Brevo Transactional Email API key
+BREVO_KEY=brevo_api_key

backend/db/data-generator/config.json

@@ -2,7 +2,7 @@
     "mockOutputPath": "./db/generated",
     "magic": 1000,
     "total": 100,
-    "ignore": [45],
+    "ignore": [],
     "batchSize": 10,
     "percentageOfSeekers": 90,
     "scoreVals": [1, 2, 3, 4, 5, 6, 7],
@@ -30,11 +30,17 @@
         "91401",
         "97075"
     ],
-    "resKeys": [1, 2, 3, 4, 5, 6],
-    "zipcodeKey": 7,
-    "mediaKey": 8,
-    "langKey": 9,
-    "blurbKey": 12,
-    "prefKeys": [7, 10, 11, 13, 14, 15, 16],
-    "maxDistanceKey": 16
+    "scoreKeys": [1, 2, 3, 4, 5, 6],
+    "nameKey": 7,
+    "emailKey": 8,
+    "passwordKey": 9,
+    "zipcodeKey": 10,
+    "mediaKey": 12,
+    "langKey": 13,
+    "durationKey": 14,
+    "presenceKey": 15,
+    "blurbKey": 16,
+    "urgencyKey": 17,
+    "pronounsKey": 18,
+    "distanceKey": 19
 }

backend/db/data-generator/index.js

@@ -115,7 +115,8 @@ const generateResponses = profiles => {
     // Generate responses first, before filling in details
     let responses = generate(
         classes.Response,
-        (config.batchSize + extraProfilesToGenerate) * mock.response_keys.length,
+        (config.batchSize + extraProfilesToGenerate) *
+            mock.response_keys.length,
         { starting: generatedResponseCount + config.batchSize },
     )
     profiles.forEach((profile, i) => {
@@ -125,29 +126,27 @@ const generateResponses = profiles => {
             resToEdit.response_key_id = k + 1
             resToEdit.profile_id = profile.profile_id
 
-            if(resToEdit.response_key_id < config.zipcodeKey) {
+            if (resToEdit.response_key_id < config.zipcodeKey) {
                 resToEdit.val = random.valFrom(Object.values(possibleResponses))
-            }
-            else if(resToEdit.response_key_id == config.zipcodeKey) {
+            } else if (resToEdit.response_key_id == config.zipcodeKey) {
                 resToEdit.val = random.valFrom(config.possibleZipcodes)
-            }
-            else {
+            } else {
                 switch (resToEdit.response_key_id) {
-                case config.mediaKey:
-                    resToEdit.val = random.media()
-                    break
-                case config.langKey:
-                    resToEdit.val = random.language()
-                    break
-                case 10:
-                    resToEdit.val = random.duration()
-                    break
-                case 11:
-                    resToEdit.val = random.location()
-                    break
-                case config.blurbKey:
-                    resToEdit.val = random.blurb()
-                    break
+                    case config.mediaKey:
+                        resToEdit.val = random.media()
+                        break
+                    case config.langKey:
+                        resToEdit.val = random.language()
+                        break
+                    case config.durationKey:
+                        resToEdit.val = random.duration()
+                        break
+                    case config.presenceKey:
+                        resToEdit.val = random.location()
+                        break
+                    case config.blurbKey:
+                        resToEdit.val = random.blurb()
+                        break
                 }
             }
         }
@@ -170,7 +169,7 @@ for (
     let jobPosterIds = users
         .filter(user => user.is_poster > 0)
         .map(user => user.user_id)
-    // Guarentee ONE job poster
+    // Guarantee ONE job poster
     if (!jobPosterIds.length) {
         random.valFrom(users).is_poster = 1
         jobPosterIds = users

backend/db/data-generator/mock.js

@@ -50,6 +50,36 @@ module.exports = {
             tag_description: 'user_email',
             is_active: true,
         },
+        {
+            tag_id: 9,
+            tag_category: 'healthcare--certification',
+            tag_description: 'ADM-BC',
+            is_active: true,
+        },
+        {
+            tag_id: 10,
+            tag_category: 'healthcare--certification',
+            tag_description: 'CBHC',
+            is_active: true,
+        },
+        {
+            tag_id: 11,
+            tag_category: 'healthcare--certification',
+            tag_description: 'CEN',
+            is_active: true,
+        },
+        {
+            tag_id: 12,
+            tag_category: 'healthcare--certification',
+            tag_description: 'CFRN',
+            is_active: true,
+        },
+        {
+            tag_id: 13,
+            tag_category: 'healthcare--certification',
+            tag_description: 'CMCN',
+            is_active: true,
+        },
     ],
     tag_associations: [
         {
@@ -84,7 +114,7 @@ module.exports = {
             tag_association_id: 5,
             profile_id: 45,
             grouping_id: 2,
-            tag_id: 4,
+            tag_id: 8,
             is_deleted: false,
         },
         {
@@ -115,113 +145,477 @@ module.exports = {
             tag_id: 5,
             is_deleted: false,
         },
+        {
+            tag_association_id: 10,
+            profile_id: 4,
+            grouping_id: null,
+            tag_id: 1,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 11,
+            profile_id: 5,
+            grouping_id: null,
+            tag_id: 1,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 12,
+            profile_id: 6,
+            grouping_id: null,
+            tag_id: 3,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 13,
+            profile_id: 7,
+            grouping_id: null,
+            tag_id: 8,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 14,
+            profile_id: 8,
+            grouping_id: null,
+            tag_id: 7,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 15,
+            profile_id: 9,
+            grouping_id: 1,
+            tag_id: 2,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 16,
+            profile_id: 10,
+            grouping_id: 2,
+            tag_id: 2,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 17,
+            profile_id: 11,
+            grouping_id: 2,
+            tag_id: 3,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 18,
+            profile_id: 12,
+            grouping_id: 3,
+            tag_id: 4,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 19,
+            profile_id: 13,
+            grouping_id: 3,
+            tag_id: 7,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 20,
+            profile_id: 14,
+            grouping_id: 4,
+            tag_id: 6,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 21,
+            profile_id: 15,
+            grouping_id: 1,
+            tag_id: 1,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 22,
+            profile_id: 16,
+            grouping_id: 1,
+            tag_id: 2,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 23,
+            profile_id: 17,
+            grouping_id: null,
+            tag_id: 6,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 24,
+            profile_id: 18,
+            grouping_id: null,
+            tag_id: 8,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 25,
+            profile_id: 19,
+            grouping_id: null,
+            tag_id: 3,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 26,
+            profile_id: 20,
+            grouping_id: null,
+            tag_id: 3,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 27,
+            profile_id: 21,
+            grouping_id: 2,
+            tag_id: 1,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 28,
+            profile_id: 22,
+            grouping_id: 2,
+            tag_id: 1,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 29,
+            profile_id: 23,
+            grouping_id: 3,
+            tag_id: 2,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 30,
+            profile_id: 24,
+            grouping_id: 4,
+            tag_id: 4,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 31,
+            profile_id: 25,
+            grouping_id: 5,
+            tag_id: 3,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 32,
+            profile_id: 26,
+            grouping_id: 1,
+            tag_id: 4,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 33,
+            profile_id: 27,
+            grouping_id: null,
+            tag_id: 3,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 34,
+            profile_id: 28,
+            grouping_id: null,
+            tag_id: 3,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 35,
+            profile_id: 29,
+            grouping_id: null,
+            tag_id: 7,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 36,
+            profile_id: 30,
+            grouping_id: null,
+            tag_id: 6,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 37,
+            profile_id: 31,
+            grouping_id: 3,
+            tag_id: 4,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 38,
+            profile_id: 32,
+            grouping_id: 3,
+            tag_id: 5,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 39,
+            profile_id: 33,
+            grouping_id: 3,
+            tag_id: 5,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 40,
+            profile_id: 34,
+            grouping_id: 4,
+            tag_id: 7,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 41,
+            profile_id: 35,
+            grouping_id: 4,
+            tag_id: 8,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 42,
+            profile_id: 36,
+            grouping_id: 1,
+            tag_id: 1,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 43,
+            profile_id: 37,
+            grouping_id: 1,
+            tag_id: 2,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 44,
+            profile_id: 38,
+            grouping_id: null,
+            tag_id: 2,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 45,
+            profile_id: 39,
+            grouping_id: null,
+            tag_id: 6,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 46,
+            profile_id: 40,
+            grouping_id: null,
+            tag_id: 5,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 47,
+            profile_id: 41,
+            grouping_id: null,
+            tag_id: 6,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 48,
+            profile_id: 42,
+            grouping_id: 1,
+            tag_id: 8,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 49,
+            profile_id: 43,
+            grouping_id: 1,
+            tag_id: 7,
+            is_deleted: false,
+        },
     ],
     response_keys: [
         {
             response_key_id: 1,
             response_key_category: 'visionary_vs_implementer',
-            response_key_prompt:
-                'While managing your team, do you find success in your employees being more Visionary or Implementer?',
+            response_key_prompt: 'Do you prefer to work with those who are driven by their Visionary insights, or those who are driven more by their Implementation?',
             response_key_description: 'first round draft scoring question',
+            aspect: 'visionary_vs_implementer',
+            category: 'aspect',
+            placeholder: null,
+            invalidInputPrompt: null,
         },
         {
             response_key_id: 2,
             response_key_category: 'creative_vs_methodical',
-            response_key_prompt:
-                'In your department, do you find more success in your employees being Creative or Methodical in their job duties?',
+            response_key_prompt: 'Have you found more success working with employees that are more Creative or those that are more Methodical?',
             response_key_description: 'first round draft scoring question',
+            aspect: 'creative_vs_methodical',
+            category: 'aspect',
+            placeholder: null,
+            invalidInputPrompt: null,
         },
         {
             response_key_id: 3,
-            response_key_category: 'collaborative_vs_independent',
-            response_key_prompt:
-                'Do you structure and encourage your team to be a Collaborative or Independent environment?',
+            response_key_category: 'dynamic_vs_ordered',
+            response_key_prompt: 'Which do you find to be the ideal working environment, one that is more Collaborative or one that is more Independent?',
             response_key_description: 'first round draft scoring question',
+            aspect: 'dynamic_vs_ordered',
+            category: 'aspect',
+            placeholder: null,
+            invalidInputPrompt: null,
         },
         {
             response_key_id: 4,
-            response_key_category: 'innovative_vs_conventional',
-            response_key_prompt:
-                'Do you find higher success in employees on your team that are Innovative or Conventional?',
+            response_key_category: 'precise_vs_resourceful',
+            response_key_prompt: 'Is the success of your team more likely if it includes individuals who are more Innovative, or those that are more Conventional when fulfilling their job duties?',
             response_key_description: 'first round draft scoring question',
+            aspect: 'precise_vs_resourceful',
+            category: 'aspect',
+            placeholder: null,
+            invalidInputPrompt: null,
         },
         {
             response_key_id: 5,
             response_key_category: 'big_Picture_vs_focused',
-            response_key_prompt:
-                'As a hiring leader, are you a Big Picture or Focused thinker when it comes to how you operate in your job duties?',
+            response_key_prompt: 'When fulfilling the role of the hiring leader, do you find yourself focusing more on the Big Picture or The Task At Hand?',
             response_key_description: 'first round draft scoring question',
+            aspect: 'big_Picture_vs_focused',
+            category: 'aspect',
+            placeholder: null,
+            invalidInputPrompt: null,
         },
         {
             response_key_id: 6,
             response_key_category: 'guided_vs_self-managed',
-            response_key_prompt:
-                'Do you prefer your employees to be Guided or Self-managed in achieving completion of their responsibilities?',
+            response_key_prompt: 'Do you prefer to Guide your employees towards achieving the team goals, or do you prefer your employees to be Self-Managed?',
             response_key_description: 'first round draft scoring question',
+            aspect: 'guided_vs_self-managed',
+            category: 'aspect',
+            placeholder: null,
+            invalidInputPrompt: null,
         },
         {
             response_key_id: 7,
             response_key_category: 'profile',
-            response_key_prompt: 'zipcode',
-            response_key_description: 'required for distance calculations',
+            response_key_prompt: 'First things first, could you provide us with your name? [break] I am called [break] when others address me.',
+            response_key_description: 'required for profile creation',
+            aspect: null,
+            category: 'input',
+            placeholder: 'Joe Doe',
+            invalidInputPrompt: 'So sorry, but what is your name?',
         },
         {
             response_key_id: 8,
             response_key_category: 'profile',
-            response_key_prompt: 'image',
-            response_key_description: 'required for profile pictures',
+            response_key_prompt: 'In order for others to reach out to you on Siimee, we will need you to provide your email address.[break]When reaching out to me, [break] is my preferred email.',
+            response_key_description: 'required for profile creation',
+            aspect: null,
+            category: 'input',
+            placeholder: 'joe@mailme.com',
+            invalidInputPrompt: 'It looks like that email is not valid, try en email that is formatted like so: joe@joe.com',
         },
         {
             response_key_id: 9,
             response_key_category: 'profile',
-            response_key_prompt: 'language',
-            response_key_description:
-                'programming and spoken language preference',
+            response_key_prompt: 'So far so good! Next we will need you to establish a super secret password. Your password should be at least 14 characters long and have at least 2 special characters.[break]My [break] is a very secure passcode that only I will have access to!',
+            response_key_description: 'required for profile creation',
+            aspect: null,
+            category: 'input',
+            placeholder: 'supersecr3tp@ssword',
+            invalidInputPrompt: 'That password does not fit our requirements, please follow the above instructions to generate a secure password.',
         },
         {
             response_key_id: 10,
             response_key_category: 'profile',
-            response_key_prompt: 'duration',
-            response_key_description:
-                'duration preference for hours able to dedicate to work',
+            response_key_prompt: 'Looking good! Doing great. The next piece of info needed is your zip code. That way we can be sure to only show you other people in your area.[break]My zip code, [break] is the general area where I wish to see results in.',
+            response_key_description: 'required for distance calculations',
+            aspect: null,
+            category: 'input',
+            placeholder: '90012',
+            invalidInputPrompt: 'Oops! That is not a recognized zipcode, please enter a 5 digit zipcode like: 97869',
         },
         {
             response_key_id: 11,
             response_key_category: 'profile',
-            response_key_prompt: 'presence',
-            response_key_description:
-                'location preference for where work happens',
+            response_key_prompt: 'What are you seeking? Are you looking to find a position to be employed in, or are you looking to employ a candidate?[break] I am a [break] seeking an employer/employee.',
+            response_key_description: 'required for profile generation',
+            aspect: null,
+            category: 'choice',
+            placeholder: null,
+            invalidInputPrompt: 'In order to provide you with the best results, Siimee will need to know whether you are an employer looking to fill a position, or a candidate looking for an employment. Please take a look at our above options and choose one.',
         },
         {
             response_key_id: 12,
             response_key_category: 'profile',
-            response_key_prompt: 'blurb',
-            response_key_description: 'required for profile description',
+            response_key_prompt: 'Hey, you are almost done! Please provide an image of yourself so others can recognize you if you ever meet up IRL:',
+            response_key_description: 'required for profile pictures',
+            aspect: null,
+            category: 'input',
+            placeholder: null,
+            invalidInputPrompt: 'It appears you have yet to upload an image. Please provide Siimee with an image in case you want to show others what you look like.',
         },
         {
             response_key_id: 13,
             response_key_category: 'profile',
-            response_key_prompt: 'urgency',
-            response_key_description: 'urgency for when work is required',
+            response_key_prompt: 'What language is your native language?[break] I consider [break] language as my native language.',
+            response_key_description: 'programming and spoken language preference',
+            aspect: null,
+            category: 'choice',
+            placeholder: null,
+            invalidInputPrompt: 'We try our best to provide results in the language of your choosing. ¿Prefieres ver resultados en español? Ou peut-être parlez-vous français? Or would you prefer to see results in english?',
         },
         {
             response_key_id: 14,
             response_key_category: 'profile',
-            response_key_prompt: 'role',
-            response_key_description: 'current and desired role',
+            response_key_prompt: 'What kind of duration would you prefer? Are you looking for part-time, full-time, other?[break] Currently, I am looking for a [break] job at this time.',
+            response_key_description: 'duration preference for hours able to dedicate to work',
+            aspect: null,
+            category: 'choice',
+            placeholder: null,
+            invalidInputPrompt: 'Looks like you have yet to  fill out what kind of work you are most interested in. As in, part-time, full-time. Take a look at our above options and choose whatever feels right for you right now. You can always edit them later!',
         },
         {
             response_key_id: 15,
             response_key_category: 'profile',
-            response_key_prompt: 'pronouns',
-            response_key_description: 'required for profile pronouns',
+            response_key_prompt: 'Would you prefer remote, hybrid, in-person work?[break] Personally I would prefer a [break] job right now. It is just what works best for me.',
+            response_key_description: 'location preference for where work happens',
+            aspect: null,
+            category: 'choice',
+            placeholder: null,
+            invalidInputPrompt: 'Hold up! So sorry to put a pause here, but it looks like you have not chosen whether to work remotely or in person. No worries, if you are unsure, just choose the flexible option.',
         },
         {
             response_key_id: 16,
             response_key_category: 'profile',
-            response_key_prompt: 'distance',
-            response_key_description:
-                'preference for commuting distance cutoff',
+            response_key_prompt: 'Please provide us with a short blurb about yourself. What is your backstory?[break] My origin story starts like this:[break]',
+            response_key_description: 'required for profile description',
+            aspect: null,
+            category: 'input',
+            placeholder: 'my backstory starts long long ago...',
+            invalidInputPrompt: 'Whoa! Cool story. Unfortunately your backstory is either too long or too short. Please tell us a bit about yourself between 1 and 100 characters.',
+        },
+        {
+            response_key_id: 17,
+            response_key_category: 'profile',
+            response_key_prompt: 'How soon do you need the position filled or you need to be employed? [break]I am currently [break] when it comes to employment opportunities right now.',
+            response_key_description: 'urgency for when work is required',
+            aspect: null,
+            category: 'choice',
+            placeholder: null,
+            invalidInputPrompt: 'Looks like you left this field blank. Take a look at our provided options and tell us when you would like be employed.',
+        },
+        {
+            response_key_id: 18,
+            response_key_category: 'profile',
+            response_key_prompt: 'When others refer to you, what pronouns do you prefer they use?[break]I prefer to be called [break] when others refer to me.',
+            response_key_description: 'required for profile pronouns',
+            aspect: null,
+            category: 'choice',
+            placeholder: null,
+            invalidInputPrompt: 'Ensuring that others on our platform are aware of what your preferred pronouns are is important to us. Please choose from one of the above options.',
+        },
+        {
+            response_key_id: 19,
+            response_key_category: 'profile',
+            response_key_prompt: 'What distance from your home are you looking to work in?[break] Preferably, I would like to work [break] from my place of residence.',
+            response_key_description: 'preference for commuting distance cutoff',
+            aspect: null,
+            category: 'input',
+            placeholder: '5 mi',
+            invalidInputPrompt: 'Whoa! You either left this field blank or tried to input an astronomically large distance you would like to see results from. Please input a distance you would like to see results in.',
         },
     ],
     responses: [],

backend/db/migrations/20210527174416_create_response_keys_table.js

@@ -4,6 +4,10 @@ exports.up = function (knex) {
         table.string('response_key_category').notNullable()
         table.string('response_key_prompt')
         table.string('response_key_description')
+        table.string('aspect')
+        table.string('category')
+        table.string('placeholder')
+        table.string('invalidInputPrompt')
     })
 }
 

backend/knexfile.js

@@ -1,6 +1,8 @@
 require('dotenv').config()
 const fs = require('fs')
 
+const useLocalDb = () => process.env.USE_LOCAL_DB == 'true'
+
 const local = {
     host: process.env.DB_HOST,
     user: process.env.DB_USER,
@@ -19,12 +21,10 @@ const pscale = {
     port: process.env.PSCALE_DB_PORT ? process.env.PSCALE_DB_PORT : 3306,
 }
 
-const connectionSettings = process.env.USE_LOCAL_DB == 'true' ? local : pscale
-
 module.exports = {
     development: {
         client: process.env.DB_TYPE,
-        connection: connectionSettings,
+        connection: useLocalDb() ? local : pscale,
         pool: {
             min: 2,
             max: 10,
@@ -35,8 +35,10 @@ module.exports = {
         seeds: {
             directory: './db/seeds',
         },
-        ssl: {
-            ca: fs.readFileSync('/etc/ssl/certs/ca-certificates.crt'),
-        },
+        ssl: useLocalDb()
+            ? {}
+            : {
+                  ca: fs.readFileSync('/etc/ssl/certs/ca-certificates.crt'),
+              },
     },
 }

backend/lib/auth/strategies/jwt.js

@@ -1,27 +1,72 @@
 'use strict'
+const JWT = require('jsonwebtoken')
+const crypto = require('crypto')
+
+const hashToken = async token => {
+    const salt = process.env.APP_SESSION_SALT
+    try {
+        return crypto.createHmac('sha256', salt).update(token).digest('hex')
+    } catch (err) {
+        throw new Error(err.message)
+    }
+}
+
+const createToken = (data, expiration = 600) => {
+    const key = process.env.APP_SECRET
+    const obj = {}
+
+    Object.assign(obj, { ...data })
+    return JWT.sign(obj, key, { expiresIn: expiration })
+}
+
+const validateToken = token => {
+    const key = process.env.APP_SECRET
+    try {
+        return JWT.verify(token, key)
+    } catch (err) {
+        return { payload: null, message: err.message }
+    }
+}
 
 module.exports = options => {
     return {
-        keys: {
-            key: options.jwtKey,
+        key: options.jwtKey,
+        verifyOptions: {
             algorithms: ['HS256'],
         },
-        verify: {
-            aud: 'urn:audience:test',
-            iss: 'urn:issuer:test',
-            sub: false,
-        },
-        validate: (artifacts, request, h) => {
+        // TODO: Naming conventions need to be reversed again??
+        validate: async (decoded, request, h) => {
+            const accessTokenFromHeaders = request.headers.authorization
+            const hashedAccessTokenFromHeaders = await hashToken(
+                accessTokenFromHeaders,
+            )
+            const activeSession =
+                request.server.app.activeSessions[hashedAccessTokenFromHeaders]
+            if (!activeSession)
+                throw new Error(
+                    `No session found for ${hashedAccessTokenFromHeaders}`,
+                )
+
+            const accessToken = activeSession.accessToken
+            const sessionToken = activeSession.sessionToken
+            const validatedAccessToken = validateToken(accessToken)
+            const validatedSessionToken = validateToken(sessionToken)
+            if (!validatedSessionToken.payload) {
+                console.log('sessionToken no longer valid, reissuing... ')
+                activeSession.sessionToken = createToken(
+                    { payload: validatedAccessToken.payload },
+                    // NOTE: Expiration of new sessionToken set for 200 seconds (testing)
+                    100,
+                )
+            }
             try {
-                return {
-                    isValid: true,
-                    credentials: { user: artifacts.decoded.payload.user },
-                }
+                const validatedJwt = JWT.verify(
+                    accessToken,
+                    process.env.APP_SECRET,
+                )
+                return { isValid: true, credentials: validatedJwt.email }
             } catch (err) {
-                console.error(err)
-                return {
-                    isValid: false,
-                }
+                return { isValid: false, error: err.message }
             }
         },
     }

backend/lib/plugins/profile.js

@@ -16,6 +16,7 @@ const MatchService = require('../services/match')
 
 const ProfileScoreRoute = require('../routes/profile/score')
 const ProfileUpdateRoute = require('../routes/profile/update')
+const ProfileInsertRoute = require('../routes/profile/insert')
 const ProfileRespondRoute = require('../routes/profile/respond')
 const ProfileMatchRoute = require('../routes/profile/match')
 const ProfileQueueRoute = require('../routes/profile/queue')
@@ -51,6 +52,7 @@ module.exports = {
         await server.route(ProfileScoreRoute)
         await server.route(ProfileRespondRoute)
         await server.route(ProfileUpdateRoute)
+        await server.route(ProfileInsertRoute)
         await server.route(ProfileMatchRoute)
         await server.route(ProfileQueueRoute)
         await server.route(ProfileGetRoute)

backend/lib/plugins/user.js

@@ -1,7 +1,7 @@
 const Objection = require('objection')
 const Schmervice = require('@hapipal/schmervice')
 const Schwifty = require('@hapipal/schwifty')
-const Jwt = require('@hapi/jwt')
+const Jwt = require('hapi-auth-jwt2')
 const JwtStrategy = require('../auth/strategies/jwt')
 
 const UserModel = require('../models/user')
@@ -12,6 +12,10 @@ const UserProfileCreateRoute = require('../routes/user/create-profile')
 const UserProfilesListRoute = require('../routes/user/list-profiles')
 const UserLoginRoute = require('../routes/user/login')
 const UserSignupRoute = require('../routes/user/signup')
+const UserEmailRoute = require('../routes/user/email.js')
+const UserVerifyActiveRoute = require('../routes/user/verifyactivesession.js')
+const UserGetAccessRoute = require('../routes/user/getaccess.js')
+const UserValidateSessionRoute = require('../routes/user/validatesession.js')
 const UserPassword = require('../routes/user/authentication')
 
 const UserService = require('../services/user')
@@ -49,6 +53,10 @@ module.exports = {
         await server.route(UserSignupRoute)
         await server.route(UserProfileCreateRoute)
         await server.route(UserProfilesListRoute)
+        await server.route(UserEmailRoute)
+        await server.route(UserVerifyActiveRoute)
+        await server.route(UserGetAccessRoute)
+        await server.route(UserValidateSessionRoute)
         await server.route(UserPassword)
     },
 }

backend/lib/routes/membership/active.js

@@ -62,48 +62,72 @@ module.exports = {
         auth: false,
         cors: true,
         handler: async function (request, h) {
-            const { membershipService, profileService } =
+            const { membershipService, profileService, userService } =
                 request.server.services()
             const membershipType = request.query.type
 
             const profileId = request.params.profile_id
-            let groupings = await membershipService.findGroupingsByProfileId(
+            const groupings = await membershipService.findGroupingsByProfileId(
                 profileId,
                 membershipType,
             )
-            let memberships = await membershipService.findMemberships(
-                groupings.map(grouping => grouping.grouping_id),
+            const groupingIds = groupings.map(grouping => grouping.grouping_id)
+            const memberships = await membershipService.findMemberships(
+                groupingIds,
+            )
+            const profileIds = memberships
+                .filter(membership => membership.profile_id != profileId)
+                .map(membership => membership.profile_id)
+
+            /** Assemble complete profiles to reference and pass */
+            const completedProfiles = await profileService.getProfilesFor(
+                profileIds,
+                'participant',
             )
 
             /**
              * Heavily process the result by storing just a profile_id
              * and attach complete profiles
+             * !: This still assumes only ONE other profile
+             * TODO: should be refactored to many other profiles
              */
-            let pIds = groupings.reduce((ids, grouping) => {
-                grouping.profiles.forEach(p => {
-                    if (p.profile_id == profileId) return
-                    ids.push(p.profile_id)
-                    grouping.profile = p.profile_id
-                })
+            const reformattedGroupings = groupings.map(grouping => {
+                const otherPid = grouping.profiles.find(
+                    p => p.profile_id != profileId,
+                ).profile_id
+                grouping.profile = completedProfiles.find(
+                    p => otherPid == p.profile_id,
+                )
+                grouping.is_paired = _activeGroupingIds(memberships).includes(
+                    grouping.grouping_id,
+                )
                 delete grouping.profiles
-                return ids
-            }, [])
+                return grouping
+            })
 
-            /** Assemble complete profiles to reference and pass */
-            const completedProfiles = await profileService.getProfilesFor(
-                pIds,
-                'participant',
-                false,
+            /** Grabs revealTags */
+            const revealTags = await profileService.getTagsFor(
+                profileIds,
+                groupingIds,
+                'reveal',
+            )
+
+            /** If the revealTags exist, the completedProfile's hidden info is
+             * removed and replaced with the completedProfile's user information
+             * Otherwise the completedProfiles remain unchanged
+             */
+            const user = await userService.findById(
+                completedProfiles.map(p => p.user_id),
             )
-            const reformattedGroupings = groupings.map(g => {
-                completedProfiles.forEach(p => {
-                    g.profile = g.profile == p.profile_id ? p : g.profile
+
+            // TODO: Refactor this. Is it safe to always use completedProfiles[0]?
+            if (revealTags && user) {
+                revealTags.forEach(t => {
+                    if (!t.tag.tag_description) return
+                    completedProfiles[0][t.tag.tag_description] =
+                        user[t.tag.tag_description]
                 })
-                g.is_paired = _activeGroupingIds(memberships).includes(
-                    g.grouping_id,
-                )
-                return g
-            })
+            }
 
             try {
                 return {

backend/lib/routes/membership/join.js

@@ -76,6 +76,7 @@ module.exports = {
                         groupingToWrite,
                         role,
                     )
+
                 const hasMatch = memberships.every(
                     membership => membership && membership.is_active == true,
                 )
@@ -85,6 +86,8 @@ module.exports = {
                         `${profileId}.stonk`,
                         {
                             name: `${res.target_id} Match Fffound`,
+                            // TODO: add urls for chat
+                            url: `<a href="/profile/${res.target_id}">url</a>`,
                             type: 'info',
                         },
                         h,
@@ -93,6 +96,8 @@ module.exports = {
                         `${res.target_id}.stonk`,
                         {
                             name: `${profileId} Match Fffound`,
+                            // TODO: add urls for chat
+                            url: `<a href="/profile/${profileId}">url</a>`,
                             type: 'info',
                         },
                         h,

backend/lib/routes/membership/reveal.js

@@ -31,12 +31,12 @@ module.exports = {
         auth: false,
         cors: true,
         handler: async function (request, h) {
-            const { membershipService, profileService } =
+            const { membershipService, profileService, userService } =
                 request.server.services()
             const grouping_id = request.params.grouping_id
             const { profile_id, tag_id } = request.query
             try {
-                const tags = await profileService.revealProfileInfo({
+                const associations = await profileService.revealProfileInfo({
                     profile_id,
                     grouping_id,
                     tag_id,
@@ -50,13 +50,46 @@ module.exports = {
                 const idsInGroup = memberships.map(
                     membership => membership.profile_id,
                 )
+                if (idsInGroup.length > 2)
+                    return console.error(
+                        'ERROR: idsInGroup cannot have more than 2 entries: ',
+                        idsInGroup,
+                    )
+                // Grab User Info from Users Table
+                const completeProfile = await profileService.getProfilesFor(
+                    [profile_id],
+                    'participant',
+                )
+                const userInfo = await userService.findById(
+                    completeProfile[0].user_id,
+                )
+
+                // Grab the TagAssociation that matches the revealed profile
+                // TODO: Check if there are multiple matching associations(?)(there shouldn't be)
+                let matchingAssociation = null
+                associations.forEach(tagAssoc => {
+                    if (
+                        tagAssoc.grouping_id === grouping_id &&
+                        tagAssoc.profile_id === profile_id &&
+                        tagAssoc.tag_id === tag_id
+                    ) {
+                        matchingAssociation = tagAssoc
+                    }
+                })
+                const description = matchingAssociation.tag.tag_description
+
                 idsInGroup.forEach(profile_id => {
                     request.server.methods.notify(
                         `${profile_id}.stonk`,
                         {
-                            name: 'REVEALED INFO',
+                            name: 'REVEALED_INFO',
+                            revealed_info: userInfo[description],
+                            profile_id: completeProfile[0].profile_id,
+                            grouping_id: grouping_id,
                             tag: tag_id,
+                            description,
                             type: 'info',
+                            url: `<a href="/chat/${profile_id}">url</a>`
                         },
                         h,
                     )
@@ -65,7 +98,7 @@ module.exports = {
                     .response({
                         ok: true,
                         handler: pluginConfig.handlerType,
-                        data: { tags },
+                        data: { tags: associations },
                     })
                     .code(200)
             } catch (err) {

backend/lib/routes/profile/get.js

@@ -28,8 +28,7 @@ module.exports = {
     options: {
         ...pluginConfig.docs,
         tags: ['api'],
-        /** Protect this route with authentication? */
-        auth: false,
+        auth: 'default_jwt',
         cors: true,
         handler: async function (request, h) {
             const { profile_id } = request.params

backend/lib/routes/profile/insert.js

@@ -0,0 +1,85 @@
+'use strict'
+
+const Joi = require('joi')
+const apiSchema = require('../../schemas/api')
+const errorSchema = require('../../schemas/errors')
+const surveyResponseSchema = require('../../schemas/responses')
+const params = require('../../schemas/params')
+
+const pluginConfig = {
+    handlerType: 'profile',
+    docs: {
+        description: 'Insert responses',
+        notes: 'Insert new responses',
+    },
+}
+
+const responseSchemas = {
+    response: surveyResponseSchema.single,
+    error: errorSchema.single,
+}
+
+module.exports = {
+    method: 'POST',
+    path: '/{profile_id}/insert/{response_key_id?}',
+    options: {
+        ...pluginConfig.docs,
+        tags: ['api'],
+        /** Protect this route with authentication? */
+        auth: false,
+        cors: true,
+
+        handler: async function (request, h) {
+            const { profileService } = request.services()
+            /** Grab payload info */
+            const res = request.payload
+
+            try {
+                // TODO: Currently passwords are stored in plain text, big no no...
+                const insertedResponse =
+                    await profileService.insertSingleResponseForProfile(res)
+
+                if (!insertedResponse) {
+                    throw new Error('Response not inserted')
+                }
+
+                return h
+                    .response({
+                        ok: true,
+                        handler: pluginConfig.handlerType,
+                        data: insertedResponse,
+                    })
+                    .code(200)
+            } catch (err) {
+                return h
+                    .response({
+                        ok: false,
+                        handler: pluginConfig.handlerType,
+                        data: { error: `${err}` },
+                    })
+                    .code(409)
+            }
+        },
+
+        /** Validate based on validators object */
+        validate: {
+            failAction: 'log',
+        },
+
+        /** Validate the server response */
+        response: {
+            status: {
+                200: apiSchema.single
+                    .append({
+                        data: responseSchemas.response,
+                    })
+                    .label('response_list_res'),
+                409: apiSchema.single
+                    .append({
+                        data: responseSchemas.error,
+                    })
+                    .label('error_single_res'),
+            },
+        },
+    },
+}

backend/lib/routes/profile/queue.js

@@ -23,7 +23,11 @@ const responseSchemas = {
 
 const validators = {
     params: params.profileId,
-    query: params.profileInclude,
+    query: Joi.object({
+        include_profile: Joi.bool(),
+        limit: Joi.number(),
+        offset: Joi.number(),
+    }),
 }
 
 module.exports = {
@@ -37,18 +41,16 @@ module.exports = {
         cors: true,
         handler: async function (request, h) {
             const { profile_id } = request.params
-            const { include_profile } = request.query
+            const { limit, offset } = request.query
             const { profileService, matchQueueService } =
                 request.server.services()
 
-            const queue = await matchQueueService.getQueue(profile_id)
+            const queue = await matchQueueService.getQueue(
+                profile_id,
+                limit,
+                offset,
+            )
             const queueIds = queue.map(entry => entry.target_id)
-            // console.log('queueIds', queueIds)
-            const res = {
-                ok: true,
-                handler: pluginConfig.handlerType,
-                data: queueIds,
-            }
 
             // HELP: I think there's an issue here
             // queueIds spits out the queue profiles in the correct order
@@ -58,15 +60,17 @@ module.exports = {
             //     'include_profile results',
             //     await profileService.getProfilesFor(queueIds),
             // )
-            if (include_profile) {
-                res.data = await profileService.getProfilesFor(
-                    queueIds,
-                    'participant',
-                    false,
-                )
-            }
             try {
-                return h.response(res).code(200)
+                return h
+                    .response({
+                        ok: true,
+                        handler: pluginConfig.handlerType,
+                        data: await profileService.getProfilesFor(
+                            queueIds,
+                            'participant',
+                        ),
+                    })
+                    .code(200)
             } catch (err) {
                 return h
                     .response({

backend/lib/routes/profile/score.js

@@ -53,11 +53,17 @@ module.exports = {
             const distanceUnit = request.query.unit
                 ? request.query.unit
                 : 'mile'
+            const duration = request.query.duration
+            const presence = request.query.presence
+            const certifications = request.query.certifications
 
             const scoredProfiles = await profileService.scoreProfilesFor(
                 profileId,
                 maxDistanceMiles,
                 distanceUnit,
+                duration,
+                presence,
+                certifications,
             )
             try {
                 if (!scoredProfiles) {

backend/lib/routes/user/create-profile.js

@@ -67,10 +67,14 @@ module.exports = {
                 }
                 /** Grab payload info */
                 const res = request.payload
+                /** Don't log password in response table */
+                const resWithoutPass = res.filter(r => {
+                    return r.response_key_id !== 9
+                })
                 const profile =
                     await profileService.saveResponsesCreateProfileFor(
                         userId,
-                        res,
+                        resWithoutPass,
                     )
                 return h
                     .response({

backend/lib/routes/user/email.js

@@ -0,0 +1,72 @@
+'use strict'
+
+const Joi = require('joi')
+
+const pluginConfig = {
+    handlerType: 'email',
+    docs: {
+        get: {
+            description: 'sends confirmation email',
+            notes: 'Stores the email in memory in a hash and sends confirmation email for signup',
+        },
+    },
+}
+
+module.exports = {
+    method: 'POST',
+    path: '/sendemail/',
+    options: {
+        ...pluginConfig.docs.get,
+        tags: ['api'],
+        auth: false,
+        cors: true,
+        handler: async function (request, h) {
+            const { userService } = request.server.services()
+            const userCredentials = request.payload
+            try {
+                const emailSent = await userService.emailSent(userCredentials)
+                const hashedAccessToken = Object.keys(
+                    userService.activeSessions,
+                ).find(hashedToken => {
+                    return (
+                        userService.activeSessions[`${hashedToken}`].email ===
+                        userCredentials.email
+                    )
+                })
+                // Registers the activeSessions object for use by jwt auth strategy
+                request.server.app.activeSessions = userService.activeSessions
+                if (!hashedAccessToken.length) {
+                    throw Error('hashedAccessToken not Found!!')
+                }
+                return {
+                    ok: true,
+                    handler: pluginConfig.handlerType,
+                    data: {
+                        emailSentSuccessfully: emailSent.wasSuccessfull,
+                        hashedAccessToken: hashedAccessToken,
+                    },
+                }
+            } catch (err) {
+                console.log('err :=>', err)
+                return {
+                    ok: false,
+                    handler: pluginConfig.handlerType,
+                    data: {
+                        error: err,
+                    },
+                }
+            }
+        },
+        validate: {
+            failAction: 'log',
+        },
+        response: {
+            schema: Joi.object({
+                ok: Joi.bool(),
+                handler: Joi.string(),
+                data: Joi.object(),
+            }).label('email_res'),
+            failAction: 'log',
+        },
+    },
+}

backend/lib/routes/user/getaccess.js

@@ -0,0 +1,58 @@
+'use strict'
+
+const Joi = require('joi')
+
+const pluginConfig = {
+    handlerType: 'authentication',
+    docs: {
+        get: {
+            description: 'gets session token for authentication',
+            notes: 'Gets session token for authentication',
+        },
+    },
+}
+
+module.exports = {
+    method: 'POST',
+    path: '/getaccess',
+    options: {
+        ...pluginConfig.docs.get,
+        tags: ['api'],
+        auth: false,
+        cors: {
+            headers: ['Authorization', 'Content-Type'],
+            exposedHeaders: ['Authorization', 'Access-Control-Expose-Headers'],
+        },
+        handler: async function (request, h) {
+            const { userService } = request.server.services()
+            const res = request.payload
+            // NOTE: Access Token set for 5 minutes expiration (default)
+            const accessToken = await userService.createToken(res, 600)
+            try {
+                const response = h.response({
+                    ok: true,
+                    handler: pluginConfig.handlerType,
+                    data: accessToken,
+                })
+                response.header('Authorization', accessToken)
+                return response
+            } catch (err) {
+                return {
+                    ok: false,
+                    handler: pluginConfig.handlerType,
+                    data: {
+                        error: err,
+                    },
+                }
+            }
+        },
+        validate: {
+            failAction: 'log',
+        },
+        response: {
+            // TODO: change back to accommodate new h.response return values
+            schema: Joi.any().label('get_session_res'),
+            failAction: 'log',
+        },
+    },
+}

backend/lib/routes/user/list-profiles.js

@@ -37,8 +37,7 @@ module.exports = {
     options: {
         ...pluginConfig.docs,
         tags: ['api'],
-        /** Protect this route with authentication? */
-        auth: false,
+        auth: 'default_jwt',
         cors: true,
         handler: async function (request, h) {
             const { userService, profileService } = request.server.services()

backend/lib/routes/user/signup.js

@@ -30,6 +30,9 @@ const responseSchemas = {
     error: errorSchema.single,
 }
 
+// Brevo logic will go here,
+// send Brevo email with link that has jwt in it?
+
 module.exports = {
     method: 'POST',
     path: '/signup',
@@ -56,7 +59,7 @@ module.exports = {
                         is_admin: 0,
                         is_verified: 0,
                     },
-                    created_at: Date.now()
+                    created_at: Date.now(),
                 })
                 return h
                     .response({
@@ -66,6 +69,7 @@ module.exports = {
                     })
                     .code(201)
             } catch (err) {
+                console.error('ERROR :=>', err)
                 return h
                     .response({
                         ok: false,

backend/lib/routes/user/validatesession.js

@@ -0,0 +1,79 @@
+'use strict'
+
+const { plugin } = require('@hapi/inert')
+const Joi = require('joi')
+
+const pluginConfig = {
+    handlerType: 'jwt',
+    docs: {
+        get: {
+            description: 'validates session token for each step of survey',
+            notes: 'validates session token for each step of survey',
+        },
+    },
+}
+
+module.exports = {
+    method: 'POST',
+    path: '/validatesession',
+    options: {
+        ...pluginConfig.docs.get,
+        tags: ['api'],
+        auth: false,
+        cors: {
+            headers: ['Authorization', 'Content-Type'],
+            exposedHeaders: ['Authorization', 'Access-Control-Expose-Headers'],
+        },
+        handler: async function (request, h) {
+            const hashedAccessToken = request.payload
+            const { userService, profileService } = request.server.services()
+            try {
+                const validatedSessionToken =
+                    userService.validateSession(hashedAccessToken)
+                const user = await userService.findByUserEmail(
+                    validatedSessionToken.email,
+                )
+                const type = user.is_poster == 1 ? 'poster' : 'seeker'
+                const profiles = await profileService.getCompleteProfilesFor(
+                    user.user_id,
+                    type,
+                )
+                // TODO: handle user with multiple profiles...
+                const profileId = profiles[0].profile_id
+                const responses = []
+                profiles[0].responses.forEach(response => {
+                    responses.push({
+                        response_key_id: response.response_key_id,
+                        val: response.val,
+                    })
+                })
+                return {
+                    ok: true,
+                    handler: pluginConfig.handlerType,
+                    data: {
+                        ...validatedSessionToken,
+                        profileId: profileId,
+                        responses: responses,
+                    },
+                }
+            } catch (err) {
+                return {
+                    ok: false,
+                    handler: pluginConfig.handlerType,
+                    data: { error: err.message },
+                }
+            }
+        },
+        validate: {
+            failAction: 'log',
+        },
+        response: {
+            schema: Joi.object({
+                ok: Joi.bool(),
+                handler: Joi.string(),
+                data: Joi.object(),
+            }).label('validate_session_res'),
+            failAction: 'log',
+        },
+    },
+}

backend/lib/routes/user/verifyactivesession.js

@@ -0,0 +1,78 @@
+'use strict'
+
+const Joi = require('joi')
+
+const pluginConfig = {
+    handlerType: 'email',
+    docs: {
+        get: {
+            description: 'verifies confirmation email',
+            notes: 'Verifies the email from the stored hash',
+        },
+    },
+}
+
+module.exports = {
+    method: 'GET',
+    path: '/verify/{hashedSessionToken}',
+    options: {
+        ...pluginConfig.docs.get,
+        tags: ['api'],
+        auth: false,
+        cors: true,
+        handler: async function (request, h) {
+            const { userService } = request.server.services()
+            const hash = request.params.hashedSessionToken
+            try {
+                const hashToMatch = Object.keys(
+                    userService.activeSessions,
+                ).find(hashedToken => {
+                    return hashedToken === hash
+                })
+                if (!hashToMatch.length) {
+                    throw Error('hashToMatch Not Found!')
+                }
+                const now = Date.now()
+                const expiration = new Date(
+                    userService.activeSessions[`${hash}`].expiration,
+                )
+                if (now > expiration) {
+                    delete userService.activeSessions[hashToMatch]
+                    throw new Error(
+                        'you took to long to respond to the email...',
+                    )
+                }
+                if (!hashToMatch) {
+                    throw new Error('no record of email in cache')
+                }
+                return {
+                    ok: true,
+                    handler: pluginConfig.handlerType,
+                    data: {
+                        hashesMatch: hashToMatch === hash,
+                    },
+                }
+            } catch (err) {
+                console.log('err :=>', err)
+                return {
+                    ok: false,
+                    handler: pluginConfig.handlerType,
+                    data: {
+                        error: err,
+                    },
+                }
+            }
+        },
+        validate: {
+            failAction: 'log',
+        },
+        response: {
+            schema: Joi.object({
+                ok: Joi.bool(),
+                handler: Joi.string(),
+                data: Joi.object(),
+            }).label('verify_email_res'),
+            failAction: 'log',
+        },
+    },
+}

backend/lib/schemas/profiles.js

@@ -13,6 +13,8 @@ const singleProfile = Joi.object({
     responses: surveyResponseSchema.list,
     reveal: Joi.array().items(),
     tags: tagSchema.list,
+    media: Joi.any(),
+    blurb: Joi.any(),
     user_type: Joi.any(),
     user: userSchema.single,
     profile_description: Joi.string().allow(null, ''),

backend/lib/schemas/responses.js

@@ -14,6 +14,11 @@ const singleResponseKey = Joi.object({
     response_key_category: Joi.string().required(),
     response_key_prompt: Joi.string().required(),
     response_key_description: Joi.any(),
+    aspect: Joi.string().allow(null, ''),
+    category: Joi.string().allow(null, ''),
+    placeholder: Joi.string().allow(null, ''),
+    invalidInputPrompt: Joi.string().allow(null, ''),
+
 }).label('question_single')
 
 module.exports = {

backend/lib/services/filter.js

@@ -0,0 +1,48 @@
+const zipcoder = require ('./profile/zipcoder')
+
+const byProfileType = (profileList, userProfile) => {
+    const isUserOpposite = userProfile.is_poster == 1 ? 0 : 1
+    return profileList.filter(profile => (profile.user.is_poster == isUserOpposite))
+}
+const byNullZip = (profileList) => {
+    return profileList.filter(profile => {
+        return zipcoder.getZipCodeFromProfile(profile) ? true : false
+    })
+}
+const byMaxDistance = (profileList, max) => {
+    return profileList.filter(profile => {
+        const profileDistance = Math.floor(parseFloat(profile.distance) * 100)
+        const adjustedMaxDistance = Math.floor(parseFloat(max) * 100)
+        return profileDistance <= adjustedMaxDistance
+    })
+}
+
+const byDuration = (profileList, duration) => {
+    return profileList.filter(profile => {
+        // TODO find duration 
+        return profile.duration == duration
+    })
+}
+
+const byPresence = (profileList, presence) => {
+    return profileList.filter(profile => {
+        // TODO find presence 
+        return profile.presence == presence
+    })
+}
+
+const byCertifications = (profileList, certifications) => {
+    return profileList.filter(profile => {
+        // TODO find certifications 
+        return profile.certifications == certifications
+    })
+}
+
+module.exports = {
+    byProfileType,
+    byNullZip,
+    byMaxDistance,
+    byDuration,
+    byPresence,
+    byCertifications,
+}

backend/lib/services/matchqueue.js

@@ -9,12 +9,19 @@ module.exports = class MatchQueueService extends Schmervice.Service {
      * @param {number} profileId
      * @returns {array} MatchQueue
      */
-    async getQueue(profileId) {
+    async getQueue(profileId, limit, offset=0) {
         const { MatchQueue } = this.server.models()
+        if(typeof limit==='undefined') {
+            return await MatchQueue.query()
+                .where('profile_id', profileId)
+                .where('is_deleted', 0)
+        }
 
         return await MatchQueue.query()
             .where('profile_id', profileId)
             .where('is_deleted', 0)
+            .limit(limit)
+            .offset(offset)
     }
     /**
      * Returns queues by profile id by user type

backend/lib/services/profile/index.js

@@ -4,7 +4,7 @@ const config = require('../../../db/data-generator/config.json')
 const profiler = require('./profiler')
 const scoring = require('./scorer')
 const zipcoder = require('./zipcoder')
-const tagger = require('./tagger')
+const filter = require('../filter')
 
 module.exports = class ProfileService extends Schmervice.Service {
     constructor(...args) {
@@ -24,15 +24,14 @@ module.exports = class ProfileService extends Schmervice.Service {
         }
     }
     async _setTagLookup() {
-        if (!Object.keys(this.tagLookup).length) {
-            const { Tag } = this.server.models()
-            const allTagDescriptions = await Tag.query()
-            allTagDescriptions.forEach(desc => {
-                if (desc.is_active) {
-                    this.tagLookup[desc.tag_id] = desc
-                }
-            })
-        }
+        /** Grab tag descriptions if they do NOT exist: Needed once per app load */
+        if (Object.keys(this.tagLookup).length) return
+        const { Tag } = this.server.models()
+        const allTagDescriptions = await Tag.query()
+        allTagDescriptions.forEach(desc => {
+            if (!desc.is_active) return
+            this.tagLookup[desc.tag_id] = desc
+        })
     }
     /**
      * Internal method to get list of profile_ids for this user
@@ -52,20 +51,38 @@ module.exports = class ProfileService extends Schmervice.Service {
         return [...new Set(profileIdsToGrab)]
     }
 
+    /**
+     * Convert indexes to actual score values
+     * Using using the input and converting to index
+     * of the generated possible prescore array in config
+     */
+    _convertResponse(responseToSave) {
+        if (scoring._isScorableResponse(responseToSave.response_key_id)) {
+            // Convert -3 to 0, 0 to 3, 3 to 6
+            const offset = (config.scoreVals.length - 1) / 2
+            const scoreFromInput = parseInt(responseToSave.val) + offset
+            const scoreFromConfig = config.scoreVals.indexOf(scoreFromInput)
+            if (scoreFromConfig < 0) {
+                console.error('score not found in possible config responses')
+            }
+            responseToSave.val = scoreFromConfig.toString()
+        }
+        return responseToSave
+    }
+
     async getProfile(profileId) {
         const { Profile } = this.server.models()
         await this._setTagLookup()
-
         const matchingProfile = await Profile.query()
             .where('profile_id', profileId)
             .first()
             .withGraphFetched('tags')
             .withGraphFetched('responses')
             .withGraphFetched('user')
-
-        tagger.setProfileTags(matchingProfile, matchingProfile, this.tagLookup)
-        const complete = new profiler.CompleteProfile(matchingProfile)
-        return complete
+        matchingProfile.tags = matchingProfile.tags.map(
+            tag => this.tagLookup[tag.tag_id],
+        )
+        return new profiler.CompleteProfile(matchingProfile)
     }
 
     async getCompleteProfilesFor(userId, type) {
@@ -78,23 +95,21 @@ module.exports = class ProfileService extends Schmervice.Service {
             .whereIn('profile_id', dedupedProfileIds)
             .withGraphFetched('tags')
             .withGraphFetched('responses')
-            // CHECKTHIS: Added this because we added user.user_name to CompleteProfile
-            // so without this, we get undefined user_name
             .withGraphFetched('user')
 
-        return profiler.makeCompleteProfilesFromProfile(
+        return profiler.makeCompleteFromProfileEntries(
             profilesEntries,
             type,
             this.tagLookup,
         )
     }
 
-    async getProfilesFor(profileIdArray, type, includeResponses = true) {
+    async getProfilesFor(profileIdArray, type) {
         const { Profile } = this.server.models()
         await this._setScoreLookup()
         await this._setTagLookup()
 
-        // profilesEntries is profiles in dataaspect_labelsbase row order
+        // profilesEntries is profiles in database row order
         const profilesEntries = await Profile.query()
             .whereIn('profile_id', profileIdArray)
             .withGraphFetched('tags')
@@ -104,11 +119,10 @@ module.exports = class ProfileService extends Schmervice.Service {
         // taking the info from profilesEntries
         // to repack into completeProfiles
         // in same order as profileIdArray
-        return profiler.makeCompleteProfiles(
+        return profiler.makeOrderedCompleteProfiles(
             profileIdArray,
             profilesEntries,
             type,
-            includeResponses,
             this.tagLookup,
         )
     }
@@ -121,35 +135,24 @@ module.exports = class ProfileService extends Schmervice.Service {
      */
     async saveResponsesCreateProfileFor(userId, responses, txn) {
         const { Profile, Response } = this.server.models()
-
-        const profile = await Profile.query(txn).insert({
-            user_id: userId,
-        })
-        for (const responseToSave of responses) {
-            /**
-             * Convert indexes to actual score values
-             * Using using the input and converting to index
-             * of the generated possible prescore array in config
-             * DUPLICATE:See saveResponseForProfile() line 343
-             */
-            let convertedResponse = responseToSave
-            if (scoring._isScorableResponse(responseToSave.response_key_id)) {
-                // Convert -3 to 0, 0 to 3, 3 to 6
-                const offset = (config.scoreVals.length - 1) / 2
-                const indexFromInput = parseInt(responseToSave.val) + offset
-                convertedResponse.val =
-                    config.scoreVals[indexFromInput].toString()
-            }
-
-            const responseInfo = {
-                profile_id: profile.id,
-                response_key_id: convertedResponse.response_key_id,
-                val: convertedResponse.val,
+        try {
+            const profile = await Profile.query(txn).insert({
+                user_id: userId,
+            })
+            for (const responseToSave of responses) {
+                const convertedResponse = this._convertResponse(responseToSave)
+                const responseInfo = {
+                    profile_id: profile.id,
+                    response_key_id: convertedResponse.response_key_id,
+                    val: convertedResponse.val,
+                }
+                await Response.query(txn).insert(responseInfo)
             }
-            await Response.query(txn).insert(responseInfo)
+            //** Work around for HAPI returning profile_id as id */
+            return { user_id: profile.user_id, profile_id: profile.id }
+        } catch (err) {
+            throw new Error(err)
         }
-        //** Work around for HAPI returning profile_id as id */
-        return { user_id: profile.user_id, profile_id: profile.id }
     }
 
     /** Update responses in place
@@ -179,6 +182,14 @@ module.exports = class ProfileService extends Schmervice.Service {
         })
     }
 
+    async insertSingleResponseForProfile(responseToSave) {
+        const { Response } = this.server.models()
+        const convertedResponse = this._convertResponse(responseToSave)
+        const savedResponse = await Response.query().insert(convertedResponse)
+        delete savedResponse.id
+        return savedResponse
+    }
+
     /** Add response
      * @param {Object} response to save
      * @returns {null} updated responses
@@ -205,24 +216,7 @@ module.exports = class ProfileService extends Schmervice.Service {
                 .delete()
                 .whereIn('response_key_id', alreadyAnswered)
         }
-
-        /**
-         * Convert indexes to actual score values
-         * Using using the input and converting to index
-         * of the generated possible prescore array in config
-         */
-        let convertedResponse = responseToSave
-        if (scoring._isScorableResponse(responseToSave.response_key_id)) {
-            // Convert -3 to 0, 0 to 3, 3 to 6
-            const offset = (config.scoreVals.length - 1) / 2
-            const scoreFromInput = parseInt(responseToSave.val) + offset
-            const scoreFromConfig = config.scoreVals.indexOf(scoreFromInput)
-            if (scoreFromConfig < 0) {
-                console.error('score not found in possible config responses')
-            }
-            convertedResponse.val = scoreFromConfig.toString()
-        }
-
+        const convertedResponse = this._convertResponse(responseToSave)
         await Response.query().insert(convertedResponse)
         return allResponses
     }
@@ -249,7 +243,14 @@ module.exports = class ProfileService extends Schmervice.Service {
      * @param {number} profileId
      * @returns {Array} Ordered and scored Profiles
      */
-    async scoreProfilesFor(profileId, maxDistance, distanceUnit) {
+    async scoreProfilesFor(
+        profileId,
+        maxDistance,
+        distanceUnit,
+        duration,
+        presence,
+        certifications,
+    ) {
         const { Profile } = this.server.models()
 
         await this._setScoreLookup()
@@ -260,29 +261,41 @@ module.exports = class ProfileService extends Schmervice.Service {
             .withGraphFetched('responses')
             .withGraphFetched('user')
 
-        // Move unneeded responses
         const userZip = zipcoder.getZipCodeFromProfile(userProfile)
 
-        // Find all Profiles that are NOT of our userProfile.type
-        // ie. If userProfile.type == seeker, then find: poster
-        let profileIdsOfOppositeType = await Profile.query()
+        // preprocess potential match pool with filter service methods
+        let matchPool = await Profile.query()
             .withGraphFetched('responses')
             .withGraphFetched('user')
-        // TODO: Let Objection optimize this
-        const isPosterOpposite = userProfile.user.is_poster == 1 ? 0 : 1
-        profileIdsOfOppositeType = profileIdsOfOppositeType
-            .filter(profile => {
-                return profile.user.is_poster == isPosterOpposite
-            })
-            .filter(profile => {
-                // Only include profiles that included zipcode response
-                return zipcoder.getZipCodeFromProfile(profile) ? true : false
-            })
 
-        const profilePlusDistance = await Promise.all(
-            profileIdsOfOppositeType.map(async profile => {
-                const targetZip = zipcoder.getZipCodeFromProfile(profile)
+        matchPool = filter.byProfileType(matchPool, userProfile.user)
+        matchPool = filter.byNullZip(matchPool)
+        // attach distance to pool profiles for max distance filter
+        matchPool = await this.calcProfileDistances(
+            matchPool,
+            distanceUnit,
+            userZip,
+        )
+        matchPool = filter.byMaxDistance(matchPool, maxDistance)
+        matchPool = filter.byDuration(matchPool, duration)
+        matchPool = filter.byPresence(matchPool, presence)
+        matchPool = filter.byCertifications(matchPool, certifications)
 
+        const scoredProfilesWithDistance = scoring.scoreAll(
+            matchPool,
+            userProfile,
+            this.scoreLookup,
+        )
+        // Order by score
+        return scoredProfilesWithDistance.sort(
+            (a, b) => b.score.total - a.score.total,
+        )
+    }
+
+    async calcProfileDistances(matchPool, distanceUnit, userZip) {
+        await Promise.all(
+            matchPool.map(async profile => {
+                const targetZip = zipcoder.getZipCodeFromProfile(profile)
                 if (!userZip || !targetZip)
                     return { ...profile, distance: [9999, distanceUnit] }
 
@@ -297,20 +310,6 @@ module.exports = class ProfileService extends Schmervice.Service {
                 }
             }),
         )
-
-        const distanceFilteredProfiles = zipcoder.filterByDistance(
-            profilePlusDistance,
-            maxDistance,
-        )
-        const scoredProfilesWithDistance = scoring.scoreAll(
-            distanceFilteredProfiles,
-            userProfile,
-            this.scoreLookup,
-        )
-        // Order by score
-        return scoredProfilesWithDistance.sort(
-            (a, b) => b.score.total - a.score.total,
-        )
     }
 
     /**
@@ -371,10 +370,26 @@ module.exports = class ProfileService extends Schmervice.Service {
                     : true
             })
     }
+
+    /**
+     * Use the db to grab tag associations
+     * by profile, grouping, tag, and insert
+     * it if it already exists
+     * @param {object} association
+     */
     async revealProfileInfo(association) {
         const { TagAssociation } = this.server.models()
-        await TagAssociation.query().insert(association)
 
-        return await this.getTagsFor(association.profile_id)
+        const existingAssociations = await TagAssociation.query()
+            .where('profile_id', `${association.profile_id}`)
+            .where('grouping_id', `${association.grouping_id}`)
+            .where('tag_id', `${association.tag_id}`)
+            .where('is_deleted', 0)
+        if (!existingAssociations.length) {
+            await TagAssociation.query().insert(association)
+            return await this.getTagsFor(association.profile_id)
+        } else {
+            return console.error('ERROR =>: tag association already exists')
+        }
     }
 }

backend/lib/services/profile/profiler.js

@@ -1,5 +1,18 @@
 const config = require('../../../db/data-generator/config.json')
-const tagger = require('./tagger')
+
+/**
+ * Unscored preferences used for filtering
+ * Does NOT include blurb, media languages
+ */
+const unscoredProfilePreferences = [
+    'zipcode',
+    'duration',
+    'presence',
+    'urgency',
+    'pronouns',
+    'distance',
+]
+const otherProfileInfo = ['blurb', 'media', 'lang']
 
 /**
  * Class to hold our retrieved profile information
@@ -7,96 +20,98 @@ const tagger = require('./tagger')
  * !: This needs to match the responseSchema in profiles.js
  */
 class CompleteProfile {
-    constructor(profile, type, includeResponses = false) {
+    constructor(profile, type) {
         this.user_id = profile.user_id // int user_id
         this.profile_id = profile.profile_id // int profile_id
-        this.user_name = profile.user.user_name // string user_name
-        this.user_email = profile.user.user_email
-        this.responses = []
+        this.responses = profile.responses
         this.user_type = type
-        this.tags = profile.tags.filter(t => t.tag_category != 'reveal')
-
-        // TODO: generalize this for multiple images, and languages
-        this.profile_description = ''
+        this.blurb = ''
         this.profile_media = []
         this.profile_languages = []
-        this.profile_prefs = {}
-
-        // TODO: Use reveal tags to add or remove information from profile!
-        // TODO: ---
-        // TODO: Use reveal tags to rebuild profile based on group/membership
-        // TODO: and include for certain profiles
+        this.profile_prefs = this.getPrefsFromResponses(this.responses)
 
-        this.reveal = profile.tags.filter(t => t.category == 'reveal')
-        // TODO: filter these correctly
-        if (profile?.responses?.length && includeResponses) {
-            // [] of all "profile" responses
-            this.responses = profile.responses
-            // image, language, duration, presence, blurb, urgency, role, pronouns, distance
-            const prefs = [
-                'zipcode',
-                'duration',
-                'presence',
-                'urgency',
-                'role',
-                'pronouns',
-                'distance',
-            ]
-            const prefsKeys = config.prefKeys
-            prefs.forEach((pref, i) => {
-                this.profile_prefs[pref] = this.responses.filter(
-                    r => r.response_key_id === prefsKeys[i],
-                )[0]
-            })
-            this.profile_description = this.responses
-                .filter(r => r.response_key_id === config.blurbKey)
-                .map(r => r.val)[0]
-            this.profile_media = this.responses
-                .filter(r => r.response_key_id === config.mediaKey)
-                .map(r => r.val)
-            this.profile_languages = this.responses
-                .filter(r => r.response_key_id === config.langKey)
-                .map(r => r.val)
-        }
+        otherProfileInfo.forEach(prefName => {
+            if (prefName == 'blurb') {
+                const blurbRes = this.responses.find(
+                    r => r.response_key_id === config.blurbKey,
+                )
+                this.profile_description = blurbRes ? blurbRes.val : ''
+            } else if (['media', 'lang'].includes(prefName)) {
+                const key =
+                    prefName == 'media'
+                        ? `profile_${prefName}`
+                        : [`profile_${prefName}uages`]
+                const resForKey = this.responses.filter(
+                    r => r.response_key_id === config[`${prefName}Key`],
+                )
+                this[key] = resForKey.length ? resForKey.map(r => r.val) : []
+            }
+        })
+        // TODO: These should be getters
+        this.user_name = 'bleh'
+        this.user_email = 'bleh@bleh.com'
+        this.reveal = profile.tags.filter(t => t.tag_category == 'reveal')
+        this.tags = profile.tags.filter(t => t.tag_category !== 'reveal')
+    }
+    /** Map pref name to dB key associated with preference */
+    get byPrefName() {
+        return unscoredProfilePreferences.reduce((byPref, prefName) => {
+            byPref[prefName] = this.responses.find(
+                r => config[`${prefName}Key`] == r.response_key_id,
+            )?.val
+            return byPref
+        }, {})
+    }
+    getPrefsFromResponses(responses) {
+        if (!responses.length) return
+        const prefs = {}
+        unscoredProfilePreferences.forEach(prefName => {
+            prefs[prefName] = this.byPrefName[prefName]
+        })
+        return prefs
     }
 }
+const _makeCompleteProfile = (profileEntry, type, tagLookup) => {
+    profileEntry.tags = profileEntry.tags.map(tag => tagLookup[tag.tag_id])
+    const complete = new CompleteProfile(profileEntry, type)
+    return complete
+}
 
-const makeCompleteProfiles = (
-    profileIdArray,
+/**
+ * Get complete profiles and return in order
+ * @param {Array} orderedProfileIds
+ * @param {Array} profilesEntries
+ * @param {String} type
+ * @param {Object} tagLookup
+ * @returns {Array}
+ */
+const makeOrderedCompleteProfiles = (
+    orderedProfileIds,
     profilesEntries,
     type,
-    includeResponses,
     tagLookup,
 ) => {
-    const completeProfiles = []
-    profileIdArray.forEach(pid => {
-        profilesEntries.forEach(entry => {
-            if (entry.profile_id == pid) {
-                const complete = new CompleteProfile(
-                    entry,
-                    type,
-                    includeResponses,
-                )
-                tagger.setProfileTags(entry, complete, tagLookup)
-                completeProfiles.push(complete)
-            }
-        })
+    return orderedProfileIds.map(pid => {
+        const found = profilesEntries.find(entry => entry.profile_id == pid)
+        return _makeCompleteProfile(found, type, tagLookup)
     })
-    return completeProfiles
 }
-const makeCompleteProfilesFromProfile = (profilesEntries, type, tagLookup) => {
-    profilesEntries.forEach(profile => {
-        tagger.setProfileTags(profile, profile, tagLookup)
-    })
 
-    //** Get responses asociated with each profile_id */
-    return profilesEntries.map(profile => {
-        return new CompleteProfile(profile, type)
-    })
+/**
+ * Get complete profiles from dB rows
+ * @param {Array} profilesEntries
+ * @param {String} type
+ * @param {Object} tagLookup
+ * @returns {Array}
+ */
+const makeCompleteFromProfileEntries = (profilesEntries, type, tagLookup) => {
+    return profilesEntries.map(entry =>
+        _makeCompleteProfile(entry, type, tagLookup),
+    )
 }
 
 module.exports = {
     CompleteProfile,
-    makeCompleteProfiles,
-    makeCompleteProfilesFromProfile,
+    makeOrderedCompleteProfiles,
+    makeCompleteFromProfileEntries,
 }

backend/lib/services/profile/scorer.js

@@ -18,13 +18,8 @@ const makeScoreLookup = (aspects, labels) => {
     return scoreLookup
 }
 
-const _isScorableResponse = res_key_id => {
-    let isScorable = false
-    if (config.resKeys.includes(res_key_id)) {
-        isScorable = true
-    }
-    return isScorable
-}
+const _isScorableResponse = res_key_id =>
+    config.scoreKeys.includes(res_key_id) ? true : false
 
 const scoreResponses = (seeker, potentialMatch, prescoreLookup) => {
     if (seeker.responses.length != potentialMatch.responses.length)

backend/lib/services/profile/tagger.js

@@ -1,7 +0,0 @@
-const setProfileTags = (inProfile, outProfile, tagLookup) => {
-    outProfile.tags = inProfile.tags.map(tag => tagLookup[tag.tag_id])
-}
-
-module.exports = {
-    setProfileTags,
-}

backend/lib/services/profile/zipcoder.js

@@ -11,15 +11,6 @@ const getZipCodeFromProfile = profile => {
     return zipRes.val
 }
 
-const filterByDistance = (profileList, max) => {
-    return profileList.filter(profile => {
-        const profileDistance = Math.floor(parseFloat(profile.distance) * 100)
-        const adjustedMaxDistance = Math.floor(parseFloat(max) * 100)
-        return profileDistance <= adjustedMaxDistance
-    })
-}
-
 module.exports = {
     getZipCodeFromProfile,
-    filterByDistance,
 }

backend/lib/services/user.js

@@ -1,10 +1,29 @@
 'use strict'
 require('dotenv').config()
+const crypto = require('crypto')
 const Util = require('util')
-const Jwt = require('@hapi/jwt')
+const JWT = require('jsonwebtoken')
 const Schmervice = require('@hapipal/schmervice')
 const SecurePassword = require('secure-password')
 
+// Configuration for Brevo
+const SibApiV3Sdk = require('sib-api-v3-sdk')
+const { access, accessSync } = require('fs')
+const defaultClient = SibApiV3Sdk.ApiClient.instance
+const apiKey = defaultClient.authentications['api-key']
+apiKey.apiKey = process.env.BREVO_KEY
+
+const apiInstance = new SibApiV3Sdk.TransactionalEmailsApi()
+
+const hashToken = async token => {
+    const salt = process.env.APP_SESSION_SALT
+    try {
+        return crypto.createHmac('sha256', salt).update(token).digest('hex')
+    } catch (err) {
+        throw new Error(err.message)
+    }
+}
+
 const hasher = async (pwd, steak) => {
     const hash = await pwd.hash(steak)
     const result = await pwd.verify(steak, hash)
@@ -24,7 +43,8 @@ const hasher = async (pwd, steak) => {
             try {
                 squirtle = await pwd.hash(steak)
                 // console.log('improvedHash', squirtle)
-                // const saveHash = Auth.insert({user_email: matchingEmails}, ).into('token')
+                // const saveHash = Auth.insert({user_email:
+                // matchingEmails}).into('token')
                 return squirtle
             } catch (err) {
                 console.error(
@@ -44,6 +64,27 @@ module.exports = class UserService extends Schmervice.Service {
     constructor(...args) {
         super(...args)
         const pwd = new SecurePassword()
+        // TODO: Invalidate this application state somehow after a
+        // certain time period has passed
+        this.activeSessions = {
+            // abc123456: '123456689',
+            // eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9...hashedSessionToken: {
+            // email: rawEmailString,
+            // name: 'Joe Doe',
+            // seeking: 'candidate'
+            // sessionToken: rawSessionToken, // use for expires instead of expires?
+            // expires: expirationTime in seconds
+            // }
+        }
+        // Check the hashedCookie which is our hashedSessionToken string
+        // validate whether or not the rawAccessToken is still valid, if valid good to go.
+        // if NOT valid, then we need to reassign accessToken to a newAccessToken
+        // this.activeSessions = {
+        // eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9...hashedSessionToken: {
+        // accessToken: 'as;dflkja;;dlfkja;sldkf... rawAccessToken'
+        // }
+        // }
+
         this.pwd = {
             hash: Util.promisify(pwd.hash.bind(pwd)),
             verify: Util.promisify(pwd.verify.bind(pwd)),
@@ -80,6 +121,21 @@ module.exports = class UserService extends Schmervice.Service {
             .where({ user_name: username })
     }
 
+    /**
+     * Use to find first user with useremail
+     * @param {*} username
+     * @param {*} txn
+     * @returns
+     */
+    async findByUserEmail(userEmail, txn) {
+        const { User } = this.server.models()
+        const user = await User.query(txn)
+            .throwIfNotFound()
+            .first()
+            .where({ user_email: userEmail })
+        return user
+    }
+
     /**
      * Signup function
      * @param {*} param0
@@ -168,28 +224,49 @@ module.exports = class UserService extends Schmervice.Service {
 
     /**
      * Create a token to be sent in request headers
-     * @param {User} user
+     * @param {data, expiration}
      * @returns {Token}
      */
-    createToken(user) {
+    createToken(data, expiration = 600) {
         const key = this.server.registrations['main-app-plugin'].options.jwtKey
-
-        return Jwt.token.generate(
-            {
-                aud: 'urn:audience:test',
-                iss: 'urn:issuer:test',
-                email: user.user_email,
-            },
-            {
-                key: key,
-                algorithm: 'HS256',
-            },
-            {
-                ttlSec: 4 * 60 * 60, // 7 days
-            },
-        )
+        const obj = {}
+        Object.assign(obj, { ...data })
+        return JWT.sign(obj, key, { expiresIn: expiration })
     }
 
+    /**
+     * Validates whether a token has expired or not
+     * @param {User} user
+     * @returns {Token}
+     */
+    validateToken(token) {
+        const key = this.server.registrations['main-app-plugin'].options.jwtKey
+        try {
+            return JWT.verify(token, key)
+        } catch (err) {
+            return { payload: null, message: err.message }
+        }
+    }
+    /**
+     * Uses this.validateToken() to verify hashedSessionToken's
+     * existence, expiry, and also valdiates accessToken
+     * @param {HashedSessionToken} hashedSessionToken
+     * @returns {PayloadFromActiveSessions}
+     */
+    validateSession(hashedAccessToken) {
+        const userSession = this.activeSessions[hashedAccessToken]
+        if (!userSession) {
+            throw new Error(
+                'hashedSessionToken not in activeSessions registry!',
+            )
+        }
+        const accessToken = userSession.accessToken
+        const accessTokenIsValid = this.validateToken(accessToken)
+        return {
+            ...accessTokenIsValid.payload,
+            accessToken: this.activeSessions[hashedAccessToken].accessToken,
+        }
+    }
     /**
      * Use knex to try to change password entry
      * @param {number} id
@@ -223,4 +300,48 @@ module.exports = class UserService extends Schmervice.Service {
 
         return passwordRow ? passwordRow.token : null
     }
+
+    /**
+     * Sends a Transactional Email via Brevo
+     * @ returns {Object}
+     */
+    async emailSent(userCredentials) {
+        const hashedAccessToken = await hashToken(userCredentials.accessToken)
+        if (Object.keys(this.activeSessions).includes(hashedAccessToken)) {
+            return new Error('session already in cache!!')
+        }
+        // Set expiration time for ten minutes from now
+        const duration = 600000
+
+        this.activeSessions[hashedAccessToken] = {
+            email: userCredentials.email,
+            name: userCredentials.name,
+            seeking: userCredentials.seeking,
+            accessToken: userCredentials.accessToken,
+            expiration: Date.now() + duration,
+            sessionToken: null,
+        }
+
+        const sendSmtpEmail = {
+            to: [
+                {
+                    email: userCredentials.email,
+                },
+            ],
+            templateId: 1,
+            params: {
+                // TODO: Change this in production...
+                link: `localhost:3000/verify/${hashedAccessToken}`,
+            },
+        }
+
+        return await apiInstance.sendTransacEmail(sendSmtpEmail).then(
+            data => {
+                return { wasSuccessfull: true, data: data }
+            },
+            error => {
+                return { wasSuccessfull: false, error: error }
+            },
+        )
+    }
 }

backend/package.json

@@ -20,7 +20,6 @@
         "@hapi/glue": "^8.0.0",
         "@hapi/hapi": "^20.1.3",
         "@hapi/inert": "^6.0.3",
-        "@hapi/jwt": "^2.0.1",
         "@hapi/vision": "^6.0.1",
         "@hapipal/confidence": "^6.0.1",
         "@hapipal/schmervice": "^2.0.0",
@@ -29,13 +28,16 @@
         "compute-cosine-similarity": "^1.0.0",
         "dotenv": "^10.0.0",
         "exiting": "^6.0.1",
+        "hapi-auth-jwt2": "^10.4.0",
         "hapi-swagger": "^14.5.5",
         "haversine": "^1.1.1",
         "joi": "^17.4.0",
+        "jsonwebtoken": "^9.0.0",
         "knex": "^0.21.19",
         "mysql": "^2.18.1",
         "objection": "^2.2.18",
-        "secure-password": "^4.0.0"
+        "secure-password": "^4.0.0",
+        "sib-api-v3-sdk": "^8.5.0"
     },
     "devDependencies": {
         "ava": "^3.15.0",

backend/server/index.js

@@ -1,3 +1,4 @@
+require('dotenv').config()
 const Glue = require('@hapi/glue')
 const Exiting = require('exiting')
 const Manifest = require('./manifest')

backend/server/manifest.js

@@ -1,4 +1,3 @@
-require('dotenv').config()
 const Confidence = require('@hapipal/confidence')
 const Inert = require('@hapi/inert')
 const Vision = require('@hapi/vision')

frontend/assets/fonts/icomoon.svg

@@ -0,0 +1,42 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>Generated by IcoMoon</metadata>
+<defs>
+<font id="icomoon" horiz-adv-x="1024">
+<font-face units-per-em="1024" ascent="960" descent="-64" />
+<missing-glyph horiz-adv-x="1024" />
+<glyph unicode="&#x20;" horiz-adv-x="512" d="" />
+<glyph unicode="&#xe900;" glyph-name="address" d="M971.947 674.987l-111.36 85.76c-7.68 4.693-15.787 8.533-24.32 11.093-8.533 2.987-17.493 4.267-26.453 4.693h-320.853l37.547-234.667h283.307c8.96 0 17.92 1.707 26.453 4.693 8.533 2.56 17.067 6.4 24.32 11.093l111.36 86.187c8.533 4.693 11.947 15.36 7.253 23.893-1.707 2.987-4.267 5.547-7.253 7.253v0zM441.6 870.4h-46.933c-12.8 0-23.467-10.667-23.467-23.467v0-164.267h-156.587c-8.96 0-17.92-1.707-26.453-4.693-8.533-2.56-17.067-6.4-24.32-11.093l-111.36-85.76c-8.533-4.693-11.947-15.36-7.253-23.893 1.707-2.987 4.267-5.547 7.253-7.253l111.36-86.187c7.68-4.693 15.787-8.533 24.32-11.093 8.533-2.987 17.493-4.267 26.453-4.693h156.587v-398.933c0-12.8 10.667-23.467 23.467-23.467h46.933c12.8 0 23.467 10.667 23.467 23.467v797.867c0 12.8-10.667 23.467-23.467 23.467v0z" />
+<glyph unicode="&#xe901;" glyph-name="area-graph" d="M1024 915.627v-935.68h-1007.787c-16.213 0-21.333 12.373-11.093 27.307l228.693 336.213c8.96 13.653 25.6 16.64 37.547 6.4 0.853-0.853 1.707-1.707 2.56-2.56l72.533-78.080c9.387-11.093 24.747-11.093 34.133 0 1.707 1.707 2.987 3.84 3.84 5.973l156.16 277.333c6.4 13.227 21.333 17.493 32.427 10.24 2.133-1.28 3.84-2.987 5.12-4.693l111.36-122.453c8.533-10.667 23.040-11.093 32.427-0.853 1.707 2.133 3.413 4.267 4.693 6.827l263.68 453.973c6.827 13.653 20.053 21.333 33.707 20.053v0z" />
+<glyph unicode="&#xe902;" glyph-name="calendar" d="M910.080 846.080h-56.747v-113.92h-170.667v113.92h-341.333v-113.92h-170.667v113.92h-56.747c-62.72 0-113.92-50.773-113.92-113.493v-682.667c0-62.72 51.2-113.493 113.92-113.92h796.16c62.72 0 113.493 51.2 113.92 113.92v682.667c0 62.72-51.2 113.493-113.92 113.92zM910.080 49.493h-796.16v455.253h796.16v-454.827zM312.747 960h-113.92v-199.253h113.92v199.253zM824.747 960h-113.92v-199.253h113.92v199.253z" />
+<glyph unicode="&#xe903;" glyph-name="certified" d="M509.013-64c-13.653 1.28-26.027 8.96-32.427 21.333l-54.187 82.347c-13.227 19.2-34.987 30.72-58.027 30.293-11.52 0-23.040-2.987-33.28-8.96l-130.133-75.947c-6.827-4.693-14.933-7.253-23.467-8.107-4.693 0-9.387 1.707-12.373 5.547-4.693 10.24-4.693 21.76 0 32l56.747 173.653c5.547 15.36 3.84 32.427-4.693 46.507-8.533 13.227-23.040 22.187-38.827 23.467l-110.933 13.653c-16.64 2.133-27.733 8.533-30.72 18.347s2.56 21.333 15.36 32.853l91.307 81.92c12.373 10.667 19.627 26.453 19.627 43.093s-7.253 32.427-19.627 43.093l-91.307 81.92c-11.52 8.107-17.493 21.76-15.787 35.413 4.693 13.227 15.787 22.613 29.44 24.32l81.493 22.187c35.413 11.52 59.307 44.8 58.453 82.347l-4.693 86.187c-1.28 12.373 2.133 24.747 10.24 34.133 5.973 6.4 14.080 9.813 23.040 9.387 7.68 0 15.36-2.133 22.187-5.547l84.48-39.253c8.96-3.84 18.347-5.973 28.16-5.973 25.6 0 49.493 13.653 62.72 35.84l48.213 84.48c5.547 12.8 17.92 21.76 32 23.040 14.080-1.28 26.453-10.667 32-23.467l51.627-93.013c10.667-19.627 31.147-32 53.76-32 11.52 0 22.613 3.413 32.427 9.387l142.933 89.173c6.827 5.12 14.933 8.107 23.467 8.96 4.267 0 8.107-1.707 10.667-5.12 4.267-10.24 3.84-21.333-1.28-31.147l-64.427-180.48c-5.973-14.933-4.693-31.573 3.413-45.227 8.533-13.227 22.613-21.333 38.4-22.187l121.173-11.52c17.067-1.707 27.733-7.68 30.72-17.067s-2.56-20.907-15.36-32.427l-91.307-81.92c-12.373-10.667-19.627-26.453-19.627-43.093s7.253-32.427 19.627-43.093l91.307-81.92c11.52-8.107 17.493-21.76 15.787-35.413-4.693-13.227-15.787-22.613-29.44-24.32l-81.493-22.187c-35.413-11.52-59.307-44.8-58.453-81.92l4.693-86.187c1.28-11.947-2.133-24.32-9.813-33.707-5.547-5.973-13.227-8.96-21.333-8.96s-15.787 2.133-23.040 5.973l-91.733 46.080c-8.96 4.693-18.773 6.827-28.587 6.827-24.747 0-47.36-13.653-58.453-35.84l-47.36-92.587c-5.547-14.080-18.347-23.467-32.853-25.173zM336.213 465.067c-10.24 0-20.053-3.413-28.16-9.387-9.813-7.68-16.213-18.773-17.92-30.72-1.707-12.373 1.707-24.747 8.96-34.56l119.040-158.72c8.533-11.52 22.613-18.347 37.12-18.773h2.133c15.36 0.853 29.44 8.96 37.12 22.187l232.533 376.747c6.4 10.667 8.533 23.467 5.973 35.413s-10.24 22.613-20.48 29.013c-7.253 4.693-15.787 7.253-24.747 7.253-16.213 0-31.147-8.533-39.253-22.187l-196.693-318.72-78.507 104.107c-8.533 11.947-22.187 18.773-37.12 18.773v0z" />
+<glyph unicode="&#xe904;" glyph-name="chat" d="M304.64 332.373v325.547h-199.68c-58.027 0-104.96-46.933-104.96-104.96v-314.88c0-58.027 46.933-104.96 104.96-104.96h52.48v-157.44l157.44 157.44h262.4c58.027 0 104.96 46.933 104.96 104.96v95.573c-3.413-0.853-6.827-1.28-10.667-1.28h-366.933zM919.040 920.747h-472.747c-58.027 0-104.96-46.933-104.96-104.96v-420.267h367.36l157.44-157.44v157.44h52.48c58.027 0 104.96 46.933 104.96 104.96v314.88c0 58.027-46.933 104.96-104.96 104.96z" />
+<glyph unicode="&#xe905;" glyph-name="checkmark" d="M864 848.213l-480-480.427-224 224.427-160-160.427 384-384 640 640-160 160z" />
+<glyph unicode="&#xe906;" glyph-name="clock" d="M512 960c-282.88 0-512-229.12-512-512s229.12-512 512-512 512 229.12 512 512-229.12 512-512 512zM512 42.667c-224 0-405.333 181.333-405.333 405.333s181.76 405.333 405.333 405.333c224 0 405.333-181.333 405.333-405.333s-181.333-405.333-405.333-405.333v0zM565.333 483.84v284.16h-106.667v-333.227l-189.013-109.227 53.333-92.16 219.307 126.72c13.653 8.96 22.187 23.893 23.040 39.68v8.96l226.133 222.293c-10.24 14.507-22.187 28.16-34.56 40.96l-191.573-188.16z" />
+<glyph unicode="&#xe907;" glyph-name="cog" d="M917.333 448c2.987 62.72 40.107 118.613 96.427 145.92-10.24 34.56-24.32 68.267-41.387 99.84-59.733-14.507-122.453 5.973-162.133 52.907-43.947 41.387-59.733 104.533-40.96 162.133-32 17.067-65.28 31.147-99.84 41.387-32.427-57.6-92.16-93.867-157.867-96.427-65.707 2.56-125.867 38.827-157.867 96.427-34.56-10.24-68.267-24.32-99.84-41.387 18.773-57.173 2.987-120.32-40.96-162.133-39.68-46.933-102.4-67.413-162.133-52.907-17.067-32-31.147-65.28-41.387-99.84 56.32-27.307 93.44-83.2 96.427-145.92-2.56-65.707-38.827-125.44-96.427-157.867 10.24-34.56 24.32-68.267 41.387-99.84 57.173 18.773 120.32 2.987 162.133-40.96 43.947-41.387 59.733-104.533 40.96-162.133 32-17.067 65.28-31.147 99.84-41.387 32 57.6 92.16 94.293 157.867 96.427 65.707-2.56 125.867-39.253 157.867-96.427 34.56 10.24 68.267 24.32 99.84 41.387-18.773 57.6-2.987 120.32 40.96 162.133 39.68 46.933 102.4 67.413 161.707 52.907 17.067 32 31.147 65.28 41.387 99.84-56.747 27.307-93.867 83.2-96.853 145.92v0zM512 229.973c-120.747 0-218.453 97.707-218.453 218.453s97.707 218.453 218.453 218.453c120.747 0 218.453-97.707 218.453-218.453v0c0-120.747-97.707-218.453-218.453-218.453z" />
+<glyph unicode="&#xe908;" glyph-name="compass" d="M269.653 205.653s243.627 33.28 347.733 137.387 137.387 347.733 137.387 347.733c0 0-243.627-33.28-347.733-137.387s-137.387-347.733-137.387-347.733zM459.52 500.907c43.52 43.52 127.147 74.667 198.827 93.867-19.2-71.68-50.347-155.733-93.867-198.827-29.013-29.013-75.947-29.013-104.96 0s-29.013 75.947 0 104.96zM512 960c-282.88 0-512-229.12-512-512s229.12-512 512-512c282.88 0 512 229.12 512 512v0c0 282.88-229.12 512-512 512zM512 42.667c-224 0-405.333 181.333-405.333 405.333s181.333 405.333 405.333 405.333c224 0 405.333-181.333 405.333-405.333s-181.333-405.333-405.333-405.333v0z" />
+<glyph unicode="&#xe909;" glyph-name="emoji-happy" d="M512 917.333c-259.413 0-469.333-209.92-469.333-469.333s209.92-469.333 469.333-469.333 469.333 209.92 469.333 469.333c0 0 0 0 0 0 0 259.413-209.92 469.333-469.333 469.333zM512 76.373c-205.227 0-371.627 166.4-371.627 371.627s166.4 371.627 371.627 371.627c205.227 0 371.627-166.4 371.627-371.627s-166.4-371.627-371.627-371.627v0zM389.973 459.947c43.52 3.84 76.373 41.813 73.387 85.76 2.987 43.947-29.44 81.92-73.387 85.76-43.52-3.84-76.373-41.813-73.387-85.333-2.987-43.947 29.44-81.92 73.387-85.76zM634.453 459.947c43.947 3.413 76.373 41.813 73.387 85.76 2.987 43.947-29.867 81.92-73.387 85.76-43.947-3.84-76.373-41.813-73.387-85.333-2.987-43.947 29.44-81.92 73.387-85.76v0zM724.48 382.293c-17.92 8.96-39.68 2.133-49.067-15.787-35.84-53.76-98.56-83.627-162.987-77.653-64.427-5.973-126.72 23.893-162.987 77.653-9.387 17.92-32 24.747-49.493 14.933-17.493-9.387-24.32-30.293-15.787-48.213 48.213-78.933 136.107-124.587 228.267-118.187 92.16-6.4 180.48 39.253 228.267 118.187 8.96 17.92 1.707 39.68-16.213 48.64z" />
+<glyph unicode="&#xe90a;" glyph-name="envelope" d="M928 799.573h-832c-52.907 0-96-42.667-96-96v-576c0-52.907 43.093-96 96-96h832c52.907 0 96 43.093 96 96v576c0 52.907-43.093 96-96 96zM87.893 96l-23.467 23.467 264.107 264.107 23.467-23.467-264.107-264.107zM936.533 96l-264.107 264.107 23.467 23.467 264.107-264.107-23.467-23.467zM544.427 309.333v-21.76h-64v21.76l-416.427 385.707 40.96 40.96 407.040-378.027 407.040 377.6 40.96-40.96-416-385.28z" />
+<glyph unicode="&#xe90b;" glyph-name="graduation-cap" d="M197.547 391.253c11.093-78.507 66.133-143.36 141.653-167.253 92.587-40.533 136.107-84.48 172.373-84.48s77.227 38.4 169.813 78.933 67.84 52.907 89.6 140.8l-259.413-125.867-314.453 157.867zM958.72 621.227l-391.253 218.88c-34.987 17.067-76.373 17.067-111.36 0l-390.4-218.88c-30.72-17.067-30.72-45.227 0-62.293l390.827-218.88c34.987-17.067 76.373-17.067 111.36 0l252.587 141.227-273.92 64c-11.093-2.56-22.613-4.267-34.133-4.267-49.493 0-89.173 23.893-89.173 52.907s40.107 53.333 89.173 53.333c31.573 2.56 62.72-10.24 83.627-34.56l290.133-95.147 72.533 40.533c30.72 17.067 30.72 45.227 0 62.293v0zM839.253 206.507c-2.987-17.92 60.16-47.787 66.133 5.12 27.307 238.080-19.627 306.347-19.627 306.347l-65.28-36.693s55.467-52.907 18.773-274.773v0z" />
+<glyph unicode="&#xe90c;" glyph-name="guage" d="M416 271.787c-29.867-42.667-19.627-101.547 23.040-131.413 4.693-2.987 9.387-5.973 14.507-8.107 42.667-29.867 101.547-19.627 131.413 23.040 3.413 4.693 5.973 9.387 8.533 14.507 35.413 61.44 258.133 607.573 238.933 618.667s-381.013-454.827-416.427-516.267zM512 660.907c22.187 0 43.947-1.707 65.707-5.547 22.613 27.733 47.36 58.88 72.107 88.32-44.8 12.8-90.88 19.627-137.387 19.627-287.573 0-512.427-242.347-512.427-551.253 0-19.2 0.853-37.973 2.56-56.747 2.56-28.16 27.307-49.067 55.467-46.507s49.067 27.307 46.507 55.467v0c-1.28 15.36-2.133 31.573-2.133 47.36 0 251.733 180.053 448.853 409.6 448.853v0zM881.493 596.907c-14.080-38.4-29.44-77.653-42.667-111.36 54.613-80.64 83.627-176.213 82.773-273.493 0-16.213-0.853-32.427-2.133-48.213-2.56-28.16 17.92-53.333 46.080-55.893 0 0 0 0 0 0h4.693c26.453 0 48.64 20.053 50.773 46.507 1.28 19.2 2.56 38.4 2.56 57.6 1.707 141.653-49.067 278.613-142.507 384.853v0z" />
+<glyph unicode="&#xe90d;" glyph-name="heart" d="M939.947 796.16c-102.827 91.307-257.707 91.307-360.533 0l-67.413-61.867-67.84 61.867c-102.4 91.307-257.28 91.307-360.107 0-102.827-90.453-112.64-247.040-22.187-349.867 6.827-7.68 14.507-15.36 22.187-22.187l427.947-392.96 427.947 392.96c102.827 90.453 112.64 247.040 22.187 349.867-6.827 7.68-14.080 14.933-22.187 22.187z" />
+<glyph unicode="&#xe90e;" glyph-name="home" d="M1000.96 389.12h-94.293v-338.347c2.987-28.16-17.493-53.333-45.653-56.32-3.413 0-7.253 0-10.667 0h-225.707v338.347h-225.707v-338.347h-225.28c-28.16-2.987-53.333 17.493-56.32 45.653 0 3.413 0 7.253 0 10.667v338.347h-94.293c-33.707 0-26.453 18.347-3.413 42.24l452.267 452.693c20.053 22.187 54.613 23.467 76.373 3.413 1.28-1.28 2.133-2.133 3.413-3.413l452.267-452.693c23.040-23.893 30.293-42.24-3.413-42.24v0z" />
+<glyph unicode="&#xe90f;" glyph-name="location" d="M991.147 33.28l-69.973 209.92h-76.8l42.667-204.8h-750.507l42.667 204.8h-76.8l-69.973-209.92c-15.36-34.987 0.427-75.947 35.84-91.733 10.667-4.693 22.613-6.827 34.56-5.547h818.773c37.973-3.413 72.107 24.32 75.52 62.72 1.28 11.947-0.853 23.893-5.547 34.56v0zM767.573 704c0.427 141.227-114.347 256-255.573 256s-256-114.773-256-256c0-244.48 256-512 256-512s256 267.52 256 512zM373.333 701.013c0 76.373 61.867 138.24 138.24 138.24s138.24-61.867 138.24-138.24-61.867-138.24-138.24-138.24v0c-76.373 0-138.24 61.867-138.24 137.813 0 0 0 0 0 0v0z" />
+<glyph unicode="&#xe910;" glyph-name="lock" d="M841.813 561.92h-102.4v136.533c0 164.693-75.947 261.547-227.413 261.547s-227.413-96.853-227.413-261.547v-136.533h-113.92c-33.28-5.547-57.6-34.56-56.747-68.267v-443.733c1.707-33.28 22.613-62.72 54.187-74.24l68.267-22.187c36.267-10.667 73.387-16.213 110.933-17.493h329.813c37.547 0.853 75.093 6.827 110.933 17.493l67.84 22.187c31.147 11.52 52.48 40.96 54.187 74.24v443.733c-4.267 35.84-32.427 64-68.267 68.267zM625.493 561.92h-227.413v159.147c0 82.347 45.653 125.013 113.92 125.013s113.92-42.667 113.92-125.013v-159.147z" />
+<glyph unicode="&#xe911;" glyph-name="cross" d="M938.24-29.44c-46.080-46.080-120.747-46.080-166.827 0 0 0 0 0 0 0l-260.693 297.813-260.693-297.813c-46.933-45.227-121.6-44.373-166.827 2.56-44.373 45.653-44.373 118.613 0 164.267l271.36 309.76-271.36 310.187c-45.227 46.933-44.373 121.6 2.56 166.827 45.653 44.373 118.613 44.373 164.267 0l260.693-298.24 260.693 298.24c45.227 46.933 120.32 47.787 166.827 2.56 46.933-45.227 47.787-120.32 2.56-166.827-0.853-0.853-1.707-1.707-2.56-2.56l-271.36-309.76 271.36-309.76c46.080-46.080 46.080-120.747 0-167.253z" />
+<glyph unicode="&#xe912;" glyph-name="paper-plane" d="M995.84 858.027l-982.613-346.453c-15.787-5.547-19.2-19.2-0.427-26.453l211.2-84.48 125.013-50.347s603.307 442.88 611.413 448.853 17.493-5.12 11.947-11.947-438.187-473.6-438.187-473.6v0l-25.173-28.16 310.613-167.253c13.653-7.68 30.72-2.987 38.827 10.667 1.28 2.56 2.56 5.12 2.987 8.107 5.547 23.893 158.293 682.24 161.707 697.173 4.267 19.2-8.107 30.72-27.307 23.893v0zM348.16 49.493c0-13.653 7.68-17.493 18.347-7.68 14.080 12.8 158.72 142.507 158.72 142.507l-177.067 91.307v-226.133z" />
+<glyph unicode="&#xe913;" glyph-name="people" d="M817.92-16.213c0 114.773-111.787 173.227-221.013 220.16s-143.36 86.187-143.36 170.667c0 50.773 33.28 34.133 47.787 127.147 5.973 38.4 35.413 0.427 40.96 88.32 0 34.987-15.787 43.52-15.787 43.52s8.107 51.627 11.52 91.733c2.56 73.813-46.507 139.52-117.76 158.293-17.067 17.493-28.587 45.227 23.467 72.96-114.347 5.12-141.227-54.613-202.24-98.56-41.387-31.147-64.853-80.64-63.573-132.693 3.413-40.107 11.52-91.733 11.52-91.733s-16.213-8.533-16.213-43.52c5.547-87.893 34.987-49.92 40.96-88.32 14.507-92.587 47.787-76.373 47.787-127.147 0-84.48-10.667-113.067-119.467-159.573s-142.507-122.453-142.080-231.253c0-32.853-0.427-44.8-0.427-44.8h818.347s-0.427 11.947-0.427 44.373v0zM947.627 278.613c-58.027 23.467-81.92 51.2-81.92 105.813 0 32.853 21.333 22.187 30.72 81.92 4.267 24.747 23.040 0 26.453 57.173 0 22.613-10.24 28.16-10.24 28.16s5.12 33.707 7.253 59.307c2.987 60.587-43.947 112.213-104.533 114.773-3.84 0-7.68 0-11.52 0-60.587 3.413-112.64-43.093-116.053-103.68 0-3.84 0-7.68 0-11.52 2.133-25.6 7.253-59.307 7.253-59.307s-10.24-5.547-10.24-28.16c3.84-56.747 22.613-32.427 26.453-57.173 9.387-60.16 30.72-49.067 30.72-81.92 0-54.613-22.613-79.787-92.587-110.080-3.413-1.707-6.4-3.413-9.387-5.12 84.053-36.267 216.32-99.413 247.467-227.413h135.253v118.187c5.973 52.48-25.6 101.547-75.52 118.613v0z" />
+<glyph unicode="&#xe914;" glyph-name="plus" d="M921.6 448c0-37.973-3.413-68.267-40.96-68.267h-300.373v-300.373c0-37.547-30.72-40.96-68.267-40.96s-68.267 3.413-68.267 40.96v300.373h-300.373c-37.547 0-40.96 30.72-40.96 68.267s3.413 68.267 40.96 68.267h300.373v300.373c0 37.547 30.72 40.96 68.267 40.96s68.267-3.413 68.267-40.96v-300.373h300.373c37.973 0 40.96-30.72 40.96-68.267z" />
+<glyph unicode="&#xe915;" glyph-name="price-ribbon" d="M661.76 413.013c8.107 14.933 22.613 25.6 39.253 28.587 15.787 2.56 28.16 14.933 30.72 30.72 2.987 16.64 13.653 31.147 28.587 39.253 14.507 7.253 22.187 23.040 20.053 38.827-2.56 16.64 2.987 33.707 14.933 46.080 11.52 11.52 14.080 29.013 6.827 43.093-7.68 15.36-7.68 33.28 0 48.213 7.253 14.507 4.693 32-6.827 43.093-11.947 12.373-17.493 29.013-14.933 46.080 2.56 15.787-5.547 31.573-20.053 38.827-14.933 8.107-25.6 22.613-28.587 39.253-2.56 15.787-14.933 28.16-30.72 30.72-16.64 2.987-31.147 13.653-39.253 28.587-7.253 14.507-23.040 22.187-39.253 19.627-16.64-2.56-33.707 2.987-46.080 14.933-11.52 11.52-28.587 14.080-43.093 6.827-15.36-7.68-33.28-7.68-48.213 0-14.507 7.253-32 4.693-43.093-6.827-12.373-11.947-29.013-17.493-46.080-14.933-15.787 2.56-31.573-5.547-38.827-19.627-8.107-14.933-22.613-25.6-39.253-28.587-15.787-2.56-28.16-14.933-30.72-30.72-2.987-16.64-13.653-31.147-28.587-39.253-14.080-7.253-22.187-23.040-19.627-38.827 2.56-16.64-2.987-33.707-14.933-46.080-11.52-11.52-14.080-29.013-6.827-43.093 7.68-15.36 7.68-33.28 0-48.213-7.253-14.507-4.693-32 6.827-43.093 11.947-12.373 17.493-29.013 14.933-46.080-2.56-15.787 5.547-31.573 19.627-38.827 14.933-8.107 25.6-22.613 28.587-39.253 2.56-15.787 14.933-28.16 30.72-30.72 16.64-2.987 31.147-13.653 39.253-28.587 7.253-14.080 23.040-22.187 38.827-19.627 16.64 2.56 33.707-2.987 46.080-14.933 11.52-11.52 29.013-14.080 43.093-6.827 15.36 7.68 33.28 7.68 48.213 0 14.507-7.253 31.573-4.693 43.093 6.827 12.373 11.947 29.013 17.493 46.080 14.933 15.787-2.56 31.573 5.547 38.827 19.627v0zM509.44 480.853c-101.12 0-183.467 81.92-183.467 183.467 0 101.12 81.92 183.467 183.467 183.467s183.467-81.92 183.467-183.467v0c0-101.12-81.92-183.467-183.467-183.467zM292.267 372.48l-66.987-380.16 168.533 25.173 149.76-81.067 66.56 378.453c-109.227-32-227.413-10.667-318.293 57.6v0zM722.773 369.92c-16.64-12.373-34.56-23.040-53.333-32l-40.107-228.267 181.76 98.56-87.893 162.133z" />
+<glyph unicode="&#xe916;" glyph-name="star" d="M512 960l139.093-391.253h372.907l-304.213-229.547 108.8-403.2-316.16 241.493-316.16-241.493 108.8 403.2-305.067 229.547h372.907l139.093 391.253z" />
+<glyph unicode="&#xe917;" glyph-name="dots-three-horizontal" d="M512 570.453c-67.413 0-122.453-54.613-122.453-122.453s54.613-122.453 122.453-122.453 122.453 54.613 122.453 122.453c0 67.413-55.040 122.453-122.453 122.453zM122.453 570.453c-67.84 0-122.453-55.040-122.453-122.453s54.613-122.453 122.453-122.453 122.453 54.613 122.453 122.453v0c0 67.413-55.040 122.453-122.453 122.453zM901.547 570.453c-67.413 0-122.453-54.613-122.453-122.453 0-67.413 54.613-122.453 122.453-122.453 67.413 0 122.453 54.613 122.453 122.453v0c0 67.413-55.040 122.453-122.453 122.453z" />
+<glyph unicode="&#xe918;" glyph-name="tools" d="M159.147 608c47.787 37.12 87.893 11.52 140.8-49.92 5.973-6.827 14.080 1.28 18.773 5.12s74.667 66.987 78.080 69.973c4.693 2.987 5.973 8.96 2.987 13.653 0 0-0.427 0.853-0.853 1.28-5.547 6.4-25.173 32-38.4 49.067-93.013 121.173 254.293 203.947 200.96 205.227-27.307 0.853-136.107 2.133-152.32 0-66.133-6.827-148.907-68.693-190.293-97.28-28.16-18.347-54.187-38.827-78.507-62.293-15.36-13.653-2.56-44.373-30.293-69.12-29.44-26.027-48.213-6.4-65.28-21.333-8.533-7.68-32-25.173-38.827-31.147s-7.68-16.64-1.707-23.467c0 0 0-0.427 0.427-0.853 0 0 64.853-71.68 70.4-78.080 7.253-8.107 20.053-9.813 29.013-3.84 8.96 8.107 32.427 28.587 36.267 32s-2.56 44.373 18.347 60.587v0zM452.693 581.547c-4.267 5.973-12.373 7.253-18.347 3.413-0.853-0.427-1.28-1.28-2.133-1.707l-73.813-64.427c-5.973-5.547-6.4-14.507-1.28-20.48l426.24-485.12c9.813-11.52 27.307-12.8 38.4-2.56v0s49.92 41.813 49.92 41.813c11.52 10.24 12.8 27.307 2.56 38.827l-421.547 489.813zM1021.013 788.053c-3.84 25.173-17.067 20.053-23.893 9.387s-37.12-56.747-49.493-77.227c-12.8-31.573-49.067-46.507-80.213-33.28-7.253 2.987-13.653 7.253-19.2 12.373-58.88 41.813-38.4 70.827-28.16 90.453s42.24 75.093 46.507 81.92c3.84 6.827 1.28 14.933-5.12 18.773-4.267 2.56-9.387 2.56-13.653 0-18.347-8.533-129.707-52.48-145.067-116.053-15.787-64.427 13.227-122.453-43.52-179.627l-69.12-72.107 69.547-80.64 84.907 80.64c27.307 26.027 65.707 37.547 102.827 31.147 84.053-18.773 129.707 12.373 157.44 64.853 24.747 46.507 20.48 144.64 16.64 170.24v0zM138.667 85.333c-10.667-10.667-10.667-28.16 0-38.827l48.64-47.787c11.947-9.387 29.013-7.68 38.4 4.267 0 0 0 0 0 0l252.16 247.893-77.227 87.893-262.4-253.867z" />
+<glyph unicode="&#xe919;" glyph-name="truck" d="M1024 416l-128 256h-192v128c0 35.413-28.587 64-64 64h-576c-35.413 0-64-28.587-64-64v-512l64-64h81.067c-35.413-61.013-14.507-139.52 46.933-174.933s139.52-14.507 174.933 46.933c23.040 39.68 23.040 88.32 0 128h354.56c-35.413-61.013-14.507-139.52 46.933-174.933 61.013-35.413 139.52-14.507 174.933 46.933 23.040 39.68 23.040 88.32 0 128h81.067v192zM704 416v192h132.693l96-192h-228.693z" />
+<glyph unicode="&#xe91a;" glyph-name="dots-three-vertical" d="M512 570.453c-67.413 0-122.453-54.613-122.453-122.453s54.613-122.453 122.453-122.453 122.453 54.613 122.453 122.453c0 67.413-55.040 122.453-122.453 122.453zM512 715.093c67.413 0 122.453 54.613 122.453 122.453 0 67.413-54.613 122.453-122.453 122.453s-122.453-54.613-122.453-122.453v0c0-67.413 54.613-122.453 122.453-122.453zM512 180.907c-67.413 0-122.453-54.613-122.453-122.453s54.613-122.453 122.453-122.453 122.453 54.613 122.453 122.453c0 67.413-55.040 122.453-122.453 122.453z" />
+<glyph unicode="&#xe986;" glyph-name="search" d="M992.262 88.604l-242.552 206.294c-25.074 22.566-51.89 32.926-73.552 31.926 57.256 67.068 91.842 154.078 91.842 249.176 0 212.078-171.922 384-384 384-212.076 0-384-171.922-384-384s171.922-384 384-384c95.098 0 182.108 34.586 249.176 91.844-1-21.662 9.36-48.478 31.926-73.552l206.294-242.552c35.322-39.246 93.022-42.554 128.22-7.356s31.892 92.898-7.354 128.22zM384 320c-141.384 0-256 114.616-256 256s114.616 256 256 256 256-114.616 256-256-114.614-256-256-256z" />
+<glyph unicode="&#xe9ce;" glyph-name="eye" d="M512 768c-223.318 0-416.882-130.042-512-320 95.118-189.958 288.682-320 512-320 223.312 0 416.876 130.042 512 320-95.116 189.958-288.688 320-512 320zM764.45 598.296c60.162-38.374 111.142-89.774 149.434-150.296-38.292-60.522-89.274-111.922-149.436-150.296-75.594-48.218-162.89-73.704-252.448-73.704-89.56 0-176.858 25.486-252.452 73.704-60.158 38.372-111.138 89.772-149.432 150.296 38.292 60.524 89.274 111.924 149.434 150.296 3.918 2.5 7.876 4.922 11.86 7.3-9.96-27.328-15.41-56.822-15.41-87.596 0-141.382 114.616-256 256-256 141.382 0 256 114.618 256 256 0 30.774-5.452 60.268-15.408 87.598 3.978-2.378 7.938-4.802 11.858-7.302v0zM512 544c0-53.020-42.98-96-96-96s-96 42.98-96 96 42.98 96 96 96 96-42.982 96-96z" />
+<glyph unicode="&#xe9d1;" glyph-name="eye-blocked" d="M945.942 945.942c-18.746 18.744-49.136 18.744-67.882 0l-202.164-202.164c-51.938 15.754-106.948 24.222-163.896 24.222-223.318 0-416.882-130.042-512-320 41.122-82.124 100.648-153.040 173.022-207.096l-158.962-158.962c-18.746-18.746-18.746-49.136 0-67.882 9.372-9.374 21.656-14.060 33.94-14.060s24.568 4.686 33.942 14.058l864 864c18.744 18.746 18.744 49.138 0 67.884zM416 640c42.24 0 78.082-27.294 90.92-65.196l-121.724-121.724c-37.902 12.838-65.196 48.68-65.196 90.92 0 53.020 42.98 96 96 96zM110.116 448c38.292 60.524 89.274 111.924 149.434 150.296 3.918 2.5 7.876 4.922 11.862 7.3-9.962-27.328-15.412-56.822-15.412-87.596 0-54.89 17.286-105.738 46.7-147.418l-60.924-60.924c-52.446 36.842-97.202 83.882-131.66 138.342zM768 518c0 27.166-4.256 53.334-12.102 77.898l-321.808-321.808c24.568-7.842 50.742-12.090 77.91-12.090 141.382 0 256 114.618 256 256zM830.026 670.026l-69.362-69.362c1.264-0.786 2.53-1.568 3.786-2.368 60.162-38.374 111.142-89.774 149.434-150.296-38.292-60.522-89.274-111.922-149.436-150.296-75.594-48.218-162.89-73.704-252.448-73.704-38.664 0-76.902 4.76-113.962 14.040l-76.894-76.894c59.718-21.462 123.95-33.146 190.856-33.146 223.31 0 416.876 130.042 512 320-45.022 89.916-112.118 166.396-193.974 222.026z" />
+<glyph unicode="&#xe9d3;" glyph-name="bookmarks" d="M256 832v-896l320 320 320-320v896zM768 960h-640v-896l64 64v768h576z" />
+<glyph unicode="&#xea40;" glyph-name="arrow-left2" d="M402.746 82.746l-320 320c-24.994 24.992-24.994 65.516 0 90.51l320 320c24.994 24.992 65.516 24.992 90.51 0 24.994-24.994 24.994-65.516 0-90.51l-210.746-210.746h613.49c35.346 0 64-28.654 64-64s-28.654-64-64-64h-613.49l210.746-210.746c12.496-12.496 18.744-28.876 18.744-45.254s-6.248-32.758-18.744-45.254c-24.994-24.994-65.516-24.994-90.51 0z" />
+</font></defs></svg>

frontend/assets/sass/icons.scss

@@ -0,0 +1,149 @@
+@font-face {
+    font-family: 'icomoon';
+    src: url('assets/fonts/icomoon.eot?6rmrq3');
+    src: url('assets/fonts/icomoon.eot?6rmrq3#iefix') format('embedded-opentype'),
+        url('assets/fonts/icomoon.ttf?6rmrq3') format('truetype'),
+        url('assets/fonts/icomoon.woff?6rmrq3') format('woff'),
+        url('assets/fonts/icomoon.svg?6rmrq3#icomoon') format('svg');
+    font-weight: normal;
+    font-style: normal;
+    font-display: block;
+}
+
+[class^="icon-"],
+[class*=" icon-"] {
+    /* use !important to prevent issues with browser extensions that change fonts */
+    font-family: 'icomoon' !important;
+    speak: never;
+    font-style: normal;
+    font-weight: normal;
+    font-variant: normal;
+    text-transform: none;
+    line-height: 1;
+
+    /* Better Font Rendering =========== */
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+
+    &.icon-cross:before {
+        content: "\e911";
+    }
+
+    &.icon-dots-three-horizontal:before {
+        content: "\e917";
+    }
+
+    &.icon-dots-three-vertical:before {
+        content: "\e91a";
+    }
+
+    &.icon-address:before {
+        content: "\e900";
+    }
+
+    &.icon-area-graph:before {
+        content: "\e901";
+    }
+
+    &.icon-calendar:before {
+        content: "\e902";
+    }
+
+    &.icon-certified:before {
+        content: "\e903";
+    }
+
+    &.icon-chat:before {
+        content: "\e904";
+    }
+
+    &.icon-checkmark:before {
+        content: "\e905";
+    }
+
+    &.icon-clock:before {
+        content: "\e906";
+    }
+
+    &.icon-cog:before {
+        content: "\e907";
+    }
+
+    &.icon-compass:before {
+        content: "\e908";
+    }
+
+    &.icon-emoji-happy:before {
+        content: "\e909";
+    }
+
+    &.icon-envelope:before {
+        content: "\e90a";
+    }
+
+    &.icon-graduation-cap:before {
+        content: "\e90b";
+    }
+
+    &.icon-guage:before {
+        content: "\e90c";
+    }
+
+    &.icon-heart:before {
+        content: "\e90d";
+    }
+
+    &.icon-home:before {
+        content: "\e90e";
+    }
+
+    &.icon-location:before {
+        content: "\e90f";
+    }
+
+    &.icon-lock:before {
+        content: "\e910";
+    }
+
+    &.icon-paper-plane:before {
+        content: "\e912";
+    }
+
+    &.icon-people:before {
+        content: "\e913";
+    }
+
+    &.icon-plus:before {
+        content: "\e914";
+    }
+
+    &.icon-price-ribbon:before {
+        content: "\e915";
+    }
+
+    &.icon-star:before {
+        content: "\e916";
+    }
+
+    &.icon-tools:before {
+        content: "\e918";
+    }
+
+    &.icon-truck:before {
+        content: "\e919";
+    }
+
+    &.icon-search:before {
+        content: "\e986";
+    }
+
+    &.icon-eye:before {
+        content: "\e9ce";
+    }
+
+    &.icon-eye-blocked:before {
+        content: "\e9d1";
+        }
+        
+
+    }

frontend/assets/sass/main.scss

@@ -0,0 +1,13 @@
+@import 'variables';
+@import 'icons';
+
+
+// Global Styles
+html {
+    background-color: $black;
+    font-size: $base-font-size;
+}
+body{
+    margin:0;
+    font-family: 'Source Code Pro', monospace;
+}

frontend/assets/sass/variables.scss

@@ -0,0 +1,48 @@
+// Color Variables
+$yellow: #F7F5A6;
+$light-green: #C2F279;
+$dark-green: #4D9127;
+$red: #FF3660;
+$light-blue: #05DBF2;
+$dark-blue: #183770;
+$dark-grey: #1F2024;
+$grey: #4C5264;
+$light-grey: #D5D5D5;
+$black: #000;
+
+// Define the base font size
+$base-font-size: 14px;
+
+// Define breakpoints
+$mobile: 350px;
+$tablet: 768px;
+$desktop: 960px;
+
+// Define font sizes for each breakpoint
+$mobile-font-size: $base-font-size;
+$tablet-font-size: $base-font-size * 1.2;
+$desktop-font-size: $base-font-size * 1.4;
+
+// Set default font size
+html {
+    font-size: $base-font-size;
+}
+
+// Media queries for font sizes
+@media (min-width: $mobile) {
+    html {
+        font-size: $mobile-font-size;
+    }
+}
+
+@media (min-width: $tablet) {
+    html {
+        font-size: $tablet-font-size;
+    }
+}
+
+@media (min-width: $desktop) {
+    html {
+        font-size: $desktop-font-size;
+    }
+}

frontend/index.html

@@ -1,16 +1,19 @@
 <!DOCTYPE html>
 <html lang="en">
-    <head>
-        <meta charset="UTF-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <title>Vite App</title>
-    </head>
-    <body>
-        <div id="app"></div>
-        <script>
-            // DUMB shim
-            var global = window
-        </script>
-        <script type="module" src="/src/main.js"></script>
-    </body>
-</html>
+
+<head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Siimee</title>
+</head>
+
+<body>
+    <div id="app"></div>
+    <script>
+        // DUMB shim
+        var global = window
+    </script>
+    <script type="module" src="/src/main.js"></script>
+</body>
+
+</html>

frontend/src/App.vue

@@ -73,7 +73,11 @@ export default {
 </script>
 
 <style lang="sass">
+@import '../assets/sass/main'
 #app > .w-app > main
     position: relative
     top: 50px
+    max-width: 960px
+    width:100%
+    margin: 0 auto
 </style>

frontend/src/components/MainNav.vue

@@ -1,24 +1,23 @@
 <template lang="pug">
 w-toolbar.mt6.py1(bottom fixed)
-    router-link.w-flex.column(:to='`/`')
-        w-button.pa8(bg-color='primary')
-            w-icon.mr1(xl) mdi mdi-home
-            //- p.text-upper home queue
-    router-link.w-flex.column(:to='`/pairs`')
-        w-button.pa8(bg-color='primary')
-            w-icon.mr1(xl) mdi mdi-tooltip-account
+    router-link.w-flex.column.exact-active-link(:to='`/`')
+        w-button.pa8()
+            w-icon.mr1.icon-home(xl :class="{ 'icon-selected': $route.path === '/' }")
+    router-link.w-flex.column.exact-active-link(:to='`/pairs`')
+        w-button.pa8()
+            w-icon.mr1.icon-people(xl, :class="{ 'icon-selected': $route.path === '/pairs' }")
             //- p.text-upper pending matches
-    router-link.w-flex.column(:to='`/messages`')
-        w-button.pa8(bg-color='primary')
-            w-icon.mr1(xl) mdi mdi-forum
+    router-link.w-flex.column.exact-active-link(:to='`/messages`')
+        w-button.pa8()
+            w-icon.mr1.icon-chat(xl, :class="{ 'icon-selected': $route.path === '/messages' }")
             //- p.text-upper active chats
-    router-link.w-flex.column(:to='`/onboarding`')
-        w-button.pa8(bg-color='primary')
-            w-icon.mr1(xl) mdi mdi-account-check
+    router-link.w-flex.column.exact-active-link(:to='`/onboarding`')
+        w-button.pa8()
+            w-icon.mr1.icon-area-graph(xl)
             //- p.text-upper survey
-    router-link.w-flex.column(:to='`/settings`')
-        w-button.pa8(bg-color='primary' disabled)
-            w-icon.mr1(xl) mdi mdi-cog
+    router-link.w-flex.column.exact-active-link(:to='`/settings`')
+        w-button.pa8(disabled)
+            w-icon.mr1.icon-cog(xl :class="{ 'icon-selected': $route.path === '/settings' }")
             //- p.text-upper settings
 </template>
 
@@ -29,3 +28,23 @@ export default {
     name: 'MainNav',
 }
 </script>
+
+<style lang="sass">
+@import '../assets/sass/main.scss'
+.w-toolbar
+    max-width: 960px
+    width:100%
+    margin: auto
+    background: $dark-grey
+    color: $light-grey
+
+    .w-button
+        background-color: $dark-grey
+    
+    .icon-selected
+        color: $light-green
+    
+    a
+        color:$light-grey
+</style>
+

frontend/src/components/NamePlate.vue

@@ -3,7 +3,6 @@
     section(:class='{ box: !isList }' v-if='pid')
         router-link(:to='`/profile/${pid}`' disabled)
             h1.text-capitalize {{ name }}
-                span O
             p.text-capitalize {{ role }} 
                 span.text-capitalize(v-if='isList')
                     span.text-capitalize | {{ locale }}
@@ -48,11 +47,9 @@ export default {
         flex-direction: column
         align-items: center
         justify-content: center
-        padding: 15px
         min-height: 10vh
         width: 100%
         &.box
-            background-color: #D5D5D5
             border-radius: 6px
             height: 15vw
             width: 15vw

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="mdi mdi-dots-horizontal")
-                    w-flex()
-                        router-link(
-                            :to='`/chat/${pair.profile.pid}`')
-                            w-button.mx2(@click='showMenu = false' bg-color="success" tile icon="mdi mdi-forum") Chat
-                        w-button.mx2(@click='showMenu = false' bg-color="info" tile icon="mdi mdi-calendar") Calendar
-                        w-button.mx2(@click='showMenu = false' bg-color="primary" icon="wi-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>
@@ -40,22 +57,23 @@ const showMenu = ref(false)
 </script>
 
 <style lang="sass">
+@import '../assets/sass/main'
 .pairs-list
     color: #fff
     article
-        font-family: 'Century Gothic'
+        font-family: 'Source Pro'
         .dot--icon
             width:12px
             height:12px
             margin: 11px
             border-radius:50%
-            background-color:#60C3FF
+            background-color:$light-blue
         .avatar
             width:40px
             height:40px
             margin: 11px
             border-radius: 6px
-            background-color:#D5D5D5
+            background-color:$light-blue
         .idCard
             color: #fff
             margin: 11px
@@ -64,5 +82,5 @@ const showMenu = ref(false)
             p
                 font-size: 14px
 .w-menu--card
-    background-color: #000000 !important
+    background-color: $black !important
 </style>

frontend/src/components/ProfileCard.vue

@@ -14,15 +14,26 @@ w-card.profile-card-list--card.xs12
 
         template(v-if='!isList')
             w-button.text-upper.xs12.pa6(v-if='currentTab == 0 && isPaired')
-                w-icon.mr1(xl) mdi mdi-chat
+                w-icon.mr1.icon-chat(xl)
                 | start chat
 
+            //- TODO: Uncomment me
+            //- SummaryBar(
+            //-     :aspects='aspects'
+            //-     :is-tab='isPaired'
+            //-     :tab-content='card.summary'
+            //-     @tab-change='onTab'
+            //- )
+
+            //- This version forces tabs on
             SummaryBar(
                 :aspects='aspects'
-                :is-tab='isPaired'
+                :is-tab='true'
+                :name='card.name'
                 :tab-content='card.summary'
                 @tab-change='onTab'
             )
+
             TagList(v-if='!isPaired || isList')
 
     article.xs12.w-flex.column.justify-space-between
@@ -39,7 +50,7 @@ w-card.profile-card-list--card.xs12
             p {{ card.summary.about.tab }}
         PairingButton(@pair='onPair' @pass='onPass' v-if='!isPaired')
         w-button.text-upper.xs12.pa6(v-else-if='currentTab != 0')
-            w-icon.mr1(xl) mdi mdi-chat
+            w-icon.mr1.icon-chat(xl)
             | start chat
 </template>
 
@@ -55,6 +66,7 @@ import TagList from './TagList.vue'
 import PairingButton from './PairingButton.vue'
 
 const router = useRouter()
+// NOTE: toggle to use for testing pairing
 // const isPaired = ref(true)
 const isPaired = ref(false)
 
@@ -123,19 +135,21 @@ const onPass = async () => {
 </script>
 
 <style lang="sass">
+@import '../assets/sass/main'
+
 .profile-card-list--card
-    background-color: #000
+    background-color: $black
     color: #fff
     width: 100%
     max-width: 450px
     margin: 11px auto
     header > .w-button
-        background-color: #116006
+        background-color: $dark-green
         color: #fff
     footer
         margin-bottom: 22px
         p
-            font-family: Century Gothic, CenturyGothic, AppleGothic, sans-serif
+            font-family: Source Pro, AppleGothic, sans-serif
             margin: 11px auto
             padding: 0 7px
             line-height: 1.619em

frontend/src/components/ProfileCardList.vue

@@ -1,6 +1,6 @@
 <template lang="pug">
-section.profile-card-list.xs12.w-flex.column
-    article
+section.profile-card-list.xs12.w-flex
+    article.w-flex.xs-col.sm-row.sm-wrap
         ProfileCard.match-layout(
             :aspects='aspects'
             :card='card'
@@ -8,6 +8,10 @@ section.profile-card-list.xs12.w-flex.column
             :key='`${card.pid}-${i}`'
             v-for='(card, i) in cards'
         )
+        w-button.pa8.more-results(
+            @click='loadMoreResults()'
+            bg-color='primary'
+        )
 </template>
 
 <script setup>
@@ -17,6 +21,8 @@ import ProfileCard from './ProfileCard.vue'
 
 const aspects = ref(cardAspects)
 
+const emit = defineEmits(['loadMore'])
+
 const props = defineProps({
     cards: {
         type: [Object, Array],
@@ -32,10 +38,32 @@ const props = defineProps({
         ],
     },
 })
+
+const loadMoreResults = () => {
+    emit('loadMore')
+} // TODO update to scroll
 </script>
 
 <style lang="sass">
+@import '../assets/sass/main'
+
 .profile-card-list
     > header > .w-select >.primary
         margin-top: 0
+
+@media (min-width: $tablet)
+    section.profile-card-list.xs12.w-flex > article
+        display: flex
+        flex-wrap: wrap
+        flex-direction: row
+
+@media (max-width: $tablet)
+    section.profile-card-list.xs12.w-flex > article
+        display: flex
+        flex-wrap: wrap
+        flex-direction: column
+
+
+.more-results
+    margin-bottom: 2em
 </style>

frontend/src/components/SideBar.vue

@@ -5,7 +5,7 @@ aside.sidebar.w-flex.column.pa8
     nav.temp-control-box
         input(v-model="switchToPID" @keyup.enter="$emit('updatePid', switchToPID)")
         button(@click="$emit('updatePid', switchToPID)") switch profile
-    
+
 </template>
 
 <script>

frontend/src/components/SummaryBar.vue

@@ -1,112 +1,127 @@
-<template lang="pug">
-section.w-flex.column.pb5
-    nav.fill-width.w-flex.column.justify-space-between
-        // Tabbed Layout
-        w-tabs(
-            :items='Object.keys(tabContent)'
-            @input='onTabChanged'
-            center
-            fill-bar
-            v-if='isTab'
-        )
-            template(#item-title='{ item }')
-                .w-flex.column.justify-start
-                    p(v-if='tabContent[item].matchPerc') {{ tabContent[item].matchPerc }}%
-                    p(v-else) &nbsp;
-                    p {{ item }}
-            // About Tab
-            template(#item-content.1='{ item }')
-                .tab--about
-                    p {{ tabContent[item].tab }}
-                    br
-                    p {{ tabContent[item].tab }}
-                    br
-                    hr
-
-            // Passion Tab
-            template(#item-content.2='{ item }')
-                .tab--passion
-                    p {{ tabContent[item].tab }}
-                    SpiderChart(
-                        :labels='aspects.map(label => label.name)'
-                        :profile-data='profileScore'
-                        :target-data='targetScore'
-                        profile-name='lucy'
-                        v-if='isTab'
-                    )
-
-            // Aspirations Tab
-            template(#item-content.3='{ item }')
-                .tab--aspirations
-                    p {{ tabContent[item].tab }}
-
-            // Skills Tab
-            template(#item-content.4='{ item }')
-                .tab--skills
-                    p {{ tabContent[item].tab }}
-
-        // Untabbed Layout
-        ul.w-flex.row.justify-space-between(v-else)
-            template(
-                :key='index'
-                v-for='(item, index) in Object.keys(tabContent)'
-            )
-                li.w-flex.row(v-if='item !== "about"')
-                    w-icon.mr1(xl) mdi mdi-heart
-                    .w-flex.column.justify-start
-                        p 
-                            span {{ tabContent[item].matchPerc }}%
-                        p.text-capitalize {{ item }}
-</template>
-
-<script>
-import SpiderChart from './SpiderChart.vue'
-
-export default {
-    components: { SpiderChart },
-    props: {
-        aspects: {
-            required: true,
-            type: Array,
-        },
-        tabContent: {
-            required: true,
-            type: Object,
-        },
-        isTab: {
-            required: false,
-            type: Boolean,
-            default: false,
-        },
-        showIcon: {
-            required: false,
-            type: Boolean,
-            default: true,
-        },
-    },
-    emits: ['tab-change'],
-    data: () => ({
-        profileScore: [5.7, 5.2, 4.8, 5.2, 4.9, 4.9],
-        targetScore: [5.3, 4.8, 5.7, 4.8, 5.6, 4.8],
-    }),
-    methods: {
-        onTabChanged(tabs) {
-            this.$emit('tab-change', tabs)
-        },
-    },
-}
-</script>
-<style lang="sass">
-    section
-        font-family: Century Gothic, CenturyGothic, AppleGothic, sans-serif
-        ul
-            margin: 11px 0
-            li
-                margin: 0 7px
-                font-size: .8em
-                p > span
-                    font-weight: bold
-                    font-size: 1em
-            li:not(:last-child)
-                border-right: 1px solid #fff
-</style>
+<template lang="pug">
+section.w-flex.column.pb5
+    nav.fill-width.w-flex.column.justify-space-between
+        // Tabbed Layout
+        w-tabs(
+            :items='Object.keys(tabContent)'
+            @input='onTabChanged'
+            center
+            fill-bar
+            v-if='isTab'
+        )
+            template(#item-title='{ item }')
+                .w-flex.column.justify-start
+                    p(v-if='tabContent[item].matchPerc') {{ tabContent[item].matchPerc }}%
+                    p(v-else) &nbsp;
+                    p {{ item }}
+
+            // About Tab
+            template(#item-content.1='{ item }')
+                .tab--about
+                    p {{ tabContent[item].tab }}
+                    br
+                    p {{ tabContent[item].tab }}
+                    br
+                    hr
+
+            // Passion Tab
+            template(#item-content.2='{ item }')
+                .tab--passion
+                    p {{ tabContent[item].tab }}
+                    SpiderChart(
+                        :labels='aspects.map(label => label.name)'
+                        :profile-data='aspects.map(data => data.percentage * 10)'
+                        :profile-name='name'
+                        :target-data='targetScore'
+                        v-if='isTab'
+                    )
+
+            // Aspirations Tab
+            template(#item-content.3='{ item }')
+                .tab--aspirations
+                    p {{ tabContent[item].tab }}
+
+            // Skills Tab
+            template(#item-content.4='{ item }')
+                .tab--skills
+                    p {{ tabContent[item].tab }}
+
+        // Untabbed Layout
+        ul.w-flex.row.justify-space-between(v-else)
+            template(
+                :key='index'
+                v-for='(item, index) in Object.keys(tabContent)'
+            )
+                li.w-flex.row(v-if='item !== "about"')
+                    w-icon.mr1.icon-compass(xl)
+                    .w-flex.column.justify-start
+                        p
+                            span {{ tabContent[item].matchPerc }}%
+                        p.text-capitalize {{ item }}
+</template>
+
+<script>
+import SpiderChart from './SpiderChart.vue'
+import { currentProfile } from '../services'
+
+export default {
+    components: { SpiderChart },
+    props: {
+        aspects: {
+            required: true,
+            type: Array,
+        },
+        tabContent: {
+            required: true,
+            type: Object,
+        },
+        name: {
+            required: true,
+            type: String,
+        },
+        isTab: {
+            required: false,
+            type: Boolean,
+            default: false,
+        },
+        showIcon: {
+            required: false,
+            type: Boolean,
+            default: true,
+        },
+    },
+    emits: ['tab-change'],
+    computed: {
+        targetScore() {
+            try {
+                let aspectResponses = currentProfile._profile.responses.filter(
+                    r => [1, 2, 3, 4, 5, 6].indexOf(r.response_key_id) !== -1,
+                )
+                return aspectResponses.map(r => Number(r.val))
+            } catch (e) {
+                console.warn('error: No aspect responses for current profile.')
+                return [1, 1, 1, 1, 1, 1]
+            }
+        },
+    },
+    methods: {
+        onTabChanged(tabs) {
+            this.$emit('tab-change', tabs)
+        },
+    },
+}
+</script>
+<style lang="sass">
+section
+    font-family: Century Gothic, CenturyGothic, AppleGothic, sans-serif
+    ul
+        margin: 11px 0
+        li
+            margin: 0 7px
+            font-size: .8em
+            p > span
+                font-weight: bold
+                font-size: 1em
+        li:not(:last-child)
+            border-right: 1px solid #fff
+</style>

frontend/src/components/TopNav.vue

@@ -2,17 +2,17 @@
 w-toolbar.top-nav.w-flex.align-center.justify-between(top fixed)
     router-link.w-flex.column.no-grow(v-if="$route.params.pid" :to='`/`')
         w-button.pa4(bg-color='transparent')
-            w-icon.mr1(md) mdi mdi-arrow-left
+            w-icon.mr1.icon-arrow-left2(md)
     
     w-button.pa4(v-if="!$route.params.pid" bg-color='transparent' @click="$emit('on-open')")
-        w-icon.mr1(md) mdi mdi-cog
+        w-icon.mr1.icon-cog(md)
 
     router-link.w-flex.column(:to='`/`')
         p.text-upper.text-center {{$route.path}} {{$route.params}}
 
     router-link.w-flex.column.no-grow(v-if="!$route.params.pid" :to='`/search`')
         w-button.pa4(bg-color='transparent' disabled)
-            w-icon.mr1(md) mdi mdi-magnify
+            w-icon.mr1.icon-search(md)
                 //- p.text-upper settings
 </template>
 

frontend/src/components/onboarding/AccountType.vue

@@ -2,10 +2,10 @@
 w-card.w-flex.column
     p {Name}, let's get started on your profile while we verify your account
     w-button.search-type(@click='handleSubmit("Recruiter")')
-        w-icon.mr1 mdi mdi-account-multiple
+        w-icon.mr1.icon-people
         | CANDIDATES
     w-button.search-type(@click='handleSubmit("Jobseeker")')
-        w-icon.mr1 mdi mdi-bookmark-box-multiple
+        w-icon.mr1.icon-bokmarks
         | JOBS
 </template>
 

frontend/src/components/onboarding/Aspects.vue

@@ -1,48 +0,0 @@
-<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/Auth.vue

@@ -0,0 +1,107 @@
+<template lang="pug">
+.wait-message
+    p.verify-message Thanks for signing up!
+    p.verify-message We'll just need you to verify your email address to continue. Please check your email!
+</template>
+
+<script>
+import { Authenticator } from '../../services/auth.service.js'
+import { createProfileForUserId } from '../../services/profile.service'
+import { signupUser } from '../../services/user.service.js'
+
+export default {
+    name: 'Auth',
+    props: {
+        question: {
+            required: true,
+            type: Object,
+            default: () => {},
+        },
+        answered: {
+            type: Object,
+            default: () => {},
+        },
+        responses: {
+            type: Object,
+            default: () => {},
+        },
+        survey: {
+            required: true,
+            type: Object,
+            default: () => {},
+        },
+    },
+    emits: ['update-answers'],
+    data: () => ({
+        authenticator: {},
+    }),
+    async created() {
+        // Establishes New User And Sends Auth Email
+        this.authenticator = new Authenticator()
+        try {
+            this.doesUserHaveMinResponses(this.responses)
+            const userPass = this.responses.find(
+                response => response.response_key_id === 9,
+            )
+            const newUserId = await this.signupNewUser({
+                ...this.answered,
+                password: userPass.val,
+            })
+            await this.createProfileForNewUser(newUserId, this.responses)
+            const accessToken = await this.getAccessToken({
+                ...this.answered,
+            })
+            console.log('accessToken :=>', accessToken)
+            const sessionInfo = await this.authenticator.sendAuthEmail({
+                ...this.answered,
+                accessToken: accessToken,
+            })
+            document.cookie = `siimee_access=${sessionInfo.hashedAccessToken}; max-age=600; path=/; secure`
+        } catch (err) {
+            // TODO: render an error page in this component displaying which
+            // error occurred and how to reach out to staff
+            console.error('ERROR :=>', err)
+        }
+    },
+    methods: {
+        doesUserHaveMinResponses(responses) {
+            if (!this.survey.hasMinResponsesToCreateProfile(responses))
+                throw new Error(
+                    'User has not answered minimum amount of questions to create profile',
+                )
+        },
+        async getAccessToken(payload) {
+            return await this.authenticator.getAccessToken({
+                payload,
+            })
+        },
+        async signupNewUser(userInfo) {
+            const newUser = await signupUser(userInfo)
+            if (!newUser || newUser.error) {
+                throw new Error(
+                    'Error occured when signing up new User :=>',
+                    newUser.error,
+                )
+            } else return newUser.user_id
+        },
+        async createProfileForNewUser(userId, responses) {
+            try {
+                await createProfileForUserId(userId, responses)
+            } catch (err) {
+                throw new Error(err)
+            }
+        },
+    },
+}
+</script>
+
+<style>
+.wait-message {
+    margin: 5rem auto;
+    text-align: center;
+    width: 90%;
+    max-width: 35rem;
+    font-size: 150%;
+    font-weight: bold;
+}
+</style>

frontend/src/components/onboarding/FormDropdown.vue

@@ -1,8 +1,10 @@
 <template lang="pug">
 .role
-    h3 {{ question.response_key_category }}
-    p {{ question.response_key_prompt }}
+    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 }}
     w-button.ma1.grow(@click='handleSubmit') NEXT
 </template>
 
@@ -18,21 +20,25 @@ export default {
     emits: ['update-answers'],
     data: () => ({
         selection: null,
+        parsedPrompt: {},
     }),
     computed: {
         items() {
             return this.question.responses.map(res => ({ label: res }))
         },
     },
+    created() {
+        const parsedPromptArr =
+            this.question.response_key_prompt.split('[break]')
+        this.parsedPrompt.start = parsedPromptArr[0]
+        this.parsedPrompt.mid = parsedPromptArr[1]
+        this.parsedPrompt.end = parsedPromptArr[2]
+    },
     methods: {
         handleSubmit() {
-            if (!this.selection) {
-                console.warn('Please select a role.')
-                return
-            }
             let payload = {
                 question: this.question,
-                answer: this.selection,
+                input: this.selection,
             }
             this.$emit('update-answers', payload)
         },

frontend/src/components/onboarding/FormInput.vue

@@ -1,9 +1,40 @@
 <template lang="pug">
 .form-input
-    h3 {{ question.response_key_category }}
-    p {{ question.response_key_prompt }}
-    input(placeholder='i am a little teapot' type='text' v-model='input')
-    w-button.ma1.grow(@click='handleSubmit') NEXT
+    span(style='text-align: center') {{ parsedPrompt.start }}
+    br
+    br
+    span(style='text-align: center') {{ parsedPrompt.mid }}
+    input(
+        :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'
+    )
+    input.pass(
+        :placeholder='question.placeholder'
+        @keyup.enter='handleSubmit({ question, input })'
+        style='-webkit-text-security: circle'
+        type='password'
+        v-else-if='question.survey_stage === "password"'
+        v-focus
+        v-model='input'
+    )
+    w-button.ma1.grow(
+        @click='submitImage'
+        v-else-if='question.survey_stage === "image"'
+    ) UPLOAD IMAGE
+    textarea(
+        :placeholder='`${question.placeholder}`'
+        @keyup.enter='handleSubmit({ question, input })'
+        cols='50'
+        rows='4'
+        v-else-if='question.survey_stage === "blurb"'
+        v-model='input'
+    )
+    span(style='text-align: center') {{ parsedPrompt.end }}
+    w-button.ma1.grow(@click='handleSubmit({ question, input })') NEXT
 </template>
 <script>
 export default {
@@ -17,20 +48,40 @@ export default {
     emits: ['update-answers'],
     data: () => ({
         input: null,
+        parsedPrompt: {},
     }),
+    created() {
+        const parsedPromptArr =
+            this.question.response_key_prompt.split('[break]')
+        this.parsedPrompt.start = parsedPromptArr[0]
+        this.parsedPrompt.mid = parsedPromptArr[1]
+        this.parsedPrompt.end = parsedPromptArr[2]
+    },
     methods: {
-        handleSubmit() {
-            if(this.question.response_key_prompt === 'password') {
-                this.$emit('update-answers') // no password collection
-                return
-            }
-
+        handleSubmit(answerInfo) {
+            this.$emit('update-answers', answerInfo)
+        },
+        submitImage() {
             let payload = {
                 question: this.question,
-                answer: this.input,
+                input: 'placeholder for image',
             }
             this.$emit('update-answers', payload)
         },
     },
 }
 </script>
+
+<style>
+.form-input,
+input[placeholder],
+textarea[placeholder] {
+    text-align: center;
+}
+input {
+    border: 0;
+    outline: 0;
+    background: transparent;
+    border-bottom: 1px solid black;
+}
+</style>

frontend/src/components/onboarding/QuestionResponse.vue

@@ -1,9 +1,20 @@
 <template lang="pug">
 w-card.question
-    p {{question.question}} 
+    p {{ question.response_key_prompt }}
     section.radio-buttons.w-flex.row.justify-space-between
-        p(v-for="label in question.labels") {{label}}
-    w-radios.w-flex.row.justify-space-between(@update:model-value="onUpdate" :items="radioItems" color="red")
+        p(v-for='label in question.labels') {{ label }}
+    w-radios.w-flex.row.justify-space-between(
+        :items='radioItems'
+        @update:model-value='onUpdate'
+        color='red'
+    )
+    w-button.ma1.grow(
+        @click='handleSubmit'
+        @keyup.enter='handleSubmit'
+        v-if='currentStep !== surveyStepsCount'
+    ) NEXT
+    w-button.ma1.grow(@click='handleSubmit' v-else) SUBMIT ANSWERS
+    p(v-if='noChoiceMade') Tough choices, we know! Just answer to the best of your ability. The team over at Siimee values the answers you provide us so that we can show you results catered to your specific needs.
 </template>
 
 <script>
@@ -13,20 +24,33 @@ export default {
             type: Object,
             required: true,
         },
+        currentStep: {
+            type: Number,
+            required: true,
+        },
+        surveyStepsCount: {
+            type: Number,
+            required: true,
+        },
     },
-    emits: ['updated'],
+    emits: ['update-answers'],
     data: () => ({
-        radioItems: [
-            { answer: 1 },
-            { answer: 2 },
-            { answer: 3 },
-            { answer: 4 },
-            { answer: 5 },
-        ],
+        radioItems: [1, 2, 3, 4, 5],
+        answer: null,
+        noChoiceMade: null,
     }),
     methods: {
-        onUpdate(e) {
-            this.$emit('updated', { ...this.question, answer: e + 1 })
+        onUpdate(index) {
+            this.noChoiceMade = false
+            this.answer = this.radioItems[index]
+        },
+        handleSubmit() {
+            const payload = {
+                question: this.question,
+                input: this.answer,
+            }
+            this.noChoiceMade = payload.input === null ? true : false
+            this.$emit('update-answers', payload)
         },
     },
 }

frontend/src/components/onboarding/Splash.vue

@@ -5,15 +5,25 @@ w-flex.column
         :src='`/assets/logos/siimee_logo.jpg`'
         :width='300'
     )
+
     w-button.ma1.grow.next-btn(
         :height='50'
         :width='315'
-        @click='this.$emit("go-to-step", currentStep + 1)'
+        @click='handleSubmit'
         bg-color='success'
         shadow
         text
         xl
-    ) GET STARTED
+    ) SIGN UP
+    router-link(to='/login')
+        w-button.ma1.grow.next-btn(
+            :height='50'
+            :width='315'
+            bg-color='success'
+            shadow
+            text
+            xl
+        ) LOG IN
 </template>
 
 <script>

frontend/src/components/onboarding/index.js

@@ -1,4 +1,5 @@
 import Splash from './Splash.vue'
+import Auth from './Auth.vue'
 import AccountType from './AccountType.vue'
 import CompanyID from './CompanyID.vue'
 import Role from './Role.vue'
@@ -6,13 +7,14 @@ import Skills from './Skills.vue'
 import Location from './Location.vue'
 import Interests from './Interests.vue'
 import LicensesAndCertifications from './LicensesAndCertifications.vue'
-import Aspects from './Aspects.vue'
 import FormInput from './FormInput.vue'
 import FormTags from './FormTags.vue'
 import FormDropdown from './FormDropdown.vue'
+import QuestionResponse from './QuestionResponse.vue'
 
 export default {
     Splash,
+    Auth,
     AccountType,
     CompanyID,
     Role,
@@ -20,8 +22,8 @@ export default {
     Location,
     Interests,
     LicensesAndCertifications,
-    Aspects,
     FormDropdown,
     FormTags,
     FormInput,
+    QuestionResponse,
 }

frontend/src/entities/card/card.js

@@ -1,4 +1,5 @@
 /** @module card/card */
+import { aspectsArr } from '../../utils/lang.js'
 
 const DEFAULT_ABOUT =
     'Hello! My name is L.L. and I am a nurse from New York. I have been in the healthcare industry for over 6 years.'
@@ -40,7 +41,7 @@ class SummaryGroup {
 }
 
 class Aspect {
-    constructor({ name, labels, percentage = 50 }) {
+    constructor({ name, labels, percentage = 1 }) {
         this.name = name
         this.labels = labels
         this.percentage = percentage
@@ -73,6 +74,15 @@ const cardAspects = [
     }),
 ]
 
+const responseKeyIdToAspectName = {
+    1: 'vision',
+    2: 'creativity',
+    3: 'dynamism',
+    4: 'precision',
+    5: 'focus',
+    6: 'attention',
+}
+
 /**
  * Class representing a profile card
  * NOT to be confused with a profile
@@ -123,6 +133,21 @@ const makeCardFromProfile = profile => {
     c.ethinicity = profile?.profile_prefs?.ethnicity?.val
     c.locale = `${profile.city}, ${profile.state}`
     c.email = profile.user_email
+
+    let aspectResponses = profile?.responses.filter(
+        r => aspectsArr.indexOf(r.response_key_id) !== -1,
+    )
+    if (aspectResponses.length) {
+        // if user has responses for aspects we overwrite default percentages
+        c.aspects.map(a => {
+            a.percentage = Number(
+                aspectResponses.find(
+                    r => responseKeyIdToAspectName[r.response_key_id] == a.name,
+                ).val,
+            )
+            return a
+        })
+    }
     // TODO: delete me later
     if (profile.profile_description) {
         c.summary.updateTab('about', profile.profile_description)

frontend/src/entities/profile/profile.schema.js

@@ -27,6 +27,8 @@ const profileSchema = {
         user_name: Joi.string(),
         user_id: Joi.number(),
         user_email: Joi.string(),
+        image: Joi.any(),
+        blurb: Joi.any(),
         profile_id: Joi.number(),
         profile_description: Joi.string().allow(null, ''),
         profile_media: Joi.array().items(Joi.string()),

frontend/src/entities/response/response.schema.js

@@ -8,7 +8,9 @@ const responseSchema = Joi.object({
     profile_id: Joi.number(),
     response_id: Joi.number(),
     response_key_id: Joi.number(),
-    val: Joi.string(),
+    // TODO: troubleshoot later, suppressed validation warning for now
+    // val: Joi.string(),
+    val: Joi.any(),
 })
 
 export { responseSchema }

frontend/src/entities/survey/survey.answer.validator.js

@@ -0,0 +1,39 @@
+import Joi from 'joi'
+import domains from './tlds-alpha-by-domain.js'
+
+const answerValidator = {
+    name: Joi.string().min(2).max(50).required(),
+    email: Joi.string().email({
+        minDomainSegments: 2,
+        tlds: { allow: domains },
+    }),
+    // TODO: change to valdate against JWT??
+    auth: Joi.any(),
+
+    // TODO: Uncomment when ease of development no longer needed
+    // password: Joi.string().min(10).max(30).pattern(new RegExp('[a-zA-Z0-9]+')),
+    password: Joi.string().max(30).pattern(new RegExp('[a-zA-Z0-9]+')),
+    // TODO: Change if going international (only works in usa)
+    zipcode: Joi.string().min(5).max(5).pattern(new RegExp('^[0-9]{5}$')),
+    seeking: Joi.string(),
+    urgency: Joi.string(),
+    presence: Joi.string(),
+    duration: Joi.string(),
+    pronouns: Joi.string(),
+    language: Joi.string(),
+    image: Joi.any(),
+    // NOTE: Allows 1 to 3 digits and then distance metric
+    distance: Joi.string()
+        .min(4)
+        .max(15)
+        .pattern(
+            new RegExp(
+                '^\\d{1,3}(\\.\\d{1,2})?\\s?(mi|km|mile|miles|kilometer|kilometers)$',
+            ),
+        ),
+    blurb: Joi.string().max(200),
+    value: Joi.string(),
+    aspect: Joi.number(),
+}
+
+export { answerValidator }

frontend/src/entities/survey/survey.js

@@ -1,8 +1,10 @@
 /** @module survey/survey */
 import { _baseRecord } from '../index.js'
 import { surveySchema } from './survey.schema.js'
+import { answerValidator } from './survey.answer.validator.js'
+import { aspectsArr } from '../../utils/lang.js'
 
-const SCORED = [1, 2, 3, 4, 5, 6]
+const SCORED = aspectsArr
 const _isScored = id => SCORED.includes(id)
 const _makeCategoryFriendly = responseCategory => {
     const labels = responseCategory.split('_vs_')
@@ -35,7 +37,31 @@ class Survey extends _baseRecord {
         /**  Fields */
         this.steps = [...questionSteps] // ! required
         this.aspectQuestions = _formatAspectQuestions(this.steps)
-        console.log('this.aspectQuestions: ', JSON.stringify(this.aspectQuestions))
+    }
+
+    hasMinResponsesToCreateProfile(responses) {
+        const neededResponseKeys = [8, 7, 11, 9]
+        const hasNeededResponseKey = responses => {
+            return responses.every(response => {
+                neededResponseKeys.includes(response.response_key_id)
+            })
+        }
+        return hasNeededResponseKey
+    }
+
+    validateAnswer(payload) {
+        const { question, input } = payload
+
+        // Continue our ugly hacks
+        const validationType =
+            question.category == 'aspect'
+                ? question.category
+                : question.survey_stage
+        const validate = answerValidator[validationType].validate(input)
+        if (validate.error) {
+            console.error(`error: ${validate.error}`)
+        }
+        return !validate.error ? true : false
     }
 
     isValid() {

frontend/src/router/index.js

@@ -7,6 +7,7 @@ import PairsView from '../views/PairsView.vue'
 import LoginView from '../views/LoginView.vue'
 import SurveyView from '../views/SurveyView.vue'
 import OnboardingView from '../views/OnboardingView.vue'
+import VerifyView from '../views/VerifyView.vue'
 import MessagesView from '../views/MessagesView.vue'
 
 const routes = [
@@ -57,12 +58,20 @@ const routes = [
         name: `SurveyView`,
         meta: { requiresAuth: true, requiresCompleteProfile: false },
     },
+    // TODO: remove after better implementation is found for verifying email
+    // hash
     {
-        path: `/onboarding`,
+        path: `/onboarding/`,
         component: OnboardingView,
         name: `OnboardingView`,
         meta: { requiresAuth: true, requiresCompleteProfile: false },
     },
+    {
+        path: `/verify/:hashedToken?`,
+        component: VerifyView,
+        name: `VerifyView`,
+        meta: { requiresAuth: true, requiresCompleteProfile: false },
+    },
     {
         path: `/login`,
         component: LoginView,

frontend/src/services/auth.service.js

@@ -1,7 +1,21 @@
+import { db } from '../utils/db.js'
+
 class Authenticator {
     constructor() {
         this.curentUser = null
     }
+    async sendAuthEmail(answered) {
+        return await db.post('/user/sendemail/', answered)
+    }
+    async verifyAuthSession(hashedToken) {
+        return await db.get(`/user/verify/${hashedToken}`)
+    }
+    async getAccessToken(req) {
+        return await db.post('/user/getaccess', req, true)
+    }
+    async validateSession(hashedAccessToken) {
+        return await db.post('/user/validatesession', hashedAccessToken, true)
+    }
 }
 
-export { Authenticator }
+export { Authenticator }

frontend/src/services/chat.service.js

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

frontend/src/services/grouping.service.js

@@ -1,6 +1,6 @@
 import { db } from '../utils/db.js'
 import { Grouping, Profile } from '../entities/index.js'
-
+import { ref } from 'vue'
 /**
  * Get Memberships associated with a single Profile from the database and
  * create a class from the data and
@@ -15,6 +15,7 @@ const fetchMembershipsByProfileId = async profileId => {
         memberships = await db.get(`/membership/${profileId}`)
         for (let membership of memberships) {
             const grouping = new Grouping(membership)
+            // TODO: look here to see about current reveal issue -bh
             if (grouping.isValid()) {
                 // Reformat incoming profile data into Profile entity
                 grouping.profile = new Profile(grouping.profile)
@@ -25,6 +26,7 @@ const fetchMembershipsByProfileId = async profileId => {
                     `/profile/${profileId}/tags/${grouping.grouping_id}`,
                 )
                 grouping.tags = [...targetTags, ...profileTags]
+                grouping.revealedFromNotification = ref([])
                 grouping._loading.value = false
                 validGroupingInstances.push(grouping)
             }

frontend/src/services/login.service.js

@@ -50,6 +50,7 @@ class Login {
      * @returns {boolean}
      */
     get isComplete() {
+        // TODO: remove once Vue Router guards allow to redirect via url
         return (
             this.responses.length == surveyFactory.questionsFromDb.length &&
             surveyFactory.questionsFromDb.length > 0

frontend/src/services/notification.service.js

@@ -1,5 +1,5 @@
 import { remote } from '../utils/db.js'
-
+import { currentProfile } from '../services'
 /**
  * Base notifier class
  * @param {number} profileId needed to listen for events for this profile
@@ -29,12 +29,41 @@ class StonkAlert extends Toaster {
         this.stonks = {}
         this.listenFor(`${profileId}.${this.event}`, message => {
             const parsed = JSON.parse(message.data)
+            if (parsed.name === 'REVEALED_INFO') {
+                this._appendTagsToGrouping(parsed)
+            }
             this.stonks[parsed.name] = parsed
             waveCb(this._formatToast(parsed), parsed.type)
         })
     }
     _formatToast(parsed) {
-        return `${parsed.name}: ${parsed.profile_id} ${parsed.order} at ${parsed.price}`
+        if (parsed.revealed_info) {
+            return `${parsed.name}: ${parsed.revealed_info} at ${parsed.type}: ${parsed.url}`
+        } else if (parsed.url) {
+            return `${parsed.name}: ${parsed.profile_id}: visit: ${parsed.url}`
+        } else {
+            return `${parsed.name}: ${parsed.profile_id} ${parsed.order} at ${parsed.price}`
+        }
+    }
+    _appendTagsToGrouping(parsed) {
+        const foundGrouping = currentProfile.groupings.find(
+            grouping => grouping.grouping_id === parsed.grouping_id,
+        )
+        if (foundGrouping) {
+            const tagFromNotification = {
+                is_active: 1,
+                tag_category: 'reveal',
+                profile_id: parsed.profile_id,
+                tag_description: parsed.description,
+                tag_id: parsed.tag,
+            }
+            const target_desc = parsed.description
+            tagFromNotification[target_desc] = parsed.revealed_info
+            foundGrouping.profile.reveal.push(tagFromNotification)
+            foundGrouping.revealedFromNotification.value.push(
+                tagFromNotification,
+            )
+        }
     }
 }
 

frontend/src/services/profile.service.js

@@ -8,8 +8,11 @@ import { Profile } from '../entities/profile/profile.js'
  * @param {number} userId
  * @returns {array} instantiated Profile objects (see: /entites/profile)
  */
-const fetchProfilesByUserId = async userId => {
-    const profilesForUserId = await db.get(`/user/${userId}/profiles`)
+const fetchProfilesByUserId = async (userId, sessionToken) => {
+    const profilesForUserId = await db.get(
+        `/user/${userId}/profiles`,
+        sessionToken,
+    )
     const validProfileInstances = []
     for (let profileData of profilesForUserId) {
         const profile = new Profile(profileData)
@@ -25,10 +28,10 @@ const createProfileForUserId = async (userId, responses) => {
     return profile
 }
 
-const fetchProfileByProfileId = async profileId => {
+const fetchProfileByProfileId = async (profileId, sessionToken) => {
     let profile
     try {
-        const profileData = await db.get(`/profile/${profileId}`)
+        const profileData = await db.get(`/profile/${profileId}`, sessionToken)
         profile = new Profile(profileData)
         if (!profile.isValid()) {
             throw '[Profile Service error]: Invalid or incomplete profile returned.'

frontend/src/services/queue.service.js

@@ -4,12 +4,16 @@ import { Profile } from '../entities/index.js'
 /**
  * Get a match queue of profiles
  * @param {number} profileId
+ * @param {number} limit
+ * @param {number} offset
  * @returns {array} profiles
  */
-const fetchQueueByProfileId = async profileId => {
+const fetchQueueByProfileId = async (profileId, offset = 0, limit = 5) => {
     let queue
     try {
-        queue = await db.get(`/profile/${profileId}/queue?include_profile=true`)
+        queue = await db.get(
+            `/profile/${profileId}/queue?include_profile=true&limit=${limit}&offset=${offset}`,
+        )
         if (!queue?.length) {
             throw '[Queue Service]: Could not retrieve match queue.\nHave you taken the survey and scored this profile?'
         }

frontend/src/services/survey.service.js

@@ -22,6 +22,17 @@ const fetchQuestions = async () => {
     return withResponses
 }
 
+const insertNewSurveyResponse = async (surveyResponse, profileId) => {
+    const keyId = surveyResponse.response_key_id
+    const val = surveyResponse.val
+    // POST
+    db.post(`/profile/${profileId}/insert/${keyId}`, {
+        profile_id: profileId,
+        response_key_id: keyId,
+        val: val,
+    })
+}
+
 const updateSurveyByProfileId = async (surveyResponses, profileId) => {
     surveyResponses.forEach(responseKeyIdwithVal => {
         const keyId = responseKeyIdwithVal.response_key_id
@@ -38,9 +49,15 @@ const updateSurveyByProfileId = async (surveyResponses, profileId) => {
     })
 }
 
-const scoreSurveyByProfileId = async (profileId, maxDistance = 99) => {
+const scoreSurveyByProfileId = async (
+    profileId,
+    maxDistance = 99,
+    duration,
+    presence,
+    certifications,
+) => {
     const scoreSurvey = await db.get(
-        `/profile/${profileId}/score?max_distance=${maxDistance}`,
+        `/profile/${profileId}/score?max_distance=${maxDistance}&duration=${duration}&presence=${presence}&certifications=${certifications}`,
     )
     return scoreSurvey
 }
@@ -51,6 +68,7 @@ const fetchResponsesByProfileId = async profileId => {
 
 export {
     fetchQuestions,
+    insertNewSurveyResponse,
     updateSurveyByProfileId,
     scoreSurveyByProfileId,
     fetchResponsesByProfileId,

frontend/src/services/user.service.js

@@ -8,6 +8,7 @@ const signupUser = async user => {
     const payload = {
         user_name: user.name,
         user_email: user.email,
+        user_pass: user.password,
         is_poster: user.seeking == 'position' ? 0 : 1,
     }
     return await db.post(`/user/signup`, payload)

frontend/src/utils/aspects.js

@@ -32,4 +32,4 @@ const Aspects = [
     },
 ]
 
-export default Aspects
+export default Aspects

frontend/src/utils/db.js

@@ -27,36 +27,60 @@ class Connector {
             patch: 'PATCH',
         }
     }
-    _makeHeader({ method, payload }) {
+    _makeHeader({ method, payload, authorization }) {
         const header = { ...headerTemplate }
         header.method = method
         if (payload) {
             header.body = JSON.stringify(payload)
         }
+        if (authorization) {
+            header.headers.authorization = authorization
+        }
         return header
     }
-    async _tryFetch({ endpoint, header }) {
+    async _tryFetch({ endpoint, header }, returnHeaders = false) {
         try {
             const res = await fetch(`${remote}${endpoint}`, header)
+            const jsonRes = await res.json()
             if (!res.ok) {
-                throw Error(res.statusText)
+                // NOTE: Somewhat hacky workaround here to get auth working
+                if (res.status === 401) {
+                    return { status: res.status }
+                } else {
+                    throw Error(res.statusText)
+                }
+            }
+            if (returnHeaders) {
+                return res.headers
+            } else {
+                return jsonRes.data
             }
-            const jsonRes = await res.json()
-            return jsonRes.data
         } catch (error) {
             console.error(`[API Util]: ${error}\nroute:`, endpoint)
         }
     }
-    async get(endpoint) {
-        return await this._tryFetch({
-            endpoint,
-            header: this._makeHeader({ method: this._verbs.get }),
-        })
+    async get(endpoint, authHeaders = false) {
+        if (authHeaders) {
+            return await this._tryFetch({
+                endpoint,
+                header: this._makeHeader({
+                    method: this._verbs.get,
+                    authorization: `${authHeaders}`,
+                }),
+            })
+        } else {
+            return await this._tryFetch({
+                endpoint,
+                header: this._makeHeader({ method: this._verbs.get }),
+            })
+        }
     }
-    async post(endpoint, payload = {}) {
+    // TODO: probably needs authHeader param for insertSurveyResponses
+    async post(endpoint, payload = {}, returnHeaders = false) {
         return await this._tryFetch({
             endpoint,
             header: this._makeHeader({ method: this._verbs.post, payload }),
+            returnHeaders,
         })
     }
     async patch(endpoint, payload = {}) {

frontend/src/utils/lang.js

@@ -1,27 +1,87 @@
-const DELIMITER = '_'
+const aspectsArr = [1, 2, 3, 4, 5, 6]
 
-// TODO: Combine these two
+// Splash page is unique in survey steps and therefore is simply spliced in
+// during survey generation
+const splash = {
+    response_key_id: 20,
+    response_key_category: 'splash',
+    response_key_prompt: 'splash page',
+    response_key_description: 'required for splash page rendering',
+    aspect: null,
+    category: 'splash',
+    component: 'Splash',
+    survey_stage: 'splash',
+    placeholder: null,
+    invalidInputPrompt: null,
+}
+
+// Auth page is also unique in survey steps and is spliced in as well
+const auth = {
+    response_key_id: 21,
+    response_key_category: 'auth',
+    response_key_prompt: 'auth page',
+    response_key_description: 'required to authenticate user signup',
+    aspect: null,
+    category: 'auth',
+    component: 'Auth',
+    survey_stage: 'auth',
+    placeholder: null,
+    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',
-        email: 'email',
-        password: 'password',
-        // pronouns: 'pronouns',
-        // seeking: 'seeking',
-        // urgency: 'urgency',
-        // experience: 'experience',
-        // roles: 'role',
-        // duration: 'duration',
-        // presence: 'presence',
-        // language: 'language',
+        ...initialSteps,
+        aspect01: 'aspect-1',
+        aspect02: 'aspect-2',
+        aspect03: 'aspect-3',
         zipcode: 'zipcode',
-        // distance: 'distance',
-        blurb: 'blurb',
+        urgency: 'urgency',
+        aspect04: 'aspect-4',
+        aspect05: 'aspect-5',
+        aspect06: 'aspect-6',
+        presence: 'presence',
+        duration: 'duration',
+        pronouns: 'pronouns',
+        language: 'language',
         image: 'image',
-        aspects: 'aspects'
+        distance: 'distance',
+        blurb: 'blurb',
+        // experience: 'experience',
+        // roles: 'role',
     },
 }
+const surveyStages = {
+    7: allSteps.usa.name,
+    8: allSteps.usa.email,
+    9: allSteps.usa.password,
+    10: allSteps.usa.zipcode,
+    11: allSteps.usa.seeking,
+    12: allSteps.usa.image,
+    13: allSteps.usa.language,
+    14: allSteps.usa.duration,
+    15: allSteps.usa.presence,
+    16: allSteps.usa.blurb,
+    17: allSteps.usa.urgency,
+    18: allSteps.usa.pronouns,
+    19: allSteps.usa.distance,
+    1: allSteps.usa.aspect01,
+    2: allSteps.usa.aspect02,
+    3: allSteps.usa.aspect03,
+    4: allSteps.usa.aspect04,
+    5: allSteps.usa.aspect05,
+    6: allSteps.usa.aspect06,
+}
 
 const aspectResponses = {
     usa: {
@@ -52,33 +112,42 @@ possible.usa = {
     // key 10
     duration: ['full-time', 'part-time', 'contract', 'flexible'],
     // Experience and roles concat, key: 14
-    experience: ['associate', 'junior', 'mid-level', 'senior', 'staff'],
-    roles: {
-        type: [
-            'back-end',
-            'database',
-            'front-end',
-            'full-stack',
-            'qa',
-            'security',
-            'system',
-            'test',
-        ],
-        position: [
-            'administrator',
-            'analyst',
-            'architect',
-            'developer',
-            'engineer',
-            'manager',
-            'technician',
-        ],
-        candidate: ['hiring_manager', 'recruiter'],
-    },
+    //     experience: ['associate', 'junior', 'mid-level', 'senior', 'staff'],
+    // roles: {
+    // type: [
+    // 'back-end',
+    // 'database',
+    // 'front-end',
+    // 'full-stack',
+    // 'qa',
+    // 'security',
+    // 'system',
+    // 'test',
+    // ],
+    // position: [
+    // 'administrator',
+    // 'analyst',
+    // 'architect',
+    // 'developer',
+    // 'engineer',
+    // 'manager',
+    // 'technician',
+    // ],
+    // candidate: ['hiring_manager', 'recruiter'],
+    // },
     pronouns: ['she/her', 'she/they', 'he/him', 'he/they', 'they/them'],
+    //    role: ['role1', 'role2'],
     image: [],
     zipcode: [],
     blurb: [],
 }
 
-export { allSteps, aspectResponses, possible, DELIMITER }
+export {
+    allSteps,
+    splash,
+    auth,
+    surveyStages,
+    aspectResponses,
+    aspectsArr,
+    possible,
+}

frontend/src/utils/survey.js

@@ -1,76 +1,91 @@
 import { Survey } from '../entities/index.js'
-import { fetchQuestions } from '../services/index.js'
-import { possible } from './lang.js'
-
-const promptToComponent = {
-    splash: 'Splash',
-    name: 'FormInput',
-    email: 'FormInput',
-    password: 'FormInput',
-    zipcode: 'FormInput',
-    // seeking: 'FormDropdown',
-    // urgency: 'FormDropdown',
-    // presence: 'FormDropdown',
-    // duration: 'FormDropdown',
-    // experience: 'FormTags',
-    // pronouns: 'FormDropdown',
-    // language: 'FormDropdown',
-    image: 'FormInput',
-    // distance: 'FormInput',
-    blurb: 'FormInput',
-    aspects: 'Aspects'
-}
-/**
- * Make a step from match or step information
- * @param {object} match
- * @param {object} step
- * @returns something like a response_key with possible responses
- */
-const formatStep = (match, step) => {
-    const responsesByCategory = possible['usa']
-    const responseKey = {
-        response_key_id: match ? match.response_key_id : null,
-        response_key_category: match ? match.response_key_category : 'profile',
-        response_key_prompt: match ? match.response_key_prompt : step,
-        response_key_description: match ? match.response_key_description : null,
-    }
-    return {
-        ...responseKey,
-        responses: responsesByCategory[step] ? responsesByCategory[step] : [],
-    }
-}
-const associateWithComponent = responseKeyLike => {
-    let component = promptToComponent[responseKeyLike.response_key_prompt]
-    return { ...responseKeyLike, component }
-}
-
-const hasMatch = (step, inArray) => {
-    return inArray.find(q => q.response_key_prompt == step)
-}
+import { fetchQuestions, insertNewSurveyResponse } from '../services/index.js'
+import { splash, auth, possible, surveyStages, allSteps } from './lang.js'
 
 class SurveyFactory {
     constructor() {
         this.questionsFromDb = []
+        this.responsesFromDb = []
+    }
+    _addResponses(responseKeys, responsesByCategory) {
+        const existingResponses = {}
+        // Removes empty form drop down options from possible['usa']
+        Object.keys(responsesByCategory).forEach(categoryKey => {
+            if (responsesByCategory[categoryKey].length) {
+                existingResponses[categoryKey] =
+                    responsesByCategory[categoryKey]
+            }
+        })
+        // Adds form drop down options to each responseKey
+        Object.keys(existingResponses).forEach(inputKey => {
+            responseKeys.forEach(responseKey => {
+                if (responseKey.survey_stage == inputKey) {
+                    responseKey.responses = existingResponses[inputKey]
+                }
+            })
+        })
+        return responseKeys
     }
-    _setSteps(langFile) {
-        const stepsToProcess = [...Object.values(langFile)]
-        const seenIds = []
-        const stepsInCommon = stepsToProcess.map(step => {
-            // Match question to step
-            const match = hasMatch(step, this.questionsFromDb)
-            if (match) {
-                seenIds.push(match.response_key_id)
+    _addComponents(responseKeys) {
+        responseKeys.forEach(responseKey => {
+            switch (responseKey.category) {
+                case 'input':
+                    responseKey.component = 'FormInput'
+                    break
+                case 'choice':
+                    responseKey.component = 'FormDropdown'
+                    break
+                case 'aspect':
+                    responseKey.component = 'QuestionResponse'
+                    break
             }
-            const responseKeyLike = formatStep(match, step)
-            const withComponent = associateWithComponent(responseKeyLike)
-            console.log('withComponent :>> ', withComponent)
-            return withComponent
         })
-        // temporary extra condition in filter 
-        let unseen = this.questionsFromDb.filter(
-            q => !seenIds.includes(q.response_key_id) && [1,2,3,4,5,6].includes(q.response_key_id),
+        return responseKeys
+    }
+    _addSurveySteps(responseKeys, surveyStages) {
+        responseKeys.forEach(responseKey => {
+            Object.keys(surveyStages).forEach((stage, i) => {
+                if (responseKey.response_key_id == stage) {
+                    responseKey.survey_stage = surveyStages[i + 1]
+                }
+            })
+        })
+        return responseKeys
+    }
+    // TODO: Don't nest the for loop...
+    _sortSurveySteps(mutatedResponseKeys, allSteps) {
+        const reordered = []
+        Object.values(allSteps).forEach(step => {
+            Object.values(mutatedResponseKeys).forEach(response => {
+                if (surveyStages[response.response_key_id] === step) {
+                    response.survey_stage = step
+                    reordered.push(response)
+                }
+            })
+        })
+        return reordered
+    }
+    _setSteps() {
+        const responseKeys = this.questionsFromDb
+        const responsesByCategory = possible['usa']
+        let mutatedResponseKeys = this._addSurveySteps(
+            responseKeys,
+            surveyStages,
+        )
+        mutatedResponseKeys = this._addResponses(
+            mutatedResponseKeys,
+            responsesByCategory,
+        )
+        mutatedResponseKeys = this._addComponents(responseKeys)
+        mutatedResponseKeys = this._sortSurveySteps(
+            mutatedResponseKeys,
+            allSteps['usa'],
         )
-        return [...stepsInCommon, ...unseen]
+        // Splash page is placed at beginning of survey
+        mutatedResponseKeys.unshift(splash)
+        // Auth page is placed after email/password
+        mutatedResponseKeys.splice(5, 0, auth)
+        return mutatedResponseKeys
     }
     async getQuestions() {
         try {
@@ -80,14 +95,25 @@ class SurveyFactory {
             console.error(err)
         }
     }
-    async createSurvey(langFile, roleTree) {
+    async addNewSurveyAnswer(responses, profileId) {
+        try {
+            this.responsesFromDb = await insertNewSurveyResponse(
+                responses,
+                profileId,
+            )
+            return this.responsesFromDb
+        } catch (err) {
+            console.error(err)
+        }
+    }
+    async createSurvey(roleTree) {
         if (!this.questionsFromDb.length) {
             const res = await this.getQuestions()
             console.warn(
                 `Attempted to create a survey before getting questions: retrieved ${res.length} questions`,
             )
         }
-        const steps = this._setSteps(langFile)
+        const steps = this._setSteps()
         return new Survey(steps, roleTree)
     }
 }

frontend/src/views/ChatView.vue

@@ -2,8 +2,13 @@
 main.view--chat
     header.mb6(v-if='profile && grouping')
         h3 chatting with:
-        p {{ target.profile_id }} | {{ grouping.profile.user_name }} | {{ grouping.profile.user_email }}
-
+        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 }}
         h3 logged in as:
         p {{ profile.id }} | {{ profile._profile.user_name }} | {{ profile._profile.user_email }}
         //- p subscriptions: {{ profile.chatter.subscriptions }}
@@ -13,10 +18,24 @@ main.view--chat
             .w-flex.row
                 button(@click='reveal(7)') reveal my name
                 button(@click='reveal(8)') reveal my email
-            p you revealed: 
-                span(v-if="grouping.revealed[profile.id]") {{ grouping.revealed }}
-            p they revealed:
-                span(v-if="grouping.revealed[grouping.profile.profile_id]") {{ grouping.revealed[grouping.profile.profile_id] }}
+                // TODO: Remove later, only for testing
+                button(@click='checkData()') check data
+            span(v-if='grouping.revealed[profile.id.value]')
+                p you revealed:
+                ul(
+                    v-for='reveal in [...new Set(grouping.revealed[profile.id.value])]'
+                )
+                    li {{ reveal.description }}
+            span(v-if='grouping.revealed[target.profile_id]')
+                p they revealed:
+                ul(v-for='reveal in grouping.revealed[target.profile_id]')
+                    li {{ reveal.description }}: {{ target[reveal.description] }}
+            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] }}
 
     article
         template(v-if='isLoading')
@@ -41,7 +60,7 @@ main.view--chat
     footer.w-flex.row
         w-input(@keyup.enter='sendMessage' outline v-model='toSend')
         w-button(@click='sendMessage')
-            w-icon mdi mdi-send
+            w-icon.icon-paper-plane
 
     MainNav
 </template>
@@ -59,8 +78,14 @@ export default {
         target: null,
         toSend: '',
         messages: [],
-        grouping: null,
+        grouping: {},
+        them: {},
     }),
+    computed: {
+        theyRevealed() {
+            return this.them
+        },
+    },
     watch: {
         async profile() {
             this.loadTargetProfile()
@@ -74,6 +99,7 @@ export default {
         this.loadTargetProfile()
         currentProfile._loading.value = true
         this.grouping = this.getGrouping()
+        this.them = this.grouping.profile
         this.messages = await currentProfile.chatter.getHistory(this.grouping.grouping_name)
         console.log('this.messages :>> ', this.messages)
         currentProfile.chatter.setOnMessage(this._onMessage)
@@ -83,6 +109,13 @@ export default {
         async reveal(tagId) {
             const grouping = this.getGrouping()
             await grouping.reveal(currentProfile.id.value, tagId)
+         },
+        // TODO: remove, only for testing reveal()
+        async checkData() {
+            console.log('currentProfile :=>', currentProfile)
+            // TODO: remove once Vue Router guards allow to redirect via url
+            console.log('currentProfile.isComplete :=>', currentProfile.isComplete) // false
+            console.log('currentProfile.isLoggedIn :=>', currentProfile.isLoggedIn) // true
         },
         /**
          * Pubnub message callback fires when message event
@@ -95,6 +128,9 @@ export default {
         },
         // TODO: test this
         getGrouping() {
+            if (this.$route.params.pid === currentProfile.profile_id) {
+                console.warn('WARNING :=> You cannot chat with yourself!!!')
+            }
             return currentProfile.groupings.find(
                 g => g.profile.profile_id == this.$route.params.pid,
             )

frontend/src/views/HomeView.vue

@@ -1,11 +1,11 @@
 <template lang="pug">
 main.view--home
-    article.w-flex.column.align-center
+    article.w-flex.sm-column.md-row.align-center
         template(v-if='isLoading')
             w-spinner(bounce)
 
         template(v-else-if='!isLoading && cards.length > 0')
-            ProfileCardList(:cards='cards')
+            ProfileCardList(:cards='cards' @loadMore='onLoadMore')
 
         template(v-else-if='cards.length === 0')
             p No profiles in match_queue.
@@ -21,7 +21,7 @@ import PairingButton from '../components/PairingButton.vue'
 
 import { Card } from '../entities'
 
-import { currentProfile } from '../services'
+import { currentProfile, fetchQueueByProfileId } from '../services'
 import { mixins } from '../utils'
 
 const notificationOpts = {
@@ -60,12 +60,36 @@ export default {
         PairingButton,
     },
     mixins: [mixins.profileMixin],
+    data() {
+        return {
+            fetchedCards: [],
+            offset: 0,
+        }
+    },
     computed: {
+        cP() {
+            return currentProfile ? currentProfile : null
+        },
         cards() {
-            return currentProfile.queue.map(qProfile => convertToCard(qProfile))
+            let initialCards = currentProfile.queue.map(qProfile =>
+                convertToCard(qProfile),
+            )
+            if (this.fetchedCards.length === 0) return initialCards
+            return [
+                ...initialCards,
+                ...this.fetchedCards.map(qProfile => convertToCard(qProfile)),
+            ]
         },
     },
     methods: {
+        async onLoadMore() {
+            this.offset += 5 // fetch next batch with updated offset
+            let newQueue = await fetchQueueByProfileId(
+                currentProfile.id._value,
+                this.offset,
+            )
+            this.fetchedCards.push(...newQueue) // update fetchedCards => recalculate cards
+        },
         // this can be placed in utils/notification.js
         notify(payload) {
             notificationOpts.message = payload

frontend/src/views/LoginView.vue

@@ -3,8 +3,8 @@ main.view--login
 
     article.pa12
         form
-            w-input.mb4(label="User E-mail" tile outline v-model="form.profileId" inner-icon-left='mdi mdi-mail')
-            w-input(label="Password" type="password" tile outline inner-icon-left='mdi mdi-eye-off')
+            w-input.mb4(label="User E-mail" tile outline v-model="form.profileId" inner-icon-left='icon-envelope')
+            w-input(label="Password" type="password" tile outline inner-icon-left='icon-eye')
 
             //- Emit up an event so we can sync App pid with currentProfile.id
             w-button.xs12.mt12(@click="$emit('updatePid', form.profileId)" type="submit") submit

frontend/src/views/OnboardingView.vue

@@ -2,57 +2,144 @@
 main.view--onboarding
     article(
         style='display: flex; flex-direction: column; align-items: center'
-        v-if='survey'
+        v-if='currentStep !== survey?.steps?.length'
     )
-        .step(v-for='(step, i) in survey.steps')
+        .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')
             component(
-                :aspect-questions='step.component == "Aspects" ? survey.aspectQuestions : null'
+                :answered='answered'
+                :currentStep='currentStep'
                 :is='step.component'
                 :question='step'
+                :responses='responses'
+                :survey='survey'
+                :surveyStepsCount='survey?.steps?.length'
                 @handle-submit='onSubmit'
                 @update-answers='updateAnswers'
                 v-if='step && currentStep == i'
             )
+        .invalidResponseMessage(
+            style='text-align: center'
+            v-if='invalidResponse'
+        )
+            p {{ survey.steps[currentStep].invalidInputPrompt }}
+
+        footer
+            p(v-if='currentStep != 0') You have completed: {{ currentStep }} / {{ survey?.steps?.length }} survey steps
+
+    article(v-else)
+        SurveyCompleteView(:answers='answered' :surveySteps='survey?.steps')
 </template>
 
 <script>
+import { Authenticator } from '../services/auth.service.js'
 import { surveyFactory } from '@/utils'
-import { allSteps } from '@/utils/lang'
 import stepViews from '@/components/onboarding'
+import SurveyCompleteView from './SurveyCompleteView.vue'
+let hashedAccessToken = null
+let currentProfileId = null
 
-// import savesurveybyprfileid - call it on submit
-// paginate to save every steps answers
 export default {
     name: 'OnboardingView',
     components: {
         ...stepViews,
+        SurveyCompleteView,
     },
     data: () => ({
         answered: {},
         aspectQuestions: [],
+        responses: [],
         currentStep: 0,
         survey: null,
+        invalidResponse: false,
+        authenticator: {},
     }),
     async created() {
-        this.survey = await surveyFactory.createSurvey(allSteps['usa'])
+        this.survey = await surveyFactory.createSurvey()
+        this.authenticator = new Authenticator()
+        hashedAccessToken = this.grabStoredCookie('siimee_access')
+        try {
+            const sessionData = await this.verifySession(hashedAccessToken)
+            currentProfileId = sessionData.profileId
+            this.responses = sessionData.responses
+            this.currentStep = this.responses.length + 3
+            this.goToStep(this.currentStep)
+        } catch (err) {
+            console.error('ERROR :=>', err)
+            this.goToStep(0)
+        }
     },
     methods: {
         onSubmit() {
             console.log(JSON.stringify(this.answered))
         },
-        goToStep(num) {
+        async goToStep(num) {
             this.currentStep = num
         },
-        updateAnswers(payload) {
-            // null payload is passed on splash page
+        grabStoredCookie(cookieKey) {
+            const cookies = document.cookie
+                .split('; ')
+                .reduce((prev, current) => {
+                    const [name, ...value] = current.split('=')
+                    prev[name] = value.join('=')
+                    return prev
+                }, {})
+            const cookieVal =
+                cookieKey in cookies ? cookies[`${cookieKey}`] : undefined
+            return cookieVal
+        },
+        async verifySession(hashedAccessToken) {
+            if (!hashedAccessToken)
+                return console.warn('WARNING :=> accessToken is not defined')
+            const validatedToken = await this.authenticator.validateSession(
+                hashedAccessToken,
+            )
+            if (validatedToken.error) {
+                throw new Error(validatedToken.error)
+            } else {
+                return validatedToken
+            }
+        },
+        async updateAnswers(payload) {
             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)}`)
+                const k = payload.question.survey_stage
+                this.answered[k] = payload.input
+                // Once validated, don't log password in answered object
+                this.answered[k] = k === 'password' ? undefined : payload.input
+                // Hacky WorkAround for Validating Answers
+                if (!this.survey.validateAnswer(payload)) {
+                    this.invalidResponse = true
+                    return
+                }
+                // Formats initial responses for response table
+                const response = {}
+                response.response_key_id = payload.question.response_key_id
+                response.val = payload.input
+                this.responses.push(response)
                 if (k === 'aspects') return
             }
-            this.goToStep(this.currentStep + 1)
+            // NOTE: If user has finished minimum profile creation,
+            // Adds survey answers to responses table and verifies tokens on each step
+            if (currentProfileId) {
+                await surveyFactory.addNewSurveyAnswer(
+                    this.responses[this.responses.length - 1],
+                    currentProfileId,
+                )
+                try {
+                    await this.verifySession(hashedAccessToken)
+                } catch (err) {
+                    this.currentStep = 0
+                    this.goToStep(this.currentStep)
+                    throw new Error(err)
+                }
+            }
+            if (this.currentStep > this.survey.steps.length) {
+                this.onSubmit(this.answered)
+            } else {
+                this.goToStep(this.currentStep + 1)
+            }
         },
     },
 }
@@ -70,6 +157,9 @@ export default {
     article
         height: 100vh
 
+    .answers
+        text-align: center
+
     .w-button
             display: flex
             width: 315px

frontend/src/views/PairsView.vue

@@ -10,7 +10,7 @@ main.view--pairs
                 //- pending tab
                 template(#item-content.1='{ item }')
                     PairsList(:pairs='pending' tab-name='pending')
-                //- paired tab 
+                //- paired tab
                 template(#item-content.2='{ item }')
                     PairsList(:pairs='paired' tab-name='paired')
 

frontend/src/views/SurveyCompleteView.vue

@@ -0,0 +1,62 @@
+<template lang="pug">
+main.view--surveycomplete
+    article(style='display: flex; flex-direction: column; align-items: center; text-align: center;')
+        h2 Thanks for Completing Our Survey!!
+        h1 Please review your answers and let us know if you need to change anything.
+        br
+        p(v-for='input in formInputs')
+            p(v-for='(value, key) in answers')
+                p(v-if='input.survey_stage == key && key !== "password"')
+                    p Your {{ key }}: {{ value }}
+        br
+        p(v-for='input in formDropdowns')
+            p(v-for='(value, key) in answers')
+                p(v-if='input.survey_stage == key')
+                    p Your {{ key }}: {{ value }}
+        br
+        p(v-for='(response, responseIndex) in questionResponses')
+            p(v-for='(value, key) in answers')
+                p(v-if='response.survey_stage == key') 
+                    p Survey Question {{ responseIndex + 1 }}: 
+                    p {{ response.response_key_prompt }}
+                    p You Answered: {{ value }}
+                    br
+        w-button.ma1(@click="changeAnswers") Change Answers
+        w-button.ma1(@click="finalSubmit") Submit Answers
+</template>
+
+<script>
+export default {
+    props: {
+        answers: {
+            type: Object,
+            default: () => ({}),
+        },
+        surveySteps: {
+            type: Array,
+            default: () => [],
+        },
+    },
+    data: () => ({
+        surveyObjects: [],
+        formInputs: [],
+        questionResponses: [],
+        formDropdowns: [],
+    }),
+    created() {
+        this.surveySteps.forEach((step) => {
+            switch (step.component) {
+                case 'FormInput':
+                    this.formInputs.push(step)
+                    break
+                case 'FormDropdown':
+                    this.formDropdowns.push(step)
+                    break
+                case 'QuestionResponse':
+                    this.questionResponses.push(step)
+                    break
+            }
+        })
+    },
+}
+</script>

frontend/src/views/SurveyView.vue

@@ -30,7 +30,7 @@ main.view--survey.f-col.start.w-full
                                 @input='storeResponseLike(step, q.response_key_id, q.response_key_prompt, profile[q.response_key_prompt])'
                                 @keyup.enter='step++'
                                 v-model='profile[q.response_key_prompt]'
-                            ) 
+                            )
                             label >{{ profile[q.response_key_prompt] }}
 
                         //- Aspects
@@ -85,7 +85,7 @@ import {
     signupUser,
 } from '@/services'
 
-import { maxDistanceKey } from '../../../backend/db/data-generator/config.json'
+import { distanceKey } from '../../../backend/db/data-generator/config.json'
 
 export default {
     props: {
@@ -207,7 +207,13 @@ export default {
 
             return userProfileRel
         },
-        async _getProfileWithScore(createdProfileId, maxDistance) {
+        async _getProfileWithScore(
+            createdProfileId,
+            maxDistance,
+            duration,
+            presence,
+            certifications,
+        ) {
             /** A Profile is associated with n:1 user and referenced by profile id */
             const fetchedProfile = await fetchProfileByProfileId(
                 createdProfileId,
@@ -223,6 +229,9 @@ export default {
             const scored = await scoreSurveyByProfileId(
                 createdProfileId,
                 maxDistance,
+                duration,
+                presence,
+                certifications,
             )
             if (!scored) {
                 console.error(`Could not score Profile ${createdProfileId}.`)
@@ -248,8 +257,19 @@ export default {
                 Object.values(this.responseLikes),
             )
             const maxDistanceRes = survey.find(
-                res => res.response_key_id == maxDistanceKey,
+                res => res.response_key_id == distanceKey,
+            )
+            const duration = survey.find(
+                res => res.response_key_id == prefKeys[1], // == 10
+            )
+            const presence = survey.find(
+                res => (res.response_key_id = prefKeys[2]), // == 11
             )
+            // TODO find certifications in responses
+            const certifications = survey.find(
+                res => (res.response_key_id = certifications),
+            )
+
             /**
              * Creating a profile only returns the created
              * user id and profile id
@@ -264,6 +284,9 @@ export default {
             const fetchedProfile = await this._getProfileWithScore(
                 createdProfileId,
                 maxDistanceRes.val,
+                duration.val,
+                presence.val,
+                certifications.val,
             )
 
             /**

frontend/src/views/VerifyView.vue

@@ -0,0 +1,77 @@
+<template lang="pug">
+.wait-message
+    p.verify-message Thanks for authenticating your email!
+    p.verify-message Please give us a moment to redirect you back to the survey
+</template>
+
+<script>
+import { Authenticator } from '../services/auth.service.js'
+let hash = null
+let hashedAccessToken = null
+export default {
+    name: 'VerifyView',
+    data: () => ({
+        authenticator: {},
+    }),
+    async created() {
+        this.authenticator = new Authenticator()
+        hash = this.$route.params.hashedToken
+        hashedAccessToken = this.grabCookie('siimee_access')
+        try {
+            this.isHashInUrl(hash)
+            await this.doesAccessTokenExist(hashedAccessToken)
+            await this.verifyActiveSession(hash)
+            await this.isSessionTokenValid(hash)
+        } catch (err) {
+            console.error(err)
+        }
+        this.$router.push('/onboarding')
+    },
+    methods: {
+        grabCookie(cookieKey) {
+            const cookies = document.cookie
+                .split('; ')
+                .reduce((prev, current) => {
+                    const [name, ...value] = current.split('=')
+                    prev[name] = value.join('=')
+                    return prev
+                }, {})
+            return `${cookieKey}` in cookies
+                ? cookies[`${cookieKey}`]
+                : undefined
+        },
+        isHashInUrl(hash) {
+            if (!hash) throw new Error('URL contains no hash!')
+        },
+        async doesAccessTokenExist(hashedAccessToken) {
+            if (!hashedAccessToken)
+                throw new Error('accessToken not in cookie store!')
+        },
+        async verifyActiveSession(hashedToken) {
+            const sessionData = await this.authenticator.verifyAuthSession(
+                hashedToken,
+            )
+            if (!sessionData.hashesMatch)
+                throw new Error('Hash is not in activeSessions!')
+        },
+        async isSessionTokenValid(hash) {
+            const sessionTokenIsValid =
+                await this.authenticator.validateSession(hash)
+            if (sessionTokenIsValid.error) {
+                throw new Error(sessionTokenIsValid.error)
+            }
+        },
+    },
+}
+</script>
+
+<style>
+.wait-message {
+    margin: 5rem auto;
+    text-align: center;
+    width: 90%;
+    max-width: 35rem;
+    font-size: 150%;
+    font-weight: bold;
+}
+</style>