Browse Source

refresh basilisk connections action added to basilisk actions menu

master
Satinder Grewal 8 years ago
parent
commit
150af985a8
  1. 19
      assets/scripts/dashboard.js
  2. 105
      assets/scripts/iguana_api.js
  3. 80
      index.html

19
assets/scripts/dashboard.js

@ -255,6 +255,7 @@ var Dashboard = function() {
var edexcoin_sendto_result_tbl = '';
edexcoin_sendto_result_tbl += '<tr class="info"><td>Info</td><td>The transaction submitted is processing. Once processed the transaction details will be displayed here.</td></tr>';
$('#edexcoin_sendto_result tbody').html(edexcoin_sendto_result_tbl);
$('#edexcoin_send_coins_anothertx_btn').hide();
var tmp_json_data = {'coin':active_edexcoin,'sendtoaddr':tmp_send_to_addr,'amount':tmp_send_total_amount};
console.log(tmp_json_data);
@ -476,12 +477,25 @@ var Dashboard = function() {
$('#atomic_explorer_select_command_options option[value=dex_getnotaries]').attr('selected','selected');
$( "#atomic_explorer_getcoinpeers_btn" ).trigger( "click" );
})
$(".btn_edexcoin_dashboard_register").click(function() {
var selected_coin = $(this).data('edexcoin')
var coinmainaddr = EDEXMainAddr(selected_coin);
Iguana_DEXImportAddr(selected_coin,coinmainaddr[0]);
})
$(".btn_edexcoin_dashboard_refresh_basilisk_conn").click(function() {
var show_mdl = setTimeout(function() {
var selected_coin = $(this).data('edexcoin')
$('#RefreshBasiliskConnectionsMdl').modal('show')
}, 0)
var start_refresh = setTimeout(function() {
EDEX_DEXgetinfoAll()
}, 3000)
Promise.all([show_mdl, start_refresh]).then(function() {
console.log('all promises executed!!!');
});
})
$(".btn_edexcoin_dashboard_validate").click(function() {
@ -666,6 +680,7 @@ function edexCoinBtnAction() {
$.each($('[data-edexcoinmenu]'), function(index, value) {$('[data-edexcoinmenu]').attr("data-edexcoinmenu",coincode); $('[data-edexcoinmenu="'+coincode+'"]')});
$('#edexcoin-active').text(selected_coinname);
$('#edex_total_balance_coincode').text(coincode);
//populate selected coin's address
var coinmainaddr = EDEXMainAddr(coincode);
$('#edexcoin_active_addr').text(coinmainaddr[0]);

105
assets/scripts/iguana_api.js

@ -676,24 +676,28 @@ function EDEXSendToAddr(data) {
toastr.error("Sent Transaction failed. Please check send Transaction page for details.", "Wallet Notification");
edexcoin_sendto_result_tbl += '<tr class="active"><td>error</td><td><span class="label label-danger">' + SendToAddrData.error + '</span></td></tr>';
$('#edexcoin_sendto_result tbody').html(edexcoin_sendto_result_tbl);
$('#edexcoin_send_coins_anothertx_btn').show();
}
if ( SendToAddrData.complete !== undefined ) {
var active_edexcoin = $('[data-edexcoin]').attr("data-edexcoin");
toastr.success("Transaction sent successfully. Check send section for details.", "Wallet Notification");
edexcoin_sendto_result_tbl += '<tr class=""><td>complete</td><td><span class="label label-info">' + SendToAddrData.complete + '</span></td></tr>'
edexcoin_sendto_result_tbl += '<tr><td>result</td><td><a href="javascript:void(0)" data-edexcoin="' + active_edexcoin + '" data-sendtotxresult="' + SendToAddrData.result + '" class="edexcoin_sendto_output_result">' + SendToAddrData.result + '</a></td></tr>'
edexcoin_sendto_result_tbl += '<tr class=""><td>sendrawtransaction</td><td><span class="label label-primary">' + SendToAddrData.sendrawtransaction + '</span></td></tr>'
edexcoin_sendto_result_tbl += '<tr class=""><td>signedtx</td><td><span style="display: block; width: 400px;word-wrap: break-word;">' + SendToAddrData.signedtx + '</span></td></tr>'
$('#edexcoin_sendto_result tbody').html(edexcoin_sendto_result_tbl);
$('#edexcoin_send_coins_anothertx_btn').show();
}
var active_edexcoin = $('[data-edexcoin]').attr("data-edexcoin");
var selected_coinmode = sessionStorage.getItem('edexTmpMode')
if ( selected_coinmode == 'Basilisk' ) {
var active_edexcoin = $('[data-edexcoin]').attr("data-edexcoin");
var coinwalletbalance = getDEXCoinBalance(active_edexcoin)
console.log(coinwalletbalance)
//coinwalletbalance = coinwalletbalance.total
$('#edex_total_balance').text(coinwalletbalance.total);
} else {
var active_edexcoin = $('[data-edexcoin]').attr("data-edexcoin");
var tmp_get_coin_balance = EDEXlistunspent(active_edexcoin)
if (tmp_get_coin_balance[0] != undefined) {
//console.log(tmp_get_coin_balance[0])
@ -1109,6 +1113,105 @@ function EDEX_DEXlistunspent(coin,addr) {
}
function EDEX_DEXnotarychains() {
NProgress.done(true);
NProgress.configure({
template: '<div class="bar nprogress-bar-header nprogress-bar-info" role="bar"></div><div class="spinner" role="spinner"><div class="spinner-icon"></div></div>'
});
NProgress.start();
var result = [];
var tmpIguanaRPCAuth = 'tmpIgRPCUser@'+sessionStorage.getItem('IguanaRPCAuth');
var ajax_data = {'userpass':tmpIguanaRPCAuth,"agent":"dpow","method":"notarychains"}
console.log(ajax_data);
$.ajax({
async: false,
type: 'POST',
data: JSON.stringify(ajax_data),
url: 'http://127.0.0.1:7778',
//dataType: 'text',
success: function(data, textStatus, jqXHR) {
var AjaxOutputData = JSON.parse(data); //Ajax output gets the whole list of unspent coin with addresses
console.log('== EDEX_DEXnotarychains Data OutPut ==');
//console.log(AjaxOutputData);
result.push(AjaxOutputData);
},
error: function(xhr, textStatus, error) {
console.log(xhr.statusText);
if ( xhr.readyState == 0 ) {
Iguana_ServiceUnavailable();
}
console.log(textStatus);
console.log(error);
}
});
//console.log(result);
NProgress.done();
return result[0];
}
function EDEX_DEXgetinfoAll() {
NProgress.done(true);
NProgress.configure({
template: '<div class="bar nprogress-bar-header nprogress-bar-info" role="bar"></div><div class="spinner" role="spinner"><div class="spinner-icon"></div></div>'
});
NProgress.start();
var result = [];
var get_dex_notarychains = EDEX_DEXnotarychains();
console.log(get_dex_notarychains.length)
//var refresh_percent = '';
$.each(get_dex_notarychains, function( coin_index, coin_value ) {
console.log(coin_index + ': ' + coin_value);
//var refresh_percent = parseFloat(parseInt(coin_index, 10) * 100)/ parseInt(get_dex_notarychains.length, 10);
//console.log(refresh_percent)
//$('#basilisk-connections-refresh-title').text(coin_value);
//$('#basilisk-connections-refresh-percent').text(refresh_percent+'%');
//$('#basilisk-connections-refresh-progress-bar').width(refresh_percent+'%')
var tmpIguanaRPCAuth = 'tmpIgRPCUser@'+sessionStorage.getItem('IguanaRPCAuth');
var ajax_data = {'userpass':tmpIguanaRPCAuth,"agent":"dex","method":"getinfo","symbol":coin_value}
//console.log(ajax_data);
$.ajax({
async: false,
type: 'POST',
data: JSON.stringify(ajax_data),
url: 'http://127.0.0.1:7778',
//dataType: 'text',
success: function(data, textStatus, jqXHR) {
var AjaxOutputData = JSON.parse(data); //Ajax output gets the whole list of unspent coin with addresses
console.log('== EDEX_DEXgetinfoAll Data OutPut ==');
console.log(AjaxOutputData);
if (AjaxOutputData == '' ) {
result.push([{"amount":0}]);
}
result.push(AjaxOutputData);
if (AjaxOutputData.error === 'less than required responses') {
toastr.info("Less than required responses for "+coin_value+".", "Basilisk Notification")
}
},
error: function(xhr, textStatus, error) {
console.log(xhr.statusText);
if ( xhr.readyState == 0 ) {
Iguana_ServiceUnavailable();
}
console.log(textStatus);
console.log(error);
}
});
});
//$('#basilisk-connections-refresh-progress-bar').width('100%')
$('#RefreshBasiliskConnectionsMdl').modal('hide')
toastr.success("Basilsk nodes connections refreshed.", "Basilisk Notification")
//console.log(result);
NProgress.done();
return result[0];
}
function Shepherd_getConf(coin) {
var result = [];
var ajax_data = {"chain":coin};

80
index.html

@ -77,6 +77,66 @@
<!-- START ADD COIN DIV -->
<div>
<!-- Modal -->
<div class="modal fade modal-3d-sign" id="RefreshBasiliskConnectionsMdl" aria-hidden="false" role="dialog"
tabindex="-1">
<div class="modal-dialog modal-center modal-md">
<div class="modal-content">
<div class="modal-header bg-orange-a400 wallet-send-header" style="border-radius: 3px 3px 0 0;">
<!--<button type="button" class="close white" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">×</span>
</button>-->
<h4 class="modal-title white"><span class="icon fa-refresh" style="margin: 0;"></span> Refreshing Basilisk Network Connections... <span id="mdl_receive_coin_name"></span></h4>
<!--<span class="white">This is your default Iguana wallet address.</span>-->
</div>
<div class="modal-body" style="text-align: center;">
<div class="loader-wrapper active">
<div class="loader-layer loader-blue">
<div class="loader-circle-left">
<div class="circle"></div>
</div>
<div class="loader-circle-gap"></div>
<div class="loader-circle-right">
<div class="circle"></div>
</div>
</div>
<div class="loader-layer loader-red">
<div class="loader-circle-left">
<div class="circle"></div>
</div>
<div class="loader-circle-gap"></div>
<div class="loader-circle-right">
<div class="circle"></div>
</div>
</div>
<div class="loader-layer loader-green">
<div class="loader-circle-left">
<div class="circle"></div>
</div>
<div class="loader-circle-gap"></div>
<div class="loader-circle-right">
<div class="circle"></div>
</div>
</div>
<div class="loader-layer loader-yellow">
<div class="loader-circle-left">
<div class="circle"></div>
</div>
<div class="loader-circle-gap"></div>
<div class="loader-circle-right">
<div class="circle"></div>
</div>
</div>
</div>
<!--<h4><span id="basilisk-connections-refresh-title">-</span> <span class="pull-right" id="basilisk-connections-refresh-percent">-</span></h4>
<div class="progress progress-md">
<div class="progress-bar progress-bar-info progress-bar-striped active" style="width: 0%; font-size: 80%;" role="progressbar" data-edexcoin="COIN" id="basilisk-connections-refresh-progress-bar"></div>
</div>-->
</div>
</div>
</div>
</div>
<!-- End Modal -->
<!-- Modal -->
<div class="modal fade modal-3d-sign" id="AddCoinDilogModel" aria-hidden="true" aria-labelledby="AddCoinDilogModel" role="dialog" tabindex="-1">
<div class="modal-dialog modal-center modal-lg">
@ -324,7 +384,7 @@
</div>
<!-- Modal -->
<!-- Modal -->
<div class="modal fade modal-3d-sign" id="AddCoinDilogModel-login" aria-hidden="true" aria-labelledby="AddCoinDilogModel-login" role="dialog" tabindex="-1">
<div class="modal-dialog modal-center modal-lg">
<div class="modal-content">
@ -656,7 +716,7 @@
<!-- Begin page header -->
<div class="page-header page-header-bordered header-easydex" id="header-dashboard" data-edexcoin="COIN" style="display: none;">
<ol class="breadcrumb" data-edexcoin="COIN">
<b>My <span data-edexcoin="COIN" id="edexcoin-active">-</span> Address: </b> <span data-edexcoin="COIN" id="edexcoin_active_addr">-</span> <button class="btn btn-xs" data-edexcoin="COIN" id="edexcoin_active_addr_clipboard" data-clipboard-text=""><i class="icon wb-copy" aria-hidden="true"></i> copy</button>
<b>My <span data-edexcoin="COIN" id="edexcoin-active">-</span> Address: </b> <span data-edexcoin="COIN" id="edexcoin_active_addr">-</span> <button class="btn btn-default btn-xs" data-edexcoin="COIN" id="edexcoin_active_addr_clipboard" data-clipboard-text=""><i class="icon wb-copy" aria-hidden="true"></i> copy</button>
</ol>
<div class="page-header-actions" data-edexcoin="COIN" id="edexcoin-actions">
<!-- EasyDEX Coin Wallet Header button -->
@ -702,7 +762,7 @@
<div class="pull-left padding-vertical-10">
<i class="icon fa-eye font-size-24 vertical-align-bottom margin-right-5"></i>Total Balance
</div>
<span class="pull-right padding-top-10" data-edexcoin="COIN" id="edex_total_balance" style="font-size: 22px;">-</span>
<span class="pull-right padding-top-10" data-edexcoin="COIN" style="font-size: 22px;"><span data-edexcoin="COIN" id="edex_total_balance"></span> <span data-edexcoin="COIN" id="edex_total_balance_coincode"></span></span>
</div>
</div>
</div>
@ -748,6 +808,8 @@
role="menu">
<li role="presentation"><a href="javascript:void(0)" class="btn_edexcoin_dashboard_getnotaries" data-edexcoin="COIN" id="btn_edexcoin_dashboard_getnotaries" role="menuitem"><i class="icon fa-sitemap" aria-hidden="true"></i> Get Notary Nodes List</a></li>
<li role="presentation"><a href="javascript:void(0)" class="btn_edexcoin_dashboard_refresh_basilisk_conn" data-edexcoin="COIN" id="btn_edexcoin_dashboard_refresh_basilisk_conn" role="menuitem"><i class="icon wb-refresh" aria-hidden="true"></i> Refresh Basilisk Connections</a></li>
<li data-edexcoin="COIN" role="presentation"><a href="javascript:void(0)" class="btn_edexcoin_dashboard_register" data-edexcoin="COIN" id="btn_edexcoin_dashboard_register" role="menuitem"><i class="icon fa-sign-in" aria-hidden="true"></i> Register Address on Network</a></li>
@ -910,15 +972,15 @@
<!-- EasyDEX Panel send info panel -->
<div class="col-xlg-12 col-md-12 col-sm-12 col-xs-12">
<div class="panel" id="edexcoin-send-txdetails-screen" style="display: none;">
<div class="panel-body">
<h4>Transaction Result</h4>
<div class="panel-heading">
<h4 class="panel-title">Transaction Result</h4>
<table class="table table-hover table-striped edexcoin_sendto_result" data-edexcoin="COIN" id="edexcoin_sendto_result">
<thead><tr><th>Key</th><th>Info</th></tr></thead>
<tbody>
</tbody>
</table>
<div class="widget-body-footer">
<div class="widget-actions pull-right">
<div class="widget-actions margin-bottom-15 margin-right-15">
<button type="button" class="btn btn-primary" id="edexcoin_send_coins_anothertx_btn">Make Another Transaction</button>
</div>
</div>
@ -1029,7 +1091,7 @@
</div>-->
<!-- End Modal -->
<!-- Modal -->
<div class="modal fade modal-3d-sign" id="ReceiveCoinModel" aria-hidden="false" role="dialog"
<!--<div class="modal fade modal-3d-sign" id="ReceiveCoinModel" aria-hidden="false" role="dialog"
tabindex="-1">
<div class="modal-dialog modal-center modal-lg">
<div class="modal-content">
@ -1044,7 +1106,7 @@
<div class="row">
<div class="col-xs-8" style="text-align: center;"><h4>Copy and Share</h4></div><div class="col-xs-4" style="text-align: center;"><h4>Scan</h4></div>
<span class="col-sm-8 col-xs-12" style="text-align: center;"><input type="text" class="force-select form-control empty" id="mdl_receive_coin_addr" readonly/><br>
<button class="btn btn-round btn-info waves-effect waves-round waves-light" data-clipboard-action="copy" data-clipboard-target="#mdl_receive_coin_addr" data-toggle="tooltip"><i class="icon md-copy" aria-hidden="true"></i>Copy to clipboard</button></span>
<button class="btn btn-round btn-info btn-default waves-effect waves-round waves-light" data-clipboard-action="copy" data-clipboard-target="#mdl_receive_coin_addr" data-toggle="tooltip"><i class="icon md-copy" aria-hidden="true"></i>Copy to clipboard</button></span>
<span class="col-sm-4 col-xs-12" id="mdl_receive_coin_addr_qr_code" style="width: 60px;"></span>
</div>
<div class="modal-footer">
@ -1052,7 +1114,7 @@
</div>
</div>
</div>
</div>
</div>-->
<!-- End Modal -->
</div>

Loading…
Cancel
Save