From 5386887076bc393ad38798651c3b23d100b57bd3 Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Wed, 8 Jul 2020 14:27:25 +0200
Subject: [PATCH] =?UTF-8?q?Zmiany=20w=20wygl=C4=85dzie=20filtr=C3=B3w,=20r?=
 =?UTF-8?q?esponsywno=C5=9B=C4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ui/Card.vue          | 267 ++++++++++++++--------------
 src/components/ui/List.vue          |   6 +-
 src/components/ui/Options.vue       |   7 +-
 src/components/utils/ListFilter.vue |  48 +++--
 src/store/modules/store.ts          |   1 +
 5 files changed, 178 insertions(+), 151 deletions(-)

diff --git a/src/components/ui/Card.vue b/src/components/ui/Card.vue
index 43efdd6..ece7e09 100644
--- a/src/components/ui/Card.vue
+++ b/src/components/ui/Card.vue
@@ -1,129 +1,131 @@
 <template>
-  <div class="card" v-if="stationInfo">
-    <div class="card-exit" @click="closeCard">X</div>
+  <transition name="card-anim">
+    <div class="card" v-if="stationInfo">
+      <div class="card-exit" @click="closeCard">X</div>
 
-    <div class="card-upper">
-      <div class="station-name">
-        <a
-          v-if="stationInfo.stationURL"
-          :href="stationInfo.stationURL"
-          target="_blank"
-          rel="noopener noreferrer"
-        >{{stationInfo.stationName}}</a>
-        <span v-else>{{stationInfo.stationName}}</span>
-      </div>
-
-      <div class="station-hash">{{stationInfo.stationHash}}</div>
-
-      <div class="station-icons">
-        <img
-          v-if="stationInfo.controlType"
-          :src="require(`@/assets/icon-${stationInfo.controlType}.svg`)"
-          :alt="stationInfo.controlType"
-          :title="'Sterowanie ' + stationInfo.controlType"
-        />
-
-        <img
-          v-if="stationInfo.signalType"
-          :src="require(`@/assets/icon-${stationInfo.signalType}.svg`)"
-          :alt="stationInfo.signalType"
-          :title="'Sygnalizacja ' + stationInfo.signalType"
-        />
-
-        <img
-          v-if="stationInfo.SBL && stationInfo.SBL !== ''"
-          :src="require(`@/assets/icon-SBL.svg`)"
-          alt="SBL"
-          title="Sceneria posiada SBL na przynajmniej jednym ze szlaków"
-        />
-
-        <img
-          v-if="stationInfo.default"
-          :src="require(`@/assets/icon-td2.svg`)"
-          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>
-    </div>
-
-    <div class="card-content">
-      <div class="dispatcher">
-        <div class="dispatcher-exp">{{stationInfo.dispatcherExp}}</div>
-        <div class="dispatcher-name">
+      <div class="card-upper">
+        <div class="station-name">
           <a
-            :href="'https://td2.info.pl/profile/?u=' + stationInfo.dispatcherId"
+            v-if="stationInfo.stationURL"
+            :href="stationInfo.stationURL"
             target="_blank"
             rel="noopener noreferrer"
-          >{{stationInfo.dispatcherName}}</a>
+          >{{stationInfo.stationName}}</a>
+          <span v-else>{{stationInfo.stationName}}</span>
         </div>
-      </div>
 
-      <div class="rating">
-        <div class="rating-content">
-          <img :src="require(`@/assets/icon-like.svg`)" alt="like-icon" />
-          {{stationInfo.dispatcherRate}}
-        </div>
-      </div>
+        <div class="station-hash">{{stationInfo.stationHash}}</div>
 
-      <div class="occupation">
-        <div class="occupation-title text--title">SCENERIA ZAJĘTA DO</div>
-        <div class="occupation-content text--content">{{stationInfo.occupiedTo}}</div>
-      </div>
+        <div class="station-icons">
+          <img
+            v-if="stationInfo.controlType"
+            :src="require(`@/assets/icon-${stationInfo.controlType}.svg`)"
+            :alt="stationInfo.controlType"
+            :title="'Sterowanie ' + stationInfo.controlType"
+          />
+
+          <img
+            v-if="stationInfo.signalType"
+            :src="require(`@/assets/icon-${stationInfo.signalType}.svg`)"
+            :alt="stationInfo.signalType"
+            :title="'Sygnalizacja ' + stationInfo.signalType"
+          />
+
+          <img
+            v-if="stationInfo.SBL && stationInfo.SBL !== ''"
+            :src="require(`@/assets/icon-SBL.svg`)"
+            alt="SBL"
+            title="Sceneria posiada SBL na przynajmniej jednym ze szlaków"
+          />
+
+          <img
+            v-if="stationInfo.default"
+            :src="require(`@/assets/icon-td2.svg`)"
+            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"
+          />
 
-      <div class="spawns">
-        <div class="spawns-title text--title">OTWARTE SPAWNY</div>
-        <div class="spawns-content text--content">
           <span
-            class="spawn"
-            v-for="(spawn, i) in stationInfo.spawnString"
-            :key="spawn + stationInfo.dispatcherName + i"
-          >{{spawn}}</span>
-
-          <span class="spawn" v-if="!stationInfo.spawnString">BRAK</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>
       </div>
 
-      <div class="users">
-        <div class="users-title text--title">GRACZE NA STACJI</div>
-        <div class="users-content text--content">
-          <div
-            class="user"
-            v-for="train in stationInfo.trains"
-            :key="train.trainNo + train.driverName"
-          >
+      <div class="card-content">
+        <div class="dispatcher">
+          <div class="dispatcher-exp">{{stationInfo.dispatcherExp}}</div>
+          <div class="dispatcher-name">
             <a
-              :href="'https://rj.td2.info.pl/train#' + train.trainNo + ';eu'"
+              :href="'https://td2.info.pl/profile/?u=' + stationInfo.dispatcherId"
               target="_blank"
               rel="noopener noreferrer"
-            >
-              <span>{{train.trainNo}}</span>
-              |
-              <span>{{train.driverName}}</span>
-            </a>
+            >{{stationInfo.dispatcherName}}</a>
           </div>
+        </div>
 
-          <span
-            class="user borderless"
-            v-if="!stationInfo.trains || stationInfo.trains.length == 0"
-          >BRAK</span>
+        <div class="rating">
+          <div class="rating-content">
+            <img :src="require(`@/assets/icon-like.svg`)" alt="like-icon" />
+            {{stationInfo.dispatcherRate}}
+          </div>
+        </div>
+
+        <div class="occupation">
+          <div class="occupation-title text--title">SCENERIA ZAJĘTA DO</div>
+          <div class="occupation-content text--content">{{stationInfo.occupiedTo}}</div>
+        </div>
+
+        <div class="spawns">
+          <div class="spawns-title text--title">OTWARTE SPAWNY</div>
+          <div class="spawns-content text--content">
+            <span
+              class="spawn"
+              v-for="(spawn, i) in stationInfo.spawnString"
+              :key="spawn + stationInfo.dispatcherName + i"
+            >{{spawn}}</span>
+
+            <span class="spawn" v-if="!stationInfo.spawnString">BRAK</span>
+          </div>
+        </div>
+
+        <div class="users">
+          <div class="users-title text--title">GRACZE NA STACJI</div>
+          <div class="users-content text--content">
+            <div
+              class="user"
+              v-for="train in stationInfo.trains"
+              :key="train.trainNo + train.driverName"
+            >
+              <a
+                :href="'https://rj.td2.info.pl/train#' + train.trainNo + ';eu'"
+                target="_blank"
+                rel="noopener noreferrer"
+              >
+                <span>{{train.trainNo}}</span>
+                |
+                <span>{{train.driverName}}</span>
+              </a>
+            </div>
+
+            <span
+              class="user borderless"
+              v-if="!stationInfo.trains || stationInfo.trains.length == 0"
+            >BRAK</span>
+          </div>
         </div>
       </div>
     </div>
-  </div>
+  </transition>
 </template>
 
 <script lang="ts">
@@ -149,27 +151,34 @@ export default Vue.extend({
   }
 }
 
+.card-anim {
+  &-enter-active,
+  &-leave-active {
+    transition: all 0.25s ease-in-out;
+  }
+
+  &-enter,
+  &-leave-to {
+    opacity: 0;
+  }
+}
+
 .card {
+  display: flex;
+  flex-direction: column;
   position: fixed;
   top: 50%;
   left: 50%;
-
-  display: flex;
-  flex-direction: column;
-
+  transform: translate(-50%, -50%);
   z-index: 2;
 
-  transform: translate(-50%, -50%);
-  background: #474747;
-
-  max-height: 95%;
-
   overflow: auto;
+  background: #474747;
+  box-shadow: 0 0 15px 5px #474747;
 
   width: 65%;
   max-width: 650px;
-
-  box-shadow: 0 0 15px 5px #474747;
+  max-height: 95%;
 
   font-size: calc(0.6rem + 0.5vw);
 
@@ -181,9 +190,7 @@ export default Vue.extend({
     position: absolute;
     top: 0;
     right: 0;
-
     padding: 1rem;
-
     font-size: calc(1rem + 0.7vw);
 
     cursor: pointer;
@@ -196,7 +203,6 @@ export default Vue.extend({
 
     align-items: center;
     text-align: center;
-
     padding: 1em;
 
     & > div {
@@ -208,7 +214,6 @@ export default Vue.extend({
   &-upper {
     background: #959595;
     text-align: center;
-
     padding: 0.2em;
   }
 }
@@ -235,17 +240,16 @@ export default Vue.extend({
   }
 
   &-icons {
-    padding: 0.5rem;
-
     display: flex;
     justify-content: center;
     align-items: center;
+    padding: 0.5rem;
 
     img,
     span {
+      margin: 0 0.5em;
       width: 2.5em;
       height: 2.5em;
-      margin: 0 0.5em;
     }
 
     span {
@@ -257,9 +261,9 @@ export default Vue.extend({
 
       font-weight: bold;
 
+      user-select: none;
       -moz-user-select: none;
       -webkit-user-select: none;
-      user-select: none;
     }
   }
 }
@@ -271,6 +275,8 @@ export default Vue.extend({
   justify-content: center;
   align-items: center;
 
+  text-align: center;
+
   @include smallScreen() {
     flex-direction: column;
   }
@@ -280,12 +286,12 @@ export default Vue.extend({
     justify-content: center;
     align-items: center;
 
-    border: 2px solid #ffbb00;
-    border-radius: 50%;
-    font-size: 1.3em;
-
     width: 2em;
     height: 2em;
+
+    font-size: 1.3em;
+    border: 2px solid #ffbb00;
+    border-radius: 50%;
   }
 
   &-name {
@@ -298,8 +304,6 @@ export default Vue.extend({
       margin-left: 0;
       margin-top: 0.2em;
     }
-
-    text-align: center;
   }
 }
 
@@ -327,7 +331,6 @@ export default Vue.extend({
   display: flex;
   justify-content: center;
   align-items: center;
-
   flex-direction: column;
 
   &-content {
@@ -343,7 +346,6 @@ export default Vue.extend({
   display: flex;
   justify-content: center;
   align-items: center;
-
   flex-direction: column;
 
   &-content {
@@ -369,7 +371,6 @@ export default Vue.extend({
   display: flex;
   justify-content: space-between;
   align-items: center;
-
   flex-direction: column;
 
   overflow: hidden;
diff --git a/src/components/ui/List.vue b/src/components/ui/List.vue
index c807808..fc86b4c 100644
--- a/src/components/ui/List.vue
+++ b/src/components/ui/List.vue
@@ -2,8 +2,10 @@
   <div class="list">
     <Card :stationInfo="focusedStationInfo" :closeCard="closeCard" />
 
+    <!-- <div class="info">Ups! Brak stacji do wyświetlenia!</div> -->
+
     <div class="table-wrapper">
-      <table class="table">
+      <table class="table" v-if="stations.length > 0">
         <thead>
           <tr>
             <th>Stacja</th>
@@ -248,7 +250,7 @@ export default Vue.extend({
   font-size: calc(0.6rem + 0.4vw);
 
   @include smallScreen() {
-    font-size: 0.5rem;
+    font-size: 0.65rem;
   }
 
   thead th {
diff --git a/src/components/ui/Options.vue b/src/components/ui/Options.vue
index 96eb57c..32d778e 100644
--- a/src/components/ui/Options.vue
+++ b/src/components/ui/Options.vue
@@ -12,7 +12,7 @@
 
     <transition name="slide">
       <keep-alive>
-        <ListFilter v-if="filtersOpen" />
+        <ListFilter v-if="filtersOpen" :exit="() => filtersOpen = !filtersOpen" />
       </keep-alive>
     </transition>
   </div>
@@ -45,15 +45,14 @@ export default Vue.extend({
 
 .slide-enter,
 .slide-leave-to {
-  transform: translateX(10px);
+  transform: translate(-40%, -50%);
   opacity: 0;
 }
 
 .options {
-  position: relative;
   font-size: calc(0.6rem + 0.9vw);
 
-  display: flex;
+  // display: flex;
 }
 
 button {
diff --git a/src/components/utils/ListFilter.vue b/src/components/utils/ListFilter.vue
index b9549d1..61c6a8d 100644
--- a/src/components/utils/ListFilter.vue
+++ b/src/components/utils/ListFilter.vue
@@ -1,5 +1,7 @@
 <template>
   <div class="list-filter">
+    <div class="exit" @click="exitFilters">X</div>
+    <div class="list-filter-title">FILTRY</div>
     <ul class="grid">
       <li class="grid-row">
         <div class="grid-col" v-for="(el, i) in gridElements" :key="i">
@@ -275,6 +277,7 @@ export default Vue.extend({
       }
     }
   }),
+  props: ["exit"],
   methods: {
     ...mapActions(["setFilter", "resetFilters"]),
     handleChange(e: any) {
@@ -303,6 +306,9 @@ export default Vue.extend({
       this.twoWayOther = 0;
 
       this.resetFilters();
+    },
+    exitFilters() {
+      this.exit();
     }
   }
 });
@@ -313,28 +319,46 @@ export default Vue.extend({
 @import "../../styles/variables";
 
 .list-filter {
-  position: absolute;
-  top: 100%;
-  left: 0;
-  padding: 0.3rem;
+  position: fixed;
+  top: 50%;
+  left: 50%;
 
-  @include smallScreen() {
-    width: 100vw;
-  }
+  overflow: auto;
+  max-height: 90%;
 
+  padding: 0.4em;
+
+  background: rgba(black, 0.85);
   white-space: nowrap;
-
+  transform: translate(-50%, -50%);
   font-size: calc(0.6rem + 0.4vw);
 
   @include smallScreen() {
-    font-size: 0.65rem;
+    width: 100vw;
+    font-size: 0.75em;
   }
 }
 
-.grid {
-  background: rgba(black, 0.65);
-  padding: 0.5rem;
+.exit {
+  position: absolute;
+  top: 0;
+  right: 0;
 
+  padding: 0.4rem;
+
+  font-size: calc(1rem + 0.4vw);
+
+  cursor: pointer;
+}
+
+.list-filter-title {
+  text-align: center;
+  padding: 0.3rem;
+  font-size: 1.6em;
+  font-weight: bold;
+}
+
+.grid {
   &-row {
     display: flex;
     justify-content: center;
diff --git a/src/store/modules/store.ts b/src/store/modules/store.ts
index 6111768..4fde1d1 100644
--- a/src/store/modules/store.ts
+++ b/src/store/modules/store.ts
@@ -196,6 +196,7 @@ class Store extends VuexModule {
     public filterStations() {
         this.filteredStations = this.stations.filter(station => {
 
+
             if ((station.nonPublic || !station.reqLevel) && this.filters['nonPublic']) return false;
             if (!station.reqLevel) return true;