diff --git a/src/app/(withAuth)/dashboard/template.js b/src/app/(withAuth)/dashboard/template.js
index ba4af8f..c44d626 100644
--- a/src/app/(withAuth)/dashboard/template.js
+++ b/src/app/(withAuth)/dashboard/template.js
@@ -1,19 +1,15 @@
-import {Stack} from "@mui/material";
+import {Box, Stack} from "@mui/material";
import HeaderWithLogo from "@/components/layouts/dashboard/headerWithLogo";
import HeaderWithSidebar from "@/components/layouts/dashboard/headerWithSidebar";
-const headerHeight = {
- header1: 50,
- header2: 50
-}
-const offsetHeaders = headerHeight.header1 + headerHeight.header2
-
const Template = ({children}) => {
return (
-
-
- {children}
-
+
+
+
+ {children}
+
+
)
}
diff --git a/src/components/layouts/dashboard/headerWithLogo/index.jsx b/src/components/layouts/dashboard/headerWithLogo/index.jsx
index 40d3743..f16f58c 100644
--- a/src/components/layouts/dashboard/headerWithLogo/index.jsx
+++ b/src/components/layouts/dashboard/headerWithLogo/index.jsx
@@ -1,9 +1,9 @@
-import {Box} from "@mui/material";
+import {Box, Stack} from "@mui/material";
-const HeaderWithLogo = ({headerHeight}) => {
- return (<>
- header1
- header2
- >)
+const HeaderWithLogo = () => {
+ return (
+ header1
+ header2
+ )
}
export default HeaderWithLogo
\ No newline at end of file
diff --git a/src/components/layouts/dashboard/headerWithSidebar/index.jsx b/src/components/layouts/dashboard/headerWithSidebar/index.jsx
index bf96b36..7591951 100644
--- a/src/components/layouts/dashboard/headerWithSidebar/index.jsx
+++ b/src/components/layouts/dashboard/headerWithSidebar/index.jsx
@@ -36,7 +36,7 @@ const DrawerHeader = styled('div')(({theme}) => ({
...theme.mixins.toolbar, justifyContent: 'flex-end',
}));
-const HeaderWithSidebar = ({children, offsetHeaders}) => {
+const HeaderWithSidebar = ({children}) => {
const [open, setOpen] = useState(false);
const handleDrawerOpen = () => {
@@ -47,7 +47,7 @@ const HeaderWithSidebar = ({children, offsetHeaders}) => {
setOpen(false);
};
return (
-
+
{
width: drawerWidth, flexShrink: 0, '& .MuiDrawer-paper': {
width: drawerWidth,
boxSizing: 'border-box',
- top: offsetHeaders,
borderTop: 1,
- borderTopColor: 'divider'
+ borderTopColor: 'divider',
+ top: "unset"
},
}}
variant="persistent"
@@ -83,7 +83,7 @@ const HeaderWithSidebar = ({children, offsetHeaders}) => {
-
+
{children}