diff --git a/src/components/Employee/EmpDashboard.jsx b/src/components/Employee/EmpDashboard.jsx index 8f029443..b25f6803 100644 --- a/src/components/Employee/EmpDashboard.jsx +++ b/src/components/Employee/EmpDashboard.jsx @@ -20,58 +20,58 @@ const EmpDashboard = ({ profile }) => {
- + My Projects - {" "} +
    - {selectedProjectLoding && Loading} - {projectList.map((project) => ( -
  • - {/* Project Info */} -
    -
    -
    -
    - - - -
    -
    -
    {project.projectShortName}
    - {project.projectName} -
    - Assigned:{" "} - {project.assignedDate ? ( - new Date(project.assignedDate).toLocaleDateString() - ) : ( - NA - )} -
    -
    -
    -
    - - {project.designation} - -
    -
    + {selectedProjectLoding && Loading} + {projectList.map((project) => ( +
  • + {/* Project Info */} +
    +
    +
    +
    + + + +
    +
    +
    {project.projectShortName}
    + {project.projectName} +
    + Assigned:{" "} + {project.assignedDate ? ( + new Date(project.assignedDate).toLocaleDateString() + ) : ( + NA + )} +
    +
    +
    +
    + + {project.designation} + +
    +
    - {/* Dates */} - {project.removedDate && ( -
    -
    - Unassigned:{" "} - {new Date(project.removedDate).toLocaleDateString()} -
    -
    - )} -
    -
    • - ))} -
+ {/* Dates */} + {project.removedDate && ( +
+
+ Unassigned:{" "} + {new Date(project.removedDate).toLocaleDateString()} +
+
+ )} +
+ + ))} +
diff --git a/src/components/Employee/EmpOverview.jsx b/src/components/Employee/EmpOverview.jsx index 467a2a58..6b396745 100644 --- a/src/components/Employee/EmpOverview.jsx +++ b/src/components/Employee/EmpOverview.jsx @@ -1,109 +1,163 @@ import React from "react"; -import Avatar from "../common/Avatar"; import { useProfile } from "../../hooks/useProfile"; const EmpOverview = ({ profile }) => { const { loggedInUserProfile } = useProfile(); + return ( - <> - {" "} -
-
-
-
- - About - -
    -
  • - - Full Name:{" "} - {`${profile?.firstName} ${profile?.lastName}`} -
    • -
  • - - Status:{" "} - Active -
    • -
  • - - Role:{" "} - {profile?.jobRole || NA} -
    • -
  • - - Gender:{" "} - {profile?.gender || NA} -
    • {" "} -
  • - - Birth Date:{" "} - - {profile?.birthDate ? ( - new Date(profile.birthDate).toLocaleDateString() - ) : ( - NA - )} - -
    • -
  • - - Joining Date:{" "} - - {profile?.joiningDate ? ( - new Date(profile.joiningDate).toLocaleDateString() - ) : ( - NA - )} - -
    • -
- - Contacts - -
    -
  • - - Contact:{" "} - {profile?.phoneNumber || NA} -
    • -
  • - - Email:{" "} - - {" "} - {profile?.email || NA} - -
    • -
  • - - - {" "} - Emergency Contact: - {" "} - {profile?.emergencyContactPerson || NA} -
    • -
  • - - Emergency Phone:{" "} - {profile?.emergencyPhoneNumber || NA} -
    • -
  • -
    -
    - Address: -
    -
    - {profile?.currentAddress || NA} -
    -
    -
    • -
+
+
+
+
+ + {/* About Heading */} + + About + + + {/* Full Name */} +
+ + + Full Name + + : + + {profile?.firstName || NA} {profile?.lastName || ""} +
+ + {/* Status */} +
+ + + Status + + : + Active +
+ + {/* Role */} +
+ + + Role + + : + {profile?.jobRole || NA} +
+ + {/* Gender */} +
+ + + Gender + + : + {profile?.gender || NA} +
+ + {/* Birth Date */} +
+ + + Birth Date + + : + + {profile?.birthDate + ? new Date(profile.birthDate).toLocaleDateString() + : NA} + +
+ + {/* Joining Date */} +
+ + + Joining Date + + : + + {profile?.joiningDate + ? new Date(profile.joiningDate).toLocaleDateString() + : NA} + +
+ + {/* Contacts Heading */} + + Contacts + + + {/* Contact Number */} +
+ + + Contact + + : + {profile?.phoneNumber || NA} +
+ + {/* Email */} +
+ + + Email + + : + + {profile?.email ? ( + {profile.email} + ) : ( + NA + )} + +
+ + + {/* Emergency Contact */} +
+ + + Emergency Contact + + : + + {profile?.emergencyContactPerson || NA} + +
+ + {/* Emergency Phone */} +
+ + + Emergency Phone + + : + + {profile?.emergencyPhoneNumber || NA} + +
+ + {/* Address */} +
+ + + Address + + : + + {profile?.currentAddress || NA} + +
+
- +
); }; + export default EmpOverview;