diff --git a/package-lock.json b/package-lock.json index 710dbd5..b4c1afd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "stacjownik", - "version": "1.17.1", + "version": "1.18.4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "stacjownik", - "version": "1.17.1", + "version": "1.18.4", "dependencies": { "core-js": "^3.32.2", "dotenv": "^16.3.1", diff --git a/package.json b/package.json index a1b275d..6a7262f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "stacjownik", - "version": "1.18.4", + "version": "1.18.5", "private": true, "scripts": { "dev": "vite", diff --git a/public/images/icon-diamond.svg b/public/images/icon-diamond.svg new file mode 100644 index 0000000..6d11898 --- /dev/null +++ b/public/images/icon-diamond.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/public/images/icon-dolar.svg b/public/images/icon-dolar.svg deleted file mode 100644 index 6a3c591..0000000 --- a/public/images/icon-dolar.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/images/icon-dollar.svg b/public/images/icon-dollar.svg index cdce7d6..6a3c591 100644 --- a/public/images/icon-dollar.svg +++ b/public/images/icon-dollar.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/public/images/main-logo.svg b/public/images/main-logo.svg new file mode 100644 index 0000000..17377a7 --- /dev/null +++ b/public/images/main-logo.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/App.scss b/src/App.scss index f97f853..8acd474 100644 --- a/src/App.scss +++ b/src/App.scss @@ -1,33 +1,7 @@ @import './styles/responsive.scss'; @import './styles/variables.scss'; @import './styles/global.scss'; - -// VUE ROUTE CHANGE ANIMATION -.view-anim { - &-enter-from, - &-leave-to { - opacity: 0.02; - } - - &-enter-active, - &-leave-active { - transition: all $animDuration $animType; - min-height: 100%; - } -} - -.modal-anim { - &-enter-active, - &-leave-active { - transition: all $animDuration $animType; - } - - &-enter-from, - &-leave-to { - transform: translateY(-25%); - opacity: 0; - } -} +@import './styles/animations.scss'; .route { margin: 0 0.2em; @@ -56,8 +30,6 @@ // CONTAINER .app_container { - // display: flex; - // flex-flow: column; display: grid; grid-template-rows: auto 1fr auto; grid-template-columns: 100%; diff --git a/src/components/Global/AnimatedModal.vue b/src/components/Global/AnimatedModal.vue new file mode 100644 index 0000000..49ca979 --- /dev/null +++ b/src/components/Global/AnimatedModal.vue @@ -0,0 +1,101 @@ + + + + + diff --git a/src/components/Global/Donation.vue b/src/components/Global/Donation.vue new file mode 100644 index 0000000..90d3317 --- /dev/null +++ b/src/components/Global/Donation.vue @@ -0,0 +1,184 @@ + + + + + diff --git a/src/components/Global/TrainModal.vue b/src/components/Global/TrainModal.vue index 3ae2871..d05857a 100644 --- a/src/components/Global/TrainModal.vue +++ b/src/components/Global/TrainModal.vue @@ -35,17 +35,6 @@ export default defineComponent({ this.$nextTick(() => { contentEl.focus(); }); - }, - - methods: { - handleContentScroll(e: Event) { - const trainInfoCompHeight: number = ( - this.$refs['trainInfo'] as any - ).$el.getBoundingClientRect().height; - - const posTop = (e.target as HTMLElement).scrollTop; - this.isTopBarVisible = posTop > trainInfoCompHeight; - } } }); diff --git a/src/components/JournalView/JournalDispatchersList.vue b/src/components/JournalView/JournalDispatchersList.vue index 894d7ae..2051229 100644 --- a/src/components/JournalView/JournalDispatchersList.vue +++ b/src/components/JournalView/JournalDispatchersList.vue @@ -235,10 +235,6 @@ table.scenery-history-table { margin: 0 auto; } } - - @media screen and (max-width: 550px) { - font-size: 0.9em; - } } .text { diff --git a/src/components/SceneryView/SceneryTimetable.vue b/src/components/SceneryView/SceneryTimetable.vue index b6d97d5..1c05dd1 100644 --- a/src/components/SceneryView/SceneryTimetable.vue +++ b/src/components/SceneryView/SceneryTimetable.vue @@ -85,9 +85,11 @@ {{ scheduledTrain.category }} {{ scheduledTrain.trainNo }} - + -  |  diff --git a/src/components/StationsView/StationFilterCard.vue b/src/components/StationsView/StationFilterCard.vue index 50dc1ef..260119a 100644 --- a/src/components/StationsView/StationFilterCard.vue +++ b/src/components/StationsView/StationFilterCard.vue @@ -295,19 +295,7 @@ export default defineComponent({