From 721600b12de513a0cec631072e9215e1564bd1b0 Mon Sep 17 00:00:00 2001
From: Lance Edgar <lance@edbob.org>
Date: Fri, 26 Aug 2022 17:56:31 -0500
Subject: [PATCH] Add home page component; fix user state issues

must be sure to keep "anonymous" user represented as {} instead of
null, otherwise getting errors.  this also fixes the menu upon user
login; previously it wasn't showing most options
---
 src/components/app/ByjoveApp.vue     |  2 +-
 src/components/home/ByjoveHome.vue   | 55 ++++++++++++++++++++++++++++
 src/components/home/index.js         | 28 ++++++++++++++
 src/components/index.js              |  2 +
 src/components/login/ByjoveLogin.vue |  5 ++-
 src/components/menu/ByjoveMenu.vue   |  6 +--
 src/plugin.js                        |  2 +-
 7 files changed, 93 insertions(+), 7 deletions(-)
 create mode 100644 src/components/home/ByjoveHome.vue
 create mode 100644 src/components/home/index.js

diff --git a/src/components/app/ByjoveApp.vue b/src/components/app/ByjoveApp.vue
index b8d18cd..78b0fd1 100644
--- a/src/components/app/ByjoveApp.vue
+++ b/src/components/app/ByjoveApp.vue
@@ -42,7 +42,7 @@ export default {
         this.$http.get('/api/session').then(response => {
 
             // let all of app know who the user is(n't)
-            this.$store.commit('SET_USER', response.data.user)
+            this.$store.commit('SET_USER', response.data.user || {})
             this.$store.commit('SET_USER_IS_ADMIN', response.data.user ? response.data.user.is_admin : false)
             this.$store.commit('SET_USER_IS_ROOT', response.data.user ? response.data.user.is_root : false)
 
diff --git a/src/components/home/ByjoveHome.vue b/src/components/home/ByjoveHome.vue
new file mode 100644
index 0000000..df9da81
--- /dev/null
+++ b/src/components/home/ByjoveHome.vue
@@ -0,0 +1,55 @@
+<template>
+  <div>
+    <img :alt="`${appsettings.systemTitle} logo`" :src="appsettings.logo" />
+    <h1>Welcome to {{ appsettings.appTitle }}</h1>
+  </div>
+</template>
+
+<script>
+export default {
+    name: 'ByjoveHome',
+    props: {
+        appsettings: {
+            type: Object,
+        },
+        forceLogin: {
+            type: Boolean,
+            default: false,
+        },
+    },
+    data() {
+        return {
+            inited: false,
+        }
+    },
+    created() {
+        this.init()
+    },
+    watch: {
+        '$store.state.session_established': 'init',
+    },
+    methods: {
+        init() {
+            if (this.inited) return
+
+            // nothing to check, unless login is to be enforced
+            if (!this.forceLogin) {
+                this.inited = true
+                return
+            }
+
+            // cannot init until session is established
+            if (!this.$store.state.session_established) {
+                return
+            }
+
+            this.inited = true
+
+            // send anonymous users to login page
+            if (!this.$store.state.user.uuid) {
+                this.$router.push('/login')
+            }
+        },
+    },
+}
+</script>
diff --git a/src/components/home/index.js b/src/components/home/index.js
new file mode 100644
index 0000000..d30b2ef
--- /dev/null
+++ b/src/components/home/index.js
@@ -0,0 +1,28 @@
+// Import vue component
+import ByjoveHome from './ByjoveHome.vue'
+
+// Declare install function executed by Vue.use()
+export function install(Vue) {
+    if (install.installed) return;
+    install.installed = true;
+    Vue.component('ByjoveHome', ByjoveHome);
+}
+
+// Create module definition for Vue.use()
+const plugin = {
+    install,
+};
+
+// Auto-install when vue is found (eg. in browser via <script> tag)
+let GlobalVue = null;
+if (typeof window !== 'undefined') {
+    GlobalVue = window.Vue;
+} else if (typeof global !== 'undefined') {
+    GlobalVue = global.Vue;
+}
+if (GlobalVue) {
+    GlobalVue.use(plugin);
+}
+
+// To allow use as module (npm/webpack/etc.) export component
+export default ByjoveHome
diff --git a/src/components/index.js b/src/components/index.js
index 6ef2c19..8b5f991 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -1,5 +1,6 @@
 import ByjoveApp from './app'
 import ByjoveMenu from './menu'
+import ByjoveHome from './home'
 import ByjoveLogo from './logo'
 import ByjoveFeedback from './feedback'
 import ByjoveLogin from './login'
@@ -13,6 +14,7 @@ import ByjoveReceiving from './receiving'
 export {
     ByjoveApp,
     ByjoveMenu,
+    ByjoveHome,
     ByjoveLogo,
     ByjoveFeedback,
     ByjoveLogin,
diff --git a/src/components/login/ByjoveLogin.vue b/src/components/login/ByjoveLogin.vue
index a9100bf..218c17e 100644
--- a/src/components/login/ByjoveLogin.vue
+++ b/src/components/login/ByjoveLogin.vue
@@ -80,7 +80,7 @@ export default {
             this.inited = true
 
             // send logged-in users to "home" page
-            if (this.$store.state.user) {
+            if (this.$store.state.user.uuid) {
                 this.$router.push('/')
             }
         },
@@ -99,7 +99,8 @@ export default {
                 if (response.data.ok) {
 
                     // login successful; let the app know
-                    this.$loginUser(response.data.user)
+                    this.$byjoveLoginUser(response.data.user,
+                                          response.data.permissions)
 
                     // send user to "home" page
                     this.$router.push('/')
diff --git a/src/components/menu/ByjoveMenu.vue b/src/components/menu/ByjoveMenu.vue
index 5dece5b..9bda90f 100644
--- a/src/components/menu/ByjoveMenu.vue
+++ b/src/components/menu/ByjoveMenu.vue
@@ -2,7 +2,7 @@
   <section>
     <nav class="level is-mobile">
 
-      <div v-if="user"
+      <div v-if="user.uuid"
            class="level-item">
 
         <b-dropdown aria-role="menu">
@@ -43,7 +43,7 @@
         </b-dropdown>
       </div>
 
-      <div v-if="!user && showLoginButton"
+      <div v-if="!user.uuid && showLoginButton"
            class="level-item">
         <b-button type="is-primary"
                   tag="router-link" to="/login">
@@ -137,7 +137,7 @@ export default {
             if (this.allowFeedback !== null) {
                 return this.allowFeedback
             }
-            if (!this.allowAnonymousFeedback && !this.user) {
+            if (!this.allowAnonymousFeedback && !this.user.uuid) {
                 return false
             }
             return true
diff --git a/src/plugin.js b/src/plugin.js
index aecb2ee..488f8bf 100644
--- a/src/plugin.js
+++ b/src/plugin.js
@@ -25,7 +25,7 @@ export function ByjovePlugin(Vue) {
             $byjoveLogoutUser() {
 
                 // remove user info from app store
-                this.$store.commit('SET_USER', null)
+                this.$store.commit('SET_USER', {})
                 this.$store.commit('SET_USER_IS_ADMIN', false)
                 this.$store.commit('SET_USER_IS_ROOT', false)
             },