diff --git a/src/config/SideBarSubMenu.ts b/src/config/SideBarSubMenu.ts index bcdeacf..f734f50 100644 --- a/src/config/SideBarSubMenu.ts +++ b/src/config/SideBarSubMenu.ts @@ -8,5 +8,4 @@ export const SideBarItemHasSubMenu = [ "blog", "support", "accessLogs", - "taskmanager", ]; diff --git a/src/langs/fa.json b/src/langs/fa.json index 0bd6589..aba2c6b 100644 --- a/src/langs/fa.json +++ b/src/langs/fa.json @@ -91,7 +91,7 @@ "reseller": "نماینده", "resellers": "نمایندگان", "withdraw": "درخواست های برداشت", - "taskmanager": "مدیریت تسک ها" + "taskmanager": "مدیریت تسک" }, "reseller": { "list": "لیست نمایندکان", diff --git a/src/shared/SideBar.tsx b/src/shared/SideBar.tsx index 6acfa4b..65b8b4a 100644 --- a/src/shared/SideBar.tsx +++ b/src/shared/SideBar.tsx @@ -1,6 +1,5 @@ import { Activity, - Add, ArrowDown2, BagTick, Building, @@ -52,7 +51,6 @@ import LearningSubMenu from "./components/LearningSubMenu"; import ReceiptSubMenu from "./components/ReceiptSubMenu"; import ServicesSubMenu from "./components/ServicesSubMenu"; import SupportSubMenu from "./components/SupportSubMenu"; -import TaskManagerSubMenu from "./components/TaskManagerSubMenu"; import TicketSubMenu from "./components/TicketSubMenu"; import UsersSubMenu from "./components/UsersSubMenu"; import SideBarItem from "./SideBarItem"; @@ -67,24 +65,23 @@ const SideBar: FC = () => { return 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); + const [openMenu, setOpenMenu] = useState(["menu"]); useEffect(() => { const split = location.pathname.split("/"); - const isTaskManagerRoute = - 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 === Pages.taskmanager.projectList; if (SideBarItemHasSubMenu.includes(split[1])) { setSubMenuName(split[1]); setSubtMenu(true); - } else if (isTaskManagerRoute) { - setSubMenuName("taskmanager"); - setSubtMenu(true); } else { setSubMenuName(""); setSubtMenu(false); @@ -454,68 +451,22 @@ const SideBar: FC = () => { activeName="criticisms" /> - - { -
handleOpenMenu("taskmanager")} - className={clx("mt-10 px-12 text-header text-sm font-normal cursor-pointer", hasSubMenu && "px-2 text-center", !hasSubMenu && "flex gap-2 items-center")} - > - {t("sidebar.taskmanager")} - -
- -
+
+ + } + title={t("sidebar.taskmanager")} + isActive={isTaskManagerActive} + link={Pages.taskmanager.workspaceList} + activeName="" + />
- } -
- - } - title={t("submenu.taskmanager_workspace_list")} - isActive={location.pathname === Pages.taskmanager.workspaceList} - link={Pages.taskmanager.workspaceList} - name="taskmanager" - activeName="" - /> - - - } - title={t("submenu.taskmanager_create_workspace")} - isActive={location.pathname === Pages.taskmanager.createWorkspace} - link={Pages.taskmanager.createWorkspace} - name="taskmanager" - activeName="" - /> - - - } - title={t("submenu.taskmanager_create_project")} - isActive={location.pathname === Pages.taskmanager.createProject} - link={Pages.taskmanager.createProject} - name="taskmanager" - activeName="" - />
{profile?.data?.user?.roles?.some((role: { name: string }) => role.name === "super_admin") && ( @@ -991,8 +942,6 @@ const SideBar: FC = () => { ) : subMenuName === "accessLogs" ? ( - ) : subMenuName === "taskmanager" ? ( - ) : null}
)} diff --git a/src/shared/components/TaskManagerSubMenu.tsx b/src/shared/components/TaskManagerSubMenu.tsx deleted file mode 100644 index de42db8..0000000 --- a/src/shared/components/TaskManagerSubMenu.tsx +++ /dev/null @@ -1,58 +0,0 @@ -import { Task } from "iconsax-react"; -import { FC } from "react"; -import { useTranslation } from "react-i18next"; -import { useLocation } from "react-router-dom"; -import { Pages } from "../../config/Pages"; -import SubMenuItem from "./SubMenuItem"; - -const TaskManagerSubMenu: FC = () => { - const { t } = useTranslation("global"); - const location = useLocation(); - - const isWorkspaceListActive = location.pathname === Pages.taskmanager.workspaceList; - const isKanbanActive = - location.pathname.startsWith(Pages.taskmanager.workspace) && - !isWorkspaceListActive; - const isCreateWorkspaceActive = location.pathname === Pages.taskmanager.createWorkspace; - const isProjectListActive = location.pathname === Pages.taskmanager.projectList; - const isCreateProjectActive = location.pathname === Pages.taskmanager.createProject; - - return ( -
-
- -
{t("sidebar.taskmanager")}
-
- -
- - - - - -
-
- ); -}; - -export default TaskManagerSubMenu;