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. - - -