diff --git a/package.json b/package.json index fec7cd6..a8d3e64 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pojazdownik", - "version": "1.2.2", + "version": "1.2.3", "private": true, "scripts": { "dev": "vite", diff --git a/src/App.vue b/src/App.vue index a706c30..f37cefd 100644 --- a/src/App.vue +++ b/src/App.vue @@ -70,7 +70,7 @@ export default defineComponent({ async created() { const stockData = await ( - await fetch(`https://spythere.github.io/api/stockDataNew.json?t=${Math.floor(Date.now() / 60000)}`) + await fetch(`https://spythere.github.io/api/td2/data/stockData.json?t=${Math.floor(Date.now() / 60000)}`) ).json(); this.store.stockData = stockData; diff --git a/src/components/TrainImageSection.vue b/src/components/TrainImageSection.vue index cca95d4..b905b1a 100644 --- a/src/components/TrainImageSection.vue +++ b/src/components/TrainImageSection.vue @@ -3,20 +3,22 @@
-
ŁADOWANIE OBRAZU...
+
+ ŁADOWANIE OBRAZU... +
PODGLĄD WYBRANEGO POJAZDU
-
Ten pojazd nie ma jeszcze podglądu!
+
@@ -81,6 +83,8 @@ export default defineComponent({ watch: { chosenVehicle(vehicle: Vehicle, prevVehicle: Vehicle) { + console.log(vehicle); + if (vehicle && vehicle.type != prevVehicle?.type) { this.store.imageLoading = true; } @@ -101,7 +105,7 @@ export default defineComponent({ if (!chosenVehicle) return; - this.store.vehiclePreviewSrc = chosenVehicle.imageSrc.replace('300', '800'); + this.store.vehiclePreviewSrc = `https://spythere.github.io/api/td2/images/${chosenVehicle.type}--800px.jpg`; }, }, }); diff --git a/src/utils/vehicleUtils.ts b/src/utils/vehicleUtils.ts index bc745f9..ba34193 100644 --- a/src/utils/vehicleUtils.ts +++ b/src/utils/vehicleUtils.ts @@ -133,12 +133,12 @@ export function carDataList(state: IStore) { return Object.keys(stockData.info).reduce((acc, vehicleTypeKey) => { if (!vehicleTypeKey.startsWith('car')) return acc; - const carVehiclesData = (stockData.info)[vehicleTypeKey as TStockInfoKey]; + const carVehiclesData = stockData.info[vehicleTypeKey as TStockInfoKey]; carVehiclesData.forEach((car) => { if (state.showSupporter && !car[3]) return; - const carPropsData = stockData.props.find((v) => car[0].toString().includes(v.type)); + const carPropsData = stockData.props.find((v) => car[0].toString().startsWith(v.type)); acc.push({ useType: vehicleTypeKey as 'car-passenger' | 'car-cargo', @@ -148,7 +148,7 @@ export function carDataList(state: IStore) { supportersOnly: car[3] as boolean, maxSpeed: Number(car[4] as string), imageSrc: car[5] as string, - cargoList: carPropsData?.cargo.includes(';') + cargoList: carPropsData?.cargo.split(';').filter((s) => s.length > 0) ? carPropsData.cargo.split(';').map((cargo) => ({ id: cargo.split(':')[0], totalMass: Number(cargo.split(':')[1]), @@ -327,5 +327,3 @@ export function chosenRealStock(state: IStore) { // }), // }; - -