From 0de81c2b3f56f57121f6a9f911c599cef70eeeb2 Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期二, 05 九月 2023 14:23:27 +0800
Subject: [PATCH] Update: 0901-P5 URL manipulation

---
 PAMapp/components/NavBar.vue |   80 +++++++++++++++++++++++++++++++++++----
 1 files changed, 71 insertions(+), 9 deletions(-)

diff --git a/PAMapp/components/NavBar.vue b/PAMapp/components/NavBar.vue
index 3754bfb..3242e17 100644
--- a/PAMapp/components/NavBar.vue
+++ b/PAMapp/components/NavBar.vue
@@ -3,15 +3,18 @@
     <div class="pam-header__logo"
       @click="pushRouterByLoginRole"></div>
     <div class="pam-header__title">
-      <div class="pam-header__title--main">���兢蝳��蜓</div>
-      <div class="pam-header__title--sub">�����兢蝳�風��</div>
+      <div class="pam-header__title--main">�憿找�����</div>
+      <div class="pam-header__title--sub">��������“���</div>
     </div>
     <div class="pam-header__action-bar">
       <i
-        v-if="currentRole"
-        class="icon-bell text--dark-blue cursor--pointer fix-chrome-click--issue"
+        v-if="isShowNotification"
+        class="icon-bell text--dark-blue cursor--pointer"
         @click="$router.push('/notification')"
-      ></i>
+      >
+        <span :class="{'newNotification': isNewNotification}"></span>
+      </i>
+
         <el-dropdown :class="{'is-open':isOpenDropdown}"
           ref="dropdown"
           trigger="click"
@@ -49,9 +52,12 @@
 
 <script lang="ts">
   import { Vue, Component } from 'vue-property-decorator';
-  import { namespace } from 'nuxt-property-decorator';
+  import { Action, namespace, State, Watch } from 'nuxt-property-decorator';
   import { Role } from '~/shared/models/enum/Role';
   import * as _ from 'lodash';
+  import { NotificationList } from '~/shared/models/reviews.model';
+  import { AppointmentLog } from '~/shared/models/appointment.model';
+  import loginService from '~/shared/services/login.service'
 
   const roleStorage = namespace('localStorage');
   @Component
@@ -71,6 +77,21 @@
 
     @roleStorage.Getter
     isAdminLogin!: boolean;
+
+    @roleStorage.Getter
+    isUserLogin!: boolean;
+
+    @Action
+    storeMyPersonalNotification!: () => void;
+
+    @State
+    notificationList!: NotificationList[];
+
+    @Action
+    storeMyAppointmentReviewLog!: () => void;
+
+    @State
+    unReviewLogList!: AppointmentLog[];
 
     isOpenDropdown = false;
 
@@ -107,7 +128,7 @@
       {
         authorityOfRoleList: [Role.NOT_LOGIN, Role.USER],
         routeUrl: '/faq',
-        title: 'F&Q 撣貉����',
+        title: 'FAQ 撣貉����',
       },
       {
         authorityOfRoleList: [Role.USER, Role.ADMIN],
@@ -120,6 +141,16 @@
         title: '憿批��',
       },
     ];
+
+    //////////////////////////////////////////////////////////////////////
+
+    @Watch('$route', {immediate: true})
+    onRouterChange() {
+        if (this.currentRole) {
+          this.storeMyPersonalNotification();
+          this.storeMyAppointmentReviewLog();
+        }
+    }
 
     //////////////////////////////////////////////////////////////////////
 
@@ -136,12 +167,29 @@
     }
 
     logout(): void {
-      this.storageClear();
-      _.isEqual(this.$route.name, 'index') ? location.reload() : this.$router.push('/');
+      loginService.logout().then(() => {
+        this.storageClear();
+        _.isEqual(this.$route.name, 'index') ? location.reload() : this.$router.push('/');
+      });
     }
 
     get loginRole(): Role {
       return this.idToken && this.currentRole ? (this.currentRole as Role): Role.NOT_LOGIN;
+    }
+
+    get isShowNotification() {
+      if (this.isUserLogin) {
+        return this.notificationList.length || this.unReviewLogList.length;
+      }
+      if (this.isAdminLogin) {
+        return this.notificationList.length
+      }
+    }
+
+    get isNewNotification() {
+      if (this.currentRole) {
+        return this.notificationList.filter(item => !item.readDate).length;
+      }
     }
 
   }
@@ -209,6 +257,7 @@
 
       i {
         padding: 0px 15px;
+        @extend .fix-chrome-click--issue;
 
         @media screen and (max-width: 352px) {
           padding: 0px 10px;
@@ -221,6 +270,19 @@
           margin: 0px 10px;
         }
       }
+
+      .icon-bell {
+        position: relative;
+        .newNotification {
+          position: absolute;
+          width: 10px;
+          height: 10px;
+          top: 0;
+          right: 15px;
+          border-radius: 50px;
+          background: $PRIMARY_RED;
+        }
+      }
     }
   }
 

--
Gitblit v1.8.0