Merge pull request #56 from AkshataKatwal16/admin

Issue #PS-1178 feat: make changes in usertable
tekdi · Jul 26, 2024 · 1738570 · 1738570
2 parents 05125e5 + 8d1a1cd
commit 1738570
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/src/components/AddFacilitator.tsx b/src/components/AddFacilitator.tsx
@@ -170,7 +170,7 @@ const AddFacilitatorModal: React.FC<AddFacilitatorModalprops> = ({
         if (typeof window !== "undefined" && window.localStorage) {
           const CenterList = localStorage.getItem("CenterList");
           const centerOptions = CenterList ? JSON.parse(CenterList) : [];
-          var centerOptionsList = centerOptions.map(
+          var centerOptionsList = centerOptions?.map(
             (center: { cohortId: string; cohortName: string }) => ({
               value: center.cohortId,
               label: center.cohortName,

diff --git a/src/components/SimpleModal.tsx b/src/components/SimpleModal.tsx
@@ -51,7 +51,7 @@ const SimpleModal: React.FC<SimpleModalProps> = ({
     top: '50%',
     left: '50%',
     transform: 'translate(-50%, -50%)',
-    width: isSmallScreen ? '90%' : isLargeScreen ? '55%' : '85%',
+    width: isSmallScreen ? '90%' : isLargeScreen ? '65%' : '85%',
     maxHeight: '80vh',
     overflowY: 'auto',
     backgroundColor: '#fff',

diff --git a/src/components/UserTable.tsx b/src/components/UserTable.tsx
@@ -18,7 +18,7 @@ import Loader from "../components/Loader";
 import { deleteUser } from "../services/DeleteUser";
 import { getCohortList } from "../services/GetCohortList";
 import { userList } from "../services/UserList";
-
+import PersonSearchIcon from '@mui/icons-material/PersonSearch';
 type UserDetails = {
   userId: any;
   username: any;
@@ -516,8 +516,9 @@ const UserTable: React.FC<UserTableProps> = ({ role , userType, searchPlaceholde
       ) : (
         loading === false &&
         data.length === 0 && (
-          <Box display="flex">
-            <Image src={glass} alt="" />
+          <Box display="flex" marginLeft="40%" gap="20px">
+            {/* <Image src={glass} alt="" /> */}
+            <PersonSearchIcon fontSize="large" />
             <Typography marginTop="10px">
               {t("COMMON.NO_USER_FOUND")}
             </Typography>

diff --git a/src/components/layouts/header/Profile.tsx b/src/components/layouts/header/Profile.tsx
@@ -82,7 +82,7 @@ const Profile = () => {
                 whiteSpace: "nowrap",
               }}
             >
-              {userName ? userName : ""}
+              {userName ?  userName.charAt(0).toUpperCase() +userName.slice(1).toLowerCase() : ""}
             </Typography>
             <FeatherIcon icon="chevron-down" size="20" />
           </Box>
@@ -107,15 +107,15 @@ const Profile = () => {
               aria-label="secondary mailbox folder"
               onClick={handleClose4}
             >
-              <ListItemButton>
+              {/* <ListItemButton>
                 <ListItemText primary="Edit Profile" />
               </ListItemButton>
               <ListItemButton>
                 <ListItemText primary="Account" />
               </ListItemButton>
               <ListItemButton>
                 <ListItemText primary="Change Password" />
-              </ListItemButton>
+              </ListItemButton> */}
               <ListItemButton>
                 <ListItemText primary="My Settings" />
               </ListItemButton>