latest osx mm, netid and seednode implimented at login
This commit is contained in:
parent
bb9e3e045c
commit
a592957ac8
Binary file not shown.
|
@ -104,31 +104,30 @@
|
||||||
<button class="btn btn-grey btn_login_show_passphrase" style="height: 44px; margin-bottom: 10px;"><span class="glyphicon glyphicon-eye-close" aria-hidden="true"></span></button>
|
<button class="btn btn-grey btn_login_show_passphrase" style="height: 44px; margin-bottom: 10px;"><span class="glyphicon glyphicon-eye-close" aria-hidden="true"></span></button>
|
||||||
</span> -->
|
</span> -->
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="col-sm-4" style="margin-bottom: 10px; padding: 0 5px 0 0;">
|
||||||
|
<span class="input-group">
|
||||||
|
<span class="input-group-addon" class="language" data-langstr="">Net ID</span>
|
||||||
|
<input type="number" id="loginNetid" class="form-control loginNetid language" data-langstr="login_netid_input_placeholder" placeholder="" value="0" required>
|
||||||
|
</span>
|
||||||
|
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="col-sm-8" style="margin-bottom: 10px; padding: 0 0 0 5px;">
|
||||||
|
|
||||||
|
<span class="input-group">
|
||||||
|
<span class="input-group-addon" class="language" data-langstr="">Seed Node IP</span>
|
||||||
|
<input type="text" id="loginSeednode" class="form-control loginSeednode language" data-langstr="login_seednode_input_placeholder" placeholder="" value="" required>
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="input-group col-sm-12" style="margin-bottom: 10px;">
|
<div class="input-group col-sm-12" style="margin-bottom: 10px;">
|
||||||
<select class="selectpicker login_mode_options" data-hide-disabled="true" data-width="30%"></select>
|
<select class="selectpicker login_mode_options" data-hide-disabled="true" data-width="30%"></select>
|
||||||
<span class="input-group-btn">
|
<span class="input-group-btn">
|
||||||
<button class="btn btn-lg btn-primary btn-block login-btn language" data-langstr="login_btn" type="submit" style="height: 64px;"></button>
|
<button class="btn btn-lg btn-primary btn-block login-btn language" data-langstr="login_btn" type="submit" style="height: 64px;"></button>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<!--<input type="password" id="loginPassphrase" class="form-control loginPassphrase" placeholder="Passphrase" required>-->
|
|
||||||
<!--<button class="btn btn-lg btn-primary btn-block login-btn" type="submit">Login</button>-->
|
|
||||||
|
|
||||||
<div class="col-sm-4" style="margin-bottom: 10px; padding: 0 5px;">
|
|
||||||
<span class="input-group">
|
|
||||||
<span class="input-group-addon" class="language" data-langstr="">Net ID</span>
|
|
||||||
<input type="number" id="loginPassphrase" class="form-control loginnetid language" data-langstr="login_netid_input_placeholder" placeholder="" value="0" required>
|
|
||||||
</span>
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="col-sm-8" style="margin-bottom: 10px; padding: 0 5px;">
|
|
||||||
|
|
||||||
<span class="input-group">
|
|
||||||
<span class="input-group-addon" class="language" data-langstr="">Seed Node IP</span>
|
|
||||||
<input type="number" id="loginPassphrase" class="form-control loginnetid language" data-langstr="login_netid_input_placeholder" placeholder="" required>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<button class="btn btn-lg btn-default btn-block login-genpass-btn language" data-langstr="generate_a_new_passphrase" style="margin-bottom: 10px;"></button>
|
<button class="btn btn-lg btn-default btn-block login-genpass-btn language" data-langstr="generate_a_new_passphrase" style="margin-bottom: 10px;"></button>
|
||||||
|
|
||||||
|
|
|
@ -128,7 +128,12 @@ $('.dexlogout-btn').click(function(e) {
|
||||||
$('.mainbody').fadeOut();
|
$('.mainbody').fadeOut();
|
||||||
$('.loginbody').fadeIn();
|
$('.loginbody').fadeIn();
|
||||||
|
|
||||||
LoginWithPassphrase('default','logout');
|
var login_data = {};
|
||||||
|
login_data.passphrase = 'default';
|
||||||
|
login_data.netid = 0;
|
||||||
|
login_data.seednode = '';
|
||||||
|
|
||||||
|
LoginWithPassphrase(login_data,'logout');
|
||||||
|
|
||||||
CheckPortfolioFn(false);
|
CheckPortfolioFn(false);
|
||||||
CheckOrderBookFn(false);
|
CheckOrderBookFn(false);
|
||||||
|
@ -287,8 +292,17 @@ $('.login-genpass-btn').click(function(e){
|
||||||
|
|
||||||
$('.login-btn').click(function(e) {
|
$('.login-btn').click(function(e) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
var passphrase = $('.loginPassphrase').val();
|
var login_data = {};
|
||||||
LoginWithPassphrase(passphrase,'login');
|
login_data.passphrase = $('.loginPassphrase').val();
|
||||||
|
login_data.netid = $('.loginNetid').val();
|
||||||
|
login_data.seednode = $('.loginSeednode').val();
|
||||||
|
|
||||||
|
if (login_data.netid > 14420) {
|
||||||
|
bootbox.alert({
|
||||||
|
message: `<b>Net ID:</b> ${login_data.netid} <br>Net ID can not be bigger than 14420.`
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
LoginWithPassphrase(login_data,'login');
|
||||||
//var shepherdresult = ShepherdIPC({"command":"login","passphrase":passphrase});
|
//var shepherdresult = ShepherdIPC({"command":"login","passphrase":passphrase});
|
||||||
$('.loginPassphrase').val('');
|
$('.loginPassphrase').val('');
|
||||||
$('.mainbody').hide();
|
$('.mainbody').hide();
|
||||||
|
@ -305,6 +319,7 @@ $('.login-btn').click(function(e) {
|
||||||
}
|
}
|
||||||
|
|
||||||
BarterDEXSettingsFn();
|
BarterDEXSettingsFn();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
@ -389,7 +404,7 @@ $('.dexsettings-btn').click(function(e){
|
||||||
BarterDEXSettingsFn();
|
BarterDEXSettingsFn();
|
||||||
RefreshStockChartTheme(selected_theme);
|
RefreshStockChartTheme(selected_theme);
|
||||||
if (barterDEX_settings.deflang == 'tlh_UNI') {
|
if (barterDEX_settings.deflang == 'tlh_UNI') {
|
||||||
$('body').css('font-family','piqad');
|
$('body').css('font-family',"'piqad', 'Open Sans', 'Helvetica Neue', Helvetica, sans-serif");
|
||||||
BarterDEXDefaultLangFn(selected_deflang);
|
BarterDEXDefaultLangFn(selected_deflang);
|
||||||
} else {
|
} else {
|
||||||
$('body').css('font-family',"'Open Sans', 'Helvetica Neue', Helvetica, sans-serif");
|
$('body').css('font-family',"'Open Sans', 'Helvetica Neue', Helvetica, sans-serif");
|
||||||
|
@ -600,9 +615,9 @@ CheckDefaultLogin = function(sig) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
LoginWithPassphrase = function(login_passphrase,action_mode) {
|
LoginWithPassphrase = function(login_passphrase_data,action_mode) {
|
||||||
console.log('Login using passphrase from Login form input');
|
console.log('Login using passphrase from Login form input');
|
||||||
|
//console.log(login_passphrase_data);
|
||||||
|
|
||||||
var userpass = '';
|
var userpass = '';
|
||||||
if (sessionStorage.getItem('mm_loginstate') == 'loggedin') {
|
if (sessionStorage.getItem('mm_loginstate') == 'loggedin') {
|
||||||
|
@ -611,7 +626,18 @@ LoginWithPassphrase = function(login_passphrase,action_mode) {
|
||||||
var userpass = '1d8b27b21efabcd96571cd56f91a40fb9aa4cc623d273c63bf9223dc6f8cd81f';
|
var userpass = '1d8b27b21efabcd96571cd56f91a40fb9aa4cc623d273c63bf9223dc6f8cd81f';
|
||||||
}
|
}
|
||||||
|
|
||||||
var ajax_data = {"userpass":userpass,"method":"passphrase","passphrase":login_passphrase,"gui":"simplegui"};
|
var ajax_data = {"userpass":userpass,"method":"passphrase","passphrase":login_passphrase_data.passphrase,"gui":"simplegui"};
|
||||||
|
|
||||||
|
if (login_passphrase_data.netid == 0) {
|
||||||
|
console.log(login_passphrase_data.netid);
|
||||||
|
delete ajax_data.netid;
|
||||||
|
delete ajax_data.seednode;
|
||||||
|
} else {
|
||||||
|
console.log('Net ID: ' + login_passphrase_data.netid);
|
||||||
|
console.log('Seed Node IP: ' + login_passphrase_data.seednode);
|
||||||
|
ajax_data.netid = login_passphrase_data.netid;
|
||||||
|
ajax_data.seednode = login_passphrase_data.seednode;
|
||||||
|
}
|
||||||
//console.log(ajax_data)
|
//console.log(ajax_data)
|
||||||
var url = "http://127.0.0.1:7783";
|
var url = "http://127.0.0.1:7783";
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue