@campxdev/shared 1.11.7-0.alpha.46 → 1.11.7-0.alpha.48

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@campxdev/shared",
-  "version": "1.11.7-0.alpha.46",
+  "version": "1.11.7-0.alpha.48",
   "main": "./exports.ts",
   "scripts": {
     "start": "react-scripts start",

package/src/components/Layout/LayoutWrapper.tsx

@@ -1,5 +1,4 @@
-import MenuIcon from '@mui/icons-material/Menu'
-import { Drawer, IconButton, styled } from '@mui/material'
+import { Drawer, Stack, styled } from '@mui/material'
 import { useState } from 'react'
 import {
   StyledLeftNavContainer,
@@ -28,60 +27,14 @@ export default function LayoutWrapper({
     setOpen(!open)
   }
   return (
-    <ErrorBoundary>
-      {window.innerWidth > 1024 && !permissions.isHomePageEnabled && (
-        <StyledLeftNavContainer>
-          <SideNav menuItems={menu as any[]} header={sideMenuHeader} />
-        </StyledLeftNavContainer>
-      )}
-
-      <StyledMainContentContainer
-        style={{
-          width: permissions.isHomePageEnabled
-            ? 'inherit'
-            : 'calc(100% - 220px)',
-          position: permissions.isHomePageEnabled ? 'unset' : 'fixed',
-          marginTop: permissions.isHomePageEnabled ? '10px' : '0px',
-          borderRadius: permissions.isHomePageEnabled ? '10px' : '0px',
-          border: permissions.isHomePageEnabled ? '1px solid #1212' : 'none',
-          height: permissions.isHomePageEnabled
-            ? 'calc(100vh - 74px)'
-            : 'calc(100vh - 64px)',
-        }}
-      >
-        {window.innerWidth < 1024 && (
-          <>
-            <IconButton
-              color="inherit"
-              aria-label="open drawer"
-              onClick={handleDrawer}
-              edge="start"
-              sx={{ mr: 0.5 }}
-            >
-              <MenuIcon />
-            </IconButton>
-            {/* <Button
-            onClick={() => {
-              console.log('hi')
-            }}
-            // edge="start"
-            // sx={{ mr: 0.5 }}
-          >
-            <MenuIcon />
-          </Button> */}
-            <StyledDrawer
-              variant={'temporary'}
-              anchor="left"
-              open={open}
-              onClose={handleDrawer}
-            >
-              <SideNav menuItems={menu as any[]} header={sideMenuHeader} />
-            </StyledDrawer>
-          </>
-        )}
+    <Stack direction="row">
+      <StyledLeftNavContainer>
+        <SideNav menuItems={menu as any[]} header={sideMenuHeader} />
+      </StyledLeftNavContainer>
+      <StyledMainContentContainer>
         <ErrorBoundary>{children}</ErrorBoundary>
       </StyledMainContentContainer>
-    </ErrorBoundary>
+    </Stack>
   )
 }
 

package/src/layouts/Components/styles.tsx

@@ -27,17 +27,12 @@ export const StyledLeftNavContainer = muiStyled('aside')(({ theme }) => ({
   width: sideNavWidth,
   background: theme.palette.secondary.main,
   color: 'white',
-  position: 'fixed',
-  top: headerHeight,
-  left: 0,
-  height: `calc(100vh - ${headerHeight})`,
-  overflowY: 'auto',
-
+  height: 'calc(100vh - 84px)',
+  overflowY: 'scroll',
   '&::-webkit-scrollbar': {
     width: '0.5em',
     height: '0.5em',
   },
-
   '&::-webkit-scrollbar-thumb': {
     backgroundColor: 'rgba(255, 255, 255, 0.3)',
     borderRadius: '3px',
@@ -46,22 +41,11 @@ export const StyledLeftNavContainer = muiStyled('aside')(({ theme }) => ({
       background: 'rgba(255, 255, 255, 0.4)',
     },
   },
-
-  zIndex: 100,
 }))
 
 export const StyledMainContentContainer = muiStyled('main')(() => ({
-  width:
-    window.innerWidth > 1024
-      ? `calc(100% - ${sideNavWidth})`
-      : '100% !important',
-  height: `calc(100vh - ${headerHeight})`,
-  position: 'fixed',
-  top: headerHeight,
-  left: window.innerWidth > 1024 ? sideNavWidth : 0,
-  right: window.innerWidth > 1024 ? 'unset' : 0,
-  bottom: window.innerWidth > 1024 ? 'unset' : 0,
-  overflowY: 'auto',
+  height: 'calc(100vh - 84px)',
+  overflowY: 'scroll',
 
   '&::-webkit-scrollbar': {
     width: '0.4em',