refactor: Replace Config.ts with Variables.ts

prona-p4-learning-platform · Jul 9, 2024 · aeb5c32 · aeb5c32
1 parent c5e3397
commit aeb5c32
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 33 deletions.
diff --git a/frontend/src/api/Config.ts b/frontend/src/api/Config.ts
diff --git a/frontend/src/api/GuacamoleTunnel.ts b/frontend/src/api/GuacamoleTunnel.ts
@@ -1,6 +1,6 @@
-import config from "./Config";
 import Guacamole from "guacamole-common-js";
 
+import { variables } from "../utilities/Variables";
 import { GuacamoleProxyTunnel } from "./GuacamoleProxyTunnel";
 
 export default function createTunnel(
@@ -10,6 +10,8 @@ export default function createTunnel(
     pathAndQuery = "/" + pathAndQuery;
   }
 
-  console.log(`${config.wsBackendHost}${pathAndQuery}`);
-  return new GuacamoleProxyTunnel(`${config.wsBackendHost}/ws${pathAndQuery}`);
+  console.log(`${variables.location.websocket.url}${pathAndQuery}`);
+  return new GuacamoleProxyTunnel(
+    `${variables.location.websocket.url}/ws${pathAndQuery}`,
+  );
 }
diff --git a/frontend/src/api/WebSocket.ts b/frontend/src/api/WebSocket.ts
@@ -1,9 +1,9 @@
-import config from "./Config";
+import { variables } from "../utilities/Variables";
 
 export default function createWebSocket(pathAndQuery = "/"): WebSocket {
   if (!pathAndQuery.startsWith("/")) {
     pathAndQuery = "/" + pathAndQuery;
   }
 
-  return new WebSocket(`${config.wsBackendHost}/ws${pathAndQuery}`);
+  return new WebSocket(`${variables.location.websocket.url}/ws${pathAndQuery}`);
 }