Removed hardcoded strings and reused constants defined in config.js (#1499)

9 files changed, 24 insertions, 21 deletions

diff --git a/src/components/auth/AuthLayout.js b/src/components/auth/AuthLayout.js
index 4783fc6a0..6fa3adf92 100644
--- a/src/components/auth/AuthLayout.js
+++ b/src/components/auth/AuthLayout.js
@@ -12,6 +12,7 @@ import globalMessages from '../../i18n/globalMessages';
 
 import { isWindows } from '../../environment';
 import AppUpdateInfoBar from '../AppUpdateInfoBar';
+import { GITHUB_FERDI_URL } from '../../config';
 
 export default @observer class AuthLayout extends Component {
   static propTypes = {
@@ -94,7 +95,7 @@ export default @observer class AuthLayout extends Component {
             })}
           </div>
           {/* </div> */}
-          <Link to="https://github.com/getferdi/ferdi" className="auth__adlk" target="_blank">
+          <Link to={`${GITHUB_FERDI_URL}/ferdi`} className="auth__adlk" target="_blank">
             <img src="./assets/images/adlk.svg" alt="" />
           </Link>
         </div>
diff --git a/src/components/auth/ChangeServer.js b/src/components/auth/ChangeServer.js
index 68c2303a4..0dedd825a 100644
--- a/src/components/auth/ChangeServer.js
+++ b/src/components/auth/ChangeServer.js
@@ -8,6 +8,7 @@ import Select from '../ui/Select';
 import Button from '../ui/Button';
 import Infobox from '../ui/Infobox';
 import { url, required } from '../../helpers/validation-helpers';
+import { LIVE_FERDI_API, LIVE_FRANZ_API } from '../../config';
 
 const messages = defineMessages({
   headline: {
@@ -47,9 +48,9 @@ export default @observer class ChangeServer extends Component {
     intl: intlShape,
   };
 
-  ferdiServer='https://api.getferdi.com';
+  ferdiServer=LIVE_FERDI_API;
 
-  franzServer='https://api.franzinfra.com';
+  franzServer=LIVE_FRANZ_API;
 
   defaultServers=[this.franzServer, this.ferdiServer];
 
diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js
index 23fdfcac7..52b09eab6 100644
--- a/src/components/auth/Login.js
+++ b/src/components/auth/Login.js
@@ -4,7 +4,8 @@ import PropTypes from 'prop-types';
 import { observer, inject } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
 
-import { isDevMode, useLiveAPI } from '../../environment';
+import { LIVE_FRANZ_API } from '../../config';
+import { API_VERSION, isDevMode, useLiveAPI } from '../../environment';
 import Form from '../../lib/Form';
 import { required, email } from '../../helpers/validation-helpers';
 import serverlessLogin from '../../helpers/serverless-helpers';
@@ -164,12 +165,12 @@ export default @inject('actions') @observer class Login extends Component {
           {error.code === 'invalid-credentials' && (
             <>
               <p className="error-message center">{intl.formatMessage(messages.invalidCredentials)}</p>
-              { window.ferdi.stores.settings.all.app.server !== 'https://api.franzinfra.com' && (
+              { window.ferdi.stores.settings.all.app.server !== LIVE_FRANZ_API && (
                 <p className="error-message center">
                     {intl.formatMessage(messages.customServerQuestion)}
                   {' '}
                   <Link
-                    to={`${window.ferdi.stores.settings.all.app.server.replace('v1', '')}/import`}
+                    to={`${window.ferdi.stores.settings.all.app.server.replace(API_VERSION, '')}/import`}
                     target="_blank"
                     style={{ cursor: 'pointer', textDecoration: 'underline' }}
                   >
diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js
index 6a7db5cde..140867ea1 100644
--- a/src/components/auth/Signup.js
+++ b/src/components/auth/Signup.js
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import { observer, inject } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
 
-import { isDevMode, useLiveAPI } from '../../environment';
+import { isDevMode, termsBase, useLiveAPI } from '../../environment';
 import Form from '../../lib/Form';
 import { required, email, minLength } from '../../helpers/validation-helpers';
 import serverlessLogin from '../../helpers/serverless-helpers';
@@ -135,8 +135,6 @@ export default @inject('actions') @observer class Signup extends Component {
       isSubmitting, loginRoute, error, changeServerRoute,
     } = this.props;
 
-    const termsBase = window.ferdi.stores.settings.all.app.server !== 'https://api.franzinfra.com' ? window.ferdi.stores.settings.all.app.server : 'https://meetfranz.com';
-
     return (
       <div className="auth__scroll-container">
         <div className="auth__container auth__container--signup">
@@ -183,7 +181,7 @@ export default @inject('actions') @observer class Signup extends Component {
               {intl.formatMessage(messages.legalInfo)}
               <br />
               <Link
-                to={`${termsBase}/terms`}
+                to={`${termsBase()}/terms`}
                 target="_blank"
                 className="link"
               >
@@ -191,7 +189,7 @@ export default @inject('actions') @observer class Signup extends Component {
               </Link>
               &nbsp;&amp;&nbsp;
               <Link
-                to={`${termsBase}/privacy`}
+                to={`${termsBase()}/privacy`}
                 target="_blank"
                 className="link"
               >
diff --git a/src/components/services/content/ConnectionLostBanner.js b/src/components/services/content/ConnectionLostBanner.js
index 36ab2b351..e54a88faa 100644
--- a/src/components/services/content/ConnectionLostBanner.js
+++ b/src/components/services/content/ConnectionLostBanner.js
@@ -8,7 +8,7 @@ import { intlShape, defineMessages } from 'react-intl';
 import {
   mdiAlert,
 } from '@mdi/js';
-import { LIVE_API_WEBSITE } from '../../../config';
+import { LIVE_API_FERDI_WEBSITE } from '../../../config';
 // import { Button } from '@meetfranz/forms';
 
 const messages = defineMessages({
@@ -98,7 +98,7 @@ class ConnectionLostBanner extends Component {
           {intl.formatMessage(messages.text, { name })}
           <br />
           <a
-            href={`${LIVE_API_WEBSITE}/support#what-does-franz-lost-the-connection-to-service-mean`}
+            href={`${LIVE_API_FERDI_WEBSITE}/support#what-does-franz-lost-the-connection-to-service-mean`}
             className={classes.link}
           >
             {intl.formatMessage(messages.moreInformation)}
diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js
index 809bfda6e..68d88e218 100644
--- a/src/components/settings/account/AccountDashboard.js
+++ b/src/components/settings/account/AccountDashboard.js
@@ -11,7 +11,7 @@ import Button from '../../ui/Button';
 import Infobox from '../../ui/Infobox';
 import SubscriptionForm from '../../../containers/subscription/SubscriptionFormScreen';
 import { i18nPlanName } from '../../../helpers/plan-helpers';
-import { LOCAL_SERVER } from '../../../config';
+import { LOCAL_SERVER, LIVE_FRANZ_API } from '../../../config';
 
 const messages = defineMessages({
   headline: {
@@ -154,7 +154,7 @@ class AccountDashboard extends Component {
     }
 
     const isUsingWithoutAccount = server === LOCAL_SERVER;
-    const isUsingFranzServer = server === 'https://api.franzinfra.com';
+    const isUsingFranzServer = server === LIVE_FRANZ_API;
 
     return (
       <div className="settings__main">
diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js
index f7786f4e8..616c8c587 100644
--- a/src/components/settings/navigation/SettingsNavigation.js
+++ b/src/components/settings/navigation/SettingsNavigation.js
@@ -5,7 +5,7 @@ import { inject, observer } from 'mobx-react';
 import { ProBadge } from '@meetfranz/ui';
 import { RouterStore } from 'mobx-react-router';
 
-import { LOCAL_SERVER, LIVE_API } from '../../../config';
+import { LOCAL_SERVER, LIVE_FERDI_API, LIVE_FRANZ_API } from '../../../config';
 import Link from '../../ui/Link';
 import { workspaceStore } from '../../../features/workspaces';
 import UIStore from '../../../stores/UIStore';
@@ -82,7 +82,7 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e
         this.props.actions.settings.update({
           type: 'app',
           data: {
-            server: LIVE_API,
+            server: LIVE_FERDI_API,
           },
         });
       }
@@ -105,7 +105,7 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e
     const { intl } = this.context;
     const isLoggedIn = Boolean(localStorage.getItem('authToken'));
     const isUsingWithoutAccount = stores.settings.app.server === LOCAL_SERVER;
-    const isUsingFranzServer = stores.settings.app.server === 'https://api.franzinfra.com';
+    const isUsingFranzServer = stores.settings.app.server === LIVE_FRANZ_API;
 
     return (
       <div className="settings-navigation">
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 0c0366335..08e5efa2a 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -16,6 +16,7 @@ import Input from '../../ui/Input';
 import {
   DEFAULT_APP_SETTINGS,
   FRANZ_TRANSLATION,
+  GITHUB_FRANZ_URL,
 } from '../../../config';
 import { isMac, isWindows } from '../../../environment';
 
@@ -677,13 +678,13 @@ export default @observer class EditSettingsForm extends Component {
 
                   Ferdi is based on
                   {' '}
-                  <a href="https://github.com/meetfranz/franz" target="_blank">Franz</a>
+                  <a href={`${GITHUB_FRANZ_URL}/franz`} target="_blank">Franz</a>
 
 
                   , a project published
                   under the
                   {' '}
-                  <a href="https://github.com/meetfranz/franz/blob/master/LICENSE" target="_blank">Apache-2.0 License</a>
+                  <a href={`${GITHUB_FRANZ_URL}/franz/blob/master/LICENSE`} target="_blank">Apache-2.0 License</a>
                 </span>
                 <br />
                 <span className="mdi mdi-information" />
diff --git a/src/components/settings/team/TeamDashboard.js b/src/components/settings/team/TeamDashboard.js
index 72358d485..f26f4cc0c 100644
--- a/src/components/settings/team/TeamDashboard.js
+++ b/src/components/settings/team/TeamDashboard.js
@@ -12,6 +12,7 @@ import Button from '../../ui/Button';
 import Infobox from '../../ui/Infobox';
 import globalMessages from '../../../i18n/globalMessages';
 import UpgradeButton from '../../ui/UpgradeButton';
+import { LIVE_FRANZ_API } from '../../../config';
 
 const messages = defineMessages({
   headline: {
@@ -125,7 +126,7 @@ export default @injectSheet(styles) @observer class TeamDashboard extends Compon
     } = this.props;
     const { intl } = this.context;
 
-    if (server === 'https://api.franzinfra.com') {
+    if (server === LIVE_FRANZ_API) {
       return (
         <div className="settings__main">
           <div className="settings__header">