1 files changed, 3 insertions, 34 deletions

diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js
index 00625a3ac..00b387b25 100644
--- a/src/components/auth/Signup.js
+++ b/src/components/auth/Signup.js
@@ -4,14 +4,11 @@ import PropTypes from 'prop-types';
 import { observer, inject } from 'mobx-react';
 import { defineMessages, injectIntl } from 'react-intl';
 
-import { isDevMode, useLiveAPI } from '../../environment-remote';
 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';
-import Infobox from '../ui/Infobox';
 
 import { globalError as globalErrorPropType } from '../../prop-types';
 import { termsBase } from '../../api/apiBase';
@@ -61,30 +58,18 @@ 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',
   },
 });
 
-@inject('actions')
-@observer
 class Signup extends Component {
   static propTypes = {
     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(
@@ -126,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">
@@ -142,14 +123,8 @@ 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>
-            {isDevMode && !useLiveAPI && (
-              <Infobox type="warning">
-                In Dev Mode your data is not persistent. Please use the live app
-                for accesing the production API.
-              </Infobox>
-            )}
             <div className="grid__row">
               <Input field={form.$('firstname')} focus />
               <Input field={form.$('lastname')} />
@@ -201,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>
@@ -217,4 +186,4 @@ class Signup extends Component {
   }
 }
 
-export default injectIntl(Signup);
+export default injectIntl(inject('actions')(observer(Signup)));