This commit is contained in:
Aria Moradi
2021-10-30 18:41:53 +03:30
parent 95e0463e96
commit 8ac72a483d
2 changed files with 6 additions and 19 deletions

View File

@@ -6,7 +6,6 @@
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
import React, { useContext } from 'react'; import React, { useContext } from 'react';
import makeStyles from '@mui/styles/makeStyles';
import AppBar from '@mui/material/AppBar'; import AppBar from '@mui/material/AppBar';
import Toolbar from '@mui/material/Toolbar'; import Toolbar from '@mui/material/Toolbar';
import Typography from '@mui/material/Typography'; import Typography from '@mui/material/Typography';
@@ -27,22 +26,11 @@ import ArrowBack from '@mui/icons-material/ArrowBack';
import { useHistory } from 'react-router-dom'; import { useHistory } from 'react-router-dom';
import NavBarContext from 'components/context/NavbarContext'; import NavBarContext from 'components/context/NavbarContext';
import DarkTheme from 'components/context/DarkTheme'; import DarkTheme from 'components/context/DarkTheme';
import ExtensionOutlinedIcon from './CustomExtensionOutlinedIcon'; import ExtensionOutlinedIcon from 'components/util/CustomExtensionOutlinedIcon';
import { Box } from '@mui/system';
import DesktopSideBar from './navigation/DesktopSideBar'; import DesktopSideBar from './navigation/DesktopSideBar';
import MobileBottomBar from './navigation/MobileBottomBar'; import MobileBottomBar from './navigation/MobileBottomBar';
const useStyles = makeStyles((theme) => ({
root: {
flexGrow: 1,
},
menuButton: {
marginRight: theme.spacing(2),
},
title: {
flexGrow: 1,
},
}));
const navbarItems: Array<NavbarItem> = [ const navbarItems: Array<NavbarItem> = [
{ {
path: '/library', path: '/library',
@@ -90,7 +78,6 @@ const navbarItems: Array<NavbarItem> = [
]; ];
export default function DefaultNavBar() { export default function DefaultNavBar() {
const classes = useStyles();
const { title, action, override } = useContext(NavBarContext); const { title, action, override } = useContext(NavBarContext);
const { darkTheme } = useContext(DarkTheme); const { darkTheme } = useContext(DarkTheme);
@@ -113,7 +100,7 @@ export default function DefaultNavBar() {
} }
return ( return (
<div className={classes.root}> <Box sx={{ flexGrow: 1 }}>
<AppBar position="fixed" color={darkTheme ? 'default' : 'primary'}> <AppBar position="fixed" color={darkTheme ? 'default' : 'primary'}>
<Toolbar> <Toolbar>
{ {
@@ -121,7 +108,7 @@ export default function DefaultNavBar() {
&& ( && (
<IconButton <IconButton
edge="start" edge="start"
className={classes.menuButton} sx={{ marginRight: theme.spacing(2) }}
color="inherit" color="inherit"
aria-label="menu" aria-label="menu"
disableRipple disableRipple
@@ -134,13 +121,13 @@ export default function DefaultNavBar() {
</IconButton> </IconButton>
) )
} }
<Typography variant={isMobileWidth ? 'h6' : 'h5'} className={classes.title}> <Typography variant={isMobileWidth ? 'h6' : 'h5'} sx={{ flexGrow: 1 }}>
{title} {title}
</Typography> </Typography>
{action} {action}
</Toolbar> </Toolbar>
</AppBar> </AppBar>
{navbar} {navbar}
</div> </Box>
); );
} }