diff --git a/js/components/ascribe_routes/proxy_routes/redirect_proxy_handler.js b/js/components/ascribe_routes/proxy_routes/auth_proxy_handler.js similarity index 98% rename from js/components/ascribe_routes/proxy_routes/redirect_proxy_handler.js rename to js/components/ascribe_routes/proxy_routes/auth_proxy_handler.js index 91cf48a7..c23dd200 100644 --- a/js/components/ascribe_routes/proxy_routes/redirect_proxy_handler.js +++ b/js/components/ascribe_routes/proxy_routes/auth_proxy_handler.js @@ -19,7 +19,7 @@ const { object } = React.PropTypes; * @param {string} options.to Any type of route path that is defined in routes.js * @param {enum/string} options.when ('loggedIn' || 'loggedOut') */ -export default function RedirectProxyHandler({to, when}) { +export default function AuthProxyHandler({to, when}) { return (Component) => { return React.createClass({ propTypes: { diff --git a/js/components/whitelabel/prize/prize_routes.js b/js/components/whitelabel/prize/prize_routes.js index b59ac537..9f3c5392 100644 --- a/js/components/whitelabel/prize/prize_routes.js +++ b/js/components/whitelabel/prize/prize_routes.js @@ -19,7 +19,7 @@ import ErrorNotFoundPage from '../../../components/error_not_found_page'; import App from './prize_app'; import AppConstants from '../../../constants/application_constants'; -import RedirectProxyHandler from '../../../components/ascribe_routes/proxy_routes/redirect_proxy_handler'; +import AuthProxyHandler from '../../../components/ascribe_routes/proxy_routes/auth_proxy_handler'; let baseUrl = AppConstants.baseUrl; @@ -30,26 +30,26 @@ function getRoutes() { + component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(LoginContainer)} /> + component={AuthProxyHandler({to: '/', when: 'loggedOut'})(LogoutContainer)}/> + component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(SignupContainer)} /> + component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(PasswordResetContainer)} /> + component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(SettingsContainer)}/> diff --git a/js/components/whitelabel/wallet/wallet_routes.js b/js/components/whitelabel/wallet/wallet_routes.js index 9900a9a6..5ef78e4a 100644 --- a/js/components/whitelabel/wallet/wallet_routes.js +++ b/js/components/whitelabel/wallet/wallet_routes.js @@ -30,7 +30,7 @@ import IkonotvContractNotifications from './components/ikonotv/ikonotv_contract_ import CCRegisterPiece from './components/cc/cc_register_piece'; -import RedirectProxyHandler from '../../../components/ascribe_routes/proxy_routes/redirect_proxy_handler'; +import AuthProxyHandler from '../../../components/ascribe_routes/proxy_routes/auth_proxy_handler'; import WalletApp from './wallet_app'; import AppConstants from '../../../constants/application_constants'; @@ -44,29 +44,29 @@ let ROUTES = { + component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(LoginContainer)} /> + component={AuthProxyHandler({to: '/', when: 'loggedOut'})(LogoutContainer)}/> + component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(SignupContainer)} /> + component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(PasswordResetContainer)} /> + component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(SettingsContainer)}/> + component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(ContractSettings)}/> @@ -78,29 +78,29 @@ let ROUTES = { + component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(LoginContainer)} /> + component={AuthProxyHandler({to: '/', when: 'loggedOut'})(LogoutContainer)}/> + component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(SignupContainer)} /> + component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(PasswordResetContainer)} /> + component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(SettingsContainer)}/> + component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(ContractSettings)}/> @@ -113,39 +113,39 @@ let ROUTES = { + component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(LoginContainer)} /> + component={AuthProxyHandler({to: '/', when: 'loggedOut'})(LogoutContainer)}/> + component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(SignupContainer)} /> + component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(PasswordResetContainer)} /> + component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(SettingsContainer)}/> + component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(ContractSettings)}/> + component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(IkonotvContractNotifications)}/> diff --git a/js/routes.js b/js/routes.js index fefb95e1..4611ff47 100644 --- a/js/routes.js +++ b/js/routes.js @@ -25,7 +25,7 @@ import ErrorNotFoundPage from './components/error_not_found_page'; import RegisterPiece from './components/register_piece'; -import RedirectProxyHandler from './components/ascribe_routes/proxy_routes/redirect_proxy_handler'; +import AuthProxyHandler from './components/ascribe_routes/proxy_routes/auth_proxy_handler'; import AppConstants from './constants/application_constants'; @@ -36,32 +36,32 @@ let COMMON_ROUTES = ( + component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(LoginContainer)} /> + component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(SignupContainer)} /> + component={AuthProxyHandler({to: '/', when: 'loggedOut'})(LogoutContainer)}/> + component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(PasswordResetContainer)} /> + component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(SettingsContainer)}/> + component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(ContractSettings)}/>