From 55b47329921563df4690d0ebd64d919e706437b3 Mon Sep 17 00:00:00 2001 From: Spythere Date: Thu, 5 Sep 2024 15:34:11 +0200 Subject: [PATCH] chore: cleanup --- src/store/apiStore.ts | 27 +++------------------------ src/typings/api.ts | 2 +- src/views/StationsView.vue | 5 ++++- 3 files changed, 8 insertions(+), 26 deletions(-) diff --git a/src/store/apiStore.ts b/src/store/apiStore.ts index a8ddd86..de0eba4 100644 --- a/src/store/apiStore.ts +++ b/src/store/apiStore.ts @@ -1,5 +1,5 @@ import { defineStore } from 'pinia'; -import { API } from '../typings/api'; +import { API, APICache } from '../typings/api'; import { Status } from '../typings/common'; import { StationJSONData } from './typings'; import axios, { AxiosInstance } from 'axios'; @@ -68,17 +68,6 @@ export const useApiStore = defineStore('apiStore', { }, async fetchActiveData() { - // if (import.meta.env.VITE_API_ACTIVE_DATA_MODE == 'mocking') { - // import('../../tests/data/getActiveData.json').then((data) => { - // console.warn('activeData: mocking mode'); - // this.activeData = data.default as API.ActiveData.Response; - - // this.dataStatuses.connection = Status.Data.Loaded; - // }); - - // return; - // } - if (!this.activeData) this.dataStatuses.connection = Status.Data.Loading; try { @@ -105,7 +94,7 @@ export const useApiStore = defineStore('apiStore', { async fetchStationsGeneralInfo() { try { const sceneryData: StationJSONData[] = ( - await this.client!.get('api/getSceneries') + await this.client!.get(`api/getSceneries`) ).data; this.dataStatuses.sceneries = Status.Data.Loaded; @@ -117,16 +106,6 @@ export const useApiStore = defineStore('apiStore', { }, async fetchVehiclesInfo() { - // if (import.meta.env.VITE_API_VEHICLES_MODE == 'mocking') { - // import('../../tests/data/vehicles.json').then((data) => { - // console.warn('vehicles.json: mocking mode'); - // this.vehiclesData = data.default; - // this.dataStatuses.vehicles = Status.Data.Loaded; - // }); - - // return; - // } - try { const response = await this.client!.get('api/getVehicles'); @@ -136,6 +115,6 @@ export const useApiStore = defineStore('apiStore', { this.dataStatuses.vehicles = Status.Data.Error; console.error('Ups! Wystąpił błąd podczas pobierania informacji o pojazdach:', error); } - } + }, } }); diff --git a/src/typings/api.ts b/src/typings/api.ts index 8bf2d75..9a53a89 100644 --- a/src/typings/api.ts +++ b/src/typings/api.ts @@ -17,13 +17,13 @@ export namespace API { trainsAPI: APIDataStatus; dispatchersAPI: APIDataStatus; sceneryRequirementsAPI: APIDataStatus; - caches: APICache[]; } export interface Response { activeSceneries?: API.ActiveSceneries.Response; trains?: API.ActiveTrains.Response; apiStatuses?: APIStatuses; + caches: APICache[]; } } diff --git a/src/views/StationsView.vue b/src/views/StationsView.vue index c1b7eff..1da3f61 100644 --- a/src/views/StationsView.vue +++ b/src/views/StationsView.vue @@ -101,7 +101,6 @@ export default defineComponent({ gap: 0.5em; position: relative; - margin-bottom: 0.5em; } @@ -122,4 +121,8 @@ button.btn-donation { } } } + +.count { + padding: 0.5em; +}