Reports pages for guests and volunteers for #271

ncosd · Feb 4, 2024 · 8a62a2d · 8a62a2d
1 parent 702f14a
commit 8a62a2d
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/web/admin/src/pages/ReleaseNotesPage.vue b/web/admin/src/pages/ReleaseNotesPage.vue
@@ -5,9 +5,9 @@
 <template>
 <div class="container">
   <h1>Release Notes</h1>
-  <h2 id="1.16.0">February 7, 2024 - 1.16.0</h2>
+  <h2 id="1.16.0">February 4, 2024 - 1.16.0</h2>
   <ul>
-    <li>TBD</li>
+    <li>Added reports pages for Guests and Volunteers.</li>
   </ul>
   <h2 id="1.15.0">January 31, 2024 - 1.15.0</h2>
   <ul>

diff --git a/web/app/src/components/AppNavigation.vue b/web/app/src/components/AppNavigation.vue
@@ -33,15 +33,12 @@ const signOutClick = () => {
     </button>
     <div class="collapse navbar-collapse" id="navbarSupportedContent">
       <ul class="navbar-nav mb-2 mb-lg-0">
-
-      <!--
-        <li class="nav-item">
-          <a class="nav-link" :href="config.DeliveryFormURL">Delivery</a>
-        </li>
-        -->
-        <li class="nav-item">
+        <li class="nav-item" v-if="!user.isLoggedIn">
           <a class="nav-link" :href="config.VolunteerPortalURL">Volunteer Portal</a>
         </li>
+        <li class="nav-item" v-if="user.isLoggedIn">
+          <router-link class="nav-link" :to="{name:'AboutPage'}">Profile</router-link>
+        </li>
         <li class="nav-item">
           <router-link class="nav-link" :to="{name:'AboutPage'}">About</router-link>
         </li>

diff --git a/web/app/src/config.js b/web/app/src/config.js
@@ -12,6 +12,7 @@ export let config = {
   DeliveryFormURL: import.meta.env.VITE_DELIVERY_FORM_URL || "/delivery-form",
   VolunteerPortalURL: import.meta.env.VITE_VOLUNTEER_PORTAL_URL || "VOLUNTEER_PORTAL_URL",
   EnableGuestLogin: import.meta.env.VITE_ENABLE_GUEST_LOGIN || "false",
+  MainOrgURL: import.meta.env.VITE_MAIN_ORG_URL || '#main-org-url-not-set',
 
   meta: {
     Home: {

diff --git a/web/app/src/main.js b/web/app/src/main.js
@@ -57,7 +57,6 @@ fetch('/__/firebase/init.json').then(async response => {
       isGuest = !isVolunteer
       isPending = token.claims.pendingvolunteer === true
     }
-    console.log('onAuthStateChanged saving', user, isAdmin, isVolunteer, isPending, isGuest)
     useAuthUserStore().save(user, isAdmin, isVolunteer, isPending, isGuest)
   })
 

diff --git a/web/app/src/pages/HomePage.vue b/web/app/src/pages/HomePage.vue
@@ -1,16 +1,19 @@
 <script setup>
 import { config } from '@/config';
 import DeliveryExplainer from '@/components/DeliveryExplainer.vue';
+import { useAuthUserStore } from '@/stores/authUser'
+
+const user = useAuthUserStore()
 </script>
 
 <template>
   <div class="container">
     <h1>Welcome!</h1>
-    <p>Welcome to the {{config.ProjectLongName}}.  Once you have
-      registered, use your profile to customize how you interact with the {{config.OrganizationName}}.
+    <p>Welcome to the {{config.ProjectLongName}}.</p>
+    <p v-if="!user.isLoggedIn">This is the Guest application.  Volunteers should use the Volunteer Portal link above.</p>
+    <p v-if="config.EnableGuestLogin !== 'true'">Guest registration and login is not enabled at this time.  Please use our website
+      <a :href="config.MainOrgURL">{{config.MainOrgURL}}</a> for guest services.
     </p>
 
-    <DeliveryExplainer></DeliveryExplainer>
-
   </div>
 </template>
diff --git a/web/app/src/pages/ReleaseNotesPage.vue b/web/app/src/pages/ReleaseNotesPage.vue
@@ -5,7 +5,7 @@
 <template>
 <div class="container">
   <h1>Release Notes</h1>
-  <h2 id="1.16.0">February 7, 2024 - 1.16.0</h2>
+  <h2 id="1.16.0">February 4, 2024 - 1.16.0</h2>
   <ul>
     <li><a href="https://github.com/ncosd/food-pantry-app/issues/278">#278</a> Add dark/light theme chooser to guest app header.</li>
   </ul>