Merge pull request #118 from shreyas1434shinde/BugFixes

#PS-1317 fix PS-1527 UI Improvement
tekdi · Aug 9, 2024 · 400a2ad · 400a2ad
2 parents 2ca8285 + 394e32a
commit 400a2ad
Show file tree

Hide file tree

Showing 9 changed files with 284 additions and 274 deletions.
diff --git a/src/assets/images/checkbook.svg b/src/assets/images/checkbook.svg
diff --git a/src/components/CenterSessionModal.tsx b/src/components/CenterSessionModal.tsx
@@ -28,7 +28,7 @@ const CenterSessionModal: React.FC<SessionsModalProps> = ({
     top: '50%',
     left: '50%',
     transform: 'translate(-50%, -50%)',
-    width: '75%',
+    width: '85%',
     bgcolor: theme?.palette?.warning['A400'],
     boxShadow: 24,
     borderRadius: '16px',

diff --git a/src/components/DeleteUserModal.tsx b/src/components/DeleteUserModal.tsx
@@ -55,7 +55,7 @@ const DeleteUserModal: React.FC<DeleteUserModalProps> = ({
     top: '50%',
     left: '50%',
     transform: 'translate(-50%, -50%)',
-    width: '65%',
+    width: '85%',
     boxShadow: 24,
     bgcolor: '#fff',
     borderRadius: '16px',

diff --git a/src/components/Header.tsx b/src/components/Header.tsx
@@ -202,9 +202,9 @@ const Header: React.FC = () => {
               <MenuItem
                 onClick={logoutOpen}
                 disableRipple
-                sx={{ 'letter-spacing': 'normal' }}
+                sx={{ 'letter-spacing': 'normal', color: theme.palette.warning['300'] }}
               >
-                <LogoutOutlinedIcon />
+                <LogoutOutlinedIcon sx={{ color: theme.palette.warning['300'] }} />
                 {t('COMMON.LOGOUT')}
               </MenuItem>
             </StyledMenu>

diff --git a/src/components/MenuDrawer.tsx b/src/components/MenuDrawer.tsx
@@ -115,7 +115,7 @@ const MenuDrawer: React.FC<DrawerProps> = ({
           {!isDesktop && (
             <Box>
               <IconButton onClick={toggleDrawer(false)}>
-                <ClearIcon />
+                <ClearIcon sx={{ color: theme.palette.warning['300'] }} />
               </IconButton>
             </Box>
           )}
@@ -183,7 +183,7 @@ const MenuDrawer: React.FC<DrawerProps> = ({
               padding: isDashboard
                 ? '16px 18px !important'
                 : '0px 18px !important',
-              marginTop: '15px',
+              marginTop: '25px',
               color: isDashboard ? '#2E1500' : theme.palette.warning.A200,
               fontWeight: isDashboard ? '600' : 500,
               '&:hover': {
@@ -192,13 +192,13 @@ const MenuDrawer: React.FC<DrawerProps> = ({
                   : 'transparent',
               },
             }}
-            startIcon={<DashboardOutlinedIcon />}
+            startIcon={<DashboardOutlinedIcon sx={{ fontSize: '24px !important' }} />}
             onClick={navigateToDashboard}
           >
             {t('DASHBOARD.DASHBOARD')}
           </Button>
         </Box>
-        <Box sx={{ marginTop: '12px' }}>
+        <Box sx={{ marginTop: '18px' }}>
           <Button
             className="fs-14"
             sx={{
@@ -221,7 +221,7 @@ const MenuDrawer: React.FC<DrawerProps> = ({
               },
               marginTop: '15px',
             }}
-            startIcon={<LocalLibraryOutlinedIcon />}
+            startIcon={<LocalLibraryOutlinedIcon sx={{ fontSize: '24px !important' }} />}
             onClick={() => {
               router.push(`/centers`); // Check route
             }}
@@ -231,7 +231,7 @@ const MenuDrawer: React.FC<DrawerProps> = ({
               : t('DASHBOARD.MY_TEACHING_CENTERS')}
           </Button>
         </Box>
-        <Box sx={{ marginTop: '12px' }}>
+        <Box sx={{ marginTop: '18px' }}>
           <Button
             className="fs-14"
             sx={{
@@ -247,13 +247,13 @@ const MenuDrawer: React.FC<DrawerProps> = ({
               },
               marginTop: '15px',
             }}
-            startIcon={<EditNoteIcon />}
-            // onClick={navigateToManageUser}
+            startIcon={<EditNoteIcon sx={{ fontSize: '24px !important' }} />}
+          // onClick={navigateToManageUser}
           >
             {t('COMMON.OBSERVATIONS_FORMS')}
           </Button>
         </Box>
-        <Box sx={{ marginTop: '12px' }}>
+        <Box sx={{ marginTop: '18px' }}>
           <Button
             className="fs-14"
             sx={{
@@ -276,7 +276,7 @@ const MenuDrawer: React.FC<DrawerProps> = ({
               },
               marginTop: '15px',
             }}
-            startIcon={<EventAvailableOutlinedIcon />}
+            startIcon={<EventAvailableOutlinedIcon sx={{ fontSize: '24px !important' }} />}
             onClick={() => {
               router.push(`/assessments`);
             }}
@@ -285,7 +285,7 @@ const MenuDrawer: React.FC<DrawerProps> = ({
           </Button>
         </Box>
 
-        <Box sx={{ marginTop: '12px' }}>
+        <Box sx={{ marginTop: '18px' }}>
           <Button
             className="fs-14"
             sx={{
@@ -308,7 +308,7 @@ const MenuDrawer: React.FC<DrawerProps> = ({
               },
               marginTop: '15px',
             }}
-            startIcon={<EventAvailableOutlinedIcon />}
+            startIcon={<EventAvailableOutlinedIcon sx={{ fontSize: '24px !important' }} />}
             onClick={() => {
               router.push(`/course-planner`); // Check route
             }}

diff --git a/src/pages/centers/[cohortId].tsx b/src/pages/centers/[cohortId].tsx
@@ -119,7 +119,7 @@ const TeachingCenterDetails = () => {
     setOpenSchedule(true);
   };
 
-  const handleSchedule = () => {};
+  const handleSchedule = () => { };
 
   const handleOpen = () => setOpen(true);
   const handleClose = () => {
@@ -501,12 +501,13 @@ const TeachingCenterDetails = () => {
             )}
           </Box>
 
-          <Box sx={{ padding: '10px 16px', mt: 1 }}>
+          <Box sx={{ padding: '10px 16px', mt: 1, background: 'linear-gradient(180deg, #FFFDF7 0%, #F8EFDA 100%)' }}>
             <Box
               sx={{
                 display: 'flex',
                 justifyContent: 'space-between',
                 alignItems: 'center',
+
               }}
             >
               <Box