From 443be236f59248fab7950e89fdf339da59451483 Mon Sep 17 00:00:00 2001 From: Brett Sun Date: Mon, 11 Jan 2016 16:26:36 +0100 Subject: [PATCH] Whitespace fix for comments --- .../ascribe_detail/edition_container.js | 2 +- .../ascribe_detail/piece_container.js | 2 +- .../ascribe_settings/contract_settings.js | 2 +- .../ascribe_settings/settings_container.js | 2 +- js/components/coa_verify_container.js | 2 +- js/components/error_not_found_page.js | 2 +- js/components/login_container.js | 2 +- js/components/logout_container.js | 2 +- js/components/password_reset_container.js | 2 +- js/components/piece_list.js | 2 +- js/components/register_piece.js | 2 +- js/components/signup_container.js | 2 +- .../portfolioreview/components/pr_landing.js | 2 +- .../components/pr_register_piece.js | 2 +- .../ascribe_detail/prize_piece_container.js | 2 +- .../simple_prize/components/prize_landing.js | 2 +- .../components/prize_login_container.js | 2 +- .../components/prize_piece_list.js | 2 +- .../components/prize_register_piece.js | 2 +- .../components/prize_settings_container.js | 2 +- .../components/prize_signup_container.js | 2 +- .../sluice_detail/sluice_piece_container.js | 2 +- js/components/whitelabel/wallet/wallet_app.js | 58 +++++++++++++++---- .../whitelabel/wallet/wallet_routes.js | 4 +- 24 files changed, 71 insertions(+), 35 deletions(-) diff --git a/js/components/ascribe_detail/edition_container.js b/js/components/ascribe_detail/edition_container.js index 7822da12..00b40ef5 100644 --- a/js/components/ascribe_detail/edition_container.js +++ b/js/components/ascribe_detail/edition_container.js @@ -29,7 +29,7 @@ let EditionContainer = React.createClass({ currentUser: React.PropTypes.object, whitelabel: React.PropTypes.object, - //Provided from router + // Provided from router location: React.PropTypes.object, params: React.PropTypes.object }, diff --git a/js/components/ascribe_detail/piece_container.js b/js/components/ascribe_detail/piece_container.js index 3db13132..30f2dc27 100644 --- a/js/components/ascribe_detail/piece_container.js +++ b/js/components/ascribe_detail/piece_container.js @@ -59,7 +59,7 @@ let PieceContainer = React.createClass({ currentUser: React.PropTypes.object, whitelabel: React.PropTypes.object, - //Provided from router + // Provided from router location: React.PropTypes.object, params: React.PropTypes.object }, diff --git a/js/components/ascribe_settings/contract_settings.js b/js/components/ascribe_settings/contract_settings.js index 36a8117d..500f1811 100644 --- a/js/components/ascribe_settings/contract_settings.js +++ b/js/components/ascribe_settings/contract_settings.js @@ -33,7 +33,7 @@ let ContractSettings = React.createClass({ currentUser: React.PropTypes.object, whitelabel: React.PropTypes.object, - //Provided from router + // Provided from router location: React.PropTypes.object }, diff --git a/js/components/ascribe_settings/settings_container.js b/js/components/ascribe_settings/settings_container.js index 3b9a1694..f36e1e70 100644 --- a/js/components/ascribe_settings/settings_container.js +++ b/js/components/ascribe_settings/settings_container.js @@ -27,7 +27,7 @@ let SettingsContainer = React.createClass({ currentUser: React.PropTypes.object, whitelabel: React.PropTypes.object, - //Provided from router + // Provided from router location: React.PropTypes.object }, diff --git a/js/components/coa_verify_container.js b/js/components/coa_verify_container.js index 6a2b6562..a3ac5037 100644 --- a/js/components/coa_verify_container.js +++ b/js/components/coa_verify_container.js @@ -22,7 +22,7 @@ let CoaVerifyContainer = React.createClass({ currentUser: React.PropTypes.object, whitelabel: React.PropTypes.object, - //Provided from router + // Provided from router location: React.PropTypes.object }, diff --git a/js/components/error_not_found_page.js b/js/components/error_not_found_page.js index 0d6fd26c..a0e4cbb5 100644 --- a/js/components/error_not_found_page.js +++ b/js/components/error_not_found_page.js @@ -13,7 +13,7 @@ let ErrorNotFoundPage = React.createClass({ currentUser: React.PropTypes.object, whitelabel: React.PropTypes.object, - //Provided from router + // Provided from router location: React.PropTypes.object }, diff --git a/js/components/login_container.js b/js/components/login_container.js index bcc8cc18..2ab013e8 100644 --- a/js/components/login_container.js +++ b/js/components/login_container.js @@ -20,7 +20,7 @@ let LoginContainer = React.createClass({ currentUser: React.PropTypes.object, whitelabel: React.PropTypes.object, - //Provided from router + // Provided from router location: React.PropTypes.object }, diff --git a/js/components/logout_container.js b/js/components/logout_container.js index 33475ab6..5b0e9e54 100644 --- a/js/components/logout_container.js +++ b/js/components/logout_container.js @@ -17,7 +17,7 @@ let LogoutContainer = React.createClass({ currentUser: React.PropTypes.object, whitelabel: React.PropTypes.object, - //Provided from router + // Provided from router location: React.PropTypes.object }, diff --git a/js/components/password_reset_container.js b/js/components/password_reset_container.js index e4df2909..f9ece359 100644 --- a/js/components/password_reset_container.js +++ b/js/components/password_reset_container.js @@ -20,7 +20,7 @@ let PasswordResetContainer = React.createClass({ currentUser: React.PropTypes.object, whitelabel: React.PropTypes.object, - //Provided from router + // Provided from router location: React.PropTypes.object }, diff --git a/js/components/piece_list.js b/js/components/piece_list.js index 11b70895..1f3e0074 100644 --- a/js/components/piece_list.js +++ b/js/components/piece_list.js @@ -48,7 +48,7 @@ let PieceList = React.createClass({ currentUser: React.PropTypes.object, whitelabel: React.PropTypes.object, - //Provided from router + // Provided from router location: React.PropTypes.object }, diff --git a/js/components/register_piece.js b/js/components/register_piece.js index e778d35e..b5fe976b 100644 --- a/js/components/register_piece.js +++ b/js/components/register_piece.js @@ -36,7 +36,7 @@ let RegisterPiece = React.createClass( { currentUser: React.PropTypes.object, whitelabel: React.PropTypes.object, - //Provided from router + // Provided from router location: React.PropTypes.object }, diff --git a/js/components/signup_container.js b/js/components/signup_container.js index 7e5d8fb1..42656794 100644 --- a/js/components/signup_container.js +++ b/js/components/signup_container.js @@ -15,7 +15,7 @@ let SignupContainer = React.createClass({ currentUser: React.PropTypes.object, whitelabel: React.PropTypes.object, - //Provided from router + // Provided from router location: React.PropTypes.object }, diff --git a/js/components/whitelabel/prize/portfolioreview/components/pr_landing.js b/js/components/whitelabel/prize/portfolioreview/components/pr_landing.js index d24f1cee..a3f14bef 100644 --- a/js/components/whitelabel/prize/portfolioreview/components/pr_landing.js +++ b/js/components/whitelabel/prize/portfolioreview/components/pr_landing.js @@ -20,7 +20,7 @@ const PRLanding = React.createClass({ currentUser: React.PropTypes.object, whitelabel: React.PropTypes.object, - //Provided from router + // Provided from router location: React.PropTypes.object }, diff --git a/js/components/whitelabel/prize/portfolioreview/components/pr_register_piece.js b/js/components/whitelabel/prize/portfolioreview/components/pr_register_piece.js index a78a2196..8f0479dc 100644 --- a/js/components/whitelabel/prize/portfolioreview/components/pr_register_piece.js +++ b/js/components/whitelabel/prize/portfolioreview/components/pr_register_piece.js @@ -21,7 +21,7 @@ const PRRegisterPiece = React.createClass({ currentUser: React.PropTypes.object, whitelabel: React.PropTypes.object, - //Provided from router + // Provided from router location: object }, diff --git a/js/components/whitelabel/prize/simple_prize/components/ascribe_detail/prize_piece_container.js b/js/components/whitelabel/prize/simple_prize/components/ascribe_detail/prize_piece_container.js index 9a4cd39c..c660103a 100644 --- a/js/components/whitelabel/prize/simple_prize/components/ascribe_detail/prize_piece_container.js +++ b/js/components/whitelabel/prize/simple_prize/components/ascribe_detail/prize_piece_container.js @@ -56,7 +56,7 @@ let PrizePieceContainer = React.createClass({ currentUser: React.PropTypes.object, whitelabel: React.PropTypes.object, - //Provided from router + // Provided from router location: React.PropTypes.object, params: React.PropTypes.object }, diff --git a/js/components/whitelabel/prize/simple_prize/components/prize_landing.js b/js/components/whitelabel/prize/simple_prize/components/prize_landing.js index 17c2e0c1..a0dc4726 100644 --- a/js/components/whitelabel/prize/simple_prize/components/prize_landing.js +++ b/js/components/whitelabel/prize/simple_prize/components/prize_landing.js @@ -19,7 +19,7 @@ let Landing = React.createClass({ currentUser: React.PropTypes.object, whitelabel: React.PropTypes.object, - //Provided from router + // Provided from router location: React.PropTypes.object }, diff --git a/js/components/whitelabel/prize/simple_prize/components/prize_login_container.js b/js/components/whitelabel/prize/simple_prize/components/prize_login_container.js index 66466e3e..7dd25bea 100644 --- a/js/components/whitelabel/prize/simple_prize/components/prize_login_container.js +++ b/js/components/whitelabel/prize/simple_prize/components/prize_login_container.js @@ -15,7 +15,7 @@ let LoginContainer = React.createClass({ currentUser: React.PropTypes.object, whitelabel: React.PropTypes.object, - //Provided from router + // Provided from router location: React.PropTypes.object }, diff --git a/js/components/whitelabel/prize/simple_prize/components/prize_piece_list.js b/js/components/whitelabel/prize/simple_prize/components/prize_piece_list.js index 4724cd68..207fac30 100644 --- a/js/components/whitelabel/prize/simple_prize/components/prize_piece_list.js +++ b/js/components/whitelabel/prize/simple_prize/components/prize_piece_list.js @@ -21,7 +21,7 @@ let PrizePieceList = React.createClass({ currentUser: React.PropTypes.object, whitelabel: React.PropTypes.object, - //Provided from router + // Provided from router location: React.PropTypes.object }, diff --git a/js/components/whitelabel/prize/simple_prize/components/prize_register_piece.js b/js/components/whitelabel/prize/simple_prize/components/prize_register_piece.js index 60929a7e..e316bfac 100644 --- a/js/components/whitelabel/prize/simple_prize/components/prize_register_piece.js +++ b/js/components/whitelabel/prize/simple_prize/components/prize_register_piece.js @@ -20,7 +20,7 @@ let PrizeRegisterPiece = React.createClass({ currentUser: React.PropTypes.object, whitelabel: React.PropTypes.object, - //Provided from router + // Provided from router location: React.PropTypes.object }, diff --git a/js/components/whitelabel/prize/simple_prize/components/prize_settings_container.js b/js/components/whitelabel/prize/simple_prize/components/prize_settings_container.js index 22a004d4..ab17e440 100644 --- a/js/components/whitelabel/prize/simple_prize/components/prize_settings_container.js +++ b/js/components/whitelabel/prize/simple_prize/components/prize_settings_container.js @@ -31,7 +31,7 @@ let Settings = React.createClass({ currentUser: React.PropTypes.object, whitelabel: React.PropTypes.object, - //Provided from router + // Provided from router location: React.PropTypes.object }, diff --git a/js/components/whitelabel/prize/simple_prize/components/prize_signup_container.js b/js/components/whitelabel/prize/simple_prize/components/prize_signup_container.js index 5bf222ba..1f8ba91a 100644 --- a/js/components/whitelabel/prize/simple_prize/components/prize_signup_container.js +++ b/js/components/whitelabel/prize/simple_prize/components/prize_signup_container.js @@ -12,7 +12,7 @@ let SignupContainer = React.createClass({ currentUser: React.PropTypes.object, whitelabel: React.PropTypes.object, - //Provided from router + // Provided from router location: React.PropTypes.object }, diff --git a/js/components/whitelabel/prize/sluice/components/sluice_detail/sluice_piece_container.js b/js/components/whitelabel/prize/sluice/components/sluice_detail/sluice_piece_container.js index 7ddd7953..c4e75df1 100644 --- a/js/components/whitelabel/prize/sluice/components/sluice_detail/sluice_piece_container.js +++ b/js/components/whitelabel/prize/sluice/components/sluice_detail/sluice_piece_container.js @@ -12,7 +12,7 @@ const SluicePieceContainer = React.createClass({ currentUser: React.PropTypes.object, whitelabel: React.PropTypes.object, - //Provided from router + // Provided from router location: React.PropTypes.object, params: React.PropTypes.object }, diff --git a/js/components/whitelabel/wallet/wallet_app.js b/js/components/whitelabel/wallet/wallet_app.js index bce7106b..e35da2da 100644 --- a/js/components/whitelabel/wallet/wallet_app.js +++ b/js/components/whitelabel/wallet/wallet_app.js @@ -1,14 +1,20 @@ 'use strict'; import React from 'react'; -import Header from '../../header'; -import Footer from '../../footer'; - -import GlobalNotification from '../../global_notification'; - import classNames from 'classnames'; -import { getSubdomain } from '../../../utils/general_utils'; +import UserStore from '../../../stores/user_store'; +import UserActions from '../../../actions/user_actions'; + +import WhitelabelActions from '../../../actions/whitelabel_actions'; +import WhitelabelStore from '../../../stores/whitelabel_store'; + +import AppRouteWrapper from '../../app_route_wrapper'; +import Header from '../../header'; +import Footer from '../../footer'; +import GlobalNotification from '../../global_notification'; + +import { getSubdomain, mergeOptions } from '../../../utils/general_utils'; let WalletApp = React.createClass({ @@ -21,21 +27,46 @@ let WalletApp = React.createClass({ routes: React.PropTypes.arrayOf(React.PropTypes.object) }, + getInitialState() { + return mergeOptions( + UserStore.getState(), + WhitelabelStore.getState() + ); + }, + + componentDidMount() { + UserStore.listen(this.onChange); + WhitelabelStore.listen(this.onChange); + + UserActions.fetchCurrentUser(); + WhitelabelActions.fetchWhitelabel(); + }, + + componentWillUnmount() { + UserStore.unlisten(this.onChange); + WhitelabelActions.unlisten(this.onChange); + }, + + onChange(state) { + this.setState(state); + }, + render() { - let header = null; - let subdomain = getSubdomain(); const { history, routes, children } = this.props; + const { currentUser, whitelabel } = this.state; + const subdomain = getSubdomain(); // The second element of routes is always the active component object, where we can // extract the path. let path = routes[1] ? routes[1].path : null; + let header = null; // if the path of the current activeRoute is not defined, then this is the IndexRoute if ((!path || history.isActive('/login') || history.isActive('/signup') || history.isActive('/contract_notifications')) && (['cyland', 'ikonotv', 'lumenus', '23vivi']).indexOf(subdomain) > -1) { header = (
); } else { - header =
; + header = (
); } // In react-router 1.0, Routes have no 'name' property anymore. To keep functionality however, @@ -44,10 +75,15 @@ let WalletApp = React.createClass({
{header} - {children} + + {/* Routes are injected here */} + {children} + +
-
); diff --git a/js/components/whitelabel/wallet/wallet_routes.js b/js/components/whitelabel/wallet/wallet_routes.js index a5a0e075..d59f47f5 100644 --- a/js/components/whitelabel/wallet/wallet_routes.js +++ b/js/components/whitelabel/wallet/wallet_routes.js @@ -48,7 +48,7 @@ import WalletApp from './wallet_app'; let ROUTES = { 'cyland': ( - + @@ -118,7 +118,7 @@ let ROUTES = { ), 'ikonotv': ( - +