Add Ferdi server to hosted services

src/api/apiBase.ts

@@ -34,7 +34,6 @@ const apiBase = (withVersion = true) => {
 export default apiBase;
 
 export function termsBase() {
-  // TODO: This needs to handle local vs ferdium vs franz servers
   return (window as any).ferdium.stores.settings.all.app.server !== LIVE_FRANZ_API
     ? (window as any).ferdium.stores.settings.all.app.server
     : DEV_API_FRANZ_WEBSITE;

src/components/auth/ChangeServer.js

@@ -9,7 +9,7 @@ import Button from '../ui/Button';
 import Link from '../ui/Link';
 import Infobox from '../ui/Infobox';
 import { url, required } from '../../helpers/validation-helpers';
-import { LIVE_FERDIUM_API, LIVE_FRANZ_API } from '../../config';
+import { LIVE_FERDIUM_API, LIVE_FRANZ_API, LIVE_FERDI_API } from '../../config';
 import globalMessages from '../../i18n/globalMessages';
 
 const messages = defineMessages({
@@ -43,9 +43,11 @@ class ChangeServer extends Component {
 
   ferdiumServer = LIVE_FERDIUM_API;
 
+  ferdiServer = LIVE_FERDI_API;
+
   franzServer = LIVE_FRANZ_API;
 
-  defaultServers = [this.franzServer, this.ferdiumServer];
+  defaultServers = [this.ferdiumServer, this.franzServer, this.ferdiServer];
 
   form = new Form(
     {
@@ -54,8 +56,9 @@ class ChangeServer extends Component {
           label: this.props.intl.formatMessage(messages.label),
           value: this.props.server,
           options: [
-            { value: this.ferdiumServer, label: 'Ferdium' },
+            { value: this.ferdiumServer, label: 'Ferdium (Default)' },
             { value: this.franzServer, label: 'Franz' },
+            { value: this.ferdiServer, label: 'Ferdi' },
             {
               value: this.defaultServers.includes(this.props.server)
                 ? ''
@@ -108,7 +111,7 @@ class ChangeServer extends Component {
         <form className="franz-form auth__form" onSubmit={e => this.submit(e)}>
           <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 && (
+          {(form.$('server').value === this.franzServer || form.$('server').value === this.ferdiServer) && (
             <Infobox type="warning">
               {intl.formatMessage(messages.warning)}
             </Infobox>

src/components/auth/Login.js

@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import { observer, inject } from 'mobx-react';
 import { defineMessages, injectIntl } from 'react-intl';
 
-import { LIVE_FRANZ_API } from '../../config';
+import { LIVE_FRANZ_API, LIVE_FERDI_API } from '../../config';
 import { API_VERSION } from '../../environment-remote';
 import Form from '../../lib/Form';
 import { required, email } from '../../helpers/validation-helpers';
@@ -153,6 +153,24 @@ class Login extends Component {
                   </Link>
                 </p>
               )}
+              {window['ferdium'].stores.settings.all.app.server !==
+                LIVE_FERDI_API && (
+                <p className="error-message center">
+                  {intl.formatMessage(messages.customServerQuestion)}{' '}
+                  <Link
+                    to={`${window[
+                      'ferdium'
+                    ].stores.settings.all.app.server.replace(
+                      API_VERSION,
+                      '',
+                    )}/import`}
+                    target="_blank"
+                    style={{ cursor: 'pointer', textDecoration: 'underline' }}
+                  >
+                    {intl.formatMessage(messages.customServerSuggestion)}
+                  </Link>
+                </p>
+              )}
             </>
           )}
           {isSubmitting ? (

src/components/settings/account/AccountDashboard.js

@@ -8,7 +8,7 @@ import { H1, H2 } from '../../ui/headline';
 import Loader from '../../ui/Loader';
 import Button from '../../ui/Button';
 import Infobox from '../../ui/Infobox';
-import { LOCAL_SERVER, LIVE_FRANZ_API } from '../../../config';
+import { LOCAL_SERVER, LIVE_FRANZ_API, LIVE_FERDI_API } from '../../../config';
 
 const messages = defineMessages({
   headline: {
@@ -95,6 +95,7 @@ class AccountDashboard extends Component {
 
     const isUsingWithoutAccount = server === LOCAL_SERVER;
     const isUsingFranzServer = server === LIVE_FRANZ_API;
+    const isUsingFerdiServer = server === LIVE_FERDI_API;
 
     return (
       <div className="settings__main">
@@ -210,6 +211,29 @@ class AccountDashboard extends Component {
                       </div>
                     </div>
                   )}
+                  {isUsingFerdiServer && (
+                    <div className="account franz-form">
+                      <div className="account__box">
+                        <H2>
+                          {intl.formatMessage(messages.headlineDangerZone)}
+                        </H2>
+                        {!isDeleteAccountSuccessful && (
+                          <div className="account__subscription">
+                            <p>{intl.formatMessage(messages.deleteInfo)}</p>
+                            <Button
+                              label={intl.formatMessage(messages.deleteAccount)}
+                              buttonType="danger"
+                              onClick={() => deleteAccount()}
+                              loaded={!isLoadingDeleteAccount}
+                            />
+                          </div>
+                        )}
+                        {isDeleteAccountSuccessful && (
+                          <p>{intl.formatMessage(messages.deleteEmailSent)}</p>
+                        )}
+                      </div>
+                    </div>
+                  )}
                 </>
               )}
             </>

src/config.ts

@@ -13,6 +13,7 @@ export const DEV_FRANZ_API = 'https://dev.franzinfra.com';
 
 export const LIVE_FERDIUM_API = 'https://api.ferdium.org';
 export const LIVE_FRANZ_API = 'https://api.franzinfra.com';
+export const LIVE_FERDI_API = 'https://api.getferdi.com';
 
 // URL used to submit debugger information, see https://github.com/ferdium/debugger
 export const DEBUG_API = 'https://debug.ferdium.org';