From d366c05d559b46f80193096d66b287883cfea3c4 Mon Sep 17 00:00:00 2001
From: Sergey Yarkov <serzh.yarkov@gmail.com>
Date: Sat, 4 Jun 2022 00:31:09 +0300
Subject: [PATCH] upd: added env for api & websocket urls

---
 Dockerfile                                     | 5 +++++
 src/api.config.ts                              | 2 +-
 src/components/Forms/LessonForm/LessonForm.tsx | 2 +-
 src/constants.ts                               | 2 +-
 src/env.d.ts                                   | 1 +
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 45c7207..755e629 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,6 +6,11 @@ WORKDIR /home/app
 COPY package*.json ./
 RUN npm install
 COPY . .
+# Get build arguments and set env variables
+ARG API_URL
+ARG WS_URL
+ENV VITE_API_URL=${API_URL}
+ENV VITE_WS_URL=${WS_URL}
 RUN npm run build
 
 FROM ${NGINX_IMAGE} as production
diff --git a/src/api.config.ts b/src/api.config.ts
index 83e086d..476c975 100644
--- a/src/api.config.ts
+++ b/src/api.config.ts
@@ -2,7 +2,7 @@ import { AxiosRequestConfig } from 'axios';
 import * as constants from '@educt/constants';
 
 const apiConfig: AxiosRequestConfig = {
-  baseURL: `${constants.BACKEND_URL}/api/`,
+  baseURL: `${constants.BACKEND_URL}/`,
   responseType: 'json',
   withCredentials: true,
 };
diff --git a/src/components/Forms/LessonForm/LessonForm.tsx b/src/components/Forms/LessonForm/LessonForm.tsx
index ee99267..75591e0 100644
--- a/src/components/Forms/LessonForm/LessonForm.tsx
+++ b/src/components/Forms/LessonForm/LessonForm.tsx
@@ -84,7 +84,7 @@ const LessonForm: React.FC<LessonFormPropsType> = ({
               <VideoUploader
                 onChange={file => onChange(file)}
                 file={file}
-                preloadedVideoUrl={constants.BACKEND_URL + preloadedVideo?.url}
+                preloadedVideoUrl={preloadedVideo && constants.BACKEND_URL + preloadedVideo.url}
               />
             )}
           />
diff --git a/src/constants.ts b/src/constants.ts
index d0be5da..ad2368e 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -1,2 +1,2 @@
 export const BACKEND_URL = import.meta.env.VITE_API_URL || 'http://localhost:3333';
-export const WS_URL = 'ws://localhost:3333';
+export const WS_URL = import.meta.env.VITE_WS_URL || 'ws://localhost:3333';
diff --git a/src/env.d.ts b/src/env.d.ts
index a5345c3..def39d7 100644
--- a/src/env.d.ts
+++ b/src/env.d.ts
@@ -2,6 +2,7 @@
 
 interface ImportMetaEnv {
   readonly VITE_API_URL?: string | undefined;
+  readonly VITE_WS_URL?: string | undefined;
 }
 
 interface ImportMeta {