Merge pull request #30 from Spythere/development

chore: new train categories

.github/workflows/github-discord-releases.yml

@@ -0,0 +1,17 @@
+on:
+  release:
+    types: [published]
+
+jobs:
+  github-releases-to-discord:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Github Releases To Discord
+        uses: SethCohen/github-releases-to-discord@v1.13.1
+        with:
+          webhook_url: ${{ secrets.WEBHOOK_URL }}
+          color: "15844367"
+          footer_title: "Changelog - Pojazdownik"
+          footer_timestamp: true

firebase.json

@@ -1,7 +1,7 @@
 {
   "hosting": {
     "public": "dist",
-    "ignore": ["firebase.json", "**/.*", "**/node_modules/**"],
+    "ignore": [],
     "rewrites": [
       {
         "source": "**",
@@ -9,4 +9,4 @@
       }
     ]
   }
-}
+}

package-lock.json

@@ -1,18 +1,18 @@
 {
   "name": "pojazdownik",
-  "version": "1.7.4",
+  "version": "1.8.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "pojazdownik",
-      "version": "1.7.4",
+      "version": "1.8.4",
       "dependencies": {
         "axios": "^1.4.0",
         "pinia": "^2.0.17",
         "prettier": "^3.0.3",
         "vue": "^3.2.37",
-        "vue-i18n": "9"
+        "vue-i18n": "9.11.0"
       },
       "devDependencies": {
         "@rushstack/eslint-patch": "^1.3.3",
@@ -2028,13 +2028,12 @@
       "license": "BSD-3-Clause"
     },
     "node_modules/@intlify/core-base": {
-      "version": "9.9.1",
+      "version": "9.11.0",
-      "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.9.1.tgz",
+      "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.11.0.tgz",
-      "integrity": "sha512-qsV15dg7jNX2faBRyKMgZS8UcFJViWEUPLdzZ9UR0kQZpFVeIpc0AG7ZOfeP7pX2T9SQ5jSiorq/tii9nkkafA==",
+      "integrity": "sha512-cveOqAstjLZIiyatcP/HrzrQ87cZI8ScPQna3yvoM8zjcjcIRK1MRvmxUNlPdg0rTNJMZw7rixPVM58O5aHVPA==",
-      "license": "MIT",
       "dependencies": {
-        "@intlify/message-compiler": "9.9.1",
+        "@intlify/message-compiler": "9.11.0",
-        "@intlify/shared": "9.9.1"
+        "@intlify/shared": "9.11.0"
       },
       "engines": {
         "node": ">= 16"
@@ -2044,12 +2043,11 @@
       }
     },
     "node_modules/@intlify/message-compiler": {
-      "version": "9.9.1",
+      "version": "9.11.0",
-      "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.9.1.tgz",
+      "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.11.0.tgz",
-      "integrity": "sha512-zTvP6X6HeumHOXuAE1CMMsV6tTX+opKMOxO1OHTCg5N5Sm/F7d8o2jdT6W6L5oHUsJ/vvkGefHIs7Q3hfowmsA==",
+      "integrity": "sha512-x31Gl7cscnoI4UUY1yaIy8e7vVMVW1VVlTXZz4SIHKqoSEUkfmgqK8NAx1e7RcoHEbICR7uyCbud0ZL1s4OGXQ==",
-      "license": "MIT",
       "dependencies": {
-        "@intlify/shared": "9.9.1",
+        "@intlify/shared": "9.11.0",
         "source-map-js": "^1.0.2"
       },
       "engines": {
@@ -2060,10 +2058,9 @@
       }
     },
     "node_modules/@intlify/shared": {
-      "version": "9.9.1",
+      "version": "9.11.0",
-      "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-9.9.1.tgz",
+      "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-9.11.0.tgz",
-      "integrity": "sha512-b3Pta1nwkz5rGq434v0psHwEwHGy1pYCttfcM22IE//K9owbpkEvFptx9VcuRAxjQdrO2If249cmDDjBu5wMDA==",
+      "integrity": "sha512-KHSNgi7sRjmSm7aD8QH8WFt9VfKaekJuJ473opbJlkGY3EDnDUU8ikIhG8PbasQbgNvbY3m3tWNGqk2omIdwMA==",
-      "license": "MIT",
       "engines": {
         "node": ">= 16"
       },
@@ -7624,13 +7621,12 @@
       }
     },
     "node_modules/vue-i18n": {
-      "version": "9.9.1",
+      "version": "9.11.0",
-      "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.9.1.tgz",
+      "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.11.0.tgz",
-      "integrity": "sha512-xyQ4VspLdNSPTKBFBPWa1tvtj+9HuockZwgFeD2OhxxXuC2CWeNvV4seu2o9+vbQOyQbhAM5Ez56oxUrrnTWdw==",
+      "integrity": "sha512-vU4gY6lu8Pdfs9BgKGiDAJmFDf88cceR47KcSB0VW4xJzUrXR/7qwqM7A8dQ2nedhoIDxoOm5Ro4pFd2KvJqbA==",
-      "license": "MIT",
       "dependencies": {
-        "@intlify/core-base": "9.9.1",
+        "@intlify/core-base": "9.11.0",
-        "@intlify/shared": "9.9.1",
+        "@intlify/shared": "9.11.0",
         "@vue/devtools-api": "^6.5.0"
       },
       "engines": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pojazdownik",
-  "version": "1.8.3",
+  "version": "1.8.7",
   "private": true,
   "type": "module",
   "scripts": {
@@ -16,7 +16,7 @@
     "pinia": "^2.0.17",
     "prettier": "^3.0.3",
     "vue": "^3.2.37",
-    "vue-i18n": "9"
+    "vue-i18n": "9.11.0"
   },
   "devDependencies": {
     "@rushstack/eslint-patch": "^1.3.3",

public/images/icon-exit.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="white" width="18px" height="18px"><path d="M0 0h24v24H0z" fill="none"/><path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"/></svg>

src/components/app/Footer.vue

@@ -8,8 +8,8 @@
       </template>
     </i18n-t>
 
-    <div class="text--grayed" v-if="store.vehiclesAPIData">
+    <div class="text--grayed" v-if="store.vehiclesData">
-      {{ $t('footer.version-check', { version: store.vehiclesAPIData.version }) }}
+      {{ $t('footer.version-check', { version: store.vehiclesData.simulatorVersion }) }}
     </div>
 
     <div>

src/components/app/MainContainer.vue

@@ -35,6 +35,8 @@ main {
   background-color: darken($color: $bgColor, $amount: 5);
   border-radius: 1em;
 
+  min-height: 950px;
+
   padding: 1em;
 }
 
@@ -42,8 +44,7 @@ main {
   main {
     display: flex;
     flex-direction: column;
-    grid-template-columns: 1fr;
+    gap: 1em;
-    grid-template-rows: 1fr;
   }
 }
 </style>

src/components/cards/RealStockCard.vue

@@ -9,8 +9,8 @@
             {{ $t('realstock.title') }}
             <a href="https://td2.info.pl/profile/?u=17708" target="_blank">Railtrains997</a>
           </h1>
-          <button class="btn exit-btn" @click="store.isRealStockListCardOpen = false">
+          <button class="btn action-exit" @click="store.isRealStockListCardOpen = false">
-            &Cross;
+            <img src="/images/icon-exit.svg" alt="" />
           </button>
         </div>
 
@@ -47,7 +47,7 @@
             </option>
           </datalist>
 
-          <button class="btn" @click="resetStockFilters">
+          <button class="btn action-reset" @click="resetStockFilters">
             {{ $t('realstock.action-reset') }}
           </button>
         </div>
@@ -100,13 +100,13 @@ import { useStore } from '../../store';
 import imageMixin from '../../mixins/imageMixin';
 import stockMixin from '../../mixins/stockMixin';
 
-import { IRealComposition } from '../../types';
+import { IRealComposition, VehicleGroupType } from '../../types';
 
-function getVehicleType(stockType: string) {
+function getVehicleType(stockType: string): VehicleGroupType {
-  if (/^E/.test(stockType)) return 'loco-e';
+  if (/^E/.test(stockType)) return 'loco-electric';
-  if (/^S/.test(stockType)) return 'loco-s';
+  if (/^S/.test(stockType)) return 'loco-diesel';
 
-  return 'car-passenger';
+  return 'wagon-passenger';
 }
 
 export default defineComponent({
@@ -222,13 +222,15 @@ export default defineComponent({
 <style lang="scss" scoped>
 @import '../../styles/global.scss';
 
-.exit-btn {
+.action-exit {
-  font-size: 1.2em;
+  display: flex;
-  margin: 0.25em 0;
+  background-color: #333;
+  border-radius: 0.25em;
+  padding: 0.5em;
 }
 
-.btn {
+.action-reset {
-  background-color: #444;
+  background-color: #333;
 }
 
 .card_content {

src/components/common/Checkbox.vue

@@ -1,18 +1,20 @@
 <template>
   <label>
-    <input type="checkbox" v-model="model" />
+    <input type="checkbox" :data-disabled="disabled" :disabled="disabled" v-model="model" />
     <div><slot /></div>
   </label>
 </template>
 
 <script lang="ts" setup>
 const model = defineModel();
+
+defineProps({
+  disabled: Boolean,
+});
 </script>
 
 <style lang="scss" scoped>
 label {
-  cursor: pointer;
-
   text-transform: uppercase;
   transition: color 200ms;
 }
@@ -20,6 +22,7 @@ label {
 div {
   padding: 0.25em 0.5em;
   color: white;
+  cursor: pointer;
 
   background-color: #222;
   border-radius: 0.25em;
@@ -54,5 +57,16 @@ input {
       content: '\2714';
     }
   }
+
+  &:disabled {
+    user-select: none;
+    -moz-user-select: none;
+    -webkit-user-select: none;
+
+    + div {
+      opacity: 0.55;
+      cursor: auto;
+    }
+  }
 }
 </style>

src/components/sections/InputsSection.vue

@@ -9,7 +9,7 @@
             v-for="locoType in locomotiveTypeList"
             :key="locoType.id"
             class="btn btn--choice"
-            :data-selected="locoType.id == store.chosenLocoPower"
+            :data-selected="locoType.id == store.chosenLocoGroup"
             @click="selectLocoType(locoType.id)"
           >
             {{ $t(`inputs.${locoType.id}`) }}
@@ -28,7 +28,8 @@
             {{ $t('inputs.input-vehicle') }}
           </option>
           <option v-for="loco in locoOptions" :value="loco" :key="loco.type">
-            {{ loco.type }}<b v-if="loco.isSponsorsOnly">*</b>
+            {{ loco.type
+            }}<b v-if="loco.sponsorOnlyTimestamp && loco.sponsorOnlyTimestamp > Date.now()">*</b>
           </option>
         </select>
       </div>
@@ -39,7 +40,7 @@
             v-for="carType in carTypeList"
             :key="carType.id"
             class="btn btn--choice"
-            :data-selected="carType.id == store.chosenCarUseType"
+            :data-selected="carType.id == store.chosenCarGroup"
             @click="selectCarWagonType(carType.id)"
           >
             {{ $t(`inputs.${carType.id}`) }}
@@ -59,7 +60,8 @@
           </option>
 
           <option v-for="car in carOptions" :value="car" :key="car.type">
-            {{ car.type }}<b v-if="car.isSponsorsOnly">*</b>
+            {{ car.type
+            }}<b v-if="car.sponsorOnlyTimestamp && car.sponsorOnlyTimestamp > Date.now()">*</b>
           </option>
         </select>
       </div>
@@ -70,7 +72,7 @@
           id="cargo-select"
           :disabled="
             (store.chosenCar && !store.chosenCar.loadable) ||
-            (store.chosenCar && store.chosenCar.useType == 'car-passenger') ||
+            (store.chosenCar && store.chosenCar.group == 'wagon-passenger') ||
             !store.chosenCar
           "
           data-select="cargo"
@@ -84,6 +86,7 @@
           <option :value="null" v-if="!store.chosenCar || !store.chosenCar.loadable">
             {{ $t('inputs.no-cargo-available') }}
           </option>
+
           <option :value="null" v-else>{{ $t('inputs.cargo-empty') }}</option>
 
           <option v-for="cargo in store.chosenCar?.cargoTypes" :value="cargo" :key="cargo.id">
@@ -123,6 +126,7 @@ import imageMixin from '../../mixins/imageMixin';
 import { useStore } from '../../store';
 import stockPreviewMixin from '../../mixins/stockPreviewMixin';
 import stockMixin from '../../mixins/stockMixin';
+import { LocoGroupType, WagonGroupType } from '../../types';
 
 export default defineComponent({
   mixins: [imageMixin, stockPreviewMixin, stockMixin],
@@ -131,33 +135,33 @@ export default defineComponent({
     store: useStore(),
     locomotiveTypeList: [
       {
-        id: 'loco-e',
+        id: 'loco-electric',
         desc: 'ELEKTRYCZNE',
       },
       {
-        id: 'loco-s',
+        id: 'loco-diesel',
         desc: 'SPALINOWE',
       },
       {
-        id: 'loco-ezt',
+        id: 'unit-electric',
         desc: 'ELEKTR. ZESPOŁY TRAKCYJNE',
       },
       {
-        id: 'loco-szt',
+        id: 'unit-diesel',
         desc: 'SPAL. ZESPOŁY TRAKCYJNE',
       },
-    ],
+    ] as { id: LocoGroupType; desc: string }[],
 
     carTypeList: [
       {
-        id: 'car-passenger',
+        id: 'wagon-passenger',
         desc: 'PASAŻERSKIE',
       },
       {
-        id: 'car-cargo',
+        id: 'wagon-freight',
         desc: 'TOWAROWE',
       },
-    ],
+    ] as { id: WagonGroupType; desc: string }[],
   }),
 
   computed: {
@@ -165,14 +169,14 @@ export default defineComponent({
       return this.store.locoDataList
         .slice()
         .sort((a, b) => (a.type > b.type ? 1 : -1))
-        .filter((loco) => loco.power == this.store.chosenLocoPower);
+        .filter((loco) => loco.group == this.store.chosenLocoGroup);
     },
 
     carOptions() {
       return this.store.carDataList
         .slice()
         .sort((a, b) => (a.type > b.type ? 1 : -1))
-        .filter((car) => car.useType == this.store.chosenCarUseType);
+        .filter((car) => car.group == this.store.chosenCarGroup);
     },
   },
 
@@ -192,10 +196,7 @@ export default defineComponent({
     removeVehicle() {
       if (this.store.stockList.length == 0) return;
 
-      const lastStock = this.store.stockList.slice(-1)[0];
+      this.store.stockList.splice(-1);
-
-      if (lastStock.count > 1) lastStock.count--;
-      else this.store.stockList.splice(-1);
     },
 
     switchVehicles() {
@@ -209,14 +210,14 @@ export default defineComponent({
       this.store.stockList[this.store.chosenStockListIndex] = stockObject;
     },
 
-    selectLocoType(locoTypeId: string) {
+    selectLocoType(locoGroupType: LocoGroupType) {
-      this.store.chosenLocoPower = locoTypeId;
+      this.store.chosenLocoGroup = locoGroupType;
       this.store.chosenVehicle = this.locoOptions[0];
       this.store.chosenLoco = this.locoOptions[0];
     },
 
-    selectCarWagonType(carWagonTypeId: string) {
+    selectCarWagonType(wagonGroupType: WagonGroupType) {
-      this.store.chosenCarUseType = carWagonTypeId;
+      this.store.chosenCarGroup = wagonGroupType;
       this.store.chosenVehicle = this.carOptions[0];
       this.store.chosenCar = this.carOptions[0];
       this.store.chosenCargo = null;

src/components/sections/LogoSection.vue

@@ -51,7 +51,6 @@ export default {
 .logo-section {
   grid-row: 1;
   grid-column: 1;
-  margin-bottom: 1.5em;
 
   display: flex;
   align-items: center;

src/components/sections/StockSection.vue

@@ -46,8 +46,9 @@ onMounted(() => {
   window.addEventListener('keydown', (e) => {
     if (e.target instanceof HTMLInputElement) return;
 
-    if (/[1234]/.test(e.key)) {
+    if (/^[1234]$/.test(e.key)) {
       const keyNum = Number(e.key);
+
       store.stockSectionMode = sectionModes[keyNum - 1];
       (sectionButtonRefs.value[keyNum - 1] as HTMLButtonElement)?.focus();
     }

src/components/sections/TrainImageSection.vue

@@ -1,68 +1,89 @@
 <template>
   <section class="train-image-section">
-    <div class="train-image__content" :class="{ sponsor: store.chosenVehicle?.isSponsorsOnly }">
+    <div v-if="store.chosenVehicle">
-      <img
+      <div class="image-wrapper">
-        tabindex="0"
+        <img
-        :src="
+          :src="getThumbnailURL(store.chosenVehicle.type, 'small')"
-          store.chosenVehicle
+          :data-preview-active="store.chosenVehicle !== null"
-            ? getThumbnailURL(store.chosenVehicle.type, 'small')
+          :data-sponsor-only="
-            : '/images/placeholder.jpg'
+            store.chosenVehicle.sponsorOnlyTimestamp &&
-        "
+            store.chosenVehicle.sponsorOnlyTimestamp > Date.now()
-        @click="onImageClick"
+          "
-        @keydown.enter="onImageClick"
+          :data-team-only="store.chosenVehicle.teamOnly"
-        @error="onImageError"
+          @click="onImageClick"
-        type="image/jpeg"
+          @keydown.enter="onImageClick"
-      />
+          @load="onImageLoad"
-    </div>
+          @error="onImageError"
+          tabindex="0"
+        />
+      </div>
 
-    <div class="train-image__info" v-if="store.chosenVehicle">
+      <div class="image-info">
-      <b class="text--accent">{{ store.chosenVehicle.type }}</b> &bull;
+        <b class="text--accent">{{ store.chosenVehicle.type }}</b> &bull;
-      <b style="color: #ccc">
+        <b style="color: #ccc">
-        {{
-          $t(
-            `preview.${isLocomotive(store.chosenVehicle) ? store.chosenVehicle.power : store.chosenVehicle.useType}`
-          )
-        }}
-      </b>
-
-      <div style="color: #ccc">
-        <div>
-          {{ store.chosenVehicle.length }}m | {{ (store.chosenVehicle.weight / 1000).toFixed(1) }}t
-          | {{ store.chosenVehicle.maxSpeed }} km/h
-        </div>
-
-        <div v-if="isLocomotive(store.chosenVehicle)">
-          {{ $t('preview.cabin') }} {{ store.chosenVehicle.cabinType }}
-        </div>
-
-        <div v-else>
           {{
-            store.chosenVehicle.useType == 'car-cargo'
+            $t(
-              ? $t(`usage.${store.chosenVehicle.constructionType}`)
+              `preview.${isTractionUnit(store.chosenVehicle) ? store.chosenVehicle.group : store.chosenVehicle.group}`
-              : `${$t('preview.construction')} ${store.chosenVehicle.constructionType}`
+            )
           }}
-        </div>
+        </b>
 
-        <b style="color: salmon" v-if="store.chosenVehicle.isSponsorsOnly">{{
+        <div style="color: #ccc">
-          $t('preview.sponsor-only', [
+          <div>
-            new Date(store.chosenVehicle.sponsorsOnlyTimestamp).toLocaleDateString(
+            {{ store.chosenVehicle.length }}m |
-              $i18n.locale == 'pl' ? 'pl-PL' : 'en-GB'
+            {{ (store.chosenVehicle.weight / 1000).toFixed(1) }}t |
-            ),
+            {{ store.chosenVehicle.maxSpeed }} km/h
-          ])
+          </div>
-        }}</b>
+
+          <div v-if="isTractionUnit(store.chosenVehicle)">
+            {{ $t('preview.cabin') }} {{ store.chosenVehicle.cabinType }}
+          </div>
+
+          <div v-else>
+            {{
+              store.chosenVehicle.group == 'wagon-freight'
+                ? $t(`usage.${store.chosenVehicle.constructionType}`)
+                : `${$t('preview.construction')} ${store.chosenVehicle.constructionType}`
+            }}
+          </div>
+
+          <b
+            v-if="
+              store.chosenVehicle.sponsorOnlyTimestamp &&
+              store.chosenVehicle.sponsorOnlyTimestamp > Date.now()
+            "
+            class="sponsor-only"
+          >
+            {{
+              $t('preview.sponsor-only', [
+                new Date(store.chosenVehicle.sponsorOnlyTimestamp).toLocaleDateString(
+                  $i18n.locale == 'pl' ? 'pl-PL' : 'en-GB'
+                ),
+              ])
+            }}
+          </b>
+
+          <b v-if="store.chosenVehicle.teamOnly" class="team-only">{{ $t('preview.team-only') }}</b>
+        </div>
       </div>
     </div>
 
-    <div class="train-image__info" v-else>{{ $t('preview.desc') }}</div>
+    <div v-else>
+      <img src="/images/placeholder.jpg" alt="placeholder image" />
+      <div class="image-info">{{ $t('preview.desc') }}</div>
+    </div>
   </section>
 </template>
 
 <script lang="ts">
 import { computed, defineComponent } from 'vue';
 import { useStore } from '../../store';
-import { isLocomotive } from '../../utils/vehicleUtils';
+import { isTractionUnit } from '../../utils/vehicleUtils';
-import { ILocomotive, IVehicle } from '../../types';
 import imageMixin from '../../mixins/imageMixin';
+import { watch } from 'vue';
+import { storeToRefs } from 'pinia';
+import { Ref } from 'vue';
+import { ref } from 'vue';
 
 export default defineComponent({
   mixins: [imageMixin],
@@ -75,35 +96,34 @@ export default defineComponent({
 
   setup() {
     const store = useStore();
+    const { chosenVehicle } = storeToRefs(store);
+
+    const imageStatus = ref('none') as Ref<'none' | 'loading' | 'loaded' | 'error'>;
+
+    watch(chosenVehicle, () => {
+      imageStatus.value = 'loading';
+    });
 
     return {
       store,
+      imageStatus,
       chosenVehicle: computed(() => store.chosenVehicle),
     };
   },
 
-  watch: {
-    chosenVehicle(vehicle: IVehicle, prevVehicle: IVehicle) {
-      if (vehicle && vehicle.type != prevVehicle?.type) {
-        this.store.imageLoading = true;
-      }
-    },
-  },
-
   methods: {
-    onImageLoad() {
+    isTractionUnit,
-      this.store.imageLoading = false;
-    },
 
     onImageError(e: Event) {
       const el = e.target as HTMLImageElement;
       if (el.src == '/images/placeholder.jpg') return;
 
       el.src = '/images/placeholder.jpg';
+      this.imageStatus = 'error';
     },
 
-    isLocomotive(vehicle: IVehicle): vehicle is ILocomotive {
+    onImageLoad(e: Event) {
-      return isLocomotive(vehicle);
+      this.imageStatus = 'loaded';
     },
 
     onImageClick(e: Event) {
@@ -121,41 +141,65 @@ export default defineComponent({
 </script>
 
 <style lang="scss" scoped>
-@import '../../styles/global.scss';
+@import '../../styles/global';
 
 .train-image-section {
   display: flex;
   flex-direction: column;
+  align-items: center;
   text-align: center;
 
-  grid-row: 3;
+  min-height: 250px;
-  grid-column: 1;
 
-  margin-top: 1em;
+  & > div {
-  height: 22em;
+    position: relative;
-}
+    max-width: 100%;
-
+    width: 380px;
-.train-image {
-  &__content {
-    &.sponsor img {
-      border: 1px solid salmon;
-    }
-
-    img {
-      max-width: 380px;
-      width: 100%;
-      height: 100%;
-      border: 1px solid white;
-
-      cursor: zoom-in;
-    }
   }
 }
 
-.train-image__info {
+img {
+  width: 100%;
+
+  &[data-preview-active='true'] {
+    border: 1px solid white;
+    cursor: zoom-in;
+  }
+
+  &[data-sponsor-only='true'] {
+    border: 1px solid $sponsorColor;
+  }
+
+  &[data-team-only='true'] {
+    border: 1px solid $teamColor;
+  }
+}
+
+.image-wrapper {
+  position: relative;
+  min-height: 220px;
+}
+
+.loading-placeholder {
+  position: absolute;
+  top: 0;
+  left: 0;
+  height: 100%;
+  width: 100%;
+
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  background-color: #2b2b2b;
+  padding: 1em;
+  font-size: 1.2em;
+}
+
+.image-info {
   font-size: 1.1em;
   padding: 0.5em;
-  margin: 0.5em auto;
+  // margin: 0.5em auto;
   line-height: 1.35;
 
   width: 100%;
@@ -165,17 +209,18 @@ export default defineComponent({
   font-weight: bold;
 }
 
-// Transition animations
+.placeholder {
-.img-message-anim {
+  height: 250px;
-  &-enter-from,
-  &-leave-to {
-    opacity: 0;
-  }
 
-  &-enter-active,
+  background-color: $bgColor;
-  &-leave-active {
+}
-    transition: opacity 75ms ease-in 100ms;
+
-  }
+.sponsor-only {
+  color: $sponsorColor;
+}
+
+.team-only {
+  color: $teamColor;
 }
 
 @media screen and (max-width: $breakpointMd) {

src/components/tabs/NumberGeneratorTab.vue

@@ -6,26 +6,26 @@
     </div>
 
     <div class="tab_content">
-      <div class="category-select">
+      <div class="inputs">
-        <label for="category"> {{ $t('numgen.train-category') }}</label>
+        <label>
-        <select id="category" v-model="chosenCategory" @change="randomizeTrainNumber()">
+          <span>{{ $t('numgen.train-category') }}</span>
-          <option :value="null" disabled>
+          <select v-model="chosenCategory" @change="randomizeTrainNumber()">
-            {{ $t('numgen.train-category') }}
+            <option :value="null" disabled>
-          </option>
+              {{ $t('numgen.train-category') }}
-          <option
+            </option>
-            v-for="(_, category) in genData.categoriesRules"
+            <option
-            :key="category"
+              v-for="(_, category) in genData.categoriesRules"
-            :value="category"
+              :key="category"
-          >
+              :value="category"
-            {{ $t(`numgen.categories.${category}`) }}
+            >
-          </option>
+              {{ $t(`numgen.categories.${category}`) }}
-        </select>
+            </option>
-      </div>
+          </select>
+        </label>
 
-      <div class="regions-select">
+        <label>
-        <div>
+          <span>{{ $t('numgen.start-region') }}</span>
-          <label for="begin-region"> {{ $t('numgen.start-region') }}</label>
+          <select v-model="beginRegionName" @change="randomizeTrainNumber()">
-          <select id="begin-region" v-model="beginRegionName" @change="randomizeTrainNumber()">
             <option :value="null" disabled>
               {{ $t('numgen.start-region') }}
             </option>
@@ -33,11 +33,11 @@
               {{ name }}
             </option>
           </select>
-        </div>
+        </label>
 
-        <div>
+        <label>
-          <label for="end-region"> {{ $t('numgen.end-region') }}</label>
+          <span> {{ $t('numgen.end-region') }}</span>
-          <select id="end-region" v-model="endRegionName" @change="randomizeTrainNumber()">
+          <select v-model="endRegionName" @change="randomizeTrainNumber()">
             <option :value="null" disabled>
               {{ $t('numgen.end-region') }}
             </option>
@@ -45,7 +45,7 @@
               {{ name }}
             </option>
           </select>
-        </div>
+        </label>
       </div>
 
       <div class="generated-number" @click="copyNumber">
@@ -227,12 +227,6 @@ const randomizeTrainNumber = (randomizeRegions = false) => {
 @import '../../styles/tab.scss';
 @import '../../styles/global.scss';
 
-label {
-  display: block;
-  font-weight: bold;
-  margin-bottom: 0.5em;
-}
-
 .category-select {
   select {
     width: auto;
@@ -242,23 +236,22 @@ label {
   margin-bottom: 1em;
 }
 
-.regions-select {
+.inputs {
-  display: flex;
+  display: grid;
-  align-items: center;
+  grid-template-columns: repeat(auto-fit, minmax(15em, 1fr));
-  justify-content: center;
+
+  flex-wrap: wrap;
   gap: 0.5em;
+}
 
-  div {
+.inputs > label {
-    width: 100%;
+  display: flex;
-  }
+  flex-direction: column;
+  gap: 0.25em;
 
-  select {
+  span {
-    width: 100%;
+    color: #ccc;
-  }
+    font-weight: bold;
-
-  label {
-    display: block;
-    margin-bottom: 0.5em;
   }
 }
 

src/components/tabs/StockGeneratorTab.vue

@@ -12,19 +12,19 @@
           {{ $t('stockgen.properties-desc') }}
         </b>
 
-        <div class="tab_attributes">
+        <div class="inputs">
           <label>
-            {{ $t('stockgen.input-mass') }}
+            <span>{{ $t('stockgen.input-mass') }}</span>
             <input type="number" v-model="maxTons" step="100" max="4000" min="0" />
           </label>
 
           <label>
-            {{ $t('stockgen.input-length') }}
+            <span>{{ $t('stockgen.input-length') }}</span>
             <input type="number" v-model="maxLength" step="25" max="650" min="0" />
           </label>
 
           <label>
-            {{ $t('stockgen.input-carcount') }}
+            <span>{{ $t('stockgen.input-carcount') }}</span>
             <input type="number" v-model="maxCarCount" step="1" max="60" min="1" />
           </label>
         </div>
@@ -119,11 +119,11 @@ import { useStore } from '../../store';
 
 import stockMixin from '../../mixins/stockMixin';
 import { ICargo, ICarWagon, IStock } from '../../types';
-import warningsMixin from '../../mixins/warningsMixin';
+import { isTractionUnit } from '../../utils/vehicleUtils';
 
 export default defineComponent({
   name: 'stock-generator',
-  mixins: [stockMixin, warningsMixin],
+  mixins: [stockMixin],
 
   data() {
     return {
@@ -150,9 +150,9 @@ export default defineComponent({
     },
 
     computedCargoData() {
-      if (!this.store.vehiclesAPIData?.generator.cargo) return [];
+      if (!this.store.vehiclesData?.generator.cargo) return [];
 
-      const cargoGeneratorData = this.store.vehiclesAPIData.generator.cargo;
+      const cargoGeneratorData = this.store.vehiclesData.generator.cargo;
 
       return Object.keys(cargoGeneratorData)
         .sort((v1, v2) => this.$t(`cargo.${v1}`).localeCompare(this.$t(`cargo.${v2}`)))
@@ -187,8 +187,8 @@ export default defineComponent({
       if (!this.isCarGroupingEnabled) return false;
 
       stockList.sort((s1, s2) => {
-        return (s1.constructionType + s1.cargo?.id).localeCompare(
+        return (s1.vehicleRef.constructionType + s1.cargo?.id).localeCompare(
-          s2.constructionType + s2.cargo?.id
+          s2.vehicleRef.constructionType + s2.cargo?.id
         );
       });
     },
@@ -196,7 +196,7 @@ export default defineComponent({
     generateStock(empty = false) {
       const generatedChosenStockList = this.chosenCargoTypes.reduce(
         (acc, type) => {
-          this.store.vehiclesAPIData?.generator.cargo[type]
+          this.store.vehiclesData?.generator.cargo[type]
             .filter((c) => !this.excludedCarTypes.includes(c.split(':')[0]))
             .forEach((c) => {
               const [type, cargoType] = c.split(':');
@@ -239,7 +239,11 @@ export default defineComponent({
       };
 
       for (let i = 0; i < 10; i++) {
-        this.store.stockList.splice(this.store.stockList[0]?.isLoco ? 1 : 0);
+        this.store.stockList.splice(
+          this.store.stockList.length > 0 && isTractionUnit(this.store.stockList[0].vehicleRef)
+            ? 1
+            : 0
+        );
 
         let carCount = 0;
         const maxWeight =
@@ -290,7 +294,7 @@ export default defineComponent({
       this.store.chosenLoco = null;
       this.store.chosenCargo = null;
 
-      if (c) this.store.chosenCarUseType = c?.useType;
+      if (c) this.store.chosenCarGroup = c?.group;
     },
 
     toggleCargoChosen(cargoType: string, vehicles: string[]) {
@@ -369,6 +373,28 @@ h2 {
   gap: 1em;
 }
 
+.inputs {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(12em, 1fr));
+
+  flex-wrap: wrap;
+  gap: 0.5em;
+}
+
+.inputs > label {
+  display: flex;
+  flex-direction: column;
+  gap: 0.25em;
+
+  span {
+    color: #ccc;
+  }
+
+  input[type='text'] {
+    background-color: white;
+  }
+}
+
 .generator_options {
   display: flex;
   flex-direction: column;

src/components/tabs/StockListTab.vue

@@ -4,198 +4,226 @@
       <h2>{{ $t('stocklist.title') }}</h2>
     </div>
 
-    <div class="stock_actions">
+    <div class="tab_content">
-      <button class="btn btn--image" @click="clickFileInput">
+      <div class="stock_actions">
-        <input type="file" @change="uploadStock" ref="conFile" accept=".con,.txt" />
+        <button class="btn btn--image" @click="clickFileInput">
-        <img src="/images/icon-upload.svg" alt="upload icon" />
+          <input type="file" @change="uploadStock" ref="conFile" accept=".con,.txt" />
-        {{ $t('stocklist.action-upload') }}
+          <img src="/images/icon-upload.svg" alt="upload icon" />
-      </button>
+          {{ $t('stocklist.action-upload') }}
+        </button>
 
-      <button
+        <button
-        class="btn btn--image"
+          class="btn btn--image"
-        :data-disabled="stockIsEmpty"
+          :data-disabled="stockIsEmpty"
-        :disabled="stockIsEmpty"
+          :disabled="stockIsEmpty"
-        @click="downloadStock"
+          @click="downloadStock"
-      >
-        <img src="/images/icon-download.svg" alt="download icon" />
-        {{ $t('stocklist.action-download') }}
-      </button>
-
-      <button
-        class="btn btn--image"
-        :data-disabled="stockIsEmpty"
-        :disabled="stockIsEmpty"
-        @click="copyToClipboard"
-      >
-        <img src="/images/icon-copy.svg" alt="copy icon" />
-        {{ $t('stocklist.action-copy') }}
-      </button>
-
-      <button
-        class="btn btn--image"
-        :data-disabled="stockIsEmpty"
-        :disabled="stockIsEmpty"
-        @click="resetStock"
-      >
-        <img src="/images/icon-reset.svg" alt="reset icon" />
-        {{ $t('stocklist.action-reset') }}
-      </button>
-
-      <button
-        class="btn btn--image"
-        :data-disabled="stockIsEmpty"
-        :disabled="stockIsEmpty"
-        @click="shuffleCars"
-      >
-        <img src="/images/icon-shuffle.svg" alt="shuffle icon" />
-        {{ $t('stocklist.action-shuffle') }}
-      </button>
-    </div>
-
-    <div class="stock_controls" :data-disabled="store.chosenStockListIndex == -1">
-      <button
-        class="btn btn--image"
-        :tabindex="store.chosenStockListIndex == -1 ? -1 : 0"
-        @click="moveUpStock(store.chosenStockListIndex)"
-      >
-        <img :src="getIconURL('higher')" alt="move up vehicle" />
-        {{ $t('stocklist.action-move-up') }}
-      </button>
-
-      <button
-        class="btn btn--image"
-        :tabindex="store.chosenStockListIndex == -1 ? -1 : 0"
-        @click="moveDownStock(store.chosenStockListIndex)"
-      >
-        <img :src="getIconURL('lower')" alt="move down vehicle" />
-        {{ $t('stocklist.action-move-down') }}
-      </button>
-
-      <button
-        class="btn btn--image"
-        :tabindex="store.chosenStockListIndex == -1 ? -1 : 0"
-        @click="removeStock(store.chosenStockListIndex)"
-      >
-        <img :src="getIconURL('remove')" alt="remove vehicle" />
-        {{ $t('stocklist.action-remove') }}
-      </button>
-    </div>
-
-    <div class="stock_specs">
-      <b class="real-stock-info" v-if="chosenRealComposition">
-        <span class="text--accent">
-          <img :src="getIconURL(chosenRealComposition.type)" :alt="chosenRealComposition.type" />
-          {{ chosenRealComposition.number }} {{ chosenRealComposition.name }}
-        </span>
-        |
-      </b>
-
-      <span>
-        {{ $t('stocklist.mass') }}
-        <span class="text--accent">{{ (store.totalWeight / 1000).toFixed(1) }}t</span>
-        ({{ $t('stocklist.mass-accepted') }}:
-        <span class="text--accent">{{
-          store.acceptableWeight ? `${~~(store.acceptableWeight / 1000)}t` : '-'
-        }}</span
-        >) - {{ $t('stocklist.length') }}:
-        <span class="text--accent">{{ store.totalLength }}m</span>
-        - {{ $t('stocklist.vmax') }}
-        <span tabindex="0" :data-tooltip="$t('stocklist.disclaimer')">(?)</span>:
-        <span class="text--accent">{{ store.maxStockSpeed }} km/h</span>
-      </span>
-    </div>
-
-    <div class="stock_spawn-settings">
-      <Checkbox v-if="store.stockSupportsColdStart" v-model="store.isColdStart">
-        {{ $t('stocklist.coldstart-info') }}
-      </Checkbox>
-
-      <Checkbox v-if="store.stockSupportsDoubleManning" v-model="store.isDoubleManned">
-        {{ $t('stocklist.doublemanning-info') }}
-      </Checkbox>
-    </div>
-
-    <div class="stock_warnings" v-if="stockHasWarnings">
-      <div class="warning" v-if="locoNotSuitable">
-        (!) {{ $t('stocklist.warning-not-suitable') }}
-      </div>
-
-      <div class="warning" v-if="trainTooLong && store.isTrainPassenger">
-        (!) {{ $t('stocklist.warning-passenger-too-long') }}
-      </div>
-
-      <div class="warning" v-if="trainTooLong && !store.isTrainPassenger">
-        (!) {{ $t('stocklist.warning-freight-too-long') }}
-      </div>
-
-      <div class="warning" v-if="trainTooHeavy">
-        (!)
-        <i18n-t keypath="stocklist.warning-too-heavy">
-          <template #href>
-            <a
-              target="_blank"
-              href="https://docs.google.com/spreadsheets/d/1KVa5vn2d8XGkXQFwbavVudwKqUQxbLOucHWs2VYqAUE"
-            >
-              {{ $t('stocklist.acceptable-mass-docs') }}
-            </a>
-          </template>
-        </i18n-t>
-      </div>
-
-      <div class="warning" v-if="tooManyLocomotives">
-        {{ $t('stocklist.warning-too-many-locos') }}
-      </div>
-    </div>
-
-    <StockThumbnails :onListItemClick="onListItemClick" />
-
-    <!-- Stock list -->
-    <ul ref="stock_list">
-      <li v-if="stockIsEmpty" class="list-empty">
-        <div class="stock-info">{{ $t('stocklist.list-empty') }}</div>
-      </li>
-
-      <TransitionGroup name="stock-list-anim" v-else>
-        <li
-          v-for="(stock, i) in store.stockList"
-          :key="stock.id"
-          :class="{ loco: stock.isLoco }"
-          tabindex="0"
-          @click="onListItemClick(i)"
-          @keydown.enter="onListItemClick(i)"
-          @keydown.w="moveUpStock(i)"
-          @keydown.s="moveDownStock(i)"
-          @keydown.backspace="removeStock(i)"
-          ref="itemRefs"
         >
-          <div
+          <img src="/images/icon-download.svg" alt="download icon" />
-            class="stock-info"
+          {{ $t('stocklist.action-download') }}
-            @dragstart="onDragStart(i)"
+        </button>
-            @drop="onDrop($event, i)"
-            @dragover="allowDrop"
-            draggable="true"
-          >
-            <span class="stock-info__no" :data-selected="i == store.chosenStockListIndex">
-              <span v-if="i == store.chosenStockListIndex">&bull;&nbsp;</span>
-              {{ i + 1 }}.
-            </span>
 
-            <span class="stock-info__type" :class="{ sponsor: stock.isSponsorsOnly }">
+        <button
-              {{ stock.isLoco ? stock.type : getCarSpecFromType(stock.type) }}
+          class="btn btn--image"
-            </span>
+          :data-disabled="stockIsEmpty"
+          :disabled="stockIsEmpty"
+          @click="copyToClipboard"
+        >
+          <img src="/images/icon-copy.svg" alt="copy icon" />
+          {{ $t('stocklist.action-copy') }}
+        </button>
 
-            <span class="stock-info__cargo" v-if="stock.cargo">
+        <button
-              {{ stock.cargo.id }}
+          class="btn btn--image"
-            </span>
+          :data-disabled="stockIsEmpty"
-            <span class="stock-info__length">{{ stock.length }}m</span>
+          :disabled="stockIsEmpty"
-            <span class="stock-info__mass"
+          @click="resetStock"
-              >{{ ((stock.weight + (stock.cargo?.weight ?? 0)) / 1000).toFixed(1) }}t</span
+        >
+          <img src="/images/icon-reset.svg" alt="reset icon" />
+          {{ $t('stocklist.action-reset') }}
+        </button>
+
+        <button
+          class="btn btn--image"
+          :data-disabled="stockIsEmpty"
+          :disabled="stockIsEmpty"
+          @click="shuffleCars"
+        >
+          <img src="/images/icon-shuffle.svg" alt="shuffle icon" />
+          {{ $t('stocklist.action-shuffle') }}
+        </button>
+      </div>
+
+      <div class="stock_controls" :data-disabled="store.chosenStockListIndex == -1">
+        <button
+          class="btn btn--image"
+          :tabindex="store.chosenStockListIndex == -1 ? -1 : 0"
+          @click="moveUpStock(store.chosenStockListIndex)"
+        >
+          <img :src="getIconURL('higher')" alt="move up vehicle" />
+          {{ $t('stocklist.action-move-up') }}
+        </button>
+
+        <button
+          class="btn btn--image"
+          :tabindex="store.chosenStockListIndex == -1 ? -1 : 0"
+          @click="moveDownStock(store.chosenStockListIndex)"
+        >
+          <img :src="getIconURL('lower')" alt="move down vehicle" />
+          {{ $t('stocklist.action-move-down') }}
+        </button>
+
+        <button
+          class="btn btn--image"
+          :tabindex="store.chosenStockListIndex == -1 ? -1 : 0"
+          @click="removeStock(store.chosenStockListIndex)"
+        >
+          <img :src="getIconURL('remove')" alt="remove vehicle" />
+          {{ $t('stocklist.action-remove') }}
+        </button>
+      </div>
+
+      <div class="stock_specs">
+        <b class="real-stock-info" v-if="chosenRealComposition">
+          <span class="text--accent">
+            <img :src="getIconURL(chosenRealComposition.type)" :alt="chosenRealComposition.type" />
+            {{ chosenRealComposition.number }} {{ chosenRealComposition.name }}
+          </span>
+          |
+        </b>
+
+        <span>
+          {{ $t('stocklist.mass') }}
+          <span class="text--accent">{{ (store.totalWeight / 1000).toFixed(1) }}t</span>
+          ({{ $t('stocklist.mass-accepted') }}:
+          <span class="text--accent">{{
+            store.acceptableWeight ? `${~~(store.acceptableWeight / 1000)}t` : '-'
+          }}</span
+          >) - {{ $t('stocklist.length') }}:
+          <span class="text--accent">{{ store.totalLength }}m</span>
+          - {{ $t('stocklist.vmax') }}
+          <span tabindex="0" :data-tooltip="$t('stocklist.disclaimer')">(?)</span>:
+          <span class="text--accent">{{ store.maxStockSpeed }} km/h</span>
+        </span>
+      </div>
+
+      <div></div>
+
+      <div class="stock_spawn-settings">
+        <Checkbox :disabled="!store.stockSupportsColdStart" v-model="store.isColdStart">
+          {{ $t('stocklist.coldstart-info') }}
+        </Checkbox>
+
+        <Checkbox :disabled="!store.stockSupportsDoubleManning" v-model="store.isDoubleManned">
+          {{ $t('stocklist.doublemanning-info') }}
+        </Checkbox>
+      </div>
+
+      <div class="stock_warnings" v-if="hasAnyWarnings">
+        <div class="warning" v-if="locoNotSuitable">
+          (!) {{ $t('stocklist.warning-not-suitable') }}
+        </div>
+
+        <div class="warning" v-if="lengthExceeded && store.isTrainPassenger">
+          (!) {{ $t('stocklist.warning-passenger-too-long') }}
+        </div>
+
+        <div class="warning" v-if="lengthExceeded && !store.isTrainPassenger">
+          (!) {{ $t('stocklist.warning-freight-too-long') }}
+        </div>
+
+        <div class="warning" v-if="teamOnlyVehicles.length > 0">
+          (!)
+          {{
+            $t('stocklist.warning-team-only-vehicle', [
+              teamOnlyVehicles.map((v) => v.vehicleRef.type).join(', '),
+            ])
+          }}
+        </div>
+
+        <div class="warning" v-if="weightExceeded">
+          (!)
+          <i18n-t keypath="stocklist.warning-too-heavy">
+            <template #href>
+              <a
+                target="_blank"
+                href="https://docs.google.com/spreadsheets/d/1KVa5vn2d8XGkXQFwbavVudwKqUQxbLOucHWs2VYqAUE"
+              >
+                {{ $t('stocklist.acceptable-mass-docs') }}
+              </a>
+            </template>
+          </i18n-t>
+        </div>
+
+        <div class="warning" v-if="locoCountExceeded">
+          {{ $t('stocklist.warning-too-many-locos') }}
+        </div>
+      </div>
+
+      <StockThumbnails :onListItemClick="onListItemClick" />
+
+      <!-- Stock list -->
+      <div class="list-wrapper">
+        <div v-if="stockIsEmpty" class="list-empty">
+          <div class="stock-info">{{ $t('stocklist.list-empty') }}</div>
+        </div>
+
+        <ul v-else>
+          <transition-group name="stock-list-anim">
+            <li
+              v-for="(stock, i) in store.stockList"
+              :key="stock.id"
+              :class="{ loco: isTractionUnit(stock.vehicleRef) }"
+              tabindex="0"
+              @click="onListItemClick(i)"
+              @keydown.enter="onListItemClick(i)"
+              @keydown.w="moveUpStock(i)"
+              @keydown.s="moveDownStock(i)"
+              @keydown.backspace="removeStock(i)"
+              ref="itemRefs"
             >
-            <span class="stock-info__speed">{{ stock.maxSpeed }}km/h</span>
+              <div
-          </div>
+                class="stock-info"
-        </li>
+                @dragstart="onDragStart(i)"
-      </TransitionGroup>
+                @drop="onDrop($event, i)"
-    </ul>
+                @dragover="allowDrop"
+                draggable="true"
+              >
+                <span class="stock-info-no" :data-selected="i == store.chosenStockListIndex">
+                  <span v-if="i == store.chosenStockListIndex">&bull;&nbsp;</span>
+                  {{ i + 1 }}.
+                </span>
+
+                <span
+                  class="stock-info-type"
+                  :data-sponsor-only="
+                    stock.vehicleRef.sponsorOnlyTimestamp &&
+                    stock.vehicleRef.sponsorOnlyTimestamp > Date.now()
+                  "
+                  :data-team-only="stock.vehicleRef.teamOnly"
+                >
+                  {{
+                    isTractionUnit(stock.vehicleRef)
+                      ? stock.vehicleRef.type
+                      : getCarSpecFromType(stock.vehicleRef.type)
+                  }}
+                </span>
+
+                <span class="stock-info-cargo" v-if="stock.cargo">
+                  {{ stock.cargo.id }}
+                </span>
+
+                <span class="stock-info-length">{{ stock.vehicleRef.length }}m</span>
+
+                <span class="stock-info-mass">
+                  {{ ((stock.vehicleRef.weight + (stock.cargo?.weight ?? 0)) / 1000).toFixed(1) }}t
+                </span>
+                <span class="stock-info-speed">{{ stock.vehicleRef.maxSpeed }}km/h</span>
+              </div>
+            </li>
+          </transition-group>
+        </ul>
+      </div>
+    </div>
   </section>
 </template>
 
@@ -204,18 +232,18 @@ import { defineComponent } from 'vue';
 
 import { useStore } from '../../store';
 
-import warningsMixin from '../../mixins/warningsMixin';
 import imageMixin from '../../mixins/imageMixin';
 import stockPreviewMixin from '../../mixins/stockPreviewMixin';
 import StockThumbnails from '../utils/StockThumbnails.vue';
 import stockMixin from '../../mixins/stockMixin';
 import Checkbox from '../common/Checkbox.vue';
+import { isTractionUnit } from '../../utils/vehicleUtils';
 
 export default defineComponent({
   name: 'stock-list',
   components: { StockThumbnails, Checkbox },
 
-  mixins: [warningsMixin, imageMixin, stockMixin, stockPreviewMixin],
+  mixins: [imageMixin, stockMixin, stockPreviewMixin],
 
   setup() {
     const store = useStore();
@@ -233,6 +261,12 @@ export default defineComponent({
   }),
 
   computed: {
+    chosenRealComposition() {
+      const currentStockString = this.store.stockList.map((s) => s.vehicleRef.type).join(';');
+
+      return this.store.realCompositionList.find((rc) => rc.stockString == currentStockString);
+    },
+
     stockString() {
       if (this.store.stockList.length == 0) return '';
 
@@ -243,7 +277,9 @@ export default defineComponent({
       return this.store.stockList
         .map((stock, i) => {
           let stockTypeStr =
-            stock.isLoco || !stock.cargo ? stock.type : `${stock.type}:${stock.cargo.id}`;
+            isTractionUnit(stock.vehicleRef) || !stock.cargo
+              ? stock.vehicleRef.type
+              : `${stock.vehicleRef.type}:${stock.cargo.id}`;
 
           if (i == 0 && (includeColdStart || includeDoubleManned))
             return `${stockTypeStr},${includeColdStart ? 'c' : ''}${includeDoubleManned ? 'd' : ''}`;
@@ -263,20 +299,55 @@ export default defineComponent({
         : this.store.stockList[this.store.chosenStockListIndex];
     },
 
-    stockHasWarnings() {
+    lengthExceeded() {
       return (
-        this.tooManyLocomotives || this.trainTooHeavy || this.trainTooLong || this.locoNotSuitable
+        (this.store.totalLength > 350 && this.store.isTrainPassenger) ||
+        (this.store.totalLength > 650 && !this.store.isTrainPassenger)
       );
     },
 
-    chosenRealComposition() {
+    weightExceeded() {
-      const currentStockString = this.store.stockList.map((s) => s.type).join(';');
+      return this.store.acceptableWeight && this.store.totalWeight > this.store.acceptableWeight;
+    },
 
-      return this.store.realCompositionList.find((rc) => rc.stockString == currentStockString);
+    locoNotSuitable() {
+      return (
+        !this.store.isTrainPassenger &&
+        this.store.stockList.length > 1 &&
+        !this.store.stockList.every((stock) => isTractionUnit(stock.vehicleRef)) &&
+        this.store.stockList.some(
+          (stock) => isTractionUnit(stock.vehicleRef) && stock.vehicleRef.type.startsWith('EP')
+        )
+      );
+    },
+
+    locoCountExceeded() {
+      return (
+        this.store.stockList.reduce((acc, stock) => {
+          if (isTractionUnit(stock.vehicleRef)) acc += 1;
+          return acc;
+        }, 0) > 2
+      );
+    },
+
+    teamOnlyVehicles() {
+      return this.store.stockList.filter((stock) => stock.vehicleRef.teamOnly);
+    },
+
+    hasAnyWarnings() {
+      return (
+        this.locoCountExceeded ||
+        this.weightExceeded ||
+        this.lengthExceeded ||
+        this.locoNotSuitable ||
+        this.teamOnlyVehicles
+      );
     },
   },
 
   methods: {
+    isTractionUnit,
+
     copyToClipboard() {
       navigator.clipboard.writeText(this.stockString);
 
@@ -293,7 +364,8 @@ export default defineComponent({
       const stock = this.store.stockList[stockID];
 
       this.store.chosenStockListIndex =
-        this.store.chosenStockListIndex == stockID && this.store.chosenVehicle?.type == stock.type
+        this.store.chosenStockListIndex == stockID &&
+        this.store.chosenVehicle?.type == stock.vehicleRef.type
           ? -1
           : stockID;
 
@@ -324,20 +396,6 @@ export default defineComponent({
       this.store.chosenStockListIndex = -1;
     },
 
-    addStock(index: number) {
-      if (index == -1) return;
-
-      this.store.stockList[index].count++;
-    },
-
-    subStock(index: number) {
-      if (index == -1) return;
-
-      if (this.store.stockList[index].count < 2) return;
-
-      this.store.stockList[index].count--;
-    },
-
     removeStock(index: number) {
       if (index == -1) return;
 
@@ -371,7 +429,7 @@ export default defineComponent({
 
     shuffleCars() {
       const availableIndexes = this.store.stockList.reduce((acc, stock, i) => {
-        if (!stock.isLoco) acc.push(i);
+        if (!isTractionUnit(stock.vehicleRef)) acc.push(i);
 
         return acc;
       }, [] as number[]);
@@ -393,7 +451,7 @@ export default defineComponent({
     downloadStock() {
       if (this.store.stockList.length == 0) return alert(this.$t('stocklist.alert-empty'));
 
-      const defaultName = `${this.chosenRealComposition ? this.chosenRealComposition.stockId + ' ' : ''}${this.store.stockList[0].type} ${(this.store.totalWeight / 1000).toFixed(1)}t; ${
+      const defaultName = `${this.chosenRealComposition ? this.chosenRealComposition.stockId + ' ' : ''}${this.store.stockList[0].vehicleRef.type} ${(this.store.totalWeight / 1000).toFixed(1)}t; ${
         this.store.totalLength
       }m; vmax ${this.store.maxStockSpeed}`;
 
@@ -431,7 +489,7 @@ export default defineComponent({
         this.loadStockFromString(stockString);
       };
 
-      reader.onerror = (err) => console.log(err);
+      reader.onerror = (err) => console.error(err);
 
       inputEl.value = '';
     },
@@ -466,7 +524,7 @@ export default defineComponent({
 @import '../../styles/global';
 @import '../../styles/tab.scss';
 
-.stock-list-tab {
+.tab_content {
   display: flex;
   flex-direction: column;
   gap: 0.5em;
@@ -474,6 +532,7 @@ export default defineComponent({
 
 .warning {
   padding: 0.25em;
+  margin: 0.25em 0;
   background: $accentColor;
   color: black;
 
@@ -536,10 +595,20 @@ export default defineComponent({
   }
 }
 
-ul {
+.list-wrapper {
   position: relative;
-  overflow: auto;
+}
-  max-height: 500px;
+
+.list-empty {
+  background-color: $secondaryColor;
+  border-radius: 0.5em;
+  padding: 0.75em;
+  font-weight: bold;
+}
+
+ul {
+  overflow-y: scroll;
+  height: 500px;
 }
 
 ul > li {
@@ -556,16 +625,11 @@ ul > li {
   &:focus-visible {
     outline: 1px solid white;
   }
-
-  &.list-empty {
-    background-color: $secondaryColor;
-    border-radius: 0.5em;
-    padding: 0.75em;
-  }
 }
 
 li > .stock-info {
   display: flex;
+  gap: 0.25em;
 
   color: white;
   font-weight: 700;
@@ -574,46 +638,39 @@ li > .stock-info {
 
   & > span {
     padding: 0.5em;
-    margin-right: 0.25em;
-
-    display: flex;
-    justify-content: center;
-    align-items: center;
   }
 }
 
-.sponsor {
+.stock-info-no,
-  color: salmon;
+.stock-info-type {
+  background-color: $secondaryColor;
+
+  &[data-team-only='true'] {
+    color: $teamColor;
+  }
+
+  &[data-sponsor-only='true'] {
+    color: $sponsorColor;
+  }
 }
 
-.stock-info {
+.stock-info-no {
-  &__no,
+  min-width: 3.5em;
-  &__type {
+  text-align: right;
-    background-color: $secondaryColor;
-  }
 
-  &__count {
+  &[data-selected='true'] {
-    background-color: #e04e3e;
+    color: $accentColor;
   }
+}
 
-  &__no {
+.stock-info-cargo {
-    min-width: 3.5em;
+  background-color: #333;
-    text-align: right;
+}
 
-    &[data-selected='true'] {
+.stock-info-length,
-      color: $accentColor;
+.stock-info-mass,
-    }
+.stock-info-speed {
-  }
+  background-color: #555;
-
-  &__cargo {
-    background-color: #333;
-  }
-
-  &__length,
-  &__mass,
-  &__speed {
-    background-color: #555;
-  }
 }
 
 .stock-list-anim {

src/components/tabs/WikiListTab.vue

@@ -5,89 +5,80 @@
     </div>
 
     <div class="tab_content">
-      <div class="actions-panel">
+      <div class="actions">
-        <div class="actions-panel_vehicles">
+        <label>
-          <button
+          <span>{{ $t('wiki.labels.search-vehicle') }}</span>
-            class="btn"
+          <input
-            :data-chosen="currentFilterMode == 'tractions'"
+            type="text"
-            @click="toggleFilter('tractions')"
+            :placeholder="$t('wiki.labels.search-vehicle-placeholder')"
-          >
+            v-model="searchedVehicleTypeName"
-            {{ $t('wiki.action-vehicles') }}
+          />
-          </button>
+        </label>
-          <button
-            class="btn"
-            :data-chosen="currentFilterMode == 'carriages'"
-            @click="toggleFilter('carriages')"
-          >
-            {{ $t('wiki.action-carriages') }}
-          </button>
-        </div>
 
-        <div class="actions-panel_search">
+        <label>
-          <input type="text" :placeholder="$t('wiki.search')" v-model="searchedVehicleTypeName" />
+          <span>{{ $t('wiki.labels.vehicles') }}</span>
-        </div>
+          <select name="filter-type" id="filter-type" v-model="filterType">
+            <option v-for="filter in filters" :key="filter" :value="filter">
+              {{ $t(`wiki.filters.${filter}`) }}
+            </option>
+          </select>
+        </label>
+
+        <label>
+          <span>{{ $t('wiki.labels.sort-by') }}</span>
+          <select name="sorter-type" id="sorter-type" v-model="sorterType">
+            <option v-for="sorter in sorters" :key="sorter" :value="sorter">
+              {{ $t(`wiki.sort-by.${sorter}`) }}
+            </option>
+          </select>
+        </label>
+
+        <label>
+          <span>{{ $t('wiki.labels.sort-direction') }}</span>
+
+          <select name="sorter-direction" id="sorter-direction" v-model="sorterDirection">
+            <option value="asc">{{ $t('wiki.sort-direction.asc') }}</option>
+            <option value="desc">{{ $t('wiki.sort-direction.desc') }}</option>
+          </select>
+        </label>
       </div>
 
-      <div class="table-wrapper" ref="table-wrapper">
+      <ul class="vehicles" ref="vehicles">
-        <table>
+        <li
-          <thead>
+          v-for="vehicle in computedVehicles"
-            <tr>
+          :key="vehicle.type"
-              <th v-for="header in visibleHeaders" @click="toggleSorter(header)" :key="header.id">
+          :data-preview="vehicle.type === store.chosenVehicle?.type"
-                {{ $t(`wiki.header.${header.id}`) }}
+          @click="previewVehicle(vehicle)"
+          @dblclick="addVehicle(vehicle)"
+          @keydown.enter="onVehicleSelect(vehicle)"
+          tabindex="0"
+        >
+          <img loading="lazy" width="120" :src="getThumbnailURL(vehicle.type, 'small')" />
 
-                <span v-if="currentSorter.id == header.id">
+          <span>
-                  {{ currentSorter.direction == 1 ? `&uArr;` : `&dArr;` }}
+            <span
-                </span>
+              class="vehicle-name"
-              </th>
+              :class="{
-            </tr>
+                'sponsor-only':
-          </thead>
+                  vehicle.sponsorOnlyTimestamp && vehicle.sponsorOnlyTimestamp > Date.now(),
-
+                'team-only': vehicle.teamOnly,
-          <tbody>
+              }"
-            <tr
-              v-for="{ vehicle, show } in computedTableData"
-              tabindex="0"
-              v-show="show"
-              :key="vehicle.type"
-              @click="previewVehicle(vehicle)"
-              @keydown.enter="previewVehicle(vehicle)"
-              @dblclick="addVehicle(vehicle)"
             >
-              <td style="width: 120px">
+              <b>{{ vehicle.type.replace(/_/g, ' ') }}</b>
-                <img
+            </span>
-                  width="120"
-                  :src="getThumbnailURL(vehicle.type, 'small')"
-                  :alt="`${vehicle.type}`"
-                  loading="lazy"
-                  @error="(e) => ((e.target as HTMLElement).style.display = 'none')"
-                />
-              </td>
 
-              <td :data-sponsoronly="vehicle.isSponsorsOnly">
+            <div class="vehicle-group">
-                {{ vehicle.type }}
+              {{ $t(`wiki.${vehicle.group}`) }} |
-              </td>
+              {{ isTractionUnit(vehicle) ? vehicle.cabinType : vehicle.constructionType }}
+            </div>
 
-              <td v-if="isLocomotive(vehicle)">
+            <div class="vehicle-props">
-                {{ $t(`wiki.${vehicle.power}`) }}
+              {{ vehicle.length }}m | {{ (vehicle.weight / 1000).toFixed(1) }}t |
-              </td>
+              {{ vehicle.maxSpeed }}km/h
-              <td v-else>{{ $t(`wiki.${vehicle.useType}`) }}</td>
+            </div>
-
+          </span>
-              <td>{{ vehicle.constructionType }}</td>
+        </li>
-              <td>{{ vehicle.length }}m</td>
+      </ul>
-              <td>{{ (vehicle.weight / 1000).toFixed(1) }}t</td>
-              <td>{{ vehicle.maxSpeed }}km/h</td>
-
-              <td v-if="currentFilterMode == 'carriages'">
-                {{ !isLocomotive(vehicle) ? vehicle.cargoTypes.length : '---' }}
-              </td>
-              <td v-if="currentFilterMode == 'tractions'">
-                {{ isLocomotive(vehicle) ? (vehicle.coldStart ? `&check;` : '&cross;') : '---' }}
-              </td>
-            </tr>
-          </tbody>
-
-          <span ref="table-bottom"></span>
-        </table>
-      </div>
     </div>
   </section>
 </template>
@@ -97,43 +88,17 @@ import { defineComponent } from 'vue';
 import { useStore } from '../../store';
 import stockPreviewMixin from '../../mixins/stockPreviewMixin';
 import { IVehicle } from '../../types';
-import { isLocomotive } from '../../utils/vehicleUtils';
+import { isTractionUnit } from '../../utils/vehicleUtils';
 import stockMixin from '../../mixins/stockMixin';
 import imageMixin from '../../mixins/imageMixin';
 
-type SorterID =
+const sorters = ['type', 'group', 'length', 'weight', 'maxSpeed'] as const;
-  | 'type'
+const filters = ['vehicles-all', 'vehicles-traction', 'vehicles-wagon'] as const;
-  | 'constructionType'
-  | 'image'
-  | 'length'
-  | 'weight'
-  | 'maxSpeed'
-  | 'cargoCount'
-  | 'group'
-  | 'coldStart';
 
-interface IWikiHeader {
+type SorterType = (typeof sorters)[number];
-  id: SorterID;
+type SorterDirection = 'asc' | 'desc';
-  sortable: boolean;
-  for: 'all' | 'carriages' | 'tractions';
-}
 
-interface IWikiRow {
+type FilterType = (typeof filters)[number];
-  vehicle: IVehicle;
-  show: boolean;
-}
-
-const headers: IWikiHeader[] = [
-  { id: 'image', sortable: false, for: 'all' },
-  { id: 'type', sortable: true, for: 'all' },
-  { id: 'group', sortable: true, for: 'all' },
-  { id: 'constructionType', sortable: true, for: 'all' },
-  { id: 'length', sortable: true, for: 'all' },
-  { id: 'weight', sortable: true, for: 'all' },
-  { id: 'maxSpeed', sortable: true, for: 'all' },
-  { id: 'coldStart', sortable: true, for: 'tractions' },
-  { id: 'cargoCount', sortable: true, for: 'carriages' },
-];
 
 export default defineComponent({
   mixins: [stockPreviewMixin, stockMixin, imageMixin],
@@ -141,110 +106,104 @@ export default defineComponent({
   data() {
     return {
       store: useStore(),
-      headers,
+      observer: null as IntersectionObserver | null,
 
-      scrollTop: 0,
+      sorters: sorters,
+      filters: filters,
 
       searchedVehicleTypeName: '',
 
-      currentSorter: {
+      sorterType: 'type' as SorterType,
-        id: 'type' as SorterID,
+      sorterDirection: 'asc' as SorterDirection,
-        direction: 1,
-      },
 
-      currentFilterMode: 'all' as 'all' | 'tractions' | 'carriages',
+      filterType: 'vehicles-all' as FilterType,
+
+      lastScrollTop: 0,
     };
   },
 
-  activated() {
+  deactivated() {
-    const tableWrapperRef = this.$refs['table-wrapper'] as HTMLElement;
+    this.lastScrollTop = (this.$refs['vehicles'] as HTMLUListElement)?.scrollTop || 0;
+  },
 
-    tableWrapperRef.scrollTo({
+  activated() {
-      top: this.scrollTop,
+    (this.$refs['vehicles'] as HTMLUListElement)?.scrollTo({ top: this.lastScrollTop });
-    });
+  },
+
+  watch: {
+    computedVehicles() {
+      const vehiclesRef = this.$refs['vehicles'] as HTMLElement;
+
+      vehiclesRef.scrollTo({
+        top: 0,
+      });
+    },
   },
 
   methods: {
-    isLocomotive,
+    isTractionUnit,
 
-    toggleFilter(name: typeof this.currentFilterMode) {
+    onVehicleSelect(vehicle: IVehicle) {
-      this.currentFilterMode = this.currentFilterMode == name ? 'all' : name;
+      if (this.store.chosenVehicle?.type === vehicle.type) this.addVehicle(vehicle);
+      this.previewVehicle(vehicle);
     },
 
-    toggleSorter(header: IWikiHeader) {
+    filterVehicles(v: IVehicle) {
-      if (!header.sortable) return;
+      if (this.searchedVehicleTypeName)
+        return v.type
+          .toLocaleLowerCase()
+          .includes(this.searchedVehicleTypeName.toLocaleLowerCase());
 
-      if (header.id == this.currentSorter.id) this.currentSorter.direction *= -1;
+      switch (this.filterType) {
-      this.currentSorter.id = header.id;
+        case 'vehicles-all':
+          return true;
+        case 'vehicles-traction':
+          return isTractionUnit(v);
+        case 'vehicles-wagon':
+          return !isTractionUnit(v);
+
+        default:
+          return false;
+      }
     },
 
-    sortTableRows(row1: IWikiRow, row2: IWikiRow) {
+    sortVehicles(v1: IVehicle, v2: IVehicle) {
-      if (!row1.show) return 0;
+      const direction = this.sorterDirection == 'asc' ? 1 : -1;
 
-      const { id, direction } = this.currentSorter;
+      switch (this.sorterType) {
-
-      switch (id) {
         case 'type':
-        case 'constructionType':
         case 'group':
-          return direction == 1
+          return direction * v1[this.sorterType].localeCompare(v2[this.sorterType]);
-            ? row1.vehicle[id].localeCompare(row2.vehicle[id])
-            : row2.vehicle[id].localeCompare(row1.vehicle[id]);
 
         case 'weight':
         case 'length':
         case 'maxSpeed':
-          return Math.sign(row1.vehicle[id] - row2.vehicle[id]) * direction;
+          return Math.sign(v1[this.sorterType] - v2[this.sorterType]) * direction;
 
-        case 'cargoCount':
+        // case 'cargoCount':
-          return (
+        //   return (
-            (!isLocomotive(row1.vehicle) ? Math.sign(row1.vehicle.cargoTypes.length || -1) : -1) -
+        //     Math.sign(
-            (!isLocomotive(row2.vehicle) ? (row2.vehicle.cargoTypes.length || -1) * direction : -1)
+        //       (!isTractionUnit(v1) ? v1.cargoTypes.length || -1 : -1) -
-          );
+        //         (!isTractionUnit(row2.vehicle) ? row2.vehicle.cargoTypes.length || -1 : -1)
+        //     ) * direction
+        //   );
 
-        case 'coldStart':
+        // case 'coldStart':
-          return (
+        //   return (
-            ((isLocomotive(row1.vehicle) && row1.vehicle.coldStart ? 1 : -1) -
+        //     ((isTractionUnit(v1) && v1.coldStart ? 1 : -1) -
-              (isLocomotive(row2.vehicle) && row2.vehicle.coldStart ? 1 : -1)) *
+        //       (isTractionUnit(row2.vehicle) && row2.vehicle.coldStart ? 1 : -1)) *
-            direction
+        //     direction
-          );
+        //   );
 
         default:
-          break;
+          return v1.type.localeCompare(v2.type) * direction;
       }
-
-      return direction == 1
-        ? row1.vehicle.type.localeCompare(row2.vehicle.type)
-        : row2.vehicle.type.localeCompare(row1.vehicle.type);
     },
   },
 
   computed: {
-    computedTableData(): IWikiRow[] {
+    computedVehicles() {
-      return this.store.vehicleDataList
+      return this.store.vehicleDataList.filter(this.filterVehicles).sort(this.sortVehicles);
-        .map((vehicle) => ({
-          vehicle,
-          show:
-            new RegExp(`${this.searchedVehicleTypeName.trim()}`, 'i').test(vehicle.type) &&
-            (this.currentFilterMode == 'all' ||
-              (this.currentFilterMode == 'tractions' && isLocomotive(vehicle)) ||
-              (this.currentFilterMode == 'carriages' && !isLocomotive(vehicle))),
-        }))
-        .sort((a, b) => this.sortTableRows(a, b));
-    },
-
-    visibleHeaders() {
-      const filtersActive = this.currentFilterMode;
-
-      return this.headers.filter((header) => header.for == 'all' || header.for == filtersActive);
-    },
-
-    areTractionVehiclesShown() {
-      return this.currentFilterMode == 'all' || this.currentFilterMode == 'tractions';
-    },
-
-    areCarriagesShown() {
-      return this.currentFilterMode == 'all' || this.currentFilterMode == 'carriages';
     },
   },
 });
@@ -253,91 +212,84 @@ export default defineComponent({
 <style lang="scss" scoped>
 @import '../../styles/tab.scss';
 
-.actions-panel {
+.actions {
-  display: flex;
+  display: grid;
-  justify-content: space-between;
+  grid-template-columns: repeat(auto-fit, minmax(10em, 1fr));
-  align-items: center;
 
   flex-wrap: wrap;
   gap: 0.5em;
-
-  margin: 0.5em 0;
 }
 
-.actions-panel_vehicles {
+.actions > label {
+  display: flex;
+  flex-direction: column;
+  gap: 0.25em;
+
+  span {
+    color: #ccc;
+  }
+}
+
+.vehicles {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(320px, 1fr));
+  gap: 0.5em;
+  overflow: auto;
+
+  max-height: 730px;
+
+  margin-top: 0.75em;
+  padding: 0.25em;
+}
+
+.vehicles > li {
   display: flex;
   gap: 0.5em;
-}
 
-.actions-panel_search {
+  background-color: #161c2e;
-  input {
+  padding: 0.5em;
-    width: auto;
+
+  min-height: 75px;
+  cursor: pointer;
+
+  &[data-preview='true'] {
+    background-color: #435288;
+  }
+
+  & > span {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    overflow: hidden;
   }
 }
 
-.table-wrapper {
+.vehicle-name {
-  overflow: auto;
+  overflow: hidden;
-  height: 750px;
+  text-wrap: nowrap;
-  max-height: 95vh;
+  text-overflow: ellipsis;
 }
 
-.wiki-list table {
+.sponsor-only {
-  border-collapse: collapse;
+  color: $sponsorColor;
-  width: 100%;
 
-  thead {
+  &::after {
-    position: sticky;
+    content: '*';
-    top: 0;
-  }
-
-  th {
-    background-color: #111;
-    padding: 0.5em;
-    user-select: none;
-    -moz-user-select: none;
-    -webkit-user-select: none;
-  }
-
-  tr {
-    cursor: pointer;
-    background-color: #333;
-
-    &:first-child {
-      min-width: 120px;
-    }
-
-    &:nth-child(odd) {
-      background-color: #444;
-    }
-
-    &:hover {
-      background-color: #666;
-    }
-  }
-
-  td {
-    text-align: center;
-    height: 70px;
-    padding: 0.25em;
-
-    &[data-sponsoronly='true'] {
-      color: salmon;
-    }
   }
 }
 
-@media screen and (max-width: $breakpointMd) {
+.team-only {
-  .wiki-list table {
+  color: $teamColor;
-    th {
-      min-width: 100px;
-    }
 
-    img {
+  &::after {
-      max-width: 100px;
+    content: '*';
-    }
   }
 }
 
+.vehicle-props {
+  color: #ccc;
+}
+
 @media screen and (max-width: $breakpointSm) {
   .actions-panel {
     align-items: stretch;

src/components/utils/StockThumbnails.vue

@@ -5,7 +5,10 @@
       v-for="(stock, stockIndex) in store.stockList"
       :key="stockIndex"
       :data-selected="store.chosenStockListIndex == stockIndex"
-      :data-sponsor="stock.isSponsorsOnly"
+      :data-sponsor-only="
+        stock.vehicleRef.sponsorOnlyTimestamp && stock.vehicleRef.sponsorOnlyTimestamp > Date.now()
+      "
+      :data-team-only="stock.vehicleRef.teamOnly"
       draggable="true"
       @dragstart="onDragStart(stockIndex)"
       @drop="onDrop($event, stockIndex)"
@@ -13,14 +16,14 @@
       @click="onListItemClick(stockIndex)"
     >
       <b>
-        {{ stock.type }}
+        {{ stock.vehicleRef.type }}
       </b>
 
       <img
         draggable="false"
-        :src="`https://rj.td2.info.pl/dist/img/thumbnails/${stock.type}.png`"
+        :src="`https://rj.td2.info.pl/dist/img/thumbnails/${stock.vehicleRef.type}.png`"
-        :alt="stock.type"
+        :alt="stock.vehicleRef.type"
-        :title="stock.type"
+        :title="stock.vehicleRef.type"
         @error="stockImageError($event, stock)"
       />
     </div>
@@ -43,7 +46,7 @@ const onListItemClick = (index: number) => {
 };
 
 const stockImageError = (e: Event, stock: IStock) => {
-  (e.target as HTMLImageElement).src = `images/${stock.useType}-unknown.png`;
+  (e.target as HTMLImageElement).src = `images/${stock.vehicleRef.group}-unknown.png`;
 };
 
 watch(
@@ -88,10 +91,13 @@ const allowDrop = (e: DragEvent) => {
 </script>
 
 <style lang="scss" scoped>
+@import '../../styles/global.scss';
+
 .stock-thumbnails {
   display: flex;
   overflow: auto;
   background-color: #353a57;
+  min-height: 100px;
 }
 
 .thumbnail-item {
@@ -121,8 +127,12 @@ const allowDrop = (e: DragEvent) => {
     margin: 0 1em;
   }
 
-  &[data-sponsor='true'] > b {
+  &[data-sponsor-only='true'] > b {
-    color: salmon;
+    color: $sponsorColor;
+  }
+
+  &[data-team-only='true'] > b {
+    color: $teamColor;
   }
 
   img {

src/constants/numberGeneratorData.json

@@ -27,18 +27,8 @@
   },
   "categoriesRules": {
     "EI": [null, "00", "99"],
-    "MP": [null, "050", "169"],
+    "EC": [null, "000", "049"],
-    "RO": [null, "200", "999"],
+    "EN": [null, "000", "049"],
-    "RP": [null, "050", "169"],
-    "PW": ["6", "000", "899"],
-    "TK": ["3", "000", "899"],
-    "TM": ["4", "000", "899"],
-    "LT": ["5", "000", "899"]
-  },
-  "categoriesNextVersion": {
-    "EI": [null, "00", "99"],
-    "EC": [null, "001", "049"],
-    "EN": [null, "001", "049"],
 
     "RO": [null, "200", "999"],
     "RP": [null, "050", "169"],

src/enums/EVehicleUseType.ts

@@ -1,9 +0,0 @@
-export const enum EVehicleUseType {
-  LOCO_ELECTRICAL = 'loco-e',
-  LOCO_DIESEL = 'loco-s',
-  EMU = 'loco-ezt',
-  DMU = 'loco-szt',
-
-  CAR_PASSENGER = 'car-passenger',
-  CAR_CARGO = 'car-cargo',
-}

src/http.ts

@@ -3,8 +3,8 @@ import axios from 'axios';
 const http = axios.create({
   baseURL:
     import.meta.env.VITE_API_DEV === '1' && import.meta.env.DEV
-      ? 'http://localhost:5500'
+      ? 'http://localhost:3001'
-      : 'https://static.spythere.eu',
+      : 'https://stacjownik.spythere.eu',
 });
 
 export default http;

src/locales/en.json

@@ -15,12 +15,12 @@
     "cargo-title": "Cargo (only selected freight cars)",
     "no-cargo-available": "no cargo available",
     "cargo-empty": "empty",
-    "loco-e": "ELECTR.",
+    "loco-electric": "ELECTR.",
-    "loco-s": "DIESEL",
+    "loco-diesel": "DIESEL",
-    "loco-ezt": "EMU",
+    "unit-electric": "EMU",
-    "loco-szt": "DMU",
+    "unit-diesel": "DMU",
-    "car-passenger": "PASSENGER",
+    "wagon-passenger": "PASSENGER",
-    "car-cargo": "FREIGHT",
+    "wagon-freight": "FREIGHT",
     "action-add": "ADD NEW",
     "action-swap": "SWAP WITH",
     "real-stock": "POLISH TRAIN COMPOSITIONS"
@@ -30,12 +30,13 @@
     "loading": "IMAGE LOADING...",
     "desc": "Choose a railway vehicle above to see its preview",
     "sponsor-only": "* SPONSORS ONLY UNTIL {0}",
-    "loco-e": "ELECTRIC LOCO",
+    "team-only": "* TD2 TEAM ONLY",
-    "loco-s": "DIESEL LOCO",
+    "loco-electric": "ELECTRIC LOCO",
-    "loco-ezt": "ELECTRIC M.U.",
+    "loco-diesel": "DIESEL LOCO",
-    "loco-szt": "DIESEL M.U.",
+    "unit-electric": "ELECTRIC M.U.",
-    "car-passenger": "PASSENGER CARRIAGE",
+    "unit-diesel": "DIESEL M.U.",
-    "car-cargo": "FREIGHT CARRIAGE",
+    "wagon-passenger": "PASSENGER CARRIAGE",
+    "wagon-freight": "FREIGHT CARRIAGE",
     "cabin": "Cabin type:",
     "construction": "Construction type:"
   },
@@ -68,11 +69,13 @@
     "coldstart-info": "Locomotive cold start",
     "doublemanning-info": "Double manning",
     "list-empty": "Stock list is empty!",
-    "warning-not-suitable": "EP07 & EP08 type locomotives are designed for passenger traffic only!",
+
+    "warning-not-suitable": "EP series locomotives are designed for passenger traffic only!",
     "warning-passenger-too-long": "Maximum length of a passenger train may not be greater than 350m!",
     "warning-freight-too-long": "Maximum length of a freight train may not be greater than 650m!",
     "warning-too-many-locos": "This train has too many traction units!",
     "warning-too-heavy": "This train is too heavy! Check {href}",
+    "warning-team-only-vehicle": "There's at least one vehicle available only for TD2 team members in your stock composition! ({0})",
     "acceptable-mass-docs": "acceptable rolling stock masses (PL)"
   },
   "stockgen": {
@@ -145,7 +148,7 @@
       "TD": "TD - domestic freight (intermodal)",
       "TM": "TM - domestic freight (cargo)",
       "TN": "TN - domestic freight (no cargo)",
-      "TK": "TK - freight (stations & sidings service)",
+      "TK": "TK - freight (stations & sidings)",
       "TS": "TS - empty freight test drive",
 
       "LT": "LT - locomotive only",
@@ -159,26 +162,37 @@
   },
   "wiki": {
     "title": "LIST OF AVAILABLE VEHICLES",
-    "action-vehicles": "TRACTION UNITS",
+    "labels": {
-    "action-carriages": "CARRIAGES",
+      "vehicles": "Vehicles",
-    "search": "Search for a vehicle...",
+      "sort-by": "Sort by",
-    "header": {
+      "sort-direction": "Sort direction",
-      "image": "Image",
+      "search-vehicle": "Find a vehicle",
-      "type": "Name",
+      "search-vehicle-placeholder": "Input a vehicle name"
-      "group": "Type group",
-      "constructionType": "Construction",
-      "coldStart": "Cold start",
-      "length": "Length",
-      "weight": "Mass",
-      "maxSpeed": "Speed",
-      "cargoCount": "Cargo count"
     },
-    "loco-ezt": "EMU",
+    "filters": {
-    "loco-szt": "DMU",
+      "vehicles-all": "all",
-    "loco-s": "Diesel locomotive",
+      "vehicles-traction": "traction units",
-    "loco-e": "Electric locomotive",
+      "vehicles-wagon": "wagons"
-    "car-passenger": "Passenger carriage",
+    },
-    "car-cargo": "Frieght carriage"
+    "sort-by": {
+      "type": "name",
+      "group": "type group",
+      "length": "length",
+      "weight": "mass",
+      "maxSpeed": "speed",
+      "coldStart": "cold start",
+      "cargoCount": "cargo count"
+    },
+    "sort-direction": {
+      "asc": "ascending",
+      "desc": "descending"
+    },
+    "unit-electric": "EMU",
+    "unit-diesel": "DMU",
+    "loco-diesel": "Diesel locomotive",
+    "loco-electric": "Electric locomotive",
+    "wagon-passenger": "Passenger carriage",
+    "wagon-freight": "Frieght carriage"
   },
   "realstock": {
     "title": "POLISH TRAIN COMPOSITIONS by",

src/locales/pl.json

@@ -9,18 +9,18 @@
     "version-check": "Strona jest kompletna dla wersji {version} symulatora TD2"
   },
   "inputs": {
-    "title": "WYBIERZ POJAZD SZYNOWY",
+    "title": "WYBIERZ POJAZD",
     "input-vehicle": "Wybierz pojazd trakcyjny",
     "input-carwagon": "Wybierz wagon",
     "cargo-title": "Ładunek (tylko wybrane towarowe)",
     "no-cargo-available": "brak dostępnych ładunków",
     "cargo-empty": "próżny",
-    "loco-e": "ELEKTR.",
+    "loco-electric": "ELEKTR.",
-    "loco-s": "SPAL.",
+    "loco-diesel": "SPAL.",
-    "loco-ezt": "EZT",
+    "unit-electric": "EZT",
-    "loco-szt": "SZT",
+    "unit-diesel": "SZT",
-    "car-passenger": "PASAŻERSKIE",
+    "wagon-passenger": "PASAŻERSKIE",
-    "car-cargo": "TOWAROWE",
+    "wagon-freight": "TOWAROWE",
     "action-add": "DODAJ NOWY",
     "action-swap": "ZAMIEŃ ZA",
     "real-stock": "REALNE ZESTAWIENIA"
@@ -30,12 +30,13 @@
     "loading": "ŁADOWANIE OBRAZU...",
     "desc": "Wybierz pojazd lub wagon, aby zobaczyć jego podgląd powyżej",
     "sponsor-only": "* TYLKO DLA SPONSORÓW DO {0}",
-    "loco-e": "ELEKTROWÓZ",
+    "team-only": "* TYLKO DLA ZESPOŁU TD2",
-    "loco-s": "SPALINOWÓZ",
+    "loco-electric": "ELEKTROWÓZ",
-    "loco-ezt": "EZT",
+    "loco-diesel": "SPALINOWÓZ",
-    "loco-szt": "SZT",
+    "unit-electric": "EZT",
-    "car-passenger": "WAGON PASAŻERSKI",
+    "unit-diesel": "SZT",
-    "car-cargo": "WAGON TOWAROWY",
+    "wagon-passenger": "WAGON PASAŻERSKI",
+    "wagon-freight": "WAGON TOWAROWY",
     "cabin": "Typ kabiny:",
     "construction": "Typ konstrukcji:"
   },
@@ -68,11 +69,13 @@
     "coldstart-info": "Zimny start",
     "doublemanning-info": "Podwójna obsada",
     "list-empty": "Lista pojazdów jest pusta!",
-    "warning-not-suitable": "Lokomotywy EP07 i EP08 są przeznaczone jedynie do ruchu pasażerskiego!",
+
+    "warning-not-suitable": "Lokomotywy serii EP są przeznaczone jedynie do ruchu pasażerskiego!",
     "warning-passenger-too-long": "Maksymalna długość składów pasażerskich nie może przekraczać 350m!",
     "warning-freight-too-long": "Maksymalna długość składów innych niż pasażerskie nie może przekraczać 650m!",
     "warning-too-many-locos": "Ten skład posiada za dużo pojazdów trakcyjnych!",
     "warning-too-heavy": "Ten skład jest za ciężki! Sprawdź {href}",
+    "warning-team-only-vehicle": "W zestawieniu znajduje się co najmniej jeden pojazd dostępny tylko dla członków zespołu TD2! ({0})",
     "acceptable-mass-docs": "dopuszczalne masy składów"
   },
   "stockgen": {
@@ -95,8 +98,8 @@
     "title": "GENERATOR NUMERU POCIĄGU",
     "subtitle": "Generuje realny numer pociągu na podstawie instrukcji Ir-11",
     "alert": "Numer został skopiowany do twojego schowka!",
-    "start-region": "Początkowy obszar konstrukcyjny",
+    "start-region": "Obszar początkowy",
-    "end-region": "Końcowy obszar konstrukcyjny",
+    "end-region": "Obszar końcowy",
     "train-category": "Kategoria pociągu",
     "number-info": "Wygenerowany numer pociągu:",
     "warning": "Wybierz kategorię oraz (opcjonalnie) obszary konstrukcyjne",
@@ -126,17 +129,17 @@
       "EC": "EC - ekspres międzynarodowy",
       "EN": "EN - ekspres krajowy nocny",
 
-      "MP": "MP - międzywojewódzki pośpieszny",
+      "MP": "MP - międzywoj. pośpieszny",
       "RP": "RP - wojewódzki pośpieszny",
-      "MO": "MO - międzywojewódzki osobowy",
+      "MO": "MO - międzywoj. osobowy",
       "RO": "RO - wojewódzki osobowy",
 
-      "MM": "MM - międzynarodowy pośpieszny",
+      "MM": "MM - międzynar. pośpieszny",
-      "MH": "MH - międzywoj. pośpieszny nocny / hotelowy",
+      "MH": "MH - międzywoj. pośpieszny hotelowy",
-      "RM": "RM - wojewódzki osobowy międzynarodowy",
+      "RM": "RM - woj. osobowy międzynarodowy",
-      "RA": "RA - wojewódzki osobowy algomeracyjny",
+      "RA": "RA - woj. osobowy algomeracyjny",
 
-      "PW": "PW - pasażerski próżny (\"służbowy\")",
+      "PW": "PW - pasażerski próżny - służbowy",
       "PX": "PX - pasażerski próżny próbny",
 
       "TC": "TC - towarowy międzynarodowy intermodalny",
@@ -145,7 +148,7 @@
       "TD": "TD - towarowy krajowy intermodalny",
       "TM": "TM - towarowy krajowy masowy",
       "TN": "TN - towarowy krajowy niemasowy",
-      "TK": "TK - towarowy do obsługi stacji i bocznic",
+      "TK": "TK - towarowy (stacje i bocznice)",
       "TS": "TS - towarowy próżny próbny",
 
       "LT": "LT - lokomotywa luzem",
@@ -159,26 +162,37 @@
   },
   "wiki": {
     "title": "LISTA DOSTĘPNYCH POJAZDÓW",
-    "action-vehicles": "POJ. TRAKCYJNE",
+    "labels": {
-    "action-carriages": "WAGONY",
+      "vehicles": "Pojazdy",
-    "search": "Wyszukaj pojazd...",
+      "sort-by": "Sortuj wg",
-    "header": {
+      "sort-direction": "Kierunek sortowania",
-      "image": "Zdjęcie",
+      "search-vehicle": "Wyszukaj pojazd",
-      "type": "Nazwa",
+      "search-vehicle-placeholder": "Wpisz nazwę pojazdu"
-      "group": "Rodzaj",
-      "constructionType": "Konstrukcja",
-      "coldStart": "Zimny start",
-      "length": "Długość",
-      "weight": "Masa",
-      "maxSpeed": "Prędkość",
-      "cargoCount": "Ładunki"
     },
-    "loco-ezt": "EZT",
+    "filters": {
-    "loco-szt": "SZT",
+      "vehicles-all": "wszystkie",
-    "loco-s": "Spalinowóz",
+      "vehicles-traction": "trakcyjne",
-    "loco-e": "Elektrowóz",
+      "vehicles-wagon": "wagony"
-    "car-passenger": "Wagon pasażerski",
+    },
-    "car-cargo": "Wagon towarowy"
+    "sort-by": {
+      "type": "nazwa",
+      "group": "rodzaj",
+      "length": "długość",
+      "weight": "masa",
+      "maxSpeed": "prędkość",
+      "coldStart": "zimny start",
+      "cargoCount": "ładunki"
+    },
+    "sort-direction": {
+      "asc": "rosnąco",
+      "desc": "malejąco"
+    },
+    "loco-diesel": "Spalinowóz",
+    "loco-electric": "Elektrowóz",
+    "unit-electric": "EZT",
+    "unit-diesel": "SZT",
+    "wagon-passenger": "Wagon pasażerski",
+    "wagon-freight": "Wagon towarowy"
   },
   "realstock": {
     "title": "ZESTAWIENIA REALNE by",

src/mixins/imageMixin.ts

@@ -7,11 +7,7 @@ export default defineComponent({
     },
 
     getThumbnailURL(vehicleType: string, size: 'small' | 'large') {
-      return `${
+      return `https://static.spythere.eu/images/${vehicleType}--${size == 'small' ? 300 : 800}px.jpg`;
-        import.meta.env.VITE_API_DEV === '1'
-          ? 'http://localhost:5500'
-          : 'https://static.spythere.eu'
-      }/images/${vehicleType}--${size == 'small' ? 300 : 800}px.jpg`;
     },
   },
 });

src/mixins/stockMixin.ts

@@ -1,7 +1,7 @@
 import { defineComponent } from 'vue';
 import { useStore } from '../store';
 import { ICarWagon, ILocomotive, IStock, ICargo, IVehicle } from '../types';
-import { isLocomotive } from '../utils/vehicleUtils';
+import { isTractionUnit } from '../utils/vehicleUtils';
 
 export default defineComponent({
   setup() {
@@ -15,23 +15,11 @@ export default defineComponent({
       return `${Math.random().toString(36).slice(5)}`;
     },
 
-    getStockObject(vehicle: IVehicle, cargo?: ICargo | null, count = 1): IStock {
+    getStockObject(vehicle: IVehicle, cargo?: ICargo | null): IStock {
-      const isLoco = isLocomotive(vehicle);
-
       return {
         id: this.getStockId(),
-        type: vehicle.type,
+        vehicleRef: vehicle,
-        length: vehicle.length,
+        cargo: !isTractionUnit(vehicle) && vehicle.loadable && cargo ? cargo : undefined,
-        weight: vehicle.weight,
-        maxSpeed: vehicle.maxSpeed,
-        isLoco,
-        cargo: !isLoco && vehicle.loadable && cargo ? cargo : undefined,
-        count,
-        imgSrc: vehicle.imageSrc,
-        useType: isLoco ? vehicle.power : vehicle.useType,
-        isSponsorsOnly: vehicle.isSponsorsOnly,
-        constructionType: vehicle.constructionType,
-        sponsorsOnlyTimestamp: vehicle.sponsorsOnlyTimestamp,
       };
     },
 
@@ -40,14 +28,19 @@ export default defineComponent({
 
       const stock = this.getStockObject(vehicle, cargo);
 
-      if (stock.isLoco && !this.store.stockList[0]?.isLoco) this.store.stockList.unshift(stock);
+      if (
+        isTractionUnit(stock.vehicleRef) &&
+        this.store.stockList.length > 0 &&
+        !isTractionUnit(this.store.stockList[0].vehicleRef)
+      )
+        this.store.stockList.unshift(stock);
       else this.store.stockList.push(stock);
     },
 
     addLocomotive(loco: ILocomotive) {
       const stockObj = this.getStockObject(loco);
 
-      if (this.store.stockList.length > 0 && !this.store.stockList[0].isLoco)
+      if (this.store.stockList.length > 0 && !isTractionUnit(this.store.stockList[0].vehicleRef))
         this.store.stockList.unshift(stockObj);
       else this.store.stockList.push(stockObj);
     },
@@ -74,9 +67,11 @@ export default defineComponent({
         let vehicle: IVehicle | null = null;
         let vehicleCargo: ICargo | null = null;
 
-        const isLoco = /^(EU|EP|ET|SM|EN|2EN|SN)/.test(type);
+        const isTractionUnit = /^([a-zA-Z\d]{0,}-\d{0,})/.test(type);
 
-        if (isLoco) {
+        console.log(type, isTractionUnit);
+
+        if (isTractionUnit) {
           const [locoType, spawnProps] = type.split(',');
           vehicle = this.store.locoDataList.find((loco) => loco.type == locoType) || null;
 
@@ -92,7 +87,7 @@ export default defineComponent({
           if (cargo) vehicleCargo = vehicle?.cargoTypes.find((c) => c.id == cargo) || null;
         }
 
-        if (!vehicle) console.log('Brak pojazdu / rodzaj pojazdu źle wczytany:', type);
+        if (!vehicle) console.warn('Brak pojazdu / rodzaj pojazdu źle wczytany:', type);
 
         this.addVehicle(vehicle, vehicleCargo);
       });

src/mixins/stockPreviewMixin.ts

@@ -1,7 +1,7 @@
 import { defineComponent } from 'vue';
 import { useStore } from '../store';
-import { ICarWagon, ILocomotive, IStock, IVehicle } from '../types';
+import { ICarWagon, ILocomotive, IStock, IVehicle, LocoGroupType, WagonGroupType } from '../types';
-import { isLocomotive } from '../utils/vehicleUtils';
+import { isTractionUnit } from '../utils/vehicleUtils';
 
 export default defineComponent({
   setup() {
@@ -14,40 +14,37 @@ export default defineComponent({
 
   methods: {
     previewStock(stock: IStock) {
-      if (this.store.chosenVehicle?.imageSrc != stock.imgSrc) this.store.imageLoading = true;
+      const vehicleRef = stock.vehicleRef;
 
-      if (stock.isLoco) {
+      this.store.chosenVehicle = vehicleRef;
-        const chosenLoco = this.store.locoDataList.find((v) => v.type == stock.type) || null;
+
-        this.store.chosenVehicle = chosenLoco;
+      if (isTractionUnit(vehicleRef)) {
-        this.store.chosenLoco = chosenLoco;
+        this.store.chosenLoco = vehicleRef;
         this.store.chosenCargo = null;
-        this.store.chosenLocoPower = stock.useType;
+        this.store.chosenLocoGroup = vehicleRef.group as LocoGroupType;
       } else {
-        const chosenCar = this.store.carDataList.find((v) => v.type == stock.type) || null;
+        this.store.chosenCar = vehicleRef;
-        this.store.chosenVehicle = chosenCar;
-        this.store.chosenCar = chosenCar;
-
         this.store.chosenCargo = stock.cargo || null;
-        this.store.chosenCarUseType = stock.useType;
+        this.store.chosenCarGroup = vehicleRef.group as WagonGroupType;
       }
     },
 
     previewLocomotive(loco: ILocomotive) {
       this.store.chosenLoco = loco;
       this.store.chosenVehicle = loco;
-      this.store.chosenLocoPower = loco.power;
+      this.store.chosenLocoGroup = loco.group;
     },
 
     previewCarWagon(carWagon: ICarWagon) {
       this.store.chosenCar = carWagon;
-      this.store.chosenCarUseType = carWagon.useType;
+      this.store.chosenCarGroup = carWagon.group;
       this.store.chosenVehicle = carWagon;
 
       this.store.chosenCargo = null;
     },
 
     previewVehicle(vehicle: IVehicle) {
-      if (isLocomotive(vehicle)) this.previewLocomotive(vehicle);
+      if (isTractionUnit(vehicle)) this.previewLocomotive(vehicle);
       else this.previewCarWagon(vehicle);
     },
 

src/mixins/warningsMixin.ts

@@ -1,42 +0,0 @@
-import { defineComponent } from 'vue';
-import { useStore } from '../store';
-
-export default defineComponent({
-  setup() {
-    const store = useStore();
-
-    return {
-      store,
-    };
-  },
-  computed: {
-    trainTooLong() {
-      return (
-        (this.store.totalLength > 350 && this.store.isTrainPassenger) ||
-        (this.store.totalLength > 650 && !this.store.isTrainPassenger)
-      );
-    },
-
-    trainTooHeavy() {
-      return this.store.acceptableWeight && this.store.totalWeight > this.store.acceptableWeight;
-    },
-
-    locoNotSuitable() {
-      return (
-        !this.store.isTrainPassenger &&
-        this.store.stockList.length > 1 &&
-        !this.store.stockList.every((stock) => stock.isLoco) &&
-        this.store.stockList.some((stock) => stock.isLoco && stock.type.startsWith('EP'))
-      );
-    },
-
-    tooManyLocomotives() {
-      return (
-        this.store.stockList.reduce((acc, stock) => {
-          if (stock.isLoco) acc += stock.count;
-          return acc;
-        }, 0) > 2
-      );
-    },
-  },
-});

src/store.ts

@@ -1,24 +1,28 @@
 import {
-  IVehiclesAPI,
+  IVehiclesData,
   ICarWagon,
   ILocomotive,
   ICargo,
   IVehicle,
   IStock,
   IRealComposition,
+  LocoGroupType,
+  WagonGroupType,
 } from './types';
 import { defineStore } from 'pinia';
 import {
   acceptableWeight,
   carDataList,
+  isTractionUnit,
   isTrainPassenger,
   locoDataList,
   maxStockSpeed,
   totalLength,
   totalWeight,
 } from './utils/vehicleUtils';
-import http from './http';
+
 import i18n from './i18n-setup';
+import http from './http';
 
 export const useStore = defineStore({
   id: 'store',
@@ -31,10 +35,8 @@ export const useStore = defineStore({
     isColdStart: false,
     isDoubleManned: false,
 
-    imageLoading: false,
+    chosenLocoGroup: 'loco-electric' as LocoGroupType,
-
+    chosenCarGroup: 'wagon-passenger' as WagonGroupType,
-    chosenLocoPower: 'loco-e',
-    chosenCarUseType: 'car-passenger',
 
     stockList: [] as IStock[],
     cargoOptions: [] as any[][],
@@ -50,17 +52,17 @@ export const useStore = defineStore({
     isRandomizerCardOpen: false,
     isRealStockListCardOpen: false,
 
-    vehiclesAPIData: undefined as IVehiclesAPI | undefined,
+    vehiclesData: undefined as IVehiclesData | undefined,
 
     lastFocusedElement: null as HTMLElement | null,
   }),
 
   getters: {
-    locoDataList: (state) => locoDataList(state.vehiclesAPIData),
+    locoDataList: (state) => locoDataList(state.vehiclesData),
-    carDataList: (state) => carDataList(state.vehiclesAPIData),
+    carDataList: (state) => carDataList(state.vehiclesData),
     vehicleDataList: (state) => [
-      ...locoDataList(state.vehiclesAPIData),
+      ...locoDataList(state.vehiclesData),
-      ...carDataList(state.vehiclesAPIData),
+      ...carDataList(state.vehiclesData),
     ],
     totalWeight: (state) => totalWeight(state.stockList),
     totalLength: (state) => totalLength(state.stockList),
@@ -69,16 +71,16 @@ export const useStore = defineStore({
     acceptableWeight: (state) => acceptableWeight(state.stockList),
 
     realCompositionList: (state) => {
-      if (!state.vehiclesAPIData) return [];
+      if (!state.vehiclesData) return [];
 
-      return Object.keys(state.vehiclesAPIData.realCompositions).reduce<IRealComposition[]>(
+      return Object.keys(state.vehiclesData.realCompositions).reduce<IRealComposition[]>(
         (acc, key) => {
           const [type, number, ...name] = key.split(' ');
 
           const obj = {
             number: number.replace(/_/g, '/'),
             name: name.join(' '),
-            stockString: state.vehiclesAPIData!.realCompositions[key],
+            stockString: state.vehiclesData!.realCompositions[key],
             type,
           };
 
@@ -95,26 +97,28 @@ export const useStore = defineStore({
 
     stockSupportsColdStart: (state) => {
       if (state.stockList.length == 0) return false;
-      if (!state.stockList[0].isLoco) return false;
+
+      if (!isTractionUnit(state.stockList[0].vehicleRef)) return false;
+      else if (state.stockList.length > 1) return false;
 
       const headingLoco = state.stockList[0];
 
       return (
-        state.vehiclesAPIData?.vehicleProps.find(
+        state.vehiclesData?.vehicleProps.find(
-          (stock) => stock.type == headingLoco.constructionType
+          (stock) => stock.type == headingLoco.vehicleRef.constructionType
         )?.coldStart ?? false
       );
     },
 
     stockSupportsDoubleManning: (state) => {
       if (state.stockList.length == 0) return false;
-      if (!state.stockList[0].isLoco) return false;
+      if (!isTractionUnit(state.stockList[0].vehicleRef)) return false;
 
       const headingLoco = state.stockList[0];
 
       return (
-        state.vehiclesAPIData?.vehicleProps.find(
+        state.vehiclesData?.vehicleProps.find(
-          (stock) => stock.type == headingLoco.constructionType
+          (stock) => stock.type == headingLoco.vehicleRef.constructionType
         )?.doubleManned ?? false
       );
     },
@@ -123,8 +127,8 @@ export const useStore = defineStore({
   actions: {
     async fetchVehiclesAPI() {
       try {
-        const vehiclesData = (await http.get<IVehiclesAPI>('/vehicles.json')).data;
+        const vehiclesData = (await http.get<IVehiclesData>('/vehicles')).data;
-        this.vehiclesAPIData = vehiclesData;
+        this.vehiclesData = vehiclesData;
       } catch (error) {
         console.error(error);
       }
@@ -136,10 +140,10 @@ export const useStore = defineStore({
     },
 
     async mergeBackendTranslations() {
-      if (!this.vehiclesAPIData) return;
+      if (!this.vehiclesData) return;
 
-      i18n.global.mergeLocaleMessage('pl', this.vehiclesAPIData.vehicleLocales.pl);
+      i18n.global.mergeLocaleMessage('pl', this.vehiclesData.vehicleLocales.pl);
-      i18n.global.mergeLocaleMessage('en', this.vehiclesAPIData.vehicleLocales.en);
+      i18n.global.mergeLocaleMessage('en', this.vehiclesData.vehicleLocales.en);
     },
 
     handleRouting() {

src/styles/global.scss

@@ -6,6 +6,9 @@ $textColor: #fff;
 $secondaryColor: #1b1b1b;
 $accentColor: #e4c428;
 
+$sponsorColor: gold;
+$teamColor: #ff4848;
+
 @font-face {
   font-family: 'Lato';
   src:
@@ -207,12 +210,11 @@ input[type='number'] {
   outline: none;
 
   padding: 0.25em 0.35em;
+  height: 100%;
 
   color: white;
   font-size: 1em;
 
-  width: 18em;
-
   &:focus-visible {
     border-color: $accentColor;
   }

src/types.ts

@@ -1,16 +1,17 @@
 export type IVehicle = ILocomotive | ICarWagon;
 export type StockSectionMode = 'STOCK_LIST' | 'STOCK_GENERATOR';
 
-export type TLocoGroup = 'loco-e' | 'loco-s' | 'loco-ezt' | 'loco-szt';
+export type LocoGroupType = 'loco-electric' | 'loco-diesel' | 'unit-electric' | 'unit-diesel';
-export type TCarWagonGroup = 'car-passenger' | 'car-cargo';
+export type WagonGroupType = 'wagon-passenger' | 'wagon-freight';
+export type VehicleGroupType = LocoGroupType | WagonGroupType;
+export type RestrictionType = 'sponsorOnly' | 'teamOnly';
 
-export interface IStockProps {
+export interface IVehicleProps {
   type: string;
+  speed: number;
   length: number;
-  // mass: number;
   weight: number;
-  // cargo?: string | null;
+  cargoTypes?: ICargo[];
-  cargoTypes: ICargo[] | null;
   coldStart?: boolean;
   doubleManned?: boolean;
 }
@@ -20,8 +21,8 @@ export interface ICargo {
   weight: number;
 }
 
-export interface IVehiclesAPI {
+export interface IVehiclesData {
-  version: string;
+  simulatorVersion: string;
 
   generator: {
     cargo: {
@@ -29,16 +30,9 @@ export interface IVehiclesAPI {
     };
   };
 
-  vehicleInfo: {
+  vehicleList: any[][];
-    'car-cargo': [string, string, boolean, number | null, string][];
-    'car-passenger': [string, string, boolean, number | null, string][];
-    'loco-e': [string, string, string, string, number | null][];
-    'loco-s': [string, string, string, string, number | null][];
-    'loco-szt': [string, string, string, string, number | null][];
-    'loco-ezt': [string, string, string, string, number | null][];
-  };
 
-  vehicleProps: IStockProps[];
+  vehicleProps: IVehicleProps[];
 
   vehicleLocales: {
     pl: {
@@ -56,50 +50,35 @@ export interface IVehiclesAPI {
 
 export interface ILocomotive {
   type: string;
-  power: TLocoGroup;
+  group: LocoGroupType;
-  group: TLocoGroup;
   constructionType: string;
   cabinType: string;
   maxSpeed: number;
-  isSponsorsOnly: boolean;
-  sponsorsOnlyTimestamp: number;
-  imageSrc: string;
   weight: number;
   length: number;
   coldStart: boolean;
   doubleManned: boolean;
+  sponsorOnlyTimestamp: number;
+  teamOnly: boolean;
 }
 
 export interface ICarWagon {
   type: string;
-  useType: TCarWagonGroup;
+  group: WagonGroupType;
-  group: TCarWagonGroup;
   constructionType: string;
   loadable: boolean;
-  isSponsorsOnly: boolean;
-  sponsorsOnlyTimestamp: number;
   maxSpeed: number;
-  imageSrc: string;
   weight: number;
   length: number;
   cargoTypes: ICargo[];
+  sponsorOnlyTimestamp: number;
+  teamOnly: boolean;
 }
 
 export interface IStock {
   id: string;
-  type: string;
+  vehicleRef: IVehicle;
-  useType: string;
-  constructionType: string;
-  length: number;
-  // mass: number;
-  weight: number;
-  maxSpeed: number;
   cargo?: ICargo;
-  isLoco: boolean;
-  isSponsorsOnly: boolean;
-  sponsorsOnlyTimestamp: number;
-  count: number;
-  imgSrc?: string;
 }
 
 export interface IRealComposition {

src/utils/vehicleUtils.ts

@@ -1,5 +1,11 @@
-import { EVehicleUseType } from '../enums/EVehicleUseType';
+import {
-import { ICarWagon, ILocomotive, IStock, IVehiclesAPI, TCarWagonGroup, TLocoGroup } from '../types';
+  ICarWagon,
+  ILocomotive,
+  IStock,
+  IVehiclesData,
+  LocoGroupType,
+  WagonGroupType,
+} from '../types';
 import {
   MassLimitLocoType,
   SpeedLimitLocoType,
@@ -7,109 +13,103 @@ import {
   calculateSpeedLimit,
 } from './vehicleLimitsUtils';
 
-export function isLocomotive(vehicle: ILocomotive | ICarWagon): vehicle is ILocomotive {
+export function isTractionUnit(vehicle: ILocomotive | ICarWagon): vehicle is ILocomotive {
-  return (vehicle as ILocomotive).power !== undefined;
+  return (vehicle as ILocomotive).cabinType !== undefined;
 }
 
-export function locoDataList(vehiclesData: IVehiclesAPI | undefined) {
+export function locoDataList(vehiclesData: IVehiclesData | undefined) {
   if (!vehiclesData) return [];
 
-  return Object.keys(vehiclesData.vehicleInfo).reduce((acc, vehiclePower) => {
+  return vehiclesData.vehicleList.reduce<ILocomotive[]>((acc, vehicleInfoArray) => {
-    if (!vehiclePower.startsWith('loco')) return acc;
+    // check if data array has 5 elements (locos & units only)
+    if (vehicleInfoArray.length != 5) return acc;
 
-    const locoVehiclesData = vehiclesData.vehicleInfo[vehiclePower as TLocoGroup];
+    const [type, constructionType, cabinType, group, restrictions] = vehicleInfoArray;
+    const locoProps = vehiclesData.vehicleProps.find((prop) => constructionType == prop.type);
 
-    locoVehiclesData.forEach((loco) => {
+    if (!locoProps) {
-      // if (!loco[4]) return;
+      console.warn('Brak atrybutów dla pojazdu:', type);
+      return acc;
+    }
 
-      const [type, constructionType, cabinType, maxSpeed, sponsorsTimestamp] = loco;
+    acc.push({
-      const locoProps = vehiclesData.vehicleProps.find((prop) => constructionType == prop.type);
+      group: group as LocoGroupType,
 
-      acc.push({
+      type,
-        power: vehiclePower as TLocoGroup,
+      constructionType,
-        group: vehiclePower as TLocoGroup,
+      cabinType,
-        type,
-        constructionType,
-        cabinType,
-        maxSpeed: Number(maxSpeed),
-        isSponsorsOnly: Number(sponsorsTimestamp) > Date.now(),
-        sponsorsOnlyTimestamp: Number(sponsorsTimestamp),
-        imageSrc: '',
 
-        length:
+      sponsorOnlyTimestamp: restrictions?.sponsorOnly ?? 0,
-          locoProps?.length && type.startsWith('2EN')
+      teamOnly: restrictions?.teamOnly ?? false,
-            ? locoProps.length * 2
-            : locoProps?.length ?? 0,
-        weight: locoProps?.weight && type.startsWith('2EN') ? 253000 : locoProps?.weight ?? 0,
 
-        coldStart: locoProps?.coldStart ?? false,
+      maxSpeed: locoProps.speed,
-        doubleManned: locoProps?.doubleManned ?? false,
+      length: locoProps.length,
-      });
+      weight: locoProps.weight,
+
+      coldStart: locoProps.coldStart ?? false,
+      doubleManned: locoProps.doubleManned ?? false,
     });
 
     return acc;
-  }, [] as ILocomotive[]);
+  }, []);
 }
 
-export function carDataList(vehiclesData: IVehiclesAPI | undefined) {
+export function carDataList(vehiclesData: IVehiclesData | undefined) {
   if (!vehiclesData) return [];
 
-  return Object.keys(vehiclesData.vehicleInfo).reduce((acc, vehicleUseType) => {
+  return vehiclesData.vehicleList.reduce<ICarWagon[]>((acc, vehicleInfoArray) => {
-    if (!vehicleUseType.startsWith('car')) return acc;
+    // check if data array has 4 elements (wagons only)
+    if (vehicleInfoArray.length != 4) return acc;
 
-    const carVehiclesData = vehiclesData.vehicleInfo[vehicleUseType as TCarWagonGroup];
+    const [type, constructionType, group, restrictions] = vehicleInfoArray;
+    const wagonProps = vehiclesData.vehicleProps.find((prop) => constructionType == prop.type);
 
-    carVehiclesData.forEach((car) => {
+    if (!wagonProps) {
-      const [type, constructionType, loadable, sponsorsOnlyTimestamp, maxSpeed] = car;
+      console.warn('Brak atrybutów dla pojazdu:', type);
+      return acc;
+    }
 
-      if (sponsorsOnlyTimestamp && Number(sponsorsOnlyTimestamp) <= Date.now()) return;
+    acc.push({
+      group: group as WagonGroupType,
+      type,
+      constructionType,
+      loadable: wagonProps.cargoTypes ? wagonProps.cargoTypes.length > 0 : false,
+      cargoTypes: wagonProps?.cargoTypes ?? [],
 
-      const carPropsData = vehiclesData.vehicleProps.find((v) =>
+      sponsorOnlyTimestamp: restrictions?.sponsorOnly ?? 0,
-        type.toString().startsWith(v.type)
+      teamOnly: restrictions?.teamOnly ?? false,
-      );
 
-      acc.push({
+      maxSpeed: wagonProps.speed,
-        useType: vehicleUseType as TCarWagonGroup,
+      weight: wagonProps?.weight || 0,
-        group: vehicleUseType as TCarWagonGroup,
+      length: wagonProps?.length || 0,
-        type,
-        constructionType,
-        loadable,
-        isSponsorsOnly: Number(sponsorsOnlyTimestamp) > Date.now(),
-        sponsorsOnlyTimestamp: Number(sponsorsOnlyTimestamp),
-        maxSpeed: Number(maxSpeed),
-        imageSrc: '',
-        cargoTypes: carPropsData?.cargoTypes ?? [],
-
-        weight: carPropsData?.weight || 0,
-        length: carPropsData?.length || 0,
-      });
     });
 
     return acc;
-  }, [] as ICarWagon[]);
+  }, []);
 }
 
 export function totalWeight(stockList: IStock[]) {
   return stockList.reduce(
-    (acc, stock) => acc + (stock.weight + (stock.cargo?.weight ?? 0)) * stock.count,
+    (acc, stock) => acc + (stock.vehicleRef.weight + (stock.cargo?.weight ?? 0)),
     0
   );
 }
 
 export function totalLength(stockList: IStock[]) {
-  return stockList.reduce((acc, stock) => acc + stock.length * stock.count, 0);
+  return stockList.reduce((acc, stock) => acc + stock.vehicleRef.length, 0);
 }
 
 export function maxStockSpeed(stockList: IStock[]) {
   const stockSpeedLimit = stockList.reduce(
-    (acc, stock) => (stock.maxSpeed < acc || acc == 0 ? stock.maxSpeed : acc),
+    (acc, stock) => (stock.vehicleRef.maxSpeed < acc || acc == 0 ? stock.vehicleRef.maxSpeed : acc),
     0
   );
-  const headingLoco = stockList[0]?.isLoco ? stockList[0] : undefined;
+  const headingLoco =
+    stockList[0] && isTractionUnit(stockList[0].vehicleRef) ? stockList[0] : undefined;
 
   if (!headingLoco) return stockSpeedLimit;
 
-  const locoType = headingLoco.type.split('-')[0];
+  const locoType = headingLoco.vehicleRef.type.split('-')[0];
 
   if (/^(EN|2EN|SN)/.test(locoType)) return stockSpeedLimit;
 
@@ -124,9 +124,9 @@ export function maxStockSpeed(stockList: IStock[]) {
 }
 
 export function acceptableWeight(stockList: IStock[]) {
-  if (stockList.length == 0 || !stockList[0].isLoco) return 0;
+  if (stockList.length == 0 || !isTractionUnit(stockList[0].vehicleRef)) return 0;
 
-  const activeLocomotiveType = stockList[0].type.split('-')[0];
+  const activeLocomotiveType = stockList[0].vehicleRef.type.split('-')[0];
 
   const locoMassLimit = calculateMassLimit(
     activeLocomotiveType as MassLimitLocoType,
@@ -138,9 +138,9 @@ export function acceptableWeight(stockList: IStock[]) {
 
 export function isTrainPassenger(stockList: IStock[]) {
   if (stockList.length == 0) return false;
-  if (stockList.every((stock) => stock.isLoco)) return false;
+  if (stockList.every((stock) => isTractionUnit(stock.vehicleRef))) return false;
 
   return stockList
-    .filter((stock) => !stock.isLoco)
+    .filter((stock) => !isTractionUnit(stock.vehicleRef))
-    .every((stock) => stock.useType === EVehicleUseType.CAR_PASSENGER);
+    .every((stock) => stock.vehicleRef.group === 'wagon-passenger');
 }

vite.config.ts

@@ -6,13 +6,15 @@ import { VitePWA } from 'vite-plugin-pwa';
 // https://vitejs.dev/config/
 export default defineConfig({
   server: {
-    port: 2137,
+    port: 2138,
   },
   plugins: [
     vue(),
     VitePWA({
       registerType: 'autoUpdate',
 
+      includeAssets: ['/images/*.{png,svg,jpg}', '/fonts/*.{woff,woff2,ttf}'],
+
       devOptions: {
         suppressWarnings: true,
         enabled: true,
@@ -23,7 +25,7 @@ export default defineConfig({
 
         runtimeCaching: [
           {
-            urlPattern: /^https:\/\/rj.td2.info.pl\/dist\/img\/thumbnails\/.*/i,
+            urlPattern: new RegExp('^https://rj.td2.info.pl/dist/img/thumbnails/*', 'i'),
             handler: 'CacheFirst',
             options: {
               cacheName: 'swdr-images-cache',
@@ -32,22 +34,16 @@ export default defineConfig({
                 maxAgeSeconds: 60 * 60 * 24, // <== 1 day
               },
               cacheableResponse: {
-                statuses: [0, 200, 404],
+                statuses: [200],
               },
             },
           },
+
           {
-            urlPattern: /^https:\/\/static.spythere.eu\/.*/i,
+            urlPattern: new RegExp('^https://stacjownik.spythere.eu/vehicles', 'i'),
-            handler: 'CacheFirst',
+            handler: 'NetworkFirst',
             options: {
-              cacheName: 'spythere-api-cache',
+              cacheName: 'vehicles-cache',
-              expiration: {
-                maxEntries: 100,
-                maxAgeSeconds: 60 * 60 * 24, // <== 1 day
-              },
-              cacheableResponse: {
-                statuses: [200, 302],
-              },
             },
           },
         ],