From b72fbc459901978e97c9bf22344a8c035d5d9305 Mon Sep 17 00:00:00 2001
From: Daniel Cojocea <danielcojocea28@gmail.com>
Date: Wed, 14 Aug 2024 14:54:43 -0400
Subject: [PATCH] Implement styling to match Figma designs

---
 Client/src/Components/BasicTable/index.css    |  2 +-
 .../Charts/MonitorDetails60MinChart/index.jsx | 63 ++++++++-----------
 Client/src/Pages/Monitors/Details/index.css   |  2 +-
 Client/src/Pages/Monitors/Details/index.jsx   | 48 +++++++-------
 4 files changed, 54 insertions(+), 61 deletions(-)

diff --git a/Client/src/Components/BasicTable/index.css b/Client/src/Components/BasicTable/index.css
index fd1f75b53..14adc440c 100644
--- a/Client/src/Components/BasicTable/index.css
+++ b/Client/src/Components/BasicTable/index.css
@@ -72,7 +72,7 @@
 }
 
 .MuiPaper-root + .MuiPagination-root {
-  margin-top: 35px;
+  margin-top: 24px;
   border: solid 1px var(--env-var-color-16);
   border-radius: var(--env-var-radius-1);
   padding: var(--env-var-spacing-1-plus) var(--env-var-spacing-2);
diff --git a/Client/src/Components/Charts/MonitorDetails60MinChart/index.jsx b/Client/src/Components/Charts/MonitorDetails60MinChart/index.jsx
index 719f711b7..ac7d1ee3b 100644
--- a/Client/src/Components/Charts/MonitorDetails60MinChart/index.jsx
+++ b/Client/src/Components/Charts/MonitorDetails60MinChart/index.jsx
@@ -1,13 +1,4 @@
-import {
-  BarChart,
-  Bar,
-  XAxis,
-  YAxis,
-  Cell,
-  ResponsiveContainer,
-  ReferenceLine,
-  Label,
-} from "recharts";
+import { BarChart, Bar, Cell, ReferenceLine, Label } from "recharts";
 
 import PropTypes from "prop-types";
 
@@ -23,34 +14,32 @@ const MonitorDetails60MinChart = ({ data }) => {
     undefined: "var(--env-var-color-33)",
   };
   return (
-    <ResponsiveContainer width="100%" height={35}>
-      <BarChart
-        height={20}
-        data={data}
-        margin={{ top: 15, left: 15, right: 15, bottom: 0 }}
+    <BarChart
+      width={data.length * 10 + 30}
+      height={35}
+      data={data}
+      margin={{ top: 14, left: 15, right: 15, bottom: 2 }}
+      style={{ alignSelf: "baseline" }}
+    >
+      <Bar dataKey="value" barSize={10}>
+        {data.map((check, index) => (
+          <Cell key={`cell-${index}`} fill={color[check.status]} />
+        ))}
+      </Bar>
+      <ReferenceLine x={0} stroke="black" strokeDasharray="3 3">
+        <Label value="60 mins" position="top" style={labelStyle} />
+      </ReferenceLine>
+      <ReferenceLine
+        x={Math.floor(data.length * (2 / 3))}
+        stroke="black"
+        strokeDasharray="3 3"
       >
-        <XAxis hide={true} />
-        <YAxis hide={true} domain={[0, 100]} />
-        <Bar dataKey="value" barSize={15}>
-          {data.map((check, index) => (
-            <Cell key={`cell-${index}`} fill={color[check.status]} />
-          ))}
-        </Bar>
-        <ReferenceLine x={0} stroke="black" strokeDasharray="3 3">
-          <Label value="60 mins" position="top" style={labelStyle} />
-        </ReferenceLine>
-        <ReferenceLine
-          x={Math.floor(data.length * (2 / 3))}
-          stroke="black"
-          strokeDasharray="3 3"
-        >
-          <Label value="20 mins" position="top" style={labelStyle} />
-        </ReferenceLine>
-        <ReferenceLine x={data.length - 1} stroke="black" strokeDasharray="3 3">
-          <Label value="Now" position="top" style={labelStyle} />
-        </ReferenceLine>
-      </BarChart>
-    </ResponsiveContainer>
+        <Label value="20 mins" position="top" style={labelStyle} />
+      </ReferenceLine>
+      <ReferenceLine x={data.length - 1} stroke="black" strokeDasharray="3 3">
+        <Label value="now" position="top" style={labelStyle} />
+      </ReferenceLine>
+    </BarChart>
   );
 };
 
diff --git a/Client/src/Pages/Monitors/Details/index.css b/Client/src/Pages/Monitors/Details/index.css
index 359a002bc..e2bd28d77 100644
--- a/Client/src/Pages/Monitors/Details/index.css
+++ b/Client/src/Pages/Monitors/Details/index.css
@@ -35,7 +35,7 @@
 }
 
 .monitor-details .stat-box {
-  flex: 1;
+  flex: 1 20%;
   min-width: 100px;
   border: solid 1px;
   border-radius: var(--env-var-radius-1);
diff --git a/Client/src/Pages/Monitors/Details/index.jsx b/Client/src/Pages/Monitors/Details/index.jsx
index 5a670a4fd..3a20273b9 100644
--- a/Client/src/Pages/Monitors/Details/index.jsx
+++ b/Client/src/Pages/Monitors/Details/index.jsx
@@ -163,12 +163,12 @@ const DetailsPage = () => {
         <>
           <Button
             level="tertiary"
-            label="Back to Monitors"
+            label="Back"
             animate="slideLeft"
             img={<WestRoundedIcon />}
             onClick={() => navigate("/monitors")}
             sx={{
-              backgroundColor: "#f4f4f4",
+              backgroundColor: theme.palette.otherColors.fillGray,
               px: theme.gap.ml,
               "& svg.MuiSvgIcon-root": {
                 mr: theme.gap.small,
@@ -176,21 +176,24 @@ const DetailsPage = () => {
               },
             }}
           />
-          <Stack gap={theme.gap.xl} mt={theme.gap.medium}>
+          <Stack gap={theme.gap.large}>
             <Stack
               direction="row"
               gap={theme.gap.small}
               mt={theme.gap.small}
-              alignItems={"end"}
+              alignItems="baseline"
             >
               {monitor?.status ? <GreenCheck /> : <RedCheck />}
-              <Typography component="h1" sx={{ lineHeight: 1 }}>
-                {monitor.url?.replace(/^https?:\/\//, "") || "..."}
-              </Typography>
-              <MonitorDetails60MinChart data={monitor.statusBar} />
-            </Stack>
-            <Stack direction="row" gap={theme.gap.small}>
               <Box>
+                <Stack direction="row">
+                  <Typography
+                    component="h1"
+                    sx={{ lineHeight: 1, alignSelf: "flex-end" }}
+                  >
+                    {monitor.url?.replace(/^https?:\/\//, "") || "..."}
+                  </Typography>
+                  <MonitorDetails60MinChart data={monitor.statusBar} />
+                </Stack>
                 <Typography mt={theme.gap.small}>
                   <Typography
                     component="span"
@@ -203,8 +206,6 @@ const DetailsPage = () => {
                     Your site is {monitor?.status ? "up" : "down"}.
                   </Typography>{" "}
                   Checking every {formatDurationRounded(monitor?.interval)}.
-                  Last time checked{" "}
-                  {formatDurationRounded(monitor?.lastChecked)} ago.
                 </Typography>
               </Box>
               <Button
@@ -235,23 +236,18 @@ const DetailsPage = () => {
               direction="row"
               justifyContent="space-between"
               gap={theme.gap.large}
+              flexWrap="wrap"
             >
               <StatBox
                 title="Currently up for"
                 value={formatDuration(monitor?.uptimeDuration)}
               />
               <StatBox
-                title="Last checked"
+                title="Last check"
                 value={`${formatDuration(monitor?.lastChecked)} ago`}
               />
               <StatBox title="Incidents" value={monitor?.incidents} />
               <StatBox title="Certificate Expiry" value={certificateExpiry} />
-            </Stack>
-            <Stack
-              direction="row"
-              justifyContent="space-between"
-              gap={theme.gap.large}
-            >
               <StatBox
                 title="Latest response time"
                 value={monitor?.latestResponseTime}
@@ -269,7 +265,7 @@ const DetailsPage = () => {
                   .replace(/\.?0+$/, "")}%`}
               />
               <StatBox
-                title="Uptime(30 days)"
+                title="Uptime (30 days)"
                 value={`${parseFloat(monitor?.uptime30Days)
                   .toFixed(2)
                   .replace(/\.?0+$/, "")}%`}
@@ -281,7 +277,7 @@ const DetailsPage = () => {
                 justifyContent="space-between"
                 mb={theme.gap.ml}
               >
-                <Typography component="h2" mb={theme.gap.small}>
+                <Typography component="h2" alignSelf="flex-end">
                   Response Times
                 </Typography>
                 <ButtonGroup>
@@ -317,7 +313,15 @@ const DetailsPage = () => {
                   />
                 </ButtonGroup>
               </Stack>
-              <Box sx={{ height: "200px" }}>
+              <Box
+                p={theme.gap.mlplus}
+                pb={theme.gap.xs}
+                backgroundColor={theme.palette.otherColors.white}
+                border={1}
+                borderColor={theme.palette.otherColors.graishWhite}
+                borderRadius={`${theme.shape.borderRadius}px`}
+                sx={{ height: "250px" }}
+              >
                 <MonitorDetailsAreaChart
                   checks={[...monitor.checks].reverse()}
                 />