From 1755ea02f1388eebbe201d373aff5ad4a90df7fa Mon Sep 17 00:00:00 2001
From: joeuhren <46763106+joeuhren@users.noreply.github.com>
Date: Fri, 25 Dec 2020 16:31:26 -0700
Subject: [PATCH] Show spinning loading icons in top panels
---
public/css/style.scss | 5 +++++
views/layout.pug | 30 ++++++++++++++++++++++--------
2 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/public/css/style.scss b/public/css/style.scss
index 9c0b458..0940658 100644
--- a/public/css/style.scss
+++ b/public/css/style.scss
@@ -666,4 +666,9 @@ tr {
.right-border-0 {
border-right: 0;
+}
+
+.fa-spinner {
+ font-size: 18px;
+ margin-bottom: 6px;
}
\ No newline at end of file
diff --git a/views/layout.pug b/views/layout.pug
index eea4ffa..e3021cb 100644
--- a/views/layout.pug
+++ b/views/layout.pug
@@ -105,6 +105,14 @@ html(lang='en')
$(document).ready(function() {
if ('#{active}' != '')
$('##{active}').addClass('active');
+ function showTopPanelData(dataElement, loadingElement) {
+ if ($('#' + loadingElement).length) {
+ $('#' + loadingElement).fadeOut('slow', function() {
+ $('#' + loadingElement).remove();
+ $('#' + dataElement).fadeIn();
+ });
+ }
+ }
function update_stats() {
$.ajax({url: '/ext/summary', success: function(json) {
var mnOnlineText = json.data[0].masternodeCountOnline+" node"+(json.data[0].masternodeCountOnline == 1 ? "" : "s")+" online";
@@ -114,6 +122,7 @@ html(lang='en')
$("#masternodeCountOffline").text(json.data[0].masternodeCountOffline).prop("alt", mnOfflineText).prop("title", mnOfflineText).attr("data-original-title", mnOfflineText);
$("#spnMasternodeCountOnline").prop("alt", mnOnlineText).prop("title", mnOnlineText).attr("data-original-title", mnOnlineText);
$("#spnMasternodeCountOffline").prop("alt", mnOfflineText).prop("title", mnOfflineText).attr("data-original-title", mnOfflineText);
+ showTopPanelData('masternodepanel', 'masternodePanelLoading');
var supplyString = json.data[0].supply;
var diffString = json.data[0].difficulty;
@@ -126,15 +135,20 @@ html(lang='en')
if (!isNaN(json.data[0].hashrate))
hashrateString = parseFloat(json.data[0].hashrate).toLocaleString('en');
+ $("#lblX1").text(' ');
$("#supply").text(supplyString);
+ $("#marketCap").html((parseFloat(json.data[0].lastPrice).toFixed(8) * parseInt(parseFloat(json.data[0].supply).toFixed(0))).toLocaleString('en') + '' + '#{settings.markets.exchange}'.toUpperCase() + '');
+ showTopPanelData('supplypanel', 'supplyPanelLoading');
$("#difficulty").text(diffString);
$("#difficultyHybrid").text(json.data[0].difficultyHybrid);
+ showTopPanelData('difficultypanel', 'difficultyPanelLoading');
$("#hashrate").text(hashrateString);
+ showTopPanelData('hashratepanel', 'hashratePanelLoading');
$("#lastPrice").text(parseFloat(json.data[0].lastPrice).toFixed(8));
- $("#marketCap").html((parseFloat(json.data[0].lastPrice).toFixed(8) * parseInt(parseFloat(json.data[0].supply).toFixed(0))).toLocaleString('en') + '' + '#{settings.markets.exchange}'.toUpperCase() + '');
+ showTopPanelData('pricepanel', 'pricePanelLoading');
+
$("#lblConnections").text(json.data[0].connections + ' connections');
$("#lblBlockcount").text(json.data[0].blockcount + ' blocks');
- $("#lblX1").text(' ');
}});
}
$('.iquidus').css('color',$('.table').css('color'));
@@ -170,29 +184,29 @@ html(lang='en')
}
var hashRateType='';
if ('#{settings.index.difficulty}' == 'Hybrid') hashRateType+='
';
- return '