From 8bc55cc71bb762d80c5d78d7888192ab2e035706 Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Wed, 15 Feb 2023 23:32:49 +0100
Subject: [PATCH] =?UTF-8?q?feature:=20wczytywanie=20sk=C5=82ad=C3=B3w;=20p?=
 =?UTF-8?q?oprawki=20stylistyki?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/tabs/StockGeneratorTab.vue |  2 -
 src/components/tabs/StockListTab.vue      | 50 +++++++----------------
 src/mixins/stockMixin.ts                  | 14 +++++--
 src/styles/global.scss                    |  4 ++
 4 files changed, 30 insertions(+), 40 deletions(-)

diff --git a/src/components/tabs/StockGeneratorTab.vue b/src/components/tabs/StockGeneratorTab.vue
index 9790788..8bf1e27 100644
--- a/src/components/tabs/StockGeneratorTab.vue
+++ b/src/components/tabs/StockGeneratorTab.vue
@@ -63,8 +63,6 @@
           @click="toggleCarExclusion(carType)"
         >
           {{ carType }}
-
-          <!-- <span>X</span> -->
         </button>
       </div>
 
diff --git a/src/components/tabs/StockListTab.vue b/src/components/tabs/StockListTab.vue
index f146756..f0a20ce 100644
--- a/src/components/tabs/StockListTab.vue
+++ b/src/components/tabs/StockListTab.vue
@@ -1,21 +1,5 @@
 <template>
   <section class="stock-list">
-    <!-- <div class="stock_actions">
-      <label class="file-label">
-        <input
-          type="file"
-          accept=".con, .txt"
-          ref="conFile"
-          style="position: fixed; top: -100%"
-          @change="uploadStock"
-        />
-        <div class="btn">ZAŁADUJ PLIK</div>
-      </label>
-
-      <button class="btn" @click="store.stockSectionMode = 'number-generator'">GENERUJ NUMER</button>
-      <button class="btn" @click="store.stockSectionMode = 'stock-generator'">LOSUJ SKŁAD</button>
-    </div> -->
-
     <div class="stock_controls" :data-disabled="store.chosenStockListIndex == -1">
       <b class="no">
         POJAZD NR <span class="text--accent">{{ store.chosenStockListIndex + 1 }}</span> &nbsp;
@@ -50,21 +34,20 @@
     </div>
 
     <div class="stock_actions">
-      <button class="btn" :data-disabled="stockIsEmpty" :disabled="stockIsEmpty" @click="downloadStock">
-        POBIERZ PLIK
-      </button>
+      <label class="file-label">
+        <div class="btn">WCZYTAJ</div>
+        <input type="file" @change="uploadStock" ref="conFile" />
+      </label>
+
+      <button class="btn" :data-disabled="stockIsEmpty" :disabled="stockIsEmpty" @click="downloadStock">POBIERZ</button>
 
       <button class="btn" :data-disabled="stockIsEmpty" :disabled="stockIsEmpty" @click="copyToClipboard">
-        KOPIUJ JAKO TEKST
+        SKOPIUJ
       </button>
 
-      <button class="btn" :data-disabled="stockIsEmpty" :disabled="stockIsEmpty" @click="resetStock">
-        ZRESETUJ LISTĘ
-      </button>
+      <button class="btn" :data-disabled="stockIsEmpty" :disabled="stockIsEmpty" @click="resetStock">ZRESETUJ</button>
 
-      <button class="btn" :data-disabled="stockIsEmpty" :disabled="stockIsEmpty" @click="shuffleCars">
-        TASUJ WAGONY
-      </button>
+      <button class="btn" :data-disabled="stockIsEmpty" :disabled="stockIsEmpty" @click="shuffleCars">PRZETASUJ</button>
     </div>
 
     <div class="stock_specs">
@@ -362,7 +345,8 @@ export default defineComponent({
     },
 
     uploadStock() {
-      const files = (this.$refs['conFile'] as HTMLInputElement).files;
+      const inputEl = this.$refs['conFile'] as HTMLInputElement;
+      const files = inputEl.files;
 
       if (files?.length != 1) return;
 
@@ -378,6 +362,8 @@ export default defineComponent({
       };
 
       reader.onerror = (err) => console.log(err);
+
+      inputEl.value = '';
     },
 
     onDragStart(vehicleIndex: number) {
@@ -471,15 +457,9 @@ export default defineComponent({
   label.file-label {
     text-align: center;
     cursor: pointer;
-    padding: 0;
 
-    input:focus-visible + div {
-      outline: 1px solid white;
-      color: $accentColor;
-    }
-
-    input:hover + div {
-      color: $accentColor;
+    input {
+      display: none;
     }
   }
 }
diff --git a/src/mixins/stockMixin.ts b/src/mixins/stockMixin.ts
index 79f4cf8..1b023ef 100644
--- a/src/mixins/stockMixin.ts
+++ b/src/mixins/stockMixin.ts
@@ -85,10 +85,18 @@ export default defineComponent({
 
       stockArray.forEach((type, i) => {
         let vehicle: Vehicle | null = null;
-        if (i == 0) vehicle = this.store.locoDataList.find((loco) => loco.type == stockArray[0]) || null;
-        else vehicle = this.store.carDataList.find((car) => car.type == type) || null;
+        let vehicleCargo: ICargo | null = null;
 
-        this.addVehicle(vehicle);
+        if (/^(EU|EP|ET|SM|EN|2EN|SN)/.test(type))
+          vehicle = this.store.locoDataList.find((loco) => loco.type == type) || null;
+        else {
+          const [carType, cargo] = type.split(':');
+          vehicle = this.store.carDataList.find((car) => car.type == carType) || null;
+
+          if (cargo) vehicleCargo = vehicle?.cargoList.find((c) => c.id == cargo) || null;
+        }
+
+        this.addVehicle(vehicle, vehicleCargo);
       });
     },
   },
diff --git a/src/styles/global.scss b/src/styles/global.scss
index 7888261..d0d100b 100644
--- a/src/styles/global.scss
+++ b/src/styles/global.scss
@@ -94,6 +94,10 @@ button {
 
   transition: all 250ms;
 
+  &:hover {
+    color: $accentColor;
+  }
+
   &.btn--outline {
     background: none;
     font-weight: bold;