diff --git a/client/src/Components/Sidebar/collapseButton.jsx b/client/src/Components/Sidebar/collapseButton.jsx index 551bcf25d..b8f088669 100644 --- a/client/src/Components/Sidebar/collapseButton.jsx +++ b/client/src/Components/Sidebar/collapseButton.jsx @@ -5,7 +5,7 @@ import { useTheme } from "@mui/material/styles"; import { useDispatch } from "react-redux"; import { toggleSidebar } from "../../Features/UI/uiSlice"; -const CollapseButton = ({ collapsed, setOpen }) => { +const CollapseButton = ({ collapsed }) => { const theme = useTheme(); const dispatch = useDispatch(); return ( @@ -34,9 +34,6 @@ const CollapseButton = ({ collapsed, setOpen }) => { }, }} onClick={() => { - setOpen((prev) => - Object.fromEntries(Object.keys(prev).map((key) => [key, false])) - ); dispatch(toggleSidebar()); }} > diff --git a/client/src/Components/Sidebar/components/authFooter.jsx b/client/src/Components/Sidebar/components/authFooter.jsx index e792cec12..dbc1ccfb0 100644 --- a/client/src/Components/Sidebar/components/authFooter.jsx +++ b/client/src/Components/Sidebar/components/authFooter.jsx @@ -87,82 +87,94 @@ const AuthFooter = ({ collapsed, accountMenuItems }) => { px={theme.spacing(8)} gap={theme.spacing(2)} borderRadius={theme.shape.borderRadius} + boxSizing={"border-box"} > - - {authState.user?.firstName} {authState.user?.lastName} - - - {authState.user?.role?.includes("superadmin") - ? t("roles.superAdmin") - : authState.user?.role?.includes("admin") - ? t("roles.admin") - : authState.user?.role?.includes("user") - ? t("roles.teamMember") - : authState.user?.role?.includes("demo") - ? t("roles.demoUser") - : authState.user?.role} - - - - - - openPopup(event, "logout")} > - - - + {authState.user?.firstName} {authState.user?.lastName} + + + {authState.user?.role?.includes("superadmin") + ? t("roles.superAdmin") + : authState.user?.role?.includes("admin") + ? t("roles.admin") + : authState.user?.role?.includes("user") + ? t("roles.teamMember") + : authState.user?.role?.includes("demo") + ? t("roles.demoUser") + : authState.user?.role} + + + + + + openPopup(event, "logout")} + > + + + + { // Redux state const collapsed = useSelector((state) => state.ui.sidebar.collapsed); - // Local state - const [open, setOpen] = useState({ Dashboard: false, Account: false, Other: false }); - const menu = getMenu(t); const otherMenuItems = getOtherMenuItems(t); const accountMenuItems = getAccountMenuItems(t); @@ -108,10 +102,7 @@ const Sidebar = () => { transition: "width 650ms cubic-bezier(0.36, -0.01, 0, 0.77)", }} > - + { sx={{ px: theme.spacing(6), height: "100%", - /* overflow: "hidden", */ }} > {menu.map((item) => { diff --git a/client/src/Components/Sidebar/logo.jsx b/client/src/Components/Sidebar/logo.jsx index 0d7adf54f..e6aa660fb 100644 --- a/client/src/Components/Sidebar/logo.jsx +++ b/client/src/Components/Sidebar/logo.jsx @@ -15,53 +15,46 @@ const Logo = ({ collapsed }) => { pt={theme.spacing(6)} pb={theme.spacing(12)} pl={theme.spacing(8)} + direction="row" + alignItems="center" + gap={theme.spacing(4)} + onClick={() => navigate("/")} + sx={{ cursor: "pointer" }} > - {/* TODO Abstract logo into component */} - {/* TODO Turn logo into a link */} - navigate("/")} - sx={{ cursor: "pointer" }} + - + + {" "} + - C - - - {" "} - - {t("common.appName")} - - - + {t("common.appName")} + + ); };