OV-377: * changed baseurl to access env PUBLIC_URL

BinaryStudioAcademy · Sep 26, 2024 · 3ae5db1 · 3ae5db1
1 parent 7d1c536
commit 3ae5db1
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/frontend/src/bundles/home/helpers/create-url-token.ts b/frontend/src/bundles/home/helpers/create-url-token.ts
@@ -1,11 +1,7 @@
-import { AppEnvironment } from '~/bundles/common/enums/enums.js';
 import { config } from '~/framework/config/config.js';
 
 const createVideoUrl = (jwtToken: string): string => {
-    const baseUrl =
-        config.ENV.APP.ENVIRONMENT === AppEnvironment.PRODUCTION
-            ? config.ENV.DEPLOYMENT.URL
-            : 'http://localhost:3000';
+    const baseUrl = config.ENV.DEPLOYMENT.PUBLIC_URL;
 
     return `${baseUrl}/preview/${jwtToken}`;
 };

diff --git a/frontend/src/framework/config/base-config.package.ts b/frontend/src/framework/config/base-config.package.ts
@@ -21,7 +21,7 @@ class BaseConfig implements Config {
                 ] as string,
             },
             DEPLOYMENT: {
-                URL: import.meta.env['DEPLOYMENT_URL'] as string,
+                PUBLIC_URL: import.meta.env['PUBLIC_URL'] as string,
             },
         };
     }

diff --git a/frontend/src/framework/config/types/environment-schema.type.ts b/frontend/src/framework/config/types/environment-schema.type.ts
@@ -10,7 +10,7 @@ type EnvironmentSchema = {
         SOCKET_ORIGIN_URL: string;
     };
     DEPLOYMENT: {
-        URL: string;
+        PUBLIC_URL: string;
     };
 };
 

diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
@@ -10,6 +10,7 @@ const config = ({ mode }: ConfigEnv): ReturnType<typeof defineConfig> => {
         VITE_APP_API_ORIGIN_URL,
         VITE_APP_PROXY_SERVER_URL,
         VITE_APP_SOCKET_ORIGIN_URL,
+
     } = loadEnv(mode, process.cwd());
 
     return defineConfig({