From 82a9a9165f2e530eaeee049626ab97d970b1cebb Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Sun, 10 Dec 2023 15:22:33 +0100
Subject: [PATCH] cleanup http

---
 src/components/JournalView/DispatcherStats.vue        |  9 +++------
 src/components/JournalView/JournalDailyStats.vue      |  5 ++---
 src/components/JournalView/JournalOptions.vue         |  9 +++------
 .../SceneryView/SceneryDispatchersHistory.vue         |  6 ++++--
 .../SceneryView/SceneryTimetablesHistory.vue          |  7 +++----
 src/scripts/utils/apiURLs.ts                          |  7 -------
 src/views/JournalDispatchers.vue                      | 11 +++--------
 src/views/JournalTimetables.vue                       |  9 +++------
 8 files changed, 21 insertions(+), 42 deletions(-)
 delete mode 100644 src/scripts/utils/apiURLs.ts

diff --git a/src/components/JournalView/DispatcherStats.vue b/src/components/JournalView/DispatcherStats.vue
index e7bc73b..758f946 100644
--- a/src/components/JournalView/DispatcherStats.vue
+++ b/src/components/JournalView/DispatcherStats.vue
@@ -56,6 +56,7 @@ import { URLs } from '../../scripts/utils/apiURLs';
 import { useMainStore } from '../../store/mainStore';
 import Loading from '../Global/Loading.vue';
 import { API } from '../../typings/api';
+import http from '../../http';
 
 export default defineComponent({
   components: { Loading },
@@ -90,15 +91,11 @@ export default defineComponent({
       }
 
       const statsData: API.DispatcherStats.Response = await (
-        await axios.get(
-          `${URLs.stacjownikAPI}/api/getDispatcherInfo?name=${this.store.dispatcherStatsName}`
-        )
+        await http.get('api/getDispatcherInfo?name=${this.store.dispatcherStatsName}')
       ).data;
 
       const timetables: API.TimetableHistory.Response = await (
-        await axios.get(
-          `${URLs.stacjownikAPI}/api/getTimetables?authorName=${this.store.dispatcherStatsName}`
-        )
+        await http.get('api/getTimetables?authorName=${this.store.dispatcherStatsName}')
       ).data;
 
       this.timetables = timetables;
diff --git a/src/components/JournalView/JournalDailyStats.vue b/src/components/JournalView/JournalDailyStats.vue
index 93a0e59..4dba276 100644
--- a/src/components/JournalView/JournalDailyStats.vue
+++ b/src/components/JournalView/JournalDailyStats.vue
@@ -137,6 +137,7 @@ import dateMixin from '../../mixins/dateMixin';
 import { URLs } from '../../scripts/utils/apiURLs';
 import { API } from '../../typings/api';
 import { Status } from '../../typings/common';
+import http from '../../http';
 
 export default defineComponent({
   name: 'journal-daily-stats',
@@ -175,9 +176,7 @@ export default defineComponent({
   methods: {
     async fetchDailyTimetableStats() {
       try {
-        const res: API.DailyStats.Response = await (
-          await axios.get(`${URLs.stacjownikAPI}/api/getDailyStats`)
-        ).data;
+        const res: API.DailyStats.Response = await (await http.get('api/getDailyStats')).data;
 
         this.stats = res;
 
diff --git a/src/components/JournalView/JournalOptions.vue b/src/components/JournalView/JournalOptions.vue
index 44d706a..fdd2a0a 100644
--- a/src/components/JournalView/JournalOptions.vue
+++ b/src/components/JournalView/JournalOptions.vue
@@ -110,14 +110,13 @@
 </template>
 
 <script lang="ts">
-import axios from 'axios';
 import { defineComponent, inject, PropType } from 'vue';
 import keyMixin from '../../mixins/keyMixin';
-import { URLs } from '../../scripts/utils/apiURLs';
 import { useMainStore } from '../../store/mainStore';
 import { Journal } from './typings';
 import { API } from '../../typings/api';
 import { Status } from '../../typings/common';
+import http from '../../http';
 
 export default defineComponent({
   emits: ['onSearchConfirm', 'onOptionsReset', 'onRefreshData'],
@@ -216,9 +215,7 @@ export default defineComponent({
         this.store.driverStatsStatus = Status.Data.Loading;
 
         const statsData: API.DriverStats.Response = await (
-          await axios.get(
-            `${URLs.stacjownikAPI}/api/getDriverInfo?name=${this.store.driverStatsName}`
-          )
+          await http.get(`api/getDriverInfo?name=${this.store.driverStatsName}`)
         ).data;
 
         this.store.driverStatsData = statsData;
@@ -241,7 +238,7 @@ export default defineComponent({
       this.searchTimeout = window.setTimeout(async () => {
         try {
           const suggestions: string[] = await (
-            await axios.get(`${URLs.stacjownikAPI}/api/get${type}Suggestions?name=${value}`)
+            await http.get(`api/get${type}Suggestions?name=${value}`)
           ).data;
 
           this[`${type}Suggestions`] = suggestions;
diff --git a/src/components/SceneryView/SceneryDispatchersHistory.vue b/src/components/SceneryView/SceneryDispatchersHistory.vue
index 586f7a9..c9e6ba3 100644
--- a/src/components/SceneryView/SceneryDispatchersHistory.vue
+++ b/src/components/SceneryView/SceneryDispatchersHistory.vue
@@ -79,6 +79,7 @@ import listObserverMixin from '../../mixins/listObserverMixin';
 import { OnlineScenery } from '../../store/typings';
 import { API } from '../../typings/api';
 import { Status } from '../../typings/common';
+import http from '../../http';
 
 export default defineComponent({
   name: 'SceneryDispatchersHistory',
@@ -121,11 +122,12 @@ export default defineComponent({
       try {
         this.dataStatus = Status.Data.Loading;
 
-        const requestString = `${URLs.stacjownikAPI}/api/getDispatchers?stationName=${
+        const requestString = `api/getDispatchers?stationName=${
           this.station?.name || this.onlineScenery?.name
         }&countFrom=${countFrom}&countLimit=${countLimit}`;
+
         const historyAPIData: API.DispatcherHistory.Response = await (
-          await axios.get(requestString)
+          await http.get(requestString)
         ).data;
 
         this.dataStatus = Status.Data.Loaded;
diff --git a/src/components/SceneryView/SceneryTimetablesHistory.vue b/src/components/SceneryView/SceneryTimetablesHistory.vue
index 4b6488a..fff3428 100644
--- a/src/components/SceneryView/SceneryTimetablesHistory.vue
+++ b/src/components/SceneryView/SceneryTimetablesHistory.vue
@@ -63,17 +63,16 @@
 </template>
 
 <script lang="ts">
-import axios from 'axios';
 import { defineComponent, PropType } from 'vue';
 import dateMixin from '../../mixins/dateMixin';
 
 import Station from '../../scripts/interfaces/Station';
-import { URLs } from '../../scripts/utils/apiURLs';
 import Loading from '../Global/Loading.vue';
 import listObserverMixin from '../../mixins/listObserverMixin';
 import { OnlineScenery } from '../../store/typings';
 import { API } from '../../typings/api';
 import { Status } from '../../typings/common';
+import http from '../../http';
 
 export default defineComponent({
   name: 'SceneryTimetablesHistory',
@@ -107,11 +106,11 @@ export default defineComponent({
       }
 
       try {
-        const requestString = `${URLs.stacjownikAPI}/api/getTimetables?issuedFrom=${
+        const requestString = `api/getTimetables?issuedFrom=${
           this.station?.name || this.onlineScenery?.name
         }&countFrom=${countFrom}&countLimit=${countLimit}`;
 
-        const response: API.TimetableHistory.Response = await (await axios.get(requestString)).data;
+        const response: API.TimetableHistory.Response = await (await http.get(requestString)).data;
 
         this.historyList = response;
 
diff --git a/src/scripts/utils/apiURLs.ts b/src/scripts/utils/apiURLs.ts
deleted file mode 100644
index 46d2d34..0000000
--- a/src/scripts/utils/apiURLs.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export const URLs = {
-  stacjownikAPI:
-    import.meta.env.VITE_APP_API_DEV === '1' && !import.meta.env.PROD
-      ? 'http://localhost:3001'
-      : 'https://stacjownik.spythere.eu',
-  stacjownikAPIDev: 'localhost:3000'
-};
diff --git a/src/views/JournalDispatchers.vue b/src/views/JournalDispatchers.vue
index d2e5a55..0359447 100644
--- a/src/views/JournalDispatchers.vue
+++ b/src/views/JournalDispatchers.vue
@@ -32,10 +32,8 @@
 
 <script lang="ts">
 import { defineComponent, provide, reactive, Ref, ref } from 'vue';
-import axios from 'axios';
 
 import JournalOptions from '../components/JournalView/JournalOptions.vue';
-import { URLs } from '../scripts/utils/apiURLs';
 import { useMainStore } from '../store/mainStore';
 import JournalDispatchersList from '../components/JournalView/JournalDispatchersList.vue';
 
@@ -44,8 +42,7 @@ import { LocationQuery } from 'vue-router';
 import { Journal } from '../components/JournalView/typings';
 import { API } from '../typings/api';
 import { Status } from '../typings/common';
-
-const DISPATCHERS_API_URL = `${URLs.stacjownikAPI}/api/getDispatchers`;
+import http from '../http';
 
 export default defineComponent({
   components: {
@@ -183,9 +180,7 @@ export default defineComponent({
       this.countFromIndex = this.historyList.length;
 
       const responseData: API.DispatcherHistory.Response = await (
-        await axios.get(
-          `${DISPATCHERS_API_URL}?${this.currentQuery}&countFrom=${this.countFromIndex}`
-        )
+        await http.get(`api/getDispatchers?${this.currentQuery}&countFrom=${this.countFromIndex}`)
       ).data;
 
       if (!responseData) return;
@@ -232,7 +227,7 @@ export default defineComponent({
         if (reset) this.dataStatus = Status.Data.Loading;
 
         const responseData: API.DispatcherHistory.Response = await (
-          await axios.get(`${DISPATCHERS_API_URL}?${this.currentQuery}`)
+          await http.get(`api/getDispatchers?${this.currentQuery}`)
         ).data;
 
         if (!responseData) {
diff --git a/src/views/JournalTimetables.vue b/src/views/JournalTimetables.vue
index 1d09e4a..bec39bb 100644
--- a/src/views/JournalTimetables.vue
+++ b/src/views/JournalTimetables.vue
@@ -35,7 +35,6 @@
 
 <script lang="ts">
 import { defineComponent, provide, reactive, Ref, ref } from 'vue';
-import axios from 'axios';
 
 import dateMixin from '../mixins/dateMixin';
 import routerMixin from '../mixins/routerMixin';
@@ -45,7 +44,6 @@ import JournalOptions from '../components/JournalView/JournalOptions.vue';
 import JournalStats from '../components/JournalView/JournalStats.vue';
 import JournalHeader from '../components/JournalView/JournalHeader.vue';
 
-import { URLs } from '../scripts/utils/apiURLs';
 import { useMainStore } from '../store/mainStore';
 
 import { LocationQuery } from 'vue-router';
@@ -54,8 +52,7 @@ import JournalTimetablesList from '../components/JournalView/JournalTimetables/J
 import { Journal } from '../components/JournalView/typings';
 import { Status } from '../typings/common';
 import { API } from '../typings/api';
-
-const TIMETABLES_API_URL = `${URLs.stacjownikAPI}/api/getTimetables`;
+import http from '../http';
 
 export const journalTimetableFilters: Journal.TimetableFilter[] = [
   {
@@ -272,7 +269,7 @@ export default defineComponent({
       this.currentQueryParams['countFrom'] = this.timetableHistory.length;
 
       const responseData: API.TimetableHistory.Response = await (
-        await axios.get(`${TIMETABLES_API_URL}`, {
+        await http.get('api/getTimetables', {
           params: { ...this.currentQueryParams }
         })
       ).data;
@@ -365,7 +362,7 @@ export default defineComponent({
 
       try {
         const responseData: API.TimetableHistory.Response = await (
-          await axios.get(`${TIMETABLES_API_URL}`, {
+          await http.get('api/getTimetables', {
             params: this.currentQueryParams
           })
         ).data;