From ac5385746a5d67ebacfb61f404d3442210869bd0 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Tue, 13 Aug 2024 15:54:23 -0700 Subject: [PATCH] Justified URL, added placeholders --- .../Charts/MonitorDetails60MinChart/index.jsx | 17 ++++++++--------- Client/src/Pages/Monitors/Details/index.jsx | 7 ++++++- Client/src/index.css | 1 + Server/db/mongo/modules/monitorModule.js | 2 +- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/Client/src/Components/Charts/MonitorDetails60MinChart/index.jsx b/Client/src/Components/Charts/MonitorDetails60MinChart/index.jsx index 2c181eaec..719f711b7 100644 --- a/Client/src/Components/Charts/MonitorDetails60MinChart/index.jsx +++ b/Client/src/Components/Charts/MonitorDetails60MinChart/index.jsx @@ -16,8 +16,14 @@ const MonitorDetails60MinChart = ({ data }) => { fontSize: "8px", fill: "black", }; + + const color = { + true: "var(--env-var-color-23)", + false: "var(--env-var-color-24)", + undefined: "var(--env-var-color-33)", + }; return ( - + { {data.map((check, index) => ( - + ))} diff --git a/Client/src/Pages/Monitors/Details/index.jsx b/Client/src/Pages/Monitors/Details/index.jsx index a8b75e6cc..5a670a4fd 100644 --- a/Client/src/Pages/Monitors/Details/index.jsx +++ b/Client/src/Pages/Monitors/Details/index.jsx @@ -177,7 +177,12 @@ const DetailsPage = () => { }} /> - + {monitor?.status ? : } {monitor.url?.replace(/^https?:\/\//, "") || "..."} diff --git a/Client/src/index.css b/Client/src/index.css index 9e404d61c..58e26ed71 100644 --- a/Client/src/index.css +++ b/Client/src/index.css @@ -58,6 +58,7 @@ --env-var-color-30: #fcfcfd; --env-var-color-31: #1a1919; --env-var-color-32: #f5f5f5; + --env-var-color-33: rgba(83, 83, 83, 0.1); --env-var-radius-1: 4px; --env-var-radius-2: 8px; diff --git a/Server/db/mongo/modules/monitorModule.js b/Server/db/mongo/modules/monitorModule.js index 689521acd..65b20d471 100644 --- a/Server/db/mongo/modules/monitorModule.js +++ b/Server/db/mongo/modules/monitorModule.js @@ -139,7 +139,7 @@ const getStatusBarValues = (monitor, checks) => { }); for (let i = 0; i < noBlankChecks; i++) { - statusBarValues.push({ status: false, responseTime: 0, value: 0 }); + statusBarValues.push({ status: undefined, responseTime: 0, value: 75 }); } return statusBarValues.reverse(); };