From 528dce57f762695b7387527673001b93dce1b396 Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Tue, 13 Jul 2021 23:17:22 +0200
Subject: [PATCH] =?UTF-8?q?Mo=C5=BCliwo=C5=9B=C4=87=20wyj=C5=9Bcia=20z=20k?=
 =?UTF-8?q?arty=20po=20klikni=C4=99ciu=20na=20zewn=C4=85trz=20niej?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Global/ActionButton.vue        |  12 +-
 .../StationsView/StationFilterCard.vue        | 136 ++++++++++--------
 src/components/TrainsView/TrainStats.vue      |  22 +--
 src/main.ts                                   |   3 +-
 src/views/StationsView.vue                    |  37 ++---
 5 files changed, 111 insertions(+), 99 deletions(-)

diff --git a/src/components/Global/ActionButton.vue b/src/components/Global/ActionButton.vue
index 02b0464..f744817 100644
--- a/src/components/Global/ActionButton.vue
+++ b/src/components/Global/ActionButton.vue
@@ -1,6 +1,8 @@
 <template>
   <button class="action-btn">
-    <slot></slot>
+    <div class="button_content">
+      <slot></slot>
+    </div>
   </button>
 </template>
 
@@ -15,9 +17,6 @@ export default defineComponent({});
 @import "../../styles/responsive";
 
 .action-btn {
-  display: flex;
-  align-items: center;
-
   background: #333;
   border: none;
 
@@ -58,4 +57,9 @@ export default defineComponent({});
     background: #5c5c5c;
   }
 }
+
+.button_content {
+  display: flex;
+  align-items: center;
+}
 </style>
\ No newline at end of file
diff --git a/src/components/StationsView/StationFilterCard.vue b/src/components/StationsView/StationFilterCard.vue
index 274dbcd..37ec8a4 100644
--- a/src/components/StationsView/StationFilterCard.vue
+++ b/src/components/StationsView/StationFilterCard.vue
@@ -1,57 +1,60 @@
 <template>
-  <section class="card" v-if="showCard">
-    <div class="card_exit" @click="exit">
-      <!-- <img :src="require('@/assets/icon-exit.svg')" alt="exit icon" /> -->
+  <section class="filter-card" v-click-outside="closeCard">
+    <div class="card_btn">
+      <action-button @click="toggleCard">
+        <img class="button_icon" :src="filterIcon" alt="icon-filter" />
+        <p>{{ $t("options.filters") }}</p>
+      </action-button>
     </div>
 
-    <div class="card_title flex">{{ $t("filters.title") }}</div>
+    <transition name="card-anim">
+      <div class="card_content card" v-if="isVisible">
+        <div class="card_exit" @click="closeCard"></div>
 
-    <section class="card_options">
-      <filter-option
-        v-for="(option, i) in inputs.options"
-        :option="option"
-        :key="i"
-        @optionChange="handleChange"
-      />
-    </section>
+        <div class="card_title flex">{{ $t("filters.title") }}</div>
 
-    <!-- <section class="card_modes">
-      <filter-option :option="inputs.modes[0]" @optionChange="invertFilters" />
-    </section> -->
+        <section class="card_options">
+          <filter-option
+            v-for="(option, i) in inputs.options"
+            :option="option"
+            :key="i"
+            @optionChange="handleChange"
+          />
+        </section>
 
-    <section class="card_sliders">
-      <div class="slider" v-for="(slider, i) in inputs.sliders" :key="i">
-        <input
-          class="slider-input"
-          type="range"
-          :name="slider.name"
-          :id="slider.id"
-          :min="slider.minRange"
-          :max="slider.maxRange"
-          v-model="slider.value"
-          @change="handleInput"
-        />
+        <section class="card_sliders">
+          <div class="slider" v-for="(slider, i) in inputs.sliders" :key="i">
+            <input
+              class="slider-input"
+              type="range"
+              :name="slider.name"
+              :id="slider.id"
+              :min="slider.minRange"
+              :max="slider.maxRange"
+              v-model="slider.value"
+              @change="handleInput"
+            />
 
-        <span class="slider-value">{{ slider.value }}</span>
+            <span class="slider-value">{{ slider.value }}</span>
 
-        <div class="slider-content">
-          {{ $t(`filters.sliders.${slider.id}`) }}
-        </div>
-      </div>
-    </section>
+            <div class="slider-content">
+              {{ $t(`filters.sliders.${slider.id}`) }}
+            </div>
+          </div>
+        </section>
 
-    <section class="card_save">
-      <filter-option
-        @optionChange="saveFilters"
-        :option="{
-          id: 'save',
-          name: 'save',
-          section: 'mode',
-          value: saveOptions,
-          defaultValue: true,
-        }"
-      />
-      <!-- <div class="option">
+        <section class="card_save">
+          <filter-option
+            @optionChange="saveFilters"
+            :option="{
+              id: 'save',
+              name: 'save',
+              section: 'mode',
+              value: saveOptions,
+              defaultValue: true,
+            }"
+          />
+          <!-- <div class="option">
         <label>
           <input type="checkbox" v-model="saveOptions" @change="saveFilters" />
           <span class="save" :class="{ checked: saveOptions }">
@@ -59,16 +62,18 @@
           </span>
         </label>
       </div> -->
-    </section>
+        </section>
 
-    <section class="card_actions flex">
-      <action-button class="outlined" @click="resetFilters">
-        {{ $t("filters.reset") }}
-      </action-button>
-      <action-button class="outlined" @click="exit">{{
-        $t("filters.close")
-      }}</action-button>
-    </section>
+        <section class="card_actions flex">
+          <action-button class="outlined" @click="resetFilters">
+            {{ $t("filters.reset") }}
+          </action-button>
+          <action-button class="outlined" @click="closeCard">{{
+            $t("filters.close")
+          }}</action-button>
+        </section>
+      </div>
+    </transition>
   </section>
 </template>
 
@@ -82,13 +87,15 @@ import FilterOption from "./FilterOption.vue";
 
 export default defineComponent({
   components: { ActionButton, FilterOption },
-  props: ["showCard", "exit"],
   emits: ["changeFilterValue", "invertFilters", "resetFilters"],
 
   data: () => ({
+    filterIcon: require("@/assets/icon-filter2.svg"),
+
     inputs: { ...inputData },
     saveOptions: false,
     STORAGE_KEY: "options_saved",
+    isVisible: false,
   }),
 
   mounted() {
@@ -160,7 +167,11 @@ export default defineComponent({
     },
 
     closeCard() {
-      this.exit();
+      this.isVisible = false;
+    },
+
+    toggleCard() {
+      this.isVisible = !this.isVisible;
     },
   },
 });
@@ -170,6 +181,19 @@ export default defineComponent({
 @import "../../styles/responsive";
 @import "../../styles/card";
 
+.card-anim {
+  &-enter-active,
+  &-leave-active {
+    transition: all $animDuration $animType;
+  }
+
+  &-enter-from,
+  &-leave-to {
+    transform: translate(-50%, -50%) scale(0.85);
+    opacity: 0;
+  }
+}
+
 .card {
   > section {
     margin-top: 1em;
diff --git a/src/components/TrainsView/TrainStats.vue b/src/components/TrainsView/TrainStats.vue
index 46a0567..83c262f 100644
--- a/src/components/TrainsView/TrainStats.vue
+++ b/src/components/TrainsView/TrainStats.vue
@@ -1,11 +1,9 @@
 <template>
-  <div class="train-stats">
-    <div class="stats_button">
-      <action-button @click="toggleStatsOpen">
-        <img :src="statsIcon" :alt="$t('trains.stats')" />
-        <p>{{ $t("trains.stats") }}</p>
-      </action-button>
-    </div>
+  <div class="train-stats" v-click-outside="closeStats">
+    <action-button class="stats_button" @click="toggleStatsOpen">
+      <img :src="statsIcon" :alt="$t('trains.stats')" />
+      <p>{{ $t("trains.stats") }}</p>
+    </action-button>
 
     <transition name="stats-anim" class="stats_wrapper" tag="div">
       <div class="stats-body" v-if="trainStatsOpen">
@@ -104,6 +102,10 @@ export default defineComponent({
     toggleStatsOpen() {
       this.trainStatsOpen = !this.trainStatsOpen;
     },
+
+    closeStats() {
+      this.trainStatsOpen = false;
+    },
   },
 
   setup(props) {
@@ -266,6 +268,9 @@ export default defineComponent({
     max-width: 700px;
     width: 100%;
 
+    top: 100%;
+    left: 0;
+
     background: #222;
     border-radius: 0 1em 1em 1em;
 
@@ -346,8 +351,7 @@ export default defineComponent({
   }
 
   .stats_button {
-    display: flex;
-    justify-content: center;
+    margin: 0 auto;
   }
 }
 </style>
\ No newline at end of file
diff --git a/src/main.ts b/src/main.ts
index bed0aa0..3d38330 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -20,7 +20,8 @@ const i18n = createI18n({
 
 const clickOutsideDirective: Directive = {
   beforeMount(el, binding) {
-
+    console.log("before mount");
+    
     el.clickOutsideEvent = (event: Event) => {
       if (!(el == event.target || el.contains(event.target))) {
         binding.value();
diff --git a/src/views/StationsView.vue b/src/views/StationsView.vue
index 60dc799..440a098 100644
--- a/src/views/StationsView.vue
+++ b/src/views/StationsView.vue
@@ -3,10 +3,13 @@
     <div class="wrapper">
       <div class="body">
         <div class="options-bar">
-          <action-button @click="() => toggleCardsState('filter')">
-            <img class="button_icon" :src="filterIcon" alt="icon-filter" />
-            <p>{{ $t("options.filters") }}</p>
-          </action-button>
+          <FilterCard
+            :showCard="filterCardOpen"
+            :exit="closeCard"
+            @changeFilterValue="changeFilterValue"
+            @invertFilters="invertFilters"
+            @resetFilters="resetFilters"
+          />
 
           <div class="paypal-link">
             <a target="_blank" href="https://paypal.me/spythere">
@@ -27,16 +30,6 @@
         />
       </div>
     </div>
-
-    <transition name="card-anim">
-      <FilterCard
-        :showCard="filterCardOpen"
-        :exit="() => toggleCardsState('filter')"
-        @changeFilterValue="changeFilterValue"
-        @invertFilters="invertFilters"
-        @resetFilters="resetFilters"
-      />
-    </transition>
   </section>
 </template>
 
@@ -68,7 +61,6 @@ export default defineComponent({
     trainIcon: require("@/assets/icon-train.svg"),
     timetableIcon: require("@/assets/icon-timetable.svg"),
     dolarIcon: require("@/assets/icon-dolar.svg"),
-    filterIcon: require("@/assets/icon-filter2.svg"),
     filterCardOpen: false,
     modalHidden: true,
     STORAGE_KEY: "options_saved",
@@ -151,7 +143,7 @@ export default defineComponent({
       this.filterManager.invertFilters();
     },
     closeCard() {
-      this.focusedStationName = "";
+      this.filterCardOpen = false;
     },
     setFocusedStation(name: string) {
       this.focusedStationName = this.focusedStationName == name ? "" : name;
@@ -164,19 +156,6 @@ export default defineComponent({
 @import "../styles/variables.scss";
 @import "../styles/responsive.scss";
 
-.card-anim {
-  &-enter-active,
-  &-leave-active {
-    transition: all $animDuration $animType;
-  }
-
-  &-enter-from,
-  &-leave-to {
-    transform: translate(-50%, -50%) scale(0.85);
-    opacity: 0;
-  }
-}
-
 @keyframes blinkAnim {
   0%,
   100% {