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 new file mode 100644 index 000000000..f7fc0d3d8 --- /dev/null +++ b/Client/src/Components/Charts/MonitorDetails60MinChart/index.jsx @@ -0,0 +1,50 @@ +import { BarChart, Bar, Cell, ReferenceLine, Label } from "recharts"; + +import PropTypes from "prop-types"; + +const MonitorDetails60MinChart = ({ data }) => { + const labelStyle = { + fontSize: "10px", + fill: "#475467", + }; + + 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) => ( + + ))} + + + + + + + + + ); +}; + +MonitorDetails60MinChart.propTypes = { + data: PropTypes.array.isRequired, +}; + +export default MonitorDetails60MinChart; diff --git a/Client/src/Pages/Monitors/Details/index.css b/Client/src/Pages/Monitors/Details/index.css index 359a002bc..127b7377a 100644 --- a/Client/src/Pages/Monitors/Details/index.css +++ b/Client/src/Pages/Monitors/Details/index.css @@ -3,12 +3,10 @@ color: var(--env-var-color-1); font-weight: 600; } -.monitor-details h2.MuiTypography-root, -.monitor-details h6.MuiTypography-root { +.monitor-details h2.MuiTypography-root { font-size: var(--env-var-font-size-large); } -.monitor-details h2.MuiTypography-root, -.monitor-details h4.MuiTypography-root { +.monitor-details h2.MuiTypography-root{ font-weight: 600; } .monitor-details h2.MuiTypography-root, @@ -35,15 +33,21 @@ } .monitor-details .stat-box { - flex: 1; + flex: 1 20%; min-width: 100px; border: solid 1px; border-radius: var(--env-var-radius-1); - padding: var(--env-var-spacing-1) 18px; + padding: var(--env-var-spacing-1) 16px; background-color: var(--env-var-color-8); } -.monitor-details .stat-box h6.MuiTypography-root { - margin-bottom: var(--env-var-spacing-1); +.monitor-details h6.MuiTypography-root { + font-size: var(--env-var-font-size-medium-plus); +} +.monitor-details h6.MuiTypography-root span.MuiTypography-root { + font-style: italic; + font-size: var(--env-var-font-size-medium); + color: var(--env-var-color-5); + opacity: 0.7; } .monitor-details button.MuiButtonBase-root, .monitor-details .stat-box { diff --git a/Client/src/Pages/Monitors/Details/index.jsx b/Client/src/Pages/Monitors/Details/index.jsx index 5f3ddf9fc..15cfd2c82 100644 --- a/Client/src/Pages/Monitors/Details/index.jsx +++ b/Client/src/Pages/Monitors/Details/index.jsx @@ -17,20 +17,23 @@ import { formatDurationRounded, } from "../../../Utils/timeUtils"; import "./index.css"; +import MonitorDetails60MinChart from "../../../Components/Charts/MonitorDetails60MinChart"; const StatBox = ({ title, value }) => { return ( - + {title} - {value} + + {value} + ); }; StatBox.propTypes = { - title: PropTypes.string, + title: PropTypes.oneOfType([PropTypes.string, PropTypes.element]), value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]), }; @@ -162,12 +165,12 @@ const DetailsPage = () => { <>