lukechilds
/
EasyDEX-GUI
mirror of https://github.com/lukechilds/EasyDEX-GUI.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Send Dialog update 

- history switched to dynamic
- send dialog box shows info from wallet widget, who’s send button was
clicked
- fee is dynamically picked from API for coin in Send dialog box
master
Satinder Grewal 9 years ago
parent
9384a31298
commit
7ef72dfb2f
3 changed files with 68 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 47
      assets/scripts/coinwallets.js
  2. 13
      assets/scripts/dashboard.js
  3. 29
      index.html

47
assets/scripts/coinwallets.js
View File

@ -10,5 +10,52 @@ $(document).ready(function() {
// Functions =============================================================
function sendCurrency(val) {
console.log(val);
$('#mdl_currency_coin').text(val.currency);
$('#mdl_currency_balance').text($('span[data-currency="' + val.currency + '"][id="currency-balance"]').text());
//console.log($('span[data-currency="' + val.currency + '"][id="currency-balance"]').text());
$('#mdl_currency_sendto').attr("placeholder", "Enter " + val.currency + " address");
$('#mdl_currency_amount_label').text(val.currency);
$('#mdl_currency_total_coinname').text(val.currency);
var getinfoValues = {"coin":val.currency,"agent":"bitcoinrpc","method":"getinfo"};
$.ajax({
type: 'POST',
data: JSON.stringify(getinfoValues),
url: 'http://127.0.0.1:7778',
//dataType: 'text',
success: function(data, textStatus, jqXHR) {
var CoinInfoData = JSON.parse(data);
var label_color = '';
var label_icon = '';
var wallettblContent = '';
//console.log('== Coin Info Data OutPut ==');
//console.log(CoinInfoData.txfee);
$('#mdl_currency_fee').val(CoinInfoData.txfee);
},
error: function(xhr, textStatus, error) {
console.log('failed getting Coin History.');
console.log(xhr.statusText);
console.log(textStatus);
console.log(error);
}
});
}
$('#mdl_currency_amount').keyup(function() {
var sum_val1 = parseFloat($('#mdl_currency_amount').val())
var sum_val2 = parseFloat($('#mdl_currency_fee').val())
var total_of_currency_fee = sum_val1 + sum_val2;
console.log($('#mdl_currency_amount').val());
$('#mdl_currency_total_value').text(total_of_currency_fee);
});
$('#mdl_currency_fee').keyup(function() {
var sum_val1 = parseFloat($('#mdl_currency_amount').val())
var sum_val2 = parseFloat($('#mdl_currency_fee').val())
var total_of_currency_fee = sum_val1 + sum_val2;
console.log($('#mdl_currency_amount').val());
$('#mdl_currency_total_value').text(total_of_currency_fee);
});

13
assets/scripts/dashboard.js
View File

@ -113,7 +113,7 @@ var Dashboard = function() {
walletDivContent += '<div class="row no-space ">';
walletDivContent += '<div class="btn-group btn-group-justified">';
walletDivContent += '<div class="btn-group" role="group">';
walletDivContent += '<button type="button" class="btn btn-xs bg-blue-grey-200 grey-800 waves-effect waves-light" data-currency="' + AllcoinsDataOutput[value][index] + '" id="currency-send" onclick="sendCurrency($(this).data())" data-target="#exampleMultipleOne" data-toggle="modal">';
walletDivContent += '<button type="button" class="btn btn-xs bg-blue-grey-200 grey-800 waves-effect waves-light" data-currency="' + AllcoinsDataOutput[value][index] + '" id="currency-send" onclick="sendCurrency($(this).data())" data-target="#SendCoinModelStep1" data-toggle="modal">';
walletDivContent += '<i class="icon wb-upload" aria-hidden="true"></i>';
walletDivContent += '<br>';
walletDivContent += '<span class="text-uppercase hidden-xs">Send</span>';
@ -191,8 +191,8 @@ var Dashboard = function() {
var label_color = '';
var label_icon = '';
var wallettblContent = '';
console.log('== Data OutPut ==');
console.log(CoinHistoryData);
//console.log('== Data OutPut ==');
//console.log(CoinHistoryData);
//var testhistory = {"result":"success","received":[{"address":"RCNL1GJuTVt88dgnuiwS7i51ztjYHpPKF2","amount":9.94390000,"numseconds":1410727,"details":{"txid":"e0330be4ec6f2fd27bc26c559524ccd808a589a0752e18618b358d288d62be3a","vout":1,"height":1195141,"relays":1}}, {"address":"RCNL1GJuTVt88dgnuiwS7i51ztjYHpPKF2","amount":0.89000000,"numseconds":1340168,"details":{"txid":"46b210cd0d505e88b738d1ca09595e33dc435f11d53e0516566deb0a9e0de5ba","vout":1,"height":1196389,"relays":1}}, {"address":"RCNL1GJuTVt88dgnuiwS7i51ztjYHpPKF2","amount":0.94590000,"numseconds":1340168,"details":{"txid":"67499f6ccefadf046e7e26b9a650f32b6dd472046356d79f35714f37482692d8","vout":1,"height":1196382,"relays":1}}, {"address":"RCNL1GJuTVt88dgnuiwS7i51ztjYHpPKF2","amount":0.87900000,"numseconds":1319872,"details":{"txid":"2426d9e0d3643706c0709af8e5342106633030b59ef738cb75d3c19aebe51a40","vout":1,"height":1196766,"relays":1}}, {"address":"RCNL1GJuTVt88dgnuiwS7i51ztjYHpPKF2","amount":0.97890000,"numseconds":1319871,"details":{"txid":"820b553726e055de46ee40652b86692be2c52fd561edf8a927ab012be46b4ed4","vout":1,"height":1196748,"relays":1}}],"sent":[{"address":"RCNL1GJuTVt88dgnuiwS7i51ztjYHpPKF2","amount":9.94390000,"numseconds":1410727,"details":{"txid":"e0330be4ec6f2fd27bc26c559524ccd808a589a0752e18618b358d288d62be3a","vout":1,"height":1195141,"relays":1}}, {"address":"RCNL1GJuTVt88dgnuiwS7i51ztjYHpPKF2","amount":0.89000000,"numseconds":1340168,"details":{"txid":"46b210cd0d505e88b738d1ca09595e33dc435f11d53e0516566deb0a9e0de5ba","vout":1,"height":1196389,"relays":1}}, {"address":"RCNL1GJuTVt88dgnuiwS7i51ztjYHpPKF2","amount":0.94590000,"numseconds":1340168,"details":{"txid":"67499f6ccefadf046e7e26b9a650f32b6dd472046356d79f35714f37482692d8","vout":1,"height":1196382,"relays":1}}, {"address":"RCNL1GJuTVt88dgnuiwS7i51ztjYHpPKF2","amount":0.87900000,"numseconds":1319872,"details":{"txid":"2426d9e0d3643706c0709af8e5342106633030b59ef738cb75d3c19aebe51a40","vout":1,"height":1196766,"relays":1}}, {"address":"RCNL1GJuTVt88dgnuiwS7i51ztjYHpPKF2","amount":0.97890000,"numseconds":1319871,"details":{"txid":"820b553726e055de46ee40652b86692be2c52fd561edf8a927ab012be46b4ed4","vout":1,"height":1196748,"relays":1}}],"coin":"BTCD","balance":13.63770000,"tag":"10703025980307863381"};
@ -202,8 +202,8 @@ var Dashboard = function() {
$('span[data-currency="' + AllcoinsDataOutput[value][index] + '"][id="currency-balance"]').text(CoinHistoryData.balance);
//var show_coin_history = CoinHistoryData; //Enable to get history from each coins's wallet address.
var show_coin_history = testhistory; //Enable to get history from just test variable.
var show_coin_history = CoinHistoryData; //Enable to get history from each coins's wallet address.
//var show_coin_history = testhistory; //Enable to get history from just test variable.
$.each(show_coin_history.history.reverse(), function(coin_history_index){
//console.log(coin_history_index);
//console.log(show_coin_history.history[coin_history_index].details.vout);
@ -222,7 +222,8 @@ var Dashboard = function() {
wallettblContent += '<td>' + show_coin_history.history[coin_history_index].numseconds + '</td>';
wallettblContent += '<td><span style="color: ' + balance_text_color + ';">' + show_coin_history.history[coin_history_index].amount + '</span></td>';
wallettblContent += '</tr>';
$('#currency-tbl tbody').html(wallettblContent);
$('table[data-currency="' + AllcoinsDataOutput[value][index] + '"][id="currency-tbl"] tbody').html(wallettblContent);
//$('#currency-tbl tbody').html(wallettblContent);
});
//console.log(show_coin_history.history.length);

29
index.html
View File

@ -268,46 +268,46 @@
</div>
<!-- Modal -->
<div class="modal fade modal-3d-sign" id="exampleMultipleOne" aria-hidden="true"
aria-labelledby="exampleModalTitle" role="dialog" tabindex="-1">
<div class="modal fade modal-3d-sign" id="SendCoinModelStep1" aria-hidden="true"
aria-labelledby="SendCoinModelTitle" role="dialog" tabindex="-1">
<div class="modal-dialog modal-center">
<form class="modal-content">
<div class="modal-header bg-orange-a400 wallet-send-header">
<button type="button" class="close white" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">×</span>
</button>
<h4 class="modal-title white" id="exampleFormModalLabel">SEND [COIN] (Balance) <small class="white" style="font-size: 10px;">STEP 1 of 2</small></h4>
<h4 class="modal-title white" id="SendCoinModelLabel">SEND <span id="mdl_currency_coin">[COIN]</span> <span id="mdl_currency_balance">(Balance)</span> <small class="white" style="font-size: 10px;">STEP 1 of 2</small></h4>
</div>
<div class="modal-body">
<div class="row">
<div class="col-lg-12 form-group form-material">
<label class="control-label" for="inputText">Send To</label>
<input type="text" class="form-control" id="inputText" name="inputText" placeholder="Enter [coin] address"
<label class="control-label" for="mdl_currency_sendto">Send To</label>
<input type="text" class="form-control" id="mdl_currency_sendto" name="mdl_currency_sendto" placeholder="Enter [coin] address"
/>
</div>
<div class="col-lg-6 form-group form-material">
<label class="control-label" for="inputText">[Coin]]</label>
<input type="text" class="form-control" id="inputText" name="inputText" placeholder="0.000"/>
<label class="control-label" for="mdl_currency_amount" id="mdl_currency_amount_label">[Coin]</label>
<input type="text" class="form-control" id="mdl_currency_amount" name="mdl_currency_amount" placeholder="0.000"/>
</div>
<div class="col-lg-6 form-group form-material">
<label class="control-label" for="inputText">Fee</label>
<input type="text" class="form-control" id="inputText" name="inputText" placeholder="0.000"/>
<label class="control-label" for="mdl_currency_fee">Fee</label>
<input type="text" class="form-control" id="mdl_currency_fee" name="mdl_currency_fee" placeholder="0.000"/>
</div>
<div class="col-lg-12">
<span><b>Total:</b> 0.000 [Coin] <span class="icon glyphicon glyphicon-resize-horizontal"></span> 0.00 [USD]</span>
<span><b>Total:</b> <span id="mdl_currency_total_value">0.000</span> <span id="mdl_currency_total_coinname">[Coin]</span> <span class="icon glyphicon glyphicon-resize-horizontal"></span> 0.00 [USD]</span>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
<button type="button" class="btn btn-primary" data-target="#exampleMultipleTwo" data-toggle="modal" data-dismiss="modal">Send</button>
<button type="button" class="btn btn-primary" data-target="#SendCoinModelStep2" data-toggle="modal" data-dismiss="modal">Send</button>
</div>
</form>
</div>
</div>
<!-- End Modal -->
<!-- Modal -->
<div class="modal fade modal-3d-sign" id="exampleMultipleTwo" aria-hidden="false" role="dialog"
<div class="modal fade modal-3d-sign" id="SendCoinModelStep2" aria-hidden="false" role="dialog"
tabindex="-1">
<div class="modal-dialog modal-center">
<div class="modal-content">
@ -338,7 +338,7 @@
</div>
</div>
<div class="modal-footer">
<a class="btn btn-default" data-target="#exampleMultipleOne" data-toggle="modal" data-dismiss="modal">Back</a>
<a class="btn btn-default" data-target="#SendCoinModelStep1" data-toggle="modal" data-dismiss="modal">Back</a>
<button type="button" class="btn btn-primary" data-toggle="modal" data-dismiss="modal">Confirm</button>
</div>
</div>
@ -425,8 +425,7 @@
<script type="text/javascript">
jQuery(document).ready(function(){
jQuery('.scrollbar-dynamic').scrollbar();
});
//$('#password').val(''); $('#wallet-login').hide(); $('#wallet-core').fadeIn(); $('body').removeClass( "page-login layout-full page-dark" ).addClass( "" ); $('link[id=loginStyle]')[0].disabled=true;
});
</script>
</body>
</html>
Write Preview
Loading…
Cancel
Save