Skip to content

Commit c5aa719

Browse files
authored
removing left dividers (#1133)
* pre-commit * remove import not used * removing divider for public layout to match the layout for logged in users
1 parent 236e712 commit c5aa719

File tree

2 files changed

+21
-41
lines changed

2 files changed

+21
-41
lines changed

frontend/src/components/Layout.tsx

Lines changed: 21 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import Drawer from "@mui/material/Drawer";
66
import MuiAppBar, { AppBarProps as MuiAppBarProps } from "@mui/material/AppBar";
77
import Toolbar from "@mui/material/Toolbar";
88
import List from "@mui/material/List";
9-
import Divider from "@mui/material/Divider";
109
import IconButton from "@mui/material/IconButton";
1110
import MenuIcon from "@mui/icons-material/Menu";
1211
import ChevronLeftIcon from "@mui/icons-material/ChevronLeft";
@@ -273,7 +272,6 @@ export default function PersistentDrawerLeft(props) {
273272
</ListItemIcon>
274273
<ListItemText>User Profile</ListItemText>
275274
</MenuItem>
276-
<Divider orientation="horizontal" />
277275
{currUserProfile.admin ? (
278276
<>
279277
<MenuItem onClick={() => toggleAdminMode(!adminMode)}>
@@ -293,8 +291,6 @@ export default function PersistentDrawerLeft(props) {
293291
</>
294292
)}
295293
</MenuItem>
296-
297-
<Divider orientation="horizontal" />
298294
</>
299295
) : (
300296
<></>
@@ -306,7 +302,6 @@ export default function PersistentDrawerLeft(props) {
306302
</ListItemIcon>
307303
<ListItemText>API Key</ListItemText>
308304
</MenuItem>
309-
<Divider orientation="horizontal" />
310305
<MenuItem component={RouterLink} to="/auth/logout">
311306
<ListItemIcon>
312307
<LogoutIcon fontSize="small" />
@@ -338,7 +333,6 @@ export default function PersistentDrawerLeft(props) {
338333
)}
339334
</IconButton>
340335
</DrawerHeader>
341-
<Divider />
342336
<List>
343337
<ListItem key={"explore"} disablePadding>
344338
<ListItemButton component={RouterLink} to="/">
@@ -349,7 +343,6 @@ export default function PersistentDrawerLeft(props) {
349343
</ListItemButton>
350344
</ListItem>
351345
</List>
352-
<Divider />
353346
<List>
354347
<ListItem key={"search"} disablePadding>
355348
<ListItemButton component={RouterLink} to="/search">
@@ -360,26 +353,21 @@ export default function PersistentDrawerLeft(props) {
360353
</ListItemButton>
361354
</ListItem>
362355
</List>
363-
<Divider />
364356
{currUserProfile.admin ? (
365-
<>
366-
<List>
367-
<ListItem key={"manage-user"} disablePadding>
368-
<ListItemButton component={RouterLink} to="/manage-users">
369-
<ListItemIcon>
370-
<ManageAccountsIcon />
371-
</ListItemIcon>
372-
<ListItemText primary={"Manage Users"} />
373-
</ListItemButton>
374-
</ListItem>
375-
</List>
376-
<Divider />
377-
</>
357+
<List>
358+
<ListItem key={"manage-user"} disablePadding>
359+
<ListItemButton component={RouterLink} to="/manage-users">
360+
<ListItemIcon>
361+
<ManageAccountsIcon />
362+
</ListItemIcon>
363+
<ListItemText primary={"Manage Users"} />
364+
</ListItemButton>
365+
</ListItem>
366+
</List>
378367
) : null}
379-
<List>
380-
{currUserProfile.read_only_user ? (
381-
<></>
382-
) : (
368+
369+
{currUserProfile.read_only_user ? null : (
370+
<List>
383371
<ListItem key={"groups"} disablePadding>
384372
<ListItemButton component={RouterLink} to="/groups">
385373
<ListItemIcon>
@@ -388,13 +376,12 @@ export default function PersistentDrawerLeft(props) {
388376
<ListItemText primary={"Groups"} />
389377
</ListItemButton>
390378
</ListItem>
391-
)}
392-
</List>
393-
<Divider />
394-
<List>
395-
{currUserProfile.read_only_user ? (
396-
<></>
397-
) : (
379+
</List>
380+
)}
381+
{currUserProfile.read_only_user ? (
382+
<></>
383+
) : (
384+
<List>
398385
<ListItem key={"newdataset"} disablePadding>
399386
<ListItemButton component={RouterLink} to="/create-dataset">
400387
<ListItemIcon>
@@ -403,9 +390,8 @@ export default function PersistentDrawerLeft(props) {
403390
<ListItemText primary={"New Dataset"} />
404391
</ListItemButton>
405392
</ListItem>
406-
)}
407-
</List>
408-
<Divider />
393+
</List>
394+
)}
409395
<List>
410396
<ListItem key={"metadataDefinition"} disablePadding>
411397
<ListItemButton component={RouterLink} to="/metadata-definitions">
@@ -416,7 +402,6 @@ export default function PersistentDrawerLeft(props) {
416402
</ListItemButton>
417403
</ListItem>
418404
</List>
419-
<Divider />
420405
<List>
421406
<ListItem key={"extractions"} disablePadding>
422407
<ListItemButton component={RouterLink} to="/extractions">
@@ -427,7 +412,6 @@ export default function PersistentDrawerLeft(props) {
427412
</ListItemButton>
428413
</ListItem>
429414
</List>
430-
<Divider />
431415
<List>
432416
<ListItem key={"listeners"} disablePadding>
433417
<ListItemButton component={RouterLink} to="/listeners">
@@ -438,7 +422,6 @@ export default function PersistentDrawerLeft(props) {
438422
</ListItemButton>
439423
</ListItem>
440424
</List>
441-
<Divider />
442425
<List>
443426
<ListItem key={"feeds"} disablePadding>
444427
<ListItemButton component={RouterLink} to="/feeds">

frontend/src/components/PublicLayout.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,6 @@ export default function PersistentDrawerLeft(props) {
226226
)}
227227
</IconButton>
228228
</DrawerHeader>
229-
<Divider />
230229
<List>
231230
<ListItem key={"public"} disablePadding>
232231
<ListItemButton component={RouterLink} to="/public">
@@ -237,7 +236,6 @@ export default function PersistentDrawerLeft(props) {
237236
</ListItemButton>
238237
</ListItem>
239238
</List>
240-
<Divider />
241239
<List>
242240
<ListItem key={"public_search"} disablePadding>
243241
<ListItemButton component={RouterLink} to="/public_search">
@@ -249,7 +247,6 @@ export default function PersistentDrawerLeft(props) {
249247
</ListItem>
250248
</List>
251249
{/*<Divider />*/}
252-
<Divider />
253250
</Drawer>
254251
<Main open={open}>
255252
<DrawerHeader />

0 commit comments

Comments
 (0)