diff --git a/Client/src/Pages/Monitors/Configure/index.css b/Client/src/Pages/Monitors/Configure/index.css index ac9cd8a0d..ec140887c 100644 --- a/Client/src/Pages/Monitors/Configure/index.css +++ b/Client/src/Pages/Monitors/Configure/index.css @@ -23,8 +23,7 @@ opacity: 0.6; } .configure-monitor h6.MuiTypography-root, -.configure-monitor p.MuiTypography-root:has(span), -.configure-monitor p.MuiTypography-root span.MuiTypography-root { +.configure-monitor h1.MuiTypography-root + span.MuiTypography-root { font-size: var(--env-var-font-size-small-plus); } .configure-monitor button.MuiButtonBase-root { @@ -33,19 +32,20 @@ .configure-monitor button.MuiButtonBase-root { height: var(--env-var-height-2); } -.configure-monitor button.MuiButtonBase-root:has(svg) { - line-height: 1; -} .configure-monitor .config-box { - padding: var(--env-var-spacing-4) 50px; - padding-bottom: 60px; border: 1px solid var(--env-var-color-16); border-radius: var(--env-var-radius-1); background-color: var(--env-var-color-8); } -.configure-monitor .config-box .MuiBox-root, -.configure-monitor .config-box .MuiStack-root { +.configure-monitor .config-box > .MuiBox-root, +.configure-monitor .config-box > .MuiStack-root { flex: 1; + padding: 24px 30px; + padding-bottom: 40px; +} +.configure-monitor .config-box > *:first-child { + flex: 0.7; + border-right: solid 1px var(--env-var-color-16); } .configure-monitor .MuiStack-root:has(span.MuiTypography-root.input-error) { position: relative; @@ -72,12 +72,6 @@ border-color: var(--env-var-color-29); } -.configure-monitor-form { - display: flex; - flex-direction: column; - gap: var(--env-var-spacing-2); -} - body:has(.configure-monitor) .select-dropdown .MuiMenuItem-root, .configure-monitor .select-wrapper .select-component > .MuiSelect-select { text-transform: lowercase; diff --git a/Client/src/Pages/Monitors/Configure/index.jsx b/Client/src/Pages/Monitors/Configure/index.jsx index a572e9151..c873482a9 100644 --- a/Client/src/Pages/Monitors/Configure/index.jsx +++ b/Client/src/Pages/Monitors/Configure/index.jsx @@ -5,15 +5,11 @@ import { useEffect, useState } from "react"; import Button from "../../../Components/Button"; import Field from "../../../Components/Inputs/Field"; import { Box, Modal, Skeleton, Stack, Typography } from "@mui/material"; -import WestRoundedIcon from "@mui/icons-material/WestRounded"; import GreenCheck from "../../../assets/icons/checkbox-green.svg?react"; import RedCheck from "../../../assets/icons/checkbox-red.svg?react"; import PauseCircleOutlineIcon from "@mui/icons-material/PauseCircleOutline"; -import { getLastChecked } from "../../../Utils/monitorUtils"; -import "./index.css"; import { monitorValidation } from "../../../Validation/validation"; import Select from "../../../Components/Inputs/Select"; -import { formatDurationRounded } from "../../../Utils/timeUtils"; import { createToast } from "../../../Utils/toastUtils"; import { updateUptimeMonitor, @@ -22,6 +18,7 @@ import { } from "../../../Features/UptimeMonitors/uptimeMonitorsSlice"; import Checkbox from "../../../Components/Inputs/Checkbox"; import Breadcrumbs from "../../../Components/Breadcrumbs"; +import "./index.css"; /** * Parses a URL string and returns a URL object. @@ -97,7 +94,6 @@ const Configure = () => { const { user, authToken } = useSelector((state) => state.auth); const { monitors } = useSelector((state) => state.uptimeMonitors); const [monitor, setMonitor] = useState({}); - const [duration, setDuration] = useState(0); const [errors, setErrors] = useState({}); const { monitorId } = useParams(); @@ -118,7 +114,6 @@ const Configure = () => { setMonitor({ ...data, }); - setDuration(formatDurationRounded(data?.interval)); }, [monitorId, authToken, monitors]); const handleChange = (event, name) => { @@ -211,12 +206,10 @@ const Configure = () => { const parsedUrl = parseUrl(monitor?.url); const protocol = parsedUrl?.protocol?.replace(":", "") || ""; - var lastChecked = formatDurationRounded(getLastChecked(monitor?.checks)); - let loading = Object.keys(monitor).length === 0; return ( - + {loading ? ( ) : ( @@ -228,49 +221,39 @@ const Configure = () => { { name: "configure", path: `/monitors/configure/${monitorId}` }, ]} /> -
- + {monitor?.status ? : } {parsedUrl?.host ? ( - + {parsedUrl.host || "..."} ) : ( "" )} - - - Your site is {monitor?.status ? "up" : "down"}. - {" "} - Checking every {duration}.{" "} - {lastChecked ? `Last time checked ${lastChecked} ago.` : ""} + + Your site is {monitor?.status ? "up" : "down"}. -