complete merging conflict and remove logs

2024-07-11 10:53:05 +03:30
parent 08926646c4
commit e9e9da7c30
2 changed files with 12 additions and 8 deletions
--- a/src/app/(withAuth)/dashboard/layout.js
+++ b/src/app/(withAuth)/dashboard/layout.js
@@ -1,7 +1,15 @@
-import "react-toastify/dist/ReactToastify.css";
+import HeaderWithLogo from "@/components/layouts/dashboard/headerWithLogo";
+import HeaderWithSidebar from "@/components/layouts/dashboard/headerWithSidebar";
+import { Box, Stack } from "@mui/material";

 const Layout = ({ children }) => {
-    return <>{children}</>;
+    return (
+        <Stack>
+            <HeaderWithLogo />
+            <Box>
+                <HeaderWithSidebar>{children}</HeaderWithSidebar>
+            </Box>
+        </Stack>
+    );
 };
-
-export default Layout;
+export default Layout;