From ed1c841fc2e542209fe3857a1068312e730fef01 Mon Sep 17 00:00:00 2001
From: Alex Cheung <alex.cheung@2fi-solutions.com.hk>
Date: Mon, 11 Sep 2023 09:58:50 +0800
Subject: [PATCH 1/3] fix not refesh after save

---
 src/pages/pnspsUserDetailPage/index.js      | 2 +-
 src/pages/pnspsUserGroupDetailPage/index.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/pnspsUserDetailPage/index.js b/src/pages/pnspsUserDetailPage/index.js
index 4fc4523..032cf51 100644
--- a/src/pages/pnspsUserDetailPage/index.js
+++ b/src/pages/pnspsUserDetailPage/index.js
@@ -144,7 +144,7 @@ const UserMaintainPage = () => {
                     "removeAuthIds": deletedUserAuth,
                 },
             ).then((response) => {
-                if (response.status === 200) {
+                if (response.status === 204) {
                     // notifySaveSuccess();
                     navigate('/userSearchview');
                 }
diff --git a/src/pages/pnspsUserGroupDetailPage/index.js b/src/pages/pnspsUserGroupDetailPage/index.js
index a7d9f4a..2fa6aab 100644
--- a/src/pages/pnspsUserGroupDetailPage/index.js
+++ b/src/pages/pnspsUserGroupDetailPage/index.js
@@ -12,7 +12,7 @@ import {
     GeneralConfirmWindow,
     getDeletedRecordWithRefList,
     getIdList,
-    notifyDeleteSuccess,
+    // notifyDeleteSuccess,
     // notifySaveSuccess
 } from "../../utils/CommonFunction";
 import {POST_AND_UPDATE_USER_GROUP,GET_GROUP_LIST_PATH } from "../../utils/ApiPathConst";
@@ -58,7 +58,7 @@ const UserMaintainPage = () => {
         )
             .then((response) => {
                 if (response.status === 204) {
-                    notifyDeleteSuccess();
+                    // notifyDeleteSuccess();
                     setIsWindowOpen(false);
                     navigate('/usergroupSearchview');
                 }

From 54ae81c922250c65b3dd42825a669e895715305e Mon Sep 17 00:00:00 2001
From: Alex Cheung <alex.cheung@2fi-solutions.com.hk>
Date: Mon, 11 Sep 2023 10:11:06 +0800
Subject: [PATCH 2/3] update load user group error

---
 src/pages/pnspsUserDetailPage/UserGroupCard.js  | 1 +
 src/pages/pnspsUserDetailPage/UserGroupTable.js | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/pnspsUserDetailPage/UserGroupCard.js b/src/pages/pnspsUserDetailPage/UserGroupCard.js
index 2dc62c3..063d4af 100644
--- a/src/pages/pnspsUserDetailPage/UserGroupCard.js
+++ b/src/pages/pnspsUserDetailPage/UserGroupCard.js
@@ -30,6 +30,7 @@ const UserGroupCard = ({isCollectData, updateUserGroupList,userData}) => {
 
     useEffect(() => {
         //if state data are ready and assign to different field
+        // if (Object.keys(userData).length > 0 &&currentUserData !== undefined) {
         if (Object.keys(userData).length > 0 &&currentUserData !== undefined) {
             setOnReady(true);
         }
diff --git a/src/pages/pnspsUserDetailPage/UserGroupTable.js b/src/pages/pnspsUserDetailPage/UserGroupTable.js
index b3ac9c8..4e24bc1 100644
--- a/src/pages/pnspsUserDetailPage/UserGroupTable.js
+++ b/src/pages/pnspsUserDetailPage/UserGroupTable.js
@@ -33,7 +33,8 @@ export default function UserGroupTable({setSelectedRow, userGroup}) {
 
     useEffect(() => {
         //if state data are ready and assign to different field
-        if (groupData.length > 0) {
+        console.log(groupData)
+        if (groupData!== undefined) {
             setOnReady(true);
         }
     }, [groupData]);

From 54355886ca05f64b4037aea9e93505b53399d302 Mon Sep 17 00:00:00 2001
From: Jason Chuang <jchuang@2fi-solutions.com.hk>
Date: Mon, 11 Sep 2023 11:16:22 +0800
Subject: [PATCH 3/3] update

---
 src/assets/style/navbarStyles.css          | 6 +++---
 src/pages/authentication/RegisterCustom.js | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/assets/style/navbarStyles.css b/src/assets/style/navbarStyles.css
index ab5ddce..3b03836 100644
--- a/src/assets/style/navbarStyles.css
+++ b/src/assets/style/navbarStyles.css
@@ -24,7 +24,7 @@
 }
 #navbar div li a{
     text-decoration: none;
-    font-size: 1.5rem;
+    font-size: 1.2rem;
     font-weight: 600;
     font-family: 微軟正黑體;
     color: black;
@@ -36,11 +36,11 @@
 #navbar div li a:hover::after,
 #navbar div li a:focus::after{
     content: "";
-    width: 60%;
+    width: 80%;
     height: 2px;
     background:#0C489E;
     position: absolute;
-    top: 1px;
+    bottom: 3px;
     left: 20px;
 }
 #navbar div li ul {
diff --git a/src/pages/authentication/RegisterCustom.js b/src/pages/authentication/RegisterCustom.js
index 3f485fd..ba5bc54 100644
--- a/src/pages/authentication/RegisterCustom.js
+++ b/src/pages/authentication/RegisterCustom.js
@@ -54,7 +54,7 @@ const RegisterCustom = () => (
 
               <Typography  ml={4} mr={4} mt={4} variant="body1" display="block" sx={{fontWeight: 'bold'}} gutterBottom>
               需上載身份證明文件數碼檔案以進行網上申請。
-              <br/>如：香港身份證；護照；往來港澳通行證等 
+              <br/>如：香港身份證; 護照; 中國內地身份證; 專業執業証書等 
               </Typography>
             </Grid>
             <Grid item xs={12} md={6} sx={{ borderLeft: 1 ,borderColor: 'grey.500' }}>