diff --git a/unwind-ui/src/config.ts b/unwind-ui/src/config.ts index 8933983..c6f6b3a 100644 --- a/unwind-ui/src/config.ts +++ b/unwind-ui/src/config.ts @@ -1,3 +1,3 @@ export default { - api_url: "http://localhost:8000/api/v1/", + api_url: `${process.env.API_URL}v1/`, } diff --git a/unwind-ui/vite.config.ts b/unwind-ui/vite.config.ts index 315212d..c51ac37 100644 --- a/unwind-ui/vite.config.ts +++ b/unwind-ui/vite.config.ts @@ -3,5 +3,11 @@ import vue from '@vitejs/plugin-vue' // https://vitejs.dev/config/ export default defineConfig({ - plugins: [vue()] + base: process.env.BASE_URL || "/", + define: { + "process.env.API_URL": JSON.stringify( + process.env.API_URL || "http://localhost:8000/api/", + ), + }, + plugins: [vue()], }) diff --git a/unwind/config.py b/unwind/config.py index 26ad3ec..6382cf5 100644 --- a/unwind/config.py +++ b/unwind/config.py @@ -16,4 +16,6 @@ config_path = os.getenv("UNWIND_CONFIG", datadir / "config.toml") _config = toml.load(config_path) -api_credentials = _config["api"]["credentials"] +api_base = _config["api"].get("base", "/api/") +api_cors = _config["api"].get("cors", "*") +api_credentials = _config["api"].get("credentials", {}) diff --git a/unwind/web.py b/unwind/web.py index a3376ab..f565f96 100644 --- a/unwind/web.py +++ b/unwind/web.py @@ -627,7 +627,7 @@ def create_app(): on_startup=[open_connection_pool], on_shutdown=[close_connection_pool], routes=[ - Mount("/api/v1", routes=route.registered), + Mount(f"{config.api_base}v1", routes=route.registered), ], middleware=[ Middleware(ResponseTimeMiddleware, header_name="Unwind-Elapsed"), @@ -638,10 +638,7 @@ def create_app(): ), Middleware( CORSMiddleware, - allow_origins=[ - # "*", - "http://localhost:3000", - ], + allow_origins=[config.api_cors], allow_credentials=True, allow_methods=["*"], allow_headers=["*"],