From 9d56e1c43c2e4aaa2731d66841dfa0e6051349e0 Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Sun, 5 Jul 2020 15:12:09 +0200
Subject: [PATCH] =?UTF-8?q?Dodano=20informacje=20o=20wymaganym=20poziomie,?=
 =?UTF-8?q?=20poprawki=20w=20wy=C5=9Bwietlaniu=20reszty=20informacji?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/icon-lock.svg   |  6 ++++++
 src/components/ui/Card.vue | 43 ++++++++++++++++++++++++++++++++------
 src/components/ui/List.vue | 20 ++++++++++++++++--
 src/data/stations.json     |  6 ++++--
 src/store/stations.ts      |  3 +++
 5 files changed, 68 insertions(+), 10 deletions(-)
 create mode 100644 src/assets/icon-lock.svg

diff --git a/src/assets/icon-lock.svg b/src/assets/icon-lock.svg
new file mode 100644
index 0000000..1c79bea
--- /dev/null
+++ b/src/assets/icon-lock.svg
@@ -0,0 +1,6 @@
+<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="64" height="64" fill="#898989"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.5571 24.571C23.5571 21.906 24.5611 20.0553 25.984 18.8523C27.4412 17.6202 29.442 16.9838 31.5119 17.0003C33.5826 17.0168 35.6013 17.6863 37.0744 18.9083C38.5148 20.1034 39.4905 21.8673 39.4905 24.2699V31.0524H23.5571V24.571ZM20.5571 31.3205V24.571C20.5571 21.0634 21.9198 18.36 24.047 16.5614C26.1398 14.7919 28.8723 13.9792 31.5357 14.0004C34.1984 14.0216 36.913 14.8764 38.9899 16.5995C41.0994 18.3496 42.4905 20.9516 42.4905 24.2699V31.3205C43.9866 31.8994 45.0476 33.352 45.0476 35.0524V45.9857C45.0476 48.1948 43.2568 49.9857 41.0476 49.9857H22C19.7909 49.9857 18 48.1948 18 45.9857V35.0524C18 33.352 19.061 31.8994 20.5571 31.3205Z" fill="white"/>
+<path d="M33.2143 39.1667C33.2143 40.1003 32.4574 40.8571 31.5238 40.8571C30.5902 40.8571 29.8333 40.1003 29.8333 39.1667C29.8333 38.233 30.5902 37.4762 31.5238 37.4762C32.4574 37.4762 33.2143 38.233 33.2143 39.1667Z" fill="#898989"/>
+<path d="M30.6786 43.3929V40.0119C30.6786 39.5451 31.057 39.1667 31.5238 39.1667C31.9906 39.1667 32.369 39.5451 32.369 40.0119V43.3929C32.369 43.8597 31.9906 44.2381 31.5238 44.2381C31.057 44.2381 30.6786 43.8597 30.6786 43.3929Z" fill="#898989"/>
+</svg>
diff --git a/src/components/ui/Card.vue b/src/components/ui/Card.vue
index 2b8a7f1..43efdd6 100644
--- a/src/components/ui/Card.vue
+++ b/src/components/ui/Card.vue
@@ -43,6 +43,18 @@
           alt="default-pack"
           title="Sceneria domyślnie dostępna w grze"
         />
+
+        <img
+          v-if="stationInfo.nonPublic || !stationInfo.reqLevel"
+          :src="require(`@/assets/icon-lock.svg`)"
+          alt="non-public"
+          title="Sceneria niepubliczna"
+        />
+
+        <span
+          v-if="stationInfo.reqLevel"
+          :title="'Wymagany poziom dyżurnego: ' +  stationInfo.reqLevel"
+        >{{parseInt(stationInfo.reqLevel) < 2 ? "L" : stationInfo.reqLevel}}</span>
       </div>
 
       <div class="station-info"></div>
@@ -104,7 +116,10 @@
             </a>
           </div>
 
-          <span class="user--borderless" v-if="!stationInfo.trains">BRAK</span>
+          <span
+            class="user borderless"
+            v-if="!stationInfo.trains || stationInfo.trains.length == 0"
+          >BRAK</span>
         </div>
       </div>
     </div>
@@ -151,8 +166,8 @@ export default Vue.extend({
 
   overflow: auto;
 
-  width: 70%;
-  max-width: 550px;
+  width: 65%;
+  max-width: 650px;
 
   box-shadow: 0 0 15px 5px #474747;
 
@@ -177,7 +192,7 @@ export default Vue.extend({
   &-content {
     display: grid;
     grid-template-areas: "dispatcher dispatcher" "rating rating" "hours hours" "users spawns";
-    grid-template-columns: repeat(2, 1fr);
+    grid-template-columns: repeat(2, minmax(0, 1fr));
 
     align-items: center;
     text-align: center;
@@ -226,10 +241,26 @@ export default Vue.extend({
     justify-content: center;
     align-items: center;
 
-    & > img {
+    img,
+    span {
       width: 2.5em;
+      height: 2.5em;
       margin: 0 0.5em;
     }
+
+    span {
+      background-color: #898989;
+
+      display: flex;
+      justify-content: center;
+      align-items: center;
+
+      font-weight: bold;
+
+      -moz-user-select: none;
+      -webkit-user-select: none;
+      user-select: none;
+    }
   }
 }
 
@@ -325,7 +356,7 @@ export default Vue.extend({
       margin: 0.3rem;
       border: 1px solid white;
 
-      &--no-border {
+      &.borderless {
         border: none;
       }
     }
diff --git a/src/components/ui/List.vue b/src/components/ui/List.vue
index 1cdb331..4e2091b 100644
--- a/src/components/ui/List.vue
+++ b/src/components/ui/List.vue
@@ -2,7 +2,7 @@
   <div class="list">
     <Card :stationInfo="focusedStationInfo" :closeCard="closeCard" />
     <div class="table-wrapper">
-      <!-- <ListFilter /> -->
+      <!-- <ListFilter />  -->
       <table class="table">
         <thead>
           <tr>
@@ -35,7 +35,7 @@
           <td
             class="station-name"
             :class="station.default && 'default-station'"
-          >{{station.stationName}}</td>
+          >{{station.stationName}} {{ station.reqLevel ? "| " + (parseInt(station.reqLevel) >= 2 ? station.reqLevel : "L") : "" }}</td>
 
           <td class="disptacher-name">{{station.dispatcherName}}</td>
           <td class="dispatcher-exp">
@@ -66,6 +66,13 @@
               alt="SBL"
               title="Sceneria posiada SBL na przynajmniej jednym ze szlaków"
             />
+
+            <img
+              v-if="!station.reqLevel || station.nonPublic"
+              :src="require(`@/assets/icon-lock.svg`)"
+              alt="non-public"
+              title="Sceneria niepubliczna"
+            />
           </td>
 
           <td class="tracks twoway">
@@ -155,6 +162,9 @@ export default Vue.extend({
         case "NIEDOSTĘPNY":
           className = "unavailable";
           break;
+        case "Z/W":
+          className = "brb";
+          break;
         default:
           break;
       }
@@ -206,6 +216,12 @@ ul {
     background-color: $accent2Col;
     font-size: 0.9em;
   }
+
+  &.brb {
+    background-color: $accentCol;
+    color: black;
+    font-size: 0.95em;
+  }
 }
 
 .list {
diff --git a/src/data/stations.json b/src/data/stations.json
index 024edee..7e591f5 100644
--- a/src/data/stations.json
+++ b/src/data/stations.json
@@ -44,7 +44,8 @@
                 "noCatenary": 0
             }
         },
-        "default": false
+        "default": false,
+        "nonPublic": true
     },
     {
         "stationName": "LCS Gdańsk",
@@ -1614,6 +1615,7 @@
                 "noCatenary": 0
             }
         },
-        "default": false
+        "default": false,
+        "non-public": true
     }
 ]
\ No newline at end of file
diff --git a/src/store/stations.ts b/src/store/stations.ts
index a48bd38..b9f2a3e 100644
--- a/src/store/stations.ts
+++ b/src/store/stations.ts
@@ -56,6 +56,9 @@ export default new Vuex.Store({
                                         { hour12: false, hour: '2-digit', minute: '2-digit' });
                         }
 
+                        if (occupiedCode === 1)
+                            occupiedTo = "Z/W";
+
                         if (occupiedCode === 2 && occupiedTimestamp === 0)
                             occupiedTo = "KOŃCZY";
                     }