From 2ccd656386cf7265ffc004941fb42a8acbfa1173 Mon Sep 17 00:00:00 2001 From: TwinProduction Date: Mon, 25 Jan 2021 22:05:19 -0500 Subject: [PATCH] Add SERVER_URL constant based on environment --- web/app/package.json | 4 ++-- web/app/src/App.vue | 3 ++- web/app/src/main.js | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/web/app/package.json b/web/app/package.json index 3ceaa350..28b951bb 100644 --- a/web/app/package.json +++ b/web/app/package.json @@ -3,8 +3,8 @@ "version": "0.1.0", "private": true, "scripts": { - "serve": "vue-cli-service serve", - "build": "vue-cli-service build", + "serve": "vue-cli-service serve --mode development", + "build": "vue-cli-service build --mode production", "lint": "vue-cli-service lint" }, "dependencies": { diff --git a/web/app/src/App.vue b/web/app/src/App.vue index ef84c90d..c2b1209e 100644 --- a/web/app/src/App.vue +++ b/web/app/src/App.vue @@ -11,6 +11,7 @@ import Social from './components/Social.vue' import Settings from './components/Settings.vue' import Services from './components/Services.vue'; import Tooltip from './components/Tooltip.vue'; +import {SERVER_URL} from "./main.js"; export default { name: 'App', @@ -23,7 +24,7 @@ export default { methods: { fetchStatuses() { console.log("[App][fetchStatuses] Fetching statuses"); - fetch("http://localhost:8080/api/v1/statuses") + fetch(`${SERVER_URL}/api/v1/statuses`) .then(response => response.json()) .then(data => { if (JSON.stringify(this.serviceStatuses) !== JSON.stringify(data)) { diff --git a/web/app/src/main.js b/web/app/src/main.js index 50a4dab0..41eba2f6 100644 --- a/web/app/src/main.js +++ b/web/app/src/main.js @@ -2,4 +2,6 @@ import { createApp } from 'vue' import App from './App.vue' import './index.css' +export const SERVER_URL = process.env.NODE_ENV === 'production' ? '.' : 'http://localhost:8080' + createApp(App).mount('#app')