From e1c2c2514c930e9ae4fcdc58f693aef3bfe7d431 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= Date: Tue, 8 Dec 2015 10:23:37 +0100 Subject: [PATCH] Move AuthProxyHandler one directory up --- .../{proxy_routes => }/auth_proxy_handler.js | 8 ++++---- .../portfolioreview/components/pr_login_container.js | 0 js/components/whitelabel/prize/prize_routes.js | 2 +- js/components/whitelabel/wallet/wallet_routes.js | 2 +- js/routes.js | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) rename js/components/ascribe_routes/{proxy_routes => }/auth_proxy_handler.js (94%) delete mode 100644 js/components/whitelabel/prize/portfolioreview/components/pr_login_container.js diff --git a/js/components/ascribe_routes/proxy_routes/auth_proxy_handler.js b/js/components/ascribe_routes/auth_proxy_handler.js similarity index 94% rename from js/components/ascribe_routes/proxy_routes/auth_proxy_handler.js rename to js/components/ascribe_routes/auth_proxy_handler.js index 0eb4ad8f..a390fe2f 100644 --- a/js/components/ascribe_routes/proxy_routes/auth_proxy_handler.js +++ b/js/components/ascribe_routes/auth_proxy_handler.js @@ -3,10 +3,10 @@ import React from 'react'; import { History, RouteContext } from 'react-router'; -import UserStore from '../../../stores/user_store'; -import UserActions from '../../../actions/user_actions'; +import UserStore from '../../stores/user_store'; +import UserActions from '../../actions/user_actions'; -import AppConstants from '../../../constants/application_constants'; +import AppConstants from '../../constants/application_constants'; const { object } = React.PropTypes; @@ -89,7 +89,7 @@ export default function AuthProxyHandler({to, when}) { } else if(!exprToValidate && when === 'loggedOut' && redirectAuthenticated) { /* - * redirectAuthenticated contains an arbirary path + * redirectAuthenticated contains an arbitrary path * eg pieces/, editions/, collection, settings, ... * hence transitionTo cannot be used directly. * diff --git a/js/components/whitelabel/prize/portfolioreview/components/pr_login_container.js b/js/components/whitelabel/prize/portfolioreview/components/pr_login_container.js deleted file mode 100644 index e69de29b..00000000 diff --git a/js/components/whitelabel/prize/prize_routes.js b/js/components/whitelabel/prize/prize_routes.js index ec0269a5..742416b5 100644 --- a/js/components/whitelabel/prize/prize_routes.js +++ b/js/components/whitelabel/prize/prize_routes.js @@ -22,7 +22,7 @@ import PasswordResetContainer from '../../password_reset_container'; import CoaVerifyContainer from '../../coa_verify_container'; import ErrorNotFoundPage from '../../error_not_found_page'; -import AuthProxyHandler from '../../../components/ascribe_routes/proxy_routes/auth_proxy_handler'; +import AuthProxyHandler from '../../../components/ascribe_routes/auth_proxy_handler'; const ROUTES = { diff --git a/js/components/whitelabel/wallet/wallet_routes.js b/js/components/whitelabel/wallet/wallet_routes.js index 0a4e3a58..268a588b 100644 --- a/js/components/whitelabel/wallet/wallet_routes.js +++ b/js/components/whitelabel/wallet/wallet_routes.js @@ -40,7 +40,7 @@ import LumenusLanding from './components/lumenus/lumenus_landing'; import Vivi23Landing from './components/23vivi/23vivi_landing'; import Vivi23PieceList from './components/23vivi/23vivi_piece_list'; -import AuthProxyHandler from '../../../components/ascribe_routes/proxy_routes/auth_proxy_handler'; +import AuthProxyHandler from '../../../components/ascribe_routes/auth_proxy_handler'; import WalletApp from './wallet_app'; diff --git a/js/routes.js b/js/routes.js index 116fb663..45adae3c 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 AuthProxyHandler from './components/ascribe_routes/proxy_routes/auth_proxy_handler'; +import AuthProxyHandler from './components/ascribe_routes/auth_proxy_handler'; let COMMON_ROUTES = (