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
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 201
      assets/scripts/dashboard.js
  2. 49
      assets/scripts/iguana_api.js
  3. 94
      assets/scripts/login.js

201
assets/scripts/dashboard.js
View File

File diff suppressed because one or more lines are too long

49
assets/scripts/iguana_api.js
View File

@ -71,4 +71,53 @@ function Iguana_rmd160conv(rmd160conv_data) {
console.log(error); console.log(error);
} }
}); });
}
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);
}
});*/
} }

94
assets/scripts/login.js
View File

@ -69,7 +69,7 @@ var Login = function() {
var LoginOutput = JSON.parse(data); var LoginOutput = JSON.parse(data);
var LoginDataToStore = JSON.stringify(data); var LoginDataToStore = JSON.stringify(data);
sessionStorage.setItem('IguanaActiveAccount', LoginDataToStore); sessionStorage.setItem('IguanaActiveAccount', LoginDataToStore);
//console.log(sessionStorage); console.log(sessionStorage);
console.log('== Data OutPut =='); console.log('== Data OutPut ==');
console.log(LoginOutput); console.log(LoginOutput);
@ -351,17 +351,13 @@ var Login = function() {
success: function(data, textStatus, jqXHR) { success: function(data, textStatus, jqXHR) {
var LogoutOutput = JSON.parse(data); var LogoutOutput = JSON.parse(data);
sessionStorage.clear(); sessionStorage.clear();
//console.log('== Data OutPut =='); console.log('== Logout Data OutPut ==');
//console.log(LogoutOutput); console.log(LogoutOutput);
if (LogoutOutput.result === 'logged out') { if (LogoutOutput.result === 'success') {
console.log('Success'); console.log('Success');
//swal("Success", "Logout Successfully.", "success"); //swal("Success", "Logout Successfully.", "success");
toastr.success("Logout Successfull", "Account Notification") toastr.success("Logout Successfull", "Account Notification")
$('#wallet-login').show(); $('#wallet-login').show();
$('body').removeClass( "" ).addClass( "page-login layout-full page-dark" ); $('body').removeClass( "" ).addClass( "page-login layout-full page-dark" );
$('#wallet-core').hide(); $('#wallet-core').hide();
@ -375,6 +371,9 @@ var Login = function() {
$('#logint-another-wallet').hide(); $('#logint-another-wallet').hide();
$("#loginbtn").text('Sign in'); $("#loginbtn").text('Sign in');
//Stop SetInterval Calls
StopShowCoinHistory();
} }
else { else {
// If something goes wrong, alert the error message that our service returned // If something goes wrong, alert the error message that our service returned
@ -477,11 +476,19 @@ var Login = function() {
}; };
var handleCheckLogin = function() { var handleCheckLogin = function() {
Iguana_activehandle();
//console.log('Iguana_activehandle_output: '+Iguana_activehandle_output);
if ( sessionStorage.getItem('IguanaActiveAccount') === null ) { if ( sessionStorage.getItem('IguanaActiveAccount') === null ) {
console.log('There\'s no active wallet logged in. Please Login.'); console.log('There\'s no active wallet logged in. Please Login.');
$('#logint-another-wallet').hide(); $('#logint-another-wallet').hide();
} else { } else {
var CheckLoginData = JSON.parse(sessionStorage.getItem('IguanaActiveAccount')); 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' ) { if ( JSON.parse(CheckLoginData).status === 'unlocked' ) {
console.log(JSON.parse(CheckLoginData).status); console.log(JSON.parse(CheckLoginData).status);
$('#password').val('') $('#password').val('')
@ -499,6 +506,36 @@ var Login = function() {
}; };
var handleCoinsRunningCheck = 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 ) { if ( sessionStorage.getItem('IguanaActiveAccount') === null ) {
$.each([ 'BTC', 'BTCD' ], function( index, value ) { $.each([ 'BTC', 'BTCD' ], function( index, value ) {
@ -548,7 +585,7 @@ var Login = function() {
} }
}); });
}); });
} }*/
} }
@ -558,7 +595,7 @@ var Login = function() {
$('#logint-another-wallet').show(); $('#logint-another-wallet').show();
$.ajax({ $.ajax({
type: 'GET', type: 'GET',
url: 'http://127.0.0.1:7778/api/SuperNET/logout', url: 'http://127.0.0.1:7778/api/bitcoinrpc/walletlock',
dataType: 'text', dataType: 'text',
success: function(data, textStatus, jqXHR) { success: function(data, textStatus, jqXHR) {
var LogoutOutput = JSON.parse(data); var LogoutOutput = JSON.parse(data);
@ -566,7 +603,7 @@ var Login = function() {
//console.log('== Data OutPut =='); //console.log('== Data OutPut ==');
//console.log(LogoutOutput); //console.log(LogoutOutput);
if (LogoutOutput.result === 'logged out') { if (LogoutOutput.result === 'success') {
console.log('Success'); console.log('Success');
//swal("Success", "Logout Successfully.", "success"); //swal("Success", "Logout Successfully.", "success");
toastr.success("Logout Successfull", "Account Notification") toastr.success("Logout Successfull", "Account Notification")
@ -609,7 +646,7 @@ var Login = function() {
//main function to initiate the module //main function to initiate the module
init: function() { init: function() {
handleCoinsRunningCheck(); //handleCoinsRunningCheck();
handleLogin(); handleLogin();
handleLock(); handleLock();
handleRegister(); handleRegister();
@ -625,4 +662,35 @@ var Login = function() {
jQuery(document).ready(function() { jQuery(document).ready(function() {
Login.init(); 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