Skip to content

Commit c50f27b

Browse files
ckcollabrnevet
ckcollab
authored and
rnevet
committed
Web view improvements (update interval, settings) (#286)
* Increase page update interval * show yearly earnings as well * Display USD with 2 decimal places * display total holdings * fix grabbing totals when totalCoins not defined * use max coins not total coins for total holdings * adds toastr and settings for interval + stats * remove cruft * change "init" to "update" as it is ran multiple times * missed an init->update refactor * add EUR to nice currency printing * verify refresh rate value * new html header with collapsing menu * restore default refreshrate to 30 seconds * added a version parameter to the javascript to force reload * added missing scheme in toastr urls * rename loadSave to loadSettings * Added Bitcoin Display Unit to Settings. * Added OutputCurrencyDisplayMode to Settings. * Added Effective Rate Calculation to Settings. * Fix indentation issues Replace printFloat with prettyfloat for Fiat currencies (doesn't display .00) * refactor validating... will still behave weirdly if somehow manages to get bad data set (sets localStorage without checking if it's valid) * Fixed indent issue * Restored btcDisplayUnitsModes saving method As btcDisplayUnitsModes isn't a list of strings a simple indexOf won't match the mode. * Close menu when settings is pressed. * use icon192
1 parent 5c917aa commit c50f27b

File tree

2 files changed

+245
-49
lines changed

2 files changed

+245
-49
lines changed

‎www/lendingbot.html‎

Lines changed: 143 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -26,33 +26,43 @@
2626

2727
<!-- Bootstrap Core CSS -->
2828
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" rel="stylesheet">
29-
29+
3030
<!-- jQuery Version 1.12.2 -->
3131
<script src="https://code.jquery.com/jquery-1.12.2.min.js"></script>
3232

3333
<!-- Bootstrap Core JavaScript -->
3434
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
35-
36-
<script src="lendingbot.js" ></script>
37-
35+
36+
<!-- toastr -->
37+
<script src="https://cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/toastr.min.js"></script>
38+
<link href="https://cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/toastr.min.css" rel="stylesheet">
39+
40+
<script src="lendingbot.js?version=1" ></script>
41+
3842
<style>
39-
body {
40-
padding-top: 50px;
41-
}
43+
.brand-margin{
44+
margin-top:4px;
45+
margin-bottom:4px
46+
}
47+
4248
.inlinediv {
43-
display: inline-block;
44-
padding-right: 5%;
45-
vertical-align: top;
46-
}
47-
.plb-tooltip {
48-
white-space: nowrap;
49-
text-decoration: none;
50-
border-bottom: 1px dotted;
51-
color: black;
52-
}
53-
.plb-tooltip:hover {
54-
text-decoration: none;
55-
}
49+
display: inline-block;
50+
padding-right: 5%;
51+
vertical-align: top;
52+
}
53+
.plb-tooltip {
54+
white-space: nowrap;
55+
text-decoration: none;
56+
border-bottom: 1px dotted;
57+
color: black;
58+
}
59+
.plb-tooltip:hover {
60+
text-decoration: none;
61+
}
62+
63+
.modal-body form label {
64+
margin-top:8px;
65+
}
5666
</style>
5767

5868
</head>
@@ -61,19 +71,36 @@
6171
<!-- Page Content -->
6272
<nav class="navbar navbar-default navbar-fixed-top">
6373
<div class="container">
64-
<div class="row">
65-
<div class="col-xs-7">
66-
<h4>
67-
Poloniex Lending Bot
68-
</h4>
69-
</div>
70-
<div class="col-xs-5" style="text-align:right;margin: 10px auto;" >
71-
<span id="updated">Not updated</span>
74+
75+
<!-- Brand and toggle get grouped for better mobile display -->
76+
<div class="navbar-header" style="margin-left:8px">
77+
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
78+
<span class="sr-only">Toggle navigation</span>
79+
<span class="icon-bar"></span>
80+
<span class="icon-bar"></span>
81+
<span class="icon-bar"></span>
82+
</button>
83+
<img src="images/icon192.png" height="32" width="32" style="margin-top: 8px;margin-right: 8px;margin-left: -15px;vertical-align:top">
84+
<div style="display:inline-block">
85+
<h4 class="brand-margin">Poloniex Lending Bot</h4>
86+
<h7 class="brand-margin" id="updated">Not updated</h7>
7287
</div>
7388
</div>
89+
90+
<!-- Collect the nav links, forms, and other content for toggling -->
91+
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
92+
<ul class="nav navbar-nav navbar-right">
93+
<li data-toggle="collapse" data-target=".navbar-collapse.in" >
94+
<a data-toggle="modal" data-target="#settings_modal">
95+
<i class="glyphicon glyphicon-cog" style="color: black; cursor: pointer;"></i>
96+
Settings
97+
</a>
98+
</li>
99+
</ul>
100+
</div>
74101
</div>
75102
</nav>
76-
<div class="container">
103+
<div class="container" style="padding-top:50px">
77104
<div class="row" style="overflow-x:auto">
78105
<div id="file" style="margin-top:8px;display:none" >Select log file: <input type="file" name="file" style="display:inline-block" onchange="handleLocalFile(this.files[0])" /></div>
79106
<table class="table table-responsive">
@@ -93,14 +120,99 @@ <h4>
93120
<th colspan="2">Log (Reversed ordered):</th>
94121
</tr>
95122
</thead>
96-
<tbody id="logtable">
123+
<tbody id="logtable">
97124
</tbody>
98125
</table>
99126
</div>
100127
</div>
101128
<!-- /.container -->
102-
103129

130+
131+
<div class="modal fade" id="settings_modal" tabindex="-1" role="dialog">
132+
<div class="modal-dialog">
133+
<div class="modal-content">
134+
<div class="modal-header">
135+
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
136+
<span aria-hidden="true">&times;</span>
137+
</button>
138+
<h4 class="modal-title">Settings</h4>
139+
</div>
140+
<div class="modal-body">
141+
<form>
142+
<label>Page Refresh interval (10-60 seconds)</label>
143+
<div class="form-group">
144+
<input type="number" class="form-control" id="refresh_interval" placeholder="(10-60)">
145+
</div>
146+
147+
<label>Date ranges to display earnings for</label>
148+
<div class="form-group">
149+
150+
<div class="checkbox-inline" style="margin-top: 0;">
151+
<input data-timespan="Hour" type="checkbox"> Hourly
152+
</div>
153+
<div class="checkbox-inline">
154+
<input data-timespan="Day" type="checkbox"> Daily
155+
</div>
156+
<div class="checkbox-inline">
157+
<input data-timespan="Week" type="checkbox"> Weekly
158+
</div>
159+
<div class="checkbox-inline">
160+
<input data-timespan="Month" type="checkbox"> Monthly
161+
</div>
162+
<div class="checkbox-inline">
163+
<input data-timespan="Year" type="checkbox"> Yearly
164+
</div>
165+
</div>
166+
167+
<label>Bitcoin Display Unit</label>
168+
<div class="form-group">
169+
170+
<div class="radio-inline" style="margin-top: 0;">
171+
<input value="BTC" type="radio" name="btcDisplayUnit"> BTC
172+
</div>
173+
<div class="radio-inline">
174+
<input value="mBTC" type="radio" name="btcDisplayUnit"> mBTC
175+
</div>
176+
<div class="radio-inline">
177+
<input value="Bits" type="radio" name="btcDisplayUnit"> Bits
178+
</div>
179+
<div class="radio-inline">
180+
<input value="Satoshi" type="radio" name="btcDisplayUnit"> Satoshi
181+
</div>
182+
</div>
183+
184+
<label>Which earnings are displayed in selected output currency</label>
185+
<div class="form-group">
186+
187+
<div class="radio-inline" style="margin-top: 0;">
188+
<input value="all" type="radio" name="outputCurrencyDisplayMode"> All Coins
189+
</div>
190+
<div class="radio-inline">
191+
<input value="summary" type="radio" name="outputCurrencyDisplayMode"> Only Summary
192+
</div>
193+
</div>
194+
195+
<label>Effective loan rates calculation</label>
196+
<p class="small">Effective rate can either take into consideration the actual amount actively lent OR consider only Poloniex 15% fee</p>
197+
<div class="form-group">
198+
199+
<div class="radio-inline" style="margin-top: 0;">
200+
<input value="lentperc" type="radio" name="effRateMode"> Fee and Effective Lent
201+
</div>
202+
<div class="radio-inline">
203+
<input value="onlyfee" type="radio" name="effRateMode"> Fee Only
204+
</div>
205+
</div>
206+
207+
</form>
208+
</div>
209+
<div class="modal-footer">
210+
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
211+
<button type="button" class="btn btn-primary" onclick="doSave()">Save changes</button>
212+
</div>
213+
</div><!-- /.modal-content -->
214+
</div><!-- /.modal-dialog -->
215+
</div><!-- /.modal -->
104216
</body>
105217

106218
</html>

0 commit comments

Comments
 (0)