diff --git a/public/assets/img/avatars/avatar_f_01.png b/public/assets/img/avatars/avatar_f_01.png new file mode 100644 index 00000000..978d2438 Binary files /dev/null and b/public/assets/img/avatars/avatar_f_01.png differ diff --git a/public/assets/img/avatars/avatar_f_02.png b/public/assets/img/avatars/avatar_f_02.png new file mode 100644 index 00000000..38958cb6 Binary files /dev/null and b/public/assets/img/avatars/avatar_f_02.png differ diff --git a/public/assets/img/avatars/avatar_m_01.png b/public/assets/img/avatars/avatar_m_01.png new file mode 100644 index 00000000..30dfa72d Binary files /dev/null and b/public/assets/img/avatars/avatar_m_01.png differ diff --git a/public/assets/img/avatars/avatar_m_02.png b/public/assets/img/avatars/avatar_m_02.png new file mode 100644 index 00000000..b43e1c74 Binary files /dev/null and b/public/assets/img/avatars/avatar_m_02.png differ diff --git a/src/components/Employee/EmpBanner.jsx b/src/components/Employee/EmpBanner.jsx index c4d734a9..756a7c56 100644 --- a/src/components/Employee/EmpBanner.jsx +++ b/src/components/Employee/EmpBanner.jsx @@ -24,12 +24,22 @@ const EmpBanner = ({ profile, loggedInUser }) => { )}
- user image + {profile.gender.toLowerCase() == "male" && ( + user image + )} + {profile.gender.toLowerCase() == "female" && ( + user image + )}
diff --git a/src/components/Employee/EmpDashboard.jsx b/src/components/Employee/EmpDashboard.jsx index 96da60b0..468a4300 100644 --- a/src/components/Employee/EmpDashboard.jsx +++ b/src/components/Employee/EmpDashboard.jsx @@ -1,26 +1,55 @@ -import React from "react"; -import Avatar from "../common/Avatar"; +import React, { useEffect, useState } from "react"; import EmpOverview from "./EmpOverview"; +import { useProjectsByEmployee } from "../../hooks/useProjects"; const EmpDashboard = ({ profile }) => { + const { + projectList, + loading: selectedProjectLoding, + refetch, + } = useProjectsByEmployee(profile?.id); + return ( <>
-
+
{" "}
-
+
{" "}
My Projects {" "} +
    + {selectedProjectLoding && Loading} + {projectList.map((project) => ( +
  • +
    + + + +
    +
    +
    +
    {project.shortName}
    +
    +
    +
    {project.name}
    +
    +
    +
  • + ))} +
-
+ {/*
@@ -28,7 +57,7 @@ const EmpDashboard = ({ profile }) => { {" "}
{" "}
-
+
*/}
); diff --git a/src/components/Layout/Header.jsx b/src/components/Layout/Header.jsx index bb4a6392..6f4988bc 100644 --- a/src/components/Layout/Header.jsx +++ b/src/components/Layout/Header.jsx @@ -27,9 +27,9 @@ const Header = () => { const { data, loading } = useMaster(); const navigate = useNavigate(); const HasManageProjectPermission = useHasUserPermission(MANAGE_PROJECT); - { - console.log(location.pathname); - } + // { + // console.log(location.pathname); + // } const isDashboardPath = /^\/dashboard$/.test(location.pathname) || /^\/$/.test(location.pathname); diff --git a/src/hooks/useProjects.js b/src/hooks/useProjects.js index d41fe34a..1e0955a5 100644 --- a/src/hooks/useProjects.js +++ b/src/hooks/useProjects.js @@ -96,7 +96,7 @@ export const useProjectDetails = (projectId, isAuto = true) => { export const useProjectsByEmployee = (employeeId) => { const { - data: projectNameList = [], + data: projectList = [], isLoading, error, refetch,