From 0d9a3f4b4f5f2e7c43bc08f5c0f538e904e6f471 Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Tue, 6 Sep 2022 12:44:18 +0200
Subject: [PATCH] =?UTF-8?q?Rozszerzone=20opcje=20filtr=C3=B3w=20dziennik?=
 =?UTF-8?q?=C3=B3w?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../JournalView/JournalDispatchers.vue        |  34 ++--
 src/components/JournalView/JournalOptions.vue | 167 +++++++++++-------
 .../JournalView/JournalTimetables.vue         |  30 ++--
 src/styles/JournalSection.scss                |   9 +-
 src/styles/global.scss                        |  17 +-
 src/styles/search_box.scss                    |  11 +-
 6 files changed, 155 insertions(+), 113 deletions(-)

diff --git a/src/components/JournalView/JournalDispatchers.vue b/src/components/JournalView/JournalDispatchers.vue
index 96464e8..f6d8a8b 100644
--- a/src/components/JournalView/JournalDispatchers.vue
+++ b/src/components/JournalView/JournalDispatchers.vue
@@ -8,7 +8,7 @@
         :sorter-option-ids="['timestampFrom', 'duration']"
       />
 
-      <div class="timetables_wrapper" ref="scrollElement">
+      <div class="list_wrapper" @scroll="handleScroll">
         <transition name="warning" mode="out-in">
           <div :key="dataStatus">
             <Loading v-if="dataStatus == (DataStatus.Loading || DataStatus.Initialized)" />
@@ -34,10 +34,10 @@
             </div>
           </div>
         </transition>
-      </div>
 
-      <div class="journal_warning" v-if="scrollNoMoreData">{{ $t('journal.no-further-data') }}</div>
-      <div class="journal_warning" v-else-if="!scrollDataLoaded">{{ $t('journal.loading-further-data') }}</div>
+        <div class="journal_warning" v-if="scrollNoMoreData">{{ $t('journal.no-further-data') }}</div>
+        <div class="journal_warning" v-else-if="!scrollDataLoaded">{{ $t('journal.loading-further-data') }}</div>
+      </div>
     </div>
   </section>
 </template>
@@ -137,8 +137,6 @@ export default defineComponent({
       this.searchersValues['search-dispatcher'] = this.dispatcherName?.toString() || '';
       this.search();
     }
-
-    window.addEventListener('scroll', this.handleScroll);
   },
 
   mounted() {
@@ -147,27 +145,15 @@ export default defineComponent({
     }
   },
 
-  deactivated() {
-    window.removeEventListener('scroll', this.handleScroll);
-  },
-
   methods: {
-    closeDispatcherStatsCard() {
-      this.statsCardOpen = false;
-    },
+    handleScroll(e: Event) {
+      const listElement = e.target as HTMLElement;
+      const scrollTop = listElement.scrollTop;
+      const elementHeight = listElement.scrollHeight - listElement.offsetHeight;
 
-    handleScroll() {
-      this.showReturnButton = window.scrollY > window.innerHeight;
+      if (!this.scrollDataLoaded || this.scrollNoMoreData || this.dataStatus != DataStatus.Loaded) return;
 
-      const element = this.$refs.scrollElement as HTMLElement;
-
-      if (
-        element.getBoundingClientRect().bottom * 0.85 < window.innerHeight &&
-        this.scrollDataLoaded &&
-        !this.scrollNoMoreData &&
-        this.dataStatus == DataStatus.Loaded
-      )
-        this.addHistoryData();
+      if (scrollTop > elementHeight * 0.85) this.addHistoryData();
     },
 
     search() {
diff --git a/src/components/JournalView/JournalOptions.vue b/src/components/JournalView/JournalOptions.vue
index 56b4f1a..e31e565 100644
--- a/src/components/JournalView/JournalOptions.vue
+++ b/src/components/JournalView/JournalOptions.vue
@@ -1,16 +1,30 @@
 <template>
   <div class="journal-options">
+    <button class="btn--open">
+      <img :src="getIcon('filter2')" alt="Open filters" />
+
+      FILTRY
+    </button>
+
     <div class="options_wrapper">
       <div class="options_content">
+        <h1>SORTUJ WG:</h1>
+
         <div class="content_select">
-          <select-box
+          <!-- <select-box
             :itemList="translatedSorterOptions"
             :defaultItemIndex="0"
             @selected="onSorterChange"
             :prefix="$t('journal.sort-prefix')"
-          />
+          /> -->
+
+          <div v-for="opt in translatedSorterOptions">
+            <button class="sort-option">{{ opt.value.toUpperCase() }}</button>
+          </div>
         </div>
 
+        <h1>SZUKAJ:</h1>
+
         <div class="content_search">
           <div class="search-box" v-for="(value, propName) in searchersValues" :key="propName">
             <input
@@ -24,27 +38,14 @@
               <img :src="getIcon('exit')" alt="exit-icon" @click="onInputClear(propName)" />
             </button>
           </div>
-          <!-- <div class="search-box">
-            <input
-              class="search-input"
-              v-model="searchedTrain"
-              :placeholder="$t('journal.search-train')"
-              @keydown.enter="search"
-            />
-
-            <img class="search-exit" :src="exitIcon" alt="exit-icon" @click="clearTrain" />
-          </div>
 
           <div class="search-box">
-            <input
-              class="search-input"
-              v-model="searchedDriver"
-              :placeholder="$t('journal.search-driver')"
-              @keydown.enter="search"
-            />
+            <input class="search-input" placeholder="Data" type="date" />
 
-            <img class="search-exit" :src="exitIcon" alt="exit-icon" @click="clearDriver" />
-          </div> -->
+            <button class="search-exit">
+              <img :src="getIcon('exit')" alt="exit-icon" />
+            </button>
+          </div>
 
           <action-button class="search-button" @click="onInputSearch">
             {{ $t('journal.search') }}
@@ -52,10 +53,11 @@
         </div>
       </div>
 
+      <h1>FILTRUJ WG:</h1>
       <div class="options_filters">
         <button
           v-for="filter in filters"
-          class="journal-filter-option btn--option"
+          class="filter-option btn--option"
           :class="{ checked: journalFilterActive.id === filter.id }"
           :id="filter.id"
           @click="onFilterChange(filter)"
@@ -133,50 +135,95 @@ export default defineComponent({
 </script>
 
 <style lang="scss" scoped>
-@import '../../styles/responsive';
-@import '../../styles/option.scss';
+@import '../../styles/responsive.scss';
 @import '../../styles/search_box.scss';
+@import '../../styles/variables.scss';
 
-.options {
-  &_wrapper {
-    display: flex;
-    flex-direction: column;
+.btn--open {
+  display: flex;
+
+  padding: 0.4em 1em;
+  font-weight: bold;
+  font-size: 1em;
+
+  border-radius: 0.75em 0.75em 0 0;
+
+  img {
+    height: 1.3em;
+    margin-right: 0.5em;
+  }
+}
+
+h1 {
+  position: relative;
+  font-size: 1.1em;
+  margin: 0.7em 0 0.25em 0;
+
+  &::before {
+    content: '';
+    position: absolute;
+    top: -4px;
+
+    width: 50%;
+    height: 2px;
+    background-color: white;
+    border-radius: 2px;
+  }
+}
+
+.journal-options {
+  position: relative;
+}
+
+.options_wrapper {
+  position: absolute;
+
+  background-color: #111111dd;
+  padding: 1em;
+
+  z-index: 100;
+}
+
+.content_select {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+
+  padding: 0.25em 0.25em 0 0;
+}
+
+.content_search > div {
+  margin: 0.5em auto;
+}
+
+.content_search > button {
+  display: flex;
+  justify-content: center;
+  margin: 0 auto;
+}
+
+.options_filters {
+  display: flex;
+  flex-wrap: wrap;
+  margin: 0.5em 0 0 0;
+}
+
+.sort-option,
+.filter-option {
+  margin: 0 0.25em 0 0;
+}
+
+.filter-option {
+  &#abandoned {
+    color: salmon;
   }
 
-  &_content {
-    display: flex;
-    flex-wrap: wrap;
-
-    .content_search,
-    .content_select {
-      display: flex;
-      align-items: center;
-      flex-wrap: wrap;
-
-      padding: 0.25em 0.25em 0 0;
-    }
+  &#fulfilled {
+    color: lightgreen;
   }
 
-  &_filters {
-    display: flex;
-    flex-wrap: wrap;
-    margin: 0.5em 0 0 0;
-
-    .journal-filter-option {
-      margin: 0 0.25em 0 0;
-
-      &#abandoned {
-        color: salmon;
-      }
-
-      &#fulfilled {
-        color: lightgreen;
-      }
-
-      &#active {
-        color: lightblue;
-      }
-    }
+  &#active {
+    color: lightblue;
   }
 }
 
@@ -209,7 +256,7 @@ export default defineComponent({
     &_filters {
       justify-content: center;
 
-      .journal-filter-option {
+      .filter-option {
         margin: 0.25em 0.25em;
       }
     }
diff --git a/src/components/JournalView/JournalTimetables.vue b/src/components/JournalView/JournalTimetables.vue
index d8c498b..895f9a3 100644
--- a/src/components/JournalView/JournalTimetables.vue
+++ b/src/components/JournalView/JournalTimetables.vue
@@ -13,7 +13,7 @@
         :filters="journalTimetableFilters"
       />
 
-      <div class="timetables_wrapper" ref="scrollElement">
+      <div class="list_wrapper" @scroll="handleScroll">
         <transition name="warning" mode="out-in">
           <div :key="dataStatus">
             <Loading v-if="dataStatus == (DataStatus.Loading || DataStatus.Initialized)" />
@@ -39,10 +39,10 @@
             </div>
           </div>
         </transition>
-      </div>
 
-      <div class="journal_warning" v-if="scrollNoMoreData">{{ $t('journal.no-further-data') }}</div>
-      <div class="journal_warning" v-else-if="!scrollDataLoaded">{{ $t('journal.loading-further-data') }}</div>
+        <div class="journal_warning" v-if="scrollNoMoreData">{{ $t('journal.no-further-data') }}</div>
+        <div class="journal_warning" v-else-if="!scrollDataLoaded">{{ $t('journal.loading-further-data') }}</div>
+      </div>
     </div>
   </section>
 </template>
@@ -130,35 +130,25 @@ export default defineComponent({
   },
 
   activated() {
-    window.addEventListener('scroll', this.handleScroll);
-
     if (this.timetableId) {
       this.searchersValues['search-train'] = `#${this.timetableId}`;
       this.searchHistory();
     }
   },
 
-  deactivated() {
-    window.removeEventListener('scroll', this.handleScroll);
-  },
-
   mounted() {
     if (!this.timetableId) this.searchHistory();
   },
 
   methods: {
-    handleScroll() {
-      this.showReturnButton = window.scrollY > window.innerHeight;
+    handleScroll(e: Event) {
+      const listElement = e.target as HTMLElement;
+      const scrollTop = listElement.scrollTop;
+      const elementHeight = listElement.scrollHeight - listElement.offsetHeight;
 
-      const element = this.$refs.scrollElement as HTMLElement;
+      if (!this.scrollDataLoaded || this.scrollNoMoreData || this.dataStatus != DataStatus.Loaded) return;
 
-      if (
-        element.getBoundingClientRect().bottom * 0.85 < window.innerHeight &&
-        this.scrollDataLoaded &&
-        !this.scrollNoMoreData &&
-        this.dataStatus == DataStatus.Loaded
-      )
-        this.addHistoryData();
+      if (scrollTop > elementHeight * 0.85) this.addHistoryData();
     },
 
     searchHistory() {
diff --git a/src/styles/JournalSection.scss b/src/styles/JournalSection.scss
index 6be3530..4da8337 100644
--- a/src/styles/JournalSection.scss
+++ b/src/styles/JournalSection.scss
@@ -18,6 +18,13 @@
 
 //Styles
 
+.list_wrapper {
+  overflow-y: scroll;
+  height: 90vh;
+
+  padding-right: 0.2em;
+}
+
 .journal_wrapper {
   max-width: 1350px;
   width: 100%;
@@ -42,7 +49,7 @@
 .journal_warning {
   background: #202020;
   padding: 1em;
-  margin: 1em 0;
+  margin-bottom: 1em;
 }
 
 .journal_top-bar {
diff --git a/src/styles/global.scss b/src/styles/global.scss
index 8f800b2..3d58dad 100644
--- a/src/styles/global.scss
+++ b/src/styles/global.scss
@@ -50,11 +50,13 @@ body {
   height: 1rem;
 
   &-track {
-    background-color: #222;
+    border-radius: 0.5em;
   }
 
   &-thumb {
-    background-color: #777;
+    border-radius: 0.5em;
+
+    background-color: #1b1b1b;
   }
 }
 
@@ -113,7 +115,6 @@ select {
 }
 
 input {
-  border: 1px solid white;
   background: none;
   color: white;
   font-size: 1em;
@@ -190,6 +191,16 @@ ul {
   }
 }
 
+button {
+  cursor: pointer;
+
+  color: white;
+  background-color: #333;
+
+  border-radius: 0.25em;
+  padding: 0.25em 0.5em;
+}
+
 .btn {
   background: none;
   cursor: pointer;
diff --git a/src/styles/search_box.scss b/src/styles/search_box.scss
index e74da0d..0fd1b15 100644
--- a/src/styles/search_box.scss
+++ b/src/styles/search_box.scss
@@ -33,6 +33,12 @@
     }
   }
 
+  &-button {
+    width: 80%;
+    max-width: 300px;
+
+  }
+
   @include smallScreen {
     &-box,
     &-button {
@@ -42,10 +48,5 @@
     &-box {
       width: 100%;
     }
-
-    &-button {
-      width: 80%;
-      max-width: 300px;
-    }
   }
 }