Add local server to allow serverlesss usage

15 files changed, 380 insertions, 124 deletions

diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js
index eea5a09bf..e58016e25 100644
--- a/src/components/auth/Login.js
+++ b/src/components/auth/Login.js
@@ -1,11 +1,13 @@
+/* eslint jsx-a11y/anchor-is-valid: 0 */
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { observer } from 'mobx-react';
+import { observer, inject } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
 
 import { isDevMode, useLiveAPI } from '../../environment';
 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';
@@ -54,13 +56,21 @@ 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: '!!!Forgot password',
   },
 });
 
-export default @observer class Login extends Component {
+export default @observer @inject('actions') class Login extends Component {
   static propTypes = {
     onSubmit: PropTypes.func.isRequired,
     isSubmitting: PropTypes.bool.isRequired,
@@ -69,6 +79,7 @@ export default @observer class Login extends Component {
     signupRoute: PropTypes.string.isRequired,
     passwordRoute: PropTypes.string.isRequired,
     error: globalErrorPropType.isRequired,
+    actions: PropTypes.object.isRequired,
   };
 
   static contextTypes = {
@@ -103,6 +114,10 @@ export default @observer class Login extends Component {
     });
   }
 
+  useLocalServer() {
+    serverlessLogin(this.props.actions);
+  }
+
   render() {
     const { form } = this;
     const { intl } = this.context;
@@ -179,7 +194,8 @@ export default @observer class Login extends Component {
           )}
         </form>
         <div className="auth__links">
-          <Link to="/settings/app">Change server</Link>
+          <Link to="/settings/app">{intl.formatMessage(messages.changeServer)}</Link>
+          <a onClick={this.useLocalServer.bind(this)}>{intl.formatMessage(messages.serverless)}</a>
           <Link to={signupRoute}>{intl.formatMessage(messages.signupLink)}</Link>
           <Link to={passwordRoute}>{intl.formatMessage(messages.passwordLink)}</Link>
         </div>
diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js
index b36e71ce1..47e9daf18 100644
--- a/src/components/auth/Signup.js
+++ b/src/components/auth/Signup.js
@@ -1,11 +1,13 @@
+/* eslint jsx-a11y/anchor-is-valid: 0 */
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { observer } from 'mobx-react';
+import { observer, inject } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
 
 import { isDevMode, useLiveAPI } from '../../environment';
 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';
@@ -58,18 +60,27 @@ 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',
   },
 });
 
-export default @observer class Signup extends Component {
+export default @observer @inject('actions') class Signup extends Component {
   static propTypes = {
     onSubmit: PropTypes.func.isRequired,
     isSubmitting: PropTypes.bool.isRequired,
     loginRoute: PropTypes.string.isRequired,
     error: globalErrorPropType.isRequired,
+    actions: PropTypes.object.isRequired,
   };
 
   static contextTypes = {
@@ -112,6 +123,10 @@ export default @observer class Signup extends Component {
     });
   }
 
+  useLocalServer() {
+    serverlessLogin(this.props.actions);
+  }
+
   render() {
     const { form } = this;
     const { intl } = this.context;
@@ -183,7 +198,8 @@ export default @observer class Signup extends Component {
             </p>
           </form>
           <div className="auth__links">
-            <Link to="/settings/app">Change server</Link>
+            <Link to="/settings/app">{intl.formatMessage(messages.changeServer)}</Link>
+            <a onClick={this.useLocalServer.bind(this)}>{intl.formatMessage(messages.serverless)}</a>
             <Link to={loginRoute}>{intl.formatMessage(messages.loginLink)}</Link>
           </div>
         </div>
diff --git a/src/components/auth/Welcome.js b/src/components/auth/Welcome.js
index ef917e336..2ca8b430f 100644
--- a/src/components/auth/Welcome.js
+++ b/src/components/auth/Welcome.js
@@ -1,7 +1,9 @@
+/* eslint jsx-a11y/anchor-is-valid: 0 */
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
+import { observer, PropTypes as MobxPropTypes, inject } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
+import serverlessLogin from '../../helpers/serverless-helpers';
 
 import Link from '../ui/Link';
 
@@ -14,19 +16,28 @@ const messages = defineMessages({
     id: 'welcome.loginButton',
     defaultMessage: '!!!Login to your account',
   },
+  serverless: {
+    id: 'services.serverless',
+    defaultMessage: '!!!Use Ferdi without an Account',
+  },
 });
 
-export default @observer class Login extends Component {
+export default @observer @inject('actions') class Login extends Component {
   static propTypes = {
     loginRoute: PropTypes.string.isRequired,
     signupRoute: PropTypes.string.isRequired,
     recipes: MobxPropTypes.arrayOrObservableArray.isRequired,
+    actions: PropTypes.object.isRequired,
   };
 
   static contextTypes = {
     intl: intlShape,
   };
 
+  useLocalServer() {
+    serverlessLogin(this.props.actions);
+  }
+
   render() {
     const { intl } = this.context;
     const {
@@ -53,6 +64,12 @@ export default @observer class Login extends Component {
           </Link>
           <br />
           <br />
+          <a className="button" onClick={this.useLocalServer.bind(this)}>
+            {intl.formatMessage(messages.serverless)}
+          </a>
+          <br />
+          <br />
+
 
           <Link to="settings/app">
             <span style={{
diff --git a/src/components/services/content/Services.js b/src/components/services/content/Services.js
index edff29ae8..6d7909362 100644
--- a/src/components/services/content/Services.js
+++ b/src/components/services/content/Services.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
+import { observer, PropTypes as MobxPropTypes, inject } from 'mobx-react';
 import { Link } from 'react-router';
 import { defineMessages, intlShape } from 'react-intl';
 import Confetti from 'react-confetti';
@@ -9,6 +9,7 @@ import injectSheet from 'react-jss';
 
 import ServiceView from './ServiceView';
 import Appear from '../../ui/effects/Appear';
+import serverlessLogin from '../../../helpers/serverless-helpers';
 
 const messages = defineMessages({
   welcome: {
@@ -23,6 +24,10 @@ const messages = defineMessages({
     id: 'services.login',
     defaultMessage: '!!!Please login to use Ferdi.',
   },
+  serverless: {
+    id: 'services.serverless',
+    defaultMessage: '!!!Use Ferdi without an Account',
+  },
   serverInfo: {
     id: 'services.serverInfo',
     defaultMessage: '!!!Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.',
@@ -39,7 +44,7 @@ const styles = {
   },
 };
 
-export default @observer @injectSheet(styles) class Services extends Component {
+export default @observer @inject('actions') @injectSheet(styles) class Services extends Component {
   static propTypes = {
     services: MobxPropTypes.arrayOrObservableArray,
     setWebviewReference: PropTypes.func.isRequired,
@@ -52,6 +57,7 @@ export default @observer @injectSheet(styles) class Services extends Component {
     userHasCompletedSignup: PropTypes.bool.isRequired,
     hasActivatedTrial: PropTypes.bool.isRequired,
     classes: PropTypes.object.isRequired,
+    actions: PropTypes.object.isRequired,
   };
 
   static defaultProps = {
@@ -68,6 +74,12 @@ export default @observer @injectSheet(styles) class Services extends Component {
 
   _confettiTimeout = null;
 
+  constructor(props) {
+    super(props);
+
+    this.useLocalServer = this.useLocalServer.bind(this);
+  }
+
   componentDidMount() {
     this._confettiTimeout = window.setTimeout(() => {
       this.setState({
@@ -82,6 +94,10 @@ export default @observer @injectSheet(styles) class Services extends Component {
     }
   }
 
+  useLocalServer() {
+    serverlessLogin(this.props.actions);
+  }
+
   render() {
     const {
       services,
@@ -136,6 +152,18 @@ export default @observer @injectSheet(styles) class Services extends Component {
                 <Link to={isLoggedIn ? '/settings/services' : '/auth/welcome'} className="button">
                   { isLoggedIn ? intl.formatMessage(messages.getStarted) : 'Login' }
                 </Link>
+                {!isLoggedIn && (
+                  <button
+                    type="button"
+                    className="button"
+                    style={{
+                      marginLeft: 10,
+                    }}
+                    onClick={this.useLocalServer}
+                  >
+                    {intl.formatMessage(messages.serverless)}
+                  </button>
+                )}
               </Appear>
             </div>
           </Appear>
diff --git a/src/helpers/serverless-helpers.js b/src/helpers/serverless-helpers.js
new file mode 100644
index 000000000..741bce7f9
--- /dev/null
+++ b/src/helpers/serverless-helpers.js
@@ -0,0 +1,16 @@
+export default function useLocalServer(actions) {
+  // Use local server for user
+  actions.settings.update({
+    type: 'app',
+    data: {
+      server: 'http://localhost:45569',
+    },
+  });
+
+  // Log into local server
+  // Credentials are ignored by the server but the client requires them
+  actions.user.login({
+    email: 'ferdi@localhost',
+    password: 'FERDI_',
+  });
+}
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index c2ce3d783..e22c80246 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -272,143 +272,169 @@
         "defaultMessage": "!!!Sign in",
         "end": {
           "column": 3,
-          "line": 20
+          "line": 22
         },
         "file": "src/components/auth/Login.js",
         "id": "login.headline",
         "start": {
           "column": 12,
-          "line": 17
+          "line": 19
         }
       },
       {
         "defaultMessage": "!!!Email address",
         "end": {
           "column": 3,
-          "line": 24
+          "line": 26
         },
         "file": "src/components/auth/Login.js",
         "id": "login.email.label",
         "start": {
           "column": 14,
-          "line": 21
+          "line": 23
         }
       },
       {
         "defaultMessage": "!!!Password",
         "end": {
           "column": 3,
-          "line": 28
+          "line": 30
         },
         "file": "src/components/auth/Login.js",
         "id": "login.password.label",
         "start": {
           "column": 17,
-          "line": 25
+          "line": 27
         }
       },
       {
         "defaultMessage": "!!!Sign in",
         "end": {
           "column": 3,
-          "line": 32
+          "line": 34
         },
         "file": "src/components/auth/Login.js",
         "id": "login.submit.label",
         "start": {
           "column": 21,
-          "line": 29
+          "line": 31
         }
       },
       {
         "defaultMessage": "!!!Email or password not valid",
         "end": {
           "column": 3,
-          "line": 36
+          "line": 38
         },
         "file": "src/components/auth/Login.js",
         "id": "login.invalidCredentials",
         "start": {
           "column": 22,
-          "line": 33
+          "line": 35
         }
       },
       {
         "defaultMessage": "!!!Using a Franz account to log in?",
         "end": {
           "column": 3,
-          "line": 40
+          "line": 42
         },
         "file": "src/components/auth/Login.js",
         "id": "login.customServerQuestion",
         "start": {
           "column": 24,
-          "line": 37
+          "line": 39
         }
       },
       {
         "defaultMessage": "!!!Try importing your Franz account into Ferdi",
         "end": {
           "column": 3,
-          "line": 44
+          "line": 46
         },
         "file": "src/components/auth/Login.js",
         "id": "login.customServerSuggestion",
         "start": {
           "column": 26,
-          "line": 41
+          "line": 43
         }
       },
       {
         "defaultMessage": "!!!Your session expired, please login again.",
         "end": {
           "column": 3,
-          "line": 48
+          "line": 50
         },
         "file": "src/components/auth/Login.js",
         "id": "login.tokenExpired",
         "start": {
           "column": 16,
-          "line": 45
+          "line": 47
         }
       },
       {
         "defaultMessage": "!!!Your session expired, please login again.",
         "end": {
           "column": 3,
-          "line": 52
+          "line": 54
         },
         "file": "src/components/auth/Login.js",
         "id": "login.serverLogout",
         "start": {
           "column": 16,
-          "line": 49
+          "line": 51
         }
       },
       {
         "defaultMessage": "!!!Create a free account",
         "end": {
           "column": 3,
-          "line": 56
+          "line": 58
         },
         "file": "src/components/auth/Login.js",
         "id": "login.link.signup",
         "start": {
           "column": 14,
-          "line": 53
+          "line": 55
+        }
+      },
+      {
+        "defaultMessage": "!!!Change server",
+        "end": {
+          "column": 3,
+          "line": 62
+        },
+        "file": "src/components/auth/Login.js",
+        "id": "login.changeServer",
+        "start": {
+          "column": 16,
+          "line": 59
+        }
+      },
+      {
+        "defaultMessage": "!!!Use Ferdi without an Account",
+        "end": {
+          "column": 3,
+          "line": 66
+        },
+        "file": "src/components/auth/Login.js",
+        "id": "services.serverless",
+        "start": {
+          "column": 14,
+          "line": 63
         }
       },
       {
         "defaultMessage": "!!!Forgot password",
         "end": {
           "column": 3,
-          "line": 60
+          "line": 70
         },
         "file": "src/components/auth/Login.js",
         "id": "login.link.password",
         "start": {
           "column": 16,
-          "line": 57
+          "line": 67
         }
       }
     ],
@@ -638,143 +664,169 @@
         "defaultMessage": "!!!Sign up",
         "end": {
           "column": 3,
-          "line": 20
+          "line": 22
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.headline",
         "start": {
           "column": 12,
-          "line": 17
+          "line": 19
         }
       },
       {
         "defaultMessage": "!!!Firstname",
         "end": {
           "column": 3,
-          "line": 24
+          "line": 26
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.firstname.label",
         "start": {
           "column": 18,
-          "line": 21
+          "line": 23
         }
       },
       {
         "defaultMessage": "!!!Lastname",
         "end": {
           "column": 3,
-          "line": 28
+          "line": 30
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.lastname.label",
         "start": {
           "column": 17,
-          "line": 25
+          "line": 27
         }
       },
       {
         "defaultMessage": "!!!Email address",
         "end": {
           "column": 3,
-          "line": 32
+          "line": 34
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.email.label",
         "start": {
           "column": 14,
-          "line": 29
+          "line": 31
         }
       },
       {
         "defaultMessage": "!!!Password",
         "end": {
           "column": 3,
-          "line": 40
+          "line": 42
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.password.label",
         "start": {
           "column": 17,
-          "line": 37
+          "line": 39
         }
       },
       {
         "defaultMessage": "!!!By creating a Ferdi account you accept the",
         "end": {
           "column": 3,
-          "line": 44
+          "line": 46
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.legal.info",
         "start": {
           "column": 13,
-          "line": 41
+          "line": 43
         }
       },
       {
         "defaultMessage": "!!!Terms of service",
         "end": {
           "column": 3,
-          "line": 48
+          "line": 50
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.legal.terms",
         "start": {
           "column": 9,
-          "line": 45
+          "line": 47
         }
       },
       {
         "defaultMessage": "!!!Privacy Statement",
         "end": {
           "column": 3,
-          "line": 52
+          "line": 54
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.legal.privacy",
         "start": {
           "column": 11,
-          "line": 49
+          "line": 51
         }
       },
       {
         "defaultMessage": "!!!Create account",
         "end": {
           "column": 3,
-          "line": 56
+          "line": 58
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.submit.label",
         "start": {
           "column": 21,
-          "line": 53
+          "line": 55
         }
       },
       {
         "defaultMessage": "!!!Already have an account, sign in?",
         "end": {
           "column": 3,
-          "line": 60
+          "line": 62
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.link.login",
         "start": {
           "column": 13,
-          "line": 57
+          "line": 59
+        }
+      },
+      {
+        "defaultMessage": "!!!Change server",
+        "end": {
+          "column": 3,
+          "line": 66
+        },
+        "file": "src/components/auth/Signup.js",
+        "id": "login.changeServer",
+        "start": {
+          "column": 16,
+          "line": 63
+        }
+      },
+      {
+        "defaultMessage": "!!!Use Ferdi without an Account",
+        "end": {
+          "column": 3,
+          "line": 70
+        },
+        "file": "src/components/auth/Signup.js",
+        "id": "services.serverless",
+        "start": {
+          "column": 14,
+          "line": 67
         }
       },
       {
         "defaultMessage": "!!!A user with that email address already exists",
         "end": {
           "column": 3,
-          "line": 64
+          "line": 74
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.emailDuplicate",
         "start": {
           "column": 18,
-          "line": 61
+          "line": 71
         }
       }
     ],
@@ -786,26 +838,39 @@
         "defaultMessage": "!!!Create a free account",
         "end": {
           "column": 3,
-          "line": 12
+          "line": 14
         },
         "file": "src/components/auth/Welcome.js",
         "id": "welcome.signupButton",
         "start": {
           "column": 16,
-          "line": 9
+          "line": 11
         }
       },
       {
         "defaultMessage": "!!!Login to your account",
         "end": {
           "column": 3,
-          "line": 16
+          "line": 18
         },
         "file": "src/components/auth/Welcome.js",
         "id": "welcome.loginButton",
         "start": {
           "column": 15,
-          "line": 13
+          "line": 15
+        }
+      },
+      {
+        "defaultMessage": "!!!Use Ferdi without an Account",
+        "end": {
+          "column": 3,
+          "line": 22
+        },
+        "file": "src/components/auth/Welcome.js",
+        "id": "services.serverless",
+        "start": {
+          "column": 14,
+          "line": 19
         }
       }
     ],
@@ -1167,52 +1232,65 @@
         "defaultMessage": "!!!Welcome to Ferdi",
         "end": {
           "column": 3,
-          "line": 17
+          "line": 18
         },
         "file": "src/components/services/content/Services.js",
         "id": "services.welcome",
         "start": {
           "column": 11,
-          "line": 14
+          "line": 15
         }
       },
       {
         "defaultMessage": "!!!Get started",
         "end": {
           "column": 3,
-          "line": 21
+          "line": 22
         },
         "file": "src/components/services/content/Services.js",
         "id": "services.getStarted",
         "start": {
           "column": 14,
-          "line": 18
+          "line": 19
         }
       },
       {
         "defaultMessage": "!!!Please login to use Ferdi.",
         "end": {
           "column": 3,
-          "line": 25
+          "line": 26
         },
         "file": "src/components/services/content/Services.js",
         "id": "services.login",
         "start": {
           "column": 9,
-          "line": 22
+          "line": 23
+        }
+      },
+      {
+        "defaultMessage": "!!!Use Ferdi without an Account",
+        "end": {
+          "column": 3,
+          "line": 30
+        },
+        "file": "src/components/services/content/Services.js",
+        "id": "services.serverless",
+        "start": {
+          "column": 14,
+          "line": 27
         }
       },
       {
         "defaultMessage": "!!!Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
         "end": {
           "column": 3,
-          "line": 29
+          "line": 34
         },
         "file": "src/components/services/content/Services.js",
         "id": "services.serverInfo",
         "start": {
           "column": 14,
-          "line": 26
+          "line": 31
         }
       }
     ],
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 2cdc57e3f..e7b0ced92 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -54,6 +54,7 @@
   "locked.invalidCredentials": "Password invalid",
   "locked.password.label": "Password",
   "locked.submit.label": "Unlock",
+  "login.changeServer": "Change server",
   "login.customServerQuestion": "Using a Franz account to log in?",
   "login.customServerSuggestion": "Try importing your Franz account into Ferdi",
   "login.email.label": "Email address",
@@ -186,6 +187,7 @@
   "services.getStarted": "Get started",
   "services.login": "Please login to use Ferdi.",
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
+  "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "Welcome to Ferdi",
   "settings.account.account.editButton": "Edit account",
   "settings.account.accountType.basic": "Basic Account",
diff --git a/src/i18n/messages/src/components/auth/Login.json b/src/i18n/messages/src/components/auth/Login.json
index 7e4b32294..c3b4ee4eb 100644
--- a/src/i18n/messages/src/components/auth/Login.json
+++ b/src/i18n/messages/src/components/auth/Login.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Sign in",
     "file": "src/components/auth/Login.js",
     "start": {
-      "line": 17,
+      "line": 19,
       "column": 12
     },
     "end": {
-      "line": 20,
+      "line": 22,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Email address",
     "file": "src/components/auth/Login.js",
     "start": {
-      "line": 21,
+      "line": 23,
       "column": 14
     },
     "end": {
-      "line": 24,
+      "line": 26,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Password",
     "file": "src/components/auth/Login.js",
     "start": {
-      "line": 25,
+      "line": 27,
       "column": 17
     },
     "end": {
-      "line": 28,
+      "line": 30,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Sign in",
     "file": "src/components/auth/Login.js",
     "start": {
-      "line": 29,
+      "line": 31,
       "column": 21
     },
     "end": {
-      "line": 32,
+      "line": 34,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Email or password not valid",
     "file": "src/components/auth/Login.js",
     "start": {
-      "line": 33,
+      "line": 35,
       "column": 22
     },
     "end": {
-      "line": 36,
+      "line": 38,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Using a Franz account to log in?",
     "file": "src/components/auth/Login.js",
     "start": {
-      "line": 37,
+      "line": 39,
       "column": 24
     },
     "end": {
-      "line": 40,
+      "line": 42,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Try importing your Franz account into Ferdi",
     "file": "src/components/auth/Login.js",
     "start": {
-      "line": 41,
+      "line": 43,
       "column": 26
     },
     "end": {
-      "line": 44,
+      "line": 46,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Your session expired, please login again.",
     "file": "src/components/auth/Login.js",
     "start": {
-      "line": 45,
+      "line": 47,
       "column": 16
     },
     "end": {
-      "line": 48,
+      "line": 50,
       "column": 3
     }
   },
@@ -108,11 +108,11 @@
     "defaultMessage": "!!!Your session expired, please login again.",
     "file": "src/components/auth/Login.js",
     "start": {
-      "line": 49,
+      "line": 51,
       "column": 16
     },
     "end": {
-      "line": 52,
+      "line": 54,
       "column": 3
     }
   },
@@ -121,11 +121,37 @@
     "defaultMessage": "!!!Create a free account",
     "file": "src/components/auth/Login.js",
     "start": {
-      "line": 53,
+      "line": 55,
       "column": 14
     },
     "end": {
-      "line": 56,
+      "line": 58,
+      "column": 3
+    }
+  },
+  {
+    "id": "login.changeServer",
+    "defaultMessage": "!!!Change server",
+    "file": "src/components/auth/Login.js",
+    "start": {
+      "line": 59,
+      "column": 16
+    },
+    "end": {
+      "line": 62,
+      "column": 3
+    }
+  },
+  {
+    "id": "services.serverless",
+    "defaultMessage": "!!!Use Ferdi without an Account",
+    "file": "src/components/auth/Login.js",
+    "start": {
+      "line": 63,
+      "column": 14
+    },
+    "end": {
+      "line": 66,
       "column": 3
     }
   },
@@ -134,11 +160,11 @@
     "defaultMessage": "!!!Forgot password",
     "file": "src/components/auth/Login.js",
     "start": {
-      "line": 57,
+      "line": 67,
       "column": 16
     },
     "end": {
-      "line": 60,
+      "line": 70,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/auth/Signup.json b/src/i18n/messages/src/components/auth/Signup.json
index 9aa7b25ab..2628c9aa3 100644
--- a/src/i18n/messages/src/components/auth/Signup.json
+++ b/src/i18n/messages/src/components/auth/Signup.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Sign up",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 17,
+      "line": 19,
       "column": 12
     },
     "end": {
-      "line": 20,
+      "line": 22,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Firstname",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 21,
+      "line": 23,
       "column": 18
     },
     "end": {
-      "line": 24,
+      "line": 26,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Lastname",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 25,
+      "line": 27,
       "column": 17
     },
     "end": {
-      "line": 28,
+      "line": 30,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Email address",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 29,
+      "line": 31,
       "column": 14
     },
     "end": {
-      "line": 32,
+      "line": 34,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Password",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 37,
+      "line": 39,
       "column": 17
     },
     "end": {
-      "line": 40,
+      "line": 42,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!By creating a Ferdi account you accept the",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 41,
+      "line": 43,
       "column": 13
     },
     "end": {
-      "line": 44,
+      "line": 46,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Terms of service",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 45,
+      "line": 47,
       "column": 9
     },
     "end": {
-      "line": 48,
+      "line": 50,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Privacy Statement",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 49,
+      "line": 51,
       "column": 11
     },
     "end": {
-      "line": 52,
+      "line": 54,
       "column": 3
     }
   },
@@ -108,11 +108,11 @@
     "defaultMessage": "!!!Create account",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 53,
+      "line": 55,
       "column": 21
     },
     "end": {
-      "line": 56,
+      "line": 58,
       "column": 3
     }
   },
@@ -121,11 +121,37 @@
     "defaultMessage": "!!!Already have an account, sign in?",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 57,
+      "line": 59,
       "column": 13
     },
     "end": {
-      "line": 60,
+      "line": 62,
+      "column": 3
+    }
+  },
+  {
+    "id": "login.changeServer",
+    "defaultMessage": "!!!Change server",
+    "file": "src/components/auth/Signup.js",
+    "start": {
+      "line": 63,
+      "column": 16
+    },
+    "end": {
+      "line": 66,
+      "column": 3
+    }
+  },
+  {
+    "id": "services.serverless",
+    "defaultMessage": "!!!Use Ferdi without an Account",
+    "file": "src/components/auth/Signup.js",
+    "start": {
+      "line": 67,
+      "column": 14
+    },
+    "end": {
+      "line": 70,
       "column": 3
     }
   },
@@ -134,11 +160,11 @@
     "defaultMessage": "!!!A user with that email address already exists",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 61,
+      "line": 71,
       "column": 18
     },
     "end": {
-      "line": 64,
+      "line": 74,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/auth/Welcome.json b/src/i18n/messages/src/components/auth/Welcome.json
index b4d2ce689..3f0c1e5c2 100644
--- a/src/i18n/messages/src/components/auth/Welcome.json
+++ b/src/i18n/messages/src/components/auth/Welcome.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Create a free account",
     "file": "src/components/auth/Welcome.js",
     "start": {
-      "line": 9,
+      "line": 11,
       "column": 16
     },
     "end": {
-      "line": 12,
+      "line": 14,
       "column": 3
     }
   },
@@ -17,11 +17,24 @@
     "defaultMessage": "!!!Login to your account",
     "file": "src/components/auth/Welcome.js",
     "start": {
-      "line": 13,
+      "line": 15,
       "column": 15
     },
     "end": {
-      "line": 16,
+      "line": 18,
+      "column": 3
+    }
+  },
+  {
+    "id": "services.serverless",
+    "defaultMessage": "!!!Use Ferdi without an Account",
+    "file": "src/components/auth/Welcome.js",
+    "start": {
+      "line": 19,
+      "column": 14
+    },
+    "end": {
+      "line": 22,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/services/content/Services.json b/src/i18n/messages/src/components/services/content/Services.json
index c2e57b8b5..6a5eb052e 100644
--- a/src/i18n/messages/src/components/services/content/Services.json
+++ b/src/i18n/messages/src/components/services/content/Services.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Welcome to Ferdi",
     "file": "src/components/services/content/Services.js",
     "start": {
-      "line": 14,
+      "line": 15,
       "column": 11
     },
     "end": {
-      "line": 17,
+      "line": 18,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Get started",
     "file": "src/components/services/content/Services.js",
     "start": {
-      "line": 18,
+      "line": 19,
       "column": 14
     },
     "end": {
-      "line": 21,
+      "line": 22,
       "column": 3
     }
   },
@@ -30,11 +30,24 @@
     "defaultMessage": "!!!Please login to use Ferdi.",
     "file": "src/components/services/content/Services.js",
     "start": {
-      "line": 22,
+      "line": 23,
       "column": 9
     },
     "end": {
-      "line": 25,
+      "line": 26,
+      "column": 3
+    }
+  },
+  {
+    "id": "services.serverless",
+    "defaultMessage": "!!!Use Ferdi without an Account",
+    "file": "src/components/services/content/Services.js",
+    "start": {
+      "line": 27,
+      "column": 14
+    },
+    "end": {
+      "line": 30,
       "column": 3
     }
   },
@@ -43,11 +56,11 @@
     "defaultMessage": "!!!Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
     "file": "src/components/services/content/Services.js",
     "start": {
-      "line": 26,
+      "line": 31,
       "column": 14
     },
     "end": {
-      "line": 29,
+      "line": 34,
       "column": 3
     }
   }
diff --git a/src/index.js b/src/index.js
index 2ee404c0b..338a8e795 100644
--- a/src/index.js
+++ b/src/index.js
@@ -34,6 +34,9 @@ import { isPositionValid } from './electron/windowUtils';
 import { appId } from './package.json'; // eslint-disable-line import/no-unresolved
 import './electron/exception';
 
+// Start internal server
+import './server/start';
+
 import {
   DEFAULT_APP_SETTINGS,
   DEFAULT_WINDOW_OPTIONS,
diff --git a/src/styles/services.scss b/src/styles/services.scss
index 5acf92d2c..ef1097791 100644
--- a/src/styles/services.scss
+++ b/src/styles/services.scss
@@ -64,7 +64,7 @@
       margin: 25px 0 40px;
     }
 
-    a.button,
+    .button,
     button { margin: 40px 0 20px; }
   }
 
diff --git a/src/styles/type.scss b/src/styles/type.scss
index 135d32da0..1b3a905ef 100644
--- a/src/styles/type.scss
+++ b/src/styles/type.scss
@@ -33,7 +33,7 @@ p {
 
 strong { font-weight: bold; }
 
-a {
+a, button {
   color: $theme-text-color;
   text-decoration: none;
 
@@ -47,6 +47,7 @@ a {
     position: relative;
     text-align: center;
     transition: background .5s, color .5s;
+    cursor: pointer;
 
     &:hover {
       background: darken($theme-brand-primary, 5%);
diff --git a/src/styles/welcome.scss b/src/styles/welcome.scss
index b517431f0..c1f85391e 100644
--- a/src/styles/welcome.scss
+++ b/src/styles/welcome.scss
@@ -48,6 +48,7 @@
   .button {
     border-color: #FFF;
     color: #FFF;
+    cursor: pointer;
 
     &:hover {
       background: #FFF;