redo elevation prop change, Sidebar renders under Topbar now
This commit is contained in:
parent
05b19413e1
commit
3609cf5d5d
|
@ -8,7 +8,7 @@ export default function Header() {
|
||||||
const classes = useStyles();
|
const classes = useStyles();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<AppBar position="static" component="footer" elevation={0}>
|
<AppBar position="static" component="footer">
|
||||||
<Container>
|
<Container>
|
||||||
<Toolbar disableGutters className={classes.toolbar}>
|
<Toolbar disableGutters className={classes.toolbar}>
|
||||||
<Typography align="center" className={classes.copyright}>
|
<Typography align="center" className={classes.copyright}>
|
||||||
|
|
|
@ -31,7 +31,7 @@ export default function Header() {
|
||||||
const classes = useStyles();
|
const classes = useStyles();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<AppBar position="fixed" elevation={0}>
|
<AppBar position="fixed">
|
||||||
<Container>
|
<Container>
|
||||||
<Toolbar disableGutters className={classes.toolbar}>
|
<Toolbar disableGutters className={classes.toolbar}>
|
||||||
<div className={classes.searchInputWrapper}>
|
<div className={classes.searchInputWrapper}>
|
||||||
|
|
|
@ -57,7 +57,7 @@ function PageLayout({ children }: Props) {
|
||||||
[classes.shiftContent]: isDesktop,
|
[classes.shiftContent]: isDesktop,
|
||||||
})}
|
})}
|
||||||
>
|
>
|
||||||
<TopBar openSidebar={openSidebar} t={t} />
|
<TopBar openSidebar={open ? closeSidebar : openSidebar} t={t} />
|
||||||
<Toolbar />
|
<Toolbar />
|
||||||
<Sidebar
|
<Sidebar
|
||||||
onClose={closeSidebar}
|
onClose={closeSidebar}
|
||||||
|
|
|
@ -7,7 +7,13 @@ import useStyles from './useStyles';
|
||||||
import * as ROUTES from '@config/routes';
|
import * as ROUTES from '@config/routes';
|
||||||
import { Route } from './components/Nav/types';
|
import { Route } from './components/Nav/types';
|
||||||
|
|
||||||
import { Divider, SwipeableDrawer, DrawerProps } from '@material-ui/core';
|
import { useTheme } from '@material-ui/core/styles';
|
||||||
|
import {
|
||||||
|
Divider,
|
||||||
|
SwipeableDrawer,
|
||||||
|
DrawerProps,
|
||||||
|
Toolbar,
|
||||||
|
} from '@material-ui/core';
|
||||||
import DashboardIcon from '@material-ui/icons/Dashboard';
|
import DashboardIcon from '@material-ui/icons/Dashboard';
|
||||||
|
|
||||||
import Nav from './components/Nav/Nav';
|
import Nav from './components/Nav/Nav';
|
||||||
|
@ -25,6 +31,7 @@ export interface Props {
|
||||||
const Sidebar = ({ t, className, open, variant, onClose, onOpen }: Props) => {
|
const Sidebar = ({ t, className, open, variant, onClose, onOpen }: Props) => {
|
||||||
const classes = useStyles();
|
const classes = useStyles();
|
||||||
const { key } = useServer();
|
const { key } = useServer();
|
||||||
|
const theme = useTheme();
|
||||||
|
|
||||||
const routes: Route[] = [
|
const routes: Route[] = [
|
||||||
{
|
{
|
||||||
|
@ -39,13 +46,14 @@ const Sidebar = ({ t, className, open, variant, onClose, onOpen }: Props) => {
|
||||||
return (
|
return (
|
||||||
<SwipeableDrawer
|
<SwipeableDrawer
|
||||||
anchor="left"
|
anchor="left"
|
||||||
classes={{ paper: classes.drawer }}
|
classes={{ paper: classes.drawerPaper }}
|
||||||
|
ModalProps={{ style: { zIndex: theme.zIndex.appBar - 1 } }}
|
||||||
onClose={onClose}
|
onClose={onClose}
|
||||||
onOpen={onOpen}
|
onOpen={onOpen}
|
||||||
open={open}
|
open={open}
|
||||||
variant={variant}
|
variant={variant}
|
||||||
disableBackdropTransition
|
|
||||||
>
|
>
|
||||||
|
<Toolbar />
|
||||||
<div className={clsx(classes.root, className)}>
|
<div className={clsx(classes.root, className)}>
|
||||||
<ServerInfo t={t} />
|
<ServerInfo t={t} />
|
||||||
<Divider />
|
<Divider />
|
||||||
|
|
|
@ -38,7 +38,6 @@ function ListItem({ route, nestedLevel }: Props) {
|
||||||
button
|
button
|
||||||
component={Box}
|
component={Box}
|
||||||
pl={nestedLevel}
|
pl={nestedLevel}
|
||||||
dense
|
|
||||||
>
|
>
|
||||||
<ListItemIcon>{route.Icon}</ListItemIcon>
|
<ListItemIcon>{route.Icon}</ListItemIcon>
|
||||||
<ListItemText primary={route.name} />
|
<ListItemText primary={route.name} />
|
||||||
|
|
|
@ -2,12 +2,9 @@ import { makeStyles } from '@material-ui/core/styles';
|
||||||
import { DRAWER_WIDTH } from './contants';
|
import { DRAWER_WIDTH } from './contants';
|
||||||
|
|
||||||
const useStyles = makeStyles(theme => ({
|
const useStyles = makeStyles(theme => ({
|
||||||
drawer: {
|
drawerPaper: {
|
||||||
|
zIndex: `${theme.zIndex.appBar - 1} !important` as any,
|
||||||
width: DRAWER_WIDTH,
|
width: DRAWER_WIDTH,
|
||||||
[theme.breakpoints.up('lg')]: {
|
|
||||||
marginTop: 64,
|
|
||||||
height: 'calc(100% - 64px) !important',
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
root: {
|
root: {
|
||||||
backgroundColor: theme.palette.background.paper,
|
backgroundColor: theme.palette.background.paper,
|
||||||
|
|
|
@ -13,7 +13,7 @@ export interface Props {
|
||||||
|
|
||||||
const TopBar = ({ className, openSidebar }: Props) => {
|
const TopBar = ({ className, openSidebar }: Props) => {
|
||||||
return (
|
return (
|
||||||
<AppBar className={clsx(className)} elevation={0}>
|
<AppBar className={clsx(className)}>
|
||||||
<Toolbar>
|
<Toolbar>
|
||||||
<Hidden lgUp>
|
<Hidden lgUp>
|
||||||
<IconButton color="inherit" onClick={openSidebar}>
|
<IconButton color="inherit" onClick={openSidebar}>
|
||||||
|
|
|
@ -21,7 +21,6 @@ const createTheme = (): Theme => {
|
||||||
},
|
},
|
||||||
MuiAppBar: {
|
MuiAppBar: {
|
||||||
color: 'default',
|
color: 'default',
|
||||||
elevation: 0,
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
Reference in New Issue
Block a user