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

few guy bug fixes 

still have more to fix
master
Satinder Grewal 8 years ago
parent
e07eeae23f
commit
f1761ca74f
3 changed files with 247 additions and 97 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. 77
      assets/scripts/dashboard.js
  2. 49
      assets/scripts/iguana_api.js
  3. 92
      assets/scripts/login.js

77
assets/scripts/dashboard.js
View File

@ -1,3 +1,6 @@
var RunShowCoinHistory = '';
var RunTotalFiatValue = '';
var Dashboard = function() {
@ -27,7 +30,7 @@ var Dashboard = function() {
dataType: 'text',
success: function(data, textStatus, jqXHR) {
var AllcoinsDataOutput = JSON.parse(data);
//console.log('== Data OutPut ==');
//console.log('== AllCoins Data OutPut ==');
//console.log(value);
//console.log(AllcoinsDataOutput[value]);
@ -67,8 +70,9 @@ var Dashboard = function() {
walletDivContent += '<div>';
walletDivContent += '<div class="font-size-20 hidden-xs" data-currency="' + AllcoinsDataOutput[value][index] + '" id="currency-name">' + coinname + '</div>';
walletDivContent += '<div class="form-material hidden-md hidden-xs">';
walletDivContent += '<select class="form-control font-size-12" data-currency="' + AllcoinsDataOutput[value][index] + '" id="currency-addr" style="width: 235px;">';
walletDivContent += '</select>';
/*walletDivContent += '<select class="form-control font-size-12" data-currency="' + AllcoinsDataOutput[value][index] + '" id="currency-addr" style="width: 235px;">';
walletDivContent += '</select>';*/
walletDivContent += '<div class="font-size-12" data-currency="' + AllcoinsDataOutput[value][index] + '" id="currency-addr"></div>';
walletDivContent += '</div>';
walletDivContent += '<div class="font-size-12 hidden-xs"></div>';
walletDivContent += '</div>';
@ -147,7 +151,7 @@ var Dashboard = function() {
//console.log('http://127.0.0.1:7778/api/bitcoinrpc/getaddressesbyaccount?coin=' + AllcoinsDataOutput[value][index] + '&account=*');
//List coin addresses as drop down menu
var getaddrlist = {"coin":AllcoinsDataOutput[value][index],"agent":"bitcoinrpc","method":"getaddressesbyaccount","account":"*"};
var getaddrlist = {"agent":"SuperNET","method":"activehandle"};
$.ajax({
type: 'POST',
data: JSON.stringify(getaddrlist),
@ -157,19 +161,10 @@ var Dashboard = function() {
var addrlistData = JSON.parse(data);
//console.log('== Address List Data OutPut ==');
//console.log(addrlistData);
$.each(addrlistData.result, function(coin_index){
//console.log(coin_index);
//console.log(addrlistData.result[index]);
//console.log(AllcoinsDataOutput[value][index]);
CoinAddrList = '<option value="' + addrlistData.result[coin_index] + '" data-select-options="' + AllcoinsDataOutput[value][index] + '">' + addrlistData.result[coin_index] + '</option>';
$('div[data-currency="' + AllcoinsDataOutput[value][index] + '"][id="currency-addr"]').text(addrlistData[AllcoinsDataOutput[value][index]])
//console.log(CoinAddrList);
// Inject the whole content string into our existing HTML table
$('select[data-currency="' + AllcoinsDataOutput[value][index] + '"]').append(CoinAddrList);
});
//console.log(data);
//console.log(data[0]);*/
//console.log(data[0]);
},
error: function(xhr, textStatus, error) {
console.log('failed getting Coin History.');
@ -181,10 +176,7 @@ var Dashboard = function() {
//Get coin history and pupulate balance and other info to wallet widget
var historyvalues = {"timeout":20000,"agent":"basilisk","method":"history","vals":{"coin":"" + AllcoinsDataOutput[value][index] + ""}};
setInterval(function() {
ShowCoinHistory(historyvalues);
console.log('wallet widget refereshed (every 15 seconds)');
}, 15000);
RunShowCoinHistory = setInterval(function() { ShowCoinHistory(historyvalues); /*console.log('wallet widget refereshed (every 1 seconds)');*/ }, 1000);
});
},
@ -217,19 +209,28 @@ var Dashboard = function() {
//main function to initiate the module
init: function() {
if ( sessionStorage.getItem('IguanaActiveAccount') === null ) {
console.log('=> No wallet logged in. No need to run Dashboard JS.');
} else {
handleWalletWidgets();
handleWalletSendRec();
TotalFiatValue();
}
/*setInterval(function() {
handleWalletWidgets();
console.log('wallet widget refereshed (every 15 seconds)');
}, 15000);*/
setInterval(function() {
RunTotalFiatValue = setInterval(function() {
if ( sessionStorage.getItem('IguanaActiveAccount') === null ) {
console.log('=> No wallet logged in. No need to get Rates.');
StopTotalFiatValue();
} else {
TotalFiatValue();
console.log('Get Rates (every 60 seconds)');
}, 60000);
//console.log('Get Rates (every 60 seconds)');
}
}, 1000);
}
@ -243,6 +244,19 @@ jQuery(document).ready(function() {
function ShowCoinHistory(getData) {
Iguana_activehandle();
if ( sessionStorage.getItem('IguanaActiveAccount') === null ) {
console.log('There\'s no active wallet logged in. Please Login.');
$('#logint-another-wallet').hide();
} else {
var CheckLoginData = JSON.parse(sessionStorage.getItem('IguanaActiveAccount'));
if ( JSON.parse(CheckLoginData).pubkey != Iguana_activehandle_output.pubkey ) {
console.log("ShowCoinHistory: sessionStorage data and activehandle data doesn't match");
console.log(Iguana_activehandle_output.pubkey);
console.log(JSON.parse(CheckLoginData).pubkey);
ClearOnLogout(true, true);
}
if ( JSON.parse(CheckLoginData).status === 'unlocked' ) {
//console.log(getData.vals['coin']);
$.ajax({
type: 'POST',
@ -305,6 +319,19 @@ function ShowCoinHistory(getData) {
console.log(error);
}
});
} else if ( JSON.parse(CheckLoginData).status === 'locked' ) {
console.log('Wallet is Locked.');
$('#login-welcome').text('Wallet Locked. Please login');
$('#register-btn').hide();
$("#loginbtn").text('Unlock');
}
}
}
function StopShowCoinHistory() {
clearInterval(RunShowCoinHistory);
console.log('Stopped executing History API.');
}
@ -438,6 +465,11 @@ function TotalFiatValue() {
}
}
function StopTotalFiatValue() {
clearInterval(RunTotalFiatValue);
console.log('Stopped executing Total Fiat Value API with Rates');
}
function secondsToString(seconds) {
var numyears = Math.floor(seconds / 31536000);
var numdays = Math.floor((seconds % 31536000) / 86400);
@ -459,3 +491,4 @@ function secondsToString(seconds) {
}
//return numyears + " years " + numdays + " days " + numhours + " hours " + numminutes + " minutes " + numseconds + " seconds";
}

49
assets/scripts/iguana_api.js
View File

@ -72,3 +72,52 @@ function Iguana_rmd160conv(rmd160conv_data) {
}
});
}
var Iguana_activehandle_output = ''; //Storing activehandle output this variable. accessible globally.
function Iguana_activehandle() {
//comment
var ajax_data = {"agent":"SuperNET","method":"activehandle"};
//console.log(ajax_data);
$.ajax({
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);
//console.log('== ActiveHandle Data OutPut ==');
//console.log(AjaxOutputData);
Iguana_activehandle_output = AjaxOutputData;
return true;
},
error: function(xhr, textStatus, error) {
console.log('failed getting Coin History.');
console.log(xhr.statusText);
console.log(textStatus);
console.log(error);
return false;
}
});
return 'Executed Iguana_activehandle. Check Iguana_activehandle_output var value.';
}
function Iguana_addcoin(addcoin_data) {
var addcoinValues = {"poll":100,"active":1,"agent":"iguana","method":"addcoin","newcoin":addcoin_data.coin,"startpend":1,"endpend":1,"services":128,"maxpeers":16,"RELAY":addcoin_data.mode,"VALIDATE":addcoin_data.mode,"portp2p":addcoin_data.portp2p};
console.log(addcoinValues);
/*$.ajax({
type: 'POST',
data: JSON.stringify(addcoinValues),
url: 'http://127.0.0.1:7778',
//dataType: 'text',
success: function(data, textStatus, jqXHR) {
var addcoinData = JSON.parse(data);
},
error: function(xhr, textStatus, error) {
console.log('failed getting Coin History.');
console.log(xhr.statusText);
console.log(textStatus);
console.log(error);
}
});*/
}

92
assets/scripts/login.js
View File

@ -69,7 +69,7 @@ var Login = function() {
var LoginOutput = JSON.parse(data);
var LoginDataToStore = JSON.stringify(data);
sessionStorage.setItem('IguanaActiveAccount', LoginDataToStore);
//console.log(sessionStorage);
console.log(sessionStorage);
console.log('== Data OutPut ==');
console.log(LoginOutput);
@ -351,17 +351,13 @@ var Login = function() {
success: function(data, textStatus, jqXHR) {
var LogoutOutput = JSON.parse(data);
sessionStorage.clear();
//console.log('== Data OutPut ==');
//console.log(LogoutOutput);
console.log('== Logout Data OutPut ==');
console.log(LogoutOutput);
if (LogoutOutput.result === 'logged out') {
if (LogoutOutput.result === 'success') {
console.log('Success');
//swal("Success", "Logout Successfully.", "success");
toastr.success("Logout Successfull", "Account Notification")
$('#wallet-login').show();
$('body').removeClass( "" ).addClass( "page-login layout-full page-dark" );
$('#wallet-core').hide();
@ -375,6 +371,9 @@ var Login = function() {
$('#logint-another-wallet').hide();
$("#loginbtn").text('Sign in');
//Stop SetInterval Calls
StopShowCoinHistory();
}
else {
// If something goes wrong, alert the error message that our service returned
@ -477,11 +476,19 @@ var Login = function() {
};
var handleCheckLogin = function() {
Iguana_activehandle();
//console.log('Iguana_activehandle_output: '+Iguana_activehandle_output);
if ( sessionStorage.getItem('IguanaActiveAccount') === null ) {
console.log('There\'s no active wallet logged in. Please Login.');
$('#logint-another-wallet').hide();
} else {
var CheckLoginData = JSON.parse(sessionStorage.getItem('IguanaActiveAccount'));
if ( JSON.parse(CheckLoginData).rmd160 != Iguana_activehandle_output.rmd160 ) {
//console.log("Login: sessionStorage data and activehandle data doesn't match");
//console.log('Iguana_activehandle_output: '+Iguana_activehandle_output.rmd160);
//console.log('CheckLoginData: ' + JSON.parse(CheckLoginData).rmd160);
ClearOnLogout(false, false);
}
if ( JSON.parse(CheckLoginData).status === 'unlocked' ) {
console.log(JSON.parse(CheckLoginData).status);
$('#password').val('')
@ -500,6 +507,36 @@ var Login = function() {
var handleCoinsRunningCheck = function() {
/*$.each([ 'basilisk', 'full', 'virtual' ], function( index, value ) {
var allcoinsvalues = {"agent":"InstantDEX","method":"allcoins"};
$.ajax({
type: 'POST',
data: JSON.stringify(allcoinsvalues),
url: 'http://127.0.0.1:7778',
//dataType: 'text',
success: function(data, textStatus, jqXHR) {
var allcoinsData = JSON.parse(data);
console.log('== Data OutPut ==');
console.log(allcoinsData);
$.each(allcoinsData[value], function(index) {
if ( allcoinsData[value][index] == 'BTC' ) { console.log('Index: '+ index + ' and Value: BTC'); }
if ( allcoinsData[value][index] == 'BTCD' ) { console.log('Index: '+ index + ' and Value: BTCD'); }
var coinvals = {"coin":"BTCD","portp2p":14631,"mode":0}
Iguana_addcoin(coinvals);
});
},
error: function(xhr, textStatus, error) {
console.log('failed getting Coin History.');
console.log(xhr.statusText);
console.log(textStatus);
console.log(error);
toastr.error("Unable to complete transaction", "Transaction Notification")
}
});
});
if ( sessionStorage.getItem('IguanaActiveAccount') === null ) {
$.each([ 'BTC', 'BTCD' ], function( index, value ) {
var AddCoinBasiliskData = {
@ -548,7 +585,7 @@ var Login = function() {
}
});
});
}
}*/
}
@ -558,7 +595,7 @@ var Login = function() {
$('#logint-another-wallet').show();
$.ajax({
type: 'GET',
url: 'http://127.0.0.1:7778/api/SuperNET/logout',
url: 'http://127.0.0.1:7778/api/bitcoinrpc/walletlock',
dataType: 'text',
success: function(data, textStatus, jqXHR) {
var LogoutOutput = JSON.parse(data);
@ -566,7 +603,7 @@ var Login = function() {
//console.log('== Data OutPut ==');
//console.log(LogoutOutput);
if (LogoutOutput.result === 'logged out') {
if (LogoutOutput.result === 'success') {
console.log('Success');
//swal("Success", "Logout Successfully.", "success");
toastr.success("Logout Successfull", "Account Notification")
@ -609,7 +646,7 @@ var Login = function() {
//main function to initiate the module
init: function() {
handleCoinsRunningCheck();
//handleCoinsRunningCheck();
handleLogin();
handleLock();
handleRegister();
@ -626,3 +663,34 @@ var Login = function() {
jQuery(document).ready(function() {
Login.init();
});
function ClearOnLogout(cleardata, stopinterval) {
if ( cleardata === true ) {
sessionStorage.clear();
}
if ( cleardata === false || cleardata === null ) {
console.log('sessionStorage data not cleared.');
}
if ( stopinterval === true ) {
//Stop SetInterval Calls
StopShowCoinHistory();
StopTotalFiatValue();
}
if ( stopinterval === false || stopinterval === null ) {
console.log('SetInterval data not cleared.');
}
$('#wallet-login').show();
$('body').removeClass( "" ).addClass( "page-login layout-full page-dark" );
$('#wallet-core').hide();
$('link[id=loginStyle]')[0].disabled=false;
$('#logint-another-wallet').hide();
//Make sure these fields are unhidden.
$('#login-welcome').text('Welcome.');
$('#wallet-handle').show();
$('.create-account').show();
$('#register-btn').show();
$('#logint-another-wallet').hide();
$("#loginbtn").text('Sign in');
}
Write Preview
Loading…
Cancel
Save