From ee792b69bf7756033b87079da3127eedf6c76ad5 Mon Sep 17 00:00:00 2001 From: hamid zarghami Date: Sun, 19 Jul 2026 12:08:00 +0330 Subject: [PATCH] fix home icon --- src/config/SideBarSubMenu.ts | 2 +- src/shared/SideBar.tsx | 4 ++-- src/shared/components/OtherSubMenu.tsx | 14 -------------- src/shared/components/UsersSubMenu.tsx | 14 ++++++++++++++ 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/config/SideBarSubMenu.ts b/src/config/SideBarSubMenu.ts index 9c5c9c2..b35bd20 100644 --- a/src/config/SideBarSubMenu.ts +++ b/src/config/SideBarSubMenu.ts @@ -44,7 +44,7 @@ export const getSubMenuNameFromPath = (pathname: string): string => { } if (pathname.startsWith("/workspace") || pathname.startsWith("/project") || pathname.startsWith("/taskmanager")) { - return "other"; + return "users"; } const segment = pathname.split("/")[1] ?? ""; diff --git a/src/shared/SideBar.tsx b/src/shared/SideBar.tsx index a4885b0..9c9beb0 100644 --- a/src/shared/SideBar.tsx +++ b/src/shared/SideBar.tsx @@ -2,8 +2,8 @@ import { Box, Category, DocumentLike, - Element3, Headphone, + Home, Logout, Money3, Profile, @@ -106,7 +106,7 @@ const SideBar: FC = () => {
{ const isActive = (name: string) => location.pathname.includes(name); - const isTaskManagerActive = - location.pathname.startsWith(Pages.taskmanager.workspace) || - location.pathname === Pages.taskmanager.workspaceList || - location.pathname.startsWith(Pages.taskmanager.updateWorkspace) || - location.pathname === Pages.taskmanager.createWorkspace || - location.pathname === Pages.taskmanager.createProject || - location.pathname.startsWith(Pages.taskmanager.updateProject) || - location.pathname.startsWith(Pages.taskmanager.projectList); - return (
@@ -79,11 +70,6 @@ const OtherSubMenu: FC = () => { link={Pages.messages.list} activeName="contacts_us" /> -
); diff --git a/src/shared/components/UsersSubMenu.tsx b/src/shared/components/UsersSubMenu.tsx index 05eddab..36307b4 100644 --- a/src/shared/components/UsersSubMenu.tsx +++ b/src/shared/components/UsersSubMenu.tsx @@ -11,6 +11,15 @@ const UsersSubMenu: FC = () => { const isActive = (name: string) => location.pathname.includes(name); + const isTaskManagerActive = + location.pathname.startsWith(Pages.taskmanager.workspace) || + location.pathname === Pages.taskmanager.workspaceList || + location.pathname.startsWith(Pages.taskmanager.updateWorkspace) || + location.pathname === Pages.taskmanager.createWorkspace || + location.pathname === Pages.taskmanager.createProject || + location.pathname.startsWith(Pages.taskmanager.updateProject) || + location.pathname.startsWith(Pages.taskmanager.projectList); + return (
@@ -41,6 +50,11 @@ const UsersSubMenu: FC = () => { link={Pages.users.groupList} activeName="admins" /> +
);