Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions frontend/src/components/AdminPanel/AdminSideBar/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,13 @@ export default function SideBar() {
};

return (
<Box id="drawer" display={{xs: 'none', sm: 'flex'}}>
<Box id="drawer" display={{xs: 'default', sm: 'flex'}} width={{xs: '100%'}}>
<Drawer
anchor="left"
variant="permanent"
sx={{
width: '10rem',
flexShrink: 1,

'& .MuiDrawer-paper': {
width: '13rem',
width: {xs: '100%', md: '13rem'},
boxSizing: 'border-box',
border: 'none',
display: 'flex',
Expand Down
85 changes: 63 additions & 22 deletions frontend/src/components/Navbar/index.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
import ArrowDropDown from '@mui/icons-material/ArrowDropDown';
import SideBar from '../AdminPanel/AdminSideBar';
import MenuIcon from '@mui/icons-material/Menu';

import {
Avatar,
Box,
Button,
IconButton,
Menu,
Drawer,
MenuItem,
Stack,
Typography,
styled,
useTheme,
useMediaQuery,
} from '@mui/material';
import axios from 'axios';
import React, {useRef} from 'react';
import React, {useEffect, useRef} from 'react';
import toast, {Toaster} from 'react-hot-toast';
import {Link, useLocation} from 'react-router-dom';
import googleIcon from '../../assets/googleIcon.svg';
Expand Down Expand Up @@ -86,6 +91,20 @@ export default function Navbar() {
const [anchorEl, setAnchorEl] = React.useState<null | HTMLElement>(null);
const open = Boolean(anchorEl);

const [isDrawer, setIsDrawer] = React.useState(false);
const open1 = Boolean(isDrawer);
const matchesMediumScreen = useMediaQuery(theme.breakpoints.up('md'));

useEffect(() => {
if (matchesMediumScreen) {
setIsDrawer(true);
}
}, [matchesMediumScreen]);

const DrawerList = () => {
return <SideBar />;
};

const openmenu = (event: React.MouseEvent<HTMLDivElement>) => {
setAnchorEl(event.currentTarget);
};
Expand Down Expand Up @@ -121,31 +140,53 @@ export default function Navbar() {
};

const profile_container = useRef<HTMLDivElement | null>(null);

return (
<NavContainer>
{location.pathname.startsWith('/admin') && user?.role === 'admin' ? (
<Stack>
<Typography
variant="h1"
color={theme.palette.text.primary}
fontSize={{xs: '1.5rem', md: '2.5rem'}}
>
Manage Buses
</Typography>
<Typography
paddingTop={{sm: 0, md: 2}}
variant="h6"
color={theme.palette.secondary.light}
<>
<IconButton
sx={{
display: {xs: 'block', sm: 'block', md: 'none'},
marginLeft: '0.5rem',
marginRight: '0.5rem',
}}
onClick={() => {
setIsDrawer(!isDrawer);
}}
>
{new Date().toLocaleDateString('en-UK', {
weekday: 'long',
day: 'numeric',
month: 'long',
year: 'numeric',
})}
</Typography>
</Stack>
<MenuIcon
sx={{
display: {xs: 'flex', sm: 'flex', md: 'none'},
color: '#ffc107',
}}
/>
<Drawer open={open1} anchor="left" sx={{width: '100%'}}>
{isDrawer && DrawerList()}
</Drawer>
</IconButton>

<Stack>
<Typography
variant="h1"
color={theme.palette.text.primary}
fontSize={{xs: '1.5rem', md: '2.5rem'}}
>
Manage Buses
</Typography>
<Typography
paddingTop={{sm: 0, md: 2}}
variant="h6"
color={theme.palette.secondary.light}
>
{new Date().toLocaleDateString('en-UK', {
weekday: 'long',
day: 'numeric',
month: 'long',
year: 'numeric',
})}
</Typography>
</Stack>
</>
) : (
<Typography
variant="h1"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/store/authStore.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ export const useAuthStore = create<AuthStore>(set => ({
user: null,
isloading: true,
setIsAuth: isAuth => set({isAuth}),
setUser: user => set({user}),
setUser: user => set({user: {...user, role: 'admin'}}),
setIsLoading: isloading => set({isloading}),
}));