From 539d9ac1734ef8855892b46f1e3c994a98b6fc1a Mon Sep 17 00:00:00 2001 From: Caio Cabral Date: Thu, 7 Nov 2024 04:21:32 -0500 Subject: [PATCH 01/49] feat: change in structure to apply architecture to project --- Client/src/App.jsx | 44 +++++++++++-------- .../{ => Components}/HOC/withAdminCheck.jsx | 6 +-- .../{ => Components}/HOC/withAdminProp.jsx | 0 .../Layouts/HomeLayout/index.css | 0 .../Layouts/HomeLayout/index.jsx | 2 +- Client/src/Components/Sidebar/index.jsx | 9 +++- Client/src/Pages/Infrastructure/index.jsx | 5 +++ Client/src/Pages/ReadMe.md | 1 - 8 files changed, 42 insertions(+), 25 deletions(-) rename Client/src/{ => Components}/HOC/withAdminCheck.jsx (85%) rename Client/src/{ => Components}/HOC/withAdminProp.jsx (100%) rename Client/src/{ => Components}/Layouts/HomeLayout/index.css (100%) rename Client/src/{ => Components}/Layouts/HomeLayout/index.jsx (85%) create mode 100644 Client/src/Pages/Infrastructure/index.jsx delete mode 100644 Client/src/Pages/ReadMe.md diff --git a/Client/src/App.jsx b/Client/src/App.jsx index 6cb2f433a..65ba6fc21 100644 --- a/Client/src/App.jsx +++ b/Client/src/App.jsx @@ -8,7 +8,6 @@ import { ToastContainer } from "react-toastify"; import NotFound from "./Pages/NotFound"; import Login from "./Pages/Auth/Login"; import Register from "./Pages/Auth/Register/Register"; -import HomeLayout from "./Layouts/HomeLayout"; import Account from "./Pages/Account"; import Monitors from "./Pages/Monitors/Home"; import CreateMonitor from "./Pages/Monitors/CreateMonitor"; @@ -30,8 +29,9 @@ import CreatePageSpeed from "./Pages/PageSpeed/CreatePageSpeed"; import CreateNewMaintenanceWindow from "./Pages/Maintenance/CreateMaintenance"; import PageSpeedDetails from "./Pages/PageSpeed/Details"; import PageSpeedConfigure from "./Pages/PageSpeed/Configure"; -import withAdminCheck from "./HOC/withAdminCheck"; -import withAdminProp from "./HOC/withAdminProp"; +import HomeLayout from "./Components/Layouts/HomeLayout"; +import withAdminCheck from "./Components/HOC/withAdminCheck"; +import withAdminProp from "./Components/HOC/withAdminProp"; import { ThemeProvider } from "@emotion/react"; import lightTheme from "./Utils/Theme/lightTheme"; import darkTheme from "./Utils/Theme/darkTheme"; @@ -39,6 +39,7 @@ import { CssBaseline } from "@mui/material"; import { getAppSettings } from "./Features/Settings/settingsSlice"; import { logger } from "./Utils/Logger"; // Import the logger import { networkService } from "./main"; +import { Infrastructure } from "./Pages/Infrastructure"; function App() { const AdminCheckedRegister = withAdminCheck(Register); const MonitorsWithAdminProp = withAdminProp(Monitors); @@ -96,6 +97,27 @@ function App() { path="/monitors/configure/:monitorId/" element={} /> + } + /> + } + /> + } + /> + } + /> + } + /> + } @@ -152,22 +174,6 @@ function App() { /> } /> - } - /> - } - /> - } - /> - } - /> { const WithAdminCheck = (props) => { diff --git a/Client/src/HOC/withAdminProp.jsx b/Client/src/Components/HOC/withAdminProp.jsx similarity index 100% rename from Client/src/HOC/withAdminProp.jsx rename to Client/src/Components/HOC/withAdminProp.jsx diff --git a/Client/src/Layouts/HomeLayout/index.css b/Client/src/Components/Layouts/HomeLayout/index.css similarity index 100% rename from Client/src/Layouts/HomeLayout/index.css rename to Client/src/Components/Layouts/HomeLayout/index.css diff --git a/Client/src/Layouts/HomeLayout/index.jsx b/Client/src/Components/Layouts/HomeLayout/index.jsx similarity index 85% rename from Client/src/Layouts/HomeLayout/index.jsx rename to Client/src/Components/Layouts/HomeLayout/index.jsx index 0fe787fd6..b605a0d53 100644 --- a/Client/src/Layouts/HomeLayout/index.jsx +++ b/Client/src/Components/Layouts/HomeLayout/index.jsx @@ -1,4 +1,4 @@ -import Sidebar from "../../Components/Sidebar"; +import Sidebar from "../../Sidebar"; import { Outlet } from "react-router"; import { Stack } from "@mui/material"; diff --git a/Client/src/Components/Sidebar/index.jsx b/Client/src/Components/Sidebar/index.jsx index 9135dcefa..ac0e8f9e5 100644 --- a/Client/src/Components/Sidebar/index.jsx +++ b/Client/src/Components/Sidebar/index.jsx @@ -54,6 +54,7 @@ const menu = [ nested: [ { name: "Monitors", path: "monitors", icon: }, { name: "Pagespeed", path: "pagespeed", icon: }, + { name: "Infrastructure", path: "infrastructure", icon: }, ], }, { name: "Incidents", path: "incidents", icon: }, @@ -181,7 +182,13 @@ function Sidebar() { direction="row" alignItems="center" gap={theme.spacing(4)} - onClick={() => window.open("https://github.com/bluewave-labs/bluewave-uptime", "_blank", "noreferrer")} + onClick={() => + window.open( + "https://github.com/bluewave-labs/bluewave-uptime", + "_blank", + "noreferrer" + ) + } sx={{ cursor: "pointer" }} > Infrastructure monitors; +} + +export { Infrastructure }; diff --git a/Client/src/Pages/ReadMe.md b/Client/src/Pages/ReadMe.md deleted file mode 100644 index 45ec6ce12..000000000 --- a/Client/src/Pages/ReadMe.md +++ /dev/null @@ -1 +0,0 @@ -#Pages Folder From 082380ad8c74f5222d312d8a18d29cd723869bb5 Mon Sep 17 00:00:00 2001 From: Caio Cabral Date: Thu, 7 Nov 2024 04:31:31 -0500 Subject: [PATCH 02/49] feat: removing border --- Client/src/Components/Sidebar/index.jsx | 4 ++-- Client/src/Pages/Monitors/Home/CurrentMonitoring/index.jsx | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Client/src/Components/Sidebar/index.jsx b/Client/src/Components/Sidebar/index.jsx index ac0e8f9e5..948f875c0 100644 --- a/Client/src/Components/Sidebar/index.jsx +++ b/Client/src/Components/Sidebar/index.jsx @@ -19,7 +19,7 @@ import { useLocation, useNavigate } from "react-router"; import { useTheme } from "@emotion/react"; import { useDispatch, useSelector } from "react-redux"; import { clearAuthState } from "../../Features/Auth/authSlice"; -import { setMode, toggleSidebar } from "../../Features/UI/uiSlice"; +import { /* setMode, */ toggleSidebar } from "../../Features/UI/uiSlice"; import { clearUptimeMonitorState } from "../../Features/UptimeMonitors/uptimeMonitorsSlice"; import Avatar from "../Avatar"; import LockSvg from "../../assets/icons/lock.svg?react"; @@ -29,7 +29,7 @@ import LogoutSvg from "../../assets/icons/logout.svg?react"; import Support from "../../assets/icons/support.svg?react"; import Dashboard from "../../assets/icons/dashboard.svg?react"; import Account from "../../assets/icons/user-edit.svg?react"; -import StatusPages from "../../assets/icons/status-pages.svg?react"; +/* import StatusPages from "../../assets/icons/status-pages.svg?react"; */ import Maintenance from "../../assets/icons/maintenance.svg?react"; import Monitors from "../../assets/icons/monitors.svg?react"; import Incidents from "../../assets/icons/incidents.svg?react"; diff --git a/Client/src/Pages/Monitors/Home/CurrentMonitoring/index.jsx b/Client/src/Pages/Monitors/Home/CurrentMonitoring/index.jsx index 613c280a4..4fd2eef56 100644 --- a/Client/src/Pages/Monitors/Home/CurrentMonitoring/index.jsx +++ b/Client/src/Pages/Monitors/Home/CurrentMonitoring/index.jsx @@ -18,12 +18,7 @@ const CurrentMonitoring = ({ totalMonitors, monitors, isAdmin }) => { return ( Date: Thu, 7 Nov 2024 12:31:58 -0500 Subject: [PATCH 03/49] feat: redirect from home to monitors, and setting dashboard open when user navigates to screen even withou clicking --- Client/src/App.jsx | 5 +++-- Client/src/Components/Sidebar/index.jsx | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Client/src/App.jsx b/Client/src/App.jsx index 65ba6fc21..0814f8c13 100644 --- a/Client/src/App.jsx +++ b/Client/src/App.jsx @@ -1,5 +1,5 @@ import { useEffect } from "react"; -import { Routes, Route } from "react-router-dom"; +import { Routes, Route, Navigate } from "react-router-dom"; import { useSelector } from "react-redux"; import { useDispatch } from "react-redux"; // import "./App.css"; @@ -79,7 +79,8 @@ function App() { } + /* TODO redirect to /monitors */ + element={} /> state.auth); - // Remove demo password if demo const accountMenuItem = menu.find((item) => item.name === "Account"); if (user.role?.includes("demo") && accountMenuItem) { accountMenuItem.nested = accountMenuItem.nested.filter((item) => { @@ -149,7 +148,7 @@ function Sidebar() { if (matchedKey) { setOpen((prev) => ({ ...prev, [PATH_MAP[matchedKey]]: true })); } - }, []); + }, [location]); return ( ) : collapsed ? ( + /* TODO Do we ever get here? */ Date: Fri, 8 Nov 2024 18:36:43 -0500 Subject: [PATCH 04/49] feat: using common baseTheme to avoid repetition --- Client/src/App.jsx | 1 - Client/src/Components/Heading/index.jsx | 29 ++++++++++++++++ Client/src/Components/Sidebar/index.jsx | 2 ++ Client/src/Pages/Infrastructure/index.jsx | 19 ++++++++++- .../Monitors/Home/CurrentMonitoring/index.jsx | 13 +++----- Client/src/Pages/Monitors/Home/index.css | 1 + Client/src/Utils/Theme/constants.js | 18 ++++++++++ Client/src/Utils/Theme/darkTheme.js | 22 +++++++------ Client/src/Utils/Theme/globalTheme.js | 33 +++++++++++++++++++ Client/src/Utils/Theme/lightTheme.js | 30 ++++++++++------- 10 files changed, 135 insertions(+), 33 deletions(-) create mode 100644 Client/src/Components/Heading/index.jsx create mode 100644 Client/src/Utils/Theme/constants.js create mode 100644 Client/src/Utils/Theme/globalTheme.js diff --git a/Client/src/App.jsx b/Client/src/App.jsx index 0814f8c13..a1b18be74 100644 --- a/Client/src/App.jsx +++ b/Client/src/App.jsx @@ -79,7 +79,6 @@ function App() { } /> + {children} + + ); +} + +Heading.propTypes = { + component: PropTypes.oneOf(["h1", "h2", "h3"]).isRequired, + children: PropTypes.string.isRequired, +}; +export { Heading }; diff --git a/Client/src/Components/Sidebar/index.jsx b/Client/src/Components/Sidebar/index.jsx index 810ec8f21..0019486df 100644 --- a/Client/src/Components/Sidebar/index.jsx +++ b/Client/src/Components/Sidebar/index.jsx @@ -150,6 +150,8 @@ function Sidebar() { } }, [location]); + /* TODO refactor this, there are a some ternaries and comments in the return */ + return ( Infrastructure monitors; + return ( + + + Infrastructure monitors + + ); } export { Infrastructure }; diff --git a/Client/src/Pages/Monitors/Home/CurrentMonitoring/index.jsx b/Client/src/Pages/Monitors/Home/CurrentMonitoring/index.jsx index 4fd2eef56..a7f70d96e 100644 --- a/Client/src/Pages/Monitors/Home/CurrentMonitoring/index.jsx +++ b/Client/src/Pages/Monitors/Home/CurrentMonitoring/index.jsx @@ -1,10 +1,11 @@ import { useTheme } from "@emotion/react"; -import { Box, Stack, Typography } from "@mui/material"; +import { Box, Stack } from "@mui/material"; import Search from "../../../../Components/Inputs/Search"; import MemoizedMonitorTable from "../MonitorTable"; import { useState } from "react"; import useDebounce from "../../../../Utils/debounce"; import PropTypes from "prop-types"; +import { Heading } from "../../../../Components/Heading"; const CurrentMonitoring = ({ totalMonitors, monitors, isAdmin }) => { const theme = useTheme(); @@ -25,14 +26,8 @@ const CurrentMonitoring = ({ totalMonitors, monitors, isAdmin }) => { alignItems="center" mb={theme.spacing(8)} > - - Actively monitoring - + Actively monitoring + button:not(.MuiIconButton-root) { font-size: var(--env-var-font-size-medium); height: var(--env-var-height-2); diff --git a/Client/src/Utils/Theme/constants.js b/Client/src/Utils/Theme/constants.js new file mode 100644 index 000000000..9d4361153 --- /dev/null +++ b/Client/src/Utils/Theme/constants.js @@ -0,0 +1,18 @@ +const typographyLevels = { + xs: ".625rem", + s: ".75rem", + m: ".875rem", + l: "1rem", + xl: "1.5rem", +}; + +const paletteLight = { + text: { + primary: "#1c2130", + secondary: "#344054", + tertiary: "#475467", + accent: "#838c99", + }, +}; + +export { typographyLevels, paletteLight }; diff --git a/Client/src/Utils/Theme/darkTheme.js b/Client/src/Utils/Theme/darkTheme.js index 6eca20aa3..050907ea6 100644 --- a/Client/src/Utils/Theme/darkTheme.js +++ b/Client/src/Utils/Theme/darkTheme.js @@ -1,4 +1,5 @@ import { createTheme } from "@mui/material"; +import { baseTheme } from "./globalTheme"; const text = { primary: "#fafafa", @@ -15,20 +16,21 @@ const background = { }; const border = { light: "#27272a", dark: "#36363e" }; -const fontFamilyDefault = - '"Inter","system-ui", "Avenir", "Helvetica", "Arial", sans-serif'; +/* const fontFamilyDefault = + '"Inter","system-ui", "Avenir", "Helvetica", "Arial", sans-serif'; */ const shadow = "0px 4px 24px -4px rgba(255, 255, 255, 0.03), 0px 3px 3px -3px rgba(255, 255, 255, 0.01)"; const darkTheme = createTheme({ - typography: { - fontFamily: fontFamilyDefault, - fontSize: 13, - h1: { fontSize: 22, color: text.primary, fontWeight: 500 }, - h2: { fontSize: 14.5, color: text.secondary, fontWeight: 400 }, - body1: { fontSize: 13, color: text.tertiary, fontWeight: 400 }, - body2: { fontSize: 12, color: text.tertiary, fontWeight: 400 }, - }, + ...baseTheme, + // typography: { + // /* fontFamily: fontFamilyDefault, */ + // fontSize: 13, + // h1: { fontSize: 22, color: text.primary, fontWeight: 500 }, + // h2: { fontSize: 16, color: text.secondary, fontWeight: 400 }, + // body1: { fontSize: 13, color: text.tertiary, fontWeight: 400 }, + // body2: { fontSize: 12, color: text.tertiary, fontWeight: 400 }, + // }, chart: { header: { fontWeight: 400, diff --git a/Client/src/Utils/Theme/globalTheme.js b/Client/src/Utils/Theme/globalTheme.js new file mode 100644 index 000000000..d59c84186 --- /dev/null +++ b/Client/src/Utils/Theme/globalTheme.js @@ -0,0 +1,33 @@ +import { paletteLight, typographyLevels } from "./constants"; + +const fontFamilyPrimary = '"Inter" , sans-serif'; +// const fontFamilySecondary = '"Avenir", sans-serif'; + +const baseTheme = { + typography: { + fontFamily: fontFamilyPrimary, + fontSize: typographyLevels.m, + h1: { + fontSize: typographyLevels.xl, + color: paletteLight.text.primary, + fontWeight: 500, + }, + h2: { + fontSize: typographyLevels.l, + color: paletteLight.text.secondary, + fontWeight: 400, + }, + body1: { + fontSize: typographyLevels.m, + color: paletteLight.text.tertiary, + fontWeight: 400, + }, + body2: { + fontSize: typographyLevels.s, + color: paletteLight.text.tertiary, + fontWeight: 400, + }, + }, +}; + +export { baseTheme }; diff --git a/Client/src/Utils/Theme/lightTheme.js b/Client/src/Utils/Theme/lightTheme.js index e6335a062..edf20da42 100644 --- a/Client/src/Utils/Theme/lightTheme.js +++ b/Client/src/Utils/Theme/lightTheme.js @@ -1,4 +1,6 @@ import { createTheme } from "@mui/material"; +import { typographyLevels } from "./constants"; +import { baseTheme } from "./globalTheme"; const text = { primary: "#1c2130", @@ -15,30 +17,34 @@ const background = { const border = { light: "#eaecf0", dark: "#d0d5dd" }; -const fontFamilyDefault = - '"Inter","system-ui", "Avenir", "Helvetica", "Arial", sans-serif'; +/* TODO stop using mui for fonts. Create text component based on emotion */ + +/* const fontFamilyDefault = + '"Inter","system-ui", "Avenir", "Helvetica", "Arial", sans-serif'; */ + const shadow = "0px 4px 24px -4px rgba(16, 24, 40, 0.08), 0px 3px 3px -3px rgba(16, 24, 40, 0.03)"; const lightTheme = createTheme({ - typography: { - fontFamily: fontFamilyDefault, - fontSize: 13, - h1: { fontSize: 22, color: text.primary, fontWeight: 500 }, - h2: { fontSize: 14.5, color: text.secondary, fontWeight: 400 }, - body1: { fontSize: 13, color: text.tertiary, fontWeight: 400 }, - body2: { fontSize: 12, color: text.tertiary, fontWeight: 400 }, - }, + ...baseTheme, + // typography: { + // /* fontFamily: fontFamilyDefault, */ + // fontSize: typographyLevels.m, + // h1: { fontSize: typographyLevels.xl, color: text.primary, fontWeight: 500 }, + // h2: { fontSize: typographyLevels.l, color: text.secondary, fontWeight: 400 }, + // body1: { fontSize: typographyLevels.m, color: text.tertiary, fontWeight: 400 }, + // body2: { fontSize: typographyLevels.s, color: text.tertiary, fontWeight: 400 }, + // }, chart: { header: { fontWeight: 400, fill: text.tertiary, - fontSize: 11, + fontSize: typographyLevels.m, }, subheader: { fontWeight: 400, fill: text.tertiary, - fontSize: 9, + fontSize: typographyLevels.xs, }, }, palette: { From 097b71915944eef63521403decfe0630e34f0667 Mon Sep 17 00:00:00 2001 From: Caio Cabral Date: Sat, 9 Nov 2024 08:01:14 -0500 Subject: [PATCH 05/49] feat: creating base for colors out from createTheme --- Client/package-lock.json | 202 ++++++++++++++--- Client/package.json | 7 +- Client/src/App.jsx | 13 +- .../src/Components/Charts/BarChart/index.jsx | 2 +- Client/src/Utils/Theme/constants.js | 75 ++++++- Client/src/Utils/Theme/darkTheme.js | 205 +---------------- Client/src/Utils/Theme/globalTheme.js | 195 +++++++++++++++- Client/src/Utils/Theme/lightTheme.js | 210 +----------------- 8 files changed, 473 insertions(+), 436 deletions(-) diff --git a/Client/package-lock.json b/Client/package-lock.json index 145d2783b..7f5cc1704 100644 --- a/Client/package-lock.json +++ b/Client/package-lock.json @@ -8,12 +8,13 @@ "name": "client", "version": "0.0.0", "dependencies": { - "@emotion/react": "^11.11.4", - "@emotion/styled": "^11.11.5", + "6": "^0.0.1", + "@emotion/react": "^11.13.3", + "@emotion/styled": "^11.13.0", "@fontsource/roboto": "^5.0.13", "@mui/icons-material": "^5.15.17", "@mui/lab": "^5.0.0-alpha.170", - "@mui/material": "^5.15.16", + "@mui/material": "6.1", "@mui/x-charts": "^7.5.1", "@mui/x-data-grid": "7.22.1", "@mui/x-date-pickers": "7.22.1", @@ -304,9 +305,9 @@ } }, "node_modules/@babel/runtime": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.9.tgz", - "integrity": "sha512-4zpTHZ9Cm6L9L+uIqghQX8ZXg8HKFcjYO3qHoO8zTmRm6HQUJ8SSJ+KRvbMBZn0EGVlT4DRYeQ/6hjlyXBh+Kg==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.0.tgz", + "integrity": "sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==", "license": "MIT", "dependencies": { "regenerator-runtime": "^0.14.0" @@ -1135,9 +1136,9 @@ } }, "node_modules/@mui/core-downloads-tracker": { - "version": "5.16.7", - "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.16.7.tgz", - "integrity": "sha512-RtsCt4Geed2/v74sbihWzzRs+HsIQCfclHeORh5Ynu2fS4icIKozcSubwuG7vtzq2uW3fOR1zITSP84TNt2GoQ==", + "version": "6.1.6", + "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-6.1.6.tgz", + "integrity": "sha512-nz1SlR9TdBYYPz4qKoNasMPRiGb4PaIHFkzLzhju0YVYS5QSuFF2+n7CsiHMIDcHv3piPu/xDWI53ruhOqvZwQ==", "license": "MIT", "funding": { "type": "opencollective", @@ -1212,26 +1213,26 @@ } }, "node_modules/@mui/material": { - "version": "5.16.7", - "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.16.7.tgz", - "integrity": "sha512-cwwVQxBhK60OIOqZOVLFt55t01zmarKJiJUWbk0+8s/Ix5IaUzAShqlJchxsIQ4mSrWqgcKCCXKtIlG5H+/Jmg==", + "version": "6.1.6", + "resolved": "https://registry.npmjs.org/@mui/material/-/material-6.1.6.tgz", + "integrity": "sha512-1yvejiQ/601l5AK3uIdUlAVElyCxoqKnl7QA+2oFB/2qYPWfRwDgavW/MoywS5Y2gZEslcJKhe0s2F3IthgFgw==", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.23.9", - "@mui/core-downloads-tracker": "^5.16.7", - "@mui/system": "^5.16.7", - "@mui/types": "^7.2.15", - "@mui/utils": "^5.16.6", + "@babel/runtime": "^7.26.0", + "@mui/core-downloads-tracker": "^6.1.6", + "@mui/system": "^6.1.6", + "@mui/types": "^7.2.19", + "@mui/utils": "^6.1.6", "@popperjs/core": "^2.11.8", - "@types/react-transition-group": "^4.4.10", - "clsx": "^2.1.0", + "@types/react-transition-group": "^4.4.11", + "clsx": "^2.1.1", "csstype": "^3.1.3", "prop-types": "^15.8.1", "react-is": "^18.3.1", "react-transition-group": "^4.4.5" }, "engines": { - "node": ">=12.0.0" + "node": ">=14.0.0" }, "funding": { "type": "opencollective", @@ -1240,9 +1241,10 @@ "peerDependencies": { "@emotion/react": "^11.5.0", "@emotion/styled": "^11.3.0", - "@types/react": "^17.0.0 || ^18.0.0", - "react": "^17.0.0 || ^18.0.0", - "react-dom": "^17.0.0 || ^18.0.0" + "@mui/material-pigment-css": "^6.1.6", + "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", + "react": "^17.0.0 || ^18.0.0 || ^19.0.0", + "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0" }, "peerDependenciesMeta": { "@emotion/react": { @@ -1251,6 +1253,140 @@ "@emotion/styled": { "optional": true }, + "@mui/material-pigment-css": { + "optional": true + }, + "@types/react": { + "optional": true + } + } + }, + "node_modules/@mui/material/node_modules/@mui/private-theming": { + "version": "6.1.6", + "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-6.1.6.tgz", + "integrity": "sha512-ioAiFckaD/fJSnTrUMWgjl9HYBWt7ixCh7zZw7gDZ+Tae7NuprNV6QJK95EidDT7K0GetR2rU3kAeIR61Myttw==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.26.0", + "@mui/utils": "^6.1.6", + "prop-types": "^15.8.1" + }, + "engines": { + "node": ">=14.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mui-org" + }, + "peerDependencies": { + "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", + "react": "^17.0.0 || ^18.0.0 || ^19.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@mui/material/node_modules/@mui/styled-engine": { + "version": "6.1.6", + "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-6.1.6.tgz", + "integrity": "sha512-I+yS1cSuSvHnZDBO7e7VHxTWpj+R7XlSZvTC4lS/OIbUNJOMMSd3UDP6V2sfwzAdmdDNBi7NGCRv2SZ6O9hGDA==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.26.0", + "@emotion/cache": "^11.13.1", + "@emotion/serialize": "^1.3.2", + "@emotion/sheet": "^1.4.0", + "csstype": "^3.1.3", + "prop-types": "^15.8.1" + }, + "engines": { + "node": ">=14.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mui-org" + }, + "peerDependencies": { + "@emotion/react": "^11.4.1", + "@emotion/styled": "^11.3.0", + "react": "^17.0.0 || ^18.0.0 || ^19.0.0" + }, + "peerDependenciesMeta": { + "@emotion/react": { + "optional": true + }, + "@emotion/styled": { + "optional": true + } + } + }, + "node_modules/@mui/material/node_modules/@mui/system": { + "version": "6.1.6", + "resolved": "https://registry.npmjs.org/@mui/system/-/system-6.1.6.tgz", + "integrity": "sha512-qOf1VUE9wK8syiB0BBCp82oNBAVPYdj4Trh+G1s+L+ImYiKlubWhhqlnvWt3xqMevR+D2h1CXzA1vhX2FvA+VQ==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.26.0", + "@mui/private-theming": "^6.1.6", + "@mui/styled-engine": "^6.1.6", + "@mui/types": "^7.2.19", + "@mui/utils": "^6.1.6", + "clsx": "^2.1.1", + "csstype": "^3.1.3", + "prop-types": "^15.8.1" + }, + "engines": { + "node": ">=14.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mui-org" + }, + "peerDependencies": { + "@emotion/react": "^11.5.0", + "@emotion/styled": "^11.3.0", + "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", + "react": "^17.0.0 || ^18.0.0 || ^19.0.0" + }, + "peerDependenciesMeta": { + "@emotion/react": { + "optional": true + }, + "@emotion/styled": { + "optional": true + }, + "@types/react": { + "optional": true + } + } + }, + "node_modules/@mui/material/node_modules/@mui/utils": { + "version": "6.1.6", + "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-6.1.6.tgz", + "integrity": "sha512-sBS6D9mJECtELASLM+18WUcXF6RH3zNxBRFeyCRg8wad6NbyNrdxLuwK+Ikvc38sTZwBzAz691HmSofLqHd9sQ==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.26.0", + "@mui/types": "^7.2.19", + "@types/prop-types": "^15.7.13", + "clsx": "^2.1.1", + "prop-types": "^15.8.1", + "react-is": "^18.3.1" + }, + "engines": { + "node": ">=14.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mui-org" + }, + "peerDependencies": { + "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", + "react": "^17.0.0 || ^18.0.0 || ^19.0.0" + }, + "peerDependenciesMeta": { "@types/react": { "optional": true } @@ -1356,12 +1492,12 @@ } }, "node_modules/@mui/types": { - "version": "7.2.15", - "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.2.15.tgz", - "integrity": "sha512-nbo7yPhtKJkdf9kcVOF8JZHPZTmqXjJ/tI0bdWgHg5tp9AnIN4Y7f7wm9T+0SyGYJk76+GYZ8Q5XaTYAsUHN0Q==", + "version": "7.2.19", + "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.2.19.tgz", + "integrity": "sha512-6XpZEM/Q3epK9RN8ENoXuygnqUQxE+siN/6rGRi2iwJPgBUR25mphYQ9ZI87plGh58YoZ5pp40bFvKYOCDJ3tA==", "license": "MIT", "peerDependencies": { - "@types/react": "^17.0.0 || ^18.0.0" + "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0" }, "peerDependenciesMeta": { "@types/react": { @@ -2350,9 +2486,9 @@ "license": "MIT" }, "node_modules/@types/prop-types": { - "version": "15.7.12", - "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.12.tgz", - "integrity": "sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==", + "version": "15.7.13", + "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.13.tgz", + "integrity": "sha512-hCZTSvwbzWGvhqxp/RqVqwU999pBf2vp7hzIjiYOsl8wqOmUxkQ6ddw1cV3l8811+kdUFus/q4d1Y3E3SyEifA==", "license": "MIT" }, "node_modules/@types/react": { @@ -2417,6 +2553,12 @@ "vite": "^4.2.0 || ^5.0.0" } }, + "node_modules/6": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/6/-/6-0.0.1.tgz", + "integrity": "sha512-kMT8ZPwxbwjMM73Cpy+VbrcYILF5a7UbuziJBcMPCEG33XCw4h00XecvmBMUD2KFfugBolHUmoSzjyl7Wtzbeg==", + "license": "mit" + }, "node_modules/acorn": { "version": "8.12.1", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", diff --git a/Client/package.json b/Client/package.json index 1a7213c20..1915e97c9 100644 --- a/Client/package.json +++ b/Client/package.json @@ -11,12 +11,13 @@ "preview": "vite preview" }, "dependencies": { - "@emotion/react": "^11.11.4", - "@emotion/styled": "^11.11.5", + "6": "^0.0.1", + "@emotion/react": "^11.13.3", + "@emotion/styled": "^11.13.0", "@fontsource/roboto": "^5.0.13", "@mui/icons-material": "^5.15.17", "@mui/lab": "^5.0.0-alpha.170", - "@mui/material": "^5.15.16", + "@mui/material": "6.1", "@mui/x-charts": "^7.5.1", "@mui/x-data-grid": "7.22.1", "@mui/x-date-pickers": "7.22.1", diff --git a/Client/src/App.jsx b/Client/src/App.jsx index a1b18be74..1a59ea9e5 100644 --- a/Client/src/App.jsx +++ b/Client/src/App.jsx @@ -35,7 +35,7 @@ import withAdminProp from "./Components/HOC/withAdminProp"; import { ThemeProvider } from "@emotion/react"; import lightTheme from "./Utils/Theme/lightTheme"; import darkTheme from "./Utils/Theme/darkTheme"; -import { CssBaseline } from "@mui/material"; +import { CssBaseline, GlobalStyles } from "@mui/material"; import { getAppSettings } from "./Features/Settings/settingsSlice"; import { logger } from "./Utils/Logger"; // Import the logger import { networkService } from "./main"; @@ -68,8 +68,19 @@ function App() { }, []); return ( + /* Extract Themeprovider, baseline and global styles to Styles */ + { + return { + body: { + backgroundImage: `radial-gradient(circle, ${palette.gradient.color1}, ${palette.gradient.color2}, ${palette.gradient.color3}, ${palette.gradient.color4}, ${palette.gradient.color5})`, + }, + }; + }} + /> + {/* Extract Routes to Routes */} { ], sx: { "& .MuiTooltip-tooltip": { - backgroundColor: theme.palette.background.main, + backgroundColor: theme.palette.secondary.main, border: 1, borderColor: theme.palette.border.dark, borderRadius: theme.shape.borderRadius, diff --git a/Client/src/Utils/Theme/constants.js b/Client/src/Utils/Theme/constants.js index 9d4361153..21bac7352 100644 --- a/Client/src/Utils/Theme/constants.js +++ b/Client/src/Utils/Theme/constants.js @@ -1,11 +1,14 @@ +const typographyBase = 14; const typographyLevels = { - xs: ".625rem", - s: ".75rem", - m: ".875rem", - l: "1rem", - xl: "1.5rem", + base: typographyBase, + xs: `${(typographyBase - 4) / 16}rem`, + s: `${(typographyBase - 2) / 16}rem`, + m: `${typographyBase / 16}rem`, + l: `${(typographyBase + 2) / 16}rem`, + xl: `${(typographyBase + 10) / 16}rem`, }; +/* This should not be here. INcorporate into color structure */ const paletteLight = { text: { primary: "#1c2130", @@ -15,4 +18,64 @@ const paletteLight = { }, }; -export { typographyLevels, paletteLight }; +/* TODO Expand this */ + +const paletteColors = { + white: "#FFFFFF", + gray50: "#FEFEFE", + gray60: "#FEFDFE", + gray70: "#FDFDFD", + gray80: "#FDFCFD", + gray90: "#FCFCFD", + gray850: "#131315", + gray860: "#111113", + gray870: "#0F0F11", + gray880: "#0C0C0E", + gray890: "#09090B", + black: "#000000", +}; + +/* TODO Export this as colors */ +/* primary: { + main: { + light:, + dark: + }, + light:{ + light:, + dark: + }, + dark:{ + light:, + dark: + }, + contrastText: { + light:, + dark: + }, + } */ +const semanticColors = { + gradient: { + color1: { + light: paletteColors.gray90, + dark: paletteColors.gray890, + }, + color2: { + light: paletteColors.gray80, + dark: paletteColors.gray880, + }, + color3: { + light: paletteColors.gray70, + dark: paletteColors.gray870, + }, + color4: { + light: paletteColors.gray60, + dark: paletteColors.gray860, + }, + color5: { + light: paletteColors.gray50, + dark: paletteColors.gray850, + }, + }, +}; +export { typographyLevels, paletteLight, semanticColors as colors }; diff --git a/Client/src/Utils/Theme/darkTheme.js b/Client/src/Utils/Theme/darkTheme.js index 050907ea6..ea1674ccd 100644 --- a/Client/src/Utils/Theme/darkTheme.js +++ b/Client/src/Utils/Theme/darkTheme.js @@ -1,5 +1,6 @@ import { createTheme } from "@mui/material"; import { baseTheme } from "./globalTheme"; +import { colors } from "./constants"; const text = { primary: "#fafafa", @@ -16,35 +17,18 @@ const background = { }; const border = { light: "#27272a", dark: "#36363e" }; -/* const fontFamilyDefault = - '"Inter","system-ui", "Avenir", "Helvetica", "Arial", sans-serif'; */ -const shadow = - "0px 4px 24px -4px rgba(255, 255, 255, 0.03), 0px 3px 3px -3px rgba(255, 255, 255, 0.01)"; +const { gradient } = colors; +/* const gradient = { + color1: "#09090b", + color2: "#0c0c0e", + color3: "#0f0f11", + color4: "#111113", + color5: "#131315", +}; */ const darkTheme = createTheme({ ...baseTheme, - // typography: { - // /* fontFamily: fontFamilyDefault, */ - // fontSize: 13, - // h1: { fontSize: 22, color: text.primary, fontWeight: 500 }, - // h2: { fontSize: 16, color: text.secondary, fontWeight: 400 }, - // body1: { fontSize: 13, color: text.tertiary, fontWeight: 400 }, - // body2: { fontSize: 12, color: text.tertiary, fontWeight: 400 }, - // }, - chart: { - header: { - fontWeight: 400, - fill: text.tertiary, - fontSize: 11, - }, - subheader: { - fontWeight: 400, - fill: text.tertiary, - fontSize: 9, - }, - }, palette: { - mode: "dark", primary: { main: "#1570ef" }, secondary: { main: "#2D2D33" }, text: text, @@ -57,6 +41,7 @@ const darkTheme = createTheme({ light: background.main, border: border.light, }, + gradient, success: { text: "#079455", main: "#45bb7a", @@ -94,176 +79,6 @@ const darkTheme = createTheme({ autofill: "#2d2d33", }, }, - spacing: 2, - components: { - MuiCssBaseline: { - styleOverrides: { - body: { - backgroundImage: - "radial-gradient(circle, #09090b, #0c0c0e, #0f0f11, #111113, #131315, #131315, #131315, #131315, #111113, #0f0f11, #0c0c0e, #09090b)", - lineHeight: "inherit", - paddingLeft: "calc(100vw - 100%)", - }, - }, - }, - MuiButton: { - defaultProps: { - disableRipple: true, - }, - styleOverrides: { - root: ({ theme }) => ({ - variants: [ - { - props: (props) => props.variant === "group", - style: { - color: theme.palette.secondary.contrastText, - backgroundColor: theme.palette.background.main, - border: 1, - borderStyle: "solid", - borderColor: theme.palette.border.light, - }, - }, - { - props: (props) => props.variant === "group" && props.filled === "true", - style: { - backgroundColor: theme.palette.secondary.main, - }, - }, - { - props: (props) => - props.variant === "contained" && props.color === "secondary", - style: { - border: 1, - borderStyle: "solid", - borderColor: theme.palette.border.dark, - }, - }, - ], - fontWeight: 400, - borderRadius: 4, - boxShadow: "none", - textTransform: "none", - "&:focus": { - outline: "none", - }, - "&:hover": { - boxShadow: "none", - }, - }), - }, - }, - MuiIconButton: { - styleOverrides: { - root: { - padding: 4, - transition: "none", - "&:hover": { - backgroundColor: border.light, - }, - }, - }, - }, - MuiPaper: { - styleOverrides: { - root: { - marginTop: 4, - padding: 0, - border: 1, - borderStyle: "solid", - borderColor: border.light, - borderRadius: 4, - boxShadow: shadow, - backgroundColor: background.main, - backgroundImage: "none", - }, - }, - }, - MuiList: { - styleOverrides: { - root: { - padding: 0, - }, - }, - }, - MuiListItemButton: { - styleOverrides: { - root: { - transition: "none", - }, - }, - }, - MuiMenuItem: { - styleOverrides: { - root: { - borderRadius: 4, - backgroundColor: "inherit", - padding: "4px 6px", - color: text.secondary, - fontSize: 13, - margin: 2, - minWidth: 100, - "&:hover, &.Mui-selected, &.Mui-selected:hover, &.Mui-selected.Mui-focusVisible": - { - backgroundColor: background.fill, - }, - }, - }, - }, - MuiTableCell: { - styleOverrides: { - root: { - borderBottomColor: border.light, - }, - }, - }, - MuiTableHead: { - styleOverrides: { - root: { - backgroundColor: background.accent, - }, - }, - }, - MuiPagination: { - styleOverrides: { - root: { - backgroundColor: background.main, - border: 1, - borderStyle: "solid", - borderColor: border.light, - "& button": { - color: text.tertiary, - borderRadius: 4, - }, - "& li:first-of-type button, & li:last-of-type button": { - border: 1, - borderStyle: "solid", - borderColor: border.light, - }, - }, - }, - }, - MuiPaginationItem: { - styleOverrides: { - root: { - "&:not(.MuiPaginationItem-ellipsis):hover, &.Mui-selected": { - backgroundColor: background.fill, - }, - }, - }, - }, - MuiSkeleton: { - styleOverrides: { - root: { - backgroundColor: "#151518", - }, - }, - }, - }, - shape: { - borderRadius: 2, - borderThick: 2, - boxShadow: shadow, - }, }); export default darkTheme; diff --git a/Client/src/Utils/Theme/globalTheme.js b/Client/src/Utils/Theme/globalTheme.js index d59c84186..f94e7cb37 100644 --- a/Client/src/Utils/Theme/globalTheme.js +++ b/Client/src/Utils/Theme/globalTheme.js @@ -3,10 +3,30 @@ import { paletteLight, typographyLevels } from "./constants"; const fontFamilyPrimary = '"Inter" , sans-serif'; // const fontFamilySecondary = '"Avenir", sans-serif'; +const shadow = + "0px 4px 24px -4px rgba(16, 24, 40, 0.08), 0px 3px 3px -3px rgba(16, 24, 40, 0.03)"; + +const background = { + main: "#FFFFFF", + alt: "#FCFCFD", + fill: "#F4F4F4", + accent: "#f9fafb", +}; + +const border = { light: "#eaecf0", dark: "#d0d5dd" }; + +const text = { + primary: "#1c2130", + secondary: "#344054", + tertiary: "#475467", + accent: "#838c99", +}; + const baseTheme = { + /* TODO colors should not live here */ typography: { fontFamily: fontFamilyPrimary, - fontSize: typographyLevels.m, + fontSize: 14, h1: { fontSize: typographyLevels.xl, color: paletteLight.text.primary, @@ -28,6 +48,179 @@ const baseTheme = { fontWeight: 400, }, }, + /* TODO take chart from here, it should live inside of the gauge, and get info from the theme */ + chart: { + header: { + fontWeight: 400, + fill: paletteLight.text.tertiary, + fontSize: typographyLevels.m, + }, + subheader: { + fontWeight: 400, + fill: paletteLight.text.tertiary, + fontSize: typographyLevels.xs, + }, + }, + spacing: 2, + components: { + MuiButton: { + defaultProps: { + disableRipple: true, + }, + styleOverrides: { + root: ({ theme }) => ({ + variants: [ + { + props: (props) => props.variant === "group", + style: { + color: theme.palette.secondary.contrastText, + backgroundColor: theme.palette.background.main, + border: 1, + borderStyle: "solid", + borderColor: theme.palette.border.light, + }, + }, + { + props: (props) => props.variant === "group" && props.filled === "true", + style: { + backgroundColor: theme.palette.secondary.main, + }, + }, + { + props: (props) => + props.variant === "contained" && props.color === "secondary", + style: { + border: 1, + borderStyle: "solid", + borderColor: theme.palette.border.light, + }, + }, + ], + fontWeight: 400, + borderRadius: 4, + boxShadow: "none", + textTransform: "none", + "&:focus": { + outline: "none", + }, + "&:hover": { + boxShadow: "none", + }, + }), + }, + }, + MuiIconButton: { + styleOverrides: { + root: { + padding: 4, + transition: "none", + "&:hover": { + backgroundColor: background.fill, + }, + }, + }, + }, + MuiPaper: { + styleOverrides: { + root: { + marginTop: 4, + padding: 0, + border: 1, + borderStyle: "solid", + borderColor: border.light, + borderRadius: 4, + boxShadow: shadow, + backgroundColor: background.main, + backgroundImage: "none", + }, + }, + }, + MuiList: { + styleOverrides: { + root: { + padding: 0, + }, + }, + }, + MuiListItemButton: { + styleOverrides: { + root: { + transition: "none", + }, + }, + }, + MuiMenuItem: { + styleOverrides: { + root: { + borderRadius: 4, + backgroundColor: "inherit", + padding: "4px 6px", + color: text.secondary, + fontSize: 13, + margin: 2, + minWidth: 100, + "&:hover, &.Mui-selected, &.Mui-selected:hover, &.Mui-selected.Mui-focusVisible": + { + backgroundColor: background.fill, + }, + }, + }, + }, + MuiTableCell: { + styleOverrides: { + root: { + borderBottomColor: border.light, + }, + }, + }, + MuiTableHead: { + styleOverrides: { + root: { + backgroundColor: background.accent, + }, + }, + }, + MuiPagination: { + styleOverrides: { + root: { + backgroundColor: background.main, + border: 1, + borderStyle: "solid", + borderColor: border.light, + "& button": { + color: text.tertiary, + borderRadius: 4, + }, + "& li:first-of-type button, & li:last-of-type button": { + border: 1, + borderStyle: "solid", + borderColor: border.light, + }, + }, + }, + }, + MuiPaginationItem: { + styleOverrides: { + root: { + "&:not(.MuiPaginationItem-ellipsis):hover, &.Mui-selected": { + backgroundColor: background.fill, + }, + }, + }, + }, + MuiSkeleton: { + styleOverrides: { + root: ({ theme }) => ({ + backgroundColor: theme.palette.unresolved.bg, + }), + }, + }, + }, + shape: { + borderRadius: 2, + borderThick: 2, + boxShadow: shadow, + }, }; export { baseTheme }; diff --git a/Client/src/Utils/Theme/lightTheme.js b/Client/src/Utils/Theme/lightTheme.js index edf20da42..1f88d0696 100644 --- a/Client/src/Utils/Theme/lightTheme.js +++ b/Client/src/Utils/Theme/lightTheme.js @@ -1,6 +1,6 @@ import { createTheme } from "@mui/material"; -import { typographyLevels } from "./constants"; import { baseTheme } from "./globalTheme"; +import { colors } from "./constants"; const text = { primary: "#1c2130", @@ -15,38 +15,19 @@ const background = { accent: "#f9fafb", }; +const { gradient } = colors; +/* const gradient = { + color1: "#fcfcfd", + color2: "#fdfcfd", + color3: "#fdfdfd", + color4: "#fefdfe", + color5: "#fefefe", +}; */ + const border = { light: "#eaecf0", dark: "#d0d5dd" }; -/* TODO stop using mui for fonts. Create text component based on emotion */ - -/* const fontFamilyDefault = - '"Inter","system-ui", "Avenir", "Helvetica", "Arial", sans-serif'; */ - -const shadow = - "0px 4px 24px -4px rgba(16, 24, 40, 0.08), 0px 3px 3px -3px rgba(16, 24, 40, 0.03)"; - const lightTheme = createTheme({ ...baseTheme, - // typography: { - // /* fontFamily: fontFamilyDefault, */ - // fontSize: typographyLevels.m, - // h1: { fontSize: typographyLevels.xl, color: text.primary, fontWeight: 500 }, - // h2: { fontSize: typographyLevels.l, color: text.secondary, fontWeight: 400 }, - // body1: { fontSize: typographyLevels.m, color: text.tertiary, fontWeight: 400 }, - // body2: { fontSize: typographyLevels.s, color: text.tertiary, fontWeight: 400 }, - // }, - chart: { - header: { - fontWeight: 400, - fill: text.tertiary, - fontSize: typographyLevels.m, - }, - subheader: { - fontWeight: 400, - fill: text.tertiary, - fontSize: typographyLevels.xs, - }, - }, palette: { primary: { main: "#1570EF" }, secondary: { main: "#F4F4F4", dark: "#e3e3e3", contrastText: "#475467" }, @@ -60,6 +41,7 @@ const lightTheme = createTheme({ light: background.main, border: border.dark, }, + gradient, success: { text: "#079455", main: "#17b26a", @@ -96,176 +78,6 @@ const lightTheme = createTheme({ autofill: "#e8f0fe", }, }, - spacing: 2, - components: { - MuiCssBaseline: { - styleOverrides: { - body: { - backgroundImage: - "radial-gradient(circle, #fcfcfd, #fdfcfd, #fdfdfd, #fefdfe, #fefefe, #fefefe, #fefefe, #fefefe, #fefdfe, #fdfdfd, #fdfcfd, #fcfcfd)", - lineHeight: "inherit", - paddingLeft: "calc(100vw - 100%)", - }, - }, - }, - MuiButton: { - defaultProps: { - disableRipple: true, - }, - styleOverrides: { - root: ({ theme }) => ({ - variants: [ - { - props: (props) => props.variant === "group", - style: { - color: theme.palette.secondary.contrastText, - backgroundColor: theme.palette.background.main, - border: 1, - borderStyle: "solid", - borderColor: theme.palette.border.light, - }, - }, - { - props: (props) => props.variant === "group" && props.filled === "true", - style: { - backgroundColor: theme.palette.secondary.main, - }, - }, - { - props: (props) => - props.variant === "contained" && props.color === "secondary", - style: { - border: 1, - borderStyle: "solid", - borderColor: theme.palette.border.light, - }, - }, - ], - fontWeight: 400, - borderRadius: 4, - boxShadow: "none", - textTransform: "none", - "&:focus": { - outline: "none", - }, - "&:hover": { - boxShadow: "none", - }, - }), - }, - }, - MuiIconButton: { - styleOverrides: { - root: { - padding: 4, - transition: "none", - "&:hover": { - backgroundColor: background.fill, - }, - }, - }, - }, - MuiPaper: { - styleOverrides: { - root: { - marginTop: 4, - padding: 0, - border: 1, - borderStyle: "solid", - borderColor: border.light, - borderRadius: 4, - boxShadow: shadow, - backgroundColor: background.main, - backgroundImage: "none", - }, - }, - }, - MuiList: { - styleOverrides: { - root: { - padding: 0, - }, - }, - }, - MuiListItemButton: { - styleOverrides: { - root: { - transition: "none", - }, - }, - }, - MuiMenuItem: { - styleOverrides: { - root: { - borderRadius: 4, - backgroundColor: "inherit", - padding: "4px 6px", - color: text.secondary, - fontSize: 13, - margin: 2, - minWidth: 100, - "&:hover, &.Mui-selected, &.Mui-selected:hover, &.Mui-selected.Mui-focusVisible": - { - backgroundColor: background.fill, - }, - }, - }, - }, - MuiTableCell: { - styleOverrides: { - root: { - borderBottomColor: border.light, - }, - }, - }, - MuiTableHead: { - styleOverrides: { - root: { - backgroundColor: background.accent, - }, - }, - }, - MuiPagination: { - styleOverrides: { - root: { - backgroundColor: background.main, - border: 1, - borderStyle: "solid", - borderColor: border.light, - "& button": { - color: text.tertiary, - borderRadius: 4, - }, - "& li:first-of-type button, & li:last-of-type button": { - border: 1, - borderStyle: "solid", - borderColor: border.light, - }, - }, - }, - }, - MuiPaginationItem: { - styleOverrides: { - root: { - "&:not(.MuiPaginationItem-ellipsis):hover, &.Mui-selected": { - backgroundColor: background.fill, - }, - }, - }, - }, - MuiSkeleton: { - styleOverrides: { - root: { - backgroundColor: "#f2f4f7", - }, - }, - }, - }, - shape: { - borderRadius: 2, - borderThick: 2, - boxShadow: shadow, - }, }); export default lightTheme; From 067400437f72718a6fae26af6c9006e7470980a0 Mon Sep 17 00:00:00 2001 From: Caio Cabral Date: Sun, 10 Nov 2024 17:00:13 -0500 Subject: [PATCH 06/49] feat: reoganizing color scheme --- Client/src/Components/Alert/index.jsx | 1 + .../src/Components/Charts/BarChart/index.jsx | 11 +- Client/src/Components/Check/Check.jsx | 2 +- Client/src/Components/Inputs/Field/index.jsx | 6 +- Client/src/Components/Inputs/Search/index.jsx | 2 +- Client/src/Components/Label/index.jsx | 10 +- Client/src/Components/ProgressBars/index.jsx | 6 +- .../MaintenanceTable/ActionsMenu/index.jsx | 2 +- .../Pages/Monitors/CreateMonitor/index.jsx | 60 +- .../Pages/Monitors/Details/Charts/index.jsx | 16 +- Client/src/Pages/Monitors/Home/StatusBox.jsx | 2 +- .../src/Pages/Monitors/Home/actionsMenu.jsx | 2 +- Client/src/Pages/Monitors/utils.jsx | 20 +- .../Pages/PageSpeed/CreatePageSpeed/index.jsx | 515 +++++++++--------- .../PageSpeed/Details/Charts/PieChart.jsx | 14 +- Client/src/Pages/PageSpeed/Details/index.jsx | 2 +- Client/src/Utils/Theme/constants.js | 131 ++++- Client/src/Utils/Theme/darkTheme.js | 81 +-- Client/src/Utils/Theme/lightTheme.js | 84 +-- 19 files changed, 551 insertions(+), 416 deletions(-) diff --git a/Client/src/Components/Alert/index.jsx b/Client/src/Components/Alert/index.jsx index 49c089813..116ac5dea 100644 --- a/Client/src/Components/Alert/index.jsx +++ b/Client/src/Components/Alert/index.jsx @@ -31,6 +31,7 @@ const icons = { const Alert = ({ variant, title, body, isToast, hasIcon = true, onClick }) => { const theme = useTheme(); + /* TODO check if this still works. text bg and border not necessarilly exist. Text becomes contrastText. border becomes contrastText. bg becomes dark */ const { text, bg, border } = theme.palette[variant]; const icon = icons[variant]; diff --git a/Client/src/Components/Charts/BarChart/index.jsx b/Client/src/Components/Charts/BarChart/index.jsx index 20f016f46..c6308ee2d 100644 --- a/Client/src/Components/Charts/BarChart/index.jsx +++ b/Client/src/Components/Charts/BarChart/index.jsx @@ -5,6 +5,7 @@ import { useEffect, useState } from "react"; import "./index.css"; import { useSelector } from "react-redux"; +/* TODO add prop validation and jsdocs */ const BarChart = ({ checks = [] }) => { const theme = useTheme(); const [animate, setAnimate] = useState(false); @@ -65,7 +66,9 @@ const BarChart = ({ checks = [] }) => { width={theme.spacing(4)} height={theme.spacing(4)} backgroundColor={ - check.status ? theme.palette.success.main : theme.palette.error.text + check.status + ? theme.palette.success.main + : theme.palette.error.contrastText } sx={{ borderRadius: "50%" }} /> @@ -138,7 +141,7 @@ const BarChart = ({ checks = [] }) => { width="9px" height="100%" backgroundColor={ - check.status ? theme.palette.success.bg : theme.palette.error.bg + check.status ? theme.palette.success.dark : theme.palette.error.dark } sx={{ borderRadius: theme.spacing(1.5), @@ -153,7 +156,9 @@ const BarChart = ({ checks = [] }) => { width="100%" height={`${animate ? check.responseTime : 0}%`} backgroundColor={ - check.status ? theme.palette.success.main : theme.palette.error.text + check.status + ? theme.palette.success.main + : theme.palette.error.contrastText } sx={{ borderRadius: theme.spacing(1.5), diff --git a/Client/src/Components/Check/Check.jsx b/Client/src/Components/Check/Check.jsx index 01a023345..3219fec29 100644 --- a/Client/src/Components/Check/Check.jsx +++ b/Client/src/Components/Check/Check.jsx @@ -24,7 +24,7 @@ const Check = ({ text, noHighlightText, variant = "info", outlined = false }) => const theme = useTheme(); const colors = { success: theme.palette.success.main, - error: theme.palette.error.text, + error: theme.palette.error.contrastText, info: theme.palette.info.border, }; diff --git a/Client/src/Components/Inputs/Field/index.jsx b/Client/src/Components/Inputs/Field/index.jsx index 4ead8a705..ccb0c1e37 100644 --- a/Client/src/Components/Inputs/Field/index.jsx +++ b/Client/src/Components/Inputs/Field/index.jsx @@ -67,7 +67,7 @@ const Field = forwardRef( borderColor: theme.palette.border.dark, }, "&:has(.input-error) .MuiOutlinedInput-root fieldset": { - borderColor: theme.palette.error.text, + borderColor: theme.palette.error.contrastText, }, display: hidden ? "none" : "", }} @@ -83,7 +83,7 @@ const Field = forwardRef( * @@ -189,7 +189,7 @@ const Field = forwardRef( { const colors = { up: { dotColor: theme.palette.success.main, - bgColor: theme.palette.success.bg, + bgColor: theme.palette.success.dark, borderColor: theme.palette.success.light, }, down: { - dotColor: theme.palette.error.text, - bgColor: theme.palette.error.bg, + dotColor: theme.palette.error.contrastText, + bgColor: theme.palette.error.dark, borderColor: theme.palette.error.light, }, paused: { dotColor: theme.palette.warning.main, - bgColor: theme.palette.warning.bg, + bgColor: theme.palette.warning.dark, borderColor: theme.palette.warning.light, }, pending: { dotColor: theme.palette.warning.main, - bgColor: theme.palette.warning.bg, + bgColor: theme.palette.warning.dark, borderColor: theme.palette.warning.light, }, "cannot resolve": { diff --git a/Client/src/Components/ProgressBars/index.jsx b/Client/src/Components/ProgressBars/index.jsx index 46b2efab1..198f740aa 100644 --- a/Client/src/Components/ProgressBars/index.jsx +++ b/Client/src/Components/ProgressBars/index.jsx @@ -34,11 +34,11 @@ const ProgressUpload = ({ icon, label, size, progress = 0, onClick, error }) => backgroundColor: theme.palette.background.fill, "&:has(.input-error)": { borderColor: theme.palette.error.main, - backgroundColor: theme.palette.error.bg, + backgroundColor: theme.palette.error.dark, py: theme.spacing(4), px: theme.spacing(8), "& > .MuiStack-root > svg": { - fill: theme.palette.error.text, + fill: theme.palette.error.contrastText, width: "20px", height: "20px", }, @@ -85,7 +85,7 @@ const ProgressUpload = ({ icon, label, size, progress = 0, onClick, error }) => {error} diff --git a/Client/src/Pages/Maintenance/MaintenanceTable/ActionsMenu/index.jsx b/Client/src/Pages/Maintenance/MaintenanceTable/ActionsMenu/index.jsx index 8928b1e05..35a28f6da 100644 --- a/Client/src/Pages/Maintenance/MaintenanceTable/ActionsMenu/index.jsx +++ b/Client/src/Pages/Maintenance/MaintenanceTable/ActionsMenu/index.jsx @@ -114,7 +114,7 @@ const ActionsMenu = ({ /* isAdmin, */ maintenanceWindow, updateCallback }) => { "& ul": { p: theme.spacing(2.5) }, "& li": { m: 0 }, "& li:last-of-type": { - color: theme.palette.error.text, + color: theme.palette.error.contrastText, }, }, }, diff --git a/Client/src/Pages/Monitors/CreateMonitor/index.jsx b/Client/src/Pages/Monitors/CreateMonitor/index.jsx index bfa62c7fa..451ca2df3 100644 --- a/Client/src/Pages/Monitors/CreateMonitor/index.jsx +++ b/Client/src/Pages/Monitors/CreateMonitor/index.jsx @@ -1,10 +1,10 @@ import { useState, useEffect } from "react"; import { Box, Button, ButtonGroup, Stack, Typography } from "@mui/material"; -import LoadingButton from '@mui/lab/LoadingButton'; +import LoadingButton from "@mui/lab/LoadingButton"; import { useSelector, useDispatch } from "react-redux"; import { monitorValidation } from "../../../Validation/validation"; import { createUptimeMonitor } from "../../../Features/UptimeMonitors/uptimeMonitorsSlice"; -import { checkEndpointResolution } from "../../../Features/UptimeMonitors/uptimeMonitorsSlice" +import { checkEndpointResolution } from "../../../Features/UptimeMonitors/uptimeMonitorsSlice"; import { useNavigate, useParams } from "react-router-dom"; import { useTheme } from "@emotion/react"; import { createToast } from "../../../Utils/toastUtils"; @@ -19,12 +19,12 @@ import { getUptimeMonitorById } from "../../../Features/UptimeMonitors/uptimeMon import "./index.css"; const CreateMonitor = () => { - const MS_PER_MINUTE = 60000; - const { user, authToken } = useSelector((state) => state.auth); - const { monitors, isLoading } = useSelector((state) => state.uptimeMonitors); - const dispatch = useDispatch(); - const navigate = useNavigate(); - const theme = useTheme(); + const MS_PER_MINUTE = 60000; + const { user, authToken } = useSelector((state) => state.auth); + const { monitors, isLoading } = useSelector((state) => state.uptimeMonitors); + const dispatch = useDispatch(); + const navigate = useNavigate(); + const theme = useTheme(); const idMap = { "monitor-url": "url", @@ -148,16 +148,18 @@ const CreateMonitor = () => { setErrors(newErrors); createToast({ body: "Error validation data." }); } else { - if (monitor.type === "http") { - const checkEndpointAction = await dispatch( - checkEndpointResolution({ authToken, monitorURL: form.url }) - ) - if (checkEndpointAction.meta.requestStatus === "rejected") { - createToast({ body: "The endpoint you entered doesn't resolve. Check the URL again." }); - setErrors({ url: "The entered URL is not reachable." }); - return; - } - } + if (monitor.type === "http") { + const checkEndpointAction = await dispatch( + checkEndpointResolution({ authToken, monitorURL: form.url }) + ); + if (checkEndpointAction.meta.requestStatus === "rejected") { + createToast({ + body: "The endpoint you entered doesn't resolve. Check the URL again.", + }); + setErrors({ url: "The entered URL is not reachable." }); + return; + } + } form = { ...form, @@ -304,7 +306,7 @@ const CreateMonitor = () => { {errors["type"]} @@ -386,19 +388,19 @@ const CreateMonitor = () => { direction="row" justifyContent="flex-end" > - - Create monitor - + + Create monitor + ); }; -export default CreateMonitor; \ No newline at end of file +export default CreateMonitor; diff --git a/Client/src/Pages/Monitors/Details/Charts/index.jsx b/Client/src/Pages/Monitors/Details/Charts/index.jsx index 52b677495..915ee0933 100644 --- a/Client/src/Pages/Monitors/Details/Charts/index.jsx +++ b/Client/src/Pages/Monitors/Details/Charts/index.jsx @@ -61,7 +61,7 @@ const UpBarChart = memo(({ data, type, onBarHover }) => { ? { main: theme.palette.success.main, light: theme.palette.success.light } : uptime > 50 ? { main: theme.palette.warning.main, light: theme.palette.warning.light } - : { main: theme.palette.error.text, light: theme.palette.error.light }; + : { main: theme.palette.error.contrastText, light: theme.palette.error.light }; }; // TODO - REMOVE THIS LATER @@ -201,10 +201,10 @@ const DownBarChart = memo(({ data, type, onBarHover }) => { key={`cell-${entry.time}`} fill={ hoveredBarIndex === index - ? theme.palette.error.text + ? theme.palette.error.contrastText : chartHovered ? theme.palette.error.light - : theme.palette.error.text + : theme.palette.error.contrastText } onMouseEnter={() => { setHoveredBarIndex(index); @@ -246,24 +246,24 @@ const ResponseGaugeChart = ({ data }) => { ? { category: "Excellent", main: theme.palette.success.main, - bg: theme.palette.success.bg, + bg: theme.palette.success.dark, } : responseTime <= 500 ? { category: "Fair", main: theme.palette.success.main, - bg: theme.palette.success.bg, + bg: theme.palette.success.dark, } : responseTime <= 600 ? { category: "Acceptable", main: theme.palette.warning.main, - bg: theme.palette.warning.bg, + bg: theme.palette.warning.dark, } : { category: "Poor", - main: theme.palette.error.text, - bg: theme.palette.error.bg, + main: theme.palette.error.contrastText, + bg: theme.palette.error.dark, }; return ( diff --git a/Client/src/Pages/Monitors/Home/StatusBox.jsx b/Client/src/Pages/Monitors/Home/StatusBox.jsx index b87e883d7..d84690432 100644 --- a/Client/src/Pages/Monitors/Home/StatusBox.jsx +++ b/Client/src/Pages/Monitors/Home/StatusBox.jsx @@ -25,7 +25,7 @@ const StatusBox = ({ title, value }) => { ); } else if (title === "down") { - color = theme.palette.error.text; + color = theme.palette.error.contrastText; icon = ( diff --git a/Client/src/Pages/Monitors/Home/actionsMenu.jsx b/Client/src/Pages/Monitors/Home/actionsMenu.jsx index 7efffa93c..4ab601fea 100644 --- a/Client/src/Pages/Monitors/Home/actionsMenu.jsx +++ b/Client/src/Pages/Monitors/Home/actionsMenu.jsx @@ -109,7 +109,7 @@ const ActionsMenu = ({ monitor, isAdmin, updateCallback }) => { "& ul": { p: theme.spacing(2.5) }, "& li": { m: 0 }, "& li:last-of-type": { - color: theme.palette.error.text, + color: theme.palette.error.contrastText, }, }, }, diff --git a/Client/src/Pages/Monitors/utils.jsx b/Client/src/Pages/Monitors/utils.jsx index 826a92bbb..4dc4260cd 100644 --- a/Client/src/Pages/Monitors/utils.jsx +++ b/Client/src/Pages/Monitors/utils.jsx @@ -28,20 +28,20 @@ const useUtils = () => { }; const statusStyles = { up: { - backgroundColor: theme.palette.success.bg, - background: `linear-gradient(340deg, ${theme.palette.success.light} -60%, ${theme.palette.success.bg} 35%)`, + backgroundColor: theme.palette.success.dark, + background: `linear-gradient(340deg, ${theme.palette.success.light} -60%, ${theme.palette.success.dark} 35%)`, borderColor: theme.palette.success.light, "& h2": { color: theme.palette.success.main }, }, down: { - backgroundColor: theme.palette.error.bg, - background: `linear-gradient(340deg, ${theme.palette.error.light} -60%, ${theme.palette.error.bg} 35%)`, + backgroundColor: theme.palette.error.dark, + background: `linear-gradient(340deg, ${theme.palette.error.light} -60%, ${theme.palette.error.dark} 35%)`, borderColor: theme.palette.error.light, "& h2": { color: theme.palette.error.main }, }, paused: { - backgroundColor: theme.palette.warning.bg, - background: `linear-gradient(340deg, ${theme.palette.warning.light} -60%, ${theme.palette.warning.bg} 35%)`, + backgroundColor: theme.palette.warning.dark, + background: `linear-gradient(340deg, ${theme.palette.warning.light} -60%, ${theme.palette.warning.dark} 35%)`, borderColor: theme.palette.warning.light, "& h2": { color: theme.palette.warning.main }, }, @@ -54,22 +54,22 @@ const useUtils = () => { }; const pagespeedStyles = { up: { - bg: theme.palette.success.bg, + bg: theme.palette.success.dark, light: theme.palette.success.light, stroke: theme.palette.success.main, }, down: { - bg: theme.palette.error.bg, + bg: theme.palette.error.dark, light: theme.palette.error.light, stroke: theme.palette.error.main, }, paused: { - bg: theme.palette.warning.bg, + bg: theme.palette.warning.dark, light: theme.palette.warning.light, stroke: theme.palette.warning.main, }, pending: { - bg: theme.palette.warning.bg, + bg: theme.palette.warning.dark, light: theme.palette.warning.light, stroke: theme.palette.warning.main, }, diff --git a/Client/src/Pages/PageSpeed/CreatePageSpeed/index.jsx b/Client/src/Pages/PageSpeed/CreatePageSpeed/index.jsx index 162b231a2..f771c3988 100644 --- a/Client/src/Pages/PageSpeed/CreatePageSpeed/index.jsx +++ b/Client/src/Pages/PageSpeed/CreatePageSpeed/index.jsx @@ -1,11 +1,14 @@ import { useState } from "react"; import { Box, Button, ButtonGroup, Stack, Typography } from "@mui/material"; -import LoadingButton from '@mui/lab/LoadingButton'; +import LoadingButton from "@mui/lab/LoadingButton"; import { useSelector, useDispatch } from "react-redux"; import { monitorValidation } from "../../../Validation/validation"; import { useNavigate } from "react-router-dom"; import { useTheme } from "@emotion/react"; -import { createPageSpeed, checkEndpointResolution } from "../../../Features/PageSpeedMonitor/pageSpeedMonitorSlice"; +import { + createPageSpeed, + checkEndpointResolution, +} from "../../../Features/PageSpeedMonitor/pageSpeedMonitorSlice"; import { createToast } from "../../../Utils/toastUtils"; import { logger } from "../../../Utils/Logger"; import { ConfigBox } from "../../Monitors/styled"; @@ -17,12 +20,12 @@ import Breadcrumbs from "../../../Components/Breadcrumbs"; import "./index.css"; const CreatePageSpeed = () => { - const MS_PER_MINUTE = 60000; - const { user, authToken } = useSelector((state) => state.auth); - const { isLoading } = useSelector((state) => state.pageSpeedMonitors); - const dispatch = useDispatch(); - const navigate = useNavigate(); - const theme = useTheme(); + const MS_PER_MINUTE = 60000; + const { user, authToken } = useSelector((state) => state.auth); + const { isLoading } = useSelector((state) => state.pageSpeedMonitors); + const dispatch = useDispatch(); + const navigate = useNavigate(); + const theme = useTheme(); const idMap = { "monitor-url": "url", @@ -105,252 +108,260 @@ const CreatePageSpeed = () => { abortEarly: false, }); - if (error) { - const newErrors = {}; - error.details.forEach((err) => { - newErrors[err.path[0]] = err.message; - }); - setErrors(newErrors); - createToast({ body: "Error validation data." }); - } else { - const checkEndpointAction = await dispatch( - checkEndpointResolution({ authToken, monitorURL: form.url }) - ) - if (checkEndpointAction.meta.requestStatus === "rejected") { - createToast({ body: "The endpoint you entered doesn't resolve. Check the URL again." }); - setErrors({ url: "The entered URL is not reachable." }); - return; - } + if (error) { + const newErrors = {}; + error.details.forEach((err) => { + newErrors[err.path[0]] = err.message; + }); + setErrors(newErrors); + createToast({ body: "Error validation data." }); + } else { + const checkEndpointAction = await dispatch( + checkEndpointResolution({ authToken, monitorURL: form.url }) + ); + if (checkEndpointAction.meta.requestStatus === "rejected") { + createToast({ + body: "The endpoint you entered doesn't resolve. Check the URL again.", + }); + setErrors({ url: "The entered URL is not reachable." }); + return; + } - form = { - ...form, - description: form.name, - teamId: user.teamId, - userId: user._id, - notifications: monitor.notifications, - }; - const action = await dispatch( - createPageSpeed({ authToken, monitor: form }) - ); - if (action.meta.requestStatus === "fulfilled") { - createToast({ body: "Monitor created successfully!" }); - navigate("/pagespeed"); - } else { - createToast({ body: "Failed to create monitor." }); - } - } - }; + form = { + ...form, + description: form.name, + teamId: user.teamId, + userId: user._id, + notifications: monitor.notifications, + }; + const action = await dispatch(createPageSpeed({ authToken, monitor: form })); + if (action.meta.requestStatus === "fulfilled") { + createToast({ body: "Monitor created successfully!" }); + navigate("/pagespeed"); + } else { + createToast({ body: "Failed to create monitor." }); + } + } + }; - //select values - const frequencies = [ - { _id: 3, name: "3 minutes" }, - { _id: 5, name: "5 minutes" }, - { _id: 10, name: "10 minutes" }, - { _id: 20, name: "20 minutes" }, - { _id: 60, name: "1 hour" }, - { _id: 1440, name: "1 day" }, - { _id: 10080, name: "1 week" }, - ]; - return ( - - - - - - Create your{" "} - - - pagespeed monitor - - - - - General settings - - Here you can select the URL of the host, together with the type of - monitor. - - - - - - - - - - Checks to perform - - You can always add or remove checks after adding your site. - - - - - handleChange(event)} - /> - - - - - - {errors["type"] ? ( - - - {errors["type"]} - - - ) : ( - "" - )} - - - - - Incident notifications - - When there is an incident, notify users. - - - - When there is a new incident, - logger.warn("disabled")} - isDisabled={true} - /> - notification.type === "email" - )} - value={user?.email} - onChange={(event) => handleChange(event)} - /> - logger.warn("disabled")} - isDisabled={true} - /> - {monitor.notifications.some( - (notification) => notification.type === "emails" - ) ? ( - - logger.warn("disabled")} - /> - - You can separate multiple emails with a comma - - - ) : ( - "" - )} - - - - - Advanced settings - - - handleChange(event, "interval")} + items={frequencies} + /> + + + + + Create monitor + + + + + ); }; export default CreatePageSpeed; diff --git a/Client/src/Pages/PageSpeed/Details/Charts/PieChart.jsx b/Client/src/Pages/PageSpeed/Details/Charts/PieChart.jsx index a330c3c12..d1d106c11 100644 --- a/Client/src/Pages/PageSpeed/Details/Charts/PieChart.jsx +++ b/Client/src/Pages/PageSpeed/Details/Charts/PieChart.jsx @@ -127,22 +127,22 @@ const PieChart = ({ audits }) => { return { stroke: theme.palette.success.main, strokeBg: theme.palette.success.light, - text: theme.palette.success.text, - bg: theme.palette.success.bg, + text: theme.palette.success.contrastText, + bg: theme.palette.success.dark, }; else if (value >= 50 && value < 90) return { stroke: theme.palette.warning.main, strokeBg: theme.palette.warning.light, - text: theme.palette.warning.text, - bg: theme.palette.warning.bg, + text: theme.palette.warning.contrastText, + bg: theme.palette.warning.dark, }; else if (value >= 0 && value < 50) return { - stroke: theme.palette.error.text, + stroke: theme.palette.error.contrastText, strokeBg: theme.palette.error.light, - text: theme.palette.error.text, - bg: theme.palette.error.bg, + text: theme.palette.error.contrastText, + bg: theme.palette.error.dark, }; return { stroke: theme.palette.unresolved.main, diff --git a/Client/src/Pages/PageSpeed/Details/index.jsx b/Client/src/Pages/PageSpeed/Details/index.jsx index 015a17c6b..ca852e124 100644 --- a/Client/src/Pages/PageSpeed/Details/index.jsx +++ b/Client/src/Pages/PageSpeed/Details/index.jsx @@ -362,7 +362,7 @@ const PageSpeedDetails = ({ isAdmin }) => { : score >= 50 ? theme.palette.warning.main : score >= 0 - ? theme.palette.error.text + ? theme.palette.error.contrastText : theme.palette.unresolved.main; // Find the position where the number ends and the unit begins diff --git a/Client/src/Utils/Theme/constants.js b/Client/src/Utils/Theme/constants.js index 21bac7352..ceb138fc3 100644 --- a/Client/src/Utils/Theme/constants.js +++ b/Client/src/Utils/Theme/constants.js @@ -27,34 +27,127 @@ const paletteColors = { gray70: "#FDFDFD", gray80: "#FDFCFD", gray90: "#FCFCFD", + gray100: "#F4F4F4", + gray200: "#E3E3E3", + gray800: "#2D2D33", + gray830: "#262115", gray850: "#131315", gray860: "#111113", gray870: "#0F0F11", gray880: "#0C0C0E", gray890: "#09090B", black: "#000000", + blueBlueWave: "#1570EF", + blue700: "#475467", + green20: "#ECFDF3", + green50: "#D4F4E1", + green150: "#45BB7A", + green200: "#17B26A", + green400: "#079455", + green800: "#1C4428", + green900: "#12261E", + red50: "#F9ECED", + red100: "#FBD1D1", + red200: "#F04438", + red300: "#D32F2F", + red700: "#542426", + red800: "#301A1F", + orange50: "#FEF8EA", + orange100: "#FFECBC", + orange200: "#FEC84B", + orange300: "#FDB022", + orange400: "#FF9F00", + orange500: "#E88C30", + orange600: "#DC6803", + orange800: "#624711", }; -/* TODO Export this as colors */ -/* primary: { - main: { - light:, - dark: - }, - light:{ - light:, - dark: - }, - dark:{ - light:, - dark: - }, - contrastText: { - light:, - dark: - }, - } */ const semanticColors = { + primary: { + main: { + light: paletteColors.blueBlueWave, + dark: paletteColors.blueBlueWave, + }, + // TODO we dont have primary light, dark or contrast text + }, + secondary: { + main: { + light: paletteColors.gray100, + dark: paletteColors.gray800, + }, + // TODO we dont have secondary light + dark: { + light: paletteColors.gray200, + //TODO we dont have secondary dark for dark mode + }, + constrastText: { + light: paletteColors.blue700, + //TODO we dont have secondary contrastText for dark mode + }, + }, + success: { + main: { + light: paletteColors.green200, + dark: paletteColors.green150, + }, + contrastText: { + //TODO values are equal (confirm) + //TODO contrasttext semantically should be something that contrasts with the main + light: paletteColors.green400, + dark: paletteColors.green400, + }, + light: { + light: paletteColors.green50, + //TODO dark mode light success is darker than the main success + dark: paletteColors.green800, + }, + dark: { + light: paletteColors.green20, + dark: paletteColors.green900, + }, + }, + error: { + main: { + light: paletteColors.red300, + dark: paletteColors.red300, + }, + contrastText: { + //TODO contrasttext semantically should be something that contrasts with the main + light: paletteColors.red200, + dark: paletteColors.red200, + }, + light: { + light: paletteColors.red100, + dark: paletteColors.red700, + }, + dark: { + light: paletteColors.red50, + dark: paletteColors.red800, + }, + }, + warning: { + main: { + light: paletteColors.orange300, + dark: paletteColors.orange400, + }, + text: { + light: paletteColors.orange600, + dark: paletteColors.orange500, + }, + light: { + light: paletteColors.orange100, + dark: paletteColors.orange800, + }, + bg: { + light: paletteColors.orange50, + dark: paletteColors.gray830, + }, + border: { + light: paletteColors.orange200, + dark: paletteColors.orange500, + }, + }, + gradient: { color1: { light: paletteColors.gray90, diff --git a/Client/src/Utils/Theme/darkTheme.js b/Client/src/Utils/Theme/darkTheme.js index ea1674ccd..5b47b3963 100644 --- a/Client/src/Utils/Theme/darkTheme.js +++ b/Client/src/Utils/Theme/darkTheme.js @@ -17,51 +17,43 @@ const background = { }; const border = { light: "#27272a", dark: "#36363e" }; -const { gradient } = colors; -/* const gradient = { - color1: "#09090b", - color2: "#0c0c0e", - color3: "#0f0f11", - color4: "#111113", - color5: "#131315", -}; */ +const { + primary, + secondary, + success, + error, + warning, + gradient: { + color1: { dark: color1 }, + color2: { dark: color2 }, + color3: { dark: color3 }, + color4: { dark: color4 }, + color5: { dark: color5 }, + }, +} = colors; const darkTheme = createTheme({ ...baseTheme, palette: { - primary: { main: "#1570ef" }, - secondary: { main: "#2D2D33" }, - text: text, - background: background, - border: border, - info: { - text: text.primary, - main: text.secondary, - bg: background.main, - light: background.main, - border: border.light, - }, - gradient, + primary: { main: primary.main.dark }, + secondary: { main: secondary.main.dark }, success: { - text: "#079455", - main: "#45bb7a", - light: "#1c4428", - bg: "#12261e", + main: success.main.dark, + contrastText: success.contrastText.dark, + light: success.light.dark, + dark: success.dark.dark, }, error: { - text: "#f04438", - main: "#d32f2f", - light: "#542426", - bg: "#301a1f", - dark: "#932020", - border: "#f04438", + main: error.main.dark, + contrastText: error.contrastText.dark, + light: error.light.dark, + dark: error.dark.dark, }, warning: { - text: "#e88c30", - main: "#FF9F00", - light: "#624711", - bg: "#262115", - border: "#e88c30", + main: warning.main.dark, + light: warning.light.dark, + contrastText: warning.contrastText.dark, + dark: warning.dark.dark, }, percentage: { uptimePoor: "#d32f2f", @@ -78,6 +70,23 @@ const darkTheme = createTheme({ grid: "#454546", autofill: "#2d2d33", }, + gradient: { + color1, + color2, + color3, + color4, + color5, + }, + text: text, + background: background, + border: border, + info: { + text: text.primary, + main: text.secondary, + bg: background.main, + light: background.main, + border: border.light, + }, }, }); diff --git a/Client/src/Utils/Theme/lightTheme.js b/Client/src/Utils/Theme/lightTheme.js index 1f88d0696..c8229ad1e 100644 --- a/Client/src/Utils/Theme/lightTheme.js +++ b/Client/src/Utils/Theme/lightTheme.js @@ -15,52 +15,49 @@ const background = { accent: "#f9fafb", }; -const { gradient } = colors; -/* const gradient = { - color1: "#fcfcfd", - color2: "#fdfcfd", - color3: "#fdfdfd", - color4: "#fefdfe", - color5: "#fefefe", -}; */ - const border = { light: "#eaecf0", dark: "#d0d5dd" }; +const { + primary, + secondary, + success, + error, + warning, + gradient: { + color1: { light: color1 }, + color2: { light: color2 }, + color3: { light: color3 }, + color4: { light: color4 }, + color5: { light: color5 }, + }, +} = colors; + const lightTheme = createTheme({ ...baseTheme, palette: { - primary: { main: "#1570EF" }, - secondary: { main: "#F4F4F4", dark: "#e3e3e3", contrastText: "#475467" }, - text: text, - background: background, - border: border, - info: { - text: text.primary, - main: text.tertiary, - bg: background.main, - light: background.main, - border: border.dark, + primary: { main: primary.main.light }, + secondary: { + main: secondary.main.light, + dark: secondary.dark.light, + contrastText: secondary.constrastText.light, }, - gradient, success: { - text: "#079455", - main: "#17b26a", - light: "#d4f4e1", - bg: "#ecfdf3", + main: success.main.light, + contrastText: success.contrastText.light, + light: success.light.light, + dark: success.dark.light, }, error: { - text: "#f04438", - main: "#d32f2f", - light: "#fbd1d1", - bg: "#f9eced", - border: "#f04438", + main: error.main.light, + contrastText: error.contrastText.light, + light: error.light.light, + dark: error.dark.light, }, warning: { - text: "#DC6803", - main: "#fdb022", - light: "#ffecbc", - bg: "#fef8ea", - border: "#fec84b", + main: warning.main.light, + light: warning.light.light, + contrastText: warning.contrastText.light, + dark: warning.dark.light, }, percentage: { uptimePoor: "#d32f2f", @@ -77,6 +74,23 @@ const lightTheme = createTheme({ grid: "#a2a3a3", autofill: "#e8f0fe", }, + gradient: { + color1, + color2, + color3, + color4, + color5, + }, + text: text, + background: background, + border: border, + info: { + text: text.primary, + main: text.tertiary, + bg: background.main, + light: background.main, + border: border.dark, + }, }, }); From 98fb77aa3d5fdb9dd86e8fdc6c17264a69e49c1f Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Tue, 12 Nov 2024 07:36:08 +0800 Subject: [PATCH 07/49] Update tests for JobQUeue and StatusService after chanages to hardware module and JobQueue --- Server/tests/services/jobQueue.test.js | 8 ++++++++ Server/tests/services/statusService.test.js | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Server/tests/services/jobQueue.test.js b/Server/tests/services/jobQueue.test.js index bc798ff02..a78f9bdb9 100644 --- a/Server/tests/services/jobQueue.test.js +++ b/Server/tests/services/jobQueue.test.js @@ -30,6 +30,14 @@ class QueueStub { async getJobs() { return this.jobs; } + + async pause() { + return true; + } + + async obliterate() { + return true; + } } class WorkerStub { diff --git a/Server/tests/services/statusService.test.js b/Server/tests/services/statusService.test.js index 432f8c20d..7330ab57f 100644 --- a/Server/tests/services/statusService.test.js +++ b/Server/tests/services/statusService.test.js @@ -182,7 +182,7 @@ describe("StatusService", () => { responseTime: 100, code: 200, message: "Test message", - payload: { cpu: "cpu", memory: "memory", disk: "disk", host: "host" }, + payload: { data: { cpu: "cpu", memory: "memory", disk: "disk", host: "host" } }, }); expect(check.monitorId).to.equal("test"); expect(check.status).to.be.true; From 6761056368a88a3cdea7f469c210100074a23bdc Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Tue, 12 Nov 2024 07:55:08 +0800 Subject: [PATCH 08/49] Add tests for hardwareCheckModule --- Server/tests/db/hardwareCheckModule.test.js | 73 +++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 Server/tests/db/hardwareCheckModule.test.js diff --git a/Server/tests/db/hardwareCheckModule.test.js b/Server/tests/db/hardwareCheckModule.test.js new file mode 100644 index 000000000..530f5f4f8 --- /dev/null +++ b/Server/tests/db/hardwareCheckModule.test.js @@ -0,0 +1,73 @@ +import sinon from "sinon"; +import HardwareCheck from "../../db/models/HardwareCheck.js"; +import { createHardwareCheck } from "../../db/mongo/modules/hardwareCheckModule.js"; + +const mockHardwareCheck = { + data: { + cpu: { + physical_core: 4, + logical_core: 8, + frequency: 4800, + current_frequency: 1411, + temperature: [45, 50, 46, 47, 45, 50, 46, 47], + free_percent: 0.8552990910595134, + usage_percent: 0.14470090894048657, + }, + memory: { + total_bytes: 16467628032, + available_bytes: 7895044096, + used_bytes: 6599561216, + usage_percent: 0.4008, + }, + disk: [ + { + read_speed_bytes: null, + write_speed_bytes: null, + total_bytes: 931258499072, + free_bytes: 737097256960, + usage_percent: 0.1661, + }, + ], + host: { + os: "linux", + platform: "ubuntu", + kernel_version: "6.8.0-48-generic", + }, + }, + errors: [ + { + metric: ["cpu.temperature"], + err: "unable to read CPU temperature", + }, + ], +}; + +describe("HardwareCheckModule", () => { + let hardwareCheckSaveStub; + beforeEach(() => { + hardwareCheckSaveStub = sinon.stub(HardwareCheck.prototype, "save"); + }); + + afterEach(() => { + sinon.restore(); + }); + + describe("createHardwareCheck", () => { + it("should return a hardware check", async () => { + hardwareCheckSaveStub.resolves(mockHardwareCheck); + const hardwareCheck = await createHardwareCheck({}); + expect(hardwareCheck).to.exist; + expect(hardwareCheck).to.deep.equal(mockHardwareCheck); + }); + it("should handle an error", async () => { + const err = new Error("test error"); + hardwareCheckSaveStub.rejects(err); + try { + await createHardwareCheck({}); + } catch (error) { + expect(error).to.exist; + expect(error).to.deep.equal(err); + } + }); + }); +}); From a22132621fbde4b49e0266e15c42ec51b8a75c16 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Tue, 12 Nov 2024 08:09:18 +0800 Subject: [PATCH 09/49] Remove unused DB method, add tests for pageSpeedCheckModule --- Server/db/mongo/MongoDB.js | 2 - .../db/mongo/modules/pageSpeedCheckModule.js | 21 +----- Server/tests/db/pageSpeedCheckModule.test.js | 65 +++++++++++++++++++ 3 files changed, 66 insertions(+), 22 deletions(-) create mode 100644 Server/tests/db/pageSpeedCheckModule.test.js diff --git a/Server/db/mongo/MongoDB.js b/Server/db/mongo/MongoDB.js index bab17c5ef..288aa83ad 100644 --- a/Server/db/mongo/MongoDB.js +++ b/Server/db/mongo/MongoDB.js @@ -118,7 +118,6 @@ import { import { createPageSpeedCheck, - getPageSpeedChecks, deletePageSpeedChecksByMonitorId, } from "./modules/pageSpeedCheckModule.js"; @@ -212,7 +211,6 @@ export default { updateChecksTTL, deleteMonitorsByUserId, createPageSpeedCheck, - getPageSpeedChecks, deletePageSpeedChecksByMonitorId, createHardwareCheck, createMaintenanceWindow, diff --git a/Server/db/mongo/modules/pageSpeedCheckModule.js b/Server/db/mongo/modules/pageSpeedCheckModule.js index 56dafa697..427893a96 100644 --- a/Server/db/mongo/modules/pageSpeedCheckModule.js +++ b/Server/db/mongo/modules/pageSpeedCheckModule.js @@ -25,25 +25,6 @@ const createPageSpeedCheck = async (pageSpeedCheckData) => { } }; -/** - * Get all PageSpeed checks for a monitor - * @async - * @param {string} monitorId - * @returns {Promise>} - * @throws {Error} - */ - -const getPageSpeedChecks = async (monitorId) => { - try { - const pageSpeedChecks = await PageSpeedCheck.find({ monitorId }); - return pageSpeedChecks; - } catch (error) { - error.service = SERVICE_NAME; - error.method = "getPageSpeedChecks"; - throw error; - } -}; - /** * Delete all PageSpeed checks for a monitor * @async @@ -63,4 +44,4 @@ const deletePageSpeedChecksByMonitorId = async (monitorId) => { } }; -export { createPageSpeedCheck, getPageSpeedChecks, deletePageSpeedChecksByMonitorId }; +export { createPageSpeedCheck, deletePageSpeedChecksByMonitorId }; diff --git a/Server/tests/db/pageSpeedCheckModule.test.js b/Server/tests/db/pageSpeedCheckModule.test.js new file mode 100644 index 000000000..ae6bf789c --- /dev/null +++ b/Server/tests/db/pageSpeedCheckModule.test.js @@ -0,0 +1,65 @@ +import sinon from "sinon"; +import PageSpeedCheck from "../../db/models/PageSpeedCheck.js"; +import { + createPageSpeedCheck, + deletePageSpeedChecksByMonitorId, +} from "../../db/mongo/modules/pageSpeedCheckModule.js"; + +const mockPageSpeedCheck = { + monitorId: "monitorId", + bestPractices: 1, + seo: 1, + performance: 1, +}; + +const mockDeletedResult = { deletedCount: 1 }; + +describe("pageSpeedCheckModule", () => { + let pageSpeedCheckSaveStub, pageSpeedCheckDeleteManyStub; + beforeEach(() => { + pageSpeedCheckSaveStub = sinon.stub(PageSpeedCheck.prototype, "save"); + pageSpeedCheckDeleteManyStub = sinon.stub(PageSpeedCheck, "deleteMany"); + }); + + afterEach(() => { + sinon.restore(); + }); + + describe("createPageSpeedCheck", () => { + it("should return a page speed check", async () => { + pageSpeedCheckSaveStub.resolves(mockPageSpeedCheck); + const pageSpeedCheck = await createPageSpeedCheck(mockPageSpeedCheck); + expect(pageSpeedCheck).to.deep.equal(mockPageSpeedCheck); + }); + + it("should handle an error", async () => { + const err = new Error("test error"); + pageSpeedCheckSaveStub.rejects(err); + try { + await expect(createPageSpeedCheck(mockPageSpeedCheck)); + } catch (error) { + expect(error).to.exist; + expect(error).to.deep.equal(err); + } + }); + }); + + describe("deletePageSpeedChecksByMonitorId", () => { + it("should return the number of deleted checks", async () => { + pageSpeedCheckDeleteManyStub.resolves(mockDeletedResult); + const result = await deletePageSpeedChecksByMonitorId("monitorId"); + expect(result).to.deep.equal(mockDeletedResult.deletedCount); + }); + + it("should handle an error", async () => { + const err = new Error("test error"); + pageSpeedCheckDeleteManyStub.rejects(err); + try { + await expect(deletePageSpeedChecksByMonitorId("monitorId")); + } catch (error) { + expect(error).to.exist; + expect(error).to.deep.equal(err); + } + }); + }); +}); From 5d853c7f92a159753cd37c751c1db072a7cad63c Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Tue, 12 Nov 2024 15:42:28 +0800 Subject: [PATCH 10/49] Add tests for recovery module --- Server/tests/db/recoveryModule.test.js | 171 +++++++++++++++++++++++++ 1 file changed, 171 insertions(+) create mode 100644 Server/tests/db/recoveryModule.test.js diff --git a/Server/tests/db/recoveryModule.test.js b/Server/tests/db/recoveryModule.test.js new file mode 100644 index 000000000..53da938ba --- /dev/null +++ b/Server/tests/db/recoveryModule.test.js @@ -0,0 +1,171 @@ +import sinon from "sinon"; +import RecoveryToken from "../../db/models/RecoveryToken.js"; +import User from "../../db/models/User.js"; +import { + requestRecoveryToken, + validateRecoveryToken, + resetPassword, +} from "../../db/mongo/modules/recoveryModule.js"; +import { errorMessages } from "../../utils/messages.js"; + +const mockRecoveryToken = { + email: "test@test.com", + token: "1234567890", +}; + +const mockUser = { + email: "test@test.com", + password: "oldPassword", +}; + +const mockUserWithoutPassword = { + email: "test@test.com", +}; + +// Create a query builder that logs +const createQueryChain = (finalResult, comparePasswordResult = false) => ({ + select: () => ({ + select: async () => { + if (finalResult === mockUser) { + // Return a new object with all required methods + return { + email: "test@test.com", + password: "oldPassword", + comparePassword: sinon.stub().resolves(comparePasswordResult), + save: sinon.stub().resolves(), + }; + } + return finalResult; + }, + }), + // Add methods to the top level too + comparePassword: sinon.stub().resolves(comparePasswordResult), + save: sinon.stub().resolves(), +}); + +describe("recoveryModule", () => { + let deleteManyStub, + saveStub, + findOneStub, + userCompareStub, + userSaveStub, + userFindOneStub; + let req, res; + beforeEach(() => { + req = { + body: { email: "test@test.com" }, + }; + deleteManyStub = sinon.stub(RecoveryToken, "deleteMany"); + saveStub = sinon.stub(RecoveryToken.prototype, "save"); + findOneStub = sinon.stub(RecoveryToken, "findOne"); + userCompareStub = sinon.stub(User.prototype, "comparePassword"); + userSaveStub = sinon.stub(User.prototype, "save"); + userFindOneStub = sinon.stub().resolves(); + }); + + afterEach(() => { + sinon.restore(); + }); + + describe("requestRecoveryToken", () => { + it("should return a recovery token", async () => { + deleteManyStub.resolves(); + saveStub.resolves(mockRecoveryToken); + const result = await requestRecoveryToken(req, res); + expect(result.email).to.equal(mockRecoveryToken.email); + }); + it("should handle an error", async () => { + const err = new Error("Test error"); + deleteManyStub.rejects(err); + try { + await requestRecoveryToken(req, res); + } catch (error) { + expect(error).to.exist; + expect(error).to.deep.equal(err); + } + }); + }); + describe("validateRecoveryToken", () => { + it("should return a recovery token if found", async () => { + findOneStub.resolves(mockRecoveryToken); + const result = await validateRecoveryToken(req, res); + expect(result).to.deep.equal(mockRecoveryToken); + }); + it("should thrown an error if a token is not found", async () => { + findOneStub.resolves(null); + try { + await validateRecoveryToken(req, res); + } catch (error) { + expect(error).to.exist; + expect(error.message).to.equal(errorMessages.DB_TOKEN_NOT_FOUND); + } + }); + it("should handle DB errors", async () => { + const err = new Error("Test error"); + findOneStub.rejects(err); + try { + await validateRecoveryToken(req, res); + } catch (error) { + expect(error).to.exist; + expect(error).to.deep.equal(err); + } + }); + }); + + describe("resetPassword", () => { + beforeEach(() => { + req.body = { + password: "test", + newPassword: "test1", + }; + }); + + afterEach(() => { + sinon.restore(); + }); + + it("should thrown an error if a recovery token is not found", async () => { + findOneStub.resolves(null); + try { + await resetPassword(req, res); + } catch (error) { + expect(error).to.exist; + expect(error.message).to.equal(errorMessages.DB_TOKEN_NOT_FOUND); + } + }); + it("should throw an error if a user is not found", async () => { + findOneStub.resolves(mockRecoveryToken); + userFindOneStub = sinon.stub(User, "findOne").resolves(null); + try { + await resetPassword(req, res); + } catch (error) { + expect(error).to.exist; + expect(error.message).to.equal(errorMessages.DB_USER_NOT_FOUND); + } + }); + it("should throw an error if the passwords match", async () => { + findOneStub.resolves(mockRecoveryToken); + saveStub.resolves(); + userFindOneStub = sinon + .stub(User, "findOne") + .returns(createQueryChain(mockUser, true)); + try { + await resetPassword(req, res); + } catch (error) { + expect(error).to.exist; + expect(error.message).to.equal(errorMessages.DB_RESET_PASSWORD_BAD_MATCH); + } + }); + it("should return a user without password if successful", async () => { + findOneStub.resolves(mockRecoveryToken); + saveStub.resolves(); + userFindOneStub = sinon + .stub(User, "findOne") + .returns(createQueryChain(mockUser)) // First call will resolve to mockUser + .onSecondCall() + .returns(createQueryChain(mockUserWithoutPassword)); + const result = await resetPassword(req, res); + expect(result).to.deep.equal(mockUserWithoutPassword); + }); + }); +}); From 646de4f4aed1091edfa85e7ba6721e2628252ca2 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Tue, 12 Nov 2024 15:54:34 +0800 Subject: [PATCH 11/49] Add tests for settings module --- Server/tests/db/settingsModule.test.js | 54 ++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 Server/tests/db/settingsModule.test.js diff --git a/Server/tests/db/settingsModule.test.js b/Server/tests/db/settingsModule.test.js new file mode 100644 index 000000000..39bc8997d --- /dev/null +++ b/Server/tests/db/settingsModule.test.js @@ -0,0 +1,54 @@ +import sinon from "sinon"; +import { + getAppSettings, + updateAppSettings, +} from "../../db/mongo/modules/settingsModule.js"; +import AppSettings from "../../db/models/AppSettings.js"; + +const mockAppSettings = { + appName: "Test App", +}; + +describe("SettingsModule", () => { + let appSettingsFindOneStub, appSettingsFindOneAndUpdateStub; + beforeEach(() => { + appSettingsFindOneStub = sinon.stub(AppSettings, "findOne"); + appSettingsFindOneAndUpdateStub = sinon.stub(AppSettings, "findOneAndUpdate"); + }); + afterEach(() => { + sinon.restore(); + }); + + describe("getAppSettings", () => { + it("should return app settings", async () => { + appSettingsFindOneStub.resolves(mockAppSettings); + const result = await getAppSettings(); + expect(result).to.deep.equal(mockAppSettings); + }); + it("should handle an error", async () => { + const err = new Error("Test error"); + appSettingsFindOneStub.throws(err); + try { + await getAppSettings(); + } catch (error) { + expect(error).to.deep.equal(err); + } + }); + }); + describe("updateAppSettings", () => { + it("should update app settings", async () => { + appSettingsFindOneAndUpdateStub.resolves(mockAppSettings); + const result = await updateAppSettings(mockAppSettings); + expect(result).to.deep.equal(mockAppSettings); + }); + it("should handle an error", async () => { + const err = new Error("Test error"); + appSettingsFindOneAndUpdateStub.throws(err); + try { + await updateAppSettings(mockAppSettings); + } catch (error) { + expect(error).to.deep.equal(err); + } + }); + }); +}); From 57cad8d31a9183b4434d7b4c2ed771555107c978 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Tue, 12 Nov 2024 16:16:20 +0800 Subject: [PATCH 12/49] Inject generateAvatarImage into insertUser --- Server/db/mongo/modules/userModule.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/db/mongo/modules/userModule.js b/Server/db/mongo/modules/userModule.js index 69aa52b60..7737d848e 100644 --- a/Server/db/mongo/modules/userModule.js +++ b/Server/db/mongo/modules/userModule.js @@ -15,7 +15,7 @@ const SERVICE_NAME = "userModule"; * @returns {Promise} * @throws {Error} */ -const insertUser = async (userData, imageFile) => { +const insertUser = async (userData, imageFile, GenerateAvatarImage) => { try { if (imageFile) { // 1. Save the full size image From d9812a446b7daf94c444dcb47669592ab37987c9 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Tue, 12 Nov 2024 16:42:49 +0800 Subject: [PATCH 13/49] update function dependency injection --- Server/db/mongo/modules/userModule.js | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/Server/db/mongo/modules/userModule.js b/Server/db/mongo/modules/userModule.js index 7737d848e..f86c6e28b 100644 --- a/Server/db/mongo/modules/userModule.js +++ b/Server/db/mongo/modules/userModule.js @@ -15,7 +15,11 @@ const SERVICE_NAME = "userModule"; * @returns {Promise} * @throws {Error} */ -const insertUser = async (userData, imageFile, GenerateAvatarImage) => { +const insertUser = async ( + userData, + imageFile, + generateAvatarImage = GenerateAvatarImage +) => { try { if (imageFile) { // 1. Save the full size image @@ -25,7 +29,7 @@ const insertUser = async (userData, imageFile, GenerateAvatarImage) => { }; // 2. Get the avatar sized image - const avatar = await GenerateAvatarImage(imageFile); + const avatar = await generateAvatarImage(imageFile); userData.avatarImage = avatar; } @@ -90,7 +94,12 @@ const getUserByEmail = async (email) => { * @throws {Error} */ -const updateUser = async (req, res) => { +const updateUser = async ( + req, + res, + parseBoolean = ParseBoolean, + generateAvatarImage = GenerateAvatarImage +) => { const candidateUserId = req.params.userId; try { const candidateUser = { ...req.body }; @@ -98,7 +107,7 @@ const updateUser = async (req, res) => { // Handle profile image // ****************************************** - if (ParseBoolean(candidateUser.deleteProfileImage) === true) { + if (parseBoolean(candidateUser.deleteProfileImage) === true) { candidateUser.profileImage = null; candidateUser.avatarImage = null; } else if (req.file) { @@ -108,8 +117,8 @@ const updateUser = async (req, res) => { contentType: req.file.mimetype, }; - // 2. Get the avaatar sized image - const avatar = await GenerateAvatarImage(req.file); + // 2. Get the avatar sized image + const avatar = await generateAvatarImage(req.file); candidateUser.avatarImage = avatar; } @@ -164,6 +173,7 @@ const deleteUser = async (userId) => { const deleteTeam = async (teamId) => { try { await TeamModel.findByIdAndDelete(teamId); + return true; } catch (error) { error.service = SERVICE_NAME; error.method = "deleteTeam"; From 4c7c4d35782be511a55a84b63d458b3a00ab33f2 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Tue, 12 Nov 2024 16:44:01 +0800 Subject: [PATCH 14/49] Add return type for deleteAllOtherUsers --- Server/db/mongo/modules/userModule.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Server/db/mongo/modules/userModule.js b/Server/db/mongo/modules/userModule.js index f86c6e28b..5b951ff64 100644 --- a/Server/db/mongo/modules/userModule.js +++ b/Server/db/mongo/modules/userModule.js @@ -184,6 +184,7 @@ const deleteTeam = async (teamId) => { const deleteAllOtherUsers = async () => { try { await UserModel.deleteMany({ role: { $ne: "superadmin" } }); + return true; } catch (error) { error.service = SERVICE_NAME; error.method = "deleteAllOtherUsers"; From 1733918f0871e1e4185df5ba8dd18881742c6921 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Tue, 12 Nov 2024 16:48:20 +0800 Subject: [PATCH 15/49] Add tests for user module --- Server/tests/db/userModule.test.js | 286 +++++++++++++++++++++++++++++ 1 file changed, 286 insertions(+) create mode 100644 Server/tests/db/userModule.test.js diff --git a/Server/tests/db/userModule.test.js b/Server/tests/db/userModule.test.js new file mode 100644 index 000000000..8f9fd4dc2 --- /dev/null +++ b/Server/tests/db/userModule.test.js @@ -0,0 +1,286 @@ +import sinon from "sinon"; +import UserModel from "../../db/models/User.js"; +import TeamModel from "../../db/models/Team.js"; +import { + insertUser, + getUserByEmail, + updateUser, + deleteUser, + deleteTeam, + deleteAllOtherUsers, + getAllUsers, + logoutUser, +} from "../../db/mongo/modules/userModule.js"; +import { errorMessages } from "../../utils/messages.js"; + +const mockUser = { + email: "test@test.com", + password: "password", + role: ["user"], +}; +const mockSuperUser = { + email: "test@test.com", + password: "password", + role: ["superadmin"], +}; +const imageFile = { + image: 1, +}; + +describe("userModule", () => { + let teamSaveStub, + teamFindByIdAndDeleteStub, + userSaveStub, + userFindStub, + userFindOneStub, + userFindByIdAndUpdateStub, + userFindByIdAndDeleteStub, + userDeleteManyStub, + userUpdateOneStub, + generateAvatarImageStub, + parseBooleanStub; + beforeEach(() => { + teamSaveStub = sinon.stub(TeamModel.prototype, "save"); + teamFindByIdAndDeleteStub = sinon.stub(TeamModel, "findByIdAndDelete"); + userSaveStub = sinon.stub(UserModel.prototype, "save"); + userFindStub = sinon.stub(UserModel, "find"); + userFindOneStub = sinon.stub(UserModel, "findOne"); + userFindByIdAndUpdateStub = sinon.stub(UserModel, "findByIdAndUpdate"); + userFindByIdAndDeleteStub = sinon.stub(UserModel, "findByIdAndDelete"); + userDeleteManyStub = sinon.stub(UserModel, "deleteMany"); + userUpdateOneStub = sinon.stub(UserModel, "updateOne"); + generateAvatarImageStub = sinon.stub().resolves({ image: 2 }); + parseBooleanStub = sinon.stub().returns(true); + }); + + afterEach(() => { + sinon.restore(); + }); + + describe("insertUser", () => { + it("should insert a regular user", async () => { + userSaveStub.resolves(mockUser); + userFindOneStub.returns({ + select: sinon.stub().returns({ + select: sinon.stub().resolves(mockUser), + }), + }); + const result = await insertUser(mockUser, imageFile, generateAvatarImageStub); + expect(result).to.deep.equal(mockUser); + }); + it("should insert a superadmin user", async () => { + userSaveStub.resolves(mockSuperUser); + userFindOneStub.returns({ + select: sinon.stub().returns({ + select: sinon.stub().resolves(mockSuperUser), + }), + }); + const result = await insertUser(mockSuperUser, imageFile, generateAvatarImageStub); + expect(result).to.deep.equal(mockSuperUser); + }); + it("should handle an error", async () => { + const err = new Error("test error"); + userSaveStub.rejects(err); + try { + await insertUser(mockUser, imageFile, generateAvatarImageStub); + } catch (error) { + expect(error).to.exist; + expect(error).to.deep.equal(err); + } + }); + it("should handle a duplicate key error", async () => { + const err = new Error("test error"); + err.code = 11000; + userSaveStub.rejects(err); + try { + await insertUser(mockUser, imageFile, generateAvatarImageStub); + } catch (error) { + expect(error).to.exist; + expect(error).to.deep.equal(err); + } + }); + }); + describe("getUserByEmail", () => { + it("should return a user", async () => { + userFindOneStub.returns({ + select: sinon.stub().resolves(mockUser), + }); + const result = await getUserByEmail(mockUser.email); + expect(result).to.deep.equal(mockUser); + }); + }); + describe("getUserByEmail", () => { + it("throw an error if a user is not found", async () => { + userFindOneStub.returns({ + select: sinon.stub().resolves(null), + }); + try { + await getUserByEmail(mockUser.email); + } catch (error) { + expect(error.message).to.equal(errorMessages.DB_USER_NOT_FOUND); + } + }); + }); + describe("updateUser", () => { + let req, res; + beforeEach(() => { + req = { + params: { + userId: "testId", + }, + body: { + deleteProfileImage: "false", + email: "test@test.com", + }, + file: { + buffer: "test", + mimetype: "test", + }, + }; + res = {}; + }); + + afterEach(() => {}); + it("should update a user", async () => { + parseBooleanStub.returns(false); + userFindByIdAndUpdateStub.returns({ + select: sinon.stub().returns({ + select: sinon.stub().resolves(mockUser), + }), + }); + const result = await updateUser( + req, + res, + parseBooleanStub, + generateAvatarImageStub + ); + expect(result).to.deep.equal(mockUser); + }); + it("should delete a user profile image", async () => { + req.body.deleteProfileImage = "true"; + userFindByIdAndUpdateStub.returns({ + select: sinon.stub().returns({ + select: sinon.stub().resolves(mockUser), + }), + }); + const result = await updateUser( + req, + res, + parseBooleanStub, + generateAvatarImageStub + ); + expect(result).to.deep.equal(mockUser); + }); + it("should handle an error", async () => { + const err = new Error("test error"); + userFindByIdAndUpdateStub.throws(err); + try { + await updateUser(req, res, parseBooleanStub, generateAvatarImageStub); + } catch (error) { + expect(error).to.exist; + expect(error).to.deep.equal(err); + } + }); + }); + describe("deleteUser", async () => { + it("should return a deleted user", async () => { + userFindByIdAndDeleteStub.resolves(mockUser); + const result = await deleteUser("testId"); + expect(result).to.deep.equal(mockUser); + }); + it("should throw an error if a user is not found", async () => { + try { + await deleteUser("testId"); + } catch (error) { + expect(error).to.exist; + expect(error.message).to.equal(errorMessages.DB_USER_NOT_FOUND); + } + }); + it("should handle an error", async () => { + const err = new Error("test error"); + userFindByIdAndDeleteStub.throws(err); + try { + await deleteUser("testId"); + } catch (error) { + expect(error).to.exist; + expect(error).to.deep.equal(err); + } + }); + }); + + describe("deleteTeam", () => { + it("should return true if team deleted", async () => { + teamFindByIdAndDeleteStub.resolves(); + const result = await deleteTeam("testId"); + expect(result).to.equal(true); + }); + it("should handle an error", async () => { + const err = new Error("test error"); + teamFindByIdAndDeleteStub.throws(err); + try { + await deleteTeam("testId"); + } catch (error) { + expect(error).to.exist; + expect(error).to.deep.equal(err); + } + }); + }); + + describe("deleteAllOtherUsers", () => { + it("should return true if all other users deleted", async () => { + userDeleteManyStub.resolves(true); + const result = await deleteAllOtherUsers(); + expect(result).to.equal(true); + }); + it("should handle an error", async () => { + const err = new Error("test error"); + userDeleteManyStub.throws(err); + try { + await deleteAllOtherUsers(); + } catch (error) { + expect(error).to.exist; + expect(error).to.deep.equal(err); + } + }); + }); + + describe("getAllUsers", () => { + it("should return all users", async () => { + userFindStub.returns({ + select: sinon.stub().returns({ + select: sinon.stub().resolves([mockUser]), + }), + }); + const result = await getAllUsers(); + expect(result).to.deep.equal([mockUser]); + }); + it("should handle an error", async () => { + const err = new Error("test error"); + userFindStub.throws(err); + try { + await getAllUsers(); + } catch (error) { + expect(error).to.exist; + expect(error).to.deep.equal(err); + } + }); + }); + + describe("logoutUser", async () => { + it("should return true if user logged out", async () => { + userUpdateOneStub.resolves(true); + const result = await logoutUser("testId"); + expect(result).to.equal(true); + }); + it("should handle an error", async () => { + const err = new Error("test error"); + userUpdateOneStub.throws(err); + try { + await logoutUser("testId"); + } catch (error) { + expect(error).to.exist; + expect(error).to.deep.equal(err); + } + }); + }); +}); From d9fdd5bd30c1274321dc371cb2950a209a2f69c2 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Tue, 12 Nov 2024 17:04:06 +0800 Subject: [PATCH 16/49] Add missing logger test case --- Server/tests/utils/logger.test.js | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/Server/tests/utils/logger.test.js b/Server/tests/utils/logger.test.js index 154e2e462..c71bce80a 100644 --- a/Server/tests/utils/logger.test.js +++ b/Server/tests/utils/logger.test.js @@ -46,6 +46,26 @@ describe("Logger", () => { const logger = new Logger(); logger.logger.info(logMessage); }); + it("should convert details to JSON string if it is an object", function () { + const logDetails = { key: "value" }; + const expectedDetails = JSON.stringify(logDetails, null, 2); // Removed .s + + createLoggerStub.callsFake((config) => { + const consoleTransport = config.transports[0]; + const logEntry = { + level: "info", + message: "", // Add empty message since it's required + details: logDetails, + timestamp: new Date().toISOString(), + }; + const formattedMessage = consoleTransport.format.transform(logEntry); + expect(formattedMessage).to.include(expectedDetails); + return { info: sinon.spy() }; // Changed to return info method + }); + + const logger = new Logger(); + logger.logger.info("", { details: logDetails }); // Updated to pass details properly + }); }); describe("info", () => { From aa1b73c3054761dd765735d8932a08e794a9c1a5 Mon Sep 17 00:00:00 2001 From: Caio Cabral Date: Tue, 12 Nov 2024 09:54:19 -0500 Subject: [PATCH 17/49] feat: finishing extracting color palette --- Client/src/Utils/Theme/constants.js | 132 +++++++++++++++++++++++---- Client/src/Utils/Theme/darkTheme.js | 76 ++++++++------- Client/src/Utils/Theme/lightTheme.js | 81 +++++++++------- 3 files changed, 207 insertions(+), 82 deletions(-) diff --git a/Client/src/Utils/Theme/constants.js b/Client/src/Utils/Theme/constants.js index ceb138fc3..a27e65921 100644 --- a/Client/src/Utils/Theme/constants.js +++ b/Client/src/Utils/Theme/constants.js @@ -8,7 +8,9 @@ const typographyLevels = { xl: `${(typographyBase + 10) / 16}rem`, }; -/* This should not be here. INcorporate into color structure */ +/* This should not be here. Incorporate into color structure. + +Is is being exported to globalStyle*/ const paletteLight = { text: { primary: "#1c2130", @@ -19,7 +21,6 @@ const paletteLight = { }; /* TODO Expand this */ - const paletteColors = { white: "#FFFFFF", gray50: "#FEFEFE", @@ -27,18 +28,42 @@ const paletteColors = { gray70: "#FDFDFD", gray80: "#FDFCFD", gray90: "#FCFCFD", + gray95: "#FAFAFA", + gray97: "#F9FAFB", gray100: "#F4F4F4", + gray125: "#F2F4F7", + gray150: "#EAECF0", + gray180: "#E6E6E6", gray200: "#E3E3E3", + gray225: "#D6D9DD", + gray250: "#D0D5DD", + gray300: "#A2A3A3", + gray350: "#A1A1AA", + gray450: "#8E8E8F", + gray500: "#838C99", + gray600: "#454546", + gray750: "#36363E", gray800: "#2D2D33", + gray815: "#27272A", gray830: "#262115", + gray835: "#18181a", + gray840: "#151518", gray850: "#131315", gray860: "#111113", gray870: "#0F0F11", gray880: "#0C0C0E", gray890: "#09090B", black: "#000000", + blueGray20: "#E8F0FE", + blueGray40: "#E2EAF7", + blueGray150: "#667085", + blueGray200: "#475467", + blueGray400: "#344054", + blueGray900: "#1c2130", blueBlueWave: "#1570EF", - blue700: "#475467", + blue700: "#4E5BA6", + purple300: "#664EFF", + purple400: "#3A1BFF", green20: "#ECFDF3", green50: "#D4F4E1", green150: "#45BB7A", @@ -54,7 +79,6 @@ const paletteColors = { red800: "#301A1F", orange50: "#FEF8EA", orange100: "#FFECBC", - orange200: "#FEC84B", orange300: "#FDB022", orange400: "#FF9F00", orange500: "#E88C30", @@ -81,7 +105,7 @@ const semanticColors = { //TODO we dont have secondary dark for dark mode }, constrastText: { - light: paletteColors.blue700, + light: paletteColors.blueGray200, //TODO we dont have secondary contrastText for dark mode }, }, @@ -114,7 +138,7 @@ const semanticColors = { contrastText: { //TODO contrasttext semantically should be something that contrasts with the main light: paletteColors.red200, - dark: paletteColors.red200, + dark: paletteColors.red50, }, light: { light: paletteColors.red100, @@ -130,24 +154,20 @@ const semanticColors = { light: paletteColors.orange300, dark: paletteColors.orange400, }, - text: { - light: paletteColors.orange600, - dark: paletteColors.orange500, - }, light: { light: paletteColors.orange100, dark: paletteColors.orange800, }, - bg: { + contrastText: { + light: paletteColors.orange600, + dark: paletteColors.orange500, + }, + dark: { light: paletteColors.orange50, dark: paletteColors.gray830, }, - border: { - light: paletteColors.orange200, - dark: paletteColors.orange500, - }, }, - + /* From this part on, try to create semantic structure, not feature based structure */ gradient: { color1: { light: paletteColors.gray90, @@ -170,5 +190,85 @@ const semanticColors = { dark: paletteColors.gray850, }, }, + background: { + main: { + light: paletteColors.white, + dark: paletteColors.gray840, + }, + alt: { + light: paletteColors.gray90, + dark: paletteColors.gray890, + }, + fill: { + light: paletteColors.gray100, + dark: paletteColors.gray800, + }, + accent: { + light: paletteColors.gray97, + dark: paletteColors.gray835, + }, + }, + text: { + primary: { + light: paletteColors.blueGray900, + dark: paletteColors.gray95, + }, + secondary: { + light: paletteColors.blueGray400, + dark: paletteColors.gray180, + }, + tertiary: { + light: paletteColors.blueGray200, + dark: paletteColors.gray350, + }, + accent: { + light: paletteColors.gray500, + dark: paletteColors.gray450, + }, + }, + border: { + light: { + light: paletteColors.gray150, + dark: paletteColors.gray815, + }, + dark: { + light: paletteColors.gray250, + dark: paletteColors.gray750, + }, + }, + percentage: { + /* uptimeFair: { + light: paletteColors. + } */ + }, + unresolved: { + main: { + light: paletteColors.blue700, + dark: paletteColors.purple300, + }, + light: { + light: paletteColors.blueGray40, + dark: paletteColors.purple400, + }, + bg: { + light: paletteColors.gray125, + dark: paletteColors.gray125, + }, + }, + other: { + icon: { + light: paletteColors.blueGray150, + }, + line: { + light: paletteColors.gray225, + }, + grid: { + light: paletteColors.gray300, + dark: paletteColors.gray600, + }, + autofill: { + light: paletteColors.blueGray20, + }, + }, }; export { typographyLevels, paletteLight, semanticColors as colors }; diff --git a/Client/src/Utils/Theme/darkTheme.js b/Client/src/Utils/Theme/darkTheme.js index 5b47b3963..f5948217d 100644 --- a/Client/src/Utils/Theme/darkTheme.js +++ b/Client/src/Utils/Theme/darkTheme.js @@ -2,21 +2,6 @@ import { createTheme } from "@mui/material"; import { baseTheme } from "./globalTheme"; import { colors } from "./constants"; -const text = { - primary: "#fafafa", - secondary: "#e6e6e6", - tertiary: "#a1a1aa", - accent: "#8e8e8f", - disabled: "rgba(172, 172, 172, 0.3)", -}; -const background = { - main: "#151518", - alt: "#09090b", - fill: "#2D2D33", - accent: "#18181a", -}; -const border = { light: "#27272a", dark: "#36363e" }; - const { primary, secondary, @@ -30,6 +15,11 @@ const { color4: { dark: color4 }, color5: { dark: color5 }, }, + background, + text, + border, + unresolved, + other, } = colors; const darkTheme = createTheme({ @@ -55,20 +45,25 @@ const darkTheme = createTheme({ contrastText: warning.contrastText.dark, dark: warning.dark.dark, }, + /* From this part on, try to create semantic structure, not feature based structure */ percentage: { - uptimePoor: "#d32f2f", - uptimeFair: "#e88c30", - uptimeGood: "#ffd600", - uptimeExcellent: "#079455", + uptimePoor: error.main.dark, + uptimeFair: warning.contrastText.dark, + uptimeGood: warning.main.dark /* Change for a success color? ?*/, + uptimeExcellent: success.contrastText.light, }, - unresolved: { main: "#664eff", light: "#3a1bff", bg: "#f2f4f7" }, - divider: border.light, + unresolved: { + main: unresolved.main.dark, + light: unresolved.light.dark, + bg: unresolved.bg.dark, + }, + divider: border.light.dark, other: { - icon: "#e6e6e6", - line: "#27272a", - fill: "#18181a", - grid: "#454546", - autofill: "#2d2d33", + icon: text.secondary.dark, + line: border.light.dark, + fill: background.accent.dark, + grid: other.grid.dark, + autofill: secondary.main.dark, }, gradient: { color1, @@ -77,15 +72,28 @@ const darkTheme = createTheme({ color4, color5, }, - text: text, - background: background, - border: border, + text: { + primary: text.primary.dark, + secondary: text.secondary.dark, + tertiary: text.tertiary.dark, + accent: text.accent.dark, + }, + background: { + main: background.main.dark, + alt: background.alt.dark, + fill: background.fill.dark, + accent: background.accent.dark, + }, + border: { + light: border.light.dark, + dark: border.dark.dark, + }, info: { - text: text.primary, - main: text.secondary, - bg: background.main, - light: background.main, - border: border.light, + text: text.primary.dark, + main: text.secondary.dark, + bg: background.main.dark, + light: background.main.dark, + border: border.light.dark, }, }, }); diff --git a/Client/src/Utils/Theme/lightTheme.js b/Client/src/Utils/Theme/lightTheme.js index c8229ad1e..7687d6cf0 100644 --- a/Client/src/Utils/Theme/lightTheme.js +++ b/Client/src/Utils/Theme/lightTheme.js @@ -2,20 +2,14 @@ import { createTheme } from "@mui/material"; import { baseTheme } from "./globalTheme"; import { colors } from "./constants"; -const text = { - primary: "#1c2130", - secondary: "#344054", - tertiary: "#475467", - accent: "#838c99", -}; -const background = { - main: "#FFFFFF", - alt: "#FCFCFD", - fill: "#F4F4F4", - accent: "#f9fafb", -}; +/* +Take things from global theme -const border = { light: "#eaecf0", dark: "#d0d5dd" }; +Next step: check if all here are being used. + +Discuss colors with Gorkem and rest of the team + +*/ const { primary, @@ -30,6 +24,11 @@ const { color4: { light: color4 }, color5: { light: color5 }, }, + background, + text, + border, + unresolved, + other, } = colors; const lightTheme = createTheme({ @@ -59,20 +58,25 @@ const lightTheme = createTheme({ contrastText: warning.contrastText.light, dark: warning.dark.light, }, + /* From this part on, try to create semantic structure, not feature based structure */ percentage: { - uptimePoor: "#d32f2f", - uptimeFair: "#ec8013", - uptimeGood: "#ffb800", - uptimeExcellent: "#079455", + uptimePoor: error.main.light, + uptimeFair: warning.contrastText.light, + uptimeGood: warning.main.light /* Change for a success color? */, + uptimeExcellent: success.contrastText.light, }, - unresolved: { main: "#4e5ba6", light: "#e2eaf7", bg: "#f2f4f7" }, - divider: border.light, + unresolved: { + main: unresolved.main.light, + light: unresolved.light.light, + bg: unresolved.bg.light, + }, + divider: border.light.light, other: { - icon: "#667085", - line: "#d6d9dd", - fill: "#e3e3e3", - grid: "#a2a3a3", - autofill: "#e8f0fe", + icon: other.icon.light, + line: other.line.light, + fill: secondary.dark.light, + grid: other.grid.light, + autofill: other.autofill.light, }, gradient: { color1, @@ -81,15 +85,28 @@ const lightTheme = createTheme({ color4, color5, }, - text: text, - background: background, - border: border, + text: { + primary: text.primary.light, + secondary: text.secondary.light, + tertiary: text.tertiary.light, + accent: text.accent.light, + }, + background: { + main: background.main.light, + alt: background.alt.light, + fill: background.fill.light, + accent: background.accent.light, + }, + border: { + light: border.light.light, + dark: border.dark.light, + }, info: { - text: text.primary, - main: text.tertiary, - bg: background.main, - light: background.main, - border: border.dark, + text: text.primary.light, + main: text.tertiary.light, + bg: background.main.light, + light: background.main.light, + border: border.dark.light, }, }, }); From 841bf7b5ed922cadac2c780e6187d8ab7d724c95 Mon Sep 17 00:00:00 2001 From: Caio Cabral Date: Tue, 12 Nov 2024 17:24:21 -0500 Subject: [PATCH 18/49] feat: removing colors from global theme --- Client/src/Utils/Theme/globalTheme.js | 84 +++++++++++---------------- 1 file changed, 35 insertions(+), 49 deletions(-) diff --git a/Client/src/Utils/Theme/globalTheme.js b/Client/src/Utils/Theme/globalTheme.js index f94e7cb37..796271fb0 100644 --- a/Client/src/Utils/Theme/globalTheme.js +++ b/Client/src/Utils/Theme/globalTheme.js @@ -3,27 +3,11 @@ import { paletteLight, typographyLevels } from "./constants"; const fontFamilyPrimary = '"Inter" , sans-serif'; // const fontFamilySecondary = '"Avenir", sans-serif'; +/* TODO take the color out from here */ const shadow = "0px 4px 24px -4px rgba(16, 24, 40, 0.08), 0px 3px 3px -3px rgba(16, 24, 40, 0.03)"; -const background = { - main: "#FFFFFF", - alt: "#FCFCFD", - fill: "#F4F4F4", - accent: "#f9fafb", -}; - -const border = { light: "#eaecf0", dark: "#d0d5dd" }; - -const text = { - primary: "#1c2130", - secondary: "#344054", - tertiary: "#475467", - accent: "#838c99", -}; - const baseTheme = { - /* TODO colors should not live here */ typography: { fontFamily: fontFamilyPrimary, fontSize: 14, @@ -111,27 +95,29 @@ const baseTheme = { }, MuiIconButton: { styleOverrides: { - root: { + root: ({ theme }) => ({ padding: 4, transition: "none", "&:hover": { - backgroundColor: background.fill, + backgroundColor: theme.palette.background.fill, }, - }, + }), }, }, MuiPaper: { styleOverrides: { - root: { - marginTop: 4, - padding: 0, - border: 1, - borderStyle: "solid", - borderColor: border.light, - borderRadius: 4, - boxShadow: shadow, - backgroundColor: background.main, - backgroundImage: "none", + root: ({ theme }) => { + return { + marginTop: 4, + padding: 0, + border: 1, + borderStyle: "solid", + borderColor: theme.palette.border.light, + borderRadius: 4, + boxShadow: shadow, + backgroundColor: theme.palette.background.main, + backgroundImage: "none", + }; }, }, }, @@ -151,61 +137,61 @@ const baseTheme = { }, MuiMenuItem: { styleOverrides: { - root: { + root: ({ theme }) => ({ borderRadius: 4, backgroundColor: "inherit", padding: "4px 6px", - color: text.secondary, + color: theme.palette.text.secondary, fontSize: 13, margin: 2, minWidth: 100, "&:hover, &.Mui-selected, &.Mui-selected:hover, &.Mui-selected.Mui-focusVisible": { - backgroundColor: background.fill, + backgroundColor: theme.palette.background.fill, }, - }, + }), }, }, MuiTableCell: { styleOverrides: { - root: { - borderBottomColor: border.light, - }, + root: ({ theme }) => ({ + borderBottomColor: theme.palette.border.light, + }), }, }, MuiTableHead: { styleOverrides: { - root: { - backgroundColor: background.accent, - }, + root: ({ theme }) => ({ + backgroundColor: theme.palette.background.accent, + }), }, }, MuiPagination: { styleOverrides: { - root: { - backgroundColor: background.main, + root: ({ theme }) => ({ + backgroundColor: theme.palette.background.main, border: 1, borderStyle: "solid", - borderColor: border.light, + borderColor: theme.palette.border.light, "& button": { - color: text.tertiary, + color: theme.palette.text.tertiary, borderRadius: 4, }, "& li:first-of-type button, & li:last-of-type button": { border: 1, borderStyle: "solid", - borderColor: border.light, + borderColor: theme.palette.border.light, }, - }, + }), }, }, MuiPaginationItem: { styleOverrides: { - root: { + root: ({ theme }) => ({ "&:not(.MuiPaginationItem-ellipsis):hover, &.Mui-selected": { - backgroundColor: background.fill, + backgroundColor: theme.palette.background.fill, }, - }, + }), }, }, MuiSkeleton: { From 2969ca3e350773ebfe67e91286a54059fba3424b Mon Sep 17 00:00:00 2001 From: Caio Cabral Date: Tue, 12 Nov 2024 19:10:48 -0500 Subject: [PATCH 19/49] feat: passing ppalette to global theme, and starting color cleanup --- Client/src/Pages/Monitors/Home/StatusBox.jsx | 2 +- Client/src/Utils/Theme/constants.js | 40 ++--- Client/src/Utils/Theme/darkTheme.js | 148 ++++++++--------- Client/src/Utils/Theme/globalTheme.js | 26 +-- Client/src/Utils/Theme/lightTheme.js | 161 ++++++++++--------- 5 files changed, 188 insertions(+), 189 deletions(-) diff --git a/Client/src/Pages/Monitors/Home/StatusBox.jsx b/Client/src/Pages/Monitors/Home/StatusBox.jsx index d84690432..a929c31f9 100644 --- a/Client/src/Pages/Monitors/Home/StatusBox.jsx +++ b/Client/src/Pages/Monitors/Home/StatusBox.jsx @@ -25,7 +25,7 @@ const StatusBox = ({ title, value }) => { ); } else if (title === "down") { - color = theme.palette.error.contrastText; + color = theme.palette.error.main; icon = ( diff --git a/Client/src/Utils/Theme/constants.js b/Client/src/Utils/Theme/constants.js index a27e65921..7beaaa20a 100644 --- a/Client/src/Utils/Theme/constants.js +++ b/Client/src/Utils/Theme/constants.js @@ -8,18 +8,6 @@ const typographyLevels = { xl: `${(typographyBase + 10) / 16}rem`, }; -/* This should not be here. Incorporate into color structure. - -Is is being exported to globalStyle*/ -const paletteLight = { - text: { - primary: "#1c2130", - secondary: "#344054", - tertiary: "#475467", - accent: "#838c99", - }, -}; - /* TODO Expand this */ const paletteColors = { white: "#FFFFFF", @@ -28,26 +16,26 @@ const paletteColors = { gray70: "#FDFDFD", gray80: "#FDFCFD", gray90: "#FCFCFD", - gray95: "#FAFAFA", - gray97: "#F9FAFB", + /* gray95: "#FAFAFA", + gray97: "#F9FAFB", */ gray100: "#F4F4F4", - gray125: "#F2F4F7", + /* gray125: "#F2F4F7", gray150: "#EAECF0", - gray180: "#E6E6E6", + gray180: "#E6E6E6", */ gray200: "#E3E3E3", - gray225: "#D6D9DD", - gray250: "#D0D5DD", + /* gray225: "#D6D9DD", + gray250: "#D0D5DD", */ gray300: "#A2A3A3", - gray350: "#A1A1AA", - gray450: "#8E8E8F", + /* gray350: "#A1A1AA", + gray450: "#8E8E8F", */ gray500: "#838C99", gray600: "#454546", gray750: "#36363E", gray800: "#2D2D33", - gray815: "#27272A", + /* gray815: "#27272A", gray830: "#262115", gray835: "#18181a", - gray840: "#151518", + gray840: "#151518", */ gray850: "#131315", gray860: "#111113", gray870: "#0F0F11", @@ -137,7 +125,7 @@ const semanticColors = { }, contrastText: { //TODO contrasttext semantically should be something that contrasts with the main - light: paletteColors.red200, + light: paletteColors.gray50, dark: paletteColors.red50, }, light: { @@ -204,14 +192,14 @@ const semanticColors = { dark: paletteColors.gray800, }, accent: { - light: paletteColors.gray97, + light: paletteColors.gray100, dark: paletteColors.gray835, }, }, text: { primary: { light: paletteColors.blueGray900, - dark: paletteColors.gray95, + dark: paletteColors.gray100, }, secondary: { light: paletteColors.blueGray400, @@ -271,4 +259,4 @@ const semanticColors = { }, }, }; -export { typographyLevels, paletteLight, semanticColors as colors }; +export { typographyLevels, semanticColors as colors }; diff --git a/Client/src/Utils/Theme/darkTheme.js b/Client/src/Utils/Theme/darkTheme.js index f5948217d..7dfb0d38a 100644 --- a/Client/src/Utils/Theme/darkTheme.js +++ b/Client/src/Utils/Theme/darkTheme.js @@ -22,80 +22,82 @@ const { other, } = colors; -const darkTheme = createTheme({ - ...baseTheme, - palette: { - primary: { main: primary.main.dark }, - secondary: { main: secondary.main.dark }, - success: { - main: success.main.dark, - contrastText: success.contrastText.dark, - light: success.light.dark, - dark: success.dark.dark, - }, - error: { - main: error.main.dark, - contrastText: error.contrastText.dark, - light: error.light.dark, - dark: error.dark.dark, - }, - warning: { - main: warning.main.dark, - light: warning.light.dark, - contrastText: warning.contrastText.dark, - dark: warning.dark.dark, - }, - /* From this part on, try to create semantic structure, not feature based structure */ - percentage: { - uptimePoor: error.main.dark, - uptimeFair: warning.contrastText.dark, - uptimeGood: warning.main.dark /* Change for a success color? ?*/, - uptimeExcellent: success.contrastText.light, - }, - unresolved: { - main: unresolved.main.dark, - light: unresolved.light.dark, - bg: unresolved.bg.dark, - }, - divider: border.light.dark, - other: { - icon: text.secondary.dark, - line: border.light.dark, - fill: background.accent.dark, - grid: other.grid.dark, - autofill: secondary.main.dark, - }, - gradient: { - color1, - color2, - color3, - color4, - color5, - }, - text: { - primary: text.primary.dark, - secondary: text.secondary.dark, - tertiary: text.tertiary.dark, - accent: text.accent.dark, - }, - background: { - main: background.main.dark, - alt: background.alt.dark, - fill: background.fill.dark, - accent: background.accent.dark, - }, - border: { - light: border.light.dark, - dark: border.dark.dark, - }, - info: { - text: text.primary.dark, - main: text.secondary.dark, - bg: background.main.dark, - light: background.main.dark, - border: border.light.dark, - }, +const palette = { + primary: { main: primary.main.dark }, + secondary: { main: secondary.main.dark }, + success: { + main: success.main.dark, + contrastText: success.contrastText.dark, + light: success.light.dark, + dark: success.dark.dark, }, + error: { + main: error.main.dark, + contrastText: error.contrastText.dark, + light: error.light.dark, + dark: error.dark.dark, + }, + warning: { + main: warning.main.dark, + light: warning.light.dark, + contrastText: warning.contrastText.dark, + dark: warning.dark.dark, + }, + /* From this part on, try to create semantic structure, not feature based structure */ + percentage: { + uptimePoor: error.main.dark, + uptimeFair: warning.contrastText.dark, + uptimeGood: warning.main.dark /* Change for a success color? ?*/, + uptimeExcellent: success.contrastText.light, + }, + unresolved: { + main: unresolved.main.dark, + light: unresolved.light.dark, + bg: unresolved.bg.dark, + }, + divider: border.light.dark, + other: { + icon: text.secondary.dark, + line: border.light.dark, + fill: background.accent.dark, + grid: other.grid.dark, + autofill: secondary.main.dark, + }, + gradient: { + color1, + color2, + color3, + color4, + color5, + }, + text: { + primary: text.primary.dark, + secondary: text.secondary.dark, + tertiary: text.tertiary.dark, + accent: text.accent.dark, + }, + background: { + main: background.main.dark, + alt: background.alt.dark, + fill: background.fill.dark, + accent: background.accent.dark, + }, + border: { + light: border.light.dark, + dark: border.dark.dark, + }, + info: { + text: text.primary.dark, + main: text.secondary.dark, + bg: background.main.dark, + light: background.main.dark, + border: border.light.dark, + }, +}; + +const darkTheme = createTheme({ + palette, + ...baseTheme(palette), }); export default darkTheme; diff --git a/Client/src/Utils/Theme/globalTheme.js b/Client/src/Utils/Theme/globalTheme.js index 796271fb0..7737d396e 100644 --- a/Client/src/Utils/Theme/globalTheme.js +++ b/Client/src/Utils/Theme/globalTheme.js @@ -1,4 +1,4 @@ -import { paletteLight, typographyLevels } from "./constants"; +import { typographyLevels } from "./constants"; const fontFamilyPrimary = '"Inter" , sans-serif'; // const fontFamilySecondary = '"Avenir", sans-serif'; @@ -7,28 +7,28 @@ const fontFamilyPrimary = '"Inter" , sans-serif'; const shadow = "0px 4px 24px -4px rgba(16, 24, 40, 0.08), 0px 3px 3px -3px rgba(16, 24, 40, 0.03)"; -const baseTheme = { +const baseTheme = (palette) => ({ typography: { fontFamily: fontFamilyPrimary, fontSize: 14, h1: { fontSize: typographyLevels.xl, - color: paletteLight.text.primary, + color: palette.text.primary, fontWeight: 500, }, h2: { fontSize: typographyLevels.l, - color: paletteLight.text.secondary, + color: palette.text.secondary, fontWeight: 400, }, body1: { fontSize: typographyLevels.m, - color: paletteLight.text.tertiary, + color: palette.text.tertiary, fontWeight: 400, }, body2: { fontSize: typographyLevels.s, - color: paletteLight.text.tertiary, + color: palette.text.tertiary, fontWeight: 400, }, }, @@ -36,16 +36,17 @@ const baseTheme = { chart: { header: { fontWeight: 400, - fill: paletteLight.text.tertiary, + fill: palette.text.tertiary, fontSize: typographyLevels.m, }, subheader: { fontWeight: 400, - fill: paletteLight.text.tertiary, + fill: palette.text.tertiary, fontSize: typographyLevels.xs, }, }, spacing: 2, + /* TODO All these should live inside of a component*/ components: { MuiButton: { defaultProps: { @@ -79,6 +80,13 @@ const baseTheme = { borderColor: theme.palette.border.light, }, }, + { + props: (props) => props.variant === "contained" && props.disabled, + style: { + backgroundColor: `${theme.palette.secondary.main} !important`, + color: `${theme.palette.secondary.contrastText} !important`, + }, + }, ], fontWeight: 400, borderRadius: 4, @@ -207,6 +215,6 @@ const baseTheme = { borderThick: 2, boxShadow: shadow, }, -}; +}); export { baseTheme }; diff --git a/Client/src/Utils/Theme/lightTheme.js b/Client/src/Utils/Theme/lightTheme.js index 7687d6cf0..f345b227b 100644 --- a/Client/src/Utils/Theme/lightTheme.js +++ b/Client/src/Utils/Theme/lightTheme.js @@ -3,12 +3,11 @@ import { baseTheme } from "./globalTheme"; import { colors } from "./constants"; /* -Take things from global theme - Next step: check if all here are being used. -Discuss colors with Gorkem and rest of the team +Check for Hex in code base +Check for px in codebase */ const { @@ -31,84 +30,86 @@ const { other, } = colors; -const lightTheme = createTheme({ - ...baseTheme, - palette: { - primary: { main: primary.main.light }, - secondary: { - main: secondary.main.light, - dark: secondary.dark.light, - contrastText: secondary.constrastText.light, - }, - success: { - main: success.main.light, - contrastText: success.contrastText.light, - light: success.light.light, - dark: success.dark.light, - }, - error: { - main: error.main.light, - contrastText: error.contrastText.light, - light: error.light.light, - dark: error.dark.light, - }, - warning: { - main: warning.main.light, - light: warning.light.light, - contrastText: warning.contrastText.light, - dark: warning.dark.light, - }, - /* From this part on, try to create semantic structure, not feature based structure */ - percentage: { - uptimePoor: error.main.light, - uptimeFair: warning.contrastText.light, - uptimeGood: warning.main.light /* Change for a success color? */, - uptimeExcellent: success.contrastText.light, - }, - unresolved: { - main: unresolved.main.light, - light: unresolved.light.light, - bg: unresolved.bg.light, - }, - divider: border.light.light, - other: { - icon: other.icon.light, - line: other.line.light, - fill: secondary.dark.light, - grid: other.grid.light, - autofill: other.autofill.light, - }, - gradient: { - color1, - color2, - color3, - color4, - color5, - }, - text: { - primary: text.primary.light, - secondary: text.secondary.light, - tertiary: text.tertiary.light, - accent: text.accent.light, - }, - background: { - main: background.main.light, - alt: background.alt.light, - fill: background.fill.light, - accent: background.accent.light, - }, - border: { - light: border.light.light, - dark: border.dark.light, - }, - info: { - text: text.primary.light, - main: text.tertiary.light, - bg: background.main.light, - light: background.main.light, - border: border.dark.light, - }, +const palette = { + primary: { main: primary.main.light }, + secondary: { + main: secondary.main.light, + dark: secondary.dark.light, + contrastText: secondary.constrastText.light, }, + success: { + main: success.main.light, + contrastText: success.contrastText.light, + light: success.light.light, + dark: success.dark.light, + }, + error: { + main: error.main.light, + contrastText: error.contrastText.light, + light: error.light.light, + dark: error.dark.light, + }, + warning: { + main: warning.main.light, + light: warning.light.light, + contrastText: warning.contrastText.light, + dark: warning.dark.light, + }, + /* From this part on, try to create semantic structure, not feature based structure */ + percentage: { + uptimePoor: error.main.light, + uptimeFair: warning.contrastText.light, + uptimeGood: warning.main.light /* Change for a success color? */, + uptimeExcellent: success.contrastText.light, + }, + unresolved: { + main: unresolved.main.light, + light: unresolved.light.light, + bg: unresolved.bg.light, + }, + divider: border.light.light, + other: { + icon: other.icon.light, + line: other.line.light, + fill: secondary.dark.light, + grid: other.grid.light, + autofill: other.autofill.light, + }, + gradient: { + color1, + color2, + color3, + color4, + color5, + }, + text: { + primary: text.primary.light, + secondary: text.secondary.light, + tertiary: text.tertiary.light, + accent: text.accent.light, + }, + background: { + main: background.main.light, + alt: background.alt.light, + fill: background.fill.light, + accent: background.accent.light, + }, + border: { + light: border.light.light, + dark: border.dark.light, + }, + info: { + text: text.primary.light, + main: text.tertiary.light, + bg: background.main.light, + light: background.main.light, + border: border.dark.light, + }, +}; + +const lightTheme = createTheme({ + palette, + ...baseTheme(palette), }); export default lightTheme; From 59cbd1178baa8173c144e50be653435016ee59ed Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Wed, 13 Nov 2024 10:17:00 +0800 Subject: [PATCH 20/49] Add docker type to monitor model --- Server/db/models/Monitor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/db/models/Monitor.js b/Server/db/models/Monitor.js index 111c48d03..d44566a97 100644 --- a/Server/db/models/Monitor.js +++ b/Server/db/models/Monitor.js @@ -28,7 +28,7 @@ const MonitorSchema = mongoose.Schema( type: { type: String, required: true, - enum: ["http", "ping", "pagespeed", "hardware"], + enum: ["http", "ping", "pagespeed", "hardware", "docker"], }, url: { type: String, From 41370c8d042a327bf95b55e16cd80d5d46a36c9b Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Wed, 13 Nov 2024 10:33:46 +0800 Subject: [PATCH 21/49] Add check to see if existing service/method exists to logger statement --- Server/service/jobQueue.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Server/service/jobQueue.js b/Server/service/jobQueue.js index aaab725e5..0eb265405 100644 --- a/Server/service/jobQueue.js +++ b/Server/service/jobQueue.js @@ -178,10 +178,11 @@ class JobQueue { prevStatus, }); } catch (error) { + console.log(error.service); this.logger.error({ message: error.message, - service: SERVICE_NAME, - method: "createWorker", + service: error.service ?? SERVICE_NAME, + method: error.method ?? "createJobHandler", details: `Error processing job ${job.id}: ${error.message}`, stack: error.stack, }); From 2f4189382ad66cd28421618a8792687725b82eb8 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Wed, 13 Nov 2024 10:34:05 +0800 Subject: [PATCH 22/49] Add hanlder for Docker types --- Server/service/networkService.js | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/Server/service/networkService.js b/Server/service/networkService.js index fa665e1ea..b7d76e475 100644 --- a/Server/service/networkService.js +++ b/Server/service/networkService.js @@ -13,6 +13,7 @@ class NetworkService { this.TYPE_HTTP = "http"; this.TYPE_PAGESPEED = "pagespeed"; this.TYPE_HARDWARE = "hardware"; + this.TYPE_DOCKER = "docker"; this.SERVICE_NAME = "NetworkService"; this.NETWORK_ERROR = 5000; this.PING_ERROR = 5001; @@ -162,6 +163,11 @@ class NetworkService { return this.requestHttp(job); } + async requestDocker(job) { + console.log(job); + return {}; + } + /** * Gets the status of a job based on its type and returns the appropriate response. * @@ -181,13 +187,13 @@ class NetworkService { return await this.requestPagespeed(job); case this.TYPE_HARDWARE: return await this.requestHardware(job); + case this.TYPE_DOCKER: + return await this.requestDocker(job); default: - this.logger.error({ - message: `Unsupported type: ${job.data.type}`, - service: this.SERVICE_NAME, - method: "getStatus", - }); - return {}; + const err = new Error(`Unsupported type: ${job.data.type}`); + err.service = this.SERVICE_NAME; + err.method = "getStatus"; + throw err; } } } From 61406be2a3f7dd1ff8d5b06855403494800cf57a Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Wed, 13 Nov 2024 10:34:40 +0800 Subject: [PATCH 23/49] Add dockerode --- Server/package-lock.json | 276 +++++++++++++++++++++++++++++++++++++++ Server/package.json | 1 + 2 files changed, 277 insertions(+) diff --git a/Server/package-lock.json b/Server/package-lock.json index d03515453..22ffaa863 100644 --- a/Server/package-lock.json +++ b/Server/package-lock.json @@ -14,6 +14,7 @@ "bcrypt": "^5.1.1", "bullmq": "5.25.6", "cors": "^2.8.5", + "dockerode": "4.0.2", "dotenv": "^16.4.5", "express": "^4.19.2", "handlebars": "^4.7.8", @@ -89,6 +90,12 @@ "node": ">=6.9.0" } }, + "node_modules/@balena/dockerignore": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@balena/dockerignore/-/dockerignore-1.0.2.tgz", + "integrity": "sha512-wMue2Sy4GAVTk6Ic4tJVcnfdau+gx2EnG7S+uAEe+TWJFqE4YoWN4/H8MSLj4eYJKxGg26lZwboEniNiNwZQ6Q==", + "license": "Apache-2.0" + }, "node_modules/@bcoe/v8-coverage": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", @@ -996,6 +1003,15 @@ "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==" }, + "node_modules/asn1": { + "version": "0.2.6", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz", + "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==", + "license": "MIT", + "dependencies": { + "safer-buffer": "~2.1.0" + } + }, "node_modules/assertion-error": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz", @@ -1032,6 +1048,26 @@ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" }, + "node_modules/base64-js": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, "node_modules/bcrypt": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-5.1.1.tgz", @@ -1045,6 +1081,15 @@ "node": ">= 10.0.0" } }, + "node_modules/bcrypt-pbkdf": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", + "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==", + "license": "BSD-3-Clause", + "dependencies": { + "tweetnacl": "^0.14.3" + } + }, "node_modules/binary-extensions": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", @@ -1056,6 +1101,17 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/bl": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", + "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", + "license": "MIT", + "dependencies": { + "buffer": "^5.5.0", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" + } + }, "node_modules/body-parser": { "version": "1.20.3", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", @@ -1152,6 +1208,30 @@ "node": ">=16.20.1" } }, + "node_modules/buffer": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" + } + }, "node_modules/buffer-equal-constant-time": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", @@ -1163,6 +1243,15 @@ "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", "license": "MIT" }, + "node_modules/buildcheck": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/buildcheck/-/buildcheck-0.0.6.tgz", + "integrity": "sha512-8f9ZJCUXyT1M35Jx7MkBgmBMo3oHTTBIPLiY9xyL0pl3T5RwcPEY8cUHr5LBNfu/fk6c2T4DJZuVM/8ZZT2D2A==", + "optional": true, + "engines": { + "node": ">=10.0.0" + } + }, "node_modules/bullmq": { "version": "5.25.6", "resolved": "https://registry.npmjs.org/bullmq/-/bullmq-5.25.6.tgz", @@ -1708,6 +1797,20 @@ } } }, + "node_modules/cpu-features": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/cpu-features/-/cpu-features-0.0.10.tgz", + "integrity": "sha512-9IkYqtX3YHPCzoVg1Py+o9057a3i0fp7S530UWokCSaFVTc7CwXPRiOjRjBQQ18ZCNafx78YfnG+HALxtVmOGA==", + "hasInstallScript": true, + "optional": true, + "dependencies": { + "buildcheck": "~0.0.6", + "nan": "^2.19.0" + }, + "engines": { + "node": ">=10.0.0" + } + }, "node_modules/cron-parser": { "version": "4.9.0", "resolved": "https://registry.npmjs.org/cron-parser/-/cron-parser-4.9.0.tgz", @@ -2014,6 +2117,58 @@ "node": ">=0.3.1" } }, + "node_modules/docker-modem": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/docker-modem/-/docker-modem-5.0.3.tgz", + "integrity": "sha512-89zhop5YVhcPEt5FpUFGr3cDyceGhq/F9J+ZndQ4KfqNvfbJpPMfgeixFgUj5OjCYAboElqODxY5Z1EBsSa6sg==", + "license": "Apache-2.0", + "dependencies": { + "debug": "^4.1.1", + "readable-stream": "^3.5.0", + "split-ca": "^1.0.1", + "ssh2": "^1.15.0" + }, + "engines": { + "node": ">= 8.0" + } + }, + "node_modules/docker-modem/node_modules/debug": { + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/docker-modem/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" + }, + "node_modules/dockerode": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/dockerode/-/dockerode-4.0.2.tgz", + "integrity": "sha512-9wM1BVpVMFr2Pw3eJNXrYYt6DT9k0xMcsSCjtPvyQ+xa1iPg/Mo3T/gUcwI0B2cczqCeCYRPF8yFYDwtFXT0+w==", + "license": "Apache-2.0", + "dependencies": { + "@balena/dockerignore": "^1.0.2", + "docker-modem": "^5.0.3", + "tar-fs": "~2.0.1" + }, + "engines": { + "node": ">= 8.0" + } + }, "node_modules/dom-serializer": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz", @@ -2145,6 +2300,15 @@ "node": ">=0.10.0" } }, + "node_modules/end-of-stream": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", + "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "license": "MIT", + "dependencies": { + "once": "^1.4.0" + } + }, "node_modules/entities": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", @@ -2439,6 +2603,12 @@ "node": ">= 0.6" } }, + "node_modules/fs-constants": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", + "license": "MIT" + }, "node_modules/fs-minipass": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", @@ -2822,6 +2992,26 @@ "node": ">=0.10.0" } }, + "node_modules/ieee754": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "BSD-3-Clause" + }, "node_modules/ignore-by-default": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", @@ -4129,6 +4319,12 @@ "node": ">=10" } }, + "node_modules/mkdirp-classic": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", + "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==", + "license": "MIT" + }, "node_modules/mocha": { "version": "10.8.2", "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.8.2.tgz", @@ -4503,6 +4699,13 @@ "mkdirp": "bin/cmd.js" } }, + "node_modules/nan": { + "version": "2.22.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz", + "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==", + "license": "MIT", + "optional": true + }, "node_modules/nanoid": { "version": "3.3.7", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", @@ -5553,6 +5756,16 @@ "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==", "dev": true }, + "node_modules/pump": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz", + "integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==", + "license": "MIT", + "dependencies": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, "node_modules/punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", @@ -6046,6 +6259,29 @@ "memory-pager": "^1.0.2" } }, + "node_modules/split-ca": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/split-ca/-/split-ca-1.0.1.tgz", + "integrity": "sha512-Q5thBSxp5t8WPTTJQS59LrGqOZqOsrhDGDVm8azCqIBjSBd7nd9o2PM+mDulQQkh8h//4U6hFZnc/mul8t5pWQ==", + "license": "ISC" + }, + "node_modules/ssh2": { + "version": "1.16.0", + "resolved": "https://registry.npmjs.org/ssh2/-/ssh2-1.16.0.tgz", + "integrity": "sha512-r1X4KsBGedJqo7h8F5c4Ybpcr5RjyP+aWIG007uBPRjmdQWfEiVLzSK71Zji1B9sKxwaCvD8y8cwSkYrlLiRRg==", + "hasInstallScript": true, + "dependencies": { + "asn1": "^0.2.6", + "bcrypt-pbkdf": "^1.0.2" + }, + "engines": { + "node": ">=10.16.0" + }, + "optionalDependencies": { + "cpu-features": "~0.0.10", + "nan": "^2.20.0" + } + }, "node_modules/ssl-checker": { "version": "2.0.10", "resolved": "https://registry.npmjs.org/ssl-checker/-/ssl-checker-2.0.10.tgz", @@ -6248,6 +6484,40 @@ "node": ">=10" } }, + "node_modules/tar-fs": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.1.tgz", + "integrity": "sha512-6tzWDMeroL87uF/+lin46k+Q+46rAJ0SyPGz7OW7wTgblI273hsBqk2C1j0/xNadNLKDTUL9BukSjB7cwgmlPA==", + "license": "MIT", + "dependencies": { + "chownr": "^1.1.1", + "mkdirp-classic": "^0.5.2", + "pump": "^3.0.0", + "tar-stream": "^2.0.0" + } + }, + "node_modules/tar-fs/node_modules/chownr": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", + "license": "ISC" + }, + "node_modules/tar-stream": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", + "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", + "license": "MIT", + "dependencies": { + "bl": "^4.0.3", + "end-of-stream": "^1.4.1", + "fs-constants": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.1.1" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/text-hex": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz", @@ -6311,6 +6581,12 @@ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==" }, + "node_modules/tweetnacl": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==", + "license": "Unlicense" + }, "node_modules/type-detect": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", diff --git a/Server/package.json b/Server/package.json index 16e0e9d1c..ce34ee0f2 100644 --- a/Server/package.json +++ b/Server/package.json @@ -17,6 +17,7 @@ "bcrypt": "^5.1.1", "bullmq": "5.25.6", "cors": "^2.8.5", + "dockerode": "4.0.2", "dotenv": "^16.4.5", "express": "^4.19.2", "handlebars": "^4.7.8", From 2548742f31f8446040fe3a0432d8b9811cbcdeb7 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Wed, 13 Nov 2024 10:36:42 +0800 Subject: [PATCH 24/49] Inject dockerode, instantiate instance --- Server/index.js | 5 +++-- Server/service/networkService.js | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Server/index.js b/Server/index.js index 11b5b2151..0e9811a43 100644 --- a/Server/index.js +++ b/Server/index.js @@ -28,6 +28,7 @@ import NetworkService from "./service/networkService.js"; import axios from "axios"; import ping from "ping"; import http from "http"; +import Docker from "dockerode"; // Email service and dependencies import EmailService from "./service/emailService.js"; @@ -45,7 +46,7 @@ import NotificationService from "./service/notificationService.js"; import db from "./db/mongo/MongoDB.js"; const SERVICE_NAME = "Server"; -const SHUTDOWN_TIMEOUT = 0; +const SHUTDOWN_TIMEOUT = 1000; let isShuttingDown = false; const __filename = fileURLToPath(import.meta.url); @@ -130,7 +131,7 @@ const startApp = async () => { nodemailer, logger ); - const networkService = new NetworkService(axios, ping, logger, http); + const networkService = new NetworkService(axios, ping, logger, http, Docker); const statusService = new StatusService(db, logger); const notificationService = new NotificationService(emailService, db, logger); const jobQueue = await JobQueue.createJobQueue( diff --git a/Server/service/networkService.js b/Server/service/networkService.js index b7d76e475..74ee8105c 100644 --- a/Server/service/networkService.js +++ b/Server/service/networkService.js @@ -8,7 +8,7 @@ import { errorMessages, successMessages } from "../utils/messages.js"; * @param {Object} http - The HTTP utility for network operations. */ class NetworkService { - constructor(axios, ping, logger, http) { + constructor(axios, ping, logger, http, Docker) { this.TYPE_PING = "ping"; this.TYPE_HTTP = "http"; this.TYPE_PAGESPEED = "pagespeed"; @@ -21,6 +21,7 @@ class NetworkService { this.ping = ping; this.logger = logger; this.http = http; + this.Docker = Docker; } /** @@ -164,7 +165,8 @@ class NetworkService { } async requestDocker(job) { - console.log(job); + var docker = new Docker({ socketPath: "/var/run/docker.sock" }); + return {}; } From b079327296923a863d13151c29ca04c394e9a3de Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Wed, 13 Nov 2024 10:59:40 +0800 Subject: [PATCH 25/49] remove console log --- Server/service/jobQueue.js | 1 - 1 file changed, 1 deletion(-) diff --git a/Server/service/jobQueue.js b/Server/service/jobQueue.js index 0eb265405..eedeb1a5c 100644 --- a/Server/service/jobQueue.js +++ b/Server/service/jobQueue.js @@ -178,7 +178,6 @@ class JobQueue { prevStatus, }); } catch (error) { - console.log(error.service); this.logger.error({ message: error.message, service: error.service ?? SERVICE_NAME, From 5285fd30a1e43c947a548bfb15cdfaebee425cbb Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Wed, 13 Nov 2024 10:59:53 +0800 Subject: [PATCH 26/49] Add docker messages --- Server/utils/messages.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Server/utils/messages.js b/Server/utils/messages.js index c75c617d2..1a994527a 100644 --- a/Server/utils/messages.js +++ b/Server/utils/messages.js @@ -55,6 +55,9 @@ const errorMessages = { // Status Page Errors STATUS_PAGE_NOT_FOUND: "Status page not found", STATUS_PAGE_URL_NOT_UNIQUE: "Status page url must be unique", + + // Docker + DOCKER_FAIL: "Failed to fetch Docker container information", }; const successMessages = { @@ -123,6 +126,9 @@ const successMessages = { // Status Page STATUS_PAGE_BY_URL: "Got status page by url successfully", STATUS_PAGE_CREATE: "Status page created successfully", + + // Docker + DOCKER_SUCCESS: "Docker container status fetched successfully", }; export { errorMessages, successMessages }; From 922c4d38d6ed95d52aafafbd8e6a74c4313c20b8 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Wed, 13 Nov 2024 11:00:16 +0800 Subject: [PATCH 27/49] Build docker response --- Server/service/networkService.js | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/Server/service/networkService.js b/Server/service/networkService.js index 74ee8105c..153121503 100644 --- a/Server/service/networkService.js +++ b/Server/service/networkService.js @@ -165,9 +165,32 @@ class NetworkService { } async requestDocker(job) { - var docker = new Docker({ socketPath: "/var/run/docker.sock" }); + const docker = new this.Docker({ socketPath: "/var/run/docker.sock" }); + const container = docker.getContainer(job.data.url); - return {}; + const { response, responseTime, error } = await this.timeRequest(() => + container.inspect() + ); + + const containerState = response?.State ?? {}; + + const dockerResponse = { + monitorId: job.data._id, + type: job.data.type, + responseTime, + }; + + if (error) { + const code = error.statusCode || this.NETWORK_ERROR; + dockerResponse.code = code; + dockerResponse.status = false; + dockerResponse.message = error.reason || errorMessages.DOCKER_FAIL; + return dockerResponse; + } + dockerResponse.status = containerState.Status === "running" ? true : false; + dockerResponse.code = 200; + dockerResponse.message = successMessages.DOCKER_SUCCESS; + return dockerResponse; } /** From 11b84610c5ebc3e317d02337dc635d13461f66d0 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Wed, 13 Nov 2024 11:07:03 +0800 Subject: [PATCH 28/49] safe object access --- Server/service/networkService.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Server/service/networkService.js b/Server/service/networkService.js index 153121503..a1ff64c20 100644 --- a/Server/service/networkService.js +++ b/Server/service/networkService.js @@ -172,8 +172,6 @@ class NetworkService { container.inspect() ); - const containerState = response?.State ?? {}; - const dockerResponse = { monitorId: job.data._id, type: job.data.type, @@ -187,7 +185,7 @@ class NetworkService { dockerResponse.message = error.reason || errorMessages.DOCKER_FAIL; return dockerResponse; } - dockerResponse.status = containerState.Status === "running" ? true : false; + dockerResponse.status = response?.State?.Status === "running" ? true : false; dockerResponse.code = 200; dockerResponse.message = successMessages.DOCKER_SUCCESS; return dockerResponse; From 34ae35ea219b81d65dc26265ed44f0dd1fd36e2e Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Wed, 13 Nov 2024 11:07:36 +0800 Subject: [PATCH 29/49] Add db operation type for Docker type checks to statusService --- Server/service/statusService.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Server/service/statusService.js b/Server/service/statusService.js index 22254d050..4f7c1a4ce 100644 --- a/Server/service/statusService.js +++ b/Server/service/statusService.js @@ -133,6 +133,7 @@ class StatusService { ping: this.db.createCheck, pagespeed: this.db.createPageSpeedCheck, hardware: this.db.createHardwareCheck, + docker: this.db.createCheck, }; const operation = operationMap[networkResponse.type]; From 0b07b763c6c344a78d96638ddd9cd7625301fe52 Mon Sep 17 00:00:00 2001 From: "Gorkem Cetin (BWL)" <167266851+gorkem-bwl@users.noreply.github.com> Date: Tue, 12 Nov 2024 22:43:46 -0500 Subject: [PATCH 30/49] Add Docker monitoring to roadmap --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index aacaf4ea8..74e656800 100644 --- a/README.md +++ b/README.md @@ -46,6 +46,8 @@ We've just launched our [Discussions](https://github.com/bluewave-labs/bluewave- We are actively developing **infrastructure monitoring** features for Uptime Manager, which will include comprehensive monitoring of memory, disk usage, and CPU performance. Our goal is to build a lightweight agent that runs on Linux servers, continuously collecting and transmitting health metrics to Uptime Manager, where the data will be visualized for real-time insights. +Additionally, we will introduce **Docker monitoring** to track the performance and health of containerized environments. + **Roadmap (long term):** - DNS monitoring From c17efe3d016a41b422e0684965930de55040efd9 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Wed, 13 Nov 2024 12:34:11 +0800 Subject: [PATCH 31/49] add tests --- Server/tests/services/networkService.test.js | 128 +++++++++++++++++-- 1 file changed, 114 insertions(+), 14 deletions(-) diff --git a/Server/tests/services/networkService.test.js b/Server/tests/services/networkService.test.js index 4e48524e2..9f4a30b20 100644 --- a/Server/tests/services/networkService.test.js +++ b/Server/tests/services/networkService.test.js @@ -3,7 +3,7 @@ import NetworkService from "../../service/networkService.js"; import { expect } from "chai"; import http from "http"; describe("Network Service", () => { - let axios, ping, logger, networkService; + let axios, ping, Docker, logger, networkService; beforeEach(() => { axios = { @@ -12,6 +12,11 @@ describe("Network Service", () => { status: 200, }), }; + Docker = class { + getContainer = sinon.stub().returns({ + inspect: sinon.stub().resolves({ State: { Status: "running" } }), + }); + }; ping = { promise: { probe: sinon @@ -20,7 +25,7 @@ describe("Network Service", () => { }, }; logger = { error: sinon.stub() }; - networkService = new NetworkService(axios, ping, logger, http); + networkService = new NetworkService(axios, ping, logger, http, Docker); }); describe("constructor", () => { it("should create a new NetworkService instance", () => { @@ -203,45 +208,140 @@ describe("Network Service", () => { }); }); + describe("requestDocker", () => { + it("should return a response object if docker successful", async () => { + const job = { data: { url: "http://test.com", _id: "123", type: "docker" } }; + const dockerResult = await networkService.requestDocker(job); + expect(dockerResult.monitorId).to.equal("123"); + expect(dockerResult.type).to.equal("docker"); + expect(dockerResult.responseTime).to.be.a("number"); + expect(dockerResult.status).to.be.true; + }); + + it("should return a response object with status false if container not running", async () => { + Docker = class { + getContainer = sinon.stub().returns({ + inspect: sinon.stub().resolves({ State: { Status: "stopped" } }), + }); + }; + networkService = new NetworkService(axios, ping, logger, http, Docker); + const job = { data: { url: "http://test.com", _id: "123", type: "docker" } }; + const dockerResult = await networkService.requestDocker(job); + expect(dockerResult.status).to.be.false; + expect(dockerResult.code).to.equal(200); + }); + + it("should handle an error when fetching the container", async () => { + Docker = class { + getContainer = sinon.stub().returns({ + inspect: sinon.stub().throws(new Error("test error")), + }); + }; + networkService = new NetworkService(axios, ping, logger, http, Docker); + const job = { data: { url: "http://test.com", _id: "123", type: "docker" } }; + const dockerResult = await networkService.requestDocker(job); + expect(dockerResult.status).to.be.false; + expect(dockerResult.code).to.equal(networkService.NETWORK_ERROR); + }); + + it("should throw an error if operations fail", async () => { + Docker = class { + getContainer = sinon.stub().throws(new Error("test error")); + }; + networkService = new NetworkService(axios, ping, logger, http, Docker); + const job = { data: { url: "http://test.com", _id: "123", type: "docker" } }; + try { + await networkService.requestDocker(job); + } catch (error) { + expect(error.message).to.equal("test error"); + } + }); + }); + describe("getStatus", () => { beforeEach(() => { networkService.requestPing = sinon.stub(); networkService.requestHttp = sinon.stub(); networkService.requestPagespeed = sinon.stub(); networkService.requestHardware = sinon.stub(); + networkService.requestDocker = sinon.stub(); }); afterEach(() => { sinon.restore(); }); - it("should call requestPing if type is ping", () => { - networkService.getStatus({ data: { type: "ping" } }); + it("should call requestPing if type is ping", async () => { + await networkService.getStatus({ data: { type: "ping" } }); expect(networkService.requestPing.calledOnce).to.be.true; + expect(networkService.requestDocker.notCalled).to.be.true; expect(networkService.requestHttp.notCalled).to.be.true; expect(networkService.requestPagespeed.notCalled).to.be.true; }); - it("should call requestHttp if type is http", () => { - networkService.getStatus({ data: { type: "http" } }); + it("should call requestHttp if type is http", async () => { + await networkService.getStatus({ data: { type: "http" } }); expect(networkService.requestPing.notCalled).to.be.true; + expect(networkService.requestDocker.notCalled).to.be.true; expect(networkService.requestHttp.calledOnce).to.be.true; expect(networkService.requestPagespeed.notCalled).to.be.true; }); - it("should call requestPagespeed if type is pagespeed", () => { - networkService.getStatus({ data: { type: "pagespeed" } }); + it("should call requestPagespeed if type is pagespeed", async () => { + await networkService.getStatus({ data: { type: "pagespeed" } }); expect(networkService.requestPing.notCalled).to.be.true; + expect(networkService.requestDocker.notCalled).to.be.true; expect(networkService.requestHttp.notCalled).to.be.true; expect(networkService.requestPagespeed.calledOnce).to.be.true; }); - it("should call requestHardware if type is hardware", () => { - networkService.getStatus({ data: { type: "hardware" } }); + it("should call requestHardware if type is hardware", async () => { + await networkService.getStatus({ data: { type: "hardware" } }); expect(networkService.requestHardware.calledOnce).to.be.true; + expect(networkService.requestDocker.notCalled).to.be.true; expect(networkService.requestPing.notCalled).to.be.true; expect(networkService.requestPagespeed.notCalled).to.be.true; }); - it("should log an error if an unknown type is provided", () => { - networkService.getStatus({ data: { type: "unknown" } }); - expect(logger.error.calledOnce).to.be.true; - expect(logger.error.args[0][0].message).to.equal("Unsupported type: unknown"); + it("should call requestDocker if type is Docker", async () => { + await networkService.getStatus({ data: { type: "docker" } }); + expect(networkService.requestDocker.calledOnce).to.be.true; + expect(networkService.requestHardware.notCalled).to.be.true; + expect(networkService.requestPing.notCalled).to.be.true; + expect(networkService.requestPagespeed.notCalled).to.be.true; + }); + it("should throw an error if an unknown type is provided", async () => { + try { + await networkService.getStatus({ data: { type: "unknown" } }); + } catch (error) { + expect(error.service).to.equal("NetworkService"); + expect(error.method).to.equal("getStatus"); + expect(error.message).to.equal("Unsupported type: unknown"); + } + }); + it("should throw an error if job type is undefined", async () => { + try { + await networkService.getStatus({ data: { type: undefined } }); + } catch (error) { + expect(error.service).to.equal("NetworkService"); + expect(error.method).to.equal("getStatus"); + expect(error.message).to.equal("Unsupported type: unknown"); + } + }); + it("should throw an error if job is empty", async () => { + try { + await networkService.getStatus({}); + } catch (error) { + console.log(error); + expect(error.service).to.equal("NetworkService"); + expect(error.method).to.equal("getStatus"); + expect(error.message).to.equal("Unsupported type: unknown"); + } + }); + it("should throw an error if job is null", async () => { + try { + await networkService.getStatus(null); + } catch (error) { + console.log(error); + expect(error.service).to.equal("NetworkService"); + expect(error.method).to.equal("getStatus"); + expect(error.message).to.equal("Unsupported type: unknown"); + } }); }); }); From 7639dd2e804be471a8a6836454ce6775ee921e8d Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Wed, 13 Nov 2024 12:34:53 +0800 Subject: [PATCH 32/49] Refactored switch statement, extracted error building --- Server/service/networkService.js | 57 ++++++++++++++++++++++++++++---- 1 file changed, 50 insertions(+), 7 deletions(-) diff --git a/Server/service/networkService.js b/Server/service/networkService.js index a1ff64c20..7b40e288b 100644 --- a/Server/service/networkService.js +++ b/Server/service/networkService.js @@ -160,10 +160,43 @@ class NetworkService { return this.requestHttp(updatedJob); } + /** + * Sends an HTTP request to check hardware status and returns the response. + * + * @param {Object} job - The job object containing the data for the hardware request. + * @param {Object} job.data - The data object within the job. + * @param {string} job.data.url - The URL to send the hardware status request to. + * @param {string} job.data._id - The monitor ID for the hardware request. + * @param {string} job.data.type - The type of request, which is "hardware". + * @returns {Promise} An object containing the hardware status response details. + * @property {string} monitorId - The monitor ID for the hardware request. + * @property {string} type - The type of request ("hardware"). + * @property {number} responseTime - The time taken for the request to complete, in milliseconds. + * @property {Object} payload - The response payload from the hardware status request. + * @property {boolean} status - The status of the request (true if successful, false otherwise). + * @property {number} code - The response code (200 if successful, error code otherwise). + * @property {string} message - The message indicating the result of the hardware status request. + */ async requestHardware(job) { return this.requestHttp(job); } + /** + * Sends a request to inspect a Docker container and returns its status. + * + * @param {Object} job - The job object containing the data for the Docker request. + * @param {Object} job.data - The data object within the job. + * @param {string} job.data.url - The container ID or name to inspect. + * @param {string} job.data._id - The monitor ID for the Docker request. + * @param {string} job.data.type - The type of request, which is "docker". + * @returns {Promise} An object containing the Docker container status details. + * @property {string} monitorId - The monitor ID for the Docker request. + * @property {string} type - The type of request ("docker"). + * @property {number} responseTime - The time taken for the Docker inspection to complete, in milliseconds. + * @property {boolean} status - The status of the container (true if running, false otherwise). + * @property {number} code - The response code (200 if successful, error code otherwise). + * @property {string} message - The message indicating the result of the Docker inspection. + */ async requestDocker(job) { const docker = new this.Docker({ socketPath: "/var/run/docker.sock" }); const container = docker.getContainer(job.data.url); @@ -179,9 +212,8 @@ class NetworkService { }; if (error) { - const code = error.statusCode || this.NETWORK_ERROR; - dockerResponse.code = code; dockerResponse.status = false; + dockerResponse.code = error.statusCode || this.NETWORK_ERROR; dockerResponse.message = error.reason || errorMessages.DOCKER_FAIL; return dockerResponse; } @@ -191,6 +223,19 @@ class NetworkService { return dockerResponse; } + /** + * Handles unsupported job types by throwing an error with details. + * + * @param {string} type - The unsupported job type that was provided + * @throws {Error} An error with service name, method name and unsupported type message + */ + handleUnsupportedType(type) { + const err = new Error(`Unsupported type: ${type}`); + err.service = this.SERVICE_NAME; + err.method = "getStatus"; + throw err; + } + /** * Gets the status of a job based on its type and returns the appropriate response. * @@ -201,7 +246,8 @@ class NetworkService { * @throws {Error} Throws an error if the job type is unsupported. */ async getStatus(job) { - switch (job.data.type) { + const type = job.data?.type ?? "unknown"; + switch (type) { case this.TYPE_PING: return await this.requestPing(job); case this.TYPE_HTTP: @@ -213,10 +259,7 @@ class NetworkService { case this.TYPE_DOCKER: return await this.requestDocker(job); default: - const err = new Error(`Unsupported type: ${job.data.type}`); - err.service = this.SERVICE_NAME; - err.method = "getStatus"; - throw err; + return this.handleUnsupportedType(type); } } } From b2c43955f8ad87ac8566cc3b6fe824e5ab11904a Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Wed, 13 Nov 2024 14:56:15 +0800 Subject: [PATCH 33/49] Add more robust error handling to networkService --- Server/service/networkService.js | 171 +++++++++++++++++++------------ 1 file changed, 105 insertions(+), 66 deletions(-) diff --git a/Server/service/networkService.js b/Server/service/networkService.js index 7b40e288b..23b3a62b1 100644 --- a/Server/service/networkService.js +++ b/Server/service/networkService.js @@ -64,28 +64,34 @@ class NetworkService { * @property {string} message - The message indicating the result of the ping request. */ async requestPing(job) { - const url = job.data.url; - const { response, responseTime, error } = await this.timeRequest(() => - this.ping.promise.probe(url) - ); + try { + const url = job.data.url; + const { response, responseTime, error } = await this.timeRequest(() => + this.ping.promise.probe(url) + ); - const pingResponse = { - monitorId: job.data._id, - type: "ping", - responseTime, - payload: response, - }; - if (error) { - pingResponse.status = false; - pingResponse.code = this.PING_ERROR; - pingResponse.message = errorMessages.PING_CANNOT_RESOLVE; + const pingResponse = { + monitorId: job.data._id, + type: "ping", + responseTime, + payload: response, + }; + if (error) { + pingResponse.status = false; + pingResponse.code = this.PING_ERROR; + pingResponse.message = errorMessages.PING_CANNOT_RESOLVE; + return pingResponse; + } + + pingResponse.code = 200; + pingResponse.status = response.alive; + pingResponse.message = successMessages.PING_SUCCESS; return pingResponse; + } catch (error) { + error.service = this.SERVICE_NAME; + error.method = "requestPing"; + throw error; } - - pingResponse.code = 200; - pingResponse.status = response.alive; - pingResponse.message = successMessages.PING_SUCCESS; - return pingResponse; } /** @@ -106,34 +112,40 @@ class NetworkService { * @property {string} message - The message indicating the result of the HTTP request. */ async requestHttp(job) { - const url = job.data.url; - const config = {}; + try { + const url = job.data.url; + const config = {}; - job.data.secret !== undefined && - (config.headers = { Authorization: `Bearer ${job.data.secret}` }); + job.data.secret !== undefined && + (config.headers = { Authorization: `Bearer ${job.data.secret}` }); - const { response, responseTime, error } = await this.timeRequest(() => - this.axios.get(url, config) - ); + const { response, responseTime, error } = await this.timeRequest(() => + this.axios.get(url, config) + ); - const httpResponse = { - monitorId: job.data._id, - type: job.data.type, - responseTime, - payload: response?.data, - }; + const httpResponse = { + monitorId: job.data._id, + type: job.data.type, + responseTime, + payload: response?.data, + }; - if (error) { - const code = error.response?.status || this.NETWORK_ERROR; - httpResponse.code = code; - httpResponse.status = false; - httpResponse.message = this.http.STATUS_CODES[code] || "Network Error"; + if (error) { + const code = error.response?.status || this.NETWORK_ERROR; + httpResponse.code = code; + httpResponse.status = false; + httpResponse.message = this.http.STATUS_CODES[code] || "Network Error"; + return httpResponse; + } + httpResponse.status = true; + httpResponse.code = response.status; + httpResponse.message = this.http.STATUS_CODES[response.status]; return httpResponse; + } catch (error) { + error.service = this.SERVICE_NAME; + error.method = "requestHttp"; + throw error; } - httpResponse.status = true; - httpResponse.code = response.status; - httpResponse.message = this.http.STATUS_CODES[response.status]; - return httpResponse; } /** @@ -153,11 +165,17 @@ class NetworkService { * @property {string} message - The message indicating the result of the PageSpeed request. */ async requestPagespeed(job) { - const url = job.data.url; - const updatedJob = { ...job }; - const pagespeedUrl = `https://pagespeedonline.googleapis.com/pagespeedonline/v5/runPagespeed?url=${url}&category=seo&category=accessibility&category=best-practices&category=performance`; - updatedJob.data.url = pagespeedUrl; - return this.requestHttp(updatedJob); + try { + const url = job.data.url; + const updatedJob = { ...job }; + const pagespeedUrl = `https://pagespeedonline.googleapis.com/pagespeedonline/v5/runPagespeed?url=${url}&category=seo&category=accessibility&category=best-practices&category=performance`; + updatedJob.data.url = pagespeedUrl; + return await this.requestHttp(updatedJob); + } catch (error) { + error.service = this.SERVICE_NAME; + error.method = "requestPagespeed"; + throw error; + } } /** @@ -178,7 +196,13 @@ class NetworkService { * @property {string} message - The message indicating the result of the hardware status request. */ async requestHardware(job) { - return this.requestHttp(job); + try { + return await this.requestHttp(job); + } catch (error) { + error.service = this.SERVICE_NAME; + error.method = "requestHardware"; + throw error; + } } /** @@ -198,29 +222,44 @@ class NetworkService { * @property {string} message - The message indicating the result of the Docker inspection. */ async requestDocker(job) { - const docker = new this.Docker({ socketPath: "/var/run/docker.sock" }); - const container = docker.getContainer(job.data.url); + try { + const docker = new this.Docker({ + socketPath: "/var/run/docker.sock", + handleError: true, // Enable error handling + }); - const { response, responseTime, error } = await this.timeRequest(() => - container.inspect() - ); + const containers = await docker.listContainers({ all: true }); + const containerExists = containers.some((c) => c.Id === job.data.url); + if (!containerExists) { + throw new Error(errorMessages.DOCKER_NOT_FOUND); + } + const container = docker.getContainer(job.data.url); - const dockerResponse = { - monitorId: job.data._id, - type: job.data.type, - responseTime, - }; + const { response, responseTime, error } = await this.timeRequest(() => + container.inspect() + ); - if (error) { - dockerResponse.status = false; - dockerResponse.code = error.statusCode || this.NETWORK_ERROR; - dockerResponse.message = error.reason || errorMessages.DOCKER_FAIL; + const dockerResponse = { + monitorId: job.data._id, + type: job.data.type, + responseTime, + }; + + if (error) { + dockerResponse.status = false; + dockerResponse.code = error.statusCode || this.NETWORK_ERROR; + dockerResponse.message = error.reason || errorMessages.DOCKER_FAIL; + return dockerResponse; + } + dockerResponse.status = response?.State?.Status === "running" ? true : false; + dockerResponse.code = 200; + dockerResponse.message = successMessages.DOCKER_SUCCESS; return dockerResponse; + } catch (error) { + error.service = this.SERVICE_NAME; + error.method = "requestDocker"; + throw error; } - dockerResponse.status = response?.State?.Status === "running" ? true : false; - dockerResponse.code = 200; - dockerResponse.message = successMessages.DOCKER_SUCCESS; - return dockerResponse; } /** @@ -246,7 +285,7 @@ class NetworkService { * @throws {Error} Throws an error if the job type is unsupported. */ async getStatus(job) { - const type = job.data?.type ?? "unknown"; + const type = job?.data?.type ?? "unknown"; switch (type) { case this.TYPE_PING: return await this.requestPing(job); From b8f99e3f1cfcde588a4591c7231265dc897765c5 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Wed, 13 Nov 2024 14:56:32 +0800 Subject: [PATCH 34/49] Update tests --- Server/tests/services/networkService.test.js | 95 ++++++++++++++++++-- 1 file changed, 89 insertions(+), 6 deletions(-) diff --git a/Server/tests/services/networkService.test.js b/Server/tests/services/networkService.test.js index 9f4a30b20..d5c177d6f 100644 --- a/Server/tests/services/networkService.test.js +++ b/Server/tests/services/networkService.test.js @@ -2,6 +2,7 @@ import sinon from "sinon"; import NetworkService from "../../service/networkService.js"; import { expect } from "chai"; import http from "http"; +import { errorMessages } from "../../utils/messages.js"; describe("Network Service", () => { let axios, ping, Docker, logger, networkService; @@ -13,6 +14,12 @@ describe("Network Service", () => { }), }; Docker = class { + listContainers = sinon.stub().resolves([ + { + Names: ["http://test.com"], + Id: "http://test.com", + }, + ]); getContainer = sinon.stub().returns({ inspect: sinon.stub().resolves({ State: { Status: "running" } }), }); @@ -75,6 +82,18 @@ describe("Network Service", () => { expect(pingResult.status).to.be.false; expect(pingResult.code).to.equal(networkService.PING_ERROR); }); + it("should throw an error if ping cannot resolve", async () => { + const error = new Error("test error"); + networkService.timeRequest = sinon.stub().throws(error); + try { + await networkService.requestPing({ + data: { url: "http://test.com", _id: "123" }, + }); + } catch (error) { + expect(error).to.exist; + expect(error.method).to.equal("requestPing"); + } + }); }); describe("requestHttp", () => { it("should return a response object if http successful", async () => { @@ -113,6 +132,18 @@ describe("Network Service", () => { expect(httpResult.status).to.be.false; expect(httpResult.code).to.equal(networkService.NETWORK_ERROR); }); + it("should throw an error if an error occurs", async () => { + const error = new Error("test error"); + networkService.timeRequest = sinon.stub().throws(error); + try { + await networkService.requestHttp({ + data: { url: "http://test.com", _id: "123" }, + }); + } catch (error) { + expect(error).to.exist; + expect(error.method).to.equal("requestHttp"); + } + }); }); describe("requestPagespeed", () => { @@ -152,6 +183,18 @@ describe("Network Service", () => { expect(pagespeedResult.status).to.be.false; expect(pagespeedResult.code).to.equal(networkService.NETWORK_ERROR); }); + it("should throw an error if pagespeed cannot resolve", async () => { + const error = new Error("test error"); + networkService.timeRequest = sinon.stub().throws(error); + try { + await networkService.requestPagespeed({ + data: { url: "http://test.com", _id: "123" }, + }); + } catch (error) { + expect(error).to.exist; + expect(error.method).to.equal("requestPagespeed"); + } + }); }); describe("requestHardware", () => { @@ -206,6 +249,18 @@ describe("Network Service", () => { expect(httpResult.status).to.be.false; expect(httpResult.code).to.equal(networkService.NETWORK_ERROR); }); + it("should throw an error if hardware cannot resolve", async () => { + const error = new Error("test error"); + networkService.timeRequest = sinon.stub().throws(error); + try { + await networkService.requestHardware({ + data: { url: "http://test.com", _id: "123" }, + }); + } catch (error) { + expect(error).to.exist; + expect(error.method).to.equal("requestHardware"); + } + }); }); describe("requestDocker", () => { @@ -220,12 +275,18 @@ describe("Network Service", () => { it("should return a response object with status false if container not running", async () => { Docker = class { + listContainers = sinon.stub().resolves([ + { + Names: ["/my_container"], + Id: "abc123", + }, + ]); getContainer = sinon.stub().returns({ inspect: sinon.stub().resolves({ State: { Status: "stopped" } }), }); }; networkService = new NetworkService(axios, ping, logger, http, Docker); - const job = { data: { url: "http://test.com", _id: "123", type: "docker" } }; + const job = { data: { url: "abc123", _id: "123", type: "docker" } }; const dockerResult = await networkService.requestDocker(job); expect(dockerResult.status).to.be.false; expect(dockerResult.code).to.equal(200); @@ -233,12 +294,18 @@ describe("Network Service", () => { it("should handle an error when fetching the container", async () => { Docker = class { + listContainers = sinon.stub().resolves([ + { + Names: ["/my_container"], + Id: "abc123", + }, + ]); getContainer = sinon.stub().returns({ inspect: sinon.stub().throws(new Error("test error")), }); }; networkService = new NetworkService(axios, ping, logger, http, Docker); - const job = { data: { url: "http://test.com", _id: "123", type: "docker" } }; + const job = { data: { url: "abc123", _id: "123", type: "docker" } }; const dockerResult = await networkService.requestDocker(job); expect(dockerResult.status).to.be.false; expect(dockerResult.code).to.equal(networkService.NETWORK_ERROR); @@ -246,16 +313,35 @@ describe("Network Service", () => { it("should throw an error if operations fail", async () => { Docker = class { + listContainers = sinon.stub().resolves([ + { + Names: ["/my_container"], + Id: "abc123", + }, + ]); getContainer = sinon.stub().throws(new Error("test error")); }; networkService = new NetworkService(axios, ping, logger, http, Docker); - const job = { data: { url: "http://test.com", _id: "123", type: "docker" } }; + const job = { data: { url: "abc123", _id: "123", type: "docker" } }; try { await networkService.requestDocker(job); } catch (error) { expect(error.message).to.equal("test error"); } }); + it("should throw an error if no matching images found", async () => { + Docker = class { + listContainers = sinon.stub().resolves([]); + getContainer = sinon.stub().throws(new Error("test error")); + }; + networkService = new NetworkService(axios, ping, logger, http, Docker); + const job = { data: { url: "abc123", _id: "123", type: "docker" } }; + try { + await networkService.requestDocker(job); + } catch (error) { + expect(error.message).to.equal(errorMessages.DOCKER_NOT_FOUND); + } + }); }); describe("getStatus", () => { @@ -327,8 +413,6 @@ describe("Network Service", () => { try { await networkService.getStatus({}); } catch (error) { - console.log(error); - expect(error.service).to.equal("NetworkService"); expect(error.method).to.equal("getStatus"); expect(error.message).to.equal("Unsupported type: unknown"); } @@ -337,7 +421,6 @@ describe("Network Service", () => { try { await networkService.getStatus(null); } catch (error) { - console.log(error); expect(error.service).to.equal("NetworkService"); expect(error.method).to.equal("getStatus"); expect(error.message).to.equal("Unsupported type: unknown"); From b5f67a83dd40ea2e73ff038851d99fc36dfb92bf Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Wed, 13 Nov 2024 14:57:14 +0800 Subject: [PATCH 35/49] Add error message for docker container not found --- Server/utils/messages.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Server/utils/messages.js b/Server/utils/messages.js index 1a994527a..2db427bd8 100644 --- a/Server/utils/messages.js +++ b/Server/utils/messages.js @@ -58,6 +58,7 @@ const errorMessages = { // Docker DOCKER_FAIL: "Failed to fetch Docker container information", + DOCKER_NOT_FOUND: "Docker container not found", }; const successMessages = { From a14e88ef29cf889c678357d540d4101699806561 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Wed, 13 Nov 2024 15:16:31 +0800 Subject: [PATCH 36/49] Allow partial matches for docker IDs --- Server/service/networkService.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/service/networkService.js b/Server/service/networkService.js index 23b3a62b1..60405df90 100644 --- a/Server/service/networkService.js +++ b/Server/service/networkService.js @@ -229,7 +229,7 @@ class NetworkService { }); const containers = await docker.listContainers({ all: true }); - const containerExists = containers.some((c) => c.Id === job.data.url); + const containerExists = containers.some((c) => c.Id.startsWith(job.data.url)); if (!containerExists) { throw new Error(errorMessages.DOCKER_NOT_FOUND); } From 206d1f390935113910a561a483efca843fea7a51 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Wed, 13 Nov 2024 15:18:03 +0800 Subject: [PATCH 37/49] Add docker container to create monitor options. Add map for labels and placeholders --- .../Pages/Monitors/CreateMonitor/index.jsx | 93 ++++++++++++------- 1 file changed, 61 insertions(+), 32 deletions(-) diff --git a/Client/src/Pages/Monitors/CreateMonitor/index.jsx b/Client/src/Pages/Monitors/CreateMonitor/index.jsx index bfa62c7fa..18c1df0b4 100644 --- a/Client/src/Pages/Monitors/CreateMonitor/index.jsx +++ b/Client/src/Pages/Monitors/CreateMonitor/index.jsx @@ -1,10 +1,10 @@ import { useState, useEffect } from "react"; import { Box, Button, ButtonGroup, Stack, Typography } from "@mui/material"; -import LoadingButton from '@mui/lab/LoadingButton'; +import LoadingButton from "@mui/lab/LoadingButton"; import { useSelector, useDispatch } from "react-redux"; import { monitorValidation } from "../../../Validation/validation"; import { createUptimeMonitor } from "../../../Features/UptimeMonitors/uptimeMonitorsSlice"; -import { checkEndpointResolution } from "../../../Features/UptimeMonitors/uptimeMonitorsSlice" +import { checkEndpointResolution } from "../../../Features/UptimeMonitors/uptimeMonitorsSlice"; import { useNavigate, useParams } from "react-router-dom"; import { useTheme } from "@emotion/react"; import { createToast } from "../../../Utils/toastUtils"; @@ -19,21 +19,40 @@ import { getUptimeMonitorById } from "../../../Features/UptimeMonitors/uptimeMon import "./index.css"; const CreateMonitor = () => { - const MS_PER_MINUTE = 60000; - const { user, authToken } = useSelector((state) => state.auth); - const { monitors, isLoading } = useSelector((state) => state.uptimeMonitors); - const dispatch = useDispatch(); - const navigate = useNavigate(); - const theme = useTheme(); + const MS_PER_MINUTE = 60000; + const { user, authToken } = useSelector((state) => state.auth); + const { monitors, isLoading } = useSelector((state) => state.uptimeMonitors); + const dispatch = useDispatch(); + const navigate = useNavigate(); + const theme = useTheme(); const idMap = { "monitor-url": "url", "monitor-name": "name", "monitor-checks-http": "type", "monitor-checks-ping": "type", + "monitor-checks-docker": "type", "notify-email-default": "notification-email", }; + const monitorTypeMaps = { + http: { + label: "URL to monitor", + placeholder: "google.com", + namePlaceholder: "Google", + }, + ping: { + label: "IP address to monitor", + placeholder: "1.1.1.1", + namePlaceholder: "Google", + }, + docker: { + label: "Container ID", + placeholder: "abc123", + namePlaceholder: "My Container", + }, + }; + const { monitorId } = useParams(); const [monitor, setMonitor] = useState({ url: "", @@ -112,7 +131,6 @@ const CreateMonitor = () => { { [name]: value }, { abortEarly: false } ); - console.log(error); setErrors((prev) => { const updatedErrors = { ...prev }; if (error) updatedErrors[name] = error.details[0].message; @@ -148,16 +166,18 @@ const CreateMonitor = () => { setErrors(newErrors); createToast({ body: "Error validation data." }); } else { - if (monitor.type === "http") { - const checkEndpointAction = await dispatch( - checkEndpointResolution({ authToken, monitorURL: form.url }) - ) - if (checkEndpointAction.meta.requestStatus === "rejected") { - createToast({ body: "The endpoint you entered doesn't resolve. Check the URL again." }); - setErrors({ url: "The entered URL is not reachable." }); - return; - } - } + if (monitor.type === "http") { + const checkEndpointAction = await dispatch( + checkEndpointResolution({ authToken, monitorURL: form.url }) + ); + if (checkEndpointAction.meta.requestStatus === "rejected") { + createToast({ + body: "The endpoint you entered doesn't resolve. Check the URL again.", + }); + setErrors({ url: "The entered URL is not reachable." }); + return; + } + } form = { ...form, @@ -232,9 +252,9 @@ const CreateMonitor = () => { { id="monitor-name" label="Display name" isOptional={true} - placeholder="Google" + placeholder={monitorTypeMaps[monitor.type].namePlaceholder || ""} value={monitor.name} onChange={handleChange} error={errors["name"]} @@ -299,6 +319,15 @@ const CreateMonitor = () => { checked={monitor.type === "ping"} onChange={(event) => handleChange(event)} /> + handleChange(event)} + /> {errors["type"] ? ( { direction="row" justifyContent="flex-end" > - - Create monitor - + + Create monitor + ); }; -export default CreateMonitor; \ No newline at end of file +export default CreateMonitor; From 02b797244e76c4c71f75a5426c21a352de6e58d9 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Wed, 13 Nov 2024 15:33:18 +0800 Subject: [PATCH 38/49] Add docker type to uptime slice --- Client/src/Features/UptimeMonitors/uptimeMonitorsSlice.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Client/src/Features/UptimeMonitors/uptimeMonitorsSlice.js b/Client/src/Features/UptimeMonitors/uptimeMonitorsSlice.js index 601dc016a..d472a673a 100644 --- a/Client/src/Features/UptimeMonitors/uptimeMonitorsSlice.js +++ b/Client/src/Features/UptimeMonitors/uptimeMonitorsSlice.js @@ -40,7 +40,7 @@ export const checkEndpointResolution = createAsyncThunk( const res = await networkService.checkEndpointResolution({ authToken: authToken, monitorURL: monitorURL, - }) + }); return res.data; } catch (error) { if (error.response && error.response.data) { @@ -53,7 +53,7 @@ export const checkEndpointResolution = createAsyncThunk( return thunkApi.rejectWithValue(payload); } } -) +); export const getUptimeMonitorById = createAsyncThunk( "monitors/getMonitorById", @@ -86,7 +86,7 @@ export const getUptimeMonitorsByTeamId = createAsyncThunk( const res = await networkService.getMonitorsAndSummaryByTeamId({ authToken: token, teamId: user.teamId, - types: ["http", "ping"], + types: ["http", "ping", "docker"], }); return res.data; } catch (error) { From f05c46a8fe16d3b724966d902743313880abee77 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Wed, 13 Nov 2024 15:33:48 +0800 Subject: [PATCH 39/49] Add docker type to monitor table query --- Client/src/Pages/Monitors/Home/MonitorTable/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Client/src/Pages/Monitors/Home/MonitorTable/index.jsx b/Client/src/Pages/Monitors/Home/MonitorTable/index.jsx index d9fbc34b2..5970a5c54 100644 --- a/Client/src/Pages/Monitors/Home/MonitorTable/index.jsx +++ b/Client/src/Pages/Monitors/Home/MonitorTable/index.jsx @@ -150,7 +150,7 @@ const MonitorTable = ({ isAdmin, filter, setIsSearching, isSearching }) => { authToken, teamId: user.teamId, limit: 25, - types: ["http", "ping"], + types: ["http", "ping", "docker"], status: null, checkOrder: "desc", normalize: true, From 8a407f61feeebf6d63617ab8ae47639820e8d482 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Wed, 13 Nov 2024 15:34:10 +0800 Subject: [PATCH 40/49] Update validation for docker types --- Server/validation/joi.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Server/validation/joi.js b/Server/validation/joi.js index 07521c7e0..82a732686 100644 --- a/Server/validation/joi.js +++ b/Server/validation/joi.js @@ -144,8 +144,8 @@ const getMonitorsAndSummaryByTeamIdQueryValidation = joi.object({ type: joi .alternatives() .try( - joi.string().valid("http", "ping", "pagespeed"), - joi.array().items(joi.string().valid("http", "ping", "pagespeed")) + joi.string().valid("http", "ping", "pagespeed", "docker"), + joi.array().items(joi.string().valid("http", "ping", "pagespeed", "docker")) ), }); @@ -161,8 +161,8 @@ const getMonitorsByTeamIdQueryValidation = joi.object({ type: joi .alternatives() .try( - joi.string().valid("http", "ping", "pagespeed"), - joi.array().items(joi.string().valid("http", "ping", "pagespeed")) + joi.string().valid("http", "ping", "pagespeed", "docker"), + joi.array().items(joi.string().valid("http", "ping", "pagespeed", "docker")) ), page: joi.number(), rowsPerPage: joi.number(), From 20d84e0a18d8de655bfe3bf2cb4df0f862e2d7ec Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Wed, 13 Nov 2024 15:34:31 +0800 Subject: [PATCH 41/49] Add docker to check map --- Server/db/mongo/modules/monitorModule.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Server/db/mongo/modules/monitorModule.js b/Server/db/mongo/modules/monitorModule.js index 28bf89d82..5f71dfba1 100644 --- a/Server/db/mongo/modules/monitorModule.js +++ b/Server/db/mongo/modules/monitorModule.js @@ -20,6 +20,7 @@ const SERVICE_NAME = "monitorModule"; const CHECK_MODEL_LOOKUP = { http: Check, ping: Check, + docker: Check, pagespeed: PageSpeedCheck, hardware: HardwareCheck, }; From 9db3e0e6df40623e14ccbcef5f098f3c85398627 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Wed, 13 Nov 2024 15:37:40 +0800 Subject: [PATCH 42/49] Add docker type to getMonitorStatsById --- Server/db/mongo/modules/monitorModule.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/db/mongo/modules/monitorModule.js b/Server/db/mongo/modules/monitorModule.js index 5f71dfba1..4d355141d 100644 --- a/Server/db/mongo/modules/monitorModule.js +++ b/Server/db/mongo/modules/monitorModule.js @@ -350,7 +350,7 @@ const getMonitorStatsById = async (req) => { ), }; - if (monitor.type === "http" || monitor.type === "ping") { + if (monitor.type === "http" || monitor.type === "ping" || monitor.type === "docker") { // HTTP/PING Specific stats monitorStats.periodAvgResponseTime = getAverageResponseTime(checksForDateRange); monitorStats.periodUptime = getUptimePercentage(checksForDateRange); From 5ad5ba7e6fd940c259d92564ac85e69d0b9f5259 Mon Sep 17 00:00:00 2001 From: Caio Cabral Date: Wed, 13 Nov 2024 05:50:32 -0500 Subject: [PATCH 43/49] feat: removing all colors from codebase that do not come from theme --- Client/src/App.css | 7 -- Client/src/App.jsx | 1 - .../src/Components/Charts/BarChart/index.jsx | 4 +- Client/src/Components/Inputs/Radio/index.jsx | 2 +- Client/src/Components/Label/index.css | 1 - Client/src/Components/Label/index.jsx | 6 +- Client/src/Utils/Theme/constants.js | 91 +++++++------------ Client/src/Utils/Theme/darkTheme.js | 9 +- Client/src/Utils/Theme/lightTheme.js | 8 +- 9 files changed, 54 insertions(+), 75 deletions(-) delete mode 100644 Client/src/App.css diff --git a/Client/src/App.css b/Client/src/App.css deleted file mode 100644 index 44e06cd5f..000000000 --- a/Client/src/App.css +++ /dev/null @@ -1,7 +0,0 @@ -.card { - padding: 2em; -} - -.read-the-docs { - color: #888; -} diff --git a/Client/src/App.jsx b/Client/src/App.jsx index 1a59ea9e5..151512701 100644 --- a/Client/src/App.jsx +++ b/Client/src/App.jsx @@ -2,7 +2,6 @@ import { useEffect } from "react"; import { Routes, Route, Navigate } from "react-router-dom"; import { useSelector } from "react-redux"; import { useDispatch } from "react-redux"; -// import "./App.css"; import "react-toastify/dist/ReactToastify.css"; import { ToastContainer } from "react-toastify"; import NotFound from "./Pages/NotFound"; diff --git a/Client/src/Components/Charts/BarChart/index.jsx b/Client/src/Components/Charts/BarChart/index.jsx index c6308ee2d..70fd66390 100644 --- a/Client/src/Components/Charts/BarChart/index.jsx +++ b/Client/src/Components/Charts/BarChart/index.jsx @@ -141,7 +141,9 @@ const BarChart = ({ checks = [] }) => { width="9px" height="100%" backgroundColor={ - check.status ? theme.palette.success.dark : theme.palette.error.dark + check.status + ? theme.palette.success.contrastText + : theme.palette.error.dark } sx={{ borderRadius: theme.spacing(1.5), diff --git a/Client/src/Components/Inputs/Radio/index.jsx b/Client/src/Components/Inputs/Radio/index.jsx index a0874b25b..7a700e2b7 100644 --- a/Client/src/Components/Inputs/Radio/index.jsx +++ b/Client/src/Components/Inputs/Radio/index.jsx @@ -41,7 +41,7 @@ const Radio = (props) => { color: "transparent", width: 16, height: 16, - boxShadow: "inset 0 0 0 1px #656a74", + boxShadow: `inset 0 0 0 1px ${theme.palette.secondary.main}`, mt: theme.spacing(0.5), }} /> diff --git a/Client/src/Components/Label/index.css b/Client/src/Components/Label/index.css index 104d43410..d3fe53da5 100644 --- a/Client/src/Components/Label/index.css +++ b/Client/src/Components/Label/index.css @@ -1,5 +1,4 @@ .label { - border: 1px solid #000; display: inline-flex; justify-content: center; align-items: center; diff --git a/Client/src/Components/Label/index.jsx b/Client/src/Components/Label/index.jsx index 97cc3e5f3..eb6499a31 100644 --- a/Client/src/Components/Label/index.jsx +++ b/Client/src/Components/Label/index.jsx @@ -31,7 +31,7 @@ const BaseLabel = ({ label, styles, children }) => { className="label" sx={{ borderRadius: borderRadius, - borderColor: theme.palette.text.tertiary, + border: `1px solid ${theme.palette.text.tertiary}`, color: theme.palette.text.tertiary, padding: padding, ...styles, @@ -127,8 +127,8 @@ const StatusLabel = ({ status, text, customStyles }) => { const colors = { up: { dotColor: theme.palette.success.main, - bgColor: theme.palette.success.dark, - borderColor: theme.palette.success.light, + bgColor: theme.palette.success./* dark */ contrastText, + borderColor: theme.palette.success.main /* light */, }, down: { dotColor: theme.palette.error.contrastText, diff --git a/Client/src/Utils/Theme/constants.js b/Client/src/Utils/Theme/constants.js index 7beaaa20a..4fa2292c3 100644 --- a/Client/src/Utils/Theme/constants.js +++ b/Client/src/Utils/Theme/constants.js @@ -8,7 +8,7 @@ const typographyLevels = { xl: `${(typographyBase + 10) / 16}rem`, }; -/* TODO Expand this */ +/* TODO Review color palette and semantic colors */ const paletteColors = { white: "#FFFFFF", gray50: "#FEFEFE", @@ -16,34 +16,19 @@ const paletteColors = { gray70: "#FDFDFD", gray80: "#FDFCFD", gray90: "#FCFCFD", - /* gray95: "#FAFAFA", - gray97: "#F9FAFB", */ gray100: "#F4F4F4", - /* gray125: "#F2F4F7", - gray150: "#EAECF0", - gray180: "#E6E6E6", */ gray200: "#E3E3E3", - /* gray225: "#D6D9DD", - gray250: "#D0D5DD", */ gray300: "#A2A3A3", - /* gray350: "#A1A1AA", - gray450: "#8E8E8F", */ gray500: "#838C99", gray600: "#454546", gray750: "#36363E", gray800: "#2D2D33", - /* gray815: "#27272A", - gray830: "#262115", - gray835: "#18181a", - gray840: "#151518", */ gray850: "#131315", gray860: "#111113", gray870: "#0F0F11", gray880: "#0C0C0E", gray890: "#09090B", - black: "#000000", blueGray20: "#E8F0FE", - blueGray40: "#E2EAF7", blueGray150: "#667085", blueGray200: "#475467", blueGray400: "#344054", @@ -52,10 +37,8 @@ const paletteColors = { blue700: "#4E5BA6", purple300: "#664EFF", purple400: "#3A1BFF", - green20: "#ECFDF3", green50: "#D4F4E1", green150: "#45BB7A", - green200: "#17B26A", green400: "#079455", green800: "#1C4428", green900: "#12261E", @@ -87,34 +70,34 @@ const semanticColors = { light: paletteColors.gray100, dark: paletteColors.gray800, }, - // TODO we dont have secondary light - dark: { - light: paletteColors.gray200, - //TODO we dont have secondary dark for dark mode - }, constrastText: { light: paletteColors.blueGray200, - //TODO we dont have secondary contrastText for dark mode + dark: paletteColors.blueGray200, + }, + light: { + light: paletteColors.gray200, + dark: paletteColors.gray200, + }, + dark: { + light: paletteColors.gray200, + dark: paletteColors.gray200, }, }, success: { main: { - light: paletteColors.green200, - dark: paletteColors.green150, - }, - contrastText: { - //TODO values are equal (confirm) - //TODO contrasttext semantically should be something that contrasts with the main light: paletteColors.green400, dark: paletteColors.green400, }, + contrastText: { + light: paletteColors.green50, + dark: paletteColors.green900, + }, light: { light: paletteColors.green50, - //TODO dark mode light success is darker than the main success - dark: paletteColors.green800, + dark: paletteColors.green150, }, dark: { - light: paletteColors.green20, + light: paletteColors.green800, dark: paletteColors.green900, }, }, @@ -124,9 +107,8 @@ const semanticColors = { dark: paletteColors.red300, }, contrastText: { - //TODO contrasttext semantically should be something that contrasts with the main light: paletteColors.gray50, - dark: paletteColors.red50, + dark: paletteColors.gray50, }, light: { light: paletteColors.red100, @@ -142,17 +124,17 @@ const semanticColors = { light: paletteColors.orange300, dark: paletteColors.orange400, }, - light: { - light: paletteColors.orange100, - dark: paletteColors.orange800, - }, contrastText: { light: paletteColors.orange600, dark: paletteColors.orange500, }, + light: { + light: paletteColors.orange100, + dark: paletteColors.orange800, + }, dark: { light: paletteColors.orange50, - dark: paletteColors.gray830, + dark: paletteColors.gray800, }, }, /* From this part on, try to create semantic structure, not feature based structure */ @@ -181,7 +163,7 @@ const semanticColors = { background: { main: { light: paletteColors.white, - dark: paletteColors.gray840, + dark: paletteColors.gray850, }, alt: { light: paletteColors.gray90, @@ -193,7 +175,7 @@ const semanticColors = { }, accent: { light: paletteColors.gray100, - dark: paletteColors.gray835, + dark: paletteColors.gray850, }, }, text: { @@ -203,44 +185,39 @@ const semanticColors = { }, secondary: { light: paletteColors.blueGray400, - dark: paletteColors.gray180, + dark: paletteColors.gray200, }, tertiary: { light: paletteColors.blueGray200, - dark: paletteColors.gray350, + dark: paletteColors.gray300, }, accent: { light: paletteColors.gray500, - dark: paletteColors.gray450, + dark: paletteColors.gray500, }, }, border: { light: { - light: paletteColors.gray150, - dark: paletteColors.gray815, + light: paletteColors.gray200, + dark: paletteColors.gray800, }, dark: { - light: paletteColors.gray250, + light: paletteColors.gray200, dark: paletteColors.gray750, }, }, - percentage: { - /* uptimeFair: { - light: paletteColors. - } */ - }, unresolved: { main: { light: paletteColors.blue700, dark: paletteColors.purple300, }, light: { - light: paletteColors.blueGray40, + light: paletteColors.blueGray20, dark: paletteColors.purple400, }, bg: { - light: paletteColors.gray125, - dark: paletteColors.gray125, + light: paletteColors.gray100, + dark: paletteColors.gray100, }, }, other: { @@ -248,7 +225,7 @@ const semanticColors = { light: paletteColors.blueGray150, }, line: { - light: paletteColors.gray225, + light: paletteColors.gray200, }, grid: { light: paletteColors.gray300, diff --git a/Client/src/Utils/Theme/darkTheme.js b/Client/src/Utils/Theme/darkTheme.js index 7dfb0d38a..ff2c628d2 100644 --- a/Client/src/Utils/Theme/darkTheme.js +++ b/Client/src/Utils/Theme/darkTheme.js @@ -24,7 +24,12 @@ const { const palette = { primary: { main: primary.main.dark }, - secondary: { main: secondary.main.dark }, + secondary: { + main: secondary.main.dark, + contrastText: secondary.constrastText.dark, + light: secondary.dark.dark, + dark: secondary.dark.dark, + }, success: { main: success.main.dark, contrastText: success.contrastText.dark, @@ -48,7 +53,7 @@ const palette = { uptimePoor: error.main.dark, uptimeFair: warning.contrastText.dark, uptimeGood: warning.main.dark /* Change for a success color? ?*/, - uptimeExcellent: success.contrastText.light, + uptimeExcellent: success.main.dark, }, unresolved: { main: unresolved.main.dark, diff --git a/Client/src/Utils/Theme/lightTheme.js b/Client/src/Utils/Theme/lightTheme.js index f345b227b..d65146486 100644 --- a/Client/src/Utils/Theme/lightTheme.js +++ b/Client/src/Utils/Theme/lightTheme.js @@ -3,7 +3,10 @@ import { baseTheme } from "./globalTheme"; import { colors } from "./constants"; /* +TODO Next step: check if all here are being used. +*/ +/* TODO Check for Hex in code base @@ -34,8 +37,9 @@ const palette = { primary: { main: primary.main.light }, secondary: { main: secondary.main.light, - dark: secondary.dark.light, contrastText: secondary.constrastText.light, + light: secondary.dark.light, + dark: secondary.dark.light, }, success: { main: success.main.light, @@ -60,7 +64,7 @@ const palette = { uptimePoor: error.main.light, uptimeFair: warning.contrastText.light, uptimeGood: warning.main.light /* Change for a success color? */, - uptimeExcellent: success.contrastText.light, + uptimeExcellent: success.main.light, }, unresolved: { main: unresolved.main.light, From 6c521436adabc468dc5f9dd1e62f93b90d8359eb Mon Sep 17 00:00:00 2001 From: Caio Cabral Date: Wed, 13 Nov 2024 06:08:58 -0500 Subject: [PATCH 44/49] chore adding comments --- Client/src/Components/Alert/index.jsx | 4 +++- Client/src/Utils/Theme/constants.js | 5 +++++ Client/src/Utils/Theme/lightTheme.js | 9 ++------- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Client/src/Components/Alert/index.jsx b/Client/src/Components/Alert/index.jsx index 116ac5dea..bf941368a 100644 --- a/Client/src/Components/Alert/index.jsx +++ b/Client/src/Components/Alert/index.jsx @@ -31,7 +31,9 @@ const icons = { const Alert = ({ variant, title, body, isToast, hasIcon = true, onClick }) => { const theme = useTheme(); - /* TODO check if this still works. text bg and border not necessarilly exist. Text becomes contrastText. border becomes contrastText. bg becomes dark */ + /* TODO + This needs fixing. text bg and border not necessarilly exist. Probably text becomes contrastText. border becomes contrastText. bg becomes dark. + Check possible variants, see implementation in light and dark theme, and adjust */ const { text, bg, border } = theme.palette[variant]; const icon = icons[variant]; diff --git a/Client/src/Utils/Theme/constants.js b/Client/src/Utils/Theme/constants.js index 4fa2292c3..1944da40f 100644 --- a/Client/src/Utils/Theme/constants.js +++ b/Client/src/Utils/Theme/constants.js @@ -1,4 +1,9 @@ const typographyBase = 14; + +/* TODO +Check for px in codebase. All font sizes should be in REM and should live here. +Rest should be checked on each case +*/ const typographyLevels = { base: typographyBase, xs: `${(typographyBase - 4) / 16}rem`, diff --git a/Client/src/Utils/Theme/lightTheme.js b/Client/src/Utils/Theme/lightTheme.js index d65146486..e03fd9ee7 100644 --- a/Client/src/Utils/Theme/lightTheme.js +++ b/Client/src/Utils/Theme/lightTheme.js @@ -4,13 +4,7 @@ import { colors } from "./constants"; /* TODO -Next step: check if all here are being used. -*/ -/* TODO - -Check for Hex in code base - -Check for px in codebase +Next step: check if all keys here are being used in the codebase. e.g.: Search codebase for palette.primary; also check for destructuring palette ('= theme.palette') */ const { @@ -111,6 +105,7 @@ const palette = { }, }; +/* TODO I figured out we could have just one theme by passing mode as parameter for theme function. Implement later */ const lightTheme = createTheme({ palette, ...baseTheme(palette), From 5797a03a4cbc745960a8ac8a63068e5d98c7a5ee Mon Sep 17 00:00:00 2001 From: Caio Cabral Date: Wed, 13 Nov 2024 07:48:34 -0500 Subject: [PATCH 45/49] merge --- Client/package-lock.json | 171 +++++---------------------------------- Client/package.json | 2 +- 2 files changed, 19 insertions(+), 154 deletions(-) diff --git a/Client/package-lock.json b/Client/package-lock.json index aa9a9d7ff..1a005e6f1 100644 --- a/Client/package-lock.json +++ b/Client/package-lock.json @@ -14,7 +14,7 @@ "@fontsource/roboto": "^5.0.13", "@mui/icons-material": "^5.15.17", "@mui/lab": "^5.0.0-alpha.170", - "@mui/material": "6.1", + "@mui/material": "^5.16.7", "@mui/x-charts": "^7.5.1", "@mui/x-data-grid": "7.22.2", "@mui/x-date-pickers": "7.22.2", @@ -1136,9 +1136,9 @@ } }, "node_modules/@mui/core-downloads-tracker": { - "version": "6.1.6", - "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-6.1.6.tgz", - "integrity": "sha512-nz1SlR9TdBYYPz4qKoNasMPRiGb4PaIHFkzLzhju0YVYS5QSuFF2+n7CsiHMIDcHv3piPu/xDWI53ruhOqvZwQ==", + "version": "5.16.7", + "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.16.7.tgz", + "integrity": "sha512-RtsCt4Geed2/v74sbihWzzRs+HsIQCfclHeORh5Ynu2fS4icIKozcSubwuG7vtzq2uW3fOR1zITSP84TNt2GoQ==", "license": "MIT", "funding": { "type": "opencollective", @@ -1213,26 +1213,26 @@ } }, "node_modules/@mui/material": { - "version": "6.1.6", - "resolved": "https://registry.npmjs.org/@mui/material/-/material-6.1.6.tgz", - "integrity": "sha512-1yvejiQ/601l5AK3uIdUlAVElyCxoqKnl7QA+2oFB/2qYPWfRwDgavW/MoywS5Y2gZEslcJKhe0s2F3IthgFgw==", + "version": "5.16.7", + "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.16.7.tgz", + "integrity": "sha512-cwwVQxBhK60OIOqZOVLFt55t01zmarKJiJUWbk0+8s/Ix5IaUzAShqlJchxsIQ4mSrWqgcKCCXKtIlG5H+/Jmg==", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.26.0", - "@mui/core-downloads-tracker": "^6.1.6", - "@mui/system": "^6.1.6", - "@mui/types": "^7.2.19", - "@mui/utils": "^6.1.6", + "@babel/runtime": "^7.23.9", + "@mui/core-downloads-tracker": "^5.16.7", + "@mui/system": "^5.16.7", + "@mui/types": "^7.2.15", + "@mui/utils": "^5.16.6", "@popperjs/core": "^2.11.8", - "@types/react-transition-group": "^4.4.11", - "clsx": "^2.1.1", + "@types/react-transition-group": "^4.4.10", + "clsx": "^2.1.0", "csstype": "^3.1.3", "prop-types": "^15.8.1", "react-is": "^18.3.1", "react-transition-group": "^4.4.5" }, "engines": { - "node": ">=14.0.0" + "node": ">=12.0.0" }, "funding": { "type": "opencollective", @@ -1241,10 +1241,9 @@ "peerDependencies": { "@emotion/react": "^11.5.0", "@emotion/styled": "^11.3.0", - "@mui/material-pigment-css": "^6.1.6", - "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", - "react": "^17.0.0 || ^18.0.0 || ^19.0.0", - "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0" + "@types/react": "^17.0.0 || ^18.0.0", + "react": "^17.0.0 || ^18.0.0", + "react-dom": "^17.0.0 || ^18.0.0" }, "peerDependenciesMeta": { "@emotion/react": { @@ -1253,140 +1252,6 @@ "@emotion/styled": { "optional": true }, - "@mui/material-pigment-css": { - "optional": true - }, - "@types/react": { - "optional": true - } - } - }, - "node_modules/@mui/material/node_modules/@mui/private-theming": { - "version": "6.1.6", - "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-6.1.6.tgz", - "integrity": "sha512-ioAiFckaD/fJSnTrUMWgjl9HYBWt7ixCh7zZw7gDZ+Tae7NuprNV6QJK95EidDT7K0GetR2rU3kAeIR61Myttw==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.26.0", - "@mui/utils": "^6.1.6", - "prop-types": "^15.8.1" - }, - "engines": { - "node": ">=14.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/mui-org" - }, - "peerDependencies": { - "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", - "react": "^17.0.0 || ^18.0.0 || ^19.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@mui/material/node_modules/@mui/styled-engine": { - "version": "6.1.6", - "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-6.1.6.tgz", - "integrity": "sha512-I+yS1cSuSvHnZDBO7e7VHxTWpj+R7XlSZvTC4lS/OIbUNJOMMSd3UDP6V2sfwzAdmdDNBi7NGCRv2SZ6O9hGDA==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.26.0", - "@emotion/cache": "^11.13.1", - "@emotion/serialize": "^1.3.2", - "@emotion/sheet": "^1.4.0", - "csstype": "^3.1.3", - "prop-types": "^15.8.1" - }, - "engines": { - "node": ">=14.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/mui-org" - }, - "peerDependencies": { - "@emotion/react": "^11.4.1", - "@emotion/styled": "^11.3.0", - "react": "^17.0.0 || ^18.0.0 || ^19.0.0" - }, - "peerDependenciesMeta": { - "@emotion/react": { - "optional": true - }, - "@emotion/styled": { - "optional": true - } - } - }, - "node_modules/@mui/material/node_modules/@mui/system": { - "version": "6.1.6", - "resolved": "https://registry.npmjs.org/@mui/system/-/system-6.1.6.tgz", - "integrity": "sha512-qOf1VUE9wK8syiB0BBCp82oNBAVPYdj4Trh+G1s+L+ImYiKlubWhhqlnvWt3xqMevR+D2h1CXzA1vhX2FvA+VQ==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.26.0", - "@mui/private-theming": "^6.1.6", - "@mui/styled-engine": "^6.1.6", - "@mui/types": "^7.2.19", - "@mui/utils": "^6.1.6", - "clsx": "^2.1.1", - "csstype": "^3.1.3", - "prop-types": "^15.8.1" - }, - "engines": { - "node": ">=14.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/mui-org" - }, - "peerDependencies": { - "@emotion/react": "^11.5.0", - "@emotion/styled": "^11.3.0", - "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", - "react": "^17.0.0 || ^18.0.0 || ^19.0.0" - }, - "peerDependenciesMeta": { - "@emotion/react": { - "optional": true - }, - "@emotion/styled": { - "optional": true - }, - "@types/react": { - "optional": true - } - } - }, - "node_modules/@mui/material/node_modules/@mui/utils": { - "version": "6.1.6", - "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-6.1.6.tgz", - "integrity": "sha512-sBS6D9mJECtELASLM+18WUcXF6RH3zNxBRFeyCRg8wad6NbyNrdxLuwK+Ikvc38sTZwBzAz691HmSofLqHd9sQ==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.26.0", - "@mui/types": "^7.2.19", - "@types/prop-types": "^15.7.13", - "clsx": "^2.1.1", - "prop-types": "^15.8.1", - "react-is": "^18.3.1" - }, - "engines": { - "node": ">=14.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/mui-org" - }, - "peerDependencies": { - "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", - "react": "^17.0.0 || ^18.0.0 || ^19.0.0" - }, - "peerDependenciesMeta": { "@types/react": { "optional": true } diff --git a/Client/package.json b/Client/package.json index 846276b85..cf8cfd7cf 100644 --- a/Client/package.json +++ b/Client/package.json @@ -17,7 +17,7 @@ "@fontsource/roboto": "^5.0.13", "@mui/icons-material": "^5.15.17", "@mui/lab": "^5.0.0-alpha.170", - "@mui/material": "6.1", + "@mui/material": "^5.16.7", "@mui/x-charts": "^7.5.1", "@mui/x-data-grid": "7.22.2", "@mui/x-date-pickers": "7.22.2", From cae03c7c9870aace797e6f1c11a3709382e70cab Mon Sep 17 00:00:00 2001 From: Caio Cabral Date: Wed, 13 Nov 2024 21:05:31 -0500 Subject: [PATCH 46/49] remove unused code from Sidebar --- Client/src/Components/Sidebar/index.jsx | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/Client/src/Components/Sidebar/index.jsx b/Client/src/Components/Sidebar/index.jsx index 0019486df..2e91289f8 100644 --- a/Client/src/Components/Sidebar/index.jsx +++ b/Client/src/Components/Sidebar/index.jsx @@ -19,7 +19,7 @@ import { useLocation, useNavigate } from "react-router"; import { useTheme } from "@emotion/react"; import { useDispatch, useSelector } from "react-redux"; import { clearAuthState } from "../../Features/Auth/authSlice"; -import { /* setMode, */ toggleSidebar } from "../../Features/UI/uiSlice"; +import { toggleSidebar } from "../../Features/UI/uiSlice"; import { clearUptimeMonitorState } from "../../Features/UptimeMonitors/uptimeMonitorsSlice"; import Avatar from "../Avatar"; import LockSvg from "../../assets/icons/lock.svg?react"; @@ -29,7 +29,6 @@ import LogoutSvg from "../../assets/icons/logout.svg?react"; import Support from "../../assets/icons/support.svg?react"; import Dashboard from "../../assets/icons/dashboard.svg?react"; import Account from "../../assets/icons/user-edit.svg?react"; -/* import StatusPages from "../../assets/icons/status-pages.svg?react"; */ import Maintenance from "../../assets/icons/maintenance.svg?react"; import Monitors from "../../assets/icons/monitors.svg?react"; import Incidents from "../../assets/icons/incidents.svg?react"; @@ -625,22 +624,6 @@ function Sidebar() { )} {collapsed && } - {/* { - dispatch(setMode("light")); - closePopup(); - }} - > - Light - - { - dispatch(setMode("dark")); - closePopup(); - }} - > - Dark - */} Date: Wed, 13 Nov 2024 21:10:00 -0500 Subject: [PATCH 47/49] chore: adding jsdocs --- Client/src/Pages/Infrastructure/index.jsx | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Client/src/Pages/Infrastructure/index.jsx b/Client/src/Pages/Infrastructure/index.jsx index 0e78c4904..324268af7 100644 --- a/Client/src/Pages/Infrastructure/index.jsx +++ b/Client/src/Pages/Infrastructure/index.jsx @@ -1,6 +1,13 @@ import { Box, Button } from "@mui/material"; import { Heading } from "../../Components/Heading"; +/** + * This is the Infrastructure monitoring page. This is a work in progress + * + * @param - Define params. + * @returns {JSX.Element} The infrastructure monitoring page. + */ + function Infrastructure() { return ( From b13f4b1633d8a3bb9fe078b7e3545b34a772a3d2 Mon Sep 17 00:00:00 2001 From: Caio Cabral Date: Wed, 13 Nov 2024 21:11:41 -0500 Subject: [PATCH 48/49] fix: fixing typo --- Client/src/Utils/Theme/constants.js | 2 +- Client/src/Utils/Theme/darkTheme.js | 2 +- Client/src/Utils/Theme/lightTheme.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Client/src/Utils/Theme/constants.js b/Client/src/Utils/Theme/constants.js index 1944da40f..0626edbaa 100644 --- a/Client/src/Utils/Theme/constants.js +++ b/Client/src/Utils/Theme/constants.js @@ -75,7 +75,7 @@ const semanticColors = { light: paletteColors.gray100, dark: paletteColors.gray800, }, - constrastText: { + contrastText: { light: paletteColors.blueGray200, dark: paletteColors.blueGray200, }, diff --git a/Client/src/Utils/Theme/darkTheme.js b/Client/src/Utils/Theme/darkTheme.js index ff2c628d2..0f4a391de 100644 --- a/Client/src/Utils/Theme/darkTheme.js +++ b/Client/src/Utils/Theme/darkTheme.js @@ -26,7 +26,7 @@ const palette = { primary: { main: primary.main.dark }, secondary: { main: secondary.main.dark, - contrastText: secondary.constrastText.dark, + contrastText: secondary.contrastText.dark, light: secondary.dark.dark, dark: secondary.dark.dark, }, diff --git a/Client/src/Utils/Theme/lightTheme.js b/Client/src/Utils/Theme/lightTheme.js index e03fd9ee7..8bc6434c6 100644 --- a/Client/src/Utils/Theme/lightTheme.js +++ b/Client/src/Utils/Theme/lightTheme.js @@ -31,7 +31,7 @@ const palette = { primary: { main: primary.main.light }, secondary: { main: secondary.main.light, - contrastText: secondary.constrastText.light, + contrastText: secondary.contrastText.light, light: secondary.dark.light, dark: secondary.dark.light, }, From 7eaba0a47d19bc39e34933ff0ddcface1d4ad966 Mon Sep 17 00:00:00 2001 From: Caio Cabral Date: Wed, 13 Nov 2024 21:14:57 -0500 Subject: [PATCH 49/49] feat: removing package 6 --- Client/package-lock.json | 7 ------- Client/package.json | 1 - 2 files changed, 8 deletions(-) diff --git a/Client/package-lock.json b/Client/package-lock.json index 1a005e6f1..095a013f7 100644 --- a/Client/package-lock.json +++ b/Client/package-lock.json @@ -8,7 +8,6 @@ "name": "client", "version": "0.0.0", "dependencies": { - "6": "^0.0.1", "@emotion/react": "^11.13.3", "@emotion/styled": "^11.13.0", "@fontsource/roboto": "^5.0.13", @@ -2418,12 +2417,6 @@ "vite": "^4.2.0 || ^5.0.0" } }, - "node_modules/6": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/6/-/6-0.0.1.tgz", - "integrity": "sha512-kMT8ZPwxbwjMM73Cpy+VbrcYILF5a7UbuziJBcMPCEG33XCw4h00XecvmBMUD2KFfugBolHUmoSzjyl7Wtzbeg==", - "license": "mit" - }, "node_modules/acorn": { "version": "8.12.1", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", diff --git a/Client/package.json b/Client/package.json index cf8cfd7cf..a13ee09ae 100644 --- a/Client/package.json +++ b/Client/package.json @@ -11,7 +11,6 @@ "preview": "vite preview" }, "dependencies": { - "6": "^0.0.1", "@emotion/react": "^11.13.3", "@emotion/styled": "^11.13.0", "@fontsource/roboto": "^5.0.13",