diff --git a/src/components/layouts/dashboard/headerWithLogo/HaederBottom/index.jsx b/src/components/layouts/dashboard/headerWithLogo/HaederBottom/index.jsx index 3a1de86..1599d86 100644 --- a/src/components/layouts/dashboard/headerWithLogo/HaederBottom/index.jsx +++ b/src/components/layouts/dashboard/headerWithLogo/HaederBottom/index.jsx @@ -25,15 +25,17 @@ const HeaderBottom = () => { theme.palette.primary2.contrastText }}>rms.rmto.ir - - theme.palette.primary.main, - borderRadius: 2, - borderStyle: "dashed", - }}> + + theme.palette.primary.main, + borderRadius: 2, + borderStyle: "dashed", + }} + > diff --git a/src/components/layouts/dashboard/headerWithSidebar/Sidebar/SidebarListItems.jsx b/src/components/layouts/dashboard/headerWithSidebar/Sidebar/SidebarListItems.jsx index 5b6c9df..092ac1c 100644 --- a/src/components/layouts/dashboard/headerWithSidebar/Sidebar/SidebarListItems.jsx +++ b/src/components/layouts/dashboard/headerWithSidebar/Sidebar/SidebarListItems.jsx @@ -1,5 +1,15 @@ import { ExpandLess, ExpandMore } from "@mui/icons-material"; -import { Collapse, List, ListItem, ListItemButton, ListItemIcon, ListItemText, Stack, useMediaQuery, useTheme } from "@mui/material"; +import { + Collapse, + List, + ListItem, + ListItemButton, + ListItemIcon, + ListItemText, + Stack, + useMediaQuery, + useTheme, +} from "@mui/material"; import Link from "next/link"; import SidebarBadge from "./SidebarBadge"; import SidebarSubitems from "./SidebarSubitems"; @@ -21,7 +31,7 @@ const SidebarListItems = ({ menuItem, dispatch, handleDrawerClose }) => { dispatch({ type: "COLLAPSE_MENU", id: menuItem.id }); } else { if (isMobile) { - handleDrawerClose() + handleDrawerClose(); } } }} @@ -62,7 +72,14 @@ const SidebarListItems = ({ menuItem, dispatch, handleDrawerClose }) => { }} > {menuItem.Subitems.map((subitem, index) => { - return ; + return ( + + ); })} ) : null} diff --git a/src/components/layouts/dashboard/headerWithSidebar/Sidebar/SidebarMenu.jsx b/src/components/layouts/dashboard/headerWithSidebar/Sidebar/SidebarMenu.jsx index 8359ad9..f27005e 100644 --- a/src/components/layouts/dashboard/headerWithSidebar/Sidebar/SidebarMenu.jsx +++ b/src/components/layouts/dashboard/headerWithSidebar/Sidebar/SidebarMenu.jsx @@ -54,16 +54,16 @@ function reducer(state, action) { return state.map((item) => item.hasSubitems ? { - ...item, - Subitems: item.Subitems.map((subitem) => - subitem.hasSubitems - ? { - ...subitem, - Subitems: toggleSubitems(subitem.Subitems, action.id), - } - : subitem - ), - } + ...item, + Subitems: item.Subitems.map((subitem) => + subitem.hasSubitems + ? { + ...subitem, + Subitems: toggleSubitems(subitem.Subitems, action.id), + } + : subitem + ), + } : item ); @@ -105,7 +105,14 @@ const SidebarMenu = ({ handleDrawerClose }) => { {userPermissions && ( {menuItems.map((menuItem) => { - return ; + return ( + + ); })} )} diff --git a/src/components/layouts/dashboard/headerWithSidebar/Sidebar/SidebarSubitems.jsx b/src/components/layouts/dashboard/headerWithSidebar/Sidebar/SidebarSubitems.jsx index 7567889..0e5267c 100644 --- a/src/components/layouts/dashboard/headerWithSidebar/Sidebar/SidebarSubitems.jsx +++ b/src/components/layouts/dashboard/headerWithSidebar/Sidebar/SidebarSubitems.jsx @@ -1,5 +1,16 @@ import { ExpandLess, ExpandMore } from "@mui/icons-material"; -import { Box, Collapse, List, ListItem, ListItemButton, ListItemIcon, ListItemText, Stack, useMediaQuery, useTheme } from "@mui/material"; +import { + Box, + Collapse, + List, + ListItem, + ListItemButton, + ListItemIcon, + ListItemText, + Stack, + useMediaQuery, + useTheme, +} from "@mui/material"; import Link from "next/link"; import SidebarBadge from "./SidebarBadge"; @@ -20,7 +31,7 @@ const SidebarSubitems = ({ subitem, dispatch, handleDrawerClose }) => { dispatch({ type: "COLLAPSE_SUB_ITEMS", id: subitem.id }); } else { if (isMobile) { - handleDrawerClose() + handleDrawerClose(); } } }} @@ -71,7 +82,14 @@ const SidebarSubitems = ({ subitem, dispatch, handleDrawerClose }) => { }} > {subitem.Subitems.map((subSubitem, index) => { - return ; + return ( + + ); })} ) : null} diff --git a/src/core/utils/routes.js b/src/core/utils/routes.js index 22163c8..d62703a 100644 --- a/src/core/utils/routes.js +++ b/src/core/utils/routes.js @@ -146,12 +146,16 @@ export const REJECT_ROAD_SAFETY_BY_SUPERVISOR = api + "/api/v3/safety_and_privac export const DESERIALIZE_JUDICIARY_DOCUMENT = api + "/api/v3/safety_and_privacy/deserialize"; export const GET_SAFETY_AND_PRIVACY_ITEM = api + "/api/v3/safety_and_privacy/sub_items"; -export const GET_ROAD_SAFETY_PROVINCE_ACTIVITY_REPORT = api + "/api/v3/safety_and_privacy_report/operator/country_activity"; -export const GET_ROAD_SAFETY_CITY_ACTIVITY_REPORT = api + "/api/v3/safety_and_privacy_report/operator/province_activity"; +export const GET_ROAD_SAFETY_PROVINCE_ACTIVITY_REPORT = + api + "/api/v3/safety_and_privacy_report/operator/country_activity"; +export const GET_ROAD_SAFETY_CITY_ACTIVITY_REPORT = + api + "/api/v3/safety_and_privacy_report/operator/province_activity"; export const GET_ROAD_SAFETY_REPORT_MAP = api + "/api/v3/safety_and_privacy/map"; export const GET_ROAD_SAFETY_DETAILS = api + "/api/v3/safety_and_privacy/operator"; -export const EXPORT_COUNTRY_ROAD_SAFETY_REPORT = api + "/api/v3/safety_and_privacy_report/operator/country_excel_activity"; -export const EXPORT_PROVINCE_ROAD_SAFETY_REPORT = api + "/api/v3/safety_and_privacy_report/operator/province_excel_activity"; +export const EXPORT_COUNTRY_ROAD_SAFETY_REPORT = + api + "/api/v3/safety_and_privacy_report/operator/country_excel_activity"; +export const EXPORT_PROVINCE_ROAD_SAFETY_REPORT = + api + "/api/v3/safety_and_privacy_report/operator/province_excel_activity"; // permission table export const GET_PERMISSION_TABLE_LIST = api + "/api/v3/permissions";