removed the default padding from page container, and changed the prop from padding to spacing, this will add left and right padding and a top margin, also disable the page wide scroll bar in app.css

This commit is contained in:
csawatzky 2025-06-09 14:12:42 -06:00
parent 06a5476e93
commit 48f3c03ebc
8 changed files with 13 additions and 8 deletions

View file

@ -22,6 +22,7 @@ html, body, #root {
height: 100%; height: 100%;
margin: 0; margin: 0;
padding: 0; padding: 0;
overflow-y: hidden;
} }
/* styles.css or a CSS module */ /* styles.css or a CSS module */

View file

@ -5,6 +5,7 @@ import { useEffect, useState } from "react";
import React from "react"; import React from "react";
import { useMobile } from "hooks"; import { useMobile } from "hooks";
import classNames from "classnames"; import classNames from "classnames";
import { getThemeType } from "theme";
const useStyles = makeStyles((theme: Theme) => { const useStyles = makeStyles((theme: Theme) => {
//const isMobile = useMobile() //const isMobile = useMobile()
@ -58,6 +59,7 @@ const useStyles = makeStyles((theme: Theme) => {
}, },
stickyHeader: { stickyHeader: {
position: "sticky", position: "sticky",
backgroundColor: getThemeType() === "light" ? "rgb(245, 245, 245)" : "rgb(40, 40, 40)",
top: 0, top: 0,
zIndex: 300 //giving a really high z-index to make sure nothing is in front of it zIndex: 300 //giving a really high z-index to make sure nothing is in front of it
} }

View file

@ -6,7 +6,7 @@ export default function AviationMap() {
const location = useLocation(); const location = useLocation();
return ( return (
<PageContainer padding={-1}> <PageContainer>
{location.state !== undefined && {location.state !== undefined &&
location.state !== null && location.state !== null &&
location.state.long !== undefined && location.state.long !== undefined &&

View file

@ -1477,5 +1477,5 @@ export default function Bins(props: Props) {
); );
}; };
return !props.insert ? <PageContainer padding={-1}>{page()}</PageContainer> : page(); return !props.insert ? <PageContainer>{page()}</PageContainer> : page();
} }

View file

@ -6,7 +6,7 @@ export default function ConstructionSiteMap() {
const location = useLocation(); const location = useLocation();
return ( return (
<PageContainer padding={-1}> <PageContainer>
{location.state !== undefined && {location.state !== undefined &&
location.state !== null && location.state !== null &&
location.state.long !== undefined && location.state.long !== undefined &&

View file

@ -704,7 +704,7 @@ export default function Devices() {
} }
return( return(
<PageContainer padding={isMobile ? 0 : 2}> <PageContainer spacing={2}>
<Box <Box
sx={{ sx={{
borderRadius: 1, borderRadius: 1,

View file

@ -5,7 +5,7 @@ import { useLocation } from "react-router";
export default function FieldMap() { export default function FieldMap() {
const location = useLocation(); const location = useLocation();
return ( return (
<PageContainer padding={-1}> <PageContainer>
{location.state !== undefined && {location.state !== undefined &&
location.state !== null && location.state !== null &&
location.state.long !== undefined && location.state.long !== undefined &&

View file

@ -39,7 +39,7 @@ interface Props extends PropsWithChildren{
fullViewport?: boolean; fullViewport?: boolean;
isCenterCenter?: boolean; isCenterCenter?: boolean;
sx?: SxProps<Theme>; sx?: SxProps<Theme>;
padding?: number; spacing?: number;
} }
export const PageContainer: React.FunctionComponent<Props> = (props: Props) => { export const PageContainer: React.FunctionComponent<Props> = (props: Props) => {
@ -48,7 +48,7 @@ export const PageContainer: React.FunctionComponent<Props> = (props: Props) => {
const { children, fullViewport, isCenterCenter, sx } = props; const { children, fullViewport, isCenterCenter, sx } = props;
// let fullViewport = false // let fullViewport = false
// let isCenterCenter = false // let isCenterCenter = false
const padding = props.padding ? props.padding : isMobile ? 1 : 2; const spacing = props.spacing;
return ( return (
<Container <Container
className={classNames( className={classNames(
@ -57,7 +57,9 @@ export const PageContainer: React.FunctionComponent<Props> = (props: Props) => {
)} )}
sx={{ sx={{
...sx, // Spread existing sx ...sx, // Spread existing sx
...(padding !== undefined && { padding }), // Conditionally add padding paddingX: spacing,
marginTop: spacing
// ...(padding !== undefined && { padding }), // Conditionally add padding
}} }}
disableGutters disableGutters
maxWidth={false} maxWidth={false}