Merge branch 'pubnub' of fyindr/siimee into dev

backend/lib/schemas/health.js

@@ -1,10 +1,10 @@
 'use strict'
 
-const Joi = require('Joi')
+const Joi = require('joi')
 
 const stats = Joi.object({
     date: Joi.string().required(),
     users: Joi.number().required(),
 }).label('stats')
 
-module.exports = { stats }
+module.exports = { stats }

backend/package.json

@@ -43,4 +43,4 @@
         "nyc": "^15.1.0",
         "sinon": "^11.1.2"
     }
-}
+}

backend/server/index.js

@@ -8,7 +8,6 @@ const Manifest = require('./manifest')
  */
 exports.deployment = async ({ start } = {}) => {
     const manifest = Manifest.get('/', process.env)
-    console.log(__dirname)
     const server = await Glue.compose(manifest, { relativeTo: __dirname })
 
     if (start) {

backend/server/manifest.js

@@ -1,11 +1,10 @@
-const Dotenv = require('dotenv').config({path: './server/.env'})
+const Dotenv = require('dotenv').config({ path: './server/.env' })
 const Confidence = require('@hapipal/confidence')
 const Inert = require('@hapi/inert')
 const Vision = require('@hapi/vision')
 const Schwifty = require('@hapipal/schwifty')
 const HapiSwagger = require('hapi-swagger')
 
-
 /** Glue manifest as a confidence store */
 module.exports = new Confidence.Store({
     server: {

frontend/src/components/ProfileCardList.vue

@@ -19,6 +19,7 @@ section.profile-card-list(:style="{'display': 'flex', 'overflow':'auto',}")
                     h4 {{ profile.name }}
                     nav.swipe_icons
                         //- Accept
+                        button(@click="chat(profile.pid)") chat
                         button(@click="accept") Accept
                         button(@click="view(profile.pid)") view
                         //- Pass
@@ -26,18 +27,19 @@ section.profile-card-list(:style="{'display': 'flex', 'overflow':'auto',}")
     
     .match-layout(
         v-else
-        :key="profile.pid"
         v-for="(profile, i) in loadedProfiles"
+        :key="`${profile.pid}-${i}`"
     )
-            .card.bg-cover(
-                :style="{ 'background-image': `url(${profile.avatar})` }"
-            )
-                .card--content
-                    p(style="color: magenta;") profile: {{ profile.pid }}
-                    .card--content--lower
-                        h4 {{ profile.name }}
-                        nav.swipe_icons
-                            button(@click="view(profile.pid)") view
+        .card.bg-cover(
+            :style="{ 'background-image': `url(${profile.avatar})` }"
+        )
+            .card--content
+                p(style="color: magenta;") profile: {{ profile.pid }}
+                .card--content--lower
+                    h4 {{ profile.name }}
+                    nav.swipe_icons
+                        button(@click="view(profile.pid)") view
+                        button(@click="chat(profile.pid)") chat
 </template>
 
 <script setup>
@@ -46,6 +48,7 @@ import {
     updateQueueByProfileId,
     fetchMembershipsByProfileId,
     postMembershipByProfileId,
+    currentProfile,
 } from '../services'
 
 const router = useRouter()
@@ -104,6 +107,24 @@ const accept = async () => {
 const view = pid => {
     router.push({ path: `/matches/${pid}` })
 }
+const chat = async pid => {
+    // create a chatter reference from the current profile
+    const chatter = currentProfile.chatter
+    // console.log('mock sender:', pid)
+    
+    /**  publish a new message to the chatter with the channel and the message
+     *  
+     *  title is optional
+     */
+    const res = await chatter.publish(chatter.subscriptions[1], {
+        title: 'New Message',
+        description: 'This is the start of a chat conversation!',
+    })
+    // PubNub response will be a timecode of when the message was published
+    console.log('res:', res)
+
+    //router.push({ path: `/chat/${pid}` })
+}
 const pass = () => {
     const targetId = props.profiles[0].pid
     updateQueueByProfileId(props.pid, targetId, true)

frontend/src/services/chat.service.js

@@ -1,29 +1,33 @@
 import PubNub from 'pubnub'
 
-/** 
+/**
  * Provider method holder
  * We always reference this object so
  * we don't have to hardcode provider specific
  * methods for doing chat things.
- * 
+ *
  * This gets overloaded later in the program
  */
 const providerMethods = {
     publish: () => console.error('no provider publish method set'),
     subscribe: () => console.error('no provider subscribe method set'),
-    listen: () => console.error('no provider listen method set')
+    listen: () => console.error('no provider listen method set'),
 }
 
-/** 
+/**
  * Breaking out as much pubnub specific flavor
  */
 const setupPubnub = async uuid => {
-    if(!uuid) return console.error('no pubnub uuid set')
-    
+    const publishKey = 'pub-c-73f35484-396f-47ff-b4b6-45bed079fd3b'
+    const subscribeKey = 'sub-c-6cb7f5d0-94e2-11ec-b249-a68c05a281ab'
+    // console.log('publishKey: ' , publishKey)
+    if (!uuid) return console.error('no pubnub uuid set')
+
     const pubnubClient = await new PubNub({
-        publishKey: import.meta.env.VITE_PUBNUB_PUBLISH_KEY,
-        subscribeKey: import.meta.env.VITE_PUBNUB_SUBSCRIBE_KEY,
-        uuid
+        publishKey: publishKey,
+        subscribeKey: subscribeKey,
+        logVerbosity: false,
+        uuid,
     })
     // Pass pubnub specific methods to our placeholder obj
     providerMethods['publish'] = pubnubClient.publish
@@ -33,19 +37,17 @@ const setupPubnub = async uuid => {
     return pubnubClient
 }
 
-
 class ChatMessage {
     constructor({ title, description }) {
-        this.title = title,
-        this.description = description
+        ;(this.title = title), (this.description = description)
     }
 }
 
 const testMessage = new ChatMessage({
-    title: "testing",
-    description: "hello world!",
+    title: 'testing',
+    description: 'hello world!',
 })
-const MAIN_CHANNEL = 'hello_world'
+const MAIN_CHANNEL = 'Channel-Barcelona'
 
 /** Singleton that holds all our chat information */
 class Chatter {
@@ -64,14 +66,14 @@ class Chatter {
         this.uuid = null
 
         // Setup the main channel
-        this.subscriptions = [MAIN_CHANNEL]
+        this.subscriptions = [MAIN_CHANNEL, 'Channel-LosAngeles']
         this.listeners = {
             status: async e => {
-                if (e.category !== "PNConnectedCategory") return
                 await this.publish(this.subscriptions[0], testMessage)
+                if (e.category !== 'PNConnectedCategory') return
             },
             message: this._onMessage,
-            presence: this._onPresence
+            presence: this._onPresence,
         }
     }
     /**
@@ -79,13 +81,18 @@ class Chatter {
      * @param {event} e
      */
     async _onMessage(e) {
-        console.log(`received message: ${e.message.title} - ${e.message.description}`)
+        if (e.message) {
+            console.log(
+                `received message: ${e.message.title} - ${e.message.description}`,
+                e,
+            )
+        }
     }
     async _onPresence(e) {
         return
     }
     async setup(uuid) {
-        this.uuid = uuid
+        this.uuid = `${uuid}`
         this.provider = await setupPubnub(this.uuid)
 
         this._listenFor({ listeners: this.listeners })
@@ -102,21 +109,21 @@ class Chatter {
     async publish(channel, message) {
         return await providerMethods['publish']({ channel, message })
     }
-    /** 
+    /**
      * Subscribe to a channels
      * Facade so we can hide provider specific methods
      * @param {array} channels
-    */
+     */
     _subscribe(channels) {
         providerMethods['subscribe']({ channels })
     }
-    /** 
+    /**
      * Listen to events and set callbacks
      * Facade so we can hide provider specific methods
-    */
+     */
     _listenFor({ listeners }) {
         providerMethods['listen'](listeners)
     }
 }
 
-export { Chatter }
+export { Chatter }

frontend/src/services/login.service.js

@@ -102,7 +102,8 @@ class Login {
     }
     setupChatter() {
         this.chatter = new Chatter()
-        const testAccountUUID = import.meta.env.VITE_TEST_ACCOUNT_UUID
+        // Use the reactive id object
+        const testAccountUUID = this.id.value
         this.chatter.setup(testAccountUUID)
     }
 }