diff --git a/src/App.vue b/src/App.vue
index 781cb7e..f4666f0 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -65,14 +65,13 @@ export default defineComponent({
data: () => ({
VERSION: packageInfo.version,
+ store: useStore(),
}),
- setup() {
- const store = useStore();
+ async created() {
+ const stockData = await (await fetch('https://spythere.github.io/api/stockData.json')).json();
- return {
- store,
- };
+ this.store.stockData = stockData;
},
});
diff --git a/src/components/StockGeneratorTab.vue b/src/components/StockGeneratorTab.vue
index 040c1ca..0c8272b 100644
--- a/src/components/StockGeneratorTab.vue
+++ b/src/components/StockGeneratorTab.vue
@@ -31,9 +31,9 @@
@@ -91,24 +91,16 @@
import { defineComponent } from 'vue';
import { useStore } from '../store';
-import generatorData from '../data/generatorData.json';
import stockMixin from '../mixins/stockMixin';
import { ICargo, ICarWagon } from '../types';
export default defineComponent({
name: 'stock-generator',
- setup() {
- return {
- store: useStore(),
- };
- },
-
mixins: [stockMixin],
data() {
return {
- generatorData,
chosenCarTypes: [] as string[],
excludedCarTypes: [] as string[],
@@ -119,6 +111,8 @@ export default defineComponent({
maxMass: 3000,
maxLength: 650,
maxCarCount: 50,
+
+ store: useStore(),
};
},
@@ -149,7 +143,7 @@ export default defineComponent({
generateStock(empty = false) {
const generatedChosenStockList = this.chosenCargoTypes.reduce((acc, type) => {
- this.generatorData.cargo[type as keyof typeof this.generatorData.cargo]
+ this.store.stockData?.generator.cargo[type]
.filter((c) => !this.excludedCarTypes.includes(c.split(':')[0]))
.forEach((c) => {
const [type, cargoType] = c.split(':');
diff --git a/src/components/TrainImageSection.vue b/src/components/TrainImageSection.vue
index 693c96b..873f54e 100644
--- a/src/components/TrainImageSection.vue
+++ b/src/components/TrainImageSection.vue
@@ -36,7 +36,7 @@
{{
store.chosenVehicle.useType == 'car-cargo'
- ? carUsage[store.chosenVehicle.constructionType]
+ ? store.stockData?.usage[store.chosenVehicle.constructionType]
: 'Typ konstrukcji: ' + store.chosenVehicle.constructionType
}}
@@ -49,11 +49,10 @@