lukechilds
/
EasyDEX-GUI
mirror of https://github.com/lukechilds/EasyDEX-GUI.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

native section toggle

all-modes
pbca26 8 years ago
parent
20031e5e6e
commit
bec45a489a
9 changed files with 57 additions and 51 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      react/src/actions/actionCreators.js
  2. 2
      react/src/components/dashboard/dashboard.js
  3. 6
      react/src/components/dashboard/walletsNative.js
  4. 82
      react/src/components/dashboard/walletsNativeBalance.js
  5. 2
      react/src/components/dashboard/walletsNativeInfo.js
  6. 2
      react/src/components/dashboard/walletsNativeReceive.js
  7. 2
      react/src/components/dashboard/walletsNativeSend.js
  8. 4
      react/src/reducers/activeCoin.js
  9. 3
      react/src/styles/index.scss

5
react/src/actions/actionCreators.js
View File

@ -47,10 +47,13 @@ export function toggleDashboardActiveSection(name) {
} }
} }
export function toggleDashboardTxInfoModal(display) { export function toggleDashboardTxInfoModal(display, txIndex) {
console.log('toggleTxInfoModal', txIndex);
return { return {
type: DASHBOARD_ACTIVE_TXINFO_MODAL, type: DASHBOARD_ACTIVE_TXINFO_MODAL,
showTransactionInfo: display, showTransactionInfo: display,
showTransactionInfoTxIndex: txIndex,
} }
} }

2
react/src/components/dashboard/dashboard.js
View File

@ -16,6 +16,7 @@ import About from './about';
import WalletsBasiliskRefresh from './walletsBasiliskRefresh'; import WalletsBasiliskRefresh from './walletsBasiliskRefresh';
import WalletsBasiliskConnection from './walletsBasiliskConnection'; import WalletsBasiliskConnection from './walletsBasiliskConnection';
import WalletsNative from './walletsNative'; import WalletsNative from './walletsNative';
import WalletsNativeTxInfo from './walletsNativeTxInfo';
class Dashboard extends React.Component { class Dashboard extends React.Component {
constructor(props) { constructor(props) {
@ -42,6 +43,7 @@ class Dashboard extends React.Component {
<WalletsBasiliskRefresh {...this.props} /> <WalletsBasiliskRefresh {...this.props} />
<WalletsBasiliskConnection {...this.props} /> <WalletsBasiliskConnection {...this.props} />
<WalletsNative {...this.props} /> <WalletsNative {...this.props} />
<WalletsNativeTxInfo {...this.props} />
</div> </div>
<div className={this.props.Dashboard.activeSection === 'edex' ? 'show' : 'hide'}> <div className={this.props.Dashboard.activeSection === 'edex' ? 'show' : 'hide'}>
<EDEX {...this.props} /> <EDEX {...this.props} />

6
react/src/components/dashboard/walletsNative.js
View File

@ -7,17 +7,12 @@ import WalletsNativeReceive from './walletsNativeReceive';
import WalletsNativeSend from './walletsNativeSend'; import WalletsNativeSend from './walletsNativeSend';
import WalletsNativeSyncProgress from './walletsNativeSyncProgress'; import WalletsNativeSyncProgress from './walletsNativeSyncProgress';
import WalletsNativeTxHistory from './walletsNativeTxHistory'; import WalletsNativeTxHistory from './walletsNativeTxHistory';
import WalletsNativeTxInfo from './walletsNativeTxInfo';
class WalletsNative extends React.Component { class WalletsNative extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props);
} }
/*$('.header-easydex-section')
.html('<img src="assets/images/native/' + imgSrcName + '_header_title_logo.png"> <span style="font-size: 35px; vertical-align: middle">' + _coin + '</span>');
$('#easydex-header-div').css('background-image', 'url("assets/images/bg/' + imgBgName + '_transparent_header_bg.png")');*/
render() { render() {
if (this.props && this.props.ActiveCoin && this.props.ActiveCoin.mode === 'native') { if (this.props && this.props.ActiveCoin && this.props.ActiveCoin.mode === 'native') {
return ( return (
@ -42,7 +37,6 @@ class WalletsNative extends React.Component {
<WalletsNativeInfo {...this.props} /> <WalletsNativeInfo {...this.props} />
</div> </div>
</div> </div>
<WalletsNativeTxInfo {...this.props} />
</div> </div>
</div> </div>
); );

82
react/src/components/dashboard/walletsNativeBalance.js
View File

@ -3,69 +3,73 @@ import { translate } from '../../translate/translate';
class WalletsNativeBalance extends React.Component { class WalletsNativeBalance extends React.Component {
render() { render() {
return ( if (this.props && this.props.ActiveCoin.nativeActiveSection === 'default') {
<div className="col-xs-12"> return (
<div className="col-lg-3 col-xs-12" data-extcoin="COIN" id="kmd_widget_get_total_balance_t"> <div className="col-xs-12">
<div className="widget widget-shadow" id="widgetLineareaOne"> <div className="col-lg-3 col-xs-12" data-extcoin="COIN" id="kmd_widget_get_total_balance_t">
<div className="widget-content white bg-yellow-800"> <div className="widget widget-shadow" id="widgetLineareaOne">
<div className="padding-20 padding-top-10"> <div className="widget-content white bg-yellow-800">
<div className="clearfix"> <div className="padding-20 padding-top-10">
<div className="pull-left padding-vertical-10"> <div className="clearfix">
<i className="icon fa-eye font-size-24 vertical-align-bottom margin-right-5"></i>{translate('INDEX.TRANSPARENT_BALANCE')} <div className="pull-left padding-vertical-10">
<i className="icon fa-eye font-size-24 vertical-align-bottom margin-right-5"></i>{translate('INDEX.TRANSPARENT_BALANCE')}
</div>
<span className="pull-right padding-top-10" data-extcoin="COIN" id="kmd_transparent_balance" style={{fontSize: '22px'}}>{this.props.ActiveCoin.balance.transparent ? this.props.ActiveCoin.balance.transparent : '-'}</span>
</div> </div>
<span className="pull-right padding-top-10" data-extcoin="COIN" id="kmd_transparent_balance" style={{fontSize: '22px'}}>{this.props.ActiveCoin.balance.transparent ? this.props.ActiveCoin.balance.transparent : '-'}</span>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div>
<div className="col-lg-3 col-xs-12" data-extcoin="COIN" id="kmd_widget_get_total_balance_z"> <div className="col-lg-3 col-xs-12" data-extcoin="COIN" id="kmd_widget_get_total_balance_z">
<div className="widget widget-shadow" id="widgetLineareaOne"> <div className="widget widget-shadow" id="widgetLineareaOne">
<div className="widget-content white bg-blue-grey-800"> <div className="widget-content white bg-blue-grey-800">
<div className="padding-20 padding-top-10"> <div className="padding-20 padding-top-10">
<div className="clearfix"> <div className="clearfix">
<div className="pull-left padding-vertical-10"> <div className="pull-left padding-vertical-10">
<i className="icon fa-eye-slash font-size-24 vertical-align-bottom margin-right-5"></i>{translate('INDEX.Z_BALANCE')} <i className="icon fa-eye-slash font-size-24 vertical-align-bottom margin-right-5"></i>{translate('INDEX.Z_BALANCE')}
</div>
<span className="pull-right padding-top-10" data-extcoin="COIN" id="kmd_private_balance" style={{fontSize: '22px'}}>{this.props.ActiveCoin.balance.private ? this.props.ActiveCoin.balance.private : '-'}</span>
</div> </div>
<span className="pull-right padding-top-10" data-extcoin="COIN" id="kmd_private_balance" style={{fontSize: '22px'}}>{this.props.ActiveCoin.balance.private ? this.props.ActiveCoin.balance.private : '-'}</span>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div>
<div className="col-lg-3 col-xs-12" data-extcoin="COIN" id="kmd_widget_get_total_balance_i"> <div className="col-lg-3 col-xs-12" data-extcoin="COIN" id="kmd_widget_get_total_balance_i">
<div className="widget widget-shadow" id="widgetLineareaOne"> <div className="widget widget-shadow" id="widgetLineareaOne">
<div className="widget-content white bg-cyan-700"> <div className="widget-content white bg-cyan-700">
<div className="padding-20 padding-top-10"> <div className="padding-20 padding-top-10">
<div className="clearfix"> <div className="clearfix">
<div className="pull-left padding-vertical-10"> <div className="pull-left padding-vertical-10">
<i className="icon fa-money font-size-24 vertical-align-bottom margin-right-5"></i>{translate('INDEX.INTEREST_EARNED')} <i className="icon fa-money font-size-24 vertical-align-bottom margin-right-5"></i>{translate('INDEX.INTEREST_EARNED')}
</div>
<span className="pull-right padding-top-10" data-extcoin="COIN" id="kmd_total_interest_balance" style={{fontSize: '22px'}}>{this.props.ActiveCoin.balance.interest ? this.props.ActiveCoin.balance.interest : '-'}</span>
</div> </div>
<span className="pull-right padding-top-10" data-extcoin="COIN" id="kmd_total_interest_balance" style={{fontSize: '22px'}}>{this.props.ActiveCoin.balance.interest ? this.props.ActiveCoin.balance.interest : '-'}</span>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div>
<div className="col-lg-3 col-xs-12" data-extcoin="COIN" id="kmd_widget_get_total_balance_tzi"> <div className="col-lg-3 col-xs-12" data-extcoin="COIN" id="kmd_widget_get_total_balance_tzi">
<div className="widget widget-shadow" id="widgetLineareaOne"> <div className="widget widget-shadow" id="widgetLineareaOne">
<div className="widget-content white bg-green-600"> <div className="widget-content white bg-green-600">
<div className="padding-20 padding-top-10"> <div className="padding-20 padding-top-10">
<div className="clearfix"> <div className="clearfix">
<div className="pull-left padding-vertical-10"> <div className="pull-left padding-vertical-10">
<i className="icon fa-bullseye font-size-24 vertical-align-bottom margin-right-5"></i>{translate('INDEX.ZT_BALANCE')} <i className="icon fa-bullseye font-size-24 vertical-align-bottom margin-right-5"></i>{translate('INDEX.ZT_BALANCE')}
</div>
<span className="pull-right padding-top-10" data-extcoin="COIN" id="kmd_total_tz_balance" style={{fontSize: '22px'}}>{this.props.ActiveCoin.balance.total ? this.props.ActiveCoin.balance.total : '-'}</span>
</div> </div>
<span className="pull-right padding-top-10" data-extcoin="COIN" id="kmd_total_tz_balance" style={{fontSize: '22px'}}>{this.props.ActiveCoin.balance.total ? this.props.ActiveCoin.balance.total : '-'}</span>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> );
); } else {
return null;
}
} }
} }

2
react/src/components/dashboard/walletsNativeInfo.js
View File

@ -7,7 +7,7 @@ class WalletsNativeInfo extends React.Component {
} }
render() { render() {
if (this.props && this.props.Dashboard && this.props.Dashboard.progress) { if (this.props && this.props.Dashboard && this.props.Dashboard.progress && this.props.ActiveCoin.nativeActiveSection === 'settings') {
return ( return (
<div data-extcoin="COIN" id="kmd_wallet_settings"> <div data-extcoin="COIN" id="kmd_wallet_settings">
<div className="col-xlg-6 col-md-4"> <div className="col-xlg-6 col-md-4">

2
react/src/components/dashboard/walletsNativeReceive.js
View File

@ -36,7 +36,7 @@ class WalletsNativeReceive extends React.Component {
} }
render() { render() {
if (this.props && this.props.ActiveCoin && this.props.ActiveCoin.receive) { if (this.props && this.props.ActiveCoin && this.props.ActiveCoin.nativeActiveSection === 'receive') {
return ( return (
<div data-extcoin="COIN" id="kmd_wallet_recieve"> <div data-extcoin="COIN" id="kmd_wallet_recieve">
<div className="col-xs-12 margin-top-20"> <div className="col-xs-12 margin-top-20">

2
react/src/components/dashboard/walletsNativeSend.js
View File

@ -3,7 +3,7 @@ import { translate } from '../../translate/translate';
class WalletsNativeSend extends React.Component { class WalletsNativeSend extends React.Component {
render() { render() {
if (this.props && this.props.ActiveCoin && this.props.ActiveCoin.send) { if (this.props && this.props.ActiveCoin && this.props.ActiveCoin.nativeActiveSection === 'send') {
return ( return (
<div data-extcoin="COIN" id="kmd_wallet_send"> <div data-extcoin="COIN" id="kmd_wallet_send">
<div className="col-xlg-12 col-md-12 col-sm-12 col-xs-12"> <div className="col-xlg-12 col-md-12 col-sm-12 col-xs-12">

4
react/src/reducers/activeCoin.js
View File

@ -19,6 +19,7 @@ export function ActiveCoin(state = {
balance: 0, balance: 0,
nativeActiveSection: 'default', nativeActiveSection: 'default',
showTransactionInfo: false, showTransactionInfo: false,
showTransactionInfoTxIndex: null,
txhistory: [], txhistory: [],
}, action) { }, action) {
switch (action.type) { switch (action.type) {
@ -56,7 +57,8 @@ export function ActiveCoin(state = {
}); });
case DASHBOARD_ACTIVE_TXINFO_MODAL: case DASHBOARD_ACTIVE_TXINFO_MODAL:
return Object.assign({}, state, { return Object.assign({}, state, {
showTransactionInfo: action.display, showTransactionInfo: action.showTransactionInfo,
showTransactionInfoTxIndex: action.showTransactionInfoTxIndex,
}); });
case DASHBOARD_ACTIVE_COIN_NATIVE_BALANCE: case DASHBOARD_ACTIVE_COIN_NATIVE_BALANCE:
return Object.assign({}, state, { return Object.assign({}, state, {

3
react/src/styles/index.scss
View File

@ -77,7 +77,8 @@ body {
} }
#edexcoin_dashboardinfo a, #edexcoin_dashboardinfo a,
.nav-top-menu { .nav-top-menu,
#kmd_txid_info_mdl .nav-tabs li {
cursor: pointer; cursor: pointer;
cursor: hand; cursor: hand;
} }

Write Preview
Loading…
Cancel
Save