mirror of
https://gitlab.com/comunic/comunicconsole
synced 2024-11-23 13:59:23 +00:00
Fix scroll issue
This commit is contained in:
parent
d01aa9272c
commit
41d568e493
@ -115,67 +115,76 @@ export function MainRoute() {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<Router>
|
<Router>
|
||||||
<AppBar
|
|
||||||
position="absolute"
|
|
||||||
className={classes.appBar}
|
|
||||||
color="primary"
|
|
||||||
>
|
|
||||||
<Toolbar className={classes.toolbar}>
|
|
||||||
<Typography
|
|
||||||
component="h1"
|
|
||||||
variant="h6"
|
|
||||||
color="inherit"
|
|
||||||
noWrap
|
|
||||||
className={classes.title}
|
|
||||||
>
|
|
||||||
Comunic Console
|
|
||||||
</Typography>
|
|
||||||
|
|
||||||
<Typography>
|
|
||||||
{AccountHelper.currentAccount.name}
|
|
||||||
<br />
|
|
||||||
<small>{AccountHelper.currentAccount.email}</small>
|
|
||||||
</Typography>
|
|
||||||
|
|
||||||
<IconButton aria-label="delete" onClick={signOut}>
|
|
||||||
<CloseSharpIcon />
|
|
||||||
</IconButton>
|
|
||||||
</Toolbar>
|
|
||||||
</AppBar>
|
|
||||||
<div
|
<div
|
||||||
style={{
|
style={{
|
||||||
display: "flex",
|
|
||||||
height: "100%",
|
height: "100%",
|
||||||
flexDirection: "row",
|
display: "flex",
|
||||||
width: "100%",
|
flexDirection: "column",
|
||||||
marginTop: "64px",
|
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Paper style={{ width: "200px" }}>
|
<Toolbar></Toolbar>
|
||||||
<Menu></Menu>
|
|
||||||
</Paper>
|
|
||||||
|
|
||||||
<div style={{ flex: "1", padding: "50px", height: "100%" }}>
|
<AppBar
|
||||||
<div
|
position="fixed"
|
||||||
style={{
|
className={classes.appBar}
|
||||||
height: "100%",
|
color="primary"
|
||||||
margin: "auto",
|
>
|
||||||
maxWidth: "1280px",
|
<Toolbar className={classes.toolbar}>
|
||||||
}}
|
<Typography
|
||||||
>
|
component="h1"
|
||||||
<Switch>
|
variant="h6"
|
||||||
<Route exact path="/">
|
color="inherit"
|
||||||
<HomeRoute></HomeRoute>
|
noWrap
|
||||||
</Route>
|
className={classes.title}
|
||||||
|
>
|
||||||
|
Comunic Console
|
||||||
|
</Typography>
|
||||||
|
|
||||||
<Route path="/accounts/:id">
|
<Typography>
|
||||||
<AccountSettingsRoute></AccountSettingsRoute>
|
{AccountHelper.currentAccount.name}
|
||||||
</Route>
|
<br />
|
||||||
|
<small>{AccountHelper.currentAccount.email}</small>
|
||||||
|
</Typography>
|
||||||
|
|
||||||
<Route path="*">
|
<IconButton aria-label="delete" onClick={signOut}>
|
||||||
<NotFoundRoute></NotFoundRoute>
|
<CloseSharpIcon />
|
||||||
</Route>
|
</IconButton>
|
||||||
</Switch>
|
</Toolbar>
|
||||||
|
</AppBar>
|
||||||
|
<div
|
||||||
|
style={{
|
||||||
|
display: "flex",
|
||||||
|
flex: "1",
|
||||||
|
flexDirection: "row",
|
||||||
|
width: "100%",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Paper style={{ width: "200px" }}>
|
||||||
|
<Menu></Menu>
|
||||||
|
</Paper>
|
||||||
|
|
||||||
|
<div style={{ flex: "1", padding: "50px" }}>
|
||||||
|
<div
|
||||||
|
style={{
|
||||||
|
height: "100%",
|
||||||
|
margin: "auto",
|
||||||
|
maxWidth: "1280px",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Switch>
|
||||||
|
<Route exact path="/">
|
||||||
|
<HomeRoute></HomeRoute>
|
||||||
|
</Route>
|
||||||
|
|
||||||
|
<Route path="/accounts/:id">
|
||||||
|
<AccountSettingsRoute></AccountSettingsRoute>
|
||||||
|
</Route>
|
||||||
|
|
||||||
|
<Route path="*">
|
||||||
|
<NotFoundRoute></NotFoundRoute>
|
||||||
|
</Route>
|
||||||
|
</Switch>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
Reference in New Issue
Block a user