From f0f1aef6dbf4986ed41ad6c4f4df0ee005f3c4c7 Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Sun, 9 Jan 2022 17:09:47 +0100
Subject: [PATCH] =?UTF-8?q?Lista=20zestawie=C5=84:=20poprawki=20dost=C4=99?=
 =?UTF-8?q?pno=C5=9Bci=20i=20wygl=C4=85du?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/InputsSection.vue  |  5 ++-
 src/components/ListSection.vue    | 16 +++++----
 src/components/ReadyStockList.vue | 58 +++++++++++++++++--------------
 src/styles/global.scss            |  5 +++
 4 files changed, 48 insertions(+), 36 deletions(-)

diff --git a/src/components/InputsSection.vue b/src/components/InputsSection.vue
index 6ec2f9a..f4fa717 100644
--- a/src/components/InputsSection.vue
+++ b/src/components/InputsSection.vue
@@ -1,6 +1,4 @@
 <template>
-  <ready-stock-list />
-
   <section class="inputs">
     <div class="input inputs_loco">
       <div class="input_container">
@@ -44,6 +42,7 @@
 
         <div class="input_ready-stock">
           <button class="btn" @click="setReadyStockList(true)"><b>REALNE ZESTAWIENIA</b></button>
+          <ready-stock-list />
         </div>
 
         <div class="input_checkbox">
@@ -123,7 +122,7 @@
 
 <script lang="ts">
 import { ICarWagon, ILocomotive, IStore } from '@/types';
-import { defineComponent, inject, provide, ref } from 'vue';
+import { defineComponent, inject, provide, Ref, ref } from 'vue';
 
 import ReadyStockList from '@/components/ReadyStockList.vue';
 
diff --git a/src/components/ListSection.vue b/src/components/ListSection.vue
index d1f3bc2..2ba814b 100644
--- a/src/components/ListSection.vue
+++ b/src/components/ListSection.vue
@@ -61,14 +61,16 @@
         <button class="btn" @click="openRandomizerCard">LOSUJ SKŁAD</button>
       </div>
 
-      <!-- <b style="font-size: 1.15em; color: gold">
-        REALNE ZESTAWIENIE: <b>{{ store.chosenRealStockName?.toLocaleUpperCase() }}</b>
-      </b> -->
-
       <div class="stock-list_specs">
-        Masa: <span class="text--accent">{{ totalMass }}t</span> | Długość:
-        <span class="text--accent">{{ totalLength }}m</span>
-        | Vmax pociągu: <span class="text--accent">{{ maxStockSpeed }} km/h</span>
+        <div>
+          Masa: <span class="text--accent">{{ totalMass }}t</span> | Długość:
+          <span class="text--accent">{{ totalLength }}m</span>
+          | Vmax pociągu: <span class="text--accent">{{ maxStockSpeed }} km/h</span>
+        </div>
+
+        <div v-if="store.chosenRealStockName" style="margin-top: 0.25rem">
+          <b>{{ store.chosenRealStockName.toLocaleUpperCase() }}</b>
+        </div>
       </div>
 
       <div class="stock-list_string">
diff --git a/src/components/ReadyStockList.vue b/src/components/ReadyStockList.vue
index 4133f3c..c8ec868 100644
--- a/src/components/ReadyStockList.vue
+++ b/src/components/ReadyStockList.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="ready-stock-list" v-if="isOpen">
-    <button class="btn--text exit" @click="exit">POWRÓT</button>
+    <button class="btn btn--text exit" @click="exit">&lt; POWRÓT</button>
     <div class="header">
       <h1>
         REALNE ZESTAWIENIA
@@ -11,21 +11,24 @@
         na stronie <i>vagonweb.cz</i>
       </p>
 
-      <input type="text" v-model="chosenStock" placeholder="Szukaj zestawienia..." />
+      <input type="text" tabindex="0" v-model="searchedReadyStockName" placeholder="Szukaj zestawienia..." />
     </div>
 
     <ul v-if="responseStatus == 'loaded'">
       <li
-        v-for="(v, k) in computedList"
-        :key="k"
-        @contextmenu="openPreview($event, v.type, v.number)"
-        @click="choseStock(v.name, v.type, v.number, v.stockString)"
+        v-for="(stock, key) in computedReadyStockList"
+        :key="key"
+        tabindex="0"
+        @contextmenu="openPreview($event, stock.type, stock.number)"
+        @click="choseStock(stock.name, stock.type, stock.number, stock.stockString)"
+        @keydown.space="openPreview($event, stock.type, stock.number)"
+        @keydown.enter="choseStock(stock.name, stock.type, stock.number, stock.stockString)"
       >
-        <img v-if="v.type != 'iR' && v.type != 'RE'" :src="icons[v.type]" alt="" />
-        <span v-else>{{ v.type }}</span>
+        <img v-if="stock.type != 'iR' && stock.type != 'RE'" :src="icons[stock.type]" alt="" />
+        <span v-else>{{ stock.type }}</span>
 
-        <b class="text--accent"> {{ v.name }}</b>
-        <div>{{ v.number }}</div>
+        <b class="text--accent"> {{ stock.name }}</b>
+        <div>{{ stock.number }}</div>
       </li>
     </ul>
   </div>
@@ -35,11 +38,11 @@
 import { ICarWagon, ILocomotive, IStore } from '@/types';
 import { defineComponent, inject } from 'vue';
 
-interface List {
+interface ReadyStockList {
   [key: string]: { stockString: string; type: string; number: string; name: string };
 }
 
-interface Response {
+interface ResponseJSONData {
   [key: string]: string;
 }
 
@@ -56,10 +59,10 @@ export default defineComponent({
 
   data: () => ({
     responseStatus: 'loading',
-    chosenStock: '',
     isMobile: 'ontouchstart' in document.documentElement && navigator.userAgent.match(/Mobi/) ? true : false,
 
-    readyStockList: {} as List,
+    readyStockList: {} as ReadyStockList,
+    searchedReadyStockName: '',
 
     icons: {
       EIC: require('@/assets/EIC.png'),
@@ -69,13 +72,13 @@ export default defineComponent({
   }),
 
   computed: {
-    computedList() {
-      if (this.chosenStock == '') return this.readyStockList;
+    computedReadyStockList() {
+      if (this.searchedReadyStockName == null) return this.readyStockList;
 
-      let filtered: List = {};
+      let filtered: ReadyStockList = {};
 
       for (let key in this.readyStockList) {
-        if (key.toLocaleLowerCase().includes(this.chosenStock.toLocaleLowerCase()))
+        if (key.toLocaleLowerCase().includes(this.searchedReadyStockName.toLocaleLowerCase()))
           filtered[key] = this.readyStockList[key];
       }
 
@@ -95,9 +98,8 @@ export default defineComponent({
 
       const zeme = isRegio ? 'PREG' : 'PKPIC';
       const rok = isRegio ? '&rok=2013' : '';
-      const cislo = number.replace(/_/g, '/');
 
-      const url = `https://www.vagonweb.cz/razeni/vlak.php?zeme=${zeme}&kategorie=${type}&cislo=${cislo}${rok}`;
+      const url = `https://www.vagonweb.cz/razeni/vlak.php?zeme=${zeme}&kategorie=${type}&cislo=${number}${rok}`;
 
       window.open(url);
     },
@@ -154,26 +156,26 @@ export default defineComponent({
   },
 
   async mounted() {
-    const response: Response = await (await fetch('https://spythere.github.io/api/readyStockTest.json')).json();
+    const readyStockJSONData: ResponseJSONData = await (await fetch('https://spythere.github.io/api/readyStockTest.json')).json();
 
-    if (!response) {
+    if (!readyStockJSONData) {
       this.responseStatus = 'error';
       return;
     }
 
-    for (let key in response) {
-      const splittedKey = key.split(' ');
+    for (let stockKey in readyStockJSONData) {
+      const splittedKey = stockKey.split(' ');
 
       let name = '';
       for (let i = 2; i < splittedKey.length; i++) {
         name += ' ' + splittedKey[i];
       }
 
-      this.readyStockList[key] = {
+      this.readyStockList[stockKey] = {
         type: splittedKey[0],
         number: splittedKey[1].replace(/_/g, '/'),
         name,
-        stockString: response[key],
+        stockString: readyStockJSONData[stockKey],
       };
     }
 
@@ -280,6 +282,10 @@ input {
     &:hover {
       background: #222;
     }
+
+    &:focus {
+      outline: 1px solid white;
+    }
   }
 }
 </style>
diff --git a/src/styles/global.scss b/src/styles/global.scss
index 05eb61c..7038f95 100644
--- a/src/styles/global.scss
+++ b/src/styles/global.scss
@@ -82,9 +82,14 @@ button.btn {
         border-color: $accentColor;
     }
 
+    &:focus {
+        color: $accentColor;
+    }
+
     &--text {
         font-weight: bold;
         transition: all 250ms;
+        border: none;
     }
 }