From be19d4c2b5b4a83150bd3454afdfddced7aa52fd Mon Sep 17 00:00:00 2001 From: Mohammad Jalali Date: Sat, 13 Jul 2024 16:48:40 +0330 Subject: [PATCH 1/2] debug scroll of sidebar --- .../dashboard/headerWithSidebar/index.jsx | 16 +++++++++------- src/core/components/SidebarMenu.jsx | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/components/layouts/dashboard/headerWithSidebar/index.jsx b/src/components/layouts/dashboard/headerWithSidebar/index.jsx index afa0456..c1b9e9f 100644 --- a/src/components/layouts/dashboard/headerWithSidebar/index.jsx +++ b/src/components/layouts/dashboard/headerWithSidebar/index.jsx @@ -2,7 +2,7 @@ import SidebarMenu from "@/core/components/SidebarMenu"; import ChevronRightIcon from "@mui/icons-material/ChevronRight"; import MenuIcon from "@mui/icons-material/Menu"; -import { Box, Drawer, IconButton, Paper, Stack, styled, Toolbar } from "@mui/material"; +import { Box, Drawer, IconButton, Stack, styled, Toolbar } from "@mui/material"; import MuiAppBar from "@mui/material/AppBar"; import { useState } from "react"; import HeaderMenu from "./HeaderMenu"; @@ -11,7 +11,7 @@ const drawerWidth = 300; const Main = styled(Stack, { shouldForwardProp: (prop) => prop !== "open" })(({ theme, open }) => ({ flexGrow: 1, - height: '100%', + height: "100%", transition: theme.transitions.create("margin", { easing: theme.transitions.easing.sharp, duration: theme.transitions.duration.leavingScreen, @@ -48,7 +48,7 @@ const DrawerHeader = styled("div")(({ theme }) => ({ alignItems: "center", padding: theme.spacing(0, 1), ...theme.mixins.toolbar, - minHeight: '48px !important', + minHeight: "48px !important", justifyContent: "flex-end", })); @@ -62,7 +62,7 @@ const HeaderWithSidebar = ({ children }) => { setOpen(false); }; return ( - + { { -
+
- + {children}
diff --git a/src/core/components/SidebarMenu.jsx b/src/core/components/SidebarMenu.jsx index 74291a3..625972a 100644 --- a/src/core/components/SidebarMenu.jsx +++ b/src/core/components/SidebarMenu.jsx @@ -113,7 +113,7 @@ const SidebarMenu = () => { return ( userPermissions && ( - + {menuItems.map((menuItem) => { return ; })} From 74e256be6b70a823d85d9cd023a0b762071a31d9 Mon Sep 17 00:00:00 2001 From: Amirhossein Mahmoodi Date: Sat, 13 Jul 2024 16:50:25 +0330 Subject: [PATCH 2/2] change version --- .env.local.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.local.example b/.env.local.example index 856ddc0..d8dc0a8 100644 --- a/.env.local.example +++ b/.env.local.example @@ -1,3 +1,3 @@ -NEXT_PUBLIC_VERSION="0.3.1" +NEXT_PUBLIC_VERSION="0.3.3" NEXT_PUBLIC_API_URL="https://rms.witel.ir" NEXT_PUBLIC_MAPTILE_ENDPOINT="https://rmsmap.rmto.ir/141map" \ No newline at end of file