From 34b3b70b16e128e8d5732a1261bbb56c93a089a8 Mon Sep 17 00:00:00 2001 From: pbca26 Date: Mon, 28 Aug 2017 21:07:17 +0300 Subject: [PATCH] disable full mode by default --- assets/mainWindow/css/loading.css | 274 +++++++++++++++++- assets/mainWindow/img/fa-close.png | Bin 0 -> 2522 bytes assets/mainWindow/img/fa-cogs.png | Bin 0 -> 4844 bytes assets/mainWindow/img/fa-cube.png | Bin 0 -> 3474 bytes assets/mainWindow/img/fa-cubes.png | Bin 0 -> 3731 bytes assets/mainWindow/img/fa-question.png | Bin 0 -> 2595 bytes assets/mainWindow/js/loading.js | 244 +++++++++++++--- .../addcoin/addcoinOptionsACFiat.js | 75 +++-- .../addcoin/addcoinOptionsCrypto.js | 44 +-- .../addcoin/coin-selectors.render.js | 9 +- .../components/dashboard/settings/settings.js | 3 +- .../walletsNativeSend/walletsNativeSend.js | 6 +- 12 files changed, 560 insertions(+), 95 deletions(-) create mode 100644 assets/mainWindow/img/fa-close.png create mode 100644 assets/mainWindow/img/fa-cogs.png create mode 100644 assets/mainWindow/img/fa-cube.png create mode 100644 assets/mainWindow/img/fa-cubes.png create mode 100644 assets/mainWindow/img/fa-question.png diff --git a/assets/mainWindow/css/loading.css b/assets/mainWindow/css/loading.css index 8782de6..47ad63a 100644 --- a/assets/mainWindow/css/loading.css +++ b/assets/mainWindow/css/loading.css @@ -2,6 +2,8 @@ body { overflow: hidden !important; border: solid 1px #ccc; height: 300px; + user-select: none; + cursor: default; } .text-center { @@ -31,6 +33,15 @@ body.agamaMode { background-color: rgba(33, 33, 33, 0.85); padding-top: 40px; color: #fff; + height: 335px; +} + +body.agama-default-window-height { + height: 300px !important; +} + +body.agama-app-settings-window { + height: 770px; } .agama-logo { @@ -38,11 +49,21 @@ body.agamaMode { } #agamaModeStatus { - padding-bottom: 25px; + padding-bottom: 35px; font-weight: bold; font-size: 16px; } +.btn-info { + color: #fff; + background-color: #25b4c5 !important; + border-color: #25b4c5 !important; +} +.btn-info:hover { + background-color: #6cd2de !important; + border-color: #6cd2de !important; +} + .btn-primary.focus, .btn-primary:focus, .btn-primary:hover, @@ -67,8 +88,8 @@ body.agamaMode { font-size: 14px; line-height: 1.57142857; border-radius: 3px; - -webkit-box-shadow: 0 1px 4px 0 rgba(0,0,0,.1); - box-shadow: 0 1px 4px 0 rgba(0,0,0,.1); + -webkit-box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.1); + box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.1); -webkit-transition: border .2s linear,color .2s linear,width .2s linear,background-color .2s linear; -o-transition: border .2s linear,color .2s linear,width .2s linear,background-color .2s linear; transition: border .2s linear,color .2s linear,width .2s linear,background-color .2s linear; @@ -114,4 +135,251 @@ body.agamaMode { .app-closing { position: relative; top: 50px; +} + +.height--auto { + height: auto; +} + +.settings-title { + font-weight: bold; + margin-bottom: 30px; +} + +.margin-right-5 { + margin-right: 5px; +} +.margin-right-10 { + margin-right: 10px; +} +.margin-right-20 { + margin-right: 20px; +} +.margin-top-15 { + margin-top: 15px; +} +.margin-top-20 { + margin-top: 20px; +} + +.btn-close { + border-bottom-left-radius: 50%; + background: #fff; + color: rgba(33, 33, 33, 0.85); + padding: 8px 10px; + font-weight: bold; + font-size: 20px; + position: absolute; + top: 0; + right: 0; + cursor: pointer; +} + +.btn-close img { + height: 12px; + position: relative; + top: -1px; + right: -1px; +} + +.btn-mode img { + height: 20px; + position: relative; + top: -1px; + left: -4px; + padding-right: 5px; +} + +/* settings */ +.settings-help { + position: relative; + top: -2px; + left: 10px; + color: #fff; + border-radius: 50%; + background: #5683ad; + display: inline-block; + padding: 4px 4px; + line-height: 30px; + cursor: default; +} + +.settings-help img { + height: 13px; +} + +.settings-buttons-block { + margin-top: 50px; +} + +.settings-table { + margin: 0 auto; + width: 650px; + text-align: left; +} + +.settings-table input[type="number"] { + width: 100px; + padding: 0 4px; +} + +.settings-table input[type="text"] { + width: 100%; + padding: 0 4px; +} + +.settings-table td { + padding-bottom: 35px; +} + +.settings-table tr:last-child td { + padding: 0; +} + +.settings-table .left { + width: 50%; +} + +.settings-table .right { + width: 50%; + text-align: left; +} + +.agama-app-settings-window #agamaModeStatus { + padding-bottom: 50px; +} + +/* toggle */ +.slider { + border-radius: 20px; + position: absolute; + cursor: pointer; + top: 0; + left: 0; + right: 0; + bottom: 0; + background-color: #fff; + transition: .4s; +} +.switch input { + display: none; +} +input[type=checkbox], +input[type=radio] { + margin: 4px 0 0; + margin-top: 1px\9; + line-height: normal; +} +input[type=checkbox], +input[type=radio] { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + padding: 0; +} +.switch { + position: relative; + display: inline-block; + width: 40px; + height: 24px; +} +label { + font-weight: 300; +} +label { + display: inline-block; + max-width: 100%; + margin-bottom: 5px; + font-weight: 700; +} +input:checked + .slider { + background: #36ab7a; +} +input:checked + .slider:before { + background: #fff; +} +input:checked + .slider:before { + -ms-transform: translateX(16px); + transform: translateX(16px); +} +.slider:before { + content: ''; + display: inline-block; + border-radius: 50%; + position: absolute; + height: 20px; + width: 20px; + left: 2px; + bottom: 2px; + background-color: #ccc; + transition: .4s; +} +input[type="text"], +input[type="number"] { + color: rgb(33, 33, 33); +} + +/* toastr */ +#toast-container { + position: fixed; + z-index: 999999; +} +.toast-bottom-right { + right: 12px; + bottom: 12px; +} +#toast-container > .toast-success { + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADsSURBVEhLY2AYBfQMgf///3P8+/evAIgvA/FsIF+BavYDDWMBGroaSMMBiE8VC7AZDrIFaMFnii3AZTjUgsUUWUDA8OdAH6iQbQEhw4HyGsPEcKBXBIC4ARhex4G4BsjmweU1soIFaGg/WtoFZRIZdEvIMhxkCCjXIVsATV6gFGACs4Rsw0EGgIIH3QJYJgHSARQZDrWAB+jawzgs+Q2UO49D7jnRSRGoEFRILcdmEMWGI0cm0JJ2QpYA1RDvcmzJEWhABhD/pqrL0S0CWuABKgnRki9lLseS7g2AlqwHWQSKH4oKLrILpRGhEQCw2LiRUIa4lwAAAABJRU5ErkJggg==) !important; +} +#toast-container > .toast-error { + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHOSURBVEhLrZa/SgNBEMZzh0WKCClSCKaIYOED+AAKeQQLG8HWztLCImBrYadgIdY+gIKNYkBFSwu7CAoqCgkkoGBI/E28PdbLZmeDLgzZzcx83/zZ2SSXC1j9fr+I1Hq93g2yxH4iwM1vkoBWAdxCmpzTxfkN2RcyZNaHFIkSo10+8kgxkXIURV5HGxTmFuc75B2RfQkpxHG8aAgaAFa0tAHqYFfQ7Iwe2yhODk8+J4C7yAoRTWI3w/4klGRgR4lO7Rpn9+gvMyWp+uxFh8+H+ARlgN1nJuJuQAYvNkEnwGFck18Er4q3egEc/oO+mhLdKgRyhdNFiacC0rlOCbhNVz4H9FnAYgDBvU3QIioZlJFLJtsoHYRDfiZoUyIxqCtRpVlANq0EU4dApjrtgezPFad5S19Wgjkc0hNVnuF4HjVA6C7QrSIbylB+oZe3aHgBsqlNqKYH48jXyJKMuAbiyVJ8KzaB3eRc0pg9VwQ4niFryI68qiOi3AbjwdsfnAtk0bCjTLJKr6mrD9g8iq/S/B81hguOMlQTnVyG40wAcjnmgsCNESDrjme7wfftP4P7SP4N3CJZdvzoNyGq2c/HWOXJGsvVg+RA/k2MC/wN6I2YA2Pt8GkAAAAASUVORK5CYII=) !important; +} +#toast-container > div { + margin: 0 0 6px; + padding: 15px 15px 15px 50px; + width: 300px; + -moz-border-radius: 3px 3px 3px 3px; + -webkit-border-radius: 3px 3px 3px 3px; + border-radius: 3px 3px 3px 3px; + background-position: 15px center; + background-repeat: no-repeat; + color: #fff; +} +.toast-success { + background-color: #51a351; +} +.toast-error { + background-color: #bd362f; +} +.toast-title { + font-weight: bold; + text-align: left; + margin-left: 10px; +} +button.toast-close-button { + padding: 0; + cursor: pointer; + background: transparent; + border: 0; + -webkit-appearance: none; +} +.toast-close-button { + position: relative; + right: -0.3em; + top: -0.3em; + float: right; + font-size: 20px; + font-weight: bold; + color: #fff; + -webkit-text-shadow: 0 1px 0 #fff; + text-shadow: 0 1px 0 #fff; + opacity: .8; + -ms-filter: alpha(opacity=80); + filter: alpha(opacity=80); +} +.toast-message { + text-align: left; + margin-left: 10px; + -ms-word-wrap: break-word; + word-wrap: break-word; } \ No newline at end of file diff --git a/assets/mainWindow/img/fa-close.png b/assets/mainWindow/img/fa-close.png new file mode 100644 index 0000000000000000000000000000000000000000..541cde8464c56273dd25345e8807e97e4acec000 GIT binary patch literal 2522 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 literal 0 HcmV?d00001 diff --git a/assets/mainWindow/img/fa-cogs.png b/assets/mainWindow/img/fa-cogs.png new file mode 100644 index 0000000000000000000000000000000000000000..3faf85401717d60f56f95ea32daccffefae3509a GIT binary patch literal 4844 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 literal 0 HcmV?d00001 diff --git a/assets/mainWindow/img/fa-cube.png b/assets/mainWindow/img/fa-cube.png new file mode 100644 index 0000000000000000000000000000000000000000..6d89cfa132de05fe1215f4d8d2292568a46fb813 GIT binary patch literal 3474 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 DnLBQt literal 0 HcmV?d00001 diff --git a/assets/mainWindow/img/fa-cubes.png b/assets/mainWindow/img/fa-cubes.png new file mode 100644 index 0000000000000000000000000000000000000000..df37e21f93c6e53b32968071a95440eda1873acc GIT binary patch literal 3731 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 + + ${appConfSchema[key].displayName}`; + + if (appConfSchema[key].info) { + _htmlOut = ` + ${_htmlOut} +
+ +
`; + } - window.forseCloseApp(); + if (appConfSchema[key].type === 'number') { + _htmlOut = ` + ${_htmlOut} + + + + + `; + } else if (appConfSchema[key].type === 'string' || appConfSchema[key].type === 'folder') { + _htmlOut = ` + ${_htmlOut} + + + + + `; + } else if (appConfSchema[key].type === 'boolean') { + _htmlOut = `${_htmlOut} + + + + + `; + } + } } - function normalStart() { + _htmlOut = ` + ${_htmlOut} + `; + + $('#agamaConfigBlock').html(_htmlOut); +} + +function hideToastImmediate() { + $('#toast-container').addClass('hide'); +} + +function hideToast() { + setTimeout(function() { + $('#toast-container').addClass('hide'); + }, 5000); +} + +function showToast(type, message) { + $('#toast-container .toast').removeClass('toast-success').removeClass('toast-error'); + $('#toast-container .toast').addClass(`toast-${type}`); + $('#toast-container .toast-message').html(message); + $('#toast-container').removeClass('hide'); + hideToast(); +} + +function setDefaultAppSettings() { + const remote = require('electron').remote; + + remote.getCurrentWindow().setDefaultAppSettings(); + remote.getCurrentWindow().appConfig = remote.getCurrentWindow().defaultAppSettings; + initSettingsForm(); + showToast('success', 'App settings are reset to default'); +} + +function handleSaveSettings() { + if (_configCopy.dataDir && + _configCopy.dataDir.length) { const remote = require('electron').remote; - let appConf = remote.getCurrentWindow().appConfig; - appConf.iguanaLessMode = false; - - // run iguana-less mode with no daemons startup - if (appConf && appConf.iguanaLessMode) { - // do something - } else { // run normal mode with 2 iguana instances started prior loading GUI - if (appConf && !appConf.manualIguanaStart) { - StartIguana(); + + remote.getCurrentWindow().testLocation(_configCopy.dataDir) + .then(function(res) { + $('#debugOut').html(res + ' | ' + _configCopy.dataDir); + if (res === -1) { + showToast('error', 'Komodo datadir path is invalid'); + } else if (res === false) { + showToast('error', 'Komodo datadir path is not a directory'); + } else { + // save settings + remote.getCurrentWindow().updateAppSettings(_configCopy); + remote.getCurrentWindow().appConfig = _configCopy; + showToast('success', 'Settings saved'); } + }); + } else { + // save settings + const remote = require('electron').remote; - var portcheck; + remote.getCurrentWindow().updateAppSettings(_configCopy); + remote.getCurrentWindow().appConfig = _configCopy; + showToast('success', 'Settings saved'); + } +} - function startcheck() { - portcheck = setInterval(function() { - Iguana_activehandle(appConf).then(function(result){ - console.log(result); +function handleInput(key) { + const _value = $(`#${key}`).val(); + _configCopy[key] = _value; +} - if (result !== 'error') { - stopcheck(); +function settingsToggle(key) { + const _value = $(`#${key} .cb`).prop('checked'); + _configCopy[key] = _value; +} - if (appConf && appConf.useBasiliskInstance) { - StartIguana_Cache(); - } +function closeSettingsWindow() { + const remote = require('electron').remote; + const window = remote.getCurrentWindow(); - $('#loading_status_text').text('Connecting to Basilisk Network...'); - EDEX_DEXgetinfoAll(appConf.skipBasiliskNetworkCheck, appConf.minNotaries, appConf); + window.destroyAppSettingsWindow(); +} + +function reloadSettingsWindow() { + const remote = require('electron').remote; + const window = remote.getCurrentWindow(); + + window.reloadSettingsWindow(); +} + +function openSettingsWindow() { + const remote = require('electron').remote; + const window = remote.getCurrentWindow(); + + window.createAppSettingsWindow(); +} + +function closeMainWindow() { + const remote = require('electron').remote; + const window = remote.getCurrentWindow(); + + window.createWindow('open'); + window.hide(); +} + +function quitApp() { + const remote = require('electron').remote; + const window = remote.getCurrentWindow(); + + window.forseCloseApp(); +} + +function normalStart() { + const remote = require('electron').remote; + let appConf = remote.getCurrentWindow().appConfig; + appConf.iguanaLessMode = false; + + // run iguana-less mode with no daemons startup + if (appConf && + appConf.iguanaLessMode) { + // do something + } else { // run normal mode with 2 iguana instances started prior loading GUI + if (appConf && + !appConf.manualIguanaStart) { + StartIguana(); + } + + var portcheck; + + function startcheck() { + portcheck = setInterval(function() { + Iguana_activehandle(appConf).then(function(result){ + console.log(result); + + if (result !== 'error') { + stopcheck(); + + if (appConf && appConf.useBasiliskInstance) { + StartIguana_Cache(); } - }) - }, 2000); - } - function stopcheck() { - clearInterval(portcheck); - } + $('#loading_status_text').text('Connecting to Basilisk Network...'); + EDEX_DEXgetinfoAll(appConf.skipBasiliskNetworkCheck, appConf.minNotaries, appConf); + } + }) + }, 2000); + } - startcheck(); + function stopcheck() { + clearInterval(portcheck); } + + startcheck(); } +} function IguanaAJAX(url, ajax_data, timeout) { return $.ajax({ diff --git a/react/src/components/addcoin/addcoinOptionsACFiat.js b/react/src/components/addcoin/addcoinOptionsACFiat.js index c5b8ace..6268c70 100644 --- a/react/src/components/addcoin/addcoinOptionsACFiat.js +++ b/react/src/components/addcoin/addcoinOptionsACFiat.js @@ -2,41 +2,52 @@ import React from 'react'; import { translate } from '../../translate/translate'; class AddCoinOptionsACFiat extends React.Component { + const _fiat = [ + 'aud', + 'brl', + 'gbp', + 'bgn', + 'cad', + 'hrk', + 'czk', + 'cny', + 'dkk', + 'eur', + 'hkd', + 'huf', + 'inr', + 'idr', + 'ils', + 'jpy', + 'krw', + 'myr', + 'mxn', + 'nzd', + 'nok', + 'php', + 'pln', + 'ron', + 'rub', + 'sgd', + 'zar', + 'sek', + 'chf', + 'thb', + 'try', + 'usd' + ]; + let _items = []; + + for (let i = 0; i < _fiat.length; i++) { + _items.push( + + ); + } + render() { return ( - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + { _items } ); } diff --git a/react/src/components/addcoin/addcoinOptionsCrypto.js b/react/src/components/addcoin/addcoinOptionsCrypto.js index c192407..c72aa68 100644 --- a/react/src/components/addcoin/addcoinOptionsCrypto.js +++ b/react/src/components/addcoin/addcoinOptionsCrypto.js @@ -12,50 +12,61 @@ class AddCoinOptionsCrypto extends React.Component { } render() { - const isWindows = this.props.appSettings && this.props.appSettings.appInfo && this.props.appSettings.appInfo.sysInfo && this.props.appSettings.appInfo.sysInfo.platform === 'win32'; + // const isWindows = this.props.appSettings && this.props.appSettings.appInfo && this.props.appSettings.appInfo.sysInfo && this.props.appSettings.appInfo.sysInfo.platform === 'win32'; + let appConfig; + + try { + appConfig = window.require('electron').remote.getCurrentWindow().appConfig; + } catch (e) {} - // - // - // return ( + + className={ this.state.nativeOnly || !appConfig.experimentalFeatures ? 'hide' : '' }>BitcoinDark (BTCD) + className={ this.state.nativeOnly || !appConfig.experimentalFeatures ? 'hide' : '' }>Bitcoin (BTC) + className={ this.state.nativeOnly || !appConfig.experimentalFeatures ? 'hide' : '' }>Bitmark (BTM) + className={ this.state.nativeOnly || !appConfig.experimentalFeatures ? 'hide' : '' }>Carboncoin (CARB) + className={ this.state.nativeOnly || !appConfig.experimentalFeatures ? 'hide' : '' }>Digibyte (DGB) + className={ this.state.nativeOnly || !appConfig.experimentalFeatures ? 'hide' : '' }>Dogecoin (DOGE) + className={ this.state.nativeOnly || !appConfig.experimentalFeatures ? 'hide' : '' }>Franko (FRK) + className={ this.state.nativeOnly || !appConfig.experimentalFeatures ? 'hide' : '' }>Gamecredits (GAME) + + className={ this.state.nativeOnly || !appConfig.experimentalFeatures ? 'hide' : '' }>Litecoin (LTC) + + className={ this.state.nativeOnly || !appConfig.experimentalFeatures ? 'hide' : '' }>Unobtanium (UNO) + className={ this.state.nativeOnly || !appConfig.experimentalFeatures ? 'hide' : '' }>Zcash (ZEC) + className={ this.state.nativeOnly || !appConfig.experimentalFeatures ? 'hide' : '' }>Zetacoin (ZET) ); } @@ -65,7 +76,6 @@ const mapStateToProps = (state) => { return { appSettings: state.appSettings, }; - }; export default connect(mapStateToProps)(AddCoinOptionsCrypto); diff --git a/react/src/components/addcoin/coin-selectors.render.js b/react/src/components/addcoin/coin-selectors.render.js index 7f164f8..60bc6f9 100644 --- a/react/src/components/addcoin/coin-selectors.render.js +++ b/react/src/components/addcoin/coin-selectors.render.js @@ -6,6 +6,13 @@ import AddCoinOptionsACFiat from '../addcoin/addcoinOptionsACFiat'; const CoinSelectorsRender = function(item, coin, i) { const isWindows = this.props.Settings && this.props.Settings.appInfo && this.props.Settings.appInfo.sysInfo && this.props.Settings.appInfo.sysInfo.platform === 'win32'; + let appConfig; + + try { + appConfig = window.require('electron').remote.getCurrentWindow().appConfig; + } catch (e) {} + + const hideFullModeBtn = item && item.selectedCoin && item.selectedCoin.indexOf('|full') === -1 || !appConfig.experimentalFeatures ? true : false; return (
-
+
this.updateInputSettings(event, key, _key) } /> @@ -856,7 +855,7 @@ const mapStateToProps = (state) => { ActiveCoin: { coin: state.ActiveCoin.coin, }, - Settings: state.Settings, + Settings: state.Settings, }; }; diff --git a/react/src/components/dashboard/walletsNativeSend/walletsNativeSend.js b/react/src/components/dashboard/walletsNativeSend/walletsNativeSend.js index e5daafb..9a9225f 100644 --- a/react/src/components/dashboard/walletsNativeSend/walletsNativeSend.js +++ b/react/src/components/dashboard/walletsNativeSend/walletsNativeSend.js @@ -47,6 +47,9 @@ class WalletsNativeSend extends React.Component { this.toggleSubstractFee = this.toggleSubstractFee.bind(this); } + // TODO: 1) t -> z amount validation + // 2) z -> z amount validation + WalletsNativeSendFormRender() { return _WalletsNativeSendFormRender.call(this); } @@ -366,8 +369,9 @@ class WalletsNativeSend extends React.Component { checkTotalBalance() { let _balance = 0; + if (this.props.ActiveCoin.balance && - this.props.ActiveCoin.balance.total) { + this.props.ActiveCoin.balance.total) { _balance = this.props.ActiveCoin.balance.total; }