Skip to content

add admin badge to avatar #880

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lmarini merged 1 commit into from
Jan 23, 2024
Merged

add admin badge to avatar #880

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 48 additions & 12 deletions frontend/src/components/Layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,14 @@ import ListItem from "@mui/material/ListItem";
import ListItemButton from "@mui/material/ListItemButton";
import ListItemIcon from "@mui/material/ListItemIcon";
import ListItemText from "@mui/material/ListItemText";
import { Link, Menu, MenuItem, MenuList, Typography } from "@mui/material";
import {
Badge,
Link,
Menu,
MenuItem,
MenuList,
Typography,
} from "@mui/material";
import { Link as RouterLink, useLocation } from "react-router-dom";
import { useDispatch, useSelector } from "react-redux";
import { RootState } from "../types/data";
Expand All @@ -37,6 +44,7 @@ import {
} from "../actions/user";
import { AdminPanelSettings } from "@mui/icons-material";
import ManageAccountsIcon from "@mui/icons-material/ManageAccounts";
import AdminPanelSettingsIcon from "@mui/icons-material/AdminPanelSettings";

const drawerWidth = 240;

Expand Down Expand Up @@ -202,18 +210,46 @@ export default function PersistentDrawerLeft(props) {
color="inherit"
>
{getCurrEmail() !== undefined ? (
<Gravatar
email={getCurrEmail()}
rating="g"
style={{
width: "32px",
height: "32px",
borderRadius: "50%",
verticalAlign: "middle",
}}
/>
<Badge
overlap="circular"
anchorOrigin={{ vertical: "bottom", horizontal: "right" }}
badgeContent={
adminMode ? (
<AdminPanelSettingsIcon
sx={{ color: theme.palette.primary.main }}
/>
) : (
<></>
)
}
>
<Gravatar
email={getCurrEmail()}
rating="g"
style={{
width: "32px",
height: "32px",
borderRadius: "50%",
verticalAlign: "middle",
}}
/>
</Badge>
) : (
<PersonIcon sx={{ verticalAlign: "middle" }} />
<Badge
overlap="circular"
anchorOrigin={{ vertical: "bottom", horizontal: "right" }}
badgeContent={
adminMode ? (
<AdminPanelSettingsIcon
sx={{ color: theme.palette.primary.main }}
/>
) : (
<></>
)
}
>
<PersonIcon sx={{ verticalAlign: "middle" }} />
</Badge>
)}
</IconButton>
)}
Expand Down