diff --git a/src/Consumer/DashboardRoutes.tsx b/src/Consumer/DashboardRoutes.tsx index a6a6e2e..e0443d1 100644 --- a/src/Consumer/DashboardRoutes.tsx +++ b/src/Consumer/DashboardRoutes.tsx @@ -10,7 +10,7 @@ import { LinkHover } from "../Components/CustomComponents"; import { setAllOrganization } from "../reducers/allOrganization"; import { setAllUser } from "../reducers/allUsers"; import { useAppDispatch, useAppSelector } from "../hooks"; -import { DefaultRoute, MenuLayout, defaultLogo, defaultProps } from "./utils"; +import { DefaultRoute, defaultLogo, defaultProps } from "./utils"; import api from "../api"; import "./Dashboard.less" @@ -64,10 +64,7 @@ const DashboardRoutes = () => { useEffect(() => { window.addEventListener('resize', handleWindowSizeChange); - return () => { - console.log(width) - window.removeEventListener('resize', handleWindowSizeChange); - } + return () => window.removeEventListener('resize', handleWindowSizeChange); }, []); return ( @@ -79,10 +76,6 @@ const DashboardRoutes = () => { navTheme="light" menu={{ defaultOpenAll: true }} waterMarkProps={{ content: 'TrackER', }} - headerRender={() => - width >= 768 ?
: - MenuLayout(navigate, pathname, userAvatar, setPathname, user, allOrganization, allUser) - } footerRender={() => { )} {...settings} > + {width >= 768 &&
} {DefaultRoute(navigate, userAvatar, setPathname, user, allOrganization, allUser)} ); diff --git a/src/Consumer/Header/Header.tsx b/src/Consumer/Header/Header.tsx index 106af6c..21f84fe 100644 --- a/src/Consumer/Header/Header.tsx +++ b/src/Consumer/Header/Header.tsx @@ -10,21 +10,32 @@ const Header = ({ avatar }: any) => { const type = user.type return ( - - + + - - - - -

Do you know the latest update of our 2023? 🎉

- - -

Check our program for 2022.

+ + +

Do you know the latest update of our 2023? 🎉

+

Check our program for 2022.

- +

{user.name} {user.surname}