feat(#350): fix minor typos in xls list pages, refactor logout

Duke-MatSci · Mar 17, 2023 · ea415e5 · ea415e5
1 parent b674366
commit ea415e5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/app/src/pages/explorer/curate/validlist/UpdateXlsList.vue b/app/src/pages/explorer/curate/validlist/UpdateXlsList.vue
@@ -4,7 +4,7 @@
           <div style="max-width: 99%;">
               <div class="md-layout md-alignment-top-center">
                   <div class="md-layout-item md-size-50 md-medium-size-70 md-small-size-85 md-xsmall-size-95">
-                    <CurateNavBar active="" :navRoutes="[]"/>
+                    <CurateNavBar active=""/>
                   </div>
               </div>
           </div>

diff --git a/app/src/pages/explorer/curate/validlist/XlsList.vue b/app/src/pages/explorer/curate/validlist/XlsList.vue
@@ -4,7 +4,7 @@
           <div style="max-width: 99%;">
               <div class="md-layout md-alignment-top-center">
                   <div class="md-layout-item md-size-50 md-medium-size-70 md-small-size-85 md-xsmall-size-95">
-                  <CurateNavBar active="" :navRoutes="[]"/>
+                  <CurateNavBar active=""/>
                   </div>
               </div>
           </div>

diff --git a/app/src/pages/explorer/curate/validlist/XlsListAll.vue b/app/src/pages/explorer/curate/validlist/XlsListAll.vue
@@ -4,7 +4,7 @@
       <div style="max-width: 99%;">
         <div class="md-layout md-alignment-top-center">
           <div class="md-layout-item md-size-50 md-medium-size-70 md-small-size-85 md-xsmall-size-95">
-            <CurateNavBar active="" :navRoutes="[]"/>
+            <CurateNavBar active=""/>
           </div>
         </div>
       </div>

diff --git a/app/src/store/modules/auth/actions.js b/app/src/store/modules/auth/actions.js
@@ -103,18 +103,19 @@ export default {
     localStorage.removeItem('displayName')
     localStorage.removeItem('tokenExpiration')
 
-    const meta = router.currentRoute?.meta
-    if (meta?.requiresAuth) {
-      router.push('/nm')
-    }
-
     clearTimeout(timer)
 
     context.commit('setUser', {
       token: null,
       userId: null,
       displayName: null
     })
+
+    const meta = router.currentRoute?.meta
+    if (meta?.requiresAuth) {
+      router.push('/nm')
+      context.dispatch('notifyUser')
+    }
   },
 
   autoLogout (context) {