diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index ff19cc6..38e8714 100644 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -1,15 +1,13 @@ #!/bin/sh set -e -: "${API_HOST:=http://localhost}" -: "${API_PORT:=80}" # Create runtime config file in writable location -cat > /runtime-config/config.js < /runtime-config/config.js < - diff --git a/src/main.ts b/src/main.ts index b47e18b..d04a78b 100644 --- a/src/main.ts +++ b/src/main.ts @@ -26,7 +26,7 @@ import {useAuthStore} from "./stores/auth.ts"; import SetsView from "./views/set/SetsView.vue"; import JobsView from "./views/JobsView.vue"; import {definePreset} from "@primeuix/themes"; -import {initConfig} from "@/util/config.ts"; +import {getConfig, initConfig} from "@/util/config.ts"; import axios from "axios"; // Initialize configuration from window object @@ -139,8 +139,12 @@ router.beforeEach(async (to) => { app.use(router); app.use(ToastService) +const apiUrl = import.meta.env.PROD + ? "/" + : `http://${getConfig().API_HOST}:${getConfig().API_PORT}`; + const axiosInstance = axios.create({ - baseURL: '', + baseURL: apiUrl, headers: { 'Content-Type': 'application/json' } diff --git a/src/util/config.ts b/src/util/config.ts index 5ad5376..bd554eb 100644 --- a/src/util/config.ts +++ b/src/util/config.ts @@ -17,11 +17,4 @@ export function initConfig(config: Partial) { export function getConfig(): AppConfig { return runtimeConfig; -} - -export function getApiUrl() { - if (!runtimeConfig.API_HOST) { - return null; - } - return `${runtimeConfig.API_HOST}:${runtimeConfig.API_PORT}`; } \ No newline at end of file