diff --git a/web-ui/src/components/menu/Menu.css b/web-ui/src/components/menu/Menu.css index ae3114177c..f1d48e1aae 100644 --- a/web-ui/src/components/menu/Menu.css +++ b/web-ui/src/components/menu/Menu.css @@ -87,6 +87,7 @@ font-size: 14px; } + .Menu-listItem, .Menu-subListItem, .MuiListItem-root { color: var(--checkins-palette-primary-menuItem); diff --git a/web-ui/src/components/menu/Menu.jsx b/web-ui/src/components/menu/Menu.jsx index 90b2d5638a..cd696e2143 100644 --- a/web-ui/src/components/menu/Menu.jsx +++ b/web-ui/src/components/menu/Menu.jsx @@ -30,6 +30,7 @@ import { IconButton, List, ListItem, + ListItemButton, ListItemText, Modal, Toolbar @@ -44,6 +45,7 @@ const classes = { menuButton: `${PREFIX}-menuButton`, drawerPaper: `${PREFIX}-drawerPaper`, content: `${PREFIX}-content`, + listItem: `${PREFIX}-listItem`, listStyle: `${PREFIX}-listStyle`, nested: `${PREFIX}-nested`, subListItem: `${PREFIX}-subListItem` @@ -238,7 +240,7 @@ function Menu({ children }) { const createLinkJsx = (path, name, isSubLink) => { return ( - - + ); }; @@ -284,48 +286,57 @@ function Menu({ children }) {
- {createLinkJsx('/', 'HOME', false)} + + {createLinkJsx('/', 'HOME', false)} + {isAdmin && ( <> - + - + {createListJsx(adminLinks, true)} {isAdmin && ( - Upload Hours - + )} )} - {createLinkJsx('/checkins', 'CHECK-INS', false)} - + + {createLinkJsx('/checkins', 'CHECK-INS', false)} + + - + {createListJsx(directoryLinks, true)} - + - + {createListJsx(feedbackLinks, true)} {hasReportPermission && ( - - + {createListJsx(getReportLinks(), true)} diff --git a/web-ui/src/components/menu/__snapshots__/Menu.test.jsx.snap b/web-ui/src/components/menu/__snapshots__/Menu.test.jsx.snap index 8dd8aa5ae9..0bb7be9981 100644 --- a/web-ui/src/components/menu/__snapshots__/Menu.test.jsx.snap +++ b/web-ui/src/components/menu/__snapshots__/Menu.test.jsx.snap @@ -85,36 +85,54 @@ exports[` > renders correctly 1`] = ` class="MuiList-root MuiList-padding Menu-listStyle css-h4y409-MuiList-root" >
- -
- - HOME - -
-
- + HOME + +
+ + + + -
- - CHECK-INS - -
- -
  • + CHECK-INS + +
  • + + + +
    > renders correctly 1`] = ` class="MuiCollapse-wrapperInner MuiCollapse-vertical css-9l5vo-MuiCollapse-wrapperInner" >
    > renders correctly 1`] = ` Guilds & Communities
    +
    > renders correctly 1`] = ` People
    +
    > renders correctly 1`] = ` Teams
    +
    -
  • > renders correctly 1`] = ` FEEDBACK
    -
  • + + @@ -224,36 +262,54 @@ exports[` > renders correctly 1`] = ` class="MuiList-root MuiList-padding Menu-listStyle css-h4y409-MuiList-root" >
    - -
    - - HOME - -
    -
    - + HOME + +
    + + + + -
    - - CHECK-INS - -
    - -
  • + CHECK-INS + + + + + +
  • + +
    > renders correctly 1`] = ` class="MuiCollapse-wrapperInner MuiCollapse-vertical css-9l5vo-MuiCollapse-wrapperInner" >
    > renders correctly 1`] = ` Guilds & Communities
    +
    > renders correctly 1`] = ` People
    +
    > renders correctly 1`] = ` Teams
    +
    -
  • > renders correctly 1`] = ` FEEDBACK
    -
  • + + @@ -433,22 +509,32 @@ exports[` > renders correctly for admin 1`] = ` class="MuiList-root MuiList-padding Menu-listStyle css-h4y409-MuiList-root" >
    - -
    - - HOME - -
    -
    -
  • + HOME + +
  • + + + + + -
    - - CHECK-INS - -
    -
    -
  • + CHECK-INS + + + + + +
  • + +
    > renders correctly for admin 1`] = ` class="MuiCollapse-wrapperInner MuiCollapse-vertical css-9l5vo-MuiCollapse-wrapperInner" >
    > renders correctly for admin 1`] = ` Guilds & Communities
    +
    > renders correctly for admin 1`] = ` People
    +
    > renders correctly for admin 1`] = ` Teams
    +
    -
  • > renders correctly for admin 1`] = ` FEEDBACK
    -
  • + +
    @@ -603,22 +722,32 @@ exports[` > renders correctly for admin 1`] = ` class="MuiList-root MuiList-padding Menu-listStyle css-h4y409-MuiList-root" >
    - -
    - - HOME - -
    -
    -
  • + HOME + +
  • + + + + + -
    - - CHECK-INS - -
    -
    -
  • + CHECK-INS + +
  • + + + +
    > renders correctly for admin 1`] = ` class="MuiCollapse-wrapperInner MuiCollapse-vertical css-9l5vo-MuiCollapse-wrapperInner" >
    > renders correctly for admin 1`] = ` Guilds & Communities
    +
    > renders correctly for admin 1`] = ` People
    +
    > renders correctly for admin 1`] = ` Teams
    +
    -
  • > renders correctly for admin 1`] = ` FEEDBACK
    -
  • + +
    @@ -843,36 +1005,54 @@ exports[` > renders correctly for pdl 1`] = ` class="MuiList-root MuiList-padding Menu-listStyle css-h4y409-MuiList-root" > + + + + -
    - - CHECK-INS - -
    - -
  • + CHECK-INS + +
  • + + + +
    > renders correctly for pdl 1`] = ` class="MuiCollapse-wrapperInner MuiCollapse-vertical css-9l5vo-MuiCollapse-wrapperInner" >
    > renders correctly for pdl 1`] = ` Guilds & Communities
    +
    > renders correctly for pdl 1`] = ` People
    +
    > renders correctly for pdl 1`] = ` Teams
    +
    -
  • > renders correctly for pdl 1`] = ` FEEDBACK
    -
  • + + @@ -982,36 +1182,54 @@ exports[` > renders correctly for pdl 1`] = ` class="MuiList-root MuiList-padding Menu-listStyle css-h4y409-MuiList-root" > + + + + -
    - - CHECK-INS - -
    - -
  • + CHECK-INS + + + + + +
  • + +
    > renders correctly for pdl 1`] = ` class="MuiCollapse-wrapperInner MuiCollapse-vertical css-9l5vo-MuiCollapse-wrapperInner" >
    > renders correctly for pdl 1`] = ` Guilds & Communities
    +
    > renders correctly for pdl 1`] = ` People
    +
    > renders correctly for pdl 1`] = ` Teams
    +
    -
  • > renders correctly for pdl 1`] = ` FEEDBACK
    -
  • + +