brandxtech/frontend
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed the actions on the bin settings and the bottom navigator opening up the side when buttons other than more waere clicked

Browse source
This commit is contained in:
csawatzky 2025-04-24 10:57:21 -06:00
parent 9105b4be3a
commit 5d697091e0
3 changed files with 26 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/app/Header.tsx
View file

@ -125,7 +125,7 @@ export default function Header() {
</Toolbar> </Toolbar>
</AppBar> </AppBar>
<SideNavigator open={navOpen} onOpen={() => {setNavOpen(true)}} onClose={() => {setNavOpen(false)}} /> <SideNavigator open={navOpen} onOpen={() => {setNavOpen(true)}} onClose={() => {setNavOpen(false)}} />
{isMobile && <BottomNavigator setNavOpen={() => {setNavOpen(true)}} sideIsOpen={navOpen} />} {isMobile && <BottomNavigator setNavOpen={isOpen => {setNavOpen(isOpen)}} sideIsOpen={navOpen} />}
</> </>
) )
} }

2
src/bin/BinSettings.tsx
View file

@ -2255,7 +2255,7 @@ export default function BinSettings(props: Props) {
} }
return ( return (
<DialogActions> <DialogActions>
<Grid container justifyContent="space-between" direction="row"> <Grid container justifyContent="space-between" direction="row" width="100%">
<Grid size={{ xs: 5 }}> <Grid size={{ xs: 5 }}>
{mode === "add" ? ( {mode === "add" ? (
<Button <Button

40
src/teams/ObjectTeams.tsx
View file

@ -40,6 +40,7 @@ import { blue, red } from "@mui/material/colors";
import { useNavigate } from "react-router-dom"; import { useNavigate } from "react-router-dom";
import { makeStyles } from "@mui/styles"; import { makeStyles } from "@mui/styles";
import { Share, RemoveCircle as RemoveUserIcon } from "@mui/icons-material"; import { Share, RemoveCircle as RemoveUserIcon } from "@mui/icons-material";
import CancelSubmit from "common/CancelSubmit";
const useStyles = makeStyles((theme: Theme) => { const useStyles = makeStyles((theme: Theme) => {
const avatarBG = theme.palette.secondary["700" as keyof PaletteColor]; const avatarBG = theme.palette.secondary["700" as keyof PaletteColor];
@ -547,22 +548,29 @@ export default function ObjectTeams(props: Props) {
const actions = () => { const actions = () => {
return ( return (
<Grid container direction="row" justifyContent="space-between"> <CancelSubmit
<Grid size={{ xs: 4 }}></Grid> onCancel={close}
<Grid size={{ xs: 8 }} container justifyContent="flex-end"> onSubmit={submit}
{!cardMode && ( submitText={cardMode ? "Update" : "Submit"}
<Button onClick={close} color="primary"> />
Cancel )
</Button> // return (
)} // <Grid container direction="row" justifyContent="space-between">
{canManageUsers && ( // <Grid size={{ xs: 4 }}></Grid>
<Button onClick={submit} color="primary" disabled={objectUsersUnchanged()}> // <Grid size={{ xs: 8 }} container justifyContent="flex-end">
{cardMode ? "Update" : "Submit"} // {!cardMode && (
</Button> // <Button onClick={close} color="primary">
)} // Cancel
</Grid> // </Button>
</Grid> // )}
); // {canManageUsers && (
// <Button onClick={submit} color="primary" disabled={objectUsersUnchanged()}>
// {cardMode ? "Update" : "Submit"}
// </Button>
// )}
// </Grid>
// </Grid>
// );
}; };
const dialogs = () => { const dialogs = () => {