From 4c1fcf710b749198590f5007e5a33c0eaaf74057 Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Thu, 23 May 2024 15:01:30 +0200
Subject: [PATCH] refactor: global modals to cards

---
 src/App.vue                                   | 16 ++--
 .../App/{UpdateModal.vue => UpdateCard.vue}   | 33 ++++---
 .../Global/{AnimatedModal.vue => Card.vue}    | 25 +++---
 .../{DonationModal.vue => DonationCard.vue}   | 89 +++++++++----------
 src/components/StationsView/StationTable.vue  |  8 +-
 src/components/TrainsView/TrainModal.vue      | 14 ---
 src/views/StationsView.vue                    | 18 ++--
 7 files changed, 94 insertions(+), 109 deletions(-)
 rename src/components/App/{UpdateModal.vue => UpdateCard.vue} (78%)
 rename src/components/Global/{AnimatedModal.vue => Card.vue} (74%)
 rename src/components/Global/{DonationModal.vue => DonationCard.vue} (80%)

diff --git a/src/App.vue b/src/App.vue
index cd5efe9..a2c9683 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="app_container">
-    <UpdateModal
-      :update-modal-open="isUpdateModalOpen"
-      @toggle-modal="() => (isUpdateModalOpen = false)"
+    <UpdateCard
+      :is-update-card-open="isUpdateCardOpen"
+      @toggle-card="() => (isUpdateCardOpen = false)"
     />
 
     <Tooltip />
@@ -27,7 +27,7 @@
       &copy;
       <a href="https://td2.info.pl/profile/?u=20777" target="_blank">Spythere</a>
       {{ new Date().getUTCFullYear() }} |
-      <button class="btn--text" @click="() => (isUpdateModalOpen = true)">
+      <button class="btn--text" @click="() => (isUpdateCardOpen = true)">
         v{{ VERSION }}{{ isOnProductionHost ? '' : 'dev' }}
       </button>
 
@@ -56,7 +56,7 @@ import StatusIndicator from './components/App/StatusIndicator.vue';
 import AppHeader from './components/App/AppHeader.vue';
 import TrainModal from './components/TrainsView/TrainModal.vue';
 import Tooltip from './components/Tooltip/Tooltip.vue';
-import UpdateModal from './components/App/UpdateModal.vue';
+import UpdateCard from './components/App/UpdateCard.vue';
 
 import StorageManager from './managers/storageManager';
 
@@ -68,7 +68,7 @@ export default defineComponent({
     StatusIndicator,
     AppHeader,
     TrainModal,
-    UpdateModal,
+    UpdateCard,
     Tooltip
   },
 
@@ -78,7 +78,7 @@ export default defineComponent({
     apiStore: useApiStore(),
     tooltipStore: useTooltipStore(),
 
-    isUpdateModalOpen: false,
+    isUpdateCardOpen: false,
 
     currentLang: 'pl',
     isOnProductionHost: location.hostname == 'stacjownik-td2.web.app',
@@ -130,7 +130,7 @@ export default defineComponent({
           releaseURL: releaseData.html_url
         };
 
-        this.isUpdateModalOpen =
+        this.isUpdateCardOpen =
           storageVersion != version || import.meta.env.VITE_UPDATE_TEST === 'test';
       } catch (error) {
         console.error(`Wystąpił błąd podczas pobierania danych z API GitHuba: ${error}`);
diff --git a/src/components/App/UpdateModal.vue b/src/components/App/UpdateCard.vue
similarity index 78%
rename from src/components/App/UpdateModal.vue
rename to src/components/App/UpdateCard.vue
index 23d5124..37f1207 100644
--- a/src/components/App/UpdateModal.vue
+++ b/src/components/App/UpdateCard.vue
@@ -1,12 +1,12 @@
 <template>
-  <AnimatedModal :is-open="updateModalOpen" @toggle-modal="toggleModal(false)">
-    <div class="modal-content">
+  <Card :is-open="isUpdateCardOpen" @toggle-card="toggleCard(false)">
+    <div class="content">
       <h1 style="margin-bottom: 0.5em">🚀 {{ $t('update.title') }}</h1>
 
       <div class="features-body" v-if="htmlChangelog != ''" v-html="htmlChangelog"></div>
       <div class="no-features" v-else>{{ $t('update.no-data') }}</div>
 
-      <button class="btn btn--action" ref="confirm-btn" @click="toggleModal(false)">
+      <button class="btn btn--action" ref="confirm-btn" @click="toggleCard(false)">
         {{ $t('update.confirm') }}
       </button>
 
@@ -16,7 +16,7 @@
         <span v-html="$t('update.info-2')"></span>
       </p>
     </div>
-  </AnimatedModal>
+  </Card>
 </template>
 
 <script lang="ts">
@@ -25,21 +25,21 @@ import { useMainStore } from '../../store/mainStore';
 import { version } from '../../../package.json';
 import { Converter } from 'showdown';
 
-import AnimatedModal from '../Global/AnimatedModal.vue';
+import Card from '../Global/Card.vue';
 
 const converter = new Converter();
 
 export default defineComponent({
-  components: { AnimatedModal },
+  components: { Card },
 
   props: {
-    updateModalOpen: {
+    isUpdateCardOpen: {
       type: Boolean,
       required: true
     }
   },
 
-  emits: ['toggleModal'],
+  emits: ['toggleCard'],
 
   data() {
     return {
@@ -49,7 +49,7 @@ export default defineComponent({
   },
 
   watch: {
-    updateModalOpen(val: boolean) {
+    isUpdateCardOpen(val: boolean) {
       this.$nextTick(() => {
         if (val) (this.$refs['confirm-btn'] as HTMLElement).focus();
       });
@@ -65,29 +65,33 @@ export default defineComponent({
   },
 
   methods: {
-    toggleModal(value: boolean) {
-      this.$emit('toggleModal', value);
+    toggleCard(value: boolean) {
+      this.$emit('toggleCard', value);
     }
   }
 });
 </script>
 
 <style lang="scss" scoped>
+@import '../../styles/variables';
+
 ::v-deep(h1) {
   text-align: center;
+  color: $accentCol;
 }
 
 ::v-deep(h2) {
   padding: 0.25em 0;
+  border-bottom: 1px solid #aaa;
 }
 
 ::v-deep(ul) {
-  list-style: inside;
-  padding: 0.5em;
+  list-style: initial;
+  padding: 1em;
   line-height: 1.5em;
 }
 
-.modal-content {
+.content {
   display: grid;
   grid-template-rows: auto 1fr auto;
   gap: 0.5em;
@@ -95,6 +99,7 @@ export default defineComponent({
   min-height: 700px;
   overflow: auto;
   text-align: justify;
+  max-width: 700px;
 }
 
 .no-features {
diff --git a/src/components/Global/AnimatedModal.vue b/src/components/Global/Card.vue
similarity index 74%
rename from src/components/Global/AnimatedModal.vue
rename to src/components/Global/Card.vue
index af32698..06e9eed 100644
--- a/src/components/Global/AnimatedModal.vue
+++ b/src/components/Global/Card.vue
@@ -1,11 +1,11 @@
 <template>
   <transition name="modal-anim" tag="div">
-    <div class="modal" v-if="isOpen">
-      <div class="modal-background" @click="toggleModal(false)"></div>
-      <div class="modal-wrapper" ref="wrapper" tabindex="0">
+    <div class="card" v-if="isOpen">
+      <div class="card-background" @click="toggleCard(false)"></div>
+      <div class="card-body" ref="wrapper" tabindex="0">
         <slot></slot>
       </div>
-      <div class="tab-exit" ref="exit" tabindex="0" @focus="toggleModal(false)"></div>
+      <div class="tab-exit" ref="exit" tabindex="0" @focus="toggleCard(false)"></div>
     </div>
   </transition>
 </template>
@@ -15,7 +15,7 @@ import { defineComponent } from 'vue';
 import { useMainStore } from '../../store/mainStore';
 
 export default defineComponent({
-  emits: ['toggleModal'],
+  emits: ['toggleCard'],
 
   props: {
     isOpen: Boolean
@@ -36,8 +36,8 @@ export default defineComponent({
   },
 
   methods: {
-    toggleModal(value: boolean) {
-      this.$emit('toggleModal', value);
+    toggleCard(value: boolean) {
+      this.$emit('toggleCard', value);
     }
   }
 });
@@ -46,7 +46,7 @@ export default defineComponent({
 <style lang="scss" scoped>
 @import '../../styles/responsive.scss';
 
-.modal {
+.card {
   position: fixed;
   top: 0;
   left: 0;
@@ -56,7 +56,7 @@ export default defineComponent({
   z-index: 200;
 }
 
-.modal-background {
+.card-background {
   position: absolute;
   top: 0;
   left: 0;
@@ -68,7 +68,7 @@ export default defineComponent({
   background-color: rgba(0, 0, 0, 0.55);
 }
 
-.modal-wrapper {
+.card-body {
   position: absolute;
   top: 50%;
   left: 50%;
@@ -77,12 +77,11 @@ export default defineComponent({
   overflow: auto;
   max-height: 95vh;
 
+  box-shadow: 0 0 15px 10px #0e0e0e;
+
   & > :slotted(div) {
     background-color: #1a1a1a;
-    box-shadow: 0 0 15px 10px #0e0e0e;
-
     width: 95vw;
-    max-width: 850px;
   }
 }
 </style>
diff --git a/src/components/Global/DonationModal.vue b/src/components/Global/DonationCard.vue
similarity index 80%
rename from src/components/Global/DonationModal.vue
rename to src/components/Global/DonationCard.vue
index f2b90b0..a1d0fc4 100644
--- a/src/components/Global/DonationModal.vue
+++ b/src/components/Global/DonationCard.vue
@@ -1,12 +1,7 @@
 <template>
-  <AnimatedModal
-    class="donation-modal"
-    :isOpen="isModalOpen"
-    @toggleModal="toggleModal"
-    @keydown.esc="toggleModal(false)"
-  >
-    <div class="modal_content">
-      <div class="modal_main">
+  <Card :isOpen="isCardOpen" @toggleCard="toggleCard" @keydown.esc="toggleCard(false)">
+    <div class="body">
+      <div class="content">
         <h1 v-html="$t('donations.header')"></h1>
         <div class="donators-slider" v-if="donatorList.length != 0">
           <span v-html="$t('donations.donator-title', { count: donatorList.length })"></span>
@@ -61,9 +56,9 @@
         </i>
       </div>
 
-      <div class="modal_actions">
+      <div class="actions">
         <a
-          class="modal-action a-button btn--image coffee"
+          class="action a-button btn--image coffee"
           href="https://buycoffee.to/spythere"
           target="_blank"
           ref="action"
@@ -73,7 +68,7 @@
         </a>
 
         <a
-          class="modal-action a-button btn--image paypal"
+          class="action a-button btn--image paypal"
           href="https://www.paypal.com/donate/?hosted_button_id=EDB3SKFAHXFTW"
           target="_blank"
         >
@@ -81,30 +76,30 @@
           {{ $t('donations.action-paypal') }}
         </a>
 
-        <button class="modal-action btn--image exit" @click="toggleModal(false)">
+        <button class="action btn--image exit" @click="toggleCard(false)">
           <img src="/images/icon-exit.svg" alt="dollar donation icon" />
           {{ $t('donations.action-exit') }}
         </button>
       </div>
     </div>
-  </AnimatedModal>
+  </Card>
 </template>
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import AnimatedModal from './AnimatedModal.vue';
 import { useApiStore } from '../../store/apiStore';
+import Card from './Card.vue';
 
 export default defineComponent({
-  components: { AnimatedModal },
+  components: { Card },
   props: {
-    isModalOpen: Boolean
+    isCardOpen: Boolean
   },
 
-  emits: ['toggleModal'],
+  emits: ['toggleCard'],
 
   watch: {
-    isModalOpen(val: boolean) {
+    isCardOpen(val: boolean) {
       this.running = val;
       this.lastUpdate = Date.now();
 
@@ -138,8 +133,8 @@ export default defineComponent({
   },
 
   methods: {
-    toggleModal(value: boolean) {
-      this.$emit('toggleModal', value);
+    toggleCard(value: boolean) {
+      this.$emit('toggleCard', value);
     },
 
     runUpdate() {
@@ -157,53 +152,53 @@ export default defineComponent({
 <style lang="scss" scoped>
 @import '../../styles/responsive.scss';
 
-.modal_content {
+.body {
   display: grid;
   grid-template-rows: 1fr auto;
   gap: 1em;
 
   font-size: 1.1em;
 
-  & > div {
-    padding: 1em;
-  }
-
-  h1 {
-    font-size: 1.95em;
-    text-align: center;
-  }
-
-  p {
-    text-align: justify;
-  }
-
-  a.discord {
-    text-decoration: underline;
-  }
+  max-width: 820px;
 }
 
-.modal_main {
+.content {
   overflow: auto;
   overflow-x: hidden;
-
-  img {
-    max-height: 20px;
-    margin-right: 5px;
-    vertical-align: text-bottom;
-  }
+  padding: 1em;
 }
 
-.modal_actions {
+img {
+  max-height: 20px;
+  margin-right: 5px;
+  vertical-align: text-bottom;
+}
+
+h1 {
+  font-size: 1.95em;
+  text-align: center;
+}
+
+p {
+  text-align: justify;
+}
+
+a.discord {
+  text-decoration: underline;
+}
+
+.actions {
   display: grid;
-  grid-template-columns: repeat(auto-fit, minmax(220px, 1fr));
+  grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
   gap: 0.5em;
+  padding: 1em;
 
   form button {
     width: 100%;
   }
 }
 
-.modal_actions > .modal-action {
+.actions > .action {
   &.paypal {
     $btnColor: #254069;
 
diff --git a/src/components/StationsView/StationTable.vue b/src/components/StationsView/StationTable.vue
index 8f328da..b06478e 100644
--- a/src/components/StationsView/StationTable.vue
+++ b/src/components/StationsView/StationTable.vue
@@ -122,7 +122,7 @@
               <span v-if="station.onlineInfo?.dispatcherName">
                 <b
                   v-if="apiStore.donatorsData.includes(station.onlineInfo.dispatcherName)"
-                  @click.stop="openDonationModal"
+                  @click.stop="openDonationCard"
                   data-tooltip-type="DonatorTooltip"
                   :data-tooltip-content="$t('donations.dispatcher-message')"
                 >
@@ -329,7 +329,7 @@ import { ActiveSorter, HeadIdsType, headIconsIds, headIds } from './typings';
 import { filterStations, sortStations } from './utils';
 
 export default defineComponent({
-  emits: ['toggleDonationModal'],
+  emits: ['toggleDonationCard'],
 
   components: { Loading, StationStatusBadge },
   mixins: [styleMixin, dateMixin],
@@ -384,8 +384,8 @@ export default defineComponent({
       });
     },
 
-    openDonationModal(e: Event) {
-      this.$emit('toggleDonationModal', true);
+    openDonationCard(e: Event) {
+      this.$emit('toggleDonationCard', true);
       this.mainStore.modalLastClickedTarget = e.target;
       this.tooltipStore.hide();
     },
diff --git a/src/components/TrainsView/TrainModal.vue b/src/components/TrainsView/TrainModal.vue
index 40ccc4c..f5d1570 100644
--- a/src/components/TrainsView/TrainModal.vue
+++ b/src/components/TrainsView/TrainModal.vue
@@ -40,20 +40,6 @@ export default defineComponent({
 
 <style lang="scss" scoped>
 @import '../../styles/responsive.scss';
-@import '../../styles/card.scss';
-
-.top-info-bar-anim {
-  &-enter-active,
-  &-leave-active {
-    transition: all 150ms ease-in-out;
-  }
-
-  &-enter-from,
-  &-leave-to {
-    transform: translate(-50%, -50%) scale(0.8);
-    opacity: 0;
-  }
-}
 
 .train-modal {
   position: fixed;
diff --git a/src/views/StationsView.vue b/src/views/StationsView.vue
index eb7e876..ff97c5a 100644
--- a/src/views/StationsView.vue
+++ b/src/views/StationsView.vue
@@ -11,16 +11,16 @@
         <button
           class="btn-donation btn--image"
           ref="btn"
-          @click="isDonationModalOpen = true"
-          @focus="isDonationModalOpen = false"
+          @click="isDonationCardOpen = true"
+          @focus="isDonationCardOpen = false"
         >
           <img src="/images/icon-dollar.svg" alt="dollar donation icon" />
           <span>{{ $t('donations.button-title') }}</span>
         </button>
       </div>
 
-      <DonationModal :isModalOpen="isDonationModalOpen" @toggleModal="toggleDonationModal" />
-      <StationTable @toggleDonationModal="toggleDonationModal" />
+      <DonationCard :is-card-open="isDonationCardOpen" @toggle-card="toggleDonationCard" />
+      <StationTable @toggle-donation-card="toggleDonationCard" />
       <StationStats />
     </div>
   </section>
@@ -31,7 +31,7 @@ import { defineComponent } from 'vue';
 import StationTable from '../components/StationsView/StationTable.vue';
 import StationFilterCard from '../components/StationsView/StationFilterCard.vue';
 import { useMainStore } from '../store/mainStore';
-import DonationModal from '../components/Global/DonationModal.vue';
+import DonationCard from '../components/Global/DonationCard.vue';
 import StationStats from '../components/StationsView/StationStats.vue';
 import { initFilters, setupFilters } from '../managers/stationFilterManager';
 import { reactive } from 'vue';
@@ -46,12 +46,12 @@ export default defineComponent({
     StationTable,
     StationFilterCard,
     StationStats,
-    DonationModal
+    DonationCard
   },
 
   data: () => ({
     filterCardOpen: false,
-    isDonationModalOpen: false,
+    isDonationCardOpen: false,
 
     mainStore: useMainStore()
   }),
@@ -69,8 +69,8 @@ export default defineComponent({
   },
 
   methods: {
-    toggleDonationModal(value: boolean) {
-      this.isDonationModalOpen = value;
+    toggleDonationCard(value: boolean) {
+      this.isDonationCardOpen = value;
     }
   }
 });