update dashboard appearance

SolidRusT · Jun 10, 2024 · 8d2654f · 8d2654f
1 parent d761420
commit 8d2654f
Show file tree

Hide file tree

Showing 3 changed files with 95 additions and 21 deletions.
diff --git a/app/static/css/style.css b/app/static/css/style.css
@@ -2,30 +2,40 @@ body {
   font-family: Arial, sans-serif;
   margin: 0;
   padding: 20px;
+  background-color: #f4f4f9;
 }
 
 h1 {
   text-align: center;
+  margin-bottom: 20px;
+  font-size: 2.5em;
+  color: #333;
 }
 
 #metrics {
   display: flex;
+  flex-wrap: wrap;
   justify-content: space-around;
 }
 
 .metric {
   border: 1px solid #ccc;
+  background-color: #fff;
   padding: 20px;
-  width: 30%;
+  width: 45%;
+  margin: 10px;
+  border-radius: 8px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
   text-align: center;
 }
 
 .metric h2 {
-  margin: 0;
+  margin-bottom: 20px;
   font-size: 1.5em;
+  color: #555;
 }
 
-.metric p {
-  font-size: 1.2em;
-  margin: 10px 0 0 0;
+canvas {
+  width: 100% !important;
+  height: auto !important;
 }
diff --git a/app/static/js/dashboard.js b/app/static/js/dashboard.js
@@ -16,6 +16,19 @@ document.addEventListener('DOMContentLoaded', function () {
               borderWidth: 1,
               data: []
           }]
+      },
+      options: {
+          responsive: true,
+          scales: {
+              y: {
+                  beginAtZero: true,
+                  ticks: {
+                      callback: function(value) {
+                          return value + '%';
+                      }
+                  }
+              }
+          }
       }
   });
 
@@ -30,6 +43,14 @@ document.addEventListener('DOMContentLoaded', function () {
               borderWidth: 1,
               data: []
           }]
+      },
+      options: {
+          responsive: true,
+          scales: {
+              y: {
+                  beginAtZero: true
+              }
+          }
       }
   });
 
@@ -44,6 +65,19 @@ document.addEventListener('DOMContentLoaded', function () {
               borderWidth: 1,
               data: []
           }]
+      },
+      options: {
+          responsive: true,
+          scales: {
+              y: {
+                  beginAtZero: true,
+                  ticks: {
+                      callback: function(value) {
+                          return value + '%';
+                      }
+                  }
+              }
+          }
       }
   });
 
@@ -58,6 +92,19 @@ document.addEventListener('DOMContentLoaded', function () {
               borderWidth: 1,
               data: []
           }]
+      },
+      options: {
+          responsive: true,
+          scales: {
+              y: {
+                  beginAtZero: true,
+                  ticks: {
+                      callback: function(value) {
+                          return value + '%';
+                      }
+                  }
+              }
+          }
       }
   });
 
@@ -72,13 +119,22 @@ document.addEventListener('DOMContentLoaded', function () {
               borderWidth: 1,
               data: []
           }]
+      },
+      options: {
+          responsive: true,
+          scales: {
+              y: {
+                  beginAtZero: true
+              }
+          }
       }
   });
 
   function updateCharts() {
       fetch('/metrics')
           .then(response => response.json())
           .then(data => {
+              console.log('Metrics data:', data); // Debugging information
               const labels = Object.keys(data);
               const cpuUsage = labels.map(label => data[label].cpu_usage);
               const memoryUsage = labels.map(label => data[label].memory_usage);
@@ -105,7 +161,8 @@ document.addEventListener('DOMContentLoaded', function () {
               networkChart.data.labels = labels;
               networkChart.data.datasets[0].data = networkIo;
               networkChart.update();
-          });
+          })
+          .catch(error => console.error('Error fetching metrics:', error)); // Debugging information
   }
 
   updateCharts();

diff --git a/app/templates/dashboard.html b/app/templates/dashboard.html
@@ -6,24 +6,31 @@
     <title>Performance Dashboard</title>
     <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
     <script src="{{ url_for('static', filename='js/dashboard.js') }}"></script>
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/styles.css') }}">
+    <link rel="stylesheet" href="{{ url_for('static', filename='css/style.css') }}">
 </head>
 <body>
     <h1>Performance Dashboard</h1>
-    <div>
-        <canvas id="cpuChart"></canvas>
-    </div>
-    <div>
-        <canvas id="memoryChart"></canvas>
-    </div>
-    <div>
-        <canvas id="gpuChart"></canvas>
-    </div>
-    <div>
-        <canvas id="diskChart"></canvas>
-    </div>
-    <div>
-        <canvas id="networkChart"></canvas>
+    <div id="metrics">
+        <div class="metric">
+            <h2>CPU Usage (%)</h2>
+            <canvas id="cpuChart"></canvas>
+        </div>
+        <div class="metric">
+            <h2>Memory Usage (Bytes)</h2>
+            <canvas id="memoryChart"></canvas>
+        </div>
+        <div class="metric">
+            <h2>GPU Usage (%)</h2>
+            <canvas id="gpuChart"></canvas>
+        </div>
+        <div class="metric">
+            <h2>Disk Usage (%)</h2>
+            <canvas id="diskChart"></canvas>
+        </div>
+        <div class="metric">
+            <h2>Network I/O (Bytes)</h2>
+            <canvas id="networkChart"></canvas>
+        </div>
     </div>
 </body>
 </html>