diff --git a/Client/src/Components/Charts/Servers/serverStatus.css b/Client/src/Components/Charts/Servers/serverStatus.css index 541019107..97a4fec3f 100644 --- a/Client/src/Components/Charts/Servers/serverStatus.css +++ b/Client/src/Components/Charts/Servers/serverStatus.css @@ -12,7 +12,7 @@ } .server-status-tile { - min-width: 310px; + min-width: 250px; width: calc(100% - 310px); padding: var(--spacing-general-1); border: 1px solid var(--color-border-0); diff --git a/Client/src/Components/MonitorTable/index.css b/Client/src/Components/MonitorTable/index.css index 23b463f87..f2d24252e 100644 --- a/Client/src/Components/MonitorTable/index.css +++ b/Client/src/Components/MonitorTable/index.css @@ -3,30 +3,32 @@ align-items: center; } -.host-open-icon { +.host-row a { width: var(--env-var-img-width-2); height: var(--env-var-img-width-2); - margin-right: 8px; + color: var(--env-var-color-5); + margin-right: 10px; + margin-bottom: 2px; +} +.host-row a svg { + width: var(--env-var-font-size-large); + height: var(--env-var-font-size-large); +} +.host-row .host-percentage { + font-size: var(--env-var-font-size-small); } .host-name { - width: 100px; - font-size: var(--env-var-font-size-medium); - font-weight: bold; - margin-right: var(--env-var-spacing-1); + width: fit-content; + margin-right: 10px; + font-weight: 700; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; } -.host-percentage { - font-size: var(--env-var-font-size-medium); -} - .host-status { - display: flex; - align-items: center; - height: 100%; + width: fit-content; } .host-status-details { @@ -47,3 +49,44 @@ border-radius: 50%; margin-right: calc(var(--env-var-spacing-1) / 2); } + +.monitors .MuiPaper-root:has(table.MuiTable-root) { + box-shadow: none; + border: solid 1px var(--env-var-color-16); + border-radius: var(--env-var-radius-1); +} +.monitors .MuiTableFooter-root .MuiTableCell-root { + border: none; +} +.monitors .MuiTableHead-root, +.monitors .MuiTableRow-root:hover { + background-color: var(--env-var-color-13); +} +.monitors .MuiTableHead-root .MuiTableCell-root, +.monitors .MuiTableBody-root .MuiTableCell-root { + font-size: var(--env-var-font-size-medium); +} +.monitors .MuiTableHead-root .MuiTableCell-root { + padding: var(--env-var-spacing-1) var(--env-var-spacing-2); + font-weight: 500; + color: var(--env-var-color-2); +} +.monitors .MuiTableHead-root span { + position: relative; + display: inline-block; + height: 14px; + width: 20px; + overflow: hidden; + margin-bottom: -3px; + margin-left: 2px; +} +.monitors .MuiTableHead-root span svg { + position: absolute; + width: 20px; + height: 20px; + bottom: 0; +} +.monitors .MuiTableBody-root .MuiTableCell-root { + color: var(--env-var-color-5); + padding: 6px var(--env-var-spacing-2); +} diff --git a/Client/src/Components/MonitorTable/index.jsx b/Client/src/Components/MonitorTable/index.jsx index 763a66c95..db1d90630 100644 --- a/Client/src/Components/MonitorTable/index.jsx +++ b/Client/src/Components/MonitorTable/index.jsx @@ -14,6 +14,8 @@ import { TablePagination, Paper, } from "@mui/material"; +import SouthRoundedIcon from "@mui/icons-material/SouthRounded"; +import OpenInNewPage from "../../assets/icons/open-in-new-page.svg?react" /** * Host component. @@ -31,7 +33,7 @@ const Host = ({ params }) => { return (
- OpenIt +
{params.title}
{ className="host-status-dot" style={{ backgroundColor: params.statusDotColor }} /> - {params.status} + + {params.status} +
); @@ -142,9 +149,14 @@ const MonitorTable = ({ monitors = [] }) => { Host - Status + + Status + + + + Response Time - Action + Actions {mappedRows} diff --git a/Client/src/Pages/Monitors/index.css b/Client/src/Pages/Monitors/index.css index 987bbd7cd..a21a3e125 100644 --- a/Client/src/Pages/Monitors/index.css +++ b/Client/src/Pages/Monitors/index.css @@ -1,7 +1,6 @@ .monitors, .new-monitor { width: 70vw; - padding: 4vw; } .monitors { @@ -9,13 +8,13 @@ } .monitors-bar { - margin-top: calc(2 * var(--env-var-spacing-2)); display: flex; justify-content: space-between; align-items: center; } .monitors-bar-title { + color: var(--env-var-color-1); font-size: 24px; font-weight: 700; } diff --git a/Client/src/Pages/Monitors/index.jsx b/Client/src/Pages/Monitors/index.jsx index a895ae47a..241ca4b10 100644 --- a/Client/src/Pages/Monitors/index.jsx +++ b/Client/src/Pages/Monitors/index.jsx @@ -8,8 +8,10 @@ import Button from "../../Components/Button"; import ServerStatus from "../../Components/Charts/Servers/ServerStatus"; import SearchTextField from "../../Components/TextFields/Search/SearchTextField"; import MonitorTable from "../../Components/MonitorTable"; +import { useTheme } from "@emotion/react"; const Monitors = () => { + const theme = useTheme(); const navigate = useNavigate(); const monitorState = useSelector((state) => state.monitors); const authState = useSelector((state) => state.auth); @@ -25,7 +27,12 @@ const Monitors = () => { const down = monitorState.monitors.length - up; return ( -
+
Hello, {authState.user.firstname} @@ -36,7 +43,7 @@ const Monitors = () => { onClick={() => { navigate("/monitors/create"); }} - sx={{ padding: "10px 20px", fontSize: "13px" }} + sx={{ padding: "6px 25px", fontSize: "13px" }} />
diff --git a/Client/src/Pages/Monitors/monitors.css b/Client/src/Pages/Monitors/monitors.css index 3a442aa42..05ae79709 100644 --- a/Client/src/Pages/Monitors/monitors.css +++ b/Client/src/Pages/Monitors/monitors.css @@ -7,6 +7,7 @@ .current-monitors-title-holder { display: flex; + align-items: center; } .current-monitors-bar { @@ -18,16 +19,22 @@ font-size: 1rem; font-weight: bold; margin-right: var(--env-var-spacing-1); + color: var(--env-var-color-1); } .current-monitors-counter { - width: var(--env-var-spacing-2); - height: var(--env-var-spacing-2); + display: inline-flex; + justify-content: center; + align-items: center; + padding: 2px; + min-width: 22px; + min-height: 22px; background-color: var(--env-var-color-15); border: 1px solid var(--env-var-color-6); border-radius: 50%; - text-align: center; - align-items: center; + font-size: var(--env-var-font-size-medium); + font-weight: 500; + color: var(--env-var-color-5); } .monitors-v-gaping { diff --git a/Client/src/assets/icons/open-in-new-page.svg b/Client/src/assets/icons/open-in-new-page.svg new file mode 100644 index 000000000..2bcb21c43 --- /dev/null +++ b/Client/src/assets/icons/open-in-new-page.svg @@ -0,0 +1,3 @@ + + +