From d56ee2abb7105a178733fd6a1c77d19e0968517f Mon Sep 17 00:00:00 2001 From: Daniel Cojocea Date: Fri, 30 Aug 2024 12:53:23 -0400 Subject: [PATCH 1/4] Added darkmode warning palette --- Client/src/Components/BasicTable/index.jsx | 37 ++----------------- Client/src/Components/Sidebar/index.jsx | 21 +++++++++-- .../src/Pages/Monitors/Home/actionsMenu.jsx | 13 +------ Client/src/Utils/Theme/darkTheme.js | 15 ++++---- 4 files changed, 32 insertions(+), 54 deletions(-) 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/Utils/Theme/darkTheme.js b/Client/src/Utils/Theme/darkTheme.js index c2e137004..0a945e6a8 100644 --- a/Client/src/Utils/Theme/darkTheme.js +++ b/Client/src/Utils/Theme/darkTheme.js @@ -38,22 +38,22 @@ const darkTheme = createTheme({ success: { text: "#079455", main: "#45bb7a", - light: "#93d5aa", + light: "#1e1e1e", bg: "#27272a", }, error: { text: "#f04438", main: "#d32f2f", - light: "#f04438", + light: "#1e1e1e", bg: "#27272a", border: "#f04438", }, warning: { - text: "#DC6803", - main: "#e88c30", - light: "#fffcf5", - bg: "#ffecbc", - border: "#fec84b", + text: "#e88c30", + main: "#FF9F00", + light: "#27272a", + bg: "#1E1E1E", + border: "#e88c30", }, unresolved: { main: "#4e5ba6", light: "#e2eaf7", bg: "#f2f4f7" }, divider: border.light, @@ -102,6 +102,7 @@ const darkTheme = createTheme({ borderRadius: 4, boxShadow: shadow, backgroundColor: background.main, + backgroundImage: "none", }, }, }, From 4c68a550106d48a32abeecb2880f28fb3a1d9545 Mon Sep 17 00:00:00 2001 From: Daniel Cojocea Date: Fri, 30 Aug 2024 13:15:22 -0400 Subject: [PATCH 2/4] Added greeting to pagespeed dashboard --- Client/src/Pages/PageSpeed/index.css | 8 +-- Client/src/Pages/PageSpeed/index.jsx | 102 ++++++++++++++++++++------- 2 files changed, 79 insertions(+), 31 deletions(-) diff --git a/Client/src/Pages/PageSpeed/index.css b/Client/src/Pages/PageSpeed/index.css index a970ccd70..edfcdb6b6 100644 --- a/Client/src/Pages/PageSpeed/index.css +++ b/Client/src/Pages/PageSpeed/index.css @@ -1,14 +1,13 @@ .page-speed h2.MuiTypography-root { line-height: 1.1; } -.page-speed h1.MuiTypography-root, +.page-speed h1.MuiTypography-root { + font-size: var(--env-var-font-size-large-plus); +} .page-speed h2.MuiTypography-root { font-size: var(--env-var-font-size-large); font-weight: 600; } -.page-speed p.MuiTypography-root { - font-size: var(--env-var-font-size-medium); -} .page-speed p:has(> span.MuiTypography-root), .page-speed p.MuiTypography-root > span.MuiTypography-root { font-size: var(--env-var-font-size-small-plus); @@ -20,5 +19,4 @@ } .page-speed:not(:has([class*="fallback__"])) button { height: 34px; - align-self: flex-end; } diff --git a/Client/src/Pages/PageSpeed/index.jsx b/Client/src/Pages/PageSpeed/index.jsx index a96eefe3b..23521d0da 100644 --- a/Client/src/Pages/PageSpeed/index.jsx +++ b/Client/src/Pages/PageSpeed/index.jsx @@ -12,6 +12,7 @@ import Button from "../../Components/Button"; import { useNavigate } from "react-router"; import { getLastChecked } from "../../Utils/monitorUtils"; import PropTypes from "prop-types"; +import Breadcrumbs from "../../Components/Breadcrumbs"; const Card = ({ data }) => { const theme = useTheme(); @@ -24,7 +25,7 @@ const Card = ({ data }) => { flexGrow={1} sx={{ "&:hover > .MuiStack-root": { - backgroundColor: "var(--primary-bg-accent)", + backgroundColor: theme.palette.background.accent, }, }} > @@ -37,7 +38,10 @@ const Card = ({ data }) => { borderColor={theme.palette.border.light} borderRadius={theme.shape.borderRadius} backgroundColor={theme.palette.background.main} - sx={{ cursor: "pointer" }} + sx={{ + cursor: "pointer", + "& svg path": { stroke: theme.palette.other.icon, strokeWidth: 0.8 }, + }} > { text={data.status ? "Live (collecting data)" : "Inactive"} /> - {data.url.replace(/^https?:\/\//, "")} + + {data.url.replace(/^https?:\/\//, "")} + Last checked:{" "} @@ -142,7 +148,7 @@ const PageSpeed = ({ isAdmin }) => { const dispatch = useDispatch(); const navigate = useNavigate(); - const { authToken } = useSelector((state) => state.auth); + const { authToken, user } = useSelector((state) => state.auth); const { monitors, isLoading } = useSelector( (state) => state.pageSpeedMonitors ); @@ -154,10 +160,25 @@ const PageSpeed = ({ isAdmin }) => { // since monitor state is being added to redux persist, there's no reason to display skeletons on every render let isActuallyLoading = isLoading && monitors.length === 0; + const now = new Date(); + const hour = now.getHours(); + + let greeting = ""; + let emoji = ""; + if (hour < 12) { + greeting = "morning"; + emoji = "πŸŒ…"; + } else if (hour < 18) { + greeting = "afternoon"; + emoji = "🌞"; + } else { + greeting = "evening"; + emoji = "πŸŒ™"; + } + return ( [class*="fallback__"])': { position: "relative", @@ -173,37 +194,66 @@ const PageSpeed = ({ isAdmin }) => { {isActuallyLoading ? ( ) : monitors?.length !== 0 ? ( - - - - All page speed monitors - - Click on one of the monitors to get more site speed information. - - -