Skip to content

Commit b1d699a

Browse files
authored
Merge pull request #206 from CodeForPhilly/UStbd-hiding-search-bar-drawer-on-login-page
UStbd: Hiding search bar drawer on login page
2 parents b82741b + ac6928b commit b1d699a

File tree

1 file changed

+19
-12
lines changed

1 file changed

+19
-12
lines changed

frontend/src/layouts/MainLayout.js

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import ChevronRightIcon from "@material-ui/icons/ChevronRight"
1313
import Navbar from "../components/Navbar"
1414
import UserSearch from "../components/UserSearch"
1515
import PropTypes from "prop-types"
16+
import { withRouter } from "react-router-dom"
1617

1718
const drawerWidth = 300
1819

@@ -78,6 +79,23 @@ const PersistentDrawerLeft = props => {
7879
const theme = useTheme()
7980
const [open, setOpen] = React.useState(false)
8081

82+
const ToolbarWrapper = withRouter(({ history }) =>
83+
history.location.pathname.match(/login/) ? null : (
84+
<Toolbar>
85+
<IconButton
86+
color="inherit"
87+
aria-label="open drawer"
88+
onClick={handleDrawerOpen}
89+
edge="start"
90+
className={clsx(classes.menuButton, open && classes.hide)}
91+
>
92+
<MenuIcon />
93+
</IconButton>
94+
<Navbar />
95+
</Toolbar>
96+
)
97+
)
98+
8199
function handleDrawerOpen() {
82100
setOpen(true)
83101
}
@@ -95,18 +113,7 @@ const PersistentDrawerLeft = props => {
95113
[classes.appBarShift]: open,
96114
})}
97115
>
98-
<Toolbar>
99-
<IconButton
100-
color="inherit"
101-
aria-label="open drawer"
102-
onClick={handleDrawerOpen}
103-
edge="start"
104-
className={clsx(classes.menuButton, open && classes.hide)}
105-
>
106-
<MenuIcon />
107-
</IconButton>
108-
<Navbar />
109-
</Toolbar>
116+
<ToolbarWrapper />
110117
</AppBar>
111118
<Drawer
112119
className={classes.drawer}

0 commit comments

Comments
 (0)