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

1 files changed, 15 insertions, 10 deletions

diff --git a/src/environment.js b/src/environment.js
index fb7c9d133..18d686232 100644
--- a/src/environment.js
+++ b/src/environment.js
@@ -1,16 +1,17 @@
 import {
   isDevMode as isDev,
-  LIVE_API,
-  DEV_API,
+  LIVE_FERDI_API,
+  DEV_FRANZ_API,
   LOCAL_API,
   LOCAL_API_WEBSITE,
-  DEV_API_WEBSITE,
-  LIVE_API_WEBSITE,
+  DEV_API_FRANZ_WEBSITE,
+  LIVE_API_FERDI_WEBSITE,
   LIVE_WS_API,
   LOCAL_WS_API,
   DEV_WS_API,
   LOCAL_TODOS_FRONTEND_URL,
   PRODUCTION_TODOS_FRONTEND_URL,
+  LIVE_FRANZ_API,
 } from './config';
 
 // eslint-disable-next-line global-require
@@ -39,11 +40,11 @@ let wsApi;
 let web;
 let todos;
 if (!isDevMode || (isDevMode && useLiveAPI)) {
-  api = LIVE_API;
-  // api = DEV_API;
+  api = LIVE_FERDI_API;
+  // api = DEV_FRANZ_API;
   wsApi = LIVE_WS_API;
-  web = LIVE_API_WEBSITE;
-  // web = DEV_API_WEBSITE;
+  web = LIVE_API_FERDI_WEBSITE;
+  // web = DEV_API_FRANZ_WEBSITE;
   todos = PRODUCTION_TODOS_FRONTEND_URL;
 } else if (isDevMode && useLocalAPI) {
   api = LOCAL_API;
@@ -51,9 +52,9 @@ if (!isDevMode || (isDevMode && useLiveAPI)) {
   web = LOCAL_API_WEBSITE;
   todos = LOCAL_TODOS_FRONTEND_URL;
 } else {
-  api = DEV_API;
+  api = DEV_FRANZ_API;
   wsApi = DEV_WS_API;
-  web = DEV_API_WEBSITE;
+  web = DEV_API_FRANZ_WEBSITE;
   todos = PRODUCTION_TODOS_FRONTEND_URL;
 }
 
@@ -62,3 +63,7 @@ export const API_VERSION = 'v1';
 export const WS_API = wsApi;
 export const WEBSITE = web;
 export const TODOS_FRONTEND = todos;
+
+export function termsBase() {
+  return window.ferdi.stores.settings.all.app.server !== LIVE_FRANZ_API ? window.ferdi.stores.settings.all.app.server : DEV_API_FRANZ_WEBSITE;
+}