use environment or configuration endpoint

sumn2u · Jun 11, 2024 · 97303e6 · 97303e6
1 parent 1b9b19a
commit 97303e6
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/client/config.js b/client/config.js
@@ -1,7 +1,15 @@
 
+let VITE_SERVER_URL;
+
+if (typeof import.meta !== 'undefined' && import.meta.env) {
+  VITE_SERVER_URL = import.meta.env.VITE_SERVER_URL;
+} else {
+  VITE_SERVER_URL = process.env.VITE_SERVER_URL || "http://localhost:5000";
+}
+
 const config = {
     DEMO_SITE_URL:"https://annotate-docs.dwaste.live/",
-    VITE_SERVER_URL: "http://localhost:5000",
+    VITE_SERVER_URL
   };
 
 export default config;

diff --git a/client/src/SetupPage/SetupPage.test.js b/client/src/SetupPage/SetupPage.test.js
@@ -11,6 +11,11 @@ jest.mock('react-i18next', () => ({
   }),
 }));
 
+jest.mock('../../config.js', () => ({
+  DEMO_SITE_URL: "https://annotate-docs.dwaste.live/",
+  VITE_SERVER_URL: "http://localhost:5000",
+}));
+
 // Mock useSettings hook
 jest.mock('../SettingsProvider', () => ({
   useSettings: jest.fn(),

diff --git a/client/src/workspace/DownloadButton/DownloadButton.test.js b/client/src/workspace/DownloadButton/DownloadButton.test.js
@@ -10,6 +10,12 @@ jest.mock('../../SnackbarContext/index.jsx', () => ({
   }),
 }));
 
+jest.mock('../../../config.js', () => ({
+    DEMO_SITE_URL: "https://annotate-docs.dwaste.live/",
+    VITE_SERVER_URL: "http://localhost:5000",
+  }));
+
+
 // Mock the useTranslation hook with actual translations
 jest.mock('react-i18next', () => ({
     useTranslation: () => ({