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

4 files changed, 12 insertions, 11 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"
               >