From bcb3be2bb1803f38669440a609411e8f2980f011 Mon Sep 17 00:00:00 2001 From: Eric Carmichael Date: Fri, 31 Mar 2017 12:50:01 -0700 Subject: [PATCH 01/26] Increase page update interval --- www/lendingbot.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/www/lendingbot.js b/www/lendingbot.js index cfe6807c..94b5160f 100644 --- a/www/lendingbot.js +++ b/www/lendingbot.js @@ -214,18 +214,18 @@ function handleLocalFile(file) { function loadData() { if (localFile) { reader.readAsText(localFile, 'utf-8'); - setTimeout('loadData()',30000) + setTimeout('loadData()', 10000) } else { // expect the botlog.json to be in the same folder on the webserver var file = 'botlog.json'; $.getJSON(file, function (data) { updateJson(data); // reload every 30sec - setTimeout('loadData()',30000) + setTimeout('loadData()', 10000) }).fail( function(d, textStatus, error) { $('#status').text("getJSON failed, status: " + textStatus + ", error: "+error); // retry after 60sec - setTimeout('loadData()',60000) + setTimeout('loadData()', 60000) });; } } From de08e92b65cf6331158c43142d330197fd96b2bc Mon Sep 17 00:00:00 2001 From: Eric Carmichael Date: Fri, 31 Mar 2017 15:07:09 -0700 Subject: [PATCH 02/26] show yearly earnings as well --- www/lendingbot.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/www/lendingbot.js b/www/lendingbot.js index 94b5160f..bdb002ba 100644 --- a/www/lendingbot.js +++ b/www/lendingbot.js @@ -2,11 +2,12 @@ var localFile, reader; -var Hour = new Timespan("Hour",1/24); -var Day = new Timespan("Day",1); -var Week = new Timespan("Week",7); -var Month = new Timespan("Month",30); -var timespans = [Month, Week, Day, Hour]; +var Hour = new Timespan("Hour", 1/24); +var Day = new Timespan("Day", 1); +var Week = new Timespan("Week", 7); +var Month = new Timespan("Month", 30); +var Year = new Timespan("Year", 365); +var timespans = [Year, Month, Week, Day, Hour]; var summaryCoinRate, summaryCoin; var earningsOutputCoinRate, earningsOutputCoin; var outputCurrencyDisplayMode = 'all' From 1a58be04f2f18ae5eff09a3d9365a89133ba6549 Mon Sep 17 00:00:00 2001 From: Eric Carmichael Date: Fri, 31 Mar 2017 15:15:19 -0700 Subject: [PATCH 03/26] Display USD with 2 decimal places --- www/lendingbot.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/www/lendingbot.js b/www/lendingbot.js index bdb002ba..92396342 100644 --- a/www/lendingbot.js +++ b/www/lendingbot.js @@ -247,6 +247,8 @@ function Timespan(name, multiplier) { } if (currency == "BTC") { return displayUnit.formatValue(earnings) + " " + displayUnit.name + " / " + name + "
" + } else if (currency == "USD" || currency == "USDT") { + return printFloat(earnings, 2) + " " + currency + " / "+ name + "
"; } else { return printFloat(earnings, 8) + " " + currency + " / "+ name + "
"; } From 45bc4396cb41aec84bb2a761cef023b63f1f3823 Mon Sep 17 00:00:00 2001 From: Eric Carmichael Date: Sat, 1 Apr 2017 18:45:23 -0700 Subject: [PATCH 04/26] display total holdings --- www/lendingbot.html | 6 +++--- www/lendingbot.js | 12 ++++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/www/lendingbot.html b/www/lendingbot.html index 5b6abbb4..90beb3d9 100644 --- a/www/lendingbot.html +++ b/www/lendingbot.html @@ -26,15 +26,15 @@ - + - + - + @@ -65,20 +67,34 @@ -
+
@@ -117,12 +133,12 @@

Settings

- +

(10-60)

- +
- +
@@ -185,6 +189,18 @@

Settings

+ +

Effective rate can either take into consideration the actual amount actively lent OR consider only Poloniex 15% fee

+
+ +
+ Fee and Effective Lent +
+
+ Fee Only +
+
+
diff --git a/www/lendingbot.js b/www/lendingbot.js index 5d502a9c..990d3c1b 100644 --- a/www/lendingbot.js +++ b/www/lendingbot.js @@ -14,6 +14,7 @@ var earningsOutputCoinRate, earningsOutputCoin; var outputCurrencyDisplayMode = 'all' var validOutputCurrencyDisplayModes = ['all', 'summary']; var effRateMode = 'lentperc'; +var validEffRateModes = ['lentperc', 'onlyfee']; // BTC DisplayUnit var BTC = new BTCDisplayUnit("BTC", 1); @@ -270,7 +271,6 @@ function BTCDisplayUnit(name, multiplier) { } function setEffRateMode() { - var validModes = ['lentperc', 'onlyfee']; var q = location.search.match(/[\?&]effrate=[^&]+/); if (q) { @@ -282,11 +282,12 @@ function setEffRateMode() { effRateMode = localStorage.effRateMode; } } - if (validModes.indexOf(effRateMode) == -1) { + if (validEffRateModes.indexOf(effRateMode) == -1) { console.error(effRateMode + ' is not valid effective rate mode! Valid values are ' + validModes); - effRateMode = validModes[0]; + effRateMode = validEffRateModes[0]; } localStorage.effRateMode = effRateMode; + $("input[name='effRateMode'][value='"+ effRateMode +"']").prop('checked', true);; console.log('Effective rate mode: ' + effRateMode); } @@ -391,6 +392,14 @@ function doSave() { } }) + //Effective rate calculation + localStorage.effRateMode = $('input[name="effRateMode"]:checked').val(); + validEffRateModes.forEach(function(mode) { + if(mode == localStorage.effRateMode) { + effRateMode = mode; + } + }) + toastr.success("Settings saved!"); $('#settings_modal').modal('hide'); From 851c30e5c14d92f08f1c2e62823674de2582b61a Mon Sep 17 00:00:00 2001 From: Raanan Date: Sat, 15 Apr 2017 13:21:04 +0200 Subject: [PATCH 21/26] Fix indentation issues Replace printFloat with prettyfloat for Fiat currencies (doesn't display .00) --- www/lendingbot.html | 55 ++++++++++++++++++++++++--------------------- www/lendingbot.js | 2 +- 2 files changed, 30 insertions(+), 27 deletions(-) diff --git a/www/lendingbot.html b/www/lendingbot.html index 11d07d77..f3d490f1 100644 --- a/www/lendingbot.html +++ b/www/lendingbot.html @@ -40,29 +40,29 @@ @@ -90,10 +90,12 @@

Poloniex Lending Bot

@@ -131,7 +133,8 @@

Poloniex Lending Bot

+ +

Settings

diff --git a/www/lendingbot.js b/www/lendingbot.js index 990d3c1b..8277970d 100644 --- a/www/lendingbot.js +++ b/www/lendingbot.js @@ -253,7 +253,7 @@ function Timespan(name, multiplier) { if (currency == "BTC") { return displayUnit.formatValue(earnings) + " " + displayUnit.name + " / " + name + "
" } else if (currency == "USD" || currency == "USDT" || currency == "EUR") { - return printFloat(earnings, 2) + " " + currency + " / "+ name + "
"; + return prettyFloat(earnings, 2) + " " + currency + " / "+ name + "
"; } else { return printFloat(earnings, 8) + " " + currency + " / "+ name + "
"; } From d18500e6047a98069f6d1afebf199b95b9aa8216 Mon Sep 17 00:00:00 2001 From: Eric Carmichael Date: Sat, 15 Apr 2017 11:14:55 -0700 Subject: [PATCH 22/26] refactor validating... will still behave weirdly if somehow manages to get bad data set (sets localStorage without checking if it's valid) --- www/lendingbot.js | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/www/lendingbot.js b/www/lendingbot.js index 8277970d..af177062 100644 --- a/www/lendingbot.js +++ b/www/lendingbot.js @@ -378,27 +378,21 @@ function doSave() { // Bitcoin Display Unit localStorage.displayUnitText = $('input[name="btcDisplayUnit"]:checked').val(); - btcDisplayUnitsModes.forEach(function(unit) { - if(unit.name == localStorage.displayUnitText) { - displayUnit = unit; - } - }) + if(btcDisplayUnitsModes.indexOf(localStorage.displayUnitText) !== -1) { + displayUnit = localStorage.displayUnitText; + } // OutputCurrencyDisplayMode localStorage.outputCurrencyDisplayModeText = $('input[name="outputCurrencyDisplayMode"]:checked').val(); - validOutputCurrencyDisplayModes.forEach(function(mode) { - if(mode == localStorage.outputCurrencyDisplayModeText) { - outputCurrencyDisplayMode = mode; - } - }) - + if(validOutputCurrencyDisplayModes.indexOf(localStorage.outputCurrencyDisplayModeText) !== -1) { + outputCurrencyDisplayMode = localStorage.outputCurrencyDisplayModeText; + } + //Effective rate calculation localStorage.effRateMode = $('input[name="effRateMode"]:checked').val(); - validEffRateModes.forEach(function(mode) { - if(mode == localStorage.effRateMode) { - effRateMode = mode; - } - }) + if(validEffRateModes.indexOf(localStorage.effRateMode) !== -1) { + effRateMode = localStorage.effRateMode; + } toastr.success("Settings saved!"); $('#settings_modal').modal('hide'); From 42294a3cfe261416830ff66a67940be56d222d1d Mon Sep 17 00:00:00 2001 From: Raanan Date: Sat, 15 Apr 2017 22:26:08 +0200 Subject: [PATCH 23/26] Fixed indent issue --- www/lendingbot.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/lendingbot.html b/www/lendingbot.html index f3d490f1..1a1fd0bb 100644 --- a/www/lendingbot.html +++ b/www/lendingbot.html @@ -72,7 +72,7 @@