Spythere/stacjownik
1
0
Fork 0
mirror of https://github.com/Spythere/stacjownik.git synced 2026-05-03 05:18:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup http

Browse Source
This commit is contained in:
Spythere
2023-12-10 15:22:33 +01:00
parent 39c3cf2329
commit 82a9a9165f
8 changed files with 21 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/JournalView/DispatcherStats.vue
+3 -6
View File
@@ -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;
src/components/JournalView/JournalDailyStats.vue
+2 -3
View File
@@ -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;
src/components/JournalView/JournalOptions.vue
+3 -6
View File
@@ -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;
src/components/SceneryView/SceneryDispatchersHistory.vue
+4 -2
View File
@@ -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;
src/components/SceneryView/SceneryTimetablesHistory.vue
+3 -4
View File
@@ -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;
src/scripts/utils/apiURLs.ts
-7
View File
@@ -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'
};
src/views/JournalDispatchers.vue
+3 -8
View File
@@ -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) {
src/views/JournalTimetables.vue
+3 -6
View File
@@ -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;