From 09edfba097c2829c4a4a438b59c31b4526c9b602 Mon Sep 17 00:00:00 2001
From: "jason.lam" <jason.lam@2fi-solutions.com.hk>
Date: Tue, 23 Jan 2024 15:30:36 +0800
Subject: [PATCH] update gld user page

---
 src/components/FiDataGrid.js                     |  2 +-
 src/pages/Message/Details/index.js               |  4 ++--
 src/pages/User/DetailPage/UserAuthTable.js       | 14 +++++---------
 src/pages/User/DetailPage/UserAuthorityCard.js   |  3 ++-
 src/pages/User/DetailPage/UserGroupCard.js       |  3 ++-
 src/pages/User/DetailPage/UserGroupTable.js      |  3 ---
 src/pages/User/DetailPage/UserInformationCard.js |  7 ++++---
 src/pages/User/DetailPage/index.js               | 10 +++++-----
 src/translations/en.json                         |  4 ++++
 src/translations/zh-CN.json                      |  4 ++++
 src/translations/zh-HK.json                      |  4 ++++
 11 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/src/components/FiDataGrid.js b/src/components/FiDataGrid.js
index f8a89bc..58be5c4 100644
--- a/src/components/FiDataGrid.js
+++ b/src/components/FiDataGrid.js
@@ -153,7 +153,7 @@ export function FiDataGrid({ rows, columns, sx, autoHeight,
                     <TablePagination
                         labelDisplayedRows={
                             ({ from, to, count }) => {
-                                return '' + from + '-' + to + ' 123 ' + count
+                                return '' + from + '-' + to + ' ' + count
                             }
                         }
                     />
diff --git a/src/pages/Message/Details/index.js b/src/pages/Message/Details/index.js
index bbdab8f..25254fc 100644
--- a/src/pages/Message/Details/index.js
+++ b/src/pages/Message/Details/index.js
@@ -79,7 +79,7 @@ const Index = () => {
                         <Grid container justifyContent="flex-start" alignItems="center" >
                             <center>
                                 <Grid item xs={12} md={12} sx={{p:2}} >
-                                    <Typography variant="h2" sx={{ textAlign: "left", borderBottom: "1px solid black" }}>
+                                    <Typography variant="h3" sx={{ textAlign: "left", borderBottom: "1px solid black" }}>
                                     {record?.subject}
                                     </Typography>
                                     <Typography sx={{p:1}} align="justify">{DateUtils.datetimeStr(record?.sentDate)}</Typography>
@@ -87,7 +87,7 @@ const Index = () => {
                                         <div  dangerouslySetInnerHTML={{__html: record?.content}}></div>
                                     </Typography>
 
-                                    <Typography variant="h3" sx={{ ml: 8, mt: 4, mr: 8, textAlign: "center" }}>
+                                    <Typography variant="h4" sx={{ ml: 8, mt: 4, mr: 8, textAlign: "center" }}>
                                         <Button
                                             component="span"
                                             variant="contained"
diff --git a/src/pages/User/DetailPage/UserAuthTable.js b/src/pages/User/DetailPage/UserAuthTable.js
index 2f53a39..3cd5083 100644
--- a/src/pages/User/DetailPage/UserAuthTable.js
+++ b/src/pages/User/DetailPage/UserAuthTable.js
@@ -20,22 +20,18 @@ export default function UserAuthTable({setSelectedRow, userAuth,isNewRecord}) {
     const [onReady, setOnReady] = useState(false);
     const [currentSelectedRow, setCurrentSelectedRow] = useState(userAuth);
     const _sx = {
-        ml: 3,
-        mb: 3,
-        mr: 3,
-        padding: "4 2 4 2",
         boxShadow: 1,
         border: 1,
         borderColor: '#DDD',
         '& .MuiDataGrid-cell': {
             borderTop: 1,
-            borderBottom: 1,
+            //borderBottom: 1,
             borderColor: "#EEE"
         },
-        '& .MuiDataGrid-footerContainer': {
-            border: 1,
-            borderColor: "#EEE"
-        }
+        // '& .MuiDataGrid-footerContainer': {
+        //     border: 1,
+        //     borderColor: "#EEE"
+        // }
     }
     useEffect(() => {
         axios.get(`${apiPath}${GET_AUTH_LIST}`)
diff --git a/src/pages/User/DetailPage/UserAuthorityCard.js b/src/pages/User/DetailPage/UserAuthorityCard.js
index fd2dd27..756a33a 100644
--- a/src/pages/User/DetailPage/UserAuthorityCard.js
+++ b/src/pages/User/DetailPage/UserAuthorityCard.js
@@ -49,8 +49,9 @@ const UserAuthorityCard = ({ isCollectData, updateUserAuthList, userData, isNewR
             <MainCard elevation={0}
                 border={false}
                 content={false}
+                sx={{margin: 0}}
             >
-                <Typography variant="h6" sx={{ mt: 3, ml: 3, mb: 2, mr: 3, borderBottom: "1px solid black" }}>
+                <Typography variant="h6" sx={{ mt: 2, ml: 3, mr: 1, borderBottom: "1px solid black" }}>
                     User Authority
                 </Typography>
 
diff --git a/src/pages/User/DetailPage/UserGroupCard.js b/src/pages/User/DetailPage/UserGroupCard.js
index d926c95..245eb44 100644
--- a/src/pages/User/DetailPage/UserGroupCard.js
+++ b/src/pages/User/DetailPage/UserGroupCard.js
@@ -48,8 +48,9 @@ const UserGroupCard = ({isCollectData, updateUserGroupList,userData,isNewRecord}
             <MainCard elevation={0}
                       border={false}
                       content={false}
+                      sx={{margin: 0}}
             >
-                <Typography variant="h5" sx={{mt: 3, ml: 3, mb: 2, mr: 3, borderBottom: "1px solid black"}}>
+                <Typography variant="h6" sx={{mt: 2, ml: 3, mr: 1, borderBottom: "1px solid black"}}>
                     Group(s)
                 </Typography>
                 <UserGroupTable
diff --git a/src/pages/User/DetailPage/UserGroupTable.js b/src/pages/User/DetailPage/UserGroupTable.js
index 060499c..90435f8 100644
--- a/src/pages/User/DetailPage/UserGroupTable.js
+++ b/src/pages/User/DetailPage/UserGroupTable.js
@@ -19,9 +19,6 @@ export default function UserGroupTable({setSelectedRow, userGroup,isNewRecord})
     const [currentSelectedRow, setCurrentSelectedRow] = useState(userGroup);
     
     const _sx = {
-        ml: 3,
-        mb: 3,
-        mr: 3,
         padding: "4 2 4 2",
         boxShadow: 1,
         border: 1,
diff --git a/src/pages/User/DetailPage/UserInformationCard.js b/src/pages/User/DetailPage/UserInformationCard.js
index 265d9dc..07b5cab 100644
--- a/src/pages/User/DetailPage/UserInformationCard.js
+++ b/src/pages/User/DetailPage/UserInformationCard.js
@@ -67,8 +67,9 @@ const UserInformationCard = ({isCollectData, updateUserObject,userData,isNewReco
             <MainCard elevation={0}
                       border={false}
                       content={false}
+                      sx={{margin: 0}}
             >
-                <Typography variant="h5" sx={{mt: 3, ml: 3, mr: 3, borderBottom: "1px solid black"}}>
+                <Typography variant="h6" sx={{ mt: 2, ml: 3, mr: 1, borderBottom: "1px solid black"}}>
                     Information
                 </Typography>
 
@@ -236,10 +237,10 @@ const UserInformationCard = ({isCollectData, updateUserObject,userData,isNewReco
                             </Grid>
                         </Grid> */}
 
-                        <Grid item xs={12} s={12} md={12} lg={12} sx={{ml: 3, mr: 3, mb: 3}}>
+                        <Grid item xs={12} s={12} md={12} lg={12} sx={{ml: 3, mr: 3}}>
                             <Grid container>
                                 <Grid item xs={4} s={4} md={4} lg={4}
-                                      sx={{ml: 3, mr: 3, display: 'flex', alignItems: 'center'}}>
+                                      sx={{ml: 3, mr: 3, mb:3, display: 'flex', alignItems: 'center'}}>
                                     <FormLabel required>Locked:</FormLabel>
                                 </Grid>
 
diff --git a/src/pages/User/DetailPage/index.js b/src/pages/User/DetailPage/index.js
index fc21433..ad62fbb 100644
--- a/src/pages/User/DetailPage/index.js
+++ b/src/pages/User/DetailPage/index.js
@@ -221,7 +221,7 @@ const UserMaintainPage = () => {
                 <Grid item xs={12} md={5} lg={5}>
                     <Grid container>
                         <Grid item xs={12} md={12} lg={12}>
-                            <Box xs={12} ml={4} mt={3} sx={{ p: 1, borderRadius: '10px', backgroundColor: '#fff' }}>
+                            <Box xs={12} ml={4} mt={2} sx={{ borderRadius: '10px', backgroundColor: '#fff' }}>
                                 <UserInformationCard
                                     updateUserObject={updateUserObject}
                                     userData={userData}
@@ -231,8 +231,8 @@ const UserMaintainPage = () => {
                             </Box>
                         </Grid>
 
-                        <Grid item xs={12} md={12} lg={12} sx={{ mt: 3 }}>
-                            <Box xs={12} ml={4} mt={2} sx={{ p: 1, borderRadius: '10px', backgroundColor: '#fff' }}>
+                        <Grid item xs={12} md={12} lg={12} sx={{ mt: 0.5 }}>
+                            <Box xs={12} ml={4} mt={2} sx={{borderRadius: '10px', backgroundColor: '#fff' }}>
                                 <UserGroupCard
                                     updateUserGroupList={updateUserGroupList}
                                     userData={userData}
@@ -245,7 +245,7 @@ const UserMaintainPage = () => {
                 </Grid>
                 {/*col 2*/}
                 <Grid item xs={12} md={7} lg={7}>
-                    <Box xs={12} ml={4} mt={3} mr={3} sx={{ p: 1, borderRadius: '10px', backgroundColor: '#fff' }}>
+                    <Box xs={12} ml={2} mt={2} mr={3} sx={{ borderRadius: '10px', backgroundColor: '#fff' }}>
                         <UserAuthorityCard
                             updateUserAuthList={updateUserAuthList}
                             userData={userData}
@@ -256,7 +256,7 @@ const UserMaintainPage = () => {
                 </Grid>
 
                 {/*bottom button*/}
-                <Grid item s={12} md={12} lg={12} sx={{ mb: 3 }} alignItems={"end"} justifyContent="center">
+                <Grid item s={12} md={12} lg={12} sx={{ mt:1, mb:2 }} alignItems={"end"} justifyContent="center">
                     <Grid container maxWidth justifyContent="flex-end">
                         <Grid item sx={{ ml: 3, mr: 3 }}>
                             <Button
diff --git a/src/translations/en.json b/src/translations/en.json
index 655115b..abb1f21 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -355,6 +355,10 @@
   "district": "District",
   "noRecordFound": "No record found",
   "rowsPerPage": "Rows Per Page",
+  "date" : "Date",
+  "keyword": "Key word",
+  "dateFrom": "Date(From)",
+  "dateTo": "Date(To)",
 
   "Dashboard": "Dashboard",
   "event": "Event"
diff --git a/src/translations/zh-CN.json b/src/translations/zh-CN.json
index 6558d95..aec6ce2 100644
--- a/src/translations/zh-CN.json
+++ b/src/translations/zh-CN.json
@@ -355,6 +355,10 @@
   "district": "区",
   "noRecordFound": "找不到記錄",
   "rowsPerPage": "每页项数",
+  "date" : "日期",
+  "keyword": "关键字",
+  "dateFrom": "日期(从)",
+  "dateTo": "日期(到)",
 
   "Dashboard": "仪表板",
   "event": "活动"
diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json
index 7c0e384..b2ad9e8 100644
--- a/src/translations/zh-HK.json
+++ b/src/translations/zh-HK.json
@@ -355,6 +355,10 @@
   "district": "區",
   "noRecordFound": "找不到記錄",
   "rowsPerPage": "每頁項數",
+  "date" : "日期",
+  "keyword": "關鍵字",
+  "dateFrom": "日期(從)",
+  "dateTo": "日期(到)",
 
   "Dashboard": "儀表板",
   "event": "活動"