From 0bb1091747816e475fd6416a63813d25e756981a Mon Sep 17 00:00:00 2001 From: Spythere Date: Fri, 27 May 2022 17:30:55 +0200 Subject: [PATCH] =?UTF-8?q?Optymalizacja=20kodu=20i=20asset=C3=B3w;=20popr?= =?UTF-8?q?awki=20w=20dzia=C5=82aniu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icon-SCS-SPK.svg | 6 - src/assets/icon-SCS.svg | 4 - src/assets/icon-SPE.svg | 4 - src/assets/icon-SPK.svg | 4 - src/assets/icon-loading.svg | 60 ---------- src/assets/icon-mechaniczne+SCS.svg | 5 - src/assets/icon-mechaniczne+SPK.svg | 5 - src/assets/icon-mechaniczne.svg | 4 - src/assets/icon-ręczne+SCS.svg | 5 - src/assets/icon-ręczne+SPK.svg | 5 - src/assets/icon-ręczne.svg | 4 - .../JournalView/JournalDispatchers.vue | 15 ++- .../JournalView/JournalTimetables.vue | 4 +- .../SceneryInfo/SceneryInfoIcons.vue | 57 ++++++--- src/components/StationsView/StationTable.vue | 108 ++++++++++-------- src/mixins/stationInfoMixin.ts | 25 ++++ src/styles/JournalSection.scss | 4 +- src/styles/icons.scss | 41 +++++++ 18 files changed, 176 insertions(+), 184 deletions(-) delete mode 100644 src/assets/icon-SCS-SPK.svg delete mode 100644 src/assets/icon-SCS.svg delete mode 100644 src/assets/icon-SPE.svg delete mode 100644 src/assets/icon-SPK.svg delete mode 100644 src/assets/icon-loading.svg delete mode 100644 src/assets/icon-mechaniczne+SCS.svg delete mode 100644 src/assets/icon-mechaniczne+SPK.svg delete mode 100644 src/assets/icon-mechaniczne.svg delete mode 100644 src/assets/icon-ręczne+SCS.svg delete mode 100644 src/assets/icon-ręczne+SPK.svg delete mode 100644 src/assets/icon-ręczne.svg create mode 100644 src/mixins/stationInfoMixin.ts diff --git a/src/assets/icon-SCS-SPK.svg b/src/assets/icon-SCS-SPK.svg deleted file mode 100644 index 4c15dbf..0000000 --- a/src/assets/icon-SCS-SPK.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/assets/icon-SCS.svg b/src/assets/icon-SCS.svg deleted file mode 100644 index 0e7ce85..0000000 --- a/src/assets/icon-SCS.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/assets/icon-SPE.svg b/src/assets/icon-SPE.svg deleted file mode 100644 index 15a41fe..0000000 --- a/src/assets/icon-SPE.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/assets/icon-SPK.svg b/src/assets/icon-SPK.svg deleted file mode 100644 index 27b20ec..0000000 --- a/src/assets/icon-SPK.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/assets/icon-loading.svg b/src/assets/icon-loading.svg deleted file mode 100644 index b0f7e8d..0000000 --- a/src/assets/icon-loading.svg +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/assets/icon-mechaniczne+SCS.svg b/src/assets/icon-mechaniczne+SCS.svg deleted file mode 100644 index 30c99ae..0000000 --- a/src/assets/icon-mechaniczne+SCS.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/assets/icon-mechaniczne+SPK.svg b/src/assets/icon-mechaniczne+SPK.svg deleted file mode 100644 index aec6d1b..0000000 --- a/src/assets/icon-mechaniczne+SPK.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/assets/icon-mechaniczne.svg b/src/assets/icon-mechaniczne.svg deleted file mode 100644 index a858e15..0000000 --- a/src/assets/icon-mechaniczne.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/assets/icon-ręczne+SCS.svg b/src/assets/icon-ręczne+SCS.svg deleted file mode 100644 index 4a15fd6..0000000 --- a/src/assets/icon-ręczne+SCS.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/assets/icon-ręczne+SPK.svg b/src/assets/icon-ręczne+SPK.svg deleted file mode 100644 index 180e95e..0000000 --- a/src/assets/icon-ręczne+SPK.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/assets/icon-ręczne.svg b/src/assets/icon-ręczne.svg deleted file mode 100644 index a3cabed..0000000 --- a/src/assets/icon-ręczne.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/components/JournalView/JournalDispatchers.vue b/src/components/JournalView/JournalDispatchers.vue index 81db17a..defea2a 100644 --- a/src/components/JournalView/JournalDispatchers.vue +++ b/src/components/JournalView/JournalDispatchers.vue @@ -17,7 +17,7 @@
- {{ $t('app.loading') }} + {{ $t('app.loading') }}
@@ -145,7 +145,6 @@ export default defineComponent({ data: () => ({ icons: { - loading: require('@/assets/icon-loading.svg'), arrow: require('@/assets/icon-arrow-asc.svg'), }, @@ -208,13 +207,12 @@ export default defineComponent({ mounted() { const query = this.$route.query; - console.log("Mounted"); - + console.log('Mounted'); if (query.sceneryName || query.dispatcherName) { - this.searchersValues[1].value = query.sceneryName?.toString() || ""; - this.searchersValues[0].value = query.dispatcherName?.toString() || ""; - + this.searchersValues[1].value = query.sceneryName?.toString() || ''; + this.searchersValues[0].value = query.dispatcherName?.toString() || ''; + this.search(); return; @@ -265,7 +263,8 @@ export default defineComponent({ if ( element.getBoundingClientRect().bottom * 0.85 < window.innerHeight && this.scrollDataLoaded && - !this.scrollNoMoreData + !this.scrollNoMoreData && + window.scrollY > window.innerHeight ) this.addHistoryData(); }, diff --git a/src/components/JournalView/JournalTimetables.vue b/src/components/JournalView/JournalTimetables.vue index 0ff9f49..c2a8ede 100644 --- a/src/components/JournalView/JournalTimetables.vue +++ b/src/components/JournalView/JournalTimetables.vue @@ -209,7 +209,6 @@ export default defineComponent({ data: () => ({ icons: { - loading: require('@/assets/icon-loading.svg'), arrow: require('@/assets/icon-arrow-asc.svg'), }, @@ -297,7 +296,8 @@ export default defineComponent({ if ( element.getBoundingClientRect().bottom * 0.85 < window.innerHeight && this.scrollDataLoaded && - !this.scrollNoMoreData + !this.scrollNoMoreData && + window.scrollY > window.innerHeight ) this.addHistoryData(); }, diff --git a/src/components/SceneryView/SceneryInfo/SceneryInfoIcons.vue b/src/components/SceneryView/SceneryInfo/SceneryInfoIcons.vue index ff8c30a..b67ba96 100644 --- a/src/components/SceneryView/SceneryInfo/SceneryInfoIcons.vue +++ b/src/components/SceneryView/SceneryInfo/SceneryInfoIcons.vue @@ -1,43 +1,55 @@