From 9940cf9ef5b77cef0c021902b28a374504be48cf Mon Sep 17 00:00:00 2001 From: MuhammadKhalilzadeh Date: Thu, 20 Jun 2024 13:16:35 +0330 Subject: [PATCH] Chart solved --- .../Components/Charts/BarChart/BarChart.jsx | 12 +- .../DashboardSettingsIcon/index.css | 4 +- .../DashboardSettingsIcon/index.jsx | 2 +- Client/src/Mock/sample_data.json | 417 +++++++++++++++--- Client/src/Pages/Monitors/CurrentStats.jsx | 2 +- 5 files changed, 363 insertions(+), 74 deletions(-) diff --git a/Client/src/Components/Charts/BarChart/BarChart.jsx b/Client/src/Components/Charts/BarChart/BarChart.jsx index dd2ba070c..af148f6fe 100644 --- a/Client/src/Components/Charts/BarChart/BarChart.jsx +++ b/Client/src/Components/Charts/BarChart/BarChart.jsx @@ -1,18 +1,14 @@ import React from "react"; import "./barChart.css"; -const BarChart = () => { - const data = Array.from({ length: 12 }, () => - Math.floor(Math.random() * 100) - ); - +const BarChart = ({ checks }) => { return (
- {data.map((value, index) => ( + {checks.map((value, index) => (
))}
diff --git a/Client/src/Components/DashboardSettingsIcon/index.css b/Client/src/Components/DashboardSettingsIcon/index.css index 1221e542f..95dc58176 100644 --- a/Client/src/Components/DashboardSettingsIcon/index.css +++ b/Client/src/Components/DashboardSettingsIcon/index.css @@ -1,10 +1,10 @@ -.dashboard-setting-menu-item { +#dashboard-setting-menu-item { width: 135px; padding: 6px; margin: 5px 12px; } -.dashboard-setting-menu-item:hover { +#dashboard-setting-menu-item:hover { color: var(--env-var-color-26); } diff --git a/Client/src/Components/DashboardSettingsIcon/index.jsx b/Client/src/Components/DashboardSettingsIcon/index.jsx index d2b9b97be..f01e65900 100644 --- a/Client/src/Components/DashboardSettingsIcon/index.jsx +++ b/Client/src/Components/DashboardSettingsIcon/index.jsx @@ -74,7 +74,7 @@ function DashboardSettings() { > {settings.map((setting) => ( diff --git a/Client/src/Mock/sample_data.json b/Client/src/Mock/sample_data.json index 3007cd498..f5a57982d 100644 --- a/Client/src/Mock/sample_data.json +++ b/Client/src/Mock/sample_data.json @@ -19,7 +19,52 @@ "_id": "6671d84a9ba14f9f260eed27", "monitorId": "6671d8469ba14f9f260eed23", "status": true, - "responseTime": 2, + "responseTime": 143, + "createdAt": "2024-06-18T18:56:10.082Z", + "updatedAt": "2024-06-18T18:56:10.082Z", + "__v": 0 + }, + { + "_id": "6671d84a9ba14f9f260eed27", + "monitorId": "6671d8469ba14f9f260eed23", + "status": true, + "responseTime": 70, + "createdAt": "2024-06-18T18:56:10.082Z", + "updatedAt": "2024-06-18T18:56:10.082Z", + "__v": 0 + }, + { + "_id": "6671d8549ba14f9f260eed2d", + "monitorId": "6671d8469ba14f9f260eed23", + "status": false, + "responseTime": 120, + "createdAt": "2024-06-18T18:56:20.016Z", + "updatedAt": "2024-06-18T18:56:20.016Z", + "__v": 0 + }, + { + "_id": "6671d84a9ba14f9f260eed27", + "monitorId": "6671d8469ba14f9f260eed23", + "status": true, + "responseTime": 200, + "createdAt": "2024-06-18T18:56:10.082Z", + "updatedAt": "2024-06-18T18:56:10.082Z", + "__v": 0 + }, + { + "_id": "6671d8549ba14f9f260eed2d", + "monitorId": "6671d8469ba14f9f260eed23", + "status": false, + "responseTime": 250, + "createdAt": "2024-06-18T18:56:20.016Z", + "updatedAt": "2024-06-18T18:56:20.016Z", + "__v": 0 + }, + { + "_id": "6671d84a9ba14f9f260eed27", + "monitorId": "6671d8469ba14f9f260eed23", + "status": false, + "responseTime": 180, "createdAt": "2024-06-18T18:56:10.082Z", "updatedAt": "2024-06-18T18:56:10.082Z", "__v": 0 @@ -28,7 +73,25 @@ "_id": "6671d8549ba14f9f260eed2d", "monitorId": "6671d8469ba14f9f260eed23", "status": true, - "responseTime": 2, + "responseTime": 200, + "createdAt": "2024-06-18T18:56:20.016Z", + "updatedAt": "2024-06-18T18:56:20.016Z", + "__v": 0 + }, + { + "_id": "6671d84a9ba14f9f260eed27", + "monitorId": "6671d8469ba14f9f260eed23", + "status": false, + "responseTime": 100, + "createdAt": "2024-06-18T18:56:10.082Z", + "updatedAt": "2024-06-18T18:56:10.082Z", + "__v": 0 + }, + { + "_id": "6671d8549ba14f9f260eed2d", + "monitorId": "6671d8469ba14f9f260eed23", + "status": true, + "responseTime": 210, "createdAt": "2024-06-18T18:56:20.016Z", "updatedAt": "2024-06-18T18:56:20.016Z", "__v": 0 @@ -37,7 +100,7 @@ "_id": "6671d85e9ba14f9f260eed3c", "monitorId": "6671d8469ba14f9f260eed23", "status": true, - "responseTime": 2, + "responseTime": 200, "createdAt": "2024-06-18T18:56:30.050Z", "updatedAt": "2024-06-18T18:56:30.050Z", "__v": 0 @@ -57,27 +120,107 @@ "updatedAt": "2024-06-18T18:56:18.555Z", "__v": 0, "checks": [ - { - "_id": "6671d8549ba14f9f260eed31", - "monitorId": "6671d8529ba14f9f260eed2b", - "status": false, - "responseTime": 167, - "statusCode": 404, - "createdAt": "2024-06-18T18:56:20.190Z", - "updatedAt": "2024-06-18T18:56:20.190Z", - "__v": 0 - }, - { - "_id": "6671d85e9ba14f9f260eed3e", - "monitorId": "6671d8529ba14f9f260eed2b", - "status": false, - "responseTime": 228, - "statusCode": 404, - "createdAt": "2024-06-18T18:56:30.279Z", - "updatedAt": "2024-06-18T18:56:30.279Z", - "__v": 0 - } - ] + { + "_id": "6671d8549ba14f9f260eed31", + "monitorId": "6671d8529ba14f9f260eed2b", + "status": false, + "responseTime": 167, + "statusCode": 404, + "createdAt": "2024-06-18T18:56:20.190Z", + "updatedAt": "2024-06-18T18:56:20.190Z", + "__v": 0 + }, + { + "_id": "6671d85e9ba14f9f260eed3e", + "monitorId": "6671d8529ba14f9f260eed2b", + "status": false, + "responseTime": 228, + "statusCode": 404, + "createdAt": "2024-06-18T18:56:30.279Z", + "updatedAt": "2024-06-18T18:56:30.279Z", + "__v": 0 + }, + { + "_id": "6671d8669ba14f9f260eed47", + "monitorId": "6671d8529ba14f9f260eed2b", + "status": true, + "responseTime": 112, + "statusCode": 200, + "createdAt": "2024-06-18T18:56:38.381Z", + "updatedAt": "2024-06-18T18:56:38.381Z", + "__v": 0 + }, + { + "_id": "6671d8809ba14f9f260eed6b", + "monitorId": "6671d8529ba14f9f260eed2b", + "status": true, + "responseTime": 134, + "statusCode": 200, + "createdAt": "2024-06-18T18:57:04.846Z", + "updatedAt": "2024-06-18T18:57:04.846Z", + "__v": 0 + }, + { + "_id": "6671d86d9ba14f9f260eed50", + "monitorId": "6671d8529ba14f9f260eed2b", + "status": false, + "responseTime": 301, + "statusCode": 404, + "createdAt": "2024-06-18T18:56:45.492Z", + "updatedAt": "2024-06-18T18:56:45.492Z", + "__v": 0 + }, + { + "_id": "6671d8739ba14f9f260eed59", + "monitorId": "6671d8529ba14f9f260eed2b", + "status": true, + "responseTime": 84, + "statusCode": 200, + "createdAt": "2024-06-18T18:56:51.614Z", + "updatedAt": "2024-06-18T18:56:51.614Z", + "__v": 0 + }, + { + "_id": "6671d87a9ba14f9f260eed62", + "monitorId": "6671d8529ba14f9f260eed2b", + "status": false, + "responseTime": 189, + "statusCode": 404, + "createdAt": "2024-06-18T18:56:58.734Z", + "updatedAt": "2024-06-18T18:56:58.734Z", + "__v": 0 + }, + { + "_id": "6671d8809ba14f9f260eed6b", + "monitorId": "6671d8529ba14f9f260eed2b", + "status": true, + "responseTime": 134, + "statusCode": 200, + "createdAt": "2024-06-18T18:57:04.846Z", + "updatedAt": "2024-06-18T18:57:04.846Z", + "__v": 0 + }, + { + "_id": "6671d8549ba14f9f260eed31", + "monitorId": "6671d8529ba14f9f260eed2b", + "status": false, + "responseTime": 167, + "statusCode": 404, + "createdAt": "2024-06-18T18:56:20.190Z", + "updatedAt": "2024-06-18T18:56:20.190Z", + "__v": 0 + }, + { + "_id": "6671d8879ba14f9f260eed74", + "monitorId": "6671d8529ba14f9f260eed2b", + "status": false, + "responseTime": 247, + "statusCode": 404, + "createdAt": "2024-06-18T18:57:11.958Z", + "updatedAt": "2024-06-18T18:57:11.958Z", + "__v": 0 + } + ] }, { "_id": "6671d8619ba14f9f260eed4c", @@ -93,33 +236,103 @@ "__v": 0, "checks": [ { - "_id": "6671d8649ba14f9f260eed50", - "monitorId": "6671d8619ba14f9f260eed4c", + "_id": "6671d8919ba14f9f260eed7d", + "monitorId": "6671d8529ba14f9f260eed2b", "status": true, - "responseTime": 158, + "responseTime": 92, "statusCode": 200, - "createdAt": "2024-06-18T18:56:52.302Z", - "updatedAt": "2024-06-18T18:56:52.302Z", + "createdAt": "2024-06-18T18:57:21.076Z", + "updatedAt": "2024-06-18T18:57:21.076Z", "__v": 0 }, { - "_id": "6671d86e9ba14f9f260eed5a", - "monitorId": "6671d8619ba14f9f260eed4c", - "status": true, - "responseTime": 162, - "statusCode": 200, - "createdAt": "2024-06-18T18:57:02.331Z", - "updatedAt": "2024-06-18T18:57:02.331Z", + "_id": "6671d8989ba14f9f260eed86", + "monitorId": "6671d8529ba14f9f260eed2b", + "status": false, + "responseTime": 205, + "statusCode": 404, + "createdAt": "2024-06-18T18:57:28.188Z", + "updatedAt": "2024-06-18T18:57:28.188Z", "__v": 0 }, { - "_id": "6671d8779ba14f9f260eed64", - "monitorId": "6671d8619ba14f9f260eed4c", + "_id": "6671d89e9ba14f9f260eed8f", + "monitorId": "6671d8529ba14f9f260eed2b", "status": true, - "responseTime": 145, + "responseTime": 159, "statusCode": 200, - "createdAt": "2024-06-18T18:57:12.378Z", - "updatedAt": "2024-06-18T18:57:12.378Z", + "createdAt": "2024-06-18T18:57:34.300Z", + "updatedAt": "2024-06-18T18:57:34.300Z", + "__v": 0 + }, + { + "_id": "6671d8a59ba14f9f260eed98", + "monitorId": "6671d8529ba14f9f260eed2b", + "status": false, + "responseTime": 271, + "statusCode": 404, + "createdAt": "2024-06-18T18:57:41.421Z", + "updatedAt": "2024-06-18T18:57:41.421Z", + "__v": 0 + }, + { + "_id": "6671d8ac9ba14f9f260eeda1", + "monitorId": "6671d8529ba14f9f260eed2b", + "status": true, + "responseTime": 127, + "statusCode": 200, + "createdAt": "2024-06-18T18:57:48.532Z", + "updatedAt": "2024-06-18T18:57:48.532Z", + "__v": 0 + }, + { + "_id": "6671d8b29ba14f9f260eedaa", + "monitorId": "6671d8529ba14f9f260eed2b", + "status": false, + "responseTime": 193, + "statusCode": 404, + "createdAt": "2024-06-18T18:57:54.643Z", + "updatedAt": "2024-06-18T18:57:54.643Z", + "__v": 0 + }, + { + "_id": "6671d8b89ba14f9f260eedb3", + "monitorId": "6671d8529ba14f9f260eed2b", + "status": true, + "responseTime": 104, + "statusCode": 200, + "createdAt": "2024-06-18T18:58:00.754Z", + "updatedAt": "2024-06-18T18:58:00.754Z", + "__v": 0 + }, + { + "_id": "6671d8bf9ba14f9f260eedbc", + "monitorId": "6671d8529ba14f9f260eed2b", + "status": false, + "responseTime": 231, + "statusCode": 404, + "createdAt": "2024-06-18T18:58:07.865Z", + "updatedAt": "2024-06-18T18:58:07.865Z", + "__v": 0 + }, + { + "_id": "6671d8c59ba14f9f260eedc5", + "monitorId": "6671d8529ba14f9f260eed2b", + "status": true, + "responseTime": 147, + "statusCode": 200, + "createdAt": "2024-06-18T18:58:13.977Z", + "updatedAt": "2024-06-18T18:58:13.977Z", + "__v": 0 + }, + { + "_id": "6671d8cc9ba14f9f260eedce", + "monitorId": "6671d8529ba14f9f260eed2b", + "status": false, + "responseTime": 283, + "statusCode": 404, + "createdAt": "2024-06-18T18:58:20.088Z", + "updatedAt": "2024-06-18T18:58:20.088Z", "__v": 0 } ] @@ -137,27 +350,107 @@ "updatedAt": "2024-06-18T18:57:12.798Z", "__v": 0, "checks": [ - { - "_id": "6671d87b9ba14f9f260eed6a", - "monitorId": "6671d8789ba14f9f260eed66", - "status": true, - "responseTime": 221, - "statusCode": 200, - "createdAt": "2024-06-18T18:57:15.613Z", - "updatedAt": "2024-06-18T18:57:15.613Z", - "__v": 0 - }, - { - "_id": "6671d8859ba14f9f260eed74", - "monitorId": "6671d8789ba14f9f260eed66", - "status": true, - "responseTime": 234, - "statusCode": 200, - "createdAt": "2024-06-18T18:57:25.655Z", - "updatedAt": "2024-06-18T18:57:25.655Z", - "__v": 0 - } - ] + { + "_id": "6671d8d29ba14f9f260eedd7", + "monitorId": "6671d8529ba14f9f260eed2b", + "status": true, + "responseTime": 81, + "statusCode": 200, + "createdAt": "2024-06-18T18:58:26.199Z", + "updatedAt": "2024-06-18T18:58:26.199Z", + "__v": 0 + }, + { + "_id": "6671d8d89ba14f9f260eede0", + "monitorId": "6671d8529ba14f9f260eed2b", + "status": false, + "responseTime": 218, + "statusCode": 404, + "createdAt": "2024-06-18T18:58:32.311Z", + "updatedAt": "2024-06-18T18:58:32.311Z", + "__v": 0 + }, + { + "_id": "6671d8df9ba14f9f260eede9", + "monitorId": "6671d8529ba14f9f260eed2b", + "status": true, + "responseTime": 138, + "statusCode": 200, + "createdAt": "2024-06-18T18:58:39.422Z", + "updatedAt": "2024-06-18T18:58:39.422Z", + "__v": 0 + }, + { + "_id": "6671d8e59ba14f9f260eedf2", + "monitorId": "6671d8529ba14f9f260eed2b", + "status": false, + "responseTime": 257, + "statusCode": 404, + "createdAt": "2024-06-18T18:58:45.533Z", + "updatedAt": "2024-06-18T18:58:45.533Z", + "__v": 0 + }, + { + "_id": "6671d8eb9ba14f9f260eedfb", + "monitorId": "6671d8529ba14f9f260eed2b", + "status": true, + "responseTime": 116, + "statusCode": 200, + "createdAt": "2024-06-18T18:58:51.644Z", + "updatedAt": "2024-06-18T18:58:51.644Z", + "__v": 0 + }, + { + "_id": "6671d8f19ba14f9f260eee04", + "monitorId": "6671d8529ba14f9f260eed2b", + "status": false, + "responseTime": 184, + "statusCode": 404, + "createdAt": "2024-06-18T18:58:57.755Z", + "updatedAt": "2024-06-18T18:58:57.755Z", + "__v": 0 + }, + { + "_id": "6671d8f79ba14f9f260eee0d", + "monitorId": "6671d8529ba14f9f260eed2b", + "status": true, + "responseTime": 97, + "statusCode": 200, + "createdAt": "2024-06-18T18:59:03.867Z", + "updatedAt": "2024-06-18T18:59:03.867Z", + "__v": 0 + }, + { + "_id": "6671d8fd9ba14f9f260eee16", + "monitorId": "6671d8529ba14f9f260eed2b", + "status": false, + "responseTime": 240, + "statusCode": 404, + "createdAt": "2024-06-18T18:59:09.978Z", + "updatedAt": "2024-06-18T18:59:09.978Z", + "__v": 0 + }, + { + "_id": "6671d9039ba14f9f260eee1f", + "monitorId": "6671d8529ba14f9f260eed2b", + "status": true, + "responseTime": 135, + "statusCode": 200, + "createdAt": "2024-06-18T18:59:16.089Z", + "updatedAt": "2024-06-18T18:59:16.089Z", + "__v": 0 + }, + { + "_id": "6671d9089ba14f9f260eee28", + "monitorId": "6671d8529ba14f9f260eed2b", + "status": false, + "responseTime": 269, + "statusCode": 404, + "createdAt": "2024-06-18T18:59:22.200Z", + "updatedAt": "2024-06-18T18:59:22.200Z", + "__v": 0 + } +] } ] } \ No newline at end of file diff --git a/Client/src/Pages/Monitors/CurrentStats.jsx b/Client/src/Pages/Monitors/CurrentStats.jsx index 39312c44d..c27bbeef5 100644 --- a/Client/src/Pages/Monitors/CurrentStats.jsx +++ b/Client/src/Pages/Monitors/CurrentStats.jsx @@ -106,7 +106,7 @@ const CurrentStats = (mockdata = true) => { ? "var(--env-var-color-17)" : "var(--env-var-color-19)" ), - team: , + team: , actions: HostActions(), })) );