fixes and revert back settings from dICO to BarterDEX
This commit is contained in:
satindergrewal
parent
83be164f73
commit
6512cec586
File diff suppressed because one or more lines are too long
|
|
@ -426,7 +426,7 @@
|
|||
<div class="col-sm-12">
|
||||
<div class="panel with-nav-tabs panel-default">
|
||||
<div class="panel-heading">
|
||||
<button class="btn btn-xs btn-exchangeclose coinexchange" data-coin="COIN" style="float: right; margin: 6px 6px 0px 3px; display: none;">BACK</button>
|
||||
<button class="btn btn-xs btn-exchangeclose coinexchange" data-coin="COIN" style="float: right; margin: 6px 6px 0px 3px;">BACK</button>
|
||||
<button class="btn btn-xs btn-exchangerefresh coinexchange" data-coin="COIN" style="float: right; margin: 6px 6px 0px 3px;"><span class="glyphicon glyphicon-refresh"></span></button>
|
||||
<ul class="nav nav-tabs">
|
||||
<li class="active"><a href="#exchange_coin_asks" data-toggle="tab">ASKS: <span class="orderbook_numasks"></span></a></li>
|
||||
|
|
@ -515,7 +515,7 @@
|
|||
|
||||
<div class="row">
|
||||
<div class="col-sm-12">
|
||||
<div class="form-group" style="display: none;">
|
||||
<div class="form-group">
|
||||
<div class="btn-group btn-group-justified colors" data-toggle="buttons">
|
||||
<label class="btn btn-lg btn-info active">
|
||||
<input type="radio" name="trading_pair_options" id="trading_pair_options" value="buying" autocomplete="off" checked> BUYING <span class="coin_ticker"></span></label>
|
||||
|
|
@ -523,7 +523,7 @@
|
|||
<input type="radio" name="trading_pair_options" id="trading_pair_options" value="selling" autocomplete="off"> SELLING <span class="coin_ticker"></span></label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group" style="display: none;">
|
||||
<div class="form-group">
|
||||
<div class="btn-group btn-group-justified colors" data-toggle="buttons">
|
||||
<label class="btn btn-lg btn-warning active">
|
||||
<input type="radio" name="trading_mode_options" id="trading_mode_options_tradebot" value="tradebot" autocomplete="off"> TRADE BOT</label>
|
||||
|
|
|
|||
|
|
@ -1,12 +1,138 @@
|
|||
|
||||
var coin_select_options = '';
|
||||
|
||||
coin_select_options = `<optgroup label="Crytpo Coins">
|
||||
<option data-content="<img src='img/cryptologo/kmd.png' width='50px;'/> Komodo (KMD)" data-tokens="kmd komodo ">KMD</option>
|
||||
<option data-content="<img src='img/cryptologo/btc.png' width='50px;'/> Bitcoin (BTC)" data-tokens="btc bitcoin ">BTC</option>
|
||||
<option data-content="<img src='img/cryptologo/kmd.png' width='50px;'/> Komodo (KMD)" data-tokens="kmd komodo ">KMD</option>
|
||||
<option data-content="<img src='img/cryptologo/mnz.png' width='50px;'/> Monaize (MNZ)" data-tokens="mnz monaize ">MNZ</option>
|
||||
<option data-content="<img src='img/cryptologo/chips.png' width='50px;'/> CHIPS (CHIPS)" data-tokens="CHIPS CHIPS ">CHIPS</option>
|
||||
|
||||
<option data-content="<img src='img/cryptologo/888.png' width='50px'/> OctoCoin (888)" data-tokens="OctoCoin 888">888</option>
|
||||
<option data-content="<img src='img/cryptologo/arc.png' width='50px'/> ArcticCoin (ARC)" data-tokens="ArcticCoin ARC">ARC</option>
|
||||
<option data-content="<img src='img/cryptologo/ARG.png' width='50px'/> Argentum (ARG)" data-tokens="Argentum ARG">ARG</option>
|
||||
<option data-content="<img src='img/cryptologo/bta.png' width='50px;'/> Bata (BTA)" data-tokens="Bata BTA">BTA</option>
|
||||
<option data-content="<img src='img/cryptologo/bdl.png' width='50px;'/> Bitdeal (BDL)" data-tokens="Bitdeal BDL">BDL</option>
|
||||
|
||||
<option data-content="<img src='img/cryptologo/btx.png' width='50px'/> Bitcore (BTX)" data-tokens="Bitcore BTX">BTX</option>
|
||||
<option data-content="<img src='img/cryptologo/btcz.png' width='50px'/> BitcoinZ (BTCZ)" data-tokens="BitcoinZ BTCZ">BTCZ</option>
|
||||
<option data-content="<img src='img/cryptologo/bsd.png' width='50px'/> BitSend (BSD)" data-tokens="BitSend BSD">BSD</option>
|
||||
<option data-content="<img src='img/cryptologo/blk.png' width='50px'/> BlackCoin (BLK)" data-tokens="BlackCoin BLK">BLK</option>
|
||||
<option data-content="<img src='img/cryptologo/block.png' width='50px'/> Blocknet (BLOCK)" data-tokens="Blocknet BLOCK">BLK</option>
|
||||
|
||||
<option data-content="<img src='img/cryptologo/crw.png' width='50px'/> Crown (CRW)" data-tokens="crw crown ">CRW</option>
|
||||
<option data-content="<img src='img/cryptologo/crea.png' width='50px'/> Creativecoin (CREA)" data-tokens="Creativecoin CREA">CREA</option>
|
||||
<option data-content="<img src='img/cryptologo/dash.png' width='50px'/> Dash (DASH)" data-tokens="dash">DASH</option>
|
||||
<option data-content="<img src='img/cryptologo/dgb.png' width='50px'/> Digibyte (DGB)" data-tokens="dgb digibyte">DGB</option>
|
||||
<option data-content="<img src='img/cryptologo/doge.png' width='50px'/> Dogecoin (DOGE)" data-tokens="doge dogecoin">DOGE</option>
|
||||
<option data-content="<img src='img/cryptologo/emc2.png' width='50px'/> Einsteinium (EMC2)" data-tokens="emc2 einsteinium">EMC2</option>
|
||||
<option data-content="<img src='img/cryptologo/erc.png' width='50px'/> EuropeCoin (ERC)" data-tokens="EuropeCoin ERC">ERC</option>
|
||||
<option data-content="<img src='img/cryptologo/fair.png' width='50px'/> Faircoin (FAIR)" data-tokens="FAIR Faircoin">FAIR</option>
|
||||
<option data-content="<img src='img/cryptologo/flo.png' width='50px'/> Florincoin (FLO)" data-tokens="Florincoin FLO">FLO</option>
|
||||
|
||||
<option data-content="<img src='img/cryptologo/game.png' width='50px'/> Gamecredits (GAME)" data-tokens="Gamecredits GAME">GAME</option>
|
||||
<option data-content="<img src='img/cryptologo/glt.png' width='50px'/> GlobalToken (GLT)" data-tokens="GlobalToken GLT">GLT</option>
|
||||
<option data-content="<img src='img/cryptologo/huc.png' width='50px'/> Huntercoin (HUC)" data-tokens="Huntercoin HUC">HUC</option>
|
||||
<option data-content="<img src='img/cryptologo/hush.png' width='50px'/> Hush (HUSH)" data-tokens="Hush HUSH">HUSH</option>
|
||||
<option data-content="<img src='img/cryptologo/i0c.png' width='50px'/> I0Coin (I0C)" data-tokens="I0Coin I0C">I0C</option>
|
||||
<option data-content="<img src='img/cryptologo/iop.png' width='50px'/> Internet of People (IOP)" data-tokens="Internet of People IOP">IOP</option>
|
||||
<option data-content="<img src='img/cryptologo/lbc.png' width='50px'/> LBRY Credits (LBC)" data-tokens="LBRY Credits LBC">LBC</option>
|
||||
<option data-content="<img src='img/cryptologo/ltc.png' width='50px'/> Litecoin (LTC)" data-tokens="Litecoin LTC">LTC</option>
|
||||
<option data-content="<img src='img/cryptologo/mac.png' width='50px'/> Machinecoin (MAC)" data-tokens="Machinecoin MAC">MAC</option>
|
||||
<option data-content="<img src='img/cryptologo/maga.png' width='50px'/> Magacoin (MAGA)" data-tokens="Magacoin MAGA">MAGA</option>
|
||||
|
||||
<option data-content="<img src='img/cryptologo/mona.png' width='50px'/> Monacoin (MONA)" data-tokens="Monacoin MONA">MONA</option>
|
||||
<option data-content="<img src='img/cryptologo/mue.png' width='50px'/> Monetary Unit (MUE)" data-tokens="MonetaryUnit MUE">MUE</option>
|
||||
<option data-content="<img src='img/cryptologo/moon.png' width='50px'/> Mooncoin (MOON)" data-tokens="Mooncoin MOON">MOON</option>
|
||||
<option data-content="<img src='img/cryptologo/xmy.png' width='50px'/> Myriad (XMY)" data-tokens="Myriad (XMY)">XMY</option>
|
||||
<option data-content="<img src='img/cryptologo/nav.png' width='50px'/> Navcoin (NAV)" data-tokens="Navcoin NAV">NAV</option>
|
||||
<option data-content="<img src='img/cryptologo/nmc.png' width='50px'/> Namecoin (NMC)" data-tokens="Namecoin NMC">NMC</option>
|
||||
<option data-content="<img src='img/cryptologo/pivx.png' width='50px'/> PIVX (PIVX)" data-tokens="PIVX">PIVX</option>
|
||||
<option data-content="<img src='img/cryptologo/xre.png' width='50px'/> RevolverCoin (XRE)" data-tokens="RevolverCoin XRE">XRE</option>
|
||||
<option data-content="<img src='img/cryptologo/sxc.png' width='50px'/> Sexcoin (SXC)" data-tokens="Sexcoin SXC">SXC</option>
|
||||
<option data-content="<img src='img/cryptologo/sib.png' width='50px'/> Sibcoin (SIB)" data-tokens="Sibcoin SIB">SIB</option>
|
||||
<option data-content="<img src='img/cryptologo/strat.png' width='50px'/> Stratis (STRAT)" data-tokens="Stratis STRAT">STRAT</option>
|
||||
<option data-content="<img src='img/cryptologo/smc.png' width='50px'/> SmartCoin (SMC)" data-tokens="SmartCoin SMC">SMC</option>
|
||||
<option data-content="<img src='img/cryptologo/sys.png' width='50px'/> Syscoin (SYS)" data-tokens="Syscoin SYS">SYS</option>
|
||||
<option data-content="<img src='img/cryptologo/trc.png' width='50px'/> Terracoin (TRC)" data-tokens="Terracoin TRC">TRC</option>
|
||||
|
||||
<option data-content="<img src='img/cryptologo/uis.png' width='50px'/> Unitus (UIS)" data-tokens="Unitus UIS">UIS</option>
|
||||
<option data-content="<img src='img/cryptologo/vtc.png' width='50px'/> Vertcoin (VTC)" data-tokens="Vertcoin VTC">VTC</option>
|
||||
<option data-content="<img src='img/cryptologo/via.png' width='50px'/> Viacoin (VIA)" data-tokens="Viacoin VIA">VIA</option>
|
||||
<option data-content="<img src='img/cryptologo/zcl.png' width='50px'/> ZClassic (ZCL)" data-tokens="ZClassic ZCL">ZCL</option>
|
||||
<option data-content="<img src='img/cryptologo/zer.png' width='50px'/> Zero (ZER)" data-tokens="Zero ZER">ZER</option>
|
||||
<option data-content="<img src='img/cryptologo/zet.png' width='50px'/> Zetacoin (ZET)" data-tokens="Zetacoin ZET">ZET</option>
|
||||
<option data-content="<img src='img/cryptologo/zen.png' width='50px'/> ZenCash (ZEN)" data-tokens="ZenCash ZEN">ZEN</option>
|
||||
<option data-content="<img src='img/cryptologo/zec.png' width='50px'/> Zcash (ZEC)" data-tokens="Zcash ZEC">ZEC</option>
|
||||
</optgroup>
|
||||
<optgroup label="AssetChains">
|
||||
<option data-content="<img src='img/cryptologo/bet.png' width='50px'/> BET (BET)" data-tokens="BET BET">BET</option>
|
||||
<option data-content="<img src='img/cryptologo/bots.png' width='50px'/> BOTS (BOTS)" data-tokens="BOTS BOTS">BOTS</option>
|
||||
<option data-content="<img src='img/cryptologo/ceal.png' width='50px'/> Ceal (CEAL)" data-tokens="Ceal CEAL">CEAL</option>
|
||||
<option data-content="<img src='img/cryptologo/coqui.png' width='50px;'/> COQUI (COQUI)" data-tokens="COQUI COQUI">COQUI</option>
|
||||
<option data-content="<img src='img/cryptologo/crypto.png' width='50px'/> Crypto777 (CRYPTO)" data-tokens="Crypto777 CRYPTO">CRYPTO</option>
|
||||
<option data-content="<img src='img/cryptologo/dex.png' width='50px;'/> InstantDEX (DEX)" data-tokens="InstantDEX DEX">DEX</option>
|
||||
<option data-content="<img src='img/cryptologo/hodlc.png' width='50px'/> HODLC (HODLC)" data-tokens="HODLC HODLC">HODLC</option>
|
||||
<option data-content="<img src='img/cryptologo/jumblr.png' width='50px;'/> Jumblr (JUMBLR)" data-tokens="Jumblr JUMBLR">JUMBLR</option>
|
||||
<option data-content="<img src='img/cryptologo/kv.png' width='50px'/> KeyValue (KV)" data-tokens="KeyValue KV">KV</option>
|
||||
<option data-content="<img src='img/cryptologo/mesh.png' width='50px'/> SuperMesh (MESH)" data-tokens="SuperMesh MESH">MESH</option>
|
||||
<option data-content="<img src='img/cryptologo/mgw.png' width='50px'/> MultiGateway (MGW)" data-tokens="MultiGateway MGW">MGW</option>
|
||||
|
||||
<option data-content="<img src='img/cryptologo/pangea.png' width='50px'/> Pangea (PANGEA)" data-tokens="Pangea PANGEA">PANGEA</option>
|
||||
<option data-content="<img src='img/cryptologo/revs.png' width='50px'/> REVS (REVS)" data-tokens="REVS REVS">REVS</option>
|
||||
<option data-content="<img src='img/cryptologo/shark.png' width='50px'/> SHARK (SHARK)" data-tokens="SHARK SHARK">SHARK</option>
|
||||
<option data-content="<img src='img/cryptologo/supernet.png' width='50px'/> SUPERNET (SUPERNET)" data-tokens="SUPERNET SUPERNET">SUPERNET</option>
|
||||
<option data-content="<img src='img/cryptologo/wlc.png' width='50px'/> Wireless (WLC)" data-tokens="Wireless WLC">WLC</option>>
|
||||
</optgroup>`;
|
||||
|
||||
|
||||
/*
|
||||
<option data-content="<img src='img/cryptologo/ANC.png' width='50px' disabled/> Anoncoin (ANC)" data-tokens="anc anoncoin">ANC</option>
|
||||
<option data-content="<img src='img/cryptologo/BTM.png' width='50px' disabled/> Bitmark (BTM)" data-tokens="btm bitmark">BTM</option>
|
||||
<option data-content="<img src='img/cryptologo/CARB.png' width='50px' disabled/> Carboncoin (CARB)" data-tokens="carb carboncoin">CARB</option>
|
||||
<option data-content="<img src='img/cryptologo/FRK.png' width='50px' disabled/> Franko (FRK)" data-tokens="Franko FRK">FRK</option>
|
||||
<option data-content="<img src='img/cryptologo/MZC.png' width='50px' disabled/> Mazacoin (MZC)" data-tokens="Mazacoin MZC">MZC</option>
|
||||
<option data-content="<img src='img/cryptologo/UNO.png' width='50px' disabled/> Unobtanium (UNO)" data-tokens="Unobtanium UNO">UNO</option>
|
||||
<option data-content="<img src='img/cryptologo/MVP.png' width='50px' disabled/> MVP (MVP)" data-tokens="MVP MVP">MVP</option>
|
||||
<optgroup label="Komodo Currencies">
|
||||
<option data-content="<img src='img/cryptologo/aud.png' width='50px;'/> Australian Dollar (AUD)" data-tokens="Australian Dollar AUD">AUD</option>
|
||||
<option data-content="<img src='img/cryptologo/bgn.png' width='50px;'/> Bulgarian Lev (BGN)" data-tokens="Bulgarian Lev BGN">BGN</option>
|
||||
<option data-content="<img src='img/cryptologo/cad.png' width='50px;'/> Canadian Dollar (CAD)" data-tokens="Canadian Dollar CAD">CAD</option>
|
||||
<option data-content="<img src='img/cryptologo/chf.png' width='50px;'/> Swiss Franc (CHF)" data-tokens="Swiss Franc CHF">CHF</option>
|
||||
<option data-content="<img src='img/cryptologo/cny.png' width='50px;'/> Chinese Yuan (CNY)" data-tokens="Chinese Yuan CNY">CNY</option>
|
||||
<option data-content="<img src='img/cryptologo/czk.png' width='50px;'/> Czech Koruna (CZK)" data-tokens="Czech Koruna CZK">CZK</option>
|
||||
<option data-content="<img src='img/cryptologo/dkk.png' width='50px;'/> Danish Krone (DKK)" data-tokens="Danish Krone DKK">DKK</option>
|
||||
<option data-content="<img src='img/cryptologo/eur.png' width='50px;'/> Euro (EUR)" data-tokens="Euro EUR">EUR</option>
|
||||
<option data-content="<img src='img/cryptologo/gbp.png' width='50px;'/> Pound Sterling (GBP)" data-tokens="Pound Sterling GBP">GBP</option>
|
||||
<option data-content="<img src='img/cryptologo/hkd.png' width='50px;'/> Hong Kong Dollar (HKD)" data-tokens="Hong Kong Dollar HKD">HKD</option>
|
||||
<option data-content="<img src='img/cryptologo/hrk.png' width='50px;'/> Croatian Kuna (HRK)" data-tokens="Croatian Kuna HRK">HRK</option>
|
||||
<option data-content="<img src='img/cryptologo/huf.png' width='50px;'/> Hungarian Forint (HUF)" data-tokens="Hungarian Forint HUF">HUF</option>
|
||||
<option data-content="<img src='img/cryptologo/idr.png' width='50px;'/> Indonesian Rupiah (IDR)" data-tokens="Indonesian Rupiah IDR">IDR</option>
|
||||
<option data-content="<img src='img/cryptologo/ils.png' width='50px;'/> Israeli Shekel (ILS)" data-tokens="Israeli Shekel ILS">ILS</option>
|
||||
<option data-content="<img src='img/cryptologo/inr.png' width='50px;'/> Indian Rupee (INR)" data-tokens="Indian Rupee INR">INR</option>
|
||||
<option data-content="<img src='img/cryptologo/jpy.png' width='50px;'/> Japanese Yen (JPY)" data-tokens="Japanese Yen JPY">JPY</option>
|
||||
<option data-content="<img src='img/cryptologo/krw.png' width='50px;'/> South Korean Won (KRW)" data-tokens="South Korean Won KRW">KRW</option>
|
||||
<option data-content="<img src='img/cryptologo/mxn.png' width='50px;'/> Mexican Peso (MXN)" data-tokens="Mexican Peso MXN">MXN</option>
|
||||
<option data-content="<img src='img/cryptologo/myr.png' width='50px;'/> Malaysian Ringgit (MYR)" data-tokens="Malaysian Ringgit MYR">MYR</option>
|
||||
<option data-content="<img src='img/cryptologo/nok.png' width='50px;'/> Norwegian Krone (NOK)" data-tokens="Norwegian Krone NOK">NOK</option>
|
||||
<option data-content="<img src='img/cryptologo/nzd.png' width='50px;'/> New Zealand Dollar (NZD)" data-tokens="New Zealand Dollar NZD">NZD</option>
|
||||
<option data-content="<img src='img/cryptologo/php.png' width='50px;'/> Philippine Peso (PHP)" data-tokens="Philippine Peso PHP">PHP</option>
|
||||
<option data-content="<img src='img/cryptologo/pln.png' width='50px;'/> Polish Zloty (PLN)" data-tokens="Polish Zloty PLN">PLN</option>
|
||||
<option data-content="<img src='img/cryptologo/brl.png' width='50px;'/> Brazilian Real (BRL)" data-tokens="Brazilian Real BRL">BRL</option>
|
||||
<option data-content="<img src='img/cryptologo/ron.png' width='50px;'/> Romanian Leu (RON)" data-tokens="Romanian Leu RON">RON</option>
|
||||
<option data-content="<img src='img/cryptologo/rub.png' width='50px;'/> Russian Ruble (RUB)" data-tokens="Russian Ruble RUB">RUB</option>
|
||||
<option data-content="<img src='img/cryptologo/sek.png' width='50px;'/> Swedish Krona (SEK)" data-tokens="Swedish Krona SEK">SEK</option>
|
||||
<option data-content="<img src='img/cryptologo/sgd.png' width='50px;'/> Singapore Dollar (SGD)" data-tokens="Singapore Dollar SGD">SGD</option>
|
||||
<option data-content="<img src='img/cryptologo/thb.png' width='50px;'/> Thai Baht (THB)" data-tokens="Thai Baht THB">THB</option>
|
||||
<option data-content="<img src='img/cryptologo/try.png' width='50px;'/> Turkish Lira (TRY)" data-tokens="Turkish Lira TRY">TRY</option>
|
||||
<option data-content="<img src='img/cryptologo/usd.png' width='50px;'/> US Dollar (USD)" data-tokens="US Dollar USD">USD</option>
|
||||
<option data-content="<img src='img/cryptologo/zar.png' width='50px;'/> South African Rand (ZAR)" data-tokens="South African Rand ZAR">ZAR</option>
|
||||
</optgroup>
|
||||
*/
|
||||
|
||||
$('.trading_pair_coin').html(coin_select_options);
|
||||
|
||||
|
||||
$('.sell_coin').html(coin_select_options);
|
||||
$('.buy_coin').html(coin_select_options);
|
||||
|
||||
$('.sell_coin_p').html(coin_select_options);
|
||||
$('.buy_coin_p').html(coin_select_options);
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ var CheckMM_Interval = null;
|
|||
// In renderer process (web page).
|
||||
const {ipcRenderer} = require('electron')
|
||||
|
||||
const _coin = 'MNZ';
|
||||
//const _coin = 'MNZ';
|
||||
|
||||
ShepherdIPC = function(data) {
|
||||
/*ipcRenderer.on('shepherd-reply', (event, arg) => {
|
||||
|
|
@ -24,9 +24,8 @@ $('.dexlogout-btn').click(function(e) {
|
|||
var shepherdresult = ShepherdIPC({"command":"logout"});
|
||||
$('.mainbody').fadeOut();
|
||||
$('.loginbody').fadeIn();
|
||||
//CheckOrderBookFn(false);
|
||||
|
||||
//CheckPortfolioFn(false);
|
||||
CheckPortfolioFn(false);
|
||||
CheckOrderBookFn(false);
|
||||
check_swap_status(false);
|
||||
check_bot_list(false);
|
||||
|
|
@ -34,7 +33,7 @@ $('.dexlogout-btn').click(function(e) {
|
|||
bot_screen_coin_balance(false);
|
||||
bot_screen_sellcoin_balance(false);
|
||||
|
||||
//check_coin_balance(false);
|
||||
check_coin_balance(false);
|
||||
sessionStorage.clear();
|
||||
});
|
||||
|
||||
|
|
@ -174,16 +173,18 @@ CheckMMStatus = function(sig) {
|
|||
$('.mainbody').fadeIn();
|
||||
$('.loginbody').fadeOut();
|
||||
$('.loadingbody').hide();
|
||||
/*var refresh_data = {"coin":" ", "status": "enable"};
|
||||
enable_disable_coin(refresh_data);
|
||||
get_myprices();
|
||||
CheckOrderbook_Interval = setInterval(CheckOrderBookFn,3000);*/
|
||||
var refresh_data = {"coin":" ", "status": "enable"};
|
||||
//enable_disable_coin(refresh_data);
|
||||
//get_myprices();
|
||||
//CheckOrderbook_Interval = setInterval(CheckOrderBookFn,3000);
|
||||
//check_coin_balance_Interval = setInterval(check_coin_balance,3000);
|
||||
CheckPortfolio_Interval = setInterval(CheckPortfolioFn,60000);
|
||||
CheckPortfolioFn();
|
||||
|
||||
//---- dICO App Settings START ----//
|
||||
//CheckPortfolio_Interval = setInterval(CheckPortfolioFn,60000);
|
||||
|
||||
selected_coin = {}
|
||||
/*selected_coin = {}
|
||||
selected_coin.coin = _coin;
|
||||
selected_coin.coin_name = return_coin_name(_coin);
|
||||
console.log(selected_coin);
|
||||
|
|
@ -213,7 +214,7 @@ CheckMMStatus = function(sig) {
|
|||
|
||||
$('#trading_mode_options_trademanual').trigger('click');
|
||||
$('#trading_mode_options_tradebot').removeAttr("checked");
|
||||
$('#trading_mode_options_trademanual').attr('checked','checked');
|
||||
$('#trading_mode_options_trademanual').attr('checked','checked');*/
|
||||
|
||||
//---- dICO App Settings END ----//
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,8 @@ $(document).ready(function() {
|
|||
if (mmstatus !== 'closed') {
|
||||
$('.mainbody').show();
|
||||
$('.loginbody').hide();
|
||||
CheckPortfolio_Interval = setInterval(CheckPortfolioFn,60000);
|
||||
CheckPortfolioFn();
|
||||
|
||||
//check_coin_balance_Interval = setInterval(check_coin_balance,3000);
|
||||
//check_coin_balance();
|
||||
|
|
@ -23,7 +25,7 @@ $(document).ready(function() {
|
|||
//CheckPortfolio_Interval = setInterval(CheckPortfolioFn,60000);
|
||||
//CheckPortfolioFn();
|
||||
|
||||
selected_coin = {}
|
||||
/* selected_coin = {}
|
||||
selected_coin.coin = _coin;
|
||||
selected_coin.coin_name = return_coin_name(_coin);
|
||||
console.log(selected_coin);
|
||||
|
|
@ -50,17 +52,21 @@ $(document).ready(function() {
|
|||
bot_screen_coin_balance();
|
||||
bot_screen_sellcoin_balance_Interval = setInterval(bot_screen_sellcoin_balance, 30000);
|
||||
bot_screen_sellcoin_balance();
|
||||
get_coin_info(_coin);
|
||||
//get_coin_info(_coin);
|
||||
|
||||
//Enableing Manual Trade by auto clicking Manual trade option via JS code.
|
||||
$('#trading_mode_options_trademanual').trigger('click');
|
||||
$('#trading_mode_options_tradebot').removeAttr("checked");
|
||||
$('#trading_mode_options_trademanual').attr('checked','checked');
|
||||
$('#trading_mode_options_trademanual').attr('checked','checked');*/
|
||||
|
||||
//---- dICO App Settings END ----//
|
||||
|
||||
//$('.trading_selected_trader_label').hide();
|
||||
//$('.trading_selected_trader').hide();
|
||||
$('#trading_mode_options_trademanual').trigger('click');
|
||||
$('#trading_mode_options_tradebot').removeAttr("checked");
|
||||
$('#trading_mode_options_trademanual').attr('checked','checked');
|
||||
|
||||
$('.relvol_basevol_coin').html($('.trading_pair_coin').selectpicker('val'));
|
||||
|
||||
} else {
|
||||
|
|
@ -193,7 +199,7 @@ $('.btn_coindashboard_receive').click(function() {
|
|||
sessionStorage.setItem('mm_usercoins', JSON.stringify(data.coins));
|
||||
sessionStorage.setItem('mm_userpass', data.userpass);
|
||||
sessionStorage.setItem('mm_mypubkey', data.mypubkey);
|
||||
get_coin_info(_coin);
|
||||
//get_coin_info(_coin);
|
||||
}
|
||||
|
||||
bootbox.dialog({
|
||||
|
|
@ -445,7 +451,7 @@ $('.btn-inventoryclose').click(function(e) {
|
|||
bot_screen_coin_balance();
|
||||
bot_screen_sellcoin_balance_Interval = setInterval(bot_screen_sellcoin_balance, 30000);
|
||||
bot_screen_sellcoin_balance();
|
||||
get_coin_info(_coin);
|
||||
//get_coin_info(_coin);
|
||||
});
|
||||
|
||||
$('.btn-inventoryrefresh').click(function(e) {
|
||||
|
|
@ -851,7 +857,7 @@ function check_coin_balance(coin_data) {
|
|||
sessionStorage.setItem('mm_usercoins', JSON.stringify(data.coins));
|
||||
sessionStorage.setItem('mm_userpass', data.userpass);
|
||||
sessionStorage.setItem('mm_mypubkey', data.mypubkey);
|
||||
get_coin_info(_coin);
|
||||
//get_coin_info(_coin);
|
||||
}
|
||||
|
||||
if (!data.error === false && data.error == 'coin is disabled') {
|
||||
|
|
@ -922,7 +928,7 @@ function get_coin_info(coin) {
|
|||
sessionStorage.setItem('mm_usercoins', JSON.stringify(data.coins));
|
||||
sessionStorage.setItem('mm_userpass', data.userpass);
|
||||
sessionStorage.setItem('mm_mypubkey', data.mypubkey);
|
||||
get_coin_info(_coin);
|
||||
//get_coin_info(_coin);
|
||||
}
|
||||
|
||||
if (!data.error == true) {
|
||||
|
|
@ -970,7 +976,7 @@ function get_coins() {
|
|||
sessionStorage.setItem('mm_usercoins', JSON.stringify(data.coins));
|
||||
sessionStorage.setItem('mm_userpass', data.userpass);
|
||||
sessionStorage.setItem('mm_mypubkey', data.mypubkey);
|
||||
get_coin_info(_coin);
|
||||
//get_coin_info(_coin);
|
||||
}
|
||||
//toastr.success('Auto goal setup executed!', 'Portfolio Info')
|
||||
//$('.initcoinswap-output').html(JSON.stringify(data, null, 2));
|
||||
|
|
@ -1049,7 +1055,7 @@ function enable_disable_coin(data) {
|
|||
sessionStorage.setItem('mm_usercoins', JSON.stringify(data.coins));
|
||||
sessionStorage.setItem('mm_userpass', data.userpass);
|
||||
sessionStorage.setItem('mm_mypubkey', data.mypubkey);
|
||||
get_coin_info(_coin);
|
||||
//get_coin_info(_coin);
|
||||
|
||||
if (ajax_data.status === 'enable') {
|
||||
toastr.success(ajax_data.coin+' Enabled','Coin Status');
|
||||
|
|
@ -1119,7 +1125,7 @@ function enable_disable_coin(data) {
|
|||
sessionStorage.setItem('mm_usercoins', JSON.stringify(data.coins));
|
||||
sessionStorage.setItem('mm_userpass', data.userpass);
|
||||
sessionStorage.setItem('mm_mypubkey', data.mypubkey);
|
||||
get_coin_info(_coin);
|
||||
//get_coin_info(_coin);
|
||||
|
||||
if (ajax_data.status === 'enable') {
|
||||
toastr.success(ajax_data.coin+' Enabled','Coin Status');
|
||||
|
|
@ -1197,7 +1203,7 @@ function check_coin_inventory(coin) {
|
|||
sessionStorage.setItem('mm_usercoins', JSON.stringify(data.coins));
|
||||
sessionStorage.setItem('mm_userpass', data.userpass);
|
||||
sessionStorage.setItem('mm_mypubkey', data.mypubkey);
|
||||
get_coin_info(_coin);
|
||||
//get_coin_info(_coin);
|
||||
//get_coins_list(data.coins);
|
||||
//$( ".inv_btn[data-coin='"+ coin +"']" ).trigger( "click" );
|
||||
} else {
|
||||
|
|
@ -1604,7 +1610,7 @@ function addcoin_enable_disable_coin(data) {
|
|||
sessionStorage.setItem('mm_usercoins', JSON.stringify(data.coins));
|
||||
sessionStorage.setItem('mm_userpass', data.userpass);
|
||||
sessionStorage.setItem('mm_mypubkey', data.mypubkey);
|
||||
get_coin_info(_coin);
|
||||
//get_coin_info(_coin);
|
||||
if (ajax_data.status === 'enable') {
|
||||
toastr.success(ajax_data.coin+' Enabled','Coin Status');
|
||||
}
|
||||
|
|
@ -1652,7 +1658,7 @@ function get_coins_list() {
|
|||
sessionStorage.setItem('mm_usercoins', JSON.stringify(data.coins));
|
||||
sessionStorage.setItem('mm_userpass', data.userpass);
|
||||
sessionStorage.setItem('mm_mypubkey', data.mypubkey);
|
||||
get_coin_info(_coin);
|
||||
//get_coin_info(_coin);
|
||||
get_coins_list();
|
||||
return
|
||||
} else {
|
||||
|
|
@ -1804,7 +1810,7 @@ function CheckPortfolioFn(sig) {
|
|||
sessionStorage.setItem('mm_userpass', data.userpass);
|
||||
sessionStorage.setItem('mm_mypubkey', data.mypubkey);
|
||||
CheckPortfolioFn();
|
||||
get_coin_info(_coin);
|
||||
//get_coin_info(_coin);
|
||||
return
|
||||
}
|
||||
|
||||
|
|
@ -2317,7 +2323,7 @@ function CheckOrderBookFn(sig) {
|
|||
sessionStorage.setItem('mm_usercoins', JSON.stringify(data.coins));
|
||||
sessionStorage.setItem('mm_userpass', data.userpass);
|
||||
sessionStorage.setItem('mm_mypubkey', data.mypubkey);
|
||||
get_coin_info(_coin);
|
||||
//get_coin_info(_coin);
|
||||
//CheckOrderBookFn();
|
||||
} else {
|
||||
//console.log(data.asks);
|
||||
|
|
@ -2435,7 +2441,7 @@ function check_my_prices(sig){
|
|||
sessionStorage.setItem('mm_usercoins', JSON.stringify(data.coins));
|
||||
sessionStorage.setItem('mm_userpass', data.userpass);
|
||||
sessionStorage.setItem('mm_mypubkey', data.mypubkey);
|
||||
get_coin_info(_coin);
|
||||
//get_coin_info(_coin);
|
||||
} else {
|
||||
//console.log(data);
|
||||
$('.exchange_my_orders_tbl tbody').empty();
|
||||
|
|
@ -2585,7 +2591,7 @@ $('.your_coins_balance_info').on('click', '.coin_balance_receive', function() {
|
|||
sessionStorage.setItem('mm_usercoins', JSON.stringify(data.coins));
|
||||
sessionStorage.setItem('mm_userpass', data.userpass);
|
||||
sessionStorage.setItem('mm_mypubkey', data.mypubkey);
|
||||
get_coin_info(_coin);
|
||||
//get_coin_info(_coin);
|
||||
}
|
||||
|
||||
bootbox.dialog({
|
||||
|
|
@ -2936,7 +2942,7 @@ function update_min_max_price_input(){
|
|||
sessionStorage.setItem('mm_usercoins', JSON.stringify(data.coins));
|
||||
sessionStorage.setItem('mm_userpass', data.userpass);
|
||||
sessionStorage.setItem('mm_mypubkey', data.mypubkey);
|
||||
get_coin_info(_coin);
|
||||
//get_coin_info(_coin);
|
||||
//get_coins_list(data.coins);
|
||||
} else {
|
||||
//console.log(data.asks);
|
||||
|
|
@ -2986,7 +2992,7 @@ function check_bot_list(sig) {
|
|||
sessionStorage.setItem('mm_usercoins', JSON.stringify(data.coins));
|
||||
sessionStorage.setItem('mm_userpass', data.userpass);
|
||||
sessionStorage.setItem('mm_mypubkey', data.mypubkey);
|
||||
get_coin_info(_coin);
|
||||
//get_coin_info(_coin);
|
||||
} else {
|
||||
$('.exchange_bot_list_tbl tbody').empty();
|
||||
$.each(data, function(index, val) {
|
||||
|
|
@ -3728,8 +3734,8 @@ function bot_screen_sellcoin_balance(sig) {
|
|||
sessionStorage.setItem('mm_usercoins', JSON.stringify(data.coins));
|
||||
sessionStorage.setItem('mm_userpass', data.userpass);
|
||||
sessionStorage.setItem('mm_mypubkey', data.mypubkey);
|
||||
get_coin_info(_coin);
|
||||
get_coin_info(_coin);
|
||||
//get_coin_info(_coin);
|
||||
//get_coin_info(_coin);
|
||||
bot_screen_sellcoin_balance();
|
||||
} else {
|
||||
if (!data.error === false && data.error === 'coin is disabled') {
|
||||
|
|
@ -3803,7 +3809,7 @@ function bot_screen_coin_balance(sig) {
|
|||
sessionStorage.setItem('mm_usercoins', JSON.stringify(data.coins));
|
||||
sessionStorage.setItem('mm_userpass', data.userpass);
|
||||
sessionStorage.setItem('mm_mypubkey', data.mypubkey);
|
||||
get_coin_info(_coin);
|
||||
//get_coin_info(_coin);
|
||||
bot_screen_coin_balance();
|
||||
} else {
|
||||
if (!data.error === false && data.error === 'coin is disabled') {
|
||||
|
|
@ -3887,7 +3893,7 @@ function check_swap_status_details(swap_data) {
|
|||
sessionStorage.setItem('mm_usercoins', JSON.stringify(data.coins));
|
||||
sessionStorage.setItem('mm_userpass', data.userpass);
|
||||
sessionStorage.setItem('mm_mypubkey', data.mypubkey);
|
||||
get_coin_info(_coin);
|
||||
//get_coin_info(_coin);
|
||||
} else {
|
||||
result_answer = (data.result == 'success') ? '<h4><span class="label label-success"><span class="glyphicon glyphicon-ok" aria-hidden="true"></span> Success</span></h4>' : '<h4><span class="label label-danger"><span class="glyphicon glyphicon-warning-sign" aria-hidden="true"></span> ' + data.result + '</span></h4>';
|
||||
alice_answer = '<img src="img/cryptologo/'+data.alice.toLowerCase()+'.png" style="width: 30px;"> '+ return_coin_name(data.alice) + ' ('+data.alice+')';
|
||||
|
|
@ -4169,7 +4175,7 @@ function check_swap_status_details(swap_data) {
|
|||
//bot_screen_coin_balance();
|
||||
//bot_screen_sellcoin_balance_Interval = setInterval(bot_screen_sellcoin_balance, 30000);
|
||||
//bot_screen_sellcoin_balance();
|
||||
get_coin_info(_coin);
|
||||
//get_coin_info(_coin);
|
||||
})
|
||||
|
||||
});
|
||||
|
|
@ -4243,7 +4249,7 @@ function check_swap_status(sig) {
|
|||
sessionStorage.setItem('mm_usercoins', JSON.stringify(data.coins));
|
||||
sessionStorage.setItem('mm_userpass', data.userpass);
|
||||
sessionStorage.setItem('mm_mypubkey', data.mypubkey);
|
||||
get_coin_info(_coin);
|
||||
//get_coin_info(_coin);
|
||||
} else {
|
||||
var reversed_swap_list = data.swaps.reverse();
|
||||
|
||||
|
|
|
|||
|
|
@ -27,21 +27,21 @@ const killmm = require('./killmm');
|
|||
// SETTING APP ICON FOR LINUX AND WINDOWS
|
||||
if (os.platform() === 'darwin') {
|
||||
fixPath();
|
||||
var dICOBin = path.join(__dirname, '../assets/bin/osx/marketmaker'),
|
||||
dICODir = `${process.env.HOME}/Library/Application Support/dICOApp`;
|
||||
var BarterDEXBin = path.join(__dirname, '../assets/bin/osx/marketmaker'),
|
||||
BarterDEXDir = `${process.env.HOME}/Library/Application Support/BarterDEX`;
|
||||
}
|
||||
|
||||
if (os.platform() === 'linux') {
|
||||
var dICOBin = path.join(__dirname, '../assets/bin/linux64/marketmaker'),
|
||||
dICODir = `${process.env.HOME}/.dICOApp`;
|
||||
var BarterDEXBin = path.join(__dirname, '../assets/bin/linux64/marketmaker'),
|
||||
BarterDEXDir = `${process.env.HOME}/.BarterDEX`;
|
||||
}
|
||||
|
||||
if (os.platform() === 'win32') {
|
||||
var dICOBin = path.join(__dirname, '../assets/bin/win64/marketmaker.exe');
|
||||
dICOBin = path.normalize(dICOBin);
|
||||
dICODir = `${process.env.APPDATA}/dICOApp`;
|
||||
dICODir = path.normalize(dICODir);
|
||||
dICOIcon = path.join(__dirname, '/assets/icons/agama_icons/agama_app_icon.ico');
|
||||
var BarterDEXBin = path.join(__dirname, '../assets/bin/win64/marketmaker.exe');
|
||||
BarterDEXBin = path.normalize(BarterDEXBin);
|
||||
BarterDEXDir = `${process.env.APPDATA}/BarterDEX`;
|
||||
BarterDEXDir = path.normalize(BarterDEXDir);
|
||||
BarterDEXIcon = path.join(__dirname, '/assets/icons/barterdex/barterdex.ico');
|
||||
}
|
||||
|
||||
// DEFAULT COINS LIST FOR MARKETMAKER
|
||||
|
|
@ -62,8 +62,8 @@ ipcMain.on('shepherd-command', (event, arg) => {
|
|||
event.returnValue = 'pong'
|
||||
break;
|
||||
case 'login':
|
||||
console.log(dICOBin);
|
||||
console.log(dICODir);
|
||||
console.log(BarterDEXBin);
|
||||
console.log(BarterDEXDir);
|
||||
//event.sender.send('shepherd-reply', 'Logged In');
|
||||
event.returnValue = 'Logged In';
|
||||
//const _passphrase = 'scatter quote stumble confirm extra jacket lens abuse gesture soda rebel seed nature achieve hurt shoot farm middle venture fault mesh crew upset cotton';
|
||||
|
|
@ -91,7 +91,7 @@ StartMarketMaker = function(data) {
|
|||
portscanner.checkPortStatus(7783, '127.0.0.1', function(error, status) {
|
||||
// Status is 'open' if currently in use or 'closed' if available
|
||||
if (status === 'closed') {
|
||||
const _coinsListFile = dICODir+'/coins.json'
|
||||
const _coinsListFile = BarterDEXDir+'/coins.json'
|
||||
|
||||
fs.pathExists(_coinsListFile, (err, exists) => {
|
||||
if (exists === true) {
|
||||
|
|
@ -156,37 +156,37 @@ ExecMarketMaker = function(data) {
|
|||
};
|
||||
|
||||
//console.log(JSON.stringify(_customParam))
|
||||
//console.log(`exec ${dICOBin} ${JSON.stringify(_customParam)}`);
|
||||
//console.log(`exec ${BarterDEXBin} ${JSON.stringify(_customParam)}`);
|
||||
|
||||
let params = _customParam;
|
||||
if (osPlatform !== 'win32') {
|
||||
params = JSON.stringify(_customParam);
|
||||
params = `'${params}'`;
|
||||
} else {
|
||||
dICOBin = '"'+dICOBin+'"';
|
||||
BarterDEXBin = '"'+BarterDEXBin+'"';
|
||||
params.userhome = process.env.APPDATA;
|
||||
// console.log('[Decker] dICOBin = '+dICOBin+', dICODir = '+dICODir);
|
||||
// console.log('[Decker] BarterDEXBin = '+BarterDEXBin+', BarterDEXDir = '+BarterDEXDir);
|
||||
params = JSON.stringify(_customParam);
|
||||
params = params.replace(/"/g, '\\"');
|
||||
params = '"' + params +'"';
|
||||
}
|
||||
|
||||
// console.log(`[Decker] exec ${dICOBin} ${params}`);
|
||||
/*var out = fs.openSync(`${dICODir}/out.log`, 'a');
|
||||
var err = fs.openSync(`${dICODir}/out.log`, 'a');
|
||||
// console.log(`[Decker] exec ${BarterDEXBin} ${params}`);
|
||||
/*var out = fs.openSync(`${BarterDEXDir}/out.log`, 'a');
|
||||
var err = fs.openSync(`${BarterDEXDir}/out.log`, 'a');
|
||||
|
||||
var cp = require('child_process');
|
||||
console.log(params);
|
||||
console.log(dICOBin);
|
||||
var child = cp.spawn(dICOBin, [params], { detached: true, stdio: [ 'ignore', out, err ] });
|
||||
console.log(BarterDEXBin);
|
||||
var child = cp.spawn(BarterDEXBin, [params], { detached: true, stdio: [ 'ignore', out, err ] });
|
||||
child.unref();*/
|
||||
|
||||
var logStream = fs.createWriteStream(`${dICODir}/logFile.log`, {flags: 'a'});
|
||||
var logStream = fs.createWriteStream(`${BarterDEXDir}/logFile.log`, {flags: 'a'});
|
||||
|
||||
console.log('mm start');
|
||||
console.log(`${dICOBin} ${params}`)
|
||||
mmid = exec(`${dICOBin} ${params}`, {
|
||||
cwd: dICODir,
|
||||
console.log(`${BarterDEXBin} ${params}`)
|
||||
mmid = exec(`${BarterDEXBin} ${params}`, {
|
||||
cwd: BarterDEXDir,
|
||||
maxBuffer: 1024 * 50000 // 50 mb
|
||||
}, function(error, stdout, stderr) {
|
||||
console.log(`stdout: ${stdout}`);
|
||||
|
|
|
|||
Loading…
Reference in New Issue