From 3a215dc2c6fcb8e9428e8167875d6fc4cb93cbd8 Mon Sep 17 00:00:00 2001 From: Satinder Grewal <> Date: Tue, 1 Aug 2017 03:18:24 +1200 Subject: [PATCH] Portfolio input control activated - set manual price - set auto price - set goal for selected coin - set auto goals --- css/custom.css | 4 + index.html | 154 ++++++++------------ js/dexactions.js | 366 +++++++++++++++++------------------------------ 3 files changed, 190 insertions(+), 334 deletions(-) diff --git a/css/custom.css b/css/custom.css index 5bbcca7..128d426 100644 --- a/css/custom.css +++ b/css/custom.css @@ -11,4 +11,8 @@ .label-uppercase { text-transform: uppercase; +} + +.dropdown-menu { + z-index: 2000; } \ No newline at end of file diff --git a/index.html b/index.html index b623d93..bbf61fe 100644 --- a/index.html +++ b/index.html @@ -81,48 +81,7 @@

EXCHANGE

- +
@@ -283,47 +242,7 @@
- + @@ -457,7 +376,7 @@

Deposit

- @@ -506,7 +425,7 @@

Receive

- @@ -554,19 +473,62 @@
-
-
- -
-
-
-
Default 1
-
Default 2
+
+
+
+
+ +
+
+
+
+
+ + +
+ +
+
+
+ + +
+ +
+
+
+
+
+
+ +
+
+
+
+
+ + +
+ +
+
+
+ +
+ +
+
+
+
+
diff --git a/js/dexactions.js b/js/dexactions.js index ae49b34..c80a5bc 100644 --- a/js/dexactions.js +++ b/js/dexactions.js @@ -6,6 +6,7 @@ $(document).ready(function() { enable_disable_coin(refresh_data); get_myprices(); CheckOrderbook_Interval = setInterval(CheckOrderBookFn,1000); + $('.set_goal_label_portfolio').html($('.sell_coin_p').selectpicker('val')); }); @@ -225,151 +226,13 @@ $( ".buy_coin" ).change(function() { sessionStorage.setItem('dex_base_coin', base_coin); sessionStorage.setItem('dex_rel_coin', rel_coin); - /*switch (base_coin) { - case 'KMD': - $('.deposit_coin02').html(''); - break; - case 'BTC': - $('.deposit_coin02').html(''); - break; - case 'REVS': - $('.deposit_coin02').html('REVS'); - break; - case 'JUMBLR': - $('.deposit_coin02').html('JUMBLR'); - break; - case 'DOGE': - $('.deposit_coin02').html('Dogecoin'); - break; - case 'HUSH': - $('.deposit_coin02').html('Hushcoin'); - break; - case 'DGB': - $('.deposit_coin02').html('Digibyte'); - break; - case 'MZC': - $('.deposit_coin02').html('Mazacoin'); - break; - case 'SYS': - $('.deposit_coin02').html('Syscoin'); - break; - case 'UNO': - $('.deposit_coin02').html('Unobtanium'); - break; - case 'ZET': - $('.deposit_coin02').html('Zetacoin'); - break; - case 'ZEC': - $('.deposit_coin02').html('Zcash'); - break; - case 'BTM': - $('.deposit_coin02').html('Bitmark'); - break; - case 'CARB': - $('.deposit_coin02').html('Carboncoin'); - break; - case 'ANC': - $('.deposit_coin02').html('Anoncoin'); - break; - case 'FRK': - $('.deposit_coin02').html('Franko'); - break; - case 'GAME': - $('.deposit_coin02').html('Gamecredits'); - break; - case 'LTC': - $('.deposit_coin02').html('Litecoin'); - break; - case 'SUPERNET': - $('.deposit_coin02').html('SUPERNET'); - break; - case 'WLC': - $('.deposit_coin02').html('Wireless'); - break; - case 'PANGEA': - $('.deposit_coin02').html('Pangea'); - break; - case 'DEX': - $('.deposit_coin02').html('InstantDEX'); - break; - case 'BET': - $('.deposit_coin02').html('BET'); - break; - case 'CRYPTO': - $('.deposit_coin02').html('Crypto777'); - break; - case 'HODL': - $('.deposit_coin02').html('HODL'); - break; - case 'SHARK': - $('.deposit_coin02').html('SHARK'); - break; - case 'BOTS': - $('.deposit_coin02').html('BOTS'); - break; - case 'MGW': - $('.deposit_coin02').html('MultiGateway'); - break; - case 'MVP': - $('.deposit_coin02').html('MVP'); - break; - case 'KV': - $('.deposit_coin02').html('KeyValue'); - break; - case 'CEAL': - $('.deposit_coin02').html('Ceal'); - break; - case 'MESH': - $('.deposit_coin02').html('SuperMesh'); - break; - }*/ + get_price(base_coin, rel_coin); - //$( ".buy_coin" ).removeClass("active") - //$( ".buy_coin[data-coin='"+ coin +"']" ).addClass(" active"); - get_myprices(); - /*var ajax_data = {"agent":"InstantDEX","method":"smartaddresses"}; - var url = "http://127.0.0.1:7778/"; - - $.ajax({ - data: JSON.stringify(ajax_data), - dataType: 'json', - type: 'POST', - url: 'http://127.0.0.1:7778' - }).done(function(data) { - // If successful - $(data).each(function(index, value) { - //console.log(index); - //console.log(value); - if (value.type == $('.buy_coin').val()) { - //console.log(value.coins); - $('.initcoinswap-output').html(JSON.stringify(value.coins[0], null, 2)); - $('.smartaddr_type').html($('.buy_coin').val().toUpperCase()) - $('.deposit_coin_code').html(value.coins[0].coin.toUpperCase()) - $('.deposit_coin_addr').html(value.coins[0].address) - $('.swap_deposit_addr').html(value.coins[0].address); - $('.swap_recieve_addr').html(value.coins[0].dest); - $('.deposit_coin_sourceamount').html(value.coins[0].sourceamount + ' ' + value.coins[0].coin.toUpperCase()); - - $('#deposit_coin_qrcode').html(''); - var qrcode = new QRCode("deposit_coin_qrcode", { - width: 96, - height: 96, - colorDark : "#000000", - colorLight : "#ffffff", - correctLevel : QRCode.CorrectLevel.H - }); - qrcode.makeCode(value.coins[0].address); - - } - }); - }).fail(function(jqXHR, textStatus, errorThrown) { - // If fail - console.log(textStatus + ': ' + errorThrown); - });*/ + }); @@ -554,104 +417,6 @@ $( ".sell_coin" ).change(function() { coin = $('.buy_coin').selectpicker('val'); $('.refresh_inv_table').data('coin',coin); - /*switch (coin) { - case 'KMD': - $('.deposit_coin01').html(''); - break; - case 'BTC': - $('.deposit_coin01').html(''); - break; - case 'REVS': - $('.deposit_coin01').html('REVS'); - break; - case 'JUMBLR': - $('.deposit_coin01').html('JUMBLR'); - break; - case 'DOGE': - $('.deposit_coin01').html('Dogecoin'); - break; - case 'HUSH': - $('.deposit_coin01').html('Hushcoin'); - break; - case 'DGB': - $('.deposit_coin01').html('Digibyte'); - break; - case 'MZC': - $('.deposit_coin01').html('Mazacoin'); - break; - case 'SYS': - $('.deposit_coin01').html('Syscoin'); - break; - case 'UNO': - $('.deposit_coin01').html('Unobtanium'); - break; - case 'ZET': - $('.deposit_coin01').html('Zetacoin'); - break; - case 'ZEC': - $('.deposit_coin01').html('Zcash'); - break; - case 'BTM': - $('.deposit_coin01').html('Bitmark'); - break; - case 'CARB': - $('.deposit_coin01').html('Carboncoin'); - break; - case 'ANC': - $('.deposit_coin01').html('Anoncoin'); - break; - case 'FRK': - $('.deposit_coin01').html('Franko'); - break; - case 'GAME': - $('.deposit_coin01').html('Gamecredits'); - break; - case 'LTC': - $('.deposit_coin01').html('Litecoin'); - break; - case 'SUPERNET': - $('.deposit_coin01').html('SUPERNET'); - break; - case 'WLC': - $('.deposit_coin01').html('Wireless'); - break; - case 'PANGEA': - $('.deposit_coin01').html('Pangea'); - break; - case 'DEX': - $('.deposit_coin01').html('InstantDEX'); - break; - case 'BET': - $('.deposit_coin01').html('BET'); - break; - case 'CRYPTO': - $('.deposit_coin01').html('Crypto777'); - break; - case 'HODL': - $('.deposit_coin01').html('HODL'); - break; - case 'SHARK': - $('.deposit_coin01').html('SHARK'); - break; - case 'BOTS': - $('.deposit_coin01').html('BOTS'); - break; - case 'MGW': - $('.deposit_coin01').html('MultiGateway'); - break; - case 'MVP': - $('.deposit_coin01').html('MVP'); - break; - case 'KV': - $('.deposit_coin01').html('KeyValue'); - break; - case 'CEAL': - $('.deposit_coin01').html('Ceal'); - break; - case 'MESH': - $('.deposit_coin01').html('SuperMesh'); - break; - }*/ $('.deposit_coin01').data('coin', coin); //calc_swap_price('kmdbtc'); @@ -1397,4 +1162,129 @@ $('.refresh_dex_potfolio_coins').click(function() { CheckPortfolioFn(); }); + +$('.portfolio_set_price_btn').click(function() { + var price = $('#portfolio_set_price').val(); + var base_coin = $('.buy_coin_p').selectpicker('val'); + var rel_coin = $('.sell_coin_p').selectpicker('val'); + + console.log('price ' + price); + console.log('base '+ base_coin); + console.log('rel ' + rel_coin); + + var userpass = sessionStorage.getItem('mm_userpass'); + var ajax_data = {"userpass":userpass,"method":"setprice","base":base_coin,"rel":rel_coin,"price":price}; + var url = "http://127.0.0.1:7779"; + + $.ajax({ + data: JSON.stringify(ajax_data), + dataType: 'json', + type: 'POST', + url: url + }).done(function(data) { + // If successful + console.log(data); + $('.initcoinswap-output').html(JSON.stringify(data, null, 2)); + }).fail(function(jqXHR, textStatus, errorThrown) { + // If fail + console.log(textStatus + ': ' + errorThrown); + }); + +}) + + +$('.portfolio_set_autoprice_btn').click(function() { + var margin = $('#portfolio_set_autoprice').val(); + var base_coin = $('.buy_coin_p').selectpicker('val'); + var rel_coin = $('.sell_coin_p').selectpicker('val'); + + console.log('margin ' + margin); + console.log('base '+ base_coin); + console.log('rel ' + rel_coin); + + var userpass = sessionStorage.getItem('mm_userpass'); + var ajax_data = {"userpass":userpass,"method":"autoprice","base":base_coin,"rel":rel_coin,"margin":margin}; + var url = "http://127.0.0.1:7779"; + + $.ajax({ + data: JSON.stringify(ajax_data), + dataType: 'json', + type: 'POST', + url: url + }).done(function(data) { + // If successful + console.log(data); + $('.initcoinswap-output').html(JSON.stringify(data, null, 2)); + }).fail(function(jqXHR, textStatus, errorThrown) { + // If fail + console.log(textStatus + ': ' + errorThrown); + }); + +}) + + +$('.portfolio_set_goal_btn').click(function() { + var percent = $('#portfolio_set_goal').val(); + var coin = $('.sell_coin_p').selectpicker('val'); + + console.log('percent ' + percent); + console.log('coin '+ coin); + //console.log('rel ' + rel_coin); + + var userpass = sessionStorage.getItem('mm_userpass'); + var ajax_data = {"userpass":userpass,"method":"goal","coin":coin,"val":percent}; + var url = "http://127.0.0.1:7779"; + + $.ajax({ + data: JSON.stringify(ajax_data), + dataType: 'json', + type: 'POST', + url: url + }).done(function(data) { + // If successful + console.log(data); + $('.initcoinswap-output').html(JSON.stringify(data, null, 2)); + }).fail(function(jqXHR, textStatus, errorThrown) { + // If fail + console.log(textStatus + ': ' + errorThrown); + }); + + CheckPortfolioFn(); +}) + + +$( ".sell_coin_p" ).change(function() { + $('.set_goal_label_portfolio').html($('.sell_coin_p').selectpicker('val')); +}) + + +$('.portfolio_set_autogoals_btn').click(function() { + //var percent = $('#portfolio_set_goal').val(); + //var coin = $('.sell_coin_p').selectpicker('val'); + + //console.log('percent ' + percent); + //console.log('coin '+ coin); + //console.log('rel ' + rel_coin); + + var userpass = sessionStorage.getItem('mm_userpass'); + var ajax_data = {"userpass":userpass,"method":"goal"}; + var url = "http://127.0.0.1:7779"; + + $.ajax({ + data: JSON.stringify(ajax_data), + dataType: 'json', + type: 'POST', + url: url + }).done(function(data) { + // If successful + console.log(data); + $('.initcoinswap-output').html(JSON.stringify(data, null, 2)); + }).fail(function(jqXHR, textStatus, errorThrown) { + // If fail + console.log(textStatus + ': ' + errorThrown); + }); + + CheckPortfolioFn(); +}) + /* Portfolio section functions END */ \ No newline at end of file