front: support using front from outside the reverse proxy

Signed-off-by: Élyse Viard <[email protected]>
OpenRailAssociation · Nov 15, 2024 · e1541e1 · e1541e1
1 parent 30ce451
commit e1541e1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -149,6 +149,8 @@ services:
       args:
         OSRD_GIT_DESCRIBE: ${OSRD_GIT_DESCRIBE}
         CARGO_PROFILE: dev
+    environment:
+      - RUST_LOG=debug
     volumes:
       - "./docker/gateway.dev.simple.toml:/gateway.toml"
     restart: unless-stopped

diff --git a/docker/gateway.dev.simple.toml b/docker/gateway.dev.simple.toml
@@ -5,7 +5,7 @@
 secret_key = "NOT+A+SECRET++NOT+A+SECRET++NOT+A+SECRET++NOT+A+SECRET++NOT+A+SECRET++NOT+A+SECRET++NOT+A+SECRET"
 
 listen_addr = "0.0.0.0"
-allowed_origins = ["http://localhost:3000"]
+allowed_origins = ["http://127.0.0.1:3000", "http://localhost:3000"]
 
 [telemetry.tracing]
 enable = true

diff --git a/front/src/config/config.ts b/front/src/config/config.ts
@@ -1,6 +1,6 @@
 export const MAIN_API = {
-  proxy_editoast: '/api',
-  proxy_gateway: '',
+  proxy_editoast: import.meta.env.VITE_PROXY_EDITOAST || '/api',
+  proxy_gateway: import.meta.env.VITE_PROXY_GATEWAY || '',
   version: '0.0.1',
   editor: {
     component_identifier: { database: 'gaia', name: 'Test' },

diff --git a/front/src/vite-env.d.ts b/front/src/vite-env.d.ts
@@ -2,4 +2,6 @@
 
 interface ImportMetaEnv {
   OSRD_GIT_DESCRIBE: string;
+  PROXY_EDITOAST: string?;
+  PROXY_GATEWAY: string?;
 }