From 936c230aa3cca3d0d336e42f3946039f8b5c5147 Mon Sep 17 00:00:00 2001
From: UpstreamData <brett@upstreamdata.ca>
Date: Fri, 4 Mar 2022 15:48:17 -0700
Subject: [PATCH] fixed a bug with scanning and adding miner which didnt append
 to the navbar

---
 tools/web_monitor/app.py                |  4 +-
 tools/web_monitor/templates/index.html  | 53 ++++++++++++++-----------
 tools/web_monitor/templates/navbar.html |  2 +-
 tools/web_monitor/templates/scan.html   |  2 +
 4 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/tools/web_monitor/app.py b/tools/web_monitor/app.py
index 3a98743e..3d45debf 100644
--- a/tools/web_monitor/app.py
+++ b/tools/web_monitor/app.py
@@ -20,8 +20,8 @@ templates = Jinja2Templates(directory="templates")
 
 
 @app.get("/")
-def index():
-    return dashboard()
+def index(request: Request):
+    return RedirectResponse(request.url_for('dashboard'))
 
 
 @app.get("/dashboard")
diff --git a/tools/web_monitor/templates/index.html b/tools/web_monitor/templates/index.html
index 939ec539..9b2e9e34 100644
--- a/tools/web_monitor/templates/index.html
+++ b/tools/web_monitor/templates/index.html
@@ -3,6 +3,9 @@
 <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/luxon@2.3.1/build/global/luxon.min.js"></script>
 <canvas id="line-chart" class="grad-border mt-3 mb-4" width="600" height="360"></canvas>
+{% if cur_miners|length == 0 %}<a role="button" href="{{url_for('scan')}}" id="noMiners" class="w-100 btn btn-info">Click here to add miners.</a>{% endif %}
+
+
 <div id="errors"></div>
 
 <script>
@@ -11,31 +14,33 @@ let all_data = []
 let all_labels = []
 ws.onmessage = function(event) {
     var new_data = JSON.parse(event.data)
-    total_hashrate = parseFloat(0)
-    errors = document.getElementById("errors")
-    for (i = 0; i< new_data["miners"].length; i++) {
-        if (new_data["miners"][i].hasOwnProperty("error")) {
-            if (!document.getElementById(new_data["miners"][i]["ip"] + "_error")) {
-                errors.innerHTML += "<div id='" + new_data["miners"][i]["ip"] + "_error" +
-                "' class='d-flex align-items-center p-1 mb-1 ms-4 alert alert-danger'><strong class='p-0 m-0'>" +
-                new_data["miners"][i]["ip"] + ": " +
-                new_data["miners"][i]["error"] +
-                "</strong><div class='spinner-border spinner-border-sm ms-auto'></div></div>"
+    if (!new_data["miners"].length == 0) {
+        total_hashrate = parseFloat(0)
+        errors = document.getElementById("errors")
+        for (i = 0; i< new_data["miners"].length; i++) {
+            if (new_data["miners"][i].hasOwnProperty("error")) {
+                if (!document.getElementById(new_data["miners"][i]["ip"] + "_error")) {
+                    errors.innerHTML += "<div id='" + new_data["miners"][i]["ip"] + "_error" +
+                    "' class='d-flex align-items-center p-1 mb-1 ms-4 alert alert-danger'><strong class='p-0 m-0'>" +
+                    new_data["miners"][i]["ip"] + ": " +
+                    new_data["miners"][i]["error"] +
+                    "</strong><div class='spinner-border spinner-border-sm ms-auto'></div></div>"
+                }
+            } else {
+                if (document.getElementById(new_data["miners"][i]["ip"] + "_error")) {
+                    document.getElementById(new_data["miners"][i]["ip"] + "_error").remove()
+                }
+                total_hashrate += parseFloat(new_data["miners"][i]["hashrate"])
             }
-        } else {
-            if (document.getElementById(new_data["miners"][i]["ip"] + "_error")) {
-                document.getElementById(new_data["miners"][i]["ip"] + "_error").remove()
-            }
-            total_hashrate += parseFloat(new_data["miners"][i]["hashrate"])
-        }
-    };
-    var chart = document.getElementById("line-chart")
-    datetime = luxon.DateTime.fromISO(new_data["datetime"]).toLocal();
-    if (minerDataChart.data.labels.length > 50) minerDataChart.data.labels.shift();
-    if (minerDataChart.data.datasets[0].data.length > 50) minerDataChart.data.datasets[0].data.shift();
-    minerDataChart.data.labels.push(datetime.toLocaleString(luxon.DateTime.TIME_WITH_SECONDS));
-    minerDataChart.data.datasets[0].data.push(total_hashrate);
-    minerDataChart.update();
+        };
+        var chart = document.getElementById("line-chart")
+        datetime = luxon.DateTime.fromISO(new_data["datetime"]).toLocal();
+        if (minerDataChart.data.labels.length > 50) minerDataChart.data.labels.shift();
+        if (minerDataChart.data.datasets[0].data.length > 50) minerDataChart.data.datasets[0].data.shift();
+        minerDataChart.data.labels.push(datetime.toLocaleString(luxon.DateTime.TIME_WITH_SECONDS));
+        minerDataChart.data.datasets[0].data.push(total_hashrate);
+        minerDataChart.update();
+    }
 };
 
 var ctx = document.getElementById("line-chart").getContext("2d");
diff --git a/tools/web_monitor/templates/navbar.html b/tools/web_monitor/templates/navbar.html
index d2037c09..05eb4efd 100644
--- a/tools/web_monitor/templates/navbar.html
+++ b/tools/web_monitor/templates/navbar.html
@@ -62,7 +62,7 @@
               Miners
             </a>
             <div class="collapse mt-1" id="miners-collapse" style="">
-              <ul class="btn-toggle-nav overflow-auto list-unstyled fw-normal pb-1 small">
+              <ul id="navMiners" class="btn-toggle-nav overflow-auto list-unstyled fw-normal pb-1 small">
                   <li>
                   <a href="{{url_for('scan')}}" class="nav-link {% if request.path == '/scan' %}active{% else %}text-white{% endif %}">
                     <svg class="bi me-2 mt-1" width="16" height="16"><use xlink:href="#scan"></use></svg>
diff --git a/tools/web_monitor/templates/scan.html b/tools/web_monitor/templates/scan.html
index 3708dfaf..ccfc1d96 100644
--- a/tools/web_monitor/templates/scan.html
+++ b/tools/web_monitor/templates/scan.html
@@ -135,6 +135,8 @@
                 for (i = 0; i< minerList.length; i++) {
                     var tr_to_remove = document.getElementById(minerList[i])
                     tr_to_remove.remove()
+                    var navbar_miners = document.getElementById("navMiners")
+                    navbar_miners.innerHTML += '<li><a href="/miner/' + minerList[i] + '" class="nav-link text-white"><svg class="bi me-2 mt-1" width="16" height="16"><use xlink:href="#miner"></use></svg>' + minerList[i] + '</a></li>'
                 }
                 document.getElementById("scanStatus").innerHTML = document.getElementById('minerTable').rows.length + " Miners"
             };