Merge branch 'login' of fyindr/siimee into dev

frontend/src/App.vue

@@ -21,7 +21,8 @@ import TopNav from './components/TopNav.vue'
 import { currentProfile } from './services'
 import { surveyFactory } from './utils'
 
-const DEV_MODE = import.meta.env.VITE_DEV == 'true'
+// const DEV_MODE = import.meta.env.VITE_DEV == 'true'
+const DEV_MODE = false
 const DEV_PID = 45
 
 export default {
@@ -57,8 +58,15 @@ export default {
             if (currentProfile.isLoggedIn) {
                 currentProfile.logout()
             }
+
             await currentProfile.login(profileId, this.$waveui.notify)
             console.log('---')
+
+            /**
+             * Default to the HomeView and alter as needed (side-effects!)
+             */
+            const toRoute = { name: 'HomeView' }
+            this.$router.push(toRoute)
         },
     },
 }

frontend/src/views/ChatView.vue

@@ -23,7 +23,7 @@ main.view--chat
         button(@click="sendMessage") send
 
     p(v-else-if="profile.isLoggedIn && !target") No match found between profile {{ $route.params.pid }} and {{profile.id}}... 
-    p(v-else) Loading...
+    w-spinner(v-else bounce)
 
     MainNav
 </template>

frontend/src/views/HomeView.vue

@@ -5,7 +5,7 @@ main.view--home
         ProfileCardList(:pid='pid' :cards='cards' @reload='getCards')
 
     p(v-else-if='cards.length === 0') No profiles in match_queue.
-    p(v-else) Loading...
+    w-spinner(v-else bounce)
 
     footer
         w-form

frontend/src/views/LoginView.vue

@@ -1,46 +1,21 @@
 <template lang="pug">
 main.view--login
-    header
-        h2 Login
 
-    article
-        form(@submit.prevent="onSubmit")
-            label profile id:
-            input(required="" type="profileId" v-model="form.profileId")
+    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')
 
             //- Emit up an event so we can sync App pid with currentProfile.id
-            button(@click="$emit('updatePid', form.profileId)" type="submit") submit
+            w-button.xs12.mt12(@click="$emit('updatePid', form.profileId)" type="submit") submit
 </template>
 
 <script>
-import { currentProfile } from '../services'
-
 export default {
     data: () => ({
         form: {
             profileId: null,
         },
     }),
-    methods: {
-        async onSubmit() {
-            if (!this.form.profileId) console.error('No profile in form')
-
-            /**
-             * Default to the HomeView and alter as needed (side-effects!)
-             */
-            const toRoute = { name: 'HomeView' }
-
-            /**
-             * Profile needs a complete survey and
-             * alters the url if it's incomplete
-             */
-            const alreadyLoggedIn = await currentProfile.isLoggedIn
-            if (!alreadyLoggedIn) {
-                await currentProfile.login(this.form.profileId)
-            }
-
-            this.$router.push(toRoute)
-        },
-    },
 }
 </script>

frontend/src/views/MatchesView.vue

@@ -7,7 +7,7 @@ main.view--matches
             ProfileCardList(:pid='pid' :profiles='matches' @reload='getCards')
 
         p(v-else-if='matches.length === 0') No matches.
-        p(v-else) Loading...
+        w-spinner(v-else bounce)
 
     MainNav
 </template>

frontend/src/views/ProfileView.vue

@@ -8,7 +8,7 @@ main.view--profile
             :is-list='false'
             :card='card'
         )
-    p(v-else) Loading...
+    w-spinner(v-else bounce)
 
     MainNav
 </template>