CAT_TOM/pyasic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed a bug with scanning and adding miner which didnt append to the navbar

Browse Source
This commit is contained in:
UpstreamData
2022-03-04 15:48:17 -07:00
parent 309b4d44fc
commit 8ecdb6f5e8
4 changed files with 34 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/web_monitor/app.py
View File

@@ -20,8 +20,8 @@ templates = Jinja2Templates(directory="templates")
@app.get("/") @app.get("/")
def index(): def index(request: Request):
return dashboard() return RedirectResponse(request.url_for('dashboard'))
@app.get("/dashboard") @app.get("/dashboard")

53
tools/web_monitor/templates/index.html
View File

@@ -3,6 +3,9 @@
<script src="https://cdn.jsdelivr.net/npm/chart.js"></script> <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> <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> <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> <div id="errors"></div>
<script> <script>
@@ -11,31 +14,33 @@ let all_data = []
let all_labels = [] let all_labels = []
ws.onmessage = function(event) { ws.onmessage = function(event) {
var new_data = JSON.parse(event.data) var new_data = JSON.parse(event.data)
total_hashrate = parseFloat(0) if (!new_data["miners"].length == 0) {
errors = document.getElementById("errors") total_hashrate = parseFloat(0)
for (i = 0; i< new_data["miners"].length; i++) { errors = document.getElementById("errors")
if (new_data["miners"][i].hasOwnProperty("error")) { for (i = 0; i< new_data["miners"].length; i++) {
if (!document.getElementById(new_data["miners"][i]["ip"] + "_error")) { if (new_data["miners"][i].hasOwnProperty("error")) {
errors.innerHTML += "<div id='" + new_data["miners"][i]["ip"] + "_error" + if (!document.getElementById(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'>" + errors.innerHTML += "<div id='" + new_data["miners"][i]["ip"] + "_error" +
new_data["miners"][i]["ip"] + ": " + "' 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]["error"] + new_data["miners"][i]["ip"] + ": " +
"</strong><div class='spinner-border spinner-border-sm ms-auto'></div></div>" 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")) { var chart = document.getElementById("line-chart")
document.getElementById(new_data["miners"][i]["ip"] + "_error").remove() datetime = luxon.DateTime.fromISO(new_data["datetime"]).toLocal();
} if (minerDataChart.data.labels.length > 50) minerDataChart.data.labels.shift();
total_hashrate += parseFloat(new_data["miners"][i]["hashrate"]) 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);
var chart = document.getElementById("line-chart") minerDataChart.update();
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"); var ctx = document.getElementById("line-chart").getContext("2d");

2
tools/web_monitor/templates/navbar.html
View File

@@ -62,7 +62,7 @@
Miners Miners
</a> </a>
<div class="collapse mt-1" id="miners-collapse" style=""> <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> <li>
<a href="{{url_for('scan')}}" class="nav-link {% if request.path == '/scan' %}active{% else %}text-white{% endif %}"> <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> <svg class="bi me-2 mt-1" width="16" height="16"><use xlink:href="#scan"></use></svg>

2
tools/web_monitor/templates/scan.html
View File

@@ -135,6 +135,8 @@
for (i = 0; i< minerList.length; i++) { for (i = 0; i< minerList.length; i++) {
var tr_to_remove = document.getElementById(minerList[i]) var tr_to_remove = document.getElementById(minerList[i])
tr_to_remove.remove() 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" document.getElementById("scanStatus").innerHTML = document.getElementById('minerTable').rows.length + " Miners"
}; };