Fix pending user broken login and page layout (#127)

* Fix to route to /pending * Remove page header if user has 'pending' role
SADEAFxSMU · Oct 9, 2020 · ee15e84 · ee15e84
1 parent cb327c2
commit ee15e84
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/sadeaf-web/layouts/default.vue b/sadeaf-web/layouts/default.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="layout">
     <el-container v-if="user" style="height: 100%">
-      <el-header>
+      <el-header v-if="user.role !== 'pending'">
         <admin-navbar v-if="userType === 'admin'" />
         <client-navbar v-else-if="userType === 'client'" />
         <volunteer-navbar v-else-if="userType === 'volunteer'" />

diff --git a/sadeaf-web/pages/index.vue b/sadeaf-web/pages/index.vue
@@ -17,7 +17,7 @@ export default {
   },
   methods: {
     navigateToRoleHome() {
-      this.$router.replace(ROLE_PROFILE_PAGE_MAPPING[this.userType]);
+      this.$router.replace(ROLE_PROFILE_PAGE_MAPPING[this.userType] || '/pending');
     },
   },
   computed: {