diff --git a/Client/src/Pages/Monitors/Home/index.jsx b/Client/src/Pages/Monitors/Home/index.jsx index 31f4800a7..b66076387 100644 --- a/Client/src/Pages/Monitors/Home/index.jsx +++ b/Client/src/Pages/Monitors/Home/index.jsx @@ -96,7 +96,12 @@ const Monitors = ({ isAdmin }) => { alignItems="center" mb={theme.spacing(8)} > - + Actively monitoring { const { determineState, pagespeedStatusMsg } = useUtils(); @@ -14,19 +15,8 @@ const Card = ({ monitor }) => { const navigate = useNavigate(); const monitorState = determineState(monitor); return ( - .MuiStack-root": { - backgroundColor: theme.palette.background.accent, - }, - }} - > - + navigate(`/pagespeed/${monitor._id}`)} border={1} @@ -34,41 +24,40 @@ const Card = ({ monitor }) => { borderRadius={theme.shape.borderRadius} backgroundColor={theme.palette.background.main} sx={{ + display: "grid", + gridTemplateColumns: "34px 2fr 1fr", + columnGap: theme.spacing(5), + gridTemplateRows: "34px 1fr 3fr", cursor: "pointer", - "& svg path": { stroke: theme.palette.other.icon, strokeWidth: 0.8 }, + "&:hover": { + backgroundColor: theme.palette.background.accent, + }, }} > - + + + + {monitor.name} + + - - - - {monitor.name} - - - - {monitor.url.replace(/^https?:\/\//, "")} - - - Last checked:{" "} - - {formatDate(getLastChecked(monitor.checks, false))}{" "} - - ({formatDurationRounded(getLastChecked(monitor.checks))} ago) - - - - + + {monitor.url} + + ); }; diff --git a/Client/src/Pages/PageSpeed/index.css b/Client/src/Pages/PageSpeed/index.css index bbf75c96c..c39a20fe0 100644 --- a/Client/src/Pages/PageSpeed/index.css +++ b/Client/src/Pages/PageSpeed/index.css @@ -1,9 +1,6 @@ -.page-speed h2.MuiTypography-root { - line-height: 1.1; -} .page-speed .label { padding: 7px; - height: 22px; + height: 24px; font-size: var(--env-var-font-size-small); } .page-speed:not(:has([class*="fallback__"])) button { diff --git a/Client/src/Pages/PageSpeed/index.jsx b/Client/src/Pages/PageSpeed/index.jsx index 6dd03c0b7..68da033e4 100644 --- a/Client/src/Pages/PageSpeed/index.jsx +++ b/Client/src/Pages/PageSpeed/index.jsx @@ -56,7 +56,7 @@ const PageSpeed = ({ isAdmin }) => { // will show skeletons only on initial load // 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; - console.log(monitors); + return ( { {isActuallyLoading ? ( ) : monitors?.length !== 0 ? ( - + { } }; -const updateChecksTTL = async (teamId, ttl) => { - try { - await Check.collection.dropIndex("expiry_1"); - await Check.collection.createIndex( - { expiry: 1 }, - { expireAfterSeconds: ttl } // TTL in seconds, adjust as necessary - ); - } catch (error) { - error.service = SERVICE_NAME; - error.method = "updateChecksTTL"; - throw error; - } -}; - module.exports = { createCheck, getChecksCount,