Skip to content

Create settings page #136

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
TylerAdamMartinez merged 8 commits into from
Sep 3, 2025
Merged

Create settings page #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8aab830
[sidenav] Update drawer to be more responsive
TylerAdamMartinez Sep 2, 2025
0428904
[Settings] Commented out password reset for now
TylerAdamMartinez Sep 2, 2025
67b8963
[MonitoringWells] Patch styles on mobile
TylerAdamMartinez Sep 2, 2025
bc25f00
[views/Reports] Fix styling on reports for tablet & mobile
TylerAdamMartinez Sep 2, 2025
036570a
[Parts & UserManagement] Update pages to be tablet friendly
TylerAdamMartinez Sep 3, 2025
a4cc4df
[BackgroundBox] Stop the page contents to be bigger than xl
TylerAdamMartinez Sep 3, 2025
00db0ac
[AppLayout] Rm unneeded theme call
TylerAdamMartinez Sep 3, 2025
1d3b63a
[index] Update title
TylerAdamMartinez Sep 3, 2025
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
2 changes: 1 addition & 1 deletion frontend/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

<link rel="icon" href="favicon.ico" />
<link rel="apple-touch-icon" href="logo.png" />
<title>Meter Manager DB</title>
<title>Meter Manager</title>
</head>

<body>
Expand Down
79 changes: 39 additions & 40 deletions frontend/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@hookform/resolvers": "^3.2.0",
"@mui/icons-material": "^5.10.6",
"@mui/material": "^5.15.14",
"@mui/x-charts": "^8.5.3",
"@mui/x-charts": "^8.0.0-beta.3",
"@mui/x-data-grid": "^7.0.0",
"@mui/x-date-pickers": "^6.10.0",
"dayjs": "^1.11.9",
Expand Down
19 changes: 3 additions & 16 deletions frontend/src/AppLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { useAuthUser } from "react-auth-kit";
import { useEffect, useState } from "react";
import { useLocation, useNavigate } from "react-router-dom";
import { Box } from "@mui/material";
import { Theme } from "@mui/material/styles";
import { SecurityScope } from "./interfaces";
import Topbar from "./components/Topbar";
import Sidenav from "./sidenav";
Expand Down Expand Up @@ -75,13 +74,6 @@ export const AppLayout = ({
<Topbar
open={drawerOpen}
onMenuClick={() => setDrawerOpen(!drawerOpen)}
sx={(theme: Theme) => ({
zIndex: theme.zIndex.drawer + 1,
transition: theme.transitions.create(["margin", "width"], {
easing: theme.transitions.easing.sharp,
duration: theme.transitions.duration.leavingScreen,
}),
})}
/>
<Sidenav
open={drawerOpen}
Expand All @@ -90,22 +82,17 @@ export const AppLayout = ({
/>
<Box
component="main"
sx={(theme: Theme) => ({
sx={{
flexGrow: 1,
flexShrink: 1,
minWidth: 0,
p: 3,
mt: 8,
...theme.mixins.toolbar,
transition: theme.transitions.create("margin", {
easing: theme.transitions.easing.sharp,
duration: theme.transitions.duration.leavingScreen,
}),
})}
}}
>
{pageComponent}
</Box>
</Box>
</Box >
);
};

2 changes: 2 additions & 0 deletions frontend/src/components/BackgroundBox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ export const BackgroundBox: React.FC<BoxProps> = ({
return (
<Box
sx={{
mx: "auto", // center horizontally
maxWidth: "xl", // limit to MUI's `xl` breakpoint (default is 1536px)
height: "fit-content",
pb: 6,
...sx,
Expand Down
6 changes: 5 additions & 1 deletion frontend/src/sidenav.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,13 @@ export default function Sidenav({

return (
<Drawer
variant="persistent"
variant="temporary"
anchor="left"
open={open}
onClose={onClose}
ModalProps={{
keepMounted: true, // improves performance on mobile
}}
sx={{
flexShrink: 0,
width: open ? drawerWidth : 0,
Expand Down
1 change: 1 addition & 0 deletions frontend/src/views/Chlorides/ChloridesView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ export const ChloridesView = () => {
</Alert>
)}
<FormControl
size="small"
sx={{ minWidth: "100px", maxWidth: 600, width: "100%" }}
disabled={isLoadingRegions || !!errorRegions}
>
Expand Down
1 change: 1 addition & 0 deletions frontend/src/views/MonitoringWells/MonitoringWellsView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ export const MonitoringWellsView = () => {
</Alert>
)}
<FormControl
size="small"
sx={{ minWidth: "100px", maxWidth: 600, width: "100%" }}
disabled={monitoredWellsQuery?.isFetching || !!monitoredWellsQuery?.isError}
>
Expand Down
Loading