From 1c119a41236f22ddcdc35a56ffb9584bf267d792 Mon Sep 17 00:00:00 2001 From: Spythere Date: Sun, 22 May 2022 22:15:13 +0200 Subject: [PATCH] =?UTF-8?q?Zmienne=20=C5=9Brodowiskowe=20dla=20=C5=9Brodow?= =?UTF-8?q?iska=20dev?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 6 +++--- package.json | 1 + src/components/JournalView/JournalDispatchers.vue | 3 +-- src/components/JournalView/JournalTimetables.vue | 9 ++++----- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7c8626f..09b7252 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,11 @@ { "name": "stacjownik", - "version": "1.6.8", + "version": "1.8.5", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "stacjownik", - "version": "1.6.8", + "version": "1.8.5", "dependencies": { "core-js": "^3.12.1", "dotenv": "^8.6.0", @@ -21,6 +20,7 @@ "vuex": "^4.0.0-0" }, "devDependencies": { + "@types/node": "^17.0.35", "@vue/cli-plugin-babel": "^5.0.4", "@vue/cli-plugin-router": "^5.0.4", "@vue/cli-plugin-typescript": "^5.0.4", diff --git a/package.json b/package.json index 6a0a31f..40ecc07 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "vuex": "^4.0.0-0" }, "devDependencies": { + "@types/node": "^17.0.35", "@vue/cli-plugin-babel": "^5.0.4", "@vue/cli-plugin-router": "^5.0.4", "@vue/cli-plugin-typescript": "^5.0.4", diff --git a/src/components/JournalView/JournalDispatchers.vue b/src/components/JournalView/JournalDispatchers.vue index 83a529f..61012e2 100644 --- a/src/components/JournalView/JournalDispatchers.vue +++ b/src/components/JournalView/JournalDispatchers.vue @@ -100,8 +100,7 @@ import JournalOptions from '@/components/JournalView/JournalOptions.vue'; import { URLs } from '@/scripts/utils/apiURLs'; -const DEV_MODE = false; -const PROD_MODE = !DEV_MODE || process.env.NODE_ENV === 'production'; +const PROD_MODE = process.env.VUE_APP_JORUNAL_DISPATCHERS_DEV != "1" || process.env.NODE_ENV === 'production'; const DISPATCHERS_API_URL = (PROD_MODE ? `${URLs.stacjownikAPI}/api` : 'http://localhost:3001/api') + '/getDispatchers'; diff --git a/src/components/JournalView/JournalTimetables.vue b/src/components/JournalView/JournalTimetables.vue index 33a8c81..49d6d80 100644 --- a/src/components/JournalView/JournalTimetables.vue +++ b/src/components/JournalView/JournalTimetables.vue @@ -158,10 +158,9 @@ import { URLs } from '@/scripts/utils/apiURLs'; import { journalTimetableFilters } from '@/data/journalFilters'; import { JournalFilterType } from '@/scripts/enums/JournalFilterType'; -const DEV_MODE = true; -const PROD_MODE = !DEV_MODE || process.env.NODE_ENV === "production"; +const PROD_MODE = process.env.VUE_APP_JOURNAL_TIMETABLES_DEV != "1" || process.env.NODE_ENV === "production"; -const API_URL = PROD_MODE ? `${URLs.stacjownikAPI}/api/getTimetables` : 'http://localhost:3001/api/getTimetables'; +const TIMETABLES_API_URL = PROD_MODE ? `${URLs.stacjownikAPI}/api/getTimetables` : 'http://localhost:3001/api/getTimetables'; interface APIResponse { errorMessage: string | null; @@ -317,7 +316,7 @@ export default defineComponent({ const countFrom = this.historyList.length; const responseData: APIResponse | null = await ( - await axios.get(`${API_URL}?${this.currentQuery}&countFrom=${countFrom}`) + await axios.get(`${TIMETABLES_API_URL}?${this.currentQuery}&countFrom=${countFrom}`) ).data; console.log('Loading...'); @@ -377,7 +376,7 @@ export default defineComponent({ this.currentQuery = queries.join('&'); try { - const responseData: APIResponse | null = await (await axios.get(`${API_URL}?${this.currentQuery}`)).data; + const responseData: APIResponse | null = await (await axios.get(`${TIMETABLES_API_URL}?${this.currentQuery}`)).data; if (!responseData) { this.historyDataStatus.status = DataStatus.Error;