Updated layout (#450)

* Updated layout

* Fixed error

* Changed integration background to white
This commit is contained in:
Daniel C authored and GitHub committed 2024-07-26 09:39:18 -07:00
1 parent 0339922db8
commit 40a268ab18
54 files changed
+441 -773

No files matched your search

+2 -10
View File
@@ -1,18 +1,11 @@
/* NavBar Component Styles*/
.css-14ds6td-MuiPaper-root-MuiAppBar-root {
height: var(--env-var-nav-bar-height);
}
.icon-button-toggle {
display: flex;
align-items: center;
justify-content: center;
.MuiToolbar-root {
min-height: var(--env-var-nav-bar-height) !important;
}
.icon-button-toggle-title {
font-size: var(--env-var-font-size-medium);
color: var(--env-var-color-5);
margin-right: var(--env-var-spacing-2);
}
.icon-button-toggle-pic {
@@ -21,7 +14,6 @@
}
#icon-button {
color: transparent;
-webkit-transition: none;
transition: none;
outline: none;
+84 -108
View File
@@ -1,17 +1,16 @@
import "./index.css";
import { useState } from "react";
import { cloneElement, useState } from "react";
import AppBar from "@mui/material/AppBar";
import Box from "@mui/material/Box";
import Toolbar from "@mui/material/Toolbar";
import IconButton from "@mui/material/IconButton";
import Typography from "@mui/material/Typography";
import Menu from "@mui/material/Menu";
import MenuIcon from "@mui/icons-material/Menu";
import Container from "@mui/material/Container";
import Avatar from "../Avatar";
import Tooltip from "@mui/material/Tooltip";
import MenuItem from "@mui/material/MenuItem";
import { useTheme } from "@mui/material/styles";
import ChevronDown from "../../assets/Images/Icon-chevron-down.png";
import KeyboardArrowDownIcon from "@mui/icons-material/KeyboardArrowDown";
import { clearAuthState } from "../../Features/Auth/authSlice";
import { clearMonitorState } from "../../Features/Monitors/monitorsSlice";
@@ -21,9 +20,7 @@ import LockSvg from "../../assets/icons/lock.svg?react";
import UserSvg from "../../assets/icons/user.svg?react";
import TeamSvg from "../../assets/icons/user-two.svg?react";
import LogoutSvg from "../../assets/icons/logout.svg?react";
import BWULogo from "../../assets/Images/bwl-logo.svg?react";
import Avatar from "../Avatar";
import { Stack, useScrollTrigger } from "@mui/material";
const icons = {
Profile: <UserSvg />,
@@ -32,6 +29,33 @@ const icons = {
Logout: <LogoutSvg />,
};
function AddBorderOnScroll(props) {
const { children, window } = props;
const trigger = useScrollTrigger({
target: window ? window() : undefined,
disableHysteresis: true,
threshold: 0,
});
return (
<AppBar
className={trigger ? "scrolled" : ""}
position="sticky"
sx={{
boxShadow: "none",
transition: "all 0.3s ease",
borderBottom: "1px solid transparent",
"&.scrolled": {
borderBottom: "1px solid #eaecf0",
backgroundColor: "white"
},
}}
>
{children}
</AppBar>
);
}
/**
* NavBar component
*
@@ -100,110 +124,62 @@ function NavBar() {
};
return (
<AppBar
position="sticky"
sx={{
width: "100%",
backgroundColor: "transparent",
boxShadow: "none",
borderBottom: "1px solid var(--color-border-0)",
}}
>
<Container maxWidth="xxl" sx={{ width: "100%" }}>
<Toolbar disableGutters>
<BWULogo id="bw-uptime-logo-dashboard" alt="BlueWave Uptime Logo" />
<Box sx={{ flexGrow: 1, display: { xs: "flex", md: "none" } }}>
<IconButton
size="large"
aria-label="account of current user"
aria-controls="menu-appbar"
aria-haspopup="true"
color="inherit"
>
<MenuIcon />
</IconButton>
</Box>
<Typography
variant="h5"
noWrap
component="a"
href="#"
sx={{
mr: 2,
display: { xs: "flex", md: "none" },
flexGrow: 1,
fontFamily: "monospace",
fontWeight: theme.typography.fontWeightBold,
letterSpacing: theme.spacing(0.3),
color: "inherit",
textDecoration: "none",
}}
<AddBorderOnScroll>
<Toolbar disableGutters sx={{ alignSelf: "flex-end", paddingX: "25px" }}>
<Tooltip title="Open settings">
<IconButton
id="icon-button"
onClick={handleOpenUserMenu}
sx={{ p: 0 }}
>
UPTIME GENIE
</Typography>
<Box sx={{ flexGrow: 1 }} />
<Box sx={{ flexGrow: 0 }}>
<Tooltip title="Open settings">
<IconButton
id="icon-button"
onClick={handleOpenUserMenu}
sx={{ p: 0 }}
<Stack direction="row" alignItems="center" gap="8px">
<Avatar small={true} />
<Box
className="icon-button-toggle-title"
sx={{ mr: "3px", lineHeight: 2 }}
>
<div className="icon-button-toggle">
<Avatar small={true} sx={{ mr: "8px" }} />
<div className="icon-button-toggle-title">
{authState.user?.firstName} {authState.user?.lastName}
</div>
<img
className="icon-button-toggle-pic"
src={ChevronDown}
alt="ChevronDown"
/>
</div>
</IconButton>
</Tooltip>
<Menu
sx={{ mt: theme.spacing(5.5) }}
id="menu-appbar"
anchorEl={anchorElUser}
anchorOrigin={{
vertical: "top",
horizontal: "right",
}}
keepMounted
transformOrigin={{
vertical: "top",
horizontal: "right",
}}
open={Boolean(anchorElUser)}
onClose={handleCloseUserMenu}
{authState.user?.firstName} {authState.user?.lastName}
</Box>
<KeyboardArrowDownIcon sx={{ mt: "2px" }} />
</Stack>
</IconButton>
</Tooltip>
<Menu
sx={{ mt: theme.spacing(5.5) }}
id="menu-appbar"
anchorEl={anchorElUser}
anchorOrigin={{
vertical: "top",
horizontal: "right",
}}
keepMounted
transformOrigin={{
vertical: "top",
horizontal: "right",
}}
open={Boolean(anchorElUser)}
onClose={handleCloseUserMenu}
>
{settings.map((setting) => (
<MenuItem
id="menu-item"
key={setting}
onClick={() => handleCloseUserMenu(setting)}
sx={{ width: "150px" }}
>
{settings.map((setting) => (
<MenuItem
id="menu-item"
key={setting}
onClick={() => handleCloseUserMenu(setting)}
sx={{ width: "150px" }}
>
{icons[setting]}
<Typography
fontSize="var(--env-var-font-size-medium)"
textAlign="center"
marginLeft="8px"
>
{setting}
</Typography>
</MenuItem>
))}
</Menu>
</Box>
</Toolbar>
</Container>
</AppBar>
{icons[setting]}
<Typography
fontSize="var(--env-var-font-size-medium)"
textAlign="center"
marginLeft="8px"
>
{setting}
</Typography>
</MenuItem>
))}
</Menu>
</Toolbar>
</AddBorderOnScroll>
);
}