From 296b1339ecac0588f180597a8721008623d9bae9 Mon Sep 17 00:00:00 2001
From: Matthias Kretschmann <m@kretschmann.io>
Date: Fri, 1 Jun 2018 10:58:50 +0200
Subject: [PATCH] redirect /signup -> /login

---
 .../whitelabel/prize/prize_routes.js          | 13 ++---
 .../whitelabel/wallet/wallet_routes.js        | 50 ++++++++-----------
 js/routes.js                                  |  5 +-
 3 files changed, 26 insertions(+), 42 deletions(-)

diff --git a/js/components/whitelabel/prize/prize_routes.js b/js/components/whitelabel/prize/prize_routes.js
index 6179ab57..3b16a372 100644
--- a/js/components/whitelabel/prize/prize_routes.js
+++ b/js/components/whitelabel/prize/prize_routes.js
@@ -41,9 +41,8 @@ const ROUTES = {
             <Route
                 path='logout'
                 component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)} />
-            <Route path='signup'>
-                <Redirect to="/login" />
-            </Route>
+            <Redirect from='signup' to='login' />
+            <Route path='signup' />
             <Route
                 path='password_reset'
                 component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)} />
@@ -92,12 +91,8 @@ const ROUTES = {
             <Route
                 path='logout'
                 component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)} />
-            <Route
-                path='signup'
-                component={ProxyHandler(
-                    AuthPrizeRoleRedirect({ to: '/collection', when: ['is_admin', 'is_judge', 'is_jury'] }),
-                    AuthRedirect({to: '/register_piece', when: 'loggedIn'})
-                )(SPSignupContainer)} />
+            <Redirect from='signup' to='login' />
+            <Route path='signup' />
             <Route
                 path='password_reset'
                 component={ProxyHandler(
diff --git a/js/components/whitelabel/wallet/wallet_routes.js b/js/components/whitelabel/wallet/wallet_routes.js
index 52c12792..1d84433d 100644
--- a/js/components/whitelabel/wallet/wallet_routes.js
+++ b/js/components/whitelabel/wallet/wallet_routes.js
@@ -68,9 +68,8 @@ let ROUTES = {
             <Route
                 path='logout'
                 component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)} />
-            <Route path='signup'>
-                <Redirect to="/login" />
-            </Route>
+            <Redirect from='signup' to='login' />
+            <Route path='signup' />
             <Route
                 path='password_reset'
                 component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)} />
@@ -112,9 +111,8 @@ let ROUTES = {
             <Route
                 path='logout'
                 component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)} />
-            <Route path='signup'>
-                <Redirect to="/login" />
-            </Route>
+            <Redirect from='signup' to='login' />
+            <Route path='signup' />
             <Route
                 path='password_reset'
                 component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)} />
@@ -157,9 +155,8 @@ let ROUTES = {
             <Route
                 path='logout'
                 component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)} />
-            <Route path='signup'>
-                <Redirect to="/login" />
-            </Route>
+            <Redirect from='signup' to='login' />
+            <Route path='signup' />
             <Route
                 path='password_reset'
                 component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)} />
@@ -211,9 +208,8 @@ let ROUTES = {
             <Route
                 path='logout'
                 component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)} />
-            <Route path='signup'>
-                <Redirect to="/login" />
-            </Route>
+            <Redirect from='signup' to='login' />
+            <Route path='signup' />
             <Route
                 path='password_reset'
                 component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)} />
@@ -258,9 +254,8 @@ let ROUTES = {
                 path='logout'
                 component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)}
                 footer={MarketFooter} />
-            <Route path='signup'>
-                <Redirect to="/login" />
-            </Route>
+            <Redirect from='signup' to='login' />
+            <Route path='signup' />
             <Route
                 path='password_reset'
                 component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)}
@@ -312,9 +307,8 @@ let ROUTES = {
             <Route
                 path='logout'
                 component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)} />
-            <Route path='signup'>
-                <Redirect to="/login" />
-            </Route>
+            <Redirect from='signup' to='login' />
+            <Route path='signup' />
             <Route
                 path='password_reset'
                 component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)} />
@@ -349,9 +343,8 @@ let ROUTES = {
             <Route
                 path='logout'
                 component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)} />
-            <Route path='signup'>
-                <Redirect to="/login" />
-            </Route>
+            <Redirect from='signup' to='login' />
+            <Route path='signup' />
             <Route
                 path='password_reset'
                 component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)} />
@@ -386,9 +379,8 @@ let ROUTES = {
             <Route
                 path='logout'
                 component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)} />
-            <Route path='signup'>
-                <Redirect to="/login" />
-            </Route>
+            <Redirect from='signup' to='login' />
+            <Route path='signup' />
             <Route
                 path='password_reset'
                 component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)} />
@@ -423,9 +415,8 @@ let ROUTES = {
             <Route
                 path='logout'
                 component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)} />
-            <Route path='signup'>
-                <Redirect to="/login" />
-            </Route>
+            <Redirect from='signup' to='login' />
+            <Route path='signup' />
             <Route
                 path='password_reset'
                 component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)} />
@@ -459,9 +450,8 @@ let ROUTES = {
             <Route
                 path='logout'
                 component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)} />
-            <Route path='signup'>
-                <Redirect to="/login" />
-            </Route>
+            <Redirect from='signup' to='login' />
+            <Route path='signup' />
             <Route
                 path='password_reset'
                 component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)} />
diff --git a/js/routes.js b/js/routes.js
index 5f62ee63..48548b93 100644
--- a/js/routes.js
+++ b/js/routes.js
@@ -48,9 +48,8 @@ const COMMON_ROUTES = (
             headerTitle={getLangText('COLLECTION')}
             disableOn='noPieces'
             footer={Footer} />
-        <Route path='signup'>
-            <Redirect to="/login" />
-        </Route>
+        <Redirect from="signup" to="login" />
+        <Route path='signup' />
         <Route
             path='logout'
             component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(LogoutContainer)}