From 63ae25c16b79cb7aacd8573136977bfa87c23be9 Mon Sep 17 00:00:00 2001 From: Daniel Cojocea Date: Sat, 24 Aug 2024 11:49:28 -0400 Subject: [PATCH 1/5] Removed url button link, tweaked typography and paddings --- Client/src/Components/BasicTable/index.css | 16 +- Client/src/Components/BasicTable/index.jsx | 6 +- Client/src/Components/Sidebar/index.css | 3 + .../Pages/Monitors/CreateMonitor/index.jsx | 2 +- Client/src/Pages/Monitors/index.css | 14 +- Client/src/Pages/Monitors/index.jsx | 143 +++++++++++++----- 6 files changed, 141 insertions(+), 43 deletions(-) diff --git a/Client/src/Components/BasicTable/index.css b/Client/src/Components/BasicTable/index.css index 47a47439d..208604021 100644 --- a/Client/src/Components/BasicTable/index.css +++ b/Client/src/Components/BasicTable/index.css @@ -5,8 +5,7 @@ white-space: nowrap; } .MuiTable-root .host span { - font-size: var(--env-var-font-size-small); - margin-left: 8px; + font-size: 11px; } .MuiTable-root .label { @@ -180,3 +179,16 @@ body:has(.pagination-dropdown) p:has(+ .MuiTablePagination-root) { body:has(.pagination-dropdown) p:has(+ .MuiTablePagination-root) { font-size: var(--env-var-font-size-small-plus); } + +.monitors .MuiTable-root .MuiTableHead-root .MuiTableCell-root { + text-transform: uppercase; + color: var(--env-var-color-5); + opacity: 0.8; + font-size: var(--env-var-font-size-small-plus); + font-weight: 400; +} +.monitors .MuiTableCell-root:not(:first-of-type):not(:last-of-type), +.monitors .MuiTableCell-root:not(:first-of-type):not(:last-of-type) { + padding-left: var(--env-var-spacing-1); + padding-right: var(--env-var-spacing-1); +} diff --git a/Client/src/Components/BasicTable/index.jsx b/Client/src/Components/BasicTable/index.jsx index bef5bd651..c723d2bec 100644 --- a/Client/src/Components/BasicTable/index.jsx +++ b/Client/src/Components/BasicTable/index.jsx @@ -233,6 +233,7 @@ const BasicTable = ({ data, paginated, reversed, table }) => { direction="row" alignItems="center" justifyContent="space-between" + px={theme.gap.small} > Showing {getRange()} of {data.rows.length} monitor(s) @@ -277,7 +278,10 @@ const BasicTable = ({ data, paginated, reversed, table }) => { }, }, }} - sx={{ mt: theme.gap.medium }} + sx={{ + mt: theme.gap.medium, + color: theme.palette.otherColors.bluishGray, + }} /> )} diff --git a/Client/src/Components/Sidebar/index.css b/Client/src/Components/Sidebar/index.css index 8ce0089bc..4c253c781 100644 --- a/Client/src/Components/Sidebar/index.css +++ b/Client/src/Components/Sidebar/index.css @@ -15,6 +15,9 @@ aside span.MuiTypography-root { font-size: var(--env-var-font-size-medium); line-height: 1; } +aside .MuiStack-root + span.MuiTypography-root { + font-size: var(--env-var-font-size-medium-plus); +} aside .MuiListSubheader-root { font-size: var(--env-var-font-size-small); font-weight: 500; diff --git a/Client/src/Pages/Monitors/CreateMonitor/index.jsx b/Client/src/Pages/Monitors/CreateMonitor/index.jsx index 28493080a..a637525ad 100644 --- a/Client/src/Pages/Monitors/CreateMonitor/index.jsx +++ b/Client/src/Pages/Monitors/CreateMonitor/index.jsx @@ -98,7 +98,7 @@ const CreateMonitor = () => { monitor.type === "http" ? `http${https ? "s" : ""}://` + monitor.url : monitor.url, - name: monitor.name === "" ? monitor.url : monitor.name, + name: monitor.name, type: monitor.type, interval: monitor.interval * MS_PER_MINUTE, }; diff --git a/Client/src/Pages/Monitors/index.css b/Client/src/Pages/Monitors/index.css index 1f46b3517..43c43f3c8 100644 --- a/Client/src/Pages/Monitors/index.css +++ b/Client/src/Pages/Monitors/index.css @@ -1,7 +1,10 @@ -.monitors h1.MuiTypography-root, -.monitors h2.MuiTypography-root { +.monitors h1.MuiTypography-root { color: var(--env-var-color-1); - font-weight: 600; + font-weight: 500; +} +.monitors h2.MuiTypography-root { + color: var(--env-var-color-5); + font-weight: 500; } .monitors h1.MuiTypography-root { font-size: var(--env-var-font-size-large-plus); @@ -13,6 +16,9 @@ font-size: var(--env-var-font-size-medium); color: var(--env-var-color-5); } +.monitors h1.MuiTypography-root + p.MuiTypography-root { + font-size: var(--env-var-font-size-medium-plus); +} .monitors .MuiStack-root > button:not(.MuiIconButton-root) { font-size: var(--env-var-font-size-medium); height: var(--env-var-height-2); @@ -31,7 +37,7 @@ border-radius: 50%; font-size: var(--env-var-font-size-medium); font-weight: 500; - color: var(--env-var-color-5); + color: var(--env-var-color-1); margin-left: 10px; line-height: 0.8; } diff --git a/Client/src/Pages/Monitors/index.jsx b/Client/src/Pages/Monitors/index.jsx index 9eef7ec3a..a91939e85 100644 --- a/Client/src/Pages/Monitors/index.jsx +++ b/Client/src/Pages/Monitors/index.jsx @@ -1,4 +1,3 @@ -import "./index.css"; import { useEffect, useState } from "react"; import { useSelector, useDispatch } from "react-redux"; import { @@ -6,11 +5,7 @@ import { getUptimeMonitorsByUserId, } from "../../Features/UptimeMonitors/uptimeMonitorsSlice"; import { useNavigate } from "react-router-dom"; -import Button from "../../Components/Button"; -import ServerStatus from "../../Components/Charts/Servers/ServerStatus"; import { useTheme } from "@emotion/react"; -import ArrowDownwardRoundedIcon from "@mui/icons-material/ArrowDownwardRounded"; -import BasicTable from "../../Components/BasicTable"; import { StatusLabel } from "../../Components/Label"; import { createToast } from "../../Utils/toastUtils"; import { @@ -23,10 +18,15 @@ import { Stack, Typography, } from "@mui/material"; - +import BasicTable from "../../Components/BasicTable"; +import Button from "../../Components/Button"; +import ServerStatus from "../../Components/Charts/Servers/ServerStatus"; import Settings from "../../assets/icons/settings-bold.svg?react"; import PropTypes from "prop-types"; import BarChart from "../../Components/Charts/BarChart"; +import Breadcrumbs from "../../Components/Breadcrumbs"; +import ArrowDownwardRoundedIcon from "@mui/icons-material/ArrowDownwardRounded"; +import "./index.css"; const ActionsMenu = ({ monitor }) => { const [anchorEl, setAnchorEl] = useState(null); @@ -177,7 +177,10 @@ const ActionsMenu = ({ monitor }) => {