Simplify navigation in auth screens

7 files changed, 11 insertions, 51 deletions

diff --git a/src/components/auth/ChangeServer.js b/src/components/auth/ChangeServer.js
index a659cdc31..4c69b2821 100644
--- a/src/components/auth/ChangeServer.js
+++ b/src/components/auth/ChangeServer.js
@@ -6,6 +6,7 @@ import Form from '../../lib/Form';
 import Input from '../ui/Input';
 import Select from '../ui/Select';
 import Button from '../ui/Button';
+import Link from '../ui/Link';
 import Infobox from '../ui/Infobox';
 import { url, required } from '../../helpers/validation-helpers';
 import { LIVE_FERDI_API, LIVE_FRANZ_API } from '../../config';
@@ -105,7 +106,7 @@ class ChangeServer extends Component {
     return (
       <div className="auth__container">
         <form className="franz-form auth__form" onSubmit={e => this.submit(e)}>
-          <img src="./assets/images/logo.svg" className="auth__logo" alt="" />
+          <Link to='/auth/welcome'><img src="./assets/images/logo.svg" className="auth__logo" alt="" /></Link>
           <h1>{intl.formatMessage(messages.headline)}</h1>
           {form.$('server').value === this.franzServer && (
             <Infobox type="warning">
diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js
index 684b2f6f3..bd01f25cd 100644
--- a/src/components/auth/Login.js
+++ b/src/components/auth/Login.js
@@ -8,7 +8,6 @@ import { LIVE_FRANZ_API } from '../../config';
 import { API_VERSION } from '../../environment-remote';
 import Form from '../../lib/Form';
 import { required, email } from '../../helpers/validation-helpers';
-import serverlessLogin from '../../helpers/serverless-helpers';
 import Input from '../ui/Input';
 import Button from '../ui/Button';
 import Link from '../ui/Link';
@@ -56,14 +55,6 @@ const messages = defineMessages({
     id: 'login.link.signup',
     defaultMessage: 'Create a free account',
   },
-  changeServer: {
-    id: 'login.changeServer',
-    defaultMessage: 'Change server',
-  },
-  serverless: {
-    id: 'services.serverless',
-    defaultMessage: 'Use Ferdi without an Account',
-  },
   passwordLink: {
     id: 'login.link.password',
     defaultMessage: 'Reset password',
@@ -78,9 +69,7 @@ class Login extends Component {
     isServerLogout: PropTypes.bool.isRequired,
     signupRoute: PropTypes.string.isRequired,
     passwordRoute: PropTypes.string.isRequired,
-    changeServerRoute: PropTypes.string.isRequired,
     error: globalErrorPropType.isRequired,
-    actions: PropTypes.object.isRequired,
   };
 
   form = new Form(
@@ -112,10 +101,6 @@ class Login extends Component {
     });
   }
 
-  useLocalServer() {
-    serverlessLogin(this.props.actions);
-  }
-
   render() {
     const { form } = this;
     const { intl } = this.props;
@@ -125,14 +110,13 @@ class Login extends Component {
       isServerLogout,
       signupRoute,
       passwordRoute,
-      changeServerRoute,
       error,
     } = this.props;
 
     return (
       <div className="auth__container">
         <form className="franz-form auth__form" onSubmit={e => this.submit(e)}>
-          <img src="./assets/images/logo.svg" className="auth__logo" alt="" />
+          <Link to='/auth/welcome'><img src="./assets/images/logo.svg" className="auth__logo" alt="" /></Link>
           <h1>{intl.formatMessage(messages.headline)}</h1>
           {isTokenExpired && (
             <p className="error-message center">
@@ -188,12 +172,6 @@ class Login extends Component {
           )}
         </form>
         <div className="auth__links">
-          <Link to={changeServerRoute}>
-            {intl.formatMessage(messages.changeServer)}
-          </Link>
-          <a onClick={this.useLocalServer.bind(this)}>
-            {intl.formatMessage(messages.serverless)}
-          </a>
           <Link to={signupRoute}>
             {intl.formatMessage(messages.signupLink)}
           </Link>
diff --git a/src/components/auth/Password.js b/src/components/auth/Password.js
index b4d51f43d..49930f6bd 100644
--- a/src/components/auth/Password.js
+++ b/src/components/auth/Password.js
@@ -78,7 +78,7 @@ class Password extends Component {
     return (
       <div className="auth__container">
         <form className="franz-form auth__form" onSubmit={e => this.submit(e)}>
-          <img src="./assets/images/logo.svg" className="auth__logo" alt="" />
+          <Link to='/auth/welcome'><img src="./assets/images/logo.svg" className="auth__logo" alt="" /></Link>
           <h1>{intl.formatMessage(messages.headline)}</h1>
           {status.length > 0 && status.includes('sent') && (
             <Infobox type="success" icon="checkbox-marked-circle-outline">
diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js
index 6526264e0..00b387b25 100644
--- a/src/components/auth/Signup.js
+++ b/src/components/auth/Signup.js
@@ -6,7 +6,6 @@ import { defineMessages, injectIntl } from 'react-intl';
 
 import Form from '../../lib/Form';
 import { required, email, minLength } from '../../helpers/validation-helpers';
-import serverlessLogin from '../../helpers/serverless-helpers';
 import Input from '../ui/Input';
 import Button from '../ui/Button';
 import Link from '../ui/Link';
@@ -59,14 +58,6 @@ const messages = defineMessages({
     id: 'signup.link.login',
     defaultMessage: 'Already have an account, sign in?',
   },
-  changeServer: {
-    id: 'login.changeServer',
-    defaultMessage: 'Change server',
-  },
-  serverless: {
-    id: 'services.serverless',
-    defaultMessage: 'Use Ferdi without an Account',
-  },
   emailDuplicate: {
     id: 'signup.emailDuplicate',
     defaultMessage: 'A user with that email address already exists',
@@ -78,9 +69,7 @@ class Signup extends Component {
     onSubmit: PropTypes.func.isRequired,
     isSubmitting: PropTypes.bool.isRequired,
     loginRoute: PropTypes.string.isRequired,
-    changeServerRoute: PropTypes.string.isRequired,
     error: globalErrorPropType.isRequired,
-    actions: PropTypes.object.isRequired,
   };
 
   form = new Form(
@@ -122,14 +111,10 @@ class Signup extends Component {
     });
   }
 
-  useLocalServer() {
-    serverlessLogin(this.props.actions);
-  }
-
   render() {
     const { form } = this;
     const { intl } = this.props;
-    const { isSubmitting, loginRoute, error, changeServerRoute } = this.props;
+    const { isSubmitting, loginRoute, error } = this.props;
 
     return (
       <div className="auth__scroll-container">
@@ -138,7 +123,7 @@ class Signup extends Component {
             className="franz-form auth__form"
             onSubmit={e => this.submit(e)}
           >
-            <img src="./assets/images/logo.svg" className="auth__logo" alt="" />
+            <Link to='/auth/welcome'><img src="./assets/images/logo.svg" className="auth__logo" alt="" /></Link>
             <h1>{intl.formatMessage(messages.headline)}</h1>
             <div className="grid__row">
               <Input field={form.$('firstname')} focus />
@@ -191,12 +176,6 @@ class Signup extends Component {
             </p>
           </form>
           <div className="auth__links">
-            <Link to={changeServerRoute}>
-              {intl.formatMessage(messages.changeServer)}
-            </Link>
-            <a onClick={this.useLocalServer.bind(this)}>
-              {intl.formatMessage(messages.serverless)}
-            </a>
             <Link to={loginRoute}>
               {intl.formatMessage(messages.loginLink)}
             </Link>
diff --git a/src/components/auth/Welcome.js b/src/components/auth/Welcome.js
index bcdec243d..380565ff6 100644
--- a/src/components/auth/Welcome.js
+++ b/src/components/auth/Welcome.js
@@ -17,6 +17,10 @@ const messages = defineMessages({
     id: 'welcome.loginButton',
     defaultMessage: 'Login to your account',
   },
+  changeServer: {
+    id: 'login.changeServer',
+    defaultMessage: 'Change server'
+  },
   serverless: {
     id: 'services.serverless',
     defaultMessage: 'Use Ferdi without an Account',
@@ -70,7 +74,7 @@ class Login extends Component {
                 cursor: 'pointer',
               }}
             >
-              Change server
+              {intl.formatMessage(messages.changeServer)}
             </span>
           </Link>
           <br />
diff --git a/src/containers/auth/LoginScreen.js b/src/containers/auth/LoginScreen.js
index 572a38ea1..f8351f458 100644
--- a/src/containers/auth/LoginScreen.js
+++ b/src/containers/auth/LoginScreen.js
@@ -23,7 +23,6 @@ class LoginScreen extends Component {
         }
         signupRoute={stores.user.signupRoute}
         passwordRoute={stores.user.passwordRoute}
-        changeServerRoute={stores.user.changeServerRoute}
         error={error}
       />
     );
diff --git a/src/containers/auth/SignupScreen.js b/src/containers/auth/SignupScreen.js
index 1dd8d0772..3824e47d5 100644
--- a/src/containers/auth/SignupScreen.js
+++ b/src/containers/auth/SignupScreen.js
@@ -27,7 +27,6 @@ class SignupScreen extends Component {
         onSubmit={values => this.onSignup(values)}
         isSubmitting={stores.user.signupRequest.isExecuting}
         loginRoute={stores.user.loginRoute}
-        changeServerRoute={stores.user.changeServerRoute}
         error={error}
       />
     );