diff --git a/Client/src/Components/Sidebar/index.jsx b/Client/src/Components/Sidebar/index.jsx index 27fb35329..16911abeb 100644 --- a/Client/src/Components/Sidebar/index.jsx +++ b/Client/src/Components/Sidebar/index.jsx @@ -652,6 +652,9 @@ function Sidebar() { gap: theme.spacing(4), borderRadius: theme.shape.borderRadius, pl: theme.spacing(4), + "& svg path": { + stroke: theme.palette.other.icon, + }, }} > diff --git a/Client/src/Pages/Monitors/Configure/index.css b/Client/src/Pages/Monitors/Configure/index.css index 23b6af57a..032833924 100644 --- a/Client/src/Pages/Monitors/Configure/index.css +++ b/Client/src/Pages/Monitors/Configure/index.css @@ -1,10 +1,3 @@ -.configure-monitor h1.MuiTypography-root { - font-size: var(--env-var-font-size-large-plus); - font-weight: 600; -} -.configure-monitor p.MuiTypography-root { - font-size: var(--env-var-font-size-medium); -} .configure-monitor h1.MuiTypography-root + span.MuiTypography-root { font-size: var(--env-var-font-size-small-plus); } diff --git a/Client/src/Pages/Monitors/Configure/index.jsx b/Client/src/Pages/Monitors/Configure/index.jsx index 1ee171034..34076dd89 100644 --- a/Client/src/Pages/Monitors/Configure/index.jsx +++ b/Client/src/Pages/Monitors/Configure/index.jsx @@ -2,7 +2,7 @@ import { useNavigate, useParams } from "react-router"; import { useTheme } from "@emotion/react"; import { useDispatch, useSelector } from "react-redux"; import { useEffect, useState } from "react"; -import { Box, Button, Modal, Stack, Typography } from "@mui/material"; +import { Box, Button, Modal, Stack, Tooltip, Typography } from "@mui/material"; import { monitorValidation } from "../../../Validation/validation"; import { createToast } from "../../../Utils/toastUtils"; import { logger } from "../../../Utils/Logger"; @@ -15,8 +15,8 @@ import { deleteUptimeMonitor, } from "../../../Features/UptimeMonitors/uptimeMonitorsSlice"; import Field from "../../../Components/Inputs/Field"; -import PauseCircleOutlineIcon from "@mui/icons-material/PauseCircleOutline"; -import PlayCircleOutlineRoundedIcon from "@mui/icons-material/PlayCircleOutlineRounded"; +import PauseIcon from "../../../assets/icons/pause-icon.svg?react"; +import ResumeIcon from "../../../assets/icons/resume-icon.svg?react"; import Select from "../../../Components/Inputs/Select"; import Checkbox from "../../../Components/Inputs/Checkbox"; import Breadcrumbs from "../../../Components/Breadcrumbs"; @@ -202,7 +202,7 @@ const Configure = () => { }; return ( - + {Object.keys(monitor).length === 0 ? ( ) : ( @@ -222,27 +222,74 @@ const Configure = () => { flex={1} > - - {parsedUrl?.host ? ( - - {parsedUrl.host || "..."} - - ) : ( - "" - )} - {statusMsg[monitor?.status ?? undefined]} + {monitor.name} + + + + + + + + {monitor.url?.replace(/^https?:\/\//, "") || "..."} + + + Editting... + + { color="secondary" loading={isLoading} sx={{ - border: "none", - backgroundColor: theme.palette.background.main, - px: theme.spacing(5), + pl: theme.spacing(4), + pr: theme.spacing(6), mr: theme.spacing(6), "& svg": { mr: theme.spacing(2), + width: 22, + height: 22, + "& path": { + stroke: theme.palette.text.tertiary, + strokeWidth: 1.7, + }, }, }} onClick={handlePause} > {monitor?.isActive ? ( <> - + Pause ) : ( <> - + Resume )} diff --git a/Client/src/Pages/Monitors/Details/index.jsx b/Client/src/Pages/Monitors/Details/index.jsx index e31de38d7..ea356a610 100644 --- a/Client/src/Pages/Monitors/Details/index.jsx +++ b/Client/src/Pages/Monitors/Details/index.jsx @@ -15,7 +15,6 @@ import { networkService } from "../../../main"; import { logger } from "../../../Utils/Logger"; import { formatDate, - formatDuration, formatDurationRounded, formatDurationSplit, } from "../../../Utils/timeUtils"; @@ -158,7 +157,8 @@ const DetailsPage = ({ isAdmin }) => { { {monitor.url?.replace(/^https?:\/\//, "") || "..."} { backgroundColor: theme.palette.text.tertiary, opacity: 0.8, left: -9, - top: "42%", + top: "50%", + transform: "translateY(-50%)", }, }} > diff --git a/Client/src/Pages/Monitors/styled.jsx b/Client/src/Pages/Monitors/styled.jsx index afef6508e..bb35e1705 100644 --- a/Client/src/Pages/Monitors/styled.jsx +++ b/Client/src/Pages/Monitors/styled.jsx @@ -32,4 +32,7 @@ export const ConfigBox = styled(Stack)(({ theme }) => ({ "& h3, & p": { color: theme.palette.text.tertiary, }, + "& p": { + fontSize: 13, + }, })); diff --git a/Client/src/assets/icons/pause-icon.svg b/Client/src/assets/icons/pause-icon.svg new file mode 100644 index 000000000..c73abfc1d --- /dev/null +++ b/Client/src/assets/icons/pause-icon.svg @@ -0,0 +1,3 @@ + + + diff --git a/Client/src/assets/icons/resume-icon.svg b/Client/src/assets/icons/resume-icon.svg new file mode 100644 index 000000000..1da787081 --- /dev/null +++ b/Client/src/assets/icons/resume-icon.svg @@ -0,0 +1,4 @@ + + + +