From 5ea7d79c4cb2bcdc85f483f747c338904098d458 Mon Sep 17 00:00:00 2001
From: JOSEPH LE <joseph.le@apactech.io>
Date: Mon, 16 Sep 2024 15:06:07 +0700
Subject: [PATCH] update Ui

---
 FRONTEND/src/components/Navbar/Navbar.tsx      |  2 +-
 FRONTEND/src/pages/Allocation/Allocation.tsx   | 18 ++++++++++++++----
 .../pages/LeaveManagement/LeaveManagement.tsx  |  2 +-
 FRONTEND/src/pages/Tickets/Tickets.tsx         |  1 -
 FRONTEND/src/pages/Timekeeping/Timekeeping.tsx |  1 -
 FRONTEND/src/pages/Worklogs/Worklogs.tsx       |  2 +-
 FRONTEND/src/routes/main.tsx                   | 10 ++++++----
 7 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/FRONTEND/src/components/Navbar/Navbar.tsx b/FRONTEND/src/components/Navbar/Navbar.tsx
index 6492cad..740a662 100755
--- a/FRONTEND/src/components/Navbar/Navbar.tsx
+++ b/FRONTEND/src/components/Navbar/Navbar.tsx
@@ -57,7 +57,7 @@ const data = [
     link: '/tracking',
     label: 'Check in/out',
     icon: IconScan,
-    group: 'normal',
+    group: 'admin',
   },
   {
     link: '/worklogs',
diff --git a/FRONTEND/src/pages/Allocation/Allocation.tsx b/FRONTEND/src/pages/Allocation/Allocation.tsx
index 53ee51c..c275a3b 100644
--- a/FRONTEND/src/pages/Allocation/Allocation.tsx
+++ b/FRONTEND/src/pages/Allocation/Allocation.tsx
@@ -3311,11 +3311,20 @@ const Allocation = () => {
         <Box
           style={{
             display: !loading ? 'flex' : 'none',
-            // display: 'flex',
-            flexWrap: 'wrap',
-            justifyContent: 'space-evenly',
+            flexFlow: 'column',
           }}
         >
+          <Box>
+          <Text fw={600} fz={'md'}>Admin/</Text>
+          <Text fw={700} fz={'lg'}>Personnel Allocation</Text>
+          <Text fw={600} fz={'sm'} c={'gray'} fs={'italic'} ml={'md'}>"P:" is the timspent/timeestimate number within the project itself</Text>
+          <Text fw={600} fz={'sm'} c={'gray'} fs={'italic'} ml={'md'}>"A:" is the timspent/timeestimate of all projects</Text>
+          </Box>
+          <Box style={{
+            display: 'flex',
+            flexWrap: 'wrap',
+            justifyContent: 'space-evenly',
+          }}>
           {!loading &&
             Object.keys(data?.projects).map((pro) => {
               return (
@@ -3511,7 +3520,7 @@ const Allocation = () => {
                   }
                 />
                 <Text ml={'md'} fw={700} size="lg">
-                  WARNING
+                  WARNING - NO ASSIGNMENT
                 </Text>
               </Card.Section>
 
@@ -3537,6 +3546,7 @@ const Allocation = () => {
                 })}
             </Card>
           </Box>
+          </Box>
         </Box>
       </div>
     </div>
diff --git a/FRONTEND/src/pages/LeaveManagement/LeaveManagement.tsx b/FRONTEND/src/pages/LeaveManagement/LeaveManagement.tsx
index 0131682..4aa1d0f 100644
--- a/FRONTEND/src/pages/LeaveManagement/LeaveManagement.tsx
+++ b/FRONTEND/src/pages/LeaveManagement/LeaveManagement.tsx
@@ -247,7 +247,7 @@ const LeaveManagement = () => {
     <div>
       <div className={classes.title}>
         <h3>
-          <Text>Admin/</Text> Leave Management
+          Leave Management
         </h3>
       </div>
       <Drawer
diff --git a/FRONTEND/src/pages/Tickets/Tickets.tsx b/FRONTEND/src/pages/Tickets/Tickets.tsx
index 90e340e..11b65d6 100755
--- a/FRONTEND/src/pages/Tickets/Tickets.tsx
+++ b/FRONTEND/src/pages/Tickets/Tickets.tsx
@@ -323,7 +323,6 @@ const Tickets = () => {
     <div>
       <div className={classes.title}>
         <h3>
-          <Text>Admin/</Text>
           Tickets
         </h3>
         <Button
diff --git a/FRONTEND/src/pages/Timekeeping/Timekeeping.tsx b/FRONTEND/src/pages/Timekeeping/Timekeeping.tsx
index 7c19cb9..8687c9a 100644
--- a/FRONTEND/src/pages/Timekeeping/Timekeeping.tsx
+++ b/FRONTEND/src/pages/Timekeeping/Timekeeping.tsx
@@ -437,7 +437,6 @@ const Timekeeping = () => {
     <div>
       <div className={classes.title}>
         <h3>
-          <Text>Admin/</Text>
           Timekeeping
         </h3>
       </div>
diff --git a/FRONTEND/src/pages/Worklogs/Worklogs.tsx b/FRONTEND/src/pages/Worklogs/Worklogs.tsx
index c598569..efbfeaa 100644
--- a/FRONTEND/src/pages/Worklogs/Worklogs.tsx
+++ b/FRONTEND/src/pages/Worklogs/Worklogs.tsx
@@ -214,7 +214,7 @@ const Worklogs = () => {
     <div style={{ display: 'flex', flexFlow: 'column' }}>
       <div className={classes.title}>
         <h3>
-          <Text>Admin/</Text>Worklogs
+          Worklogs
           {!updating ? (
             <Text fs={'italic'} fz={'xs'} c={'gray'}>
               Updating data in the background ...
diff --git a/FRONTEND/src/routes/main.tsx b/FRONTEND/src/routes/main.tsx
index 5106f33..456cbc5 100755
--- a/FRONTEND/src/routes/main.tsx
+++ b/FRONTEND/src/routes/main.tsx
@@ -39,7 +39,7 @@ const mainRoutes = [
   {
     path: '/tracking',
     element: (
-      <ProtectedRoute mode="home" permission="staff">
+      <ProtectedRoute mode="home" permission="admin,hr">
         <BasePage
           main={
             <>
@@ -186,10 +186,12 @@ const mainRoutes = [
               <Allocation />
             </>
           }
-            ></BasePage>
+        ></BasePage>
       </ProtectedRoute>
-      )},
-    {path: '/profile',
+    ),
+  },
+  {
+    path: '/profile',
     element: (
       <ProtectedRoute mode="route" permission="admin,hr">
         <BasePage