From cfab18f0e8ffc35f3af327dadcf56a630401bfb9 Mon Sep 17 00:00:00 2001 From: Daniel Cojocea Date: Sat, 24 Aug 2024 14:40:08 -0400 Subject: [PATCH] Updated cards background, removed unused files --- .../Charts/Servers/ServerStatus.jsx | 28 ------ .../Charts/Servers/serverStatus.css | 46 --------- Client/src/Components/Sidebar/index.jsx | 2 + Client/src/Layouts/HomeLayout/index.css | 2 +- Client/src/Pages/Monitors/index.jsx | 97 ++++++++++++++++++- Client/src/assets/Images/background-grid.svg | 67 +++++++++++++ Client/src/assets/icons/top-right-arrow.svg | 3 + 7 files changed, 166 insertions(+), 79 deletions(-) delete mode 100644 Client/src/Components/Charts/Servers/ServerStatus.jsx delete mode 100644 Client/src/Components/Charts/Servers/serverStatus.css create mode 100644 Client/src/assets/Images/background-grid.svg create mode 100644 Client/src/assets/icons/top-right-arrow.svg diff --git a/Client/src/Components/Charts/Servers/ServerStatus.jsx b/Client/src/Components/Charts/Servers/ServerStatus.jsx deleted file mode 100644 index c06d0436b..000000000 --- a/Client/src/Components/Charts/Servers/ServerStatus.jsx +++ /dev/null @@ -1,28 +0,0 @@ -import React from "react"; -import "./serverStatus.css"; -import PropTypes from "prop-types"; - -/** - * @component - * @param {Object} props - * @param {string} props.title - The title text for the server status (required) - * @param {number} props.value - The value text to be displayed (required) - * @param {string} props.state - The state of the server (e.g., "online", "offline", "warning") (required) - * @returns {JSX.Element} - Renders the server status component - */ -const ServerStatus = ({ title, value, state }) => { - return ( -
-
{title}
-
{value}
-
- ); -}; - -ServerStatus.propTypes = { - title: PropTypes.string.isRequired, - value: PropTypes.number.isRequired, - state: PropTypes.string.isRequired, -}; - -export default ServerStatus; diff --git a/Client/src/Components/Charts/Servers/serverStatus.css b/Client/src/Components/Charts/Servers/serverStatus.css deleted file mode 100644 index fcbf470aa..000000000 --- a/Client/src/Components/Charts/Servers/serverStatus.css +++ /dev/null @@ -1,46 +0,0 @@ -:root { - --spacing-general-0: 12px 18px; - --spacing-general-1: 20px; - --color-border-0: #eaecf0; - --border-radius-0: 4px; - --font-size-0: 1rem; - --font-size-2: 36px; - - --color-up: #17b26a; - --color-down: #f04438; - --color-pause: #fdb022; -} - -.server-status-tile { - min-width: 100px; - width: calc(100% - 310px); - padding: var(--spacing-general-0); - border: 1px solid var(--color-border-0); - border-radius: var(--border-radius-0); - background-color: var(--env-var-color-8); -} - -.server-status-tile-title { - font-size: var(--font-size-0); - font-weight: 500; - margin-bottom: calc(var(--spacing-general-1) / 2); - color: var(--env-var-color-5); - opacity: 0.6; -} - -.server-status-tile-value { - font-size: var(--font-size-2); - font-weight: bolder; -} - -.up { - color: var(--color-up); -} - -.down { - color: var(--color-down); -} - -.pause { - color: var(--color-pause); -} diff --git a/Client/src/Components/Sidebar/index.jsx b/Client/src/Components/Sidebar/index.jsx index ae6507b69..873ec8212 100644 --- a/Client/src/Components/Sidebar/index.jsx +++ b/Client/src/Components/Sidebar/index.jsx @@ -194,6 +194,7 @@ function Sidebar() { sx={{ pt: theme.gap.small, px: collapsed ? theme.gap.xs : theme.gap.small, + backgroundColor: "transparent" }} > Menu @@ -394,6 +395,7 @@ function Sidebar() { sx={{ pt: theme.gap.small, px: collapsed ? 0 : theme.gap.small, + backgroundColor: "transparent" }} > Other diff --git a/Client/src/Layouts/HomeLayout/index.css b/Client/src/Layouts/HomeLayout/index.css index dcdcf0535..e85a6362b 100644 --- a/Client/src/Layouts/HomeLayout/index.css +++ b/Client/src/Layouts/HomeLayout/index.css @@ -20,7 +20,7 @@ height: calc(100vh - var(--env-var-spacing-2) * 2); max-width: var(--env-var-side-bar-width); - border: 1px solid var(--color-border-0); + border: 1px solid var(--env-var-color-6); border-radius: var(--env-var-radius-1); background-color: var(--env-var-color-8); diff --git a/Client/src/Pages/Monitors/index.jsx b/Client/src/Pages/Monitors/index.jsx index a91939e85..e8b24306c 100644 --- a/Client/src/Pages/Monitors/index.jsx +++ b/Client/src/Pages/Monitors/index.jsx @@ -20,12 +20,13 @@ import { } 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 background from "../../assets/Images/background-grid.svg"; +import Arrow from "../../assets/icons/top-right-arrow.svg?react"; import "./index.css"; const ActionsMenu = ({ monitor }) => { @@ -259,6 +260,94 @@ Host.propTypes = { }).isRequired, }; +const StatusBox = ({ title, value }) => { + const theme = useTheme(); + + let sharedStyles = { position: "absolute", right: 8, opacity: 0.5 }; + + let color; + let icon; + if (title === "up") { + color = theme.pie.green.stroke; + icon = ( + + + + ); + } else if (title === "down") { + color = theme.pie.red.stroke; + icon = ( + + + + ); + } else if (title === "paused") { + color = theme.pie.yellow.stroke; + } + + return ( + + + {title} + + {icon} + + {value} + + # + + + + ); +}; + /** * Renders a skeleton layout. * @@ -476,9 +565,9 @@ const Monitors = () => { direction="row" justifyContent="space-between" > - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Client/src/assets/icons/top-right-arrow.svg b/Client/src/assets/icons/top-right-arrow.svg new file mode 100644 index 000000000..471b9454c --- /dev/null +++ b/Client/src/assets/icons/top-right-arrow.svg @@ -0,0 +1,3 @@ + + +