.

SnazziesLab · Jan 29, 2024 · e3c26bc · e3c26bc
1 parent 2ea1ed0
commit e3c26bc
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 11 deletions.
diff --git a/Assets/Logo.afdesign b/Assets/Logo.afdesign
diff --git a/Assets/Logo.png b/Assets/Logo.png
diff --git a/Assets/Logo.svg b/Assets/Logo.svg
diff --git a/Source/Assets/Logo.png b/Source/Assets/Logo.png
diff --git a/Source/Assets/Logo.svg b/Source/Assets/Logo.svg
diff --git a/Source/Dockerfile.UI b/Source/Dockerfile.UI
@@ -24,5 +24,5 @@ RUN npm i -g serve
 COPY --from=Build src/dist ./dist
 
 EXPOSE 80
-
+ENV VITE_API_URL=localhost:8080
 CMD [ "serve", "-s", "dist", "-l", "80" ]
diff --git a/Source/Topica.UI/.env.production b/Source/Topica.UI/.env.production
@@ -0,0 +1 @@
+VITE_API_URL=http://localhost:8080
diff --git a/Source/Topica.UI/index.html b/Source/Topica.UI/index.html
@@ -4,7 +4,9 @@
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite + React + TS</title>
+        <!-- Load environment variables -->
+    <script src='/config.js'></script>
+    <title>Topica</title>
   </head>
   <body>
     <div id="root"></div>

diff --git a/Source/Topica.UI/src/api/api.ts b/Source/Topica.UI/src/api/api.ts
@@ -30,15 +30,20 @@ const middlewares: eventsClient.Middleware[] = [
     }
 ];
 
+// eslint-disable-next-line @typescript-eslint/no-var-requires, @typescript-eslint/ban-ts-comment
+// @ts-ignore
+const url = import.meta.env.VITE_API_URL;
+
 const eventsConfig = () =>
     new eventsClient.Configuration({
-        basePath: import.meta.env.VITE_API_SERVER_URL,
+        basePath: url,
         middleware: middlewares
     });
 
+
 export const topicApi = new eventsClient.TopicsApi(eventsConfig());
 export const loginApi = new eventsClient.LoginApi( new eventsClient.Configuration({
-    basePath: import.meta.env.VITE_API_SERVER_URL,
+    basePath: url,
 }));
 
 export function getCookie(name: string) {

diff --git a/Source/Topica.UI/src/config.js b/Source/Topica.UI/src/config.js
diff --git a/Source/Topica.UI/tsconfig.json b/Source/Topica.UI/tsconfig.json
@@ -20,6 +20,6 @@
     "noUnusedParameters": true,
     "noFallthroughCasesInSwitch": true
   },
-  "include": ["src"],
+  "include": ["src", "../Assets/config.js"],
   "references": [{ "path": "./tsconfig.node.json" }]
 }
diff --git a/Source/Topica.UI/vite.config.ts b/Source/Topica.UI/vite.config.ts
@@ -1,7 +1,10 @@
 import { defineConfig } from 'vite'
 import react from '@vitejs/plugin-react-swc'
-
+// eslint-disable-next-line @typescript-eslint/no-var-requires
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [react()],
+  server:{
+    port:3001
+  }
 })
diff --git a/Source/docker-compose.yml b/Source/docker-compose.yml
@@ -5,17 +5,15 @@ services:
     image: ${DOCKER_REGISTRY-}topica.server
     container_name: topica.server
     ports:
-      - 8780:8080
+      - 8080:8080
     build:
       context: ./Topica.Server/Topica.Server
       dockerfile: Dockerfile
   topica.ui:
     image: ${DOCKER_REGISTRY-}topica.ui
     container_name: topica.ui
     ports:
-      - 8680:80
-    environment:
-      - VITE_API_SERVER_URL=https://localhost:8780
+      - 3001:80
     build:
       context: .
       dockerfile: Dockerfile.UI