diff --git a/react/src/assets/images/cryptologo/AUD.png b/react/src/assets/images/cryptologo/aud.png similarity index 100% rename from react/src/assets/images/cryptologo/AUD.png rename to react/src/assets/images/cryptologo/aud.png diff --git a/react/src/assets/images/cryptologo/BET.png b/react/src/assets/images/cryptologo/bet.png similarity index 100% rename from react/src/assets/images/cryptologo/BET.png rename to react/src/assets/images/cryptologo/bet.png diff --git a/react/src/assets/images/cryptologo/BGN.png b/react/src/assets/images/cryptologo/bgn.png similarity index 100% rename from react/src/assets/images/cryptologo/BGN.png rename to react/src/assets/images/cryptologo/bgn.png diff --git a/react/src/assets/images/cryptologo/BOTS.png b/react/src/assets/images/cryptologo/bots.png similarity index 100% rename from react/src/assets/images/cryptologo/BOTS.png rename to react/src/assets/images/cryptologo/bots.png diff --git a/react/src/assets/images/cryptologo/BRL.png b/react/src/assets/images/cryptologo/brl.png similarity index 100% rename from react/src/assets/images/cryptologo/BRL.png rename to react/src/assets/images/cryptologo/brl.png diff --git a/react/src/assets/images/cryptologo/CAD.png b/react/src/assets/images/cryptologo/cad.png similarity index 100% rename from react/src/assets/images/cryptologo/CAD.png rename to react/src/assets/images/cryptologo/cad.png diff --git a/react/src/assets/images/cryptologo/CEAL.png b/react/src/assets/images/cryptologo/ceal.png similarity index 100% rename from react/src/assets/images/cryptologo/CEAL.png rename to react/src/assets/images/cryptologo/ceal.png diff --git a/react/src/assets/images/cryptologo/CHF.png b/react/src/assets/images/cryptologo/chf.png similarity index 100% rename from react/src/assets/images/cryptologo/CHF.png rename to react/src/assets/images/cryptologo/chf.png diff --git a/react/src/assets/images/cryptologo/CNY.png b/react/src/assets/images/cryptologo/cny.png similarity index 100% rename from react/src/assets/images/cryptologo/CNY.png rename to react/src/assets/images/cryptologo/cny.png diff --git a/react/src/assets/images/cryptologo/CRYPTO.png b/react/src/assets/images/cryptologo/crypto.png similarity index 100% rename from react/src/assets/images/cryptologo/CRYPTO.png rename to react/src/assets/images/cryptologo/crypto.png diff --git a/react/src/assets/images/cryptologo/CZK.png b/react/src/assets/images/cryptologo/czk.png similarity index 100% rename from react/src/assets/images/cryptologo/CZK.png rename to react/src/assets/images/cryptologo/czk.png diff --git a/react/src/assets/images/cryptologo/DKK.png b/react/src/assets/images/cryptologo/dkk.png similarity index 100% rename from react/src/assets/images/cryptologo/DKK.png rename to react/src/assets/images/cryptologo/dkk.png diff --git a/react/src/assets/images/cryptologo/EUR.png b/react/src/assets/images/cryptologo/eur.png similarity index 100% rename from react/src/assets/images/cryptologo/EUR.png rename to react/src/assets/images/cryptologo/eur.png diff --git a/react/src/assets/images/cryptologo/GAME.png b/react/src/assets/images/cryptologo/game.png similarity index 100% rename from react/src/assets/images/cryptologo/GAME.png rename to react/src/assets/images/cryptologo/game.png diff --git a/react/src/assets/images/cryptologo/GBP.png b/react/src/assets/images/cryptologo/gbp.png similarity index 100% rename from react/src/assets/images/cryptologo/GBP.png rename to react/src/assets/images/cryptologo/gbp.png diff --git a/react/src/assets/images/cryptologo/HKD.png b/react/src/assets/images/cryptologo/hkd.png similarity index 100% rename from react/src/assets/images/cryptologo/HKD.png rename to react/src/assets/images/cryptologo/hkd.png diff --git a/react/src/assets/images/cryptologo/HODL.png b/react/src/assets/images/cryptologo/hodl.png similarity index 100% rename from react/src/assets/images/cryptologo/HODL.png rename to react/src/assets/images/cryptologo/hodl.png diff --git a/react/src/assets/images/cryptologo/HRK.png b/react/src/assets/images/cryptologo/hrk.png similarity index 100% rename from react/src/assets/images/cryptologo/HRK.png rename to react/src/assets/images/cryptologo/hrk.png diff --git a/react/src/assets/images/cryptologo/HUF.png b/react/src/assets/images/cryptologo/huf.png similarity index 100% rename from react/src/assets/images/cryptologo/HUF.png rename to react/src/assets/images/cryptologo/huf.png diff --git a/react/src/assets/images/cryptologo/IDR.png b/react/src/assets/images/cryptologo/idr.png similarity index 100% rename from react/src/assets/images/cryptologo/IDR.png rename to react/src/assets/images/cryptologo/idr.png diff --git a/react/src/assets/images/cryptologo/ILS.png b/react/src/assets/images/cryptologo/ils.png similarity index 100% rename from react/src/assets/images/cryptologo/ILS.png rename to react/src/assets/images/cryptologo/ils.png diff --git a/react/src/assets/images/cryptologo/INR.png b/react/src/assets/images/cryptologo/inr.png similarity index 100% rename from react/src/assets/images/cryptologo/INR.png rename to react/src/assets/images/cryptologo/inr.png diff --git a/react/src/assets/images/cryptologo/JPY.png b/react/src/assets/images/cryptologo/jpy.png similarity index 100% rename from react/src/assets/images/cryptologo/JPY.png rename to react/src/assets/images/cryptologo/jpy.png diff --git a/react/src/assets/images/cryptologo/JUMBLR.png b/react/src/assets/images/cryptologo/jumblr.png similarity index 100% rename from react/src/assets/images/cryptologo/JUMBLR.png rename to react/src/assets/images/cryptologo/jumblr.png diff --git a/react/src/assets/images/cryptologo/komodo.png b/react/src/assets/images/cryptologo/kmd.png similarity index 100% rename from react/src/assets/images/cryptologo/komodo.png rename to react/src/assets/images/cryptologo/kmd.png diff --git a/react/src/assets/images/cryptologo/KRW.png b/react/src/assets/images/cryptologo/krw.png similarity index 100% rename from react/src/assets/images/cryptologo/KRW.png rename to react/src/assets/images/cryptologo/krw.png diff --git a/react/src/assets/images/cryptologo/KV.png b/react/src/assets/images/cryptologo/kv.png similarity index 100% rename from react/src/assets/images/cryptologo/KV.png rename to react/src/assets/images/cryptologo/kv.png diff --git a/react/src/assets/images/cryptologo/MESH.png b/react/src/assets/images/cryptologo/mesh.png similarity index 100% rename from react/src/assets/images/cryptologo/MESH.png rename to react/src/assets/images/cryptologo/mesh.png diff --git a/react/src/assets/images/cryptologo/MGW.png b/react/src/assets/images/cryptologo/mgw.png similarity index 100% rename from react/src/assets/images/cryptologo/MGW.png rename to react/src/assets/images/cryptologo/mgw.png diff --git a/react/src/assets/images/cryptologo/MVP.png b/react/src/assets/images/cryptologo/mvp.png similarity index 100% rename from react/src/assets/images/cryptologo/MVP.png rename to react/src/assets/images/cryptologo/mvp.png diff --git a/react/src/assets/images/cryptologo/MXN.png b/react/src/assets/images/cryptologo/mxn.png similarity index 100% rename from react/src/assets/images/cryptologo/MXN.png rename to react/src/assets/images/cryptologo/mxn.png diff --git a/react/src/assets/images/cryptologo/MYR.png b/react/src/assets/images/cryptologo/myr.png similarity index 100% rename from react/src/assets/images/cryptologo/MYR.png rename to react/src/assets/images/cryptologo/myr.png diff --git a/react/src/assets/images/cryptologo/NOK.png b/react/src/assets/images/cryptologo/nok.png similarity index 100% rename from react/src/assets/images/cryptologo/NOK.png rename to react/src/assets/images/cryptologo/nok.png diff --git a/react/src/assets/images/cryptologo/NZD.png b/react/src/assets/images/cryptologo/nzd.png similarity index 100% rename from react/src/assets/images/cryptologo/NZD.png rename to react/src/assets/images/cryptologo/nzd.png diff --git a/react/src/assets/images/cryptologo/PANGEA.png b/react/src/assets/images/cryptologo/pangea.png similarity index 100% rename from react/src/assets/images/cryptologo/PANGEA.png rename to react/src/assets/images/cryptologo/pangea.png diff --git a/react/src/assets/images/cryptologo/PHP.png b/react/src/assets/images/cryptologo/php.png similarity index 100% rename from react/src/assets/images/cryptologo/PHP.png rename to react/src/assets/images/cryptologo/php.png diff --git a/react/src/assets/images/cryptologo/PLN.png b/react/src/assets/images/cryptologo/pln.png similarity index 100% rename from react/src/assets/images/cryptologo/PLN.png rename to react/src/assets/images/cryptologo/pln.png diff --git a/react/src/assets/images/cryptologo/REVS.png b/react/src/assets/images/cryptologo/revs.png similarity index 100% rename from react/src/assets/images/cryptologo/REVS.png rename to react/src/assets/images/cryptologo/revs.png diff --git a/react/src/assets/images/cryptologo/RON.png b/react/src/assets/images/cryptologo/ron.png similarity index 100% rename from react/src/assets/images/cryptologo/RON.png rename to react/src/assets/images/cryptologo/ron.png diff --git a/react/src/assets/images/cryptologo/RUB.png b/react/src/assets/images/cryptologo/rub.png similarity index 100% rename from react/src/assets/images/cryptologo/RUB.png rename to react/src/assets/images/cryptologo/rub.png diff --git a/react/src/assets/images/cryptologo/SEK.png b/react/src/assets/images/cryptologo/sek.png similarity index 100% rename from react/src/assets/images/cryptologo/SEK.png rename to react/src/assets/images/cryptologo/sek.png diff --git a/react/src/assets/images/cryptologo/SGD.png b/react/src/assets/images/cryptologo/sgd.png similarity index 100% rename from react/src/assets/images/cryptologo/SGD.png rename to react/src/assets/images/cryptologo/sgd.png diff --git a/react/src/assets/images/cryptologo/SHARK.png b/react/src/assets/images/cryptologo/shark.png similarity index 100% rename from react/src/assets/images/cryptologo/SHARK.png rename to react/src/assets/images/cryptologo/shark.png diff --git a/react/src/assets/images/cryptologo/SUPERNET.png b/react/src/assets/images/cryptologo/supernet.png similarity index 100% rename from react/src/assets/images/cryptologo/SUPERNET.png rename to react/src/assets/images/cryptologo/supernet.png diff --git a/react/src/assets/images/cryptologo/THB.png b/react/src/assets/images/cryptologo/thb.png similarity index 100% rename from react/src/assets/images/cryptologo/THB.png rename to react/src/assets/images/cryptologo/thb.png diff --git a/react/src/assets/images/cryptologo/TRY.png b/react/src/assets/images/cryptologo/try.png similarity index 100% rename from react/src/assets/images/cryptologo/TRY.png rename to react/src/assets/images/cryptologo/try.png diff --git a/react/src/assets/images/cryptologo/WLC.png b/react/src/assets/images/cryptologo/wlc.png similarity index 100% rename from react/src/assets/images/cryptologo/WLC.png rename to react/src/assets/images/cryptologo/wlc.png diff --git a/react/src/assets/images/cryptologo/ZAR.png b/react/src/assets/images/cryptologo/zar.png similarity index 100% rename from react/src/assets/images/cryptologo/ZAR.png rename to react/src/assets/images/cryptologo/zar.png diff --git a/react/src/components/dashboard/coinTile/coinTileItem.render.js b/react/src/components/dashboard/coinTile/coinTileItem.render.js index 832dd4a..b669c6c 100644 --- a/react/src/components/dashboard/coinTile/coinTileItem.render.js +++ b/react/src/components/dashboard/coinTile/coinTileItem.render.js @@ -12,7 +12,7 @@ const CoinTileItemRender = function() { { { item.modecode } diff --git a/react/src/components/dashboard/walletsNative/walletsNative.js b/react/src/components/dashboard/walletsNative/walletsNative.js index 764a55e..793ff9d 100644 --- a/react/src/components/dashboard/walletsNative/walletsNative.js +++ b/react/src/components/dashboard/walletsNative/walletsNative.js @@ -2,6 +2,7 @@ import React from 'react'; import WalletsNativeRender from './walletsNative.render'; import { translate } from '../../../translate/translate'; import { triggerToaster } from '../../../actions/actionCreators'; +import { getCoinTitle } from '../../../util/coinHelper'; import Config from '../../../config'; import Store from '../../../store'; @@ -13,6 +14,10 @@ const socket = io.connect(`http://127.0.0.1:${Config.agamaPort}`); class WalletsNative extends React.Component { constructor(props) { super(props); + this.state = { + nativeOnly: Config.iguanaLessMode, + }; + this.getCoinStyle = this.getCoinStyle.bind(this); socket.on('service', msg => this.updateSocketsData(msg)); } @@ -35,11 +40,21 @@ class WalletsNative extends React.Component { } } - defaultBG() { - if (this.props.ActiveCoin.coin === 'REVS') { - return 'supernet'; - } else { - return this.props.ActiveCoin.coin.toLowerCase(); + getCoinStyle(type) { + if (type === 'transparent') { + if (getCoinTitle(this.props.ActiveCoin.coin).transparentBG && getCoinTitle().logo) { + return { 'backgroundImage': `url("assets/images/bg/${getCoinTitle().logo.toLowerCase()}_transparent_header_bg.png")` }; + } + } else if (type === 'title') { + let _iconPath; + + if (getCoinTitle(this.props.ActiveCoin.coin).titleBG) { + _iconPath = `assets/images/native/${getCoinTitle(this.props.ActiveCoin.coin).logo.toLowerCase()}_header_title_logo.png`; + } else if (!getCoinTitle(this.props.ActiveCoin.coin).titleBG && getCoinTitle(this.props.ActiveCoin.coin).logo) { + _iconPath = `assets/images/cryptologo/${getCoinTitle(this.props.ActiveCoin.coin).logo.toLowerCase()}.png`; + } + + return _iconPath; } } diff --git a/react/src/components/dashboard/walletsNative/walletsNative.render.js b/react/src/components/dashboard/walletsNative/walletsNative.render.js index 15d5be5..f50e95b 100644 --- a/react/src/components/dashboard/walletsNative/walletsNative.render.js +++ b/react/src/components/dashboard/walletsNative/walletsNative.render.js @@ -13,12 +13,14 @@ const WalletsNativeRender = function() {
-
    + style={ this.getCoinStyle('transparent') }> +
    1. - + { this.getCoinStyle('title') && + + } { this.props.ActiveCoin.coin } diff --git a/react/src/components/dashboard/walletsNav/walletsNav.render.js b/react/src/components/dashboard/walletsNav/walletsNav.render.js index 67d43a7..7c79dad 100644 --- a/react/src/components/dashboard/walletsNav/walletsNav.render.js +++ b/react/src/components/dashboard/walletsNav/walletsNav.render.js @@ -24,9 +24,9 @@ export const WalletsNavWithWalletRender = function() { return (
      + style={{ marginBottom: this.props.ActiveCoin.mode === 'basilisk' ? '30px' : (this.state.nativeOnly ? '30' : '0') }}>
        { translate('INDEX.MY') } { this.props && this.props.ActiveCoin ? this.props.ActiveCoin.coin : '-' } { translate('INDEX.ADDRESS') }: { this.props && this.props.Dashboard && this.props.Dashboard.activeHandle ? this.props.Dashboard.activeHandle[this.props.ActiveCoin.coin] : '-' } diff --git a/react/src/components/overrides.scss b/react/src/components/overrides.scss index a3cb152..94eff32 100644 --- a/react/src/components/overrides.scss +++ b/react/src/components/overrides.scss @@ -684,4 +684,58 @@ select{ } } } +} + +.breadcrumb { + padding: 8px 30px 0; + position: relative; + top: -10px; +} + +.header-easydex-section { + img { + max-width: 60px; + } +} + +.coin-logo-wide { + padding: 8px 30px 0; + position: relative; + top: 0; + + .header-easydex-section { + img { + width: inherit; + max-width: inherit; + position: relative; + top: -5px; + } + } +} + +.native-coin-logo { + float: left; + position: absolute; + top: -105px; + z-index: 100; + + .header-easydex-section { + img { + width: 60px; + } + } +} + +.coin-logo-wide { + &.native-coin-logo { + top: -93px; + + .header-easydex-section img { + width: inherit; + } + } +} + +.page-header--native { + height: 75px; } \ No newline at end of file diff --git a/react/src/util/coinHelper.js b/react/src/util/coinHelper.js index 216795f..9ee30c1 100644 --- a/react/src/util/coinHelper.js +++ b/react/src/util/coinHelper.js @@ -1,6 +1,9 @@ export function getCoinTitle(coin) { - let coinlogo, - coinname; + let coinlogo; + let coinname; + let transparentBG = false; + let titleBG = false; + let hideTitle = false; switch (coin) { case 'BTC': @@ -56,7 +59,10 @@ export function getCoinTitle(coin) { coinname = 'Zetacoin'; break; case 'KMD': - coinlogo = 'komodo'; + hideTitle = true; + titleBG = true; + transparentBG = true; + coinlogo = 'kmd'; coinname = 'Komodo'; break; case 'BTM': @@ -80,6 +86,7 @@ export function getCoinTitle(coin) { coinname = 'GameCredits'; break; case 'SUPERNET': + titleBG = true; coinlogo = 'SUPERNET'; coinname = 'SUPERNET'; break; @@ -88,14 +95,20 @@ export function getCoinTitle(coin) { coinname = 'REVS'; break; case 'WLC': + titleBG = true; + transparentBG = true; coinlogo = 'WLC'; coinname = 'WIRELESS'; break; case 'PANGEA': + titleBG = true; coinlogo = 'PANGEA'; coinname = 'PANGEA'; break; case 'JUMBLR': + titleBG = true; + transparentBG = true; + hideTitle = true; coinlogo = 'JUMBLR'; coinname = 'JUMBLR'; break; @@ -124,6 +137,9 @@ export function getCoinTitle(coin) { coinname = 'MultiGateway'; break; case 'MVP': + hideTitle = true; + titleBG = true; + transparentBG = true; coinlogo = 'MVP'; coinname = 'MVP Lineup'; break; @@ -132,138 +148,197 @@ export function getCoinTitle(coin) { coinname = 'KV'; break; case 'CEAL': + titleBG = true; + transparentBG = true; coinlogo = 'CEAL'; coinname = 'CEAL NET'; break; + case 'COQUI': + coinlogo = 'COQUI'; + coinname = 'COQUI'; + break; case 'MESH': + hideTitle = true; + titleBG = true; + transparentBG = true; coinlogo = 'MESH'; coinname = 'SpaceMesh'; break; case 'USD': + titleBG = true; + transparentBG = true; coinlogo = 'usd'; coinname = 'US Dollar'; break; case 'RON': + titleBG = true; + transparentBG = true; coinlogo = 'RON'; coinname = 'Romanian Leu'; break; case 'EUR': + titleBG = true; + transparentBG = true; coinlogo = 'EUR'; coinname = 'Euro'; break; case 'JPY': + titleBG = true; + transparentBG = true; coinlogo = 'JPY'; coinname = 'Japanese Yen'; break; case 'GBP': + titleBG = true; + transparentBG = true; coinlogo = 'GBP'; coinname = 'British Pound'; break; case 'AUD': + titleBG = true; + transparentBG = true; coinlogo = 'AUD'; coinname = 'Australian Dollar'; break; case 'CAD': + titleBG = true; + transparentBG = true; coinlogo = 'CAD'; coinname = 'Canadian Dollar'; break; case 'CHF': + titleBG = true; + transparentBG = true; coinlogo = 'CHF'; coinname = 'Swiss Franc'; break; case 'NZD': + titleBG = true; + transparentBG = true; coinlogo = 'NZD'; coinname = 'New Zealand Dollar'; break; case 'CNY': + titleBG = true; + transparentBG = true; coinlogo = 'CNY'; coinname = 'Chinese Yuan'; break; case 'RUB': + titleBG = true; + transparentBG = true; coinlogo = 'RUB'; coinname = 'Russian Ruble'; break; case 'MXN': + titleBG = true; + transparentBG = true; coinlogo = 'MXN'; coinname = 'Mexican peso'; break; case 'BRL': + titleBG = true; + transparentBG = true; coinlogo = 'BRL'; coinname = 'Brazilian Real'; break; case 'INR': + titleBG = true; + transparentBG = true; coinlogo = 'INR'; coinname = 'Indian Rupee'; break; case 'HKD': + titleBG = true; + transparentBG = true; coinlogo = 'HKD'; coinname = 'Hong Kong Dollar'; break; case 'TRY': + titleBG = true; + transparentBG = true; coinlogo = 'TRY'; coinname = 'Turkish Lira'; break; case 'ZAR': + titleBG = true; + transparentBG = true; coinlogo = 'ZAR'; coinname = 'South African Rand'; break; case 'PLN': + titleBG = true; + transparentBG = true; coinlogo = 'PLN'; coinname = 'Polish Zloty'; break; case 'NOK': + titleBG = true; coinlogo = 'NOK'; coinname = 'Norwegian Krone'; break; case 'SEK': + titleBG = true; coinlogo = 'SEK'; coinname = 'Swedish Krona'; break; case 'DKK': + titleBG = true; coinlogo = 'DKK'; coinname = 'Danish Krone'; break; case 'CZK': + titleBG = true; coinlogo = 'CZK'; coinname = 'Czech Koruna'; break; case 'HUF': + titleBG = true; coinlogo = 'HUF'; coinname = 'Hungarian Forint'; break; case 'ILS': + titleBG = true; coinlogo = 'ILS'; coinname = 'Israeli Shekel'; break; case 'KRW': + titleBG = true; coinlogo = 'KRW'; coinname = 'Korean Won'; break; case 'MYR': + titleBG = true; coinlogo = 'MYR'; coinname = 'Malaysian Ringgit'; break; case 'PHP': + titleBG = true; coinlogo = 'PHP'; coinname = 'Philippine Peso'; break; case 'SGD': + titleBG = true; coinlogo = 'SGD'; coinname = 'Singapore Dollar'; break; case 'THB': + titleBG = true; coinlogo = 'THB'; coinname = 'Thai Baht'; break; case 'BGN': + titleBG = true; coinlogo = 'BGN'; coinname = 'Bulgarian Lev'; break; case 'IDR': + titleBG = true; coinlogo = 'IDR'; coinname = 'Indonesian Rupiah'; break; case 'HRK': + titleBG = true; coinlogo = 'HRK'; coinname = 'Croatian Kuna'; break; @@ -271,14 +346,16 @@ export function getCoinTitle(coin) { return { 'logo': coinlogo, - 'name': coinname + 'name': coinname, + titleBG, + transparentBG, }; } export function getModeInfo(mode) { - let modecode, - modetip, - modecolor; + let modecode; + let modetip; + let modecolor; switch (mode) { case 'native':