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

Merge redux into decouple-jsx-out-of-js

all-modes
petitPapillon 8 years ago
parent
ddfe1125ec
commit
b1a892e459
8 changed files with 68 additions and 95 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      react/src/components/addcoin/coin-selectors.render.js
  2. 10
      react/src/components/dashboard/coinTile.render.js
  3. 49
      react/src/components/dashboard/jumblr.render.js
  4. 52
      react/src/components/dashboard/navbar.render.js
  5. 29
      react/src/components/dashboard/notifications.render.js
  6. 9
      react/src/components/dashboard/receiveCoin.render.js
  7. 6
      react/src/components/login/login.render.js
  8. 4
      react/src/components/login/swall-modal.render.js

4
react/src/components/addcoin/coin-selectors.render.js
View File

@ -7,7 +7,9 @@ import AddCoinOptionsACFiat from '../addcoin/addcoinOptionsACFiat';
const CoinSelectorsRender = function(item, coin, i) {
return (
<div className={ this.hasMoreThanOneCoin() ? 'multi' : 'single' } key={ `add-coin-${i}` }>
<div
className={ this.hasMoreThanOneCoin() > 1 ? 'multi' : 'single' }
key={ `add-coin-${i}` }>
<div className="col-sm-8">
<div className="form-group">
<select

10
react/src/components/dashboard/coinTile.render.js
View File

@ -5,8 +5,8 @@ const CoinTileRender = function () {
return (
<div className="page-aside padding-top-80">
<div className="page-aside-switch">
<i className="icon md-chevron-left" aria-hidden="true"></i>
<i className="icon md-chevron-right" aria-hidden="true"></i>
<i className="icon md-chevron-left"></i>
<i className="icon md-chevron-right"></i>
</div>
<div className="page-aside-inner">
<div className="search-wallet-widgets panel display-none">
@ -14,7 +14,7 @@ const CoinTileRender = function () {
<div className="panel-actions">
<div className="input-search input-group-sm">
<button type="submit" className="input-search-btn">
<i className="icon md-search" aria-hidden="true"></i>
<i className="icon md-search"></i>
</button>
<input type="text" className="form-control" name="" placeholder="Search..." disabled />
</div>
@ -23,8 +23,8 @@ const CoinTileRender = function () {
</div>
</div>
<div className="wallet-widgets-list">
<div data-role="container">
<div data-role="content">
<div>
<div>
<div className="list-group row wallet-widgets-row">
{ this.renderTiles() }
</div>

49
react/src/components/dashboard/jumblr.render.js
View File

@ -10,9 +10,9 @@ const JumblrRender = function () {
<div className="page-content margin-top-30" id="section-jumblr">
<div className="row" id="jumblr_dashboard">
<div className="col-xs-12" id="jumblr_testing_alert">
<div className="alert alert-danger" role="alert">
<button type="button" className="close" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true">×</span>
<div className="alert alert-danger">
<button type="button" className="close">
<span>×</span>
</button>
<span className="jumblr-header">
<i className="icon fa-paw" aria-hidden="true"></i> { translate('JUMBLR.NOTICE') }
@ -24,11 +24,11 @@ const JumblrRender = function () {
<div className="col-xs-12" id="jumblr_no_native_kmd_alert">
<div className="alert alert-info alert-dismissible" role="alert">
<button type="button" className="close" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true">×</span>
<button type="button" className="close">
<span>×</span>
</button>
<span className="jumblr-header">
<i className="icon fa-paw" aria-hidden="true"></i> { translate('JUMBLR.NEED_NATIVE') }
<i className="icon fa-paw"></i> { translate('JUMBLR.NEED_NATIVE') }
</span>
<br />
{ translate('JUMBLR.TO_USE_JUMBLR') }
@ -42,23 +42,17 @@ const JumblrRender = function () {
</div>
<div className="col-xs-12">
<div className="panel-group" id="jumber_quick_info" aria-multiselectable="true" role="tablist">
<div className="panel-group" id="jumber_quick_info">
<div className="panel">
<div
className="panel-heading"
id="jumblr_security_notes"
role="tab"
onClick={ () => this.openTab(0) }>
<a
className={ this.state.activeTab === 0 ? 'panel-title' : 'panel-title collapsed' }
aria-expanded="true"
aria-controls="jumblr_security_notes_1">{ translate('JUMBLR.FEW_SECURITY_NOTES') }</a>
<a className={ this.state.activeTab === 0 ? 'panel-title' : 'panel-title collapsed' }>{ translate('JUMBLR.FEW_SECURITY_NOTES') }</a>
</div>
<div
className={ this.state.activeTab === 0 ? 'panel-collapse collapse in' : 'panel-collapse collapse' }
id="jumblr_security_notes_1"
aria-labelledby="jumblr_security_notes"
role="tabpanel">
id="jumblr_security_notes_1">
<div className="panel-body">
<ul>
<li>{ translate('JUMBLR.FEW_SECURITY_NOTES_DESC1') }</li>
@ -74,18 +68,12 @@ const JumblrRender = function () {
<div
className="panel-heading"
id="jumblr_access_funds"
role="tab"
onClick={ () => this.openTab(1) }>
<a
className={ this.state.activeTab === 1 ? 'panel-title' : 'panel-title collapsed' }
aria-expanded="false"
aria-controls="jumblr_access_funds_2">{ translate('JUMBLR.ACCESS_JUMBLR_FUNDS') }</a>
<a className={ this.state.activeTab === 1 ? 'panel-title' : 'panel-title collapsed' }>{ translate('JUMBLR.ACCESS_JUMBLR_FUNDS') }</a>
</div>
<div
className={ this.state.activeTab === 1 ? 'panel-collapse collapse in' : 'panel-collapse collapse' }
id="jumblr_access_funds_2"
aria-labelledby="jumblr_access_funds"
role="tabpanel">
id="jumblr_access_funds_2">
<div className="panel-body">
<p>{ translate('JUMBLR.ADDRESS_ACCESSIBLE_EASILY') }</p>
<ul>
@ -114,17 +102,12 @@ const JumblrRender = function () {
</div>
</div>
<div className="panel">
<div className="panel-heading" id="jumblr_using_jumblr" role="tab" onClick={ () => this.openTab(2) }>
<a
className={ this.state.activeTab === 2 ? 'panel-title' : 'panel-title collapsed' }
aria-expanded="false"
aria-controls="jumblr_using_jumblr_3">{ translate('JUMBLR.USING_JUMBLR') }</a>
<div className="panel-heading" id="jumblr_using_jumblr" onClick={ () => this.openTab(2) }>
<a className={ this.state.activeTab === 2 ? 'panel-title' : 'panel-title collapsed' }>{ translate('JUMBLR.USING_JUMBLR') }</a>
</div>
<div
className={ this.state.activeTab === 2 ? 'panel-collapse collapse in' : 'panel-collapse collapse' }
id="jumblr_using_jumblr_3"
aria-labelledby="jumblr_using_jumblr"
role="tabpanel">
id="jumblr_using_jumblr_3">
<div className="panel-body">
<ul>
<li>{ translate('JUMBLR.RUN_KMD') }</li>
@ -162,7 +145,9 @@ const JumblrRender = function () {
<td>BTC Jumblr</td>
<td>
<button type="button" className="btn btn-animate btn-animate-side btn-default btn-sm waves-effect waves-light jumblr_show_hide_addr_btc_btn">
<span><i className="icon fa-eye" aria-hidden="true"></i> { translate('JUMBLR.SHOW_HIDE') }</span>
<span>
<i className="icon fa-eye"></i> { translate('JUMBLR.SHOW_HIDE') }
</span>
</button>
<span
className="label label-lg label-outline label-success"

52
react/src/components/dashboard/navbar.render.js
View File

@ -3,14 +3,14 @@ import { translate } from '../../translate/translate';
const NavbarRender = function () {
return (
<nav className="site-navbar navbar navbar-default navbar-fixed-top navbar-mega" role="navigation">
<nav className="site-navbar navbar navbar-default navbar-fixed-top navbar-mega">
<div className="navbar-header">
<button type="button" className="navbar-toggle hamburger hamburger-close navbar-toggle-left hided">
<span className="sr-only">{ translate('INDEX.TOGGLE_NAV') }</span>
<span className="hamburger-bar"></span>
</button>
<button type="button" className="navbar-toggle collapsed">
<i className="icon md-more" aria-hidden="true"></i>
<i className="icon md-more"></i>
</button>
<div className="navbar-brand navbar-brand-center site-gridmenu-toggle">
<img
@ -24,46 +24,45 @@ const NavbarRender = function () {
</div>
<button type="button" className="navbar-toggle collapsed">
<span className="sr-only">{ translate('INDEX.TOGGLE_SEARCH') }</span>
<i className="icon md-search" aria-hidden="true"></i>
<i className="icon md-search"></i>
</button>
</div>
<div className="navbar-container container-fluid">
<div className="collapse navbar-collapse navbar-collapse-toolbar" id="site-navbar-collapse">
<ul className="nav navbar-toolbar">
<li className="hidden-float display-none" id="toggleMenubar">
<a role="button">
<a>
<i className="icon hamburger hamburger-arrow-left">
<span className="sr-only">{ translate('INDEX.TOGGLE_MENUBAR') }</span>
<span className="hamburger-bar"></span>
</i>
</a>
</li>
<li className={ this.isSectionActive('wallets') ? 'active nav-top-menu' : 'nav-top-menu' }>
<li className={ this.props.Dashboard.activeSection === 'wallets' ? 'active nav-top-menu' : 'nav-top-menu' }>
<a id="nav-dashboard" onClick={ () => this.dashboardChangeSection('wallets') }>
<i className="site-menu-icon" aria-hidden="true"></i> { translate('INDEX.WALLETS') }
<i className="site-menu-icon"></i> { translate('INDEX.WALLETS') }
</a>
</li>
<li className={ this.isSectionActive('edex') ? 'active nav-top-menu' : 'nav-top-menu' }>
<li className={ this.props.Dashboard.activeSection === 'edex' ? 'active nav-top-menu' : 'nav-top-menu' }>
<a id="nav-easydex" onClick={ () => this.dashboardChangeSection('edex') }>
<i className="site-menu-icon" aria-hidden="true"></i> EasyDEX
</a>
</li>
<li
className={'display-none ' + (this.isSectionActive('jumblr') ? 'active nav-top-menu' : 'nav-top-menu') }>
className={'display-none ' + (this.props.Dashboard.activeSection === 'jumblr' ? 'active nav-top-menu' : 'nav-top-menu') }>
<a id="nav-jumblr" onClick={ () => this.dashboardChangeSection('jumblr') }>
<i className="site-menu-icon" aria-hidden="true"></i> Jumblr
<i className="site-menu-icon"></i> Jumblr
</a>
</li>
<li className={ this.isSectionActive('atomic') ? 'active nav-top-menu' : 'nav-top-menu' }>
<li className={ this.props.Dashboard.activeSection === 'atomic' ? 'active nav-top-menu' : 'nav-top-menu' }>
<a id="nav-iguana-atomic-explorer" onClick={ () => this.dashboardChangeSection('atomic') }>
<i className="site-menu-icon" aria-hidden="true"></i> Atomic Explorer
<i className="site-menu-icon"></i> Atomic Explorer
</a>
</li>
</ul>
<ul className="nav navbar-toolbar navbar-right navbar-toolbar-right">
<li role="presentation">
<a
role="menuitem"
id="btn_edexcoin_addcoin"
className="pointer padding-bottom-10 padding-top-16"
onClick={ this.toggleAddCoinModal }>
@ -73,43 +72,40 @@ const NavbarRender = function () {
</a>
</li>
<li
className={ 'dropdown' + (this.state.openDropMenu ? ' open' : '') }
className={ 'pointer dropdown' + (this.state.openDropMenu ? ' open' : '') }
onClick={ this.openDropMenu }>
<a className="navbar-avatar dropdown-toggle" aria-expanded="false" role="button">
<a className="navbar-avatar dropdown-toggle">
<span className="avatar avatar-online">
<img src="assets/images/iguana_profile_02.jpg" alt="iguana profile pic" />
<i></i>
</span>
</a>
<ul className="dropdown-menu" role="menu">
<li role="presentation">
<ul className="dropdown-menu">
<li>
<a
role="menuitem"
id="nav-iguana-wallet-settings"
onClick={ () => this.dashboardChangeSection('settings') }>
<i className="icon md-settings" aria-hidden="true"></i> { translate('INDEX.SETTINGS') }
<i className="icon md-settings"></i> { translate('INDEX.SETTINGS') }
</a>
</li>
<li role="presentation">
<li>
<a
role="menuitem"
id="nav-iguana-sync-only"
onClick={ () => this.openSyncOnlyModal() }>
<i className="icon fa-cubes" aria-hidden="true"></i> { translate('ADD_COIN.SYNC_ONLY') }
<i className="icon fa-cubes"></i> { translate('ADD_COIN.SYNC_ONLY') }
</a>
</li>
<li role="presentation">
<li>
<a
role="menuitem"
id="nav-about-iguana"
onClick={ () => this.dashboardChangeSection('about') }>
<i className="icon fa-users" aria-hidden="true"></i> { translate('INDEX.ABOUT_IGUANA') }
<i className="icon fa-users"></i> { translate('INDEX.ABOUT_IGUANA') }
</a>
</li>
<li className="divider" role="presentation"></li>
<li role="presentation">
<a role="menuitem" id="logout-account" onClick={ this.logout }>
<i className="icon md-power" aria-hidden="true"></i> { translate('INDEX.LOGOUT') }
<li className="divider"></li>
<li>
<a id="logout-account" onClick={ this.logout }>
<i className="icon md-power"></i> { translate('INDEX.LOGOUT') }
</a>
</li>
</ul>

29
react/src/components/dashboard/notifications.render.js
View File

@ -34,49 +34,43 @@ export const NotificationsByTypeRender = function (logItem, type, index) {
export const NotificationsModalRender = function () {
return (
<div onKeyDown={ (event) => this.handleKeydown(event) }>
<div className="modal show notifications-modal" aria-hidden="false" role="dialog">
<div className="modal show notifications-modal">
<div className="modal-dialog modal-center modal-lg">
<div className="modal-content">
<div className="modal-body modal-body-container">
<div className="panel nav-tabs-horizontal">
<ul className="nav nav-tabs nav-tabs-line" role="tablist">
<li className={ this.state.activeTab === 0 ? 'active' : 'pointer' } role="presentation">
<ul className="nav nav-tabs nav-tabs-line">
<li className={ this.state.activeTab === 0 ? 'active' : 'pointer' }>
<a
role="tab"
onClick={ () => this.openTab(0) }>
<i className="icon fa fa-thumbs-o-up" aria-hidden="true"></i> Success ({ this.state.calls.success })
<i className="icon fa fa-thumbs-o-up"></i> Success ({ this.state.calls.success })
</a>
</li>
<li className={ this.state.activeTab === 1 ? 'active' : 'pointer' } role="presentation">
<li className={ this.state.activeTab === 1 ? 'active' : 'pointer' }>
<a
role="tab"
onClick={ () => this.openTab(1) }>
<i className="icon fa fa-exclamation-triangle" aria-hidden="true"></i> Error ({ this.state.calls.error })
<i className="icon fa fa-exclamation-triangle"></i> Error ({ this.state.calls.error })
</a>
</li>
<li className={ this.state.activeTab === 2 ? 'active' : 'pointer' } role="presentation">
<li className={ this.state.activeTab === 2 ? 'active' : 'pointer' }>
<a
role="tab"
onClick={ () => this.openTab(2) }>
<i className="icon fa fa-clock-o" aria-hidden="true"></i> Pending ({ this.state.calls.pending })
<i className="icon fa fa-clock-o"></i> Pending ({ this.state.calls.pending })
</a>
</li>
</ul>
<div className="panel-body panel-body-container">
<div className="tab-content">
<div
className={ this.state.activeTab === 0 ? 'tab-pane active' : 'tab-pane' }
role="tabpanel">
className={ this.state.activeTab === 0 ? 'tab-pane active' : 'tab-pane' }>
{ this.renderNotificationsByType('success') }
</div>
<div
className={ this.state.activeTab === 1 ? 'tab-pane active' : 'tab-pane' }
role="tabpanel">
className={ this.state.activeTab === 1 ? 'tab-pane active' : 'tab-pane' }>
{ this.renderNotificationsByType('error') }
</div>
<div
className={ this.state.activeTab === 2 ? 'tab-pane active' : 'tab-pane' }
role="tabpanel">
className={ this.state.activeTab === 2 ? 'tab-pane active' : 'tab-pane' }>
{ this.renderNotificationsByType('pending') }
</div>
</div>
@ -87,7 +81,6 @@ export const NotificationsModalRender = function () {
<button
type="button"
className="btn btn-default"
data-dismiss="modal"
onClick={ this.toggleNotificationsModal }>{ translate('INDEX.CLOSE') }</button>
</div>
</div>

9
react/src/components/dashboard/receiveCoin.render.js
View File

@ -13,13 +13,13 @@ export const AddressActionsBasiliskModeRender = function (address) {
onClick={ () => this._copyCoinAddress(address) }><i className="icon wb-copy" aria-hidden="true"></i> { translate('INDEX.COPY') }</button>
<span
className="label label-default margin-left-10 action"
title="Check"
title={ translate('INDEX.CHECK') }
onClick={ () => this._checkAddressBasilisk(address) }>
<i className="icon fa-database"></i>
</span>
<span
className="label label-default margin-left-10 action"
title="Import"
title={ translate('INDEX.VALIDATE') }
onClick={ () => this._validateAddressBasilisk(address) }>
<i className="icon fa-info-circle"></i>
</span>
@ -36,7 +36,7 @@ export const AddressActionsNonBasiliskModeRender = function (address) {
<button
className="btn btn-default btn-xs clipboard-edexaddr margin-left-10"
id="edexcoin_active_addr_clipboard"
onClick={ () => this._copyCoinAddress(address) }><i className="icon wb-copy" aria-hidden="true"></i> { translate('INDEX.COPY') }</button>
onClick={ () => this._copyCoinAddress(address) }><i className="icon wb-copy"></i> { translate('INDEX.COPY') }</button>
</td>
);
};
@ -61,8 +61,7 @@ export const ReceiveCoinRender = function () {
<div className="col-xlg-12 col-lg-12 col-sm-12 col-xs-12">
<div className="panel">
<header className="panel-heading">
<div className="panel-actions">
</div>
<div className="panel-actions"></div>
<h4 className="panel-title">{ translate('INDEX.RECEIVING_ADDRESS') }</h4>
</header>
<div className="panel-body">

6
react/src/components/login/login.render.js
View File

@ -23,8 +23,8 @@ const LoginRender = function () {
<h3 className="panel-title">{ translate('INDEX.UNSUPPORTED_BROWSER') }</h3>
</div>
<div className="alert alert-danger alert-dismissible" role="alert">
<button type="button" className="close" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true">&times;</span>
<button type="button" className="close">
<span>&times;</span>
<span className="sr-only">{ translate('INDEX.CLOSE') }</span>
</button>
{ translate('INDEX.IE_UNSUPPORTED') }
@ -76,7 +76,6 @@ const LoginRender = function () {
<button
className="btn btn-lg btn-flat btn-block waves-effect margin-top-20"
id="register-btn"
role="menuitem"
onClick={ this.toggleActivateCoinForm }
disabled={ !this.props.Main }>
<span className="ladda-label">{ translate('ADD_COIN.ADD_ANOTHER_COIN') }</span>
@ -94,7 +93,6 @@ const LoginRender = function () {
<button
className="btn btn-lg btn-primary btn-block ladda-button"
id="start-coin-login"
role="menuitem"
onClick={ this.toggleActivateCoinForm }
disabled={ !this.props.Main }>
<span className="ladda-label">{ translate('INDEX.ACTIVATE_COIN') }</span>

4
react/src/components/login/swall-modal.render.js
View File

@ -4,8 +4,8 @@ import {translate} from "../../translate/translate";
const SwallModalRender = function () {
return (
<div className="swal2-container">
<div className="swal2-overlay full-opacity display-block" tabIndex="-1"></div>
<div className="swal2-modal show-swal2 visible swal2-modal-container" tabIndex="-1">
<div className="swal2-overlay full-opacity display-block"></div>
<div className="swal2-modal show-swal2 visible swal2-modal-container">
<div className="swal2-icon swal2-warning pulse-warning display-block">!</div>
<h2>{ translate('LOGIN.SAVED_WALLET_SEED') }</h2>
<div className="swal2-content display-block">{ translate('LOGIN.SEED_MAKE_SURE_BACKUP') }</div>

Write Preview
Loading…
Cancel
Save