From eb18334fea1fd4fb40b45a4985b458b968376d4a Mon Sep 17 00:00:00 2001
From: cv <34649812+cpvalente@users.noreply.github.com>
Date: Tue, 4 May 2021 22:15:41 +0200
Subject: [PATCH] refreact

server url calculated in constants
---
 client/src/app/api/apiConstants.js | 8 ++++++--
 client/src/app/api/eventApi.js     | 8 +-------
 client/src/app/api/playbackApi.js  | 8 +-------
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/client/src/app/api/apiConstants.js b/client/src/app/api/apiConstants.js
index 9b7e6084e..26f818293 100644
--- a/client/src/app/api/apiConstants.js
+++ b/client/src/app/api/apiConstants.js
@@ -1,3 +1,7 @@
-// TODO: should be defined dynamically?
-export const serverURL = 'http://localhost';
 export const NODE_PORT = 4001;
+
+const calculateServer = () => {
+  return window.location.origin.replace(window.location.port, `${NODE_PORT}/`);
+};
+
+export const serverURL = calculateServer();
diff --git a/client/src/app/api/eventApi.js b/client/src/app/api/eventApi.js
index 7d43221e6..0118acb68 100644
--- a/client/src/app/api/eventApi.js
+++ b/client/src/app/api/eventApi.js
@@ -1,11 +1,5 @@
 import axios from 'axios';
-import { NODE_PORT } from './apiConstants';
-
-// get origin from URL
-const serverURL = window.location.origin.replace(
-  window.location.port,
-  `${NODE_PORT}/`
-);
+import { serverURL } from './apiConstants';
 
 export const eventNamespace = 'event';
 export const eventURL = serverURL + eventNamespace;
diff --git a/client/src/app/api/playbackApi.js b/client/src/app/api/playbackApi.js
index 09edcc516..1dabea106 100644
--- a/client/src/app/api/playbackApi.js
+++ b/client/src/app/api/playbackApi.js
@@ -1,11 +1,5 @@
 import axios from 'axios';
-import { NODE_PORT } from '../api/apiConstants';
-
-// get origin from URL
-const serverURL = window.location.origin.replace(
-  window.location.port,
-  `${NODE_PORT}/`
-);
+import { serverURL } from '../api/apiConstants';
 
 export const playbackNamespace = 'playback';
 const playbackURL = serverURL + playbackNamespace;