diff --git a/css/miningcore.css b/css/miningcore.css index cf6c928..10e4960 100644 --- a/css/miningcore.css +++ b/css/miningcore.css @@ -1005,12 +1005,13 @@ div.card-chart { */ #pool-coins td:nth-of-type(1):before { content: "Pool coin"; } #pool-coins td:nth-of-type(2):before { content: "Algorithm"; } - #pool-coins td:nth-of-type(3):before { content: "Miners"; } - #pool-coins td:nth-of-type(4):before { content: "Pool Hashrate"; } - #pool-coins td:nth-of-type(5):before { content: "Fee"; } - #pool-coins td:nth-of-type(6):before { content: "Network Hashrate"; } - #pool-coins td:nth-of-type(7):before { content: "Network Difficulty"; } - #pool-coins td:nth-of-type(8):before { content: ""; } + #pool-coins td:nth-of-type(3):before { content: "Scheme"; } + #pool-coins td:nth-of-type(4):before { content: "Miners"; } + #pool-coins td:nth-of-type(5):before { content: "Pool Hashrate"; } + #pool-coins td:nth-of-type(6):before { content: "Fee"; } + #pool-coins td:nth-of-type(7):before { content: "Network Hashrate"; } + #pool-coins td:nth-of-type(8):before { content: "Network Difficulty"; } + #pool-coins td:nth-of-type(9):before { content: ""; } .sidebar-open .main-sidebar { -webkit-transform:translate(0, 0); diff --git a/img/coin/icon/erg.png b/img/coin/icon/erg.png new file mode 100644 index 0000000..9f0cbe7 Binary files /dev/null and b/img/coin/icon/erg.png differ diff --git a/index.html b/index.html index 16e2522..333cfce 100644 --- a/index.html +++ b/index.html @@ -202,6 +202,7 @@
Pool Coins
Pool coin Algorithm + Payout Type Miners Pool Hashrate Fee @@ -586,13 +587,14 @@

Blocks Mined

- Found - Height - Effort - Status - Reward - Confirmation - + When + Found by + Height + Effort + Status + Reward + Confirmation + diff --git a/js/miningcore.js b/js/miningcore.js index a85985c..fcfdaf4 100644 --- a/js/miningcore.js +++ b/js/miningcore.js @@ -22,22 +22,14 @@ -// read WebURL from current browser -var WebURL = window.location.protocol + "//" + window.location.hostname + "/"; // Website URL is: https://domain.com/ -// WebURL correction if not ends with / -if (WebURL.substring(WebURL.length-1) != "/") -{ - WebURL = WebURL + "/"; - console.log('Corrected WebURL, does not end with / -> New WebURL : ', WebURL); -} -var API = WebURL + "api/"; // API address is: https://domain.com/api/ +var API = "https://miningcore-api.mattsnoby.com/api/"; // API correction if not ends with / if (API.substring(API.length-1) != "/") { API = API + "/"; console.log('Corrected API, does not end with / -> New API : ', API); } -var stratumAddress = window.location.hostname; // Stratum address is: domain.com +var stratumAddress = "ergo.mattsnoby.com:3056"; @@ -49,7 +41,6 @@ var stratumAddress = window.location.hostname; // Stratum address // -------------------------------------------------------------------------------------------- // no need to change anything below here // -------------------------------------------------------------------------------------------- -console.log('MiningCore.WebUI : ', WebURL); // Returns website URL console.log('API address used : ', API); // Returns API URL console.log('Stratum address : ', "stratum+tcp://" + stratumAddress + ":"); // Returns Stratum URL console.log('Page Load : ', window.location.href); // Returns full URL @@ -172,6 +163,7 @@ function loadHomePage() { poolCoinTableTemplate += ""; poolCoinTableTemplate += "" + coinLogo + coinName + " (" + value.coin.type.toUpperCase() + ") "; poolCoinTableTemplate += "" + value.coin.algorithm + ""; + poolCoinTableTemplate += "" + value.paymentProcessing.payoutScheme + ""; poolCoinTableTemplate += "" + value.poolStats.connectedMiners + ""; poolCoinTableTemplate += "" + _formatter(value.poolStats.poolHashrate, 5, "H/s") + ""; poolCoinTableTemplate += "" + value.poolFeePercent + " %"; @@ -261,39 +253,38 @@ function loadDashboardPage() { } } - // Load MINERS page content function loadMinersPage() { - return $.ajax(API + "pools/" + currentPool + "/miners?page=0&pagesize=20") - .done(function(data) { - var minerList = ""; - if (data.length > 0) { - $.each(data, function(index, value) { - minerList += ""; - //minerList += "" + value.miner + ""; - minerList += '' + value.miner.substring(0, 12) + ' … ' + value.miner.substring(value.miner.length - 12) + ''; - //minerList += '' + value.miner.substring(0, 12) + ' … ' + value.miner.substring(value.miner.length - 12) + ''; - minerList += "" + _formatter(value.hashrate, 5, "H/s") + ""; - minerList += "" + _formatter(value.sharesPerSecond, 5, "S/s") + ""; - minerList += ""; - }); - } else { - minerList += 'No miner connected'; - } - $("#minerList").html(minerList); - }) - .fail(function() { - $.notify( - { - message: "Error: No response from API.
(loadMinersList)" - }, - { - type: "danger", - timer: 3000 - } - ); - }); -} + return $.ajax(API + "pools/" + currentPool + "/miners?page=0&pagesize=20") + .done(function(data) { + var minerList = ""; + if (data.length > 0) { + $.each(data, function(index, value) { + var url = "?#" + currentPool + "/dashboard?address=" + value.miner; + console.log(url) + minerList += ""; + minerList += "" + "" + value.miner +"" + ""; + minerList += "" + _formatter(value.hashrate, 5, "H/s") + ""; + minerList += "" + _formatter(value.sharesPerSecond, 5, "S/s") + ""; + minerList += ""; + }); + } else { + minerList += 'No miner connected'; + } + $("#minerList").html(minerList); + }) + .fail(function() { + $.notify( + { + message: "Error: No response from API.
(loadMinersList)" + }, + { + type: "danger", + timer: 3000 + } + ); + }); + } // Load BLOCKS page content @@ -304,7 +295,7 @@ function loadBlocksPage() { if (data.length > 0) { $.each(data, function(index, value) { var createDate = convertLocalDateToUTCDate(new Date(value.created),false); - var effort = Math.round(value.effort * 100); + var effort = Math.round(value.effort * 10000); var effortClass = ""; if (effort < 30) { effortClass = "effort1"; @@ -316,8 +307,11 @@ function loadBlocksPage() { effortClass = "effort4"; } + var url = "?#" + currentPool + "/dashboard?address=" + value.miner; + blockList += ""; blockList += "" + createDate + ""; + blockList += "" + value.miner.substring(value.miner.length -12) +"" + ""; blockList += "" + value.blockHeight + ""; if (typeof value.effort !== "undefined") { blockList += "" + effort + "%"; diff --git a/poolconfig/default.html b/poolconfig/default.html index ffd76cb..b16ba8b 100644 --- a/poolconfig/default.html +++ b/poolconfig/default.html @@ -29,6 +29,12 @@

crypto mining software

Where: