Compare commits

...

2 Commits

Author SHA1 Message Date
b0d66c9aa0 Bump version 2025-07-15 18:12:54 +02:00
6b23bfb39f Amend Upstream URL 2025-07-15 18:12:46 +02:00
7 changed files with 21 additions and 13 deletions

View File

@@ -1,19 +1,19 @@
#!/bin/sh
set -e
: "${API_BASE_URL:=http://localhost}"
: "${API_HOST:=http://localhost}"
: "${API_PORT:=7070}"
# Create runtime config file in writable location
cat > /runtime-config/config.js <<EOF
window.__APP_CONFIG__ = {
API_BASE_URL: "${API_BASE_URL}",
API_HOST: "${API_HOST}",
API_PORT: "${API_PORT}"
};
EOF
# Generate nginx config from template (if using)
if [ -f "/etc/nginx/templates/nginx.conf.template" ]; then
envsubst '${API_BASE_URL} ${API_PORT}' \
envsubst '${API_HOST} ${API_PORT}' \
< /etc/nginx/templates/nginx.conf.template \
> /etc/nginx/nginx.conf
fi

View File

@@ -28,7 +28,7 @@ http {
resolver 127.0.0.11 valid=10s ipv6=off;
upstream backend {
server ${API_BASE_URL}:${API_PORT};
server ${API_HOST}:${API_PORT};
}
server {

2
package-lock.json generated
View File

@@ -1,6 +1,6 @@
{
"name": "dex-ui-vue",
"version": "0.0.6",
"version": "0.0.7",
"lockfileVersion": 3,
"requires": true,
"packages": {

View File

@@ -1,7 +1,7 @@
{
"name": "dex-ui-vue",
"private": true,
"version": "0.0.6",
"version": "0.0.7",
"type": "module",
"scripts": {
"dev": "vite",

View File

@@ -1,4 +1,4 @@
window.__RUNTIME_CONFIG__ = {
API_BASE_URL: "__API_BASE_URL__",
API_HOST: "__API_HOST__",
API_PORT: "__API_PORT__"
};

View File

@@ -139,8 +139,16 @@ router.beforeEach(async (to) => {
app.use(router);
app.use(ToastService)
let apiUrl = getApiUrl();
if (!apiUrl) {
apiUrl = `http://${apiUrl}`
} else {
apiUrl = ''
}
const axiosInstance = axios.create({
baseURL: getApiUrl() ?? '',
baseURL: apiUrl,
headers: {
'Content-Type': 'application/json'
}

View File

@@ -1,11 +1,11 @@
export interface AppConfig {
API_BASE_URL: string;
API_HOST: string;
API_PORT: number;
}
let runtimeConfig: AppConfig = {
API_BASE_URL: import.meta.env.VITE_API_BASE_URL || '',
API_PORT: import.meta.env.VITE_API_BASE_URL || 8080
API_HOST: import.meta.env.VITE_API_HOST || '',
API_PORT: import.meta.env.VITE_API_PORT || 8080
};
export function initConfig(config: Partial<AppConfig>) {
@@ -20,8 +20,8 @@ export function getConfig(): AppConfig {
}
export function getApiUrl() {
if (!runtimeConfig.API_BASE_URL) {
if (!runtimeConfig.API_HOST) {
return null;
}
return `${runtimeConfig.API_BASE_URL}:${runtimeConfig.API_PORT}`;
return `${runtimeConfig.API_HOST}:${runtimeConfig.API_PORT}`;
}