diff --git a/Client/src/Components/BasicTable/index.jsx b/Client/src/Components/BasicTable/index.jsx index e2de29ae1..aed322beb 100644 --- a/Client/src/Components/BasicTable/index.jsx +++ b/Client/src/Components/BasicTable/index.jsx @@ -200,31 +200,12 @@ const BasicTable = ({ data, paginated, reversed, table }) => { return ( <> - + - + {data.cols.map((col) => ( - - {col.name} - + {col.name} ))} @@ -242,17 +223,7 @@ const BasicTable = ({ data, paginated, reversed, table }) => { onClick={row.handleClick ? row.handleClick : null} > {row.data.map((cell) => { - return ( - - {cell.data} - - ); + return {cell.data}; })} ); diff --git a/Client/src/Components/Sidebar/index.jsx b/Client/src/Components/Sidebar/index.jsx index 2988efb54..722d48431 100644 --- a/Client/src/Components/Sidebar/index.jsx +++ b/Client/src/Components/Sidebar/index.jsx @@ -598,8 +598,9 @@ function Sidebar() { MenuListProps={{ sx: { p: 2, + "& li": { m: 0 }, "& li:has(.MuiBox-root):hover": { - backgroundColor: theme.palette.background.main, + backgroundColor: "transparent", }, }, }} @@ -620,8 +621,22 @@ function Sidebar() { )} {collapsed && } - dispatch(setMode("light"))}>Light - dispatch(setMode("dark"))}>Dark + { + dispatch(setMode("light")); + closePopup(); + }} + > + Light + + { + dispatch(setMode("dark")); + closePopup(); + }} + > + Dark + { slotProps={{ paper: { sx: { - "& ul": { - p: theme.spacing(2.5), - minWidth: "100px", - }, - "& li": { - color: theme.palette.text.secondary, - fontSize: 13, - px: theme.spacing(4), - py: theme.spacing(2.5), - borderRadius: theme.shape.borderRadius, - }, + "& ul": { p: theme.spacing(2.5) }, + "& li": { m: 0 }, "& li:last-of-type": { color: theme.palette.error.text, }, diff --git a/Client/src/Pages/Monitors/Home/index.jsx b/Client/src/Pages/Monitors/Home/index.jsx index e17b56e37..75632a582 100644 --- a/Client/src/Pages/Monitors/Home/index.jsx +++ b/Client/src/Pages/Monitors/Home/index.jsx @@ -13,6 +13,7 @@ import Fallback from "./fallback"; import StatusBox from "./StatusBox"; import { buildData } from "./monitorData"; import Breadcrumbs from "../../../Components/Breadcrumbs"; +import Greeting from "../../../Utils/greeting"; const Monitors = ({ isAdmin }) => { const theme = useTheme(); @@ -73,36 +74,7 @@ const Monitors = ({ isAdmin }) => { alignItems="center" mt={theme.spacing(5)} > - - - - Good {greeting},{" "} - - - {authState.user.firstName} {emoji} - - - - Hereโ€™s an overview of your uptime monitors. - - + {monitorState.monitors?.length !== 0 && (