mirror of
https://github.com/Kingsrook/qqq-frontend-material-dashboard.git
synced 2025-07-18 05:10:45 +00:00
Turning hot-dog menu button (to show menu when in mobile) back on;
Hiding recently viewed on smallest screens Updating style on recently viewed to match new paul design
This commit is contained in:
@ -19,7 +19,7 @@
|
|||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import {Popper} from "@mui/material";
|
import {Popper, InputAdornment} from "@mui/material";
|
||||||
import AppBar from "@mui/material/AppBar";
|
import AppBar from "@mui/material/AppBar";
|
||||||
import Autocomplete from "@mui/material/Autocomplete";
|
import Autocomplete from "@mui/material/Autocomplete";
|
||||||
import Badge from "@mui/material/Badge";
|
import Badge from "@mui/material/Badge";
|
||||||
@ -34,8 +34,8 @@ import React, {useContext, useEffect, useState} from "react";
|
|||||||
import {useLocation, useNavigate} from "react-router-dom";
|
import {useLocation, useNavigate} from "react-router-dom";
|
||||||
import QContext from "QContext";
|
import QContext from "QContext";
|
||||||
import QBreadcrumbs, {routeToLabel} from "qqq/components/horseshoe/Breadcrumbs";
|
import QBreadcrumbs, {routeToLabel} from "qqq/components/horseshoe/Breadcrumbs";
|
||||||
import {navbar, navbarContainer, navbarIconButton, navbarRow,} from "qqq/components/horseshoe/Styles";
|
import {navbar, navbarContainer, navbarRow, navbarMobileMenu, recentlyViewedMenu,} from "qqq/components/horseshoe/Styles";
|
||||||
import {setTransparentNavbar, useMaterialUIController,} from "qqq/context";
|
import {setTransparentNavbar, useMaterialUIController, setMiniSidenav} from "qqq/context";
|
||||||
import HistoryUtils from "qqq/utils/HistoryUtils";
|
import HistoryUtils from "qqq/utils/HistoryUtils";
|
||||||
|
|
||||||
// Declaring prop types for NavBar
|
// Declaring prop types for NavBar
|
||||||
@ -57,7 +57,7 @@ function NavBar({absolute, light, isMini}: Props): JSX.Element
|
|||||||
{
|
{
|
||||||
const [navbarType, setNavbarType] = useState<"fixed" | "absolute" | "relative" | "static" | "sticky">();
|
const [navbarType, setNavbarType] = useState<"fixed" | "absolute" | "relative" | "static" | "sticky">();
|
||||||
const [controller, dispatch] = useMaterialUIController();
|
const [controller, dispatch] = useMaterialUIController();
|
||||||
const {transparentNavbar, fixedNavbar, darkMode,} = controller;
|
const {miniSidenav, transparentNavbar, fixedNavbar, darkMode,} = controller;
|
||||||
const [openMenu, setOpenMenu] = useState<any>(false);
|
const [openMenu, setOpenMenu] = useState<any>(false);
|
||||||
const [history, setHistory] = useState<any>([] as HistoryEntry[]);
|
const [history, setHistory] = useState<any>([] as HistoryEntry[]);
|
||||||
const [autocompleteValue, setAutocompleteValue] = useState<any>(null);
|
const [autocompleteValue, setAutocompleteValue] = useState<any>(null);
|
||||||
@ -105,6 +105,8 @@ function NavBar({absolute, light, isMini}: Props): JSX.Element
|
|||||||
return () => window.removeEventListener("scroll", handleTransparentNavbar);
|
return () => window.removeEventListener("scroll", handleTransparentNavbar);
|
||||||
}, [dispatch, fixedNavbar]);
|
}, [dispatch, fixedNavbar]);
|
||||||
|
|
||||||
|
const handleMiniSidenav = () => setMiniSidenav(dispatch, !miniSidenav);
|
||||||
|
|
||||||
const goToHistory = (path: string) =>
|
const goToHistory = (path: string) =>
|
||||||
{
|
{
|
||||||
navigate(path);
|
navigate(path);
|
||||||
@ -162,7 +164,15 @@ function NavBar({absolute, light, isMini}: Props): JSX.Element
|
|||||||
onChange={handleAutocompleteOnChange}
|
onChange={handleAutocompleteOnChange}
|
||||||
PopperComponent={CustomPopper}
|
PopperComponent={CustomPopper}
|
||||||
isOptionEqualToValue={(option, value) => option.id === value.id}
|
isOptionEqualToValue={(option, value) => option.id === value.id}
|
||||||
renderInput={(params) => <TextField {...params} label="Recently Viewed Records" />}
|
sx={recentlyViewedMenu}
|
||||||
|
renderInput={(params) => <TextField {...params} label="Recently Viewed Records" InputProps={{
|
||||||
|
...params.InputProps,
|
||||||
|
endAdornment: (
|
||||||
|
<InputAdornment position="end">
|
||||||
|
<Icon sx={{position: "relative", right: "-1rem"}}>keyboard_arrow_down</Icon>
|
||||||
|
</InputAdornment>
|
||||||
|
)
|
||||||
|
}} />}
|
||||||
renderOption={(props, option: HistoryEntry) => (
|
renderOption={(props, option: HistoryEntry) => (
|
||||||
<Box {...props} component="li" key={option.id} sx={{width: "auto"}}>
|
<Box {...props} component="li" key={option.id} sx={{width: "auto"}}>
|
||||||
<Box sx={{width: "auto", px: "8px", whiteSpace: "overflow"}} key={option.id}>
|
<Box sx={{width: "auto", px: "8px", whiteSpace: "overflow"}} key={option.id}>
|
||||||
@ -175,22 +185,6 @@ function NavBar({absolute, light, isMini}: Props): JSX.Element
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Render the notifications menu
|
|
||||||
const renderMenu = () => (
|
|
||||||
<Menu
|
|
||||||
anchorEl={openMenu}
|
|
||||||
anchorReference={null}
|
|
||||||
anchorOrigin={{
|
|
||||||
vertical: "bottom",
|
|
||||||
horizontal: "left",
|
|
||||||
}}
|
|
||||||
open={Boolean(openMenu)}
|
|
||||||
onClose={handleCloseMenu}
|
|
||||||
sx={{mt: 2}}
|
|
||||||
/>
|
|
||||||
);
|
|
||||||
|
|
||||||
// Styles for the navbar icons
|
// Styles for the navbar icons
|
||||||
const iconsStyle = ({
|
const iconsStyle = ({
|
||||||
palette: {dark, white, text},
|
palette: {dark, white, text},
|
||||||
@ -240,26 +234,22 @@ function NavBar({absolute, light, isMini}: Props): JSX.Element
|
|||||||
>
|
>
|
||||||
<Toolbar sx={navbarContainer}>
|
<Toolbar sx={navbarContainer}>
|
||||||
<Box color="inherit" mb={{xs: 1, md: 0}} sx={(theme) => navbarRow(theme, {isMini})}>
|
<Box color="inherit" mb={{xs: 1, md: 0}} sx={(theme) => navbarRow(theme, {isMini})}>
|
||||||
|
<IconButton
|
||||||
|
size="small"
|
||||||
|
disableRipple
|
||||||
|
color="inherit"
|
||||||
|
sx={navbarMobileMenu}
|
||||||
|
onClick={handleMiniSidenav}
|
||||||
|
>
|
||||||
|
<Icon sx={iconsStyle} fontSize="large">menu</Icon>
|
||||||
|
</IconButton>
|
||||||
<QBreadcrumbs icon="home" title={breadcrumbTitle} route={route} light={light} />
|
<QBreadcrumbs icon="home" title={breadcrumbTitle} route={route} light={light} />
|
||||||
</Box>
|
</Box>
|
||||||
{isMini ? null : (
|
{isMini ? null : (
|
||||||
<Box sx={(theme) => navbarRow(theme, {isMini})}>
|
<Box sx={(theme) => navbarRow(theme, {isMini})}>
|
||||||
<Box pr={1}>
|
<Box pr={0} mr={-2} mt={-4}>
|
||||||
{renderHistory()}
|
{renderHistory()}
|
||||||
</Box>
|
</Box>
|
||||||
<Box color={light ? "white" : "inherit"}>
|
|
||||||
<IconButton
|
|
||||||
size="small"
|
|
||||||
color="inherit"
|
|
||||||
sx={navbarIconButton}
|
|
||||||
onClick={handleOpenMenu}
|
|
||||||
>
|
|
||||||
<Badge badgeContent={0} color="error" variant="dot">
|
|
||||||
<Icon sx={iconsStyle}>notifications</Icon>
|
|
||||||
</Badge>
|
|
||||||
</IconButton>
|
|
||||||
{renderMenu()}
|
|
||||||
</Box>
|
|
||||||
</Box>
|
</Box>
|
||||||
)}
|
)}
|
||||||
</Toolbar>
|
</Toolbar>
|
||||||
|
@ -110,11 +110,10 @@ const navbarContainer = ({breakpoints}: Theme): any => ({
|
|||||||
const navbarRow = ({breakpoints}: Theme, {isMini}: any) => ({
|
const navbarRow = ({breakpoints}: Theme, {isMini}: any) => ({
|
||||||
display: "flex",
|
display: "flex",
|
||||||
alignItems: "center",
|
alignItems: "center",
|
||||||
justifyContent: "space-between",
|
|
||||||
width: "100%",
|
width: "100%",
|
||||||
|
|
||||||
[breakpoints.up("md")]: {
|
[breakpoints.up("md")]: {
|
||||||
justifyContent: isMini ? "space-between" : "stretch",
|
justifyContent: "stretch",
|
||||||
width: isMini ? "100%" : "max-content",
|
width: isMini ? "100%" : "max-content",
|
||||||
},
|
},
|
||||||
|
|
||||||
@ -146,12 +145,27 @@ const navbarDesktopMenu = ({breakpoints}: Theme) => ({
|
|||||||
display: "none !important",
|
display: "none !important",
|
||||||
cursor: "pointer",
|
cursor: "pointer",
|
||||||
|
|
||||||
[breakpoints.up("xl")]: {
|
[breakpoints.down("sm")]: {
|
||||||
display: "inline-block !important",
|
display: "inline-block !important",
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const recentlyViewedMenu = ({breakpoints}: Theme) => ({
|
||||||
|
"& .MuiOutlinedInput-root": {
|
||||||
|
borderRadius: "0",
|
||||||
|
padding: "0"
|
||||||
|
},
|
||||||
|
"& .MuiOutlinedInput-root .MuiOutlinedInput-notchedOutline": {
|
||||||
|
border: "0"
|
||||||
|
},
|
||||||
|
display: "block",
|
||||||
|
[breakpoints.down("md")]: {
|
||||||
|
display: "none !important",
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
const navbarMobileMenu = ({breakpoints}: Theme) => ({
|
const navbarMobileMenu = ({breakpoints}: Theme) => ({
|
||||||
|
left: "-0.75rem",
|
||||||
display: "inline-block",
|
display: "inline-block",
|
||||||
lineHeight: 0,
|
lineHeight: 0,
|
||||||
|
|
||||||
@ -167,4 +181,5 @@ export {
|
|||||||
navbarIconButton,
|
navbarIconButton,
|
||||||
navbarDesktopMenu,
|
navbarDesktopMenu,
|
||||||
navbarMobileMenu,
|
navbarMobileMenu,
|
||||||
|
recentlyViewedMenu
|
||||||
};
|
};
|
||||||
|
Reference in New Issue
Block a user