diff --git a/src/Components/InfoBox/index.jsx b/src/Components/InfoBox/index.jsx new file mode 100644 index 000000000..6797d6c9c --- /dev/null +++ b/src/Components/InfoBox/index.jsx @@ -0,0 +1,42 @@ +import { RowContainer } from "../StandardContainer"; +import { Stack, Typography } from "@mui/material"; +import Image from "../Image"; + +import { useTheme } from "@mui/material/styles"; + +const InfoBox = ({ + img, + icon: Icon, + alt, + heading, + headingLevel = 2, + subHeading, + subHeadingLevel = "", + sx, +}) => { + const theme = useTheme(); + return ( + + {img && ( + {alt} + )} + {Icon && ( + + )} + + {heading} + + {subHeading} + + + + ); +}; + +export default InfoBox; diff --git a/src/Components/StandardContainer/index.jsx b/src/Components/StandardContainer/index.jsx new file mode 100644 index 000000000..d0ade6805 --- /dev/null +++ b/src/Components/StandardContainer/index.jsx @@ -0,0 +1,52 @@ +// Components +import { Stack } from "@mui/material"; + +// Utils +import { useTheme } from "@emotion/react"; + +const Container = ({ children, direction, backgroundColor, sx }) => { + const theme = useTheme(); + let bgColor = + typeof backgroundColor !== "undefined" + ? backgroundColor + : theme.palette.background.main; + return ( + + {children} + + ); +}; + +export const ColContainer = ({ children, backgroundColor, sx }) => { + return ( + + {children} + + ); +}; + +export const RowContainer = ({ children, backgroundColor, sx }) => { + return ( + + {children} + + ); +}; diff --git a/src/Pages/DistributedUptime/Details/Components/DeviceTicker/index.jsx b/src/Pages/DistributedUptime/Details/Components/DeviceTicker/index.jsx index 78740bd1d..9194eefe5 100644 --- a/src/Pages/DistributedUptime/Details/Components/DeviceTicker/index.jsx +++ b/src/Pages/DistributedUptime/Details/Components/DeviceTicker/index.jsx @@ -2,7 +2,7 @@ import { Stack, Typography } from "@mui/material"; import { useTheme } from "@emotion/react"; import PulseDot from "../../../../../Components/Animated/PulseDot"; import "flag-icons/css/flag-icons.min.css"; -import { styled } from "@mui/material/styles"; +import { ColContainer } from "../../../../../Components/StandardContainer"; const BASE_BOX_PADDING_VERTICAL = 16; const BASE_BOX_PADDING_HORIZONTAL = 8; @@ -15,19 +15,7 @@ const DeviceTicker = ({ data, width = "100%", connectionStatus }) => { }; return ( - + { })} - + ); }; diff --git a/src/Pages/DistributedUptime/Details/Components/DistributedUptimeMap/index.jsx b/src/Pages/DistributedUptime/Details/Components/DistributedUptimeMap/index.jsx index f4e6a2b19..940b59351 100644 --- a/src/Pages/DistributedUptime/Details/Components/DistributedUptimeMap/index.jsx +++ b/src/Pages/DistributedUptime/Details/Components/DistributedUptimeMap/index.jsx @@ -5,6 +5,7 @@ import { useTheme } from "@mui/material/styles"; import maplibregl from "maplibre-gl"; import { useSelector } from "react-redux"; import buildStyle from "./buildStyle"; +import { ColContainer } from "../../../../../Components/StandardContainer"; const DistributedUptimeMap = ({ width = "100%", checks }) => { const mapContainer = useRef(null); @@ -87,6 +88,10 @@ const DistributedUptimeMap = ({ width = "100%", checks }) => { ref={mapContainer} style={{ width: width, + borderRadius: theme.spacing(4), + borderColor: theme.palette.primary.lowContrast, + borderStyle: "solid", + borderWidth: 1, }} /> ); diff --git a/src/Pages/DistributedUptime/Details/Components/StatBoxes/index.jsx b/src/Pages/DistributedUptime/Details/Components/StatBoxes/index.jsx index a4fd3b03d..df0492bd2 100644 --- a/src/Pages/DistributedUptime/Details/Components/StatBoxes/index.jsx +++ b/src/Pages/DistributedUptime/Details/Components/StatBoxes/index.jsx @@ -1,6 +1,6 @@ // Components import { Stack } from "@mui/material"; -import StatBox from "../../../../../Components/StatBox"; +import InfoBox from "../../../../../Components/InfoBox"; import LastUpdate from "../LastUpdate"; import UptLogo from "../../../../../assets/icons/upt_logo.png"; @@ -14,17 +14,21 @@ const StatBoxes = ({ monitor, lastUpdateTrigger }) => { return ( - - - { /> } /> - { /> } /> - - ); }; diff --git a/src/Pages/DistributedUptimeStatus/Status/index.jsx b/src/Pages/DistributedUptimeStatus/Status/index.jsx index 22fa6364a..e4e54f272 100644 --- a/src/Pages/DistributedUptimeStatus/Status/index.jsx +++ b/src/Pages/DistributedUptimeStatus/Status/index.jsx @@ -15,6 +15,7 @@ import SkeletonLayout from "./Components/Skeleton"; import StatBox from "../../../Components/StatBox"; import UptLogo from "../../../assets/icons/upt_logo.png"; import PeopleAltOutlinedIcon from "@mui/icons-material/PeopleAltOutlined"; +import InfoBox from "../../../Components/InfoBox"; //Utils import { useTheme } from "@mui/material/styles"; @@ -175,14 +176,14 @@ const DistributedUptimeStatus = () => { direction="row" gap={theme.spacing(8)} > - -