From a8bab5283b95d3e9de69e8b720c4f6529b48fc84 Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Sat, 16 Jul 2022 00:56:25 +0200
Subject: [PATCH] Modal aktualizacji aplikacji

---
 src/components/App/UpdateModal.vue | 44 ++++++++++++++++++------------
 src/locales/en.json                |  4 +--
 src/locales/pl.json                |  4 +--
 3 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/src/components/App/UpdateModal.vue b/src/components/App/UpdateModal.vue
index e427bd6..0cac8eb 100644
--- a/src/components/App/UpdateModal.vue
+++ b/src/components/App/UpdateModal.vue
@@ -1,6 +1,6 @@
 <template>
   <transition name="card-anim">
-    <section class="update-modal card" v-if="releaseData && !isUpToDate">
+    <section class="update-modal card" v-if="releaseData && modalOpen">
       <h2 class="modal_header text--primary">
         <img :src="icons.logo" alt="stacjownik logo" />
 
@@ -20,7 +20,7 @@
       </div>
 
       <div class="modal_actions">
-        <button class="btn btn--option" @click="reload">{{ $t('update.refresh-button') }}</button>
+        <button class="btn btn--option" @click="modalOpen = false">{{ $t('update.confirm-button') }}</button>
       </div>
     </section>
   </transition>
@@ -31,6 +31,7 @@ import { ReleaseAPIData } from '@/scripts/interfaces/github_api/ReleaseAPIData';
 import { defineComponent } from '@vue/runtime-core';
 import packageInfo from '../../../package.json';
 import axios from 'axios';
+import StorageManager from '@/scripts/managers/storageManager';
 
 const GH_LASTEST_RELEASE_URL = 'https://api.github.com/repos/Spythere/stacjownik/releases/latest';
 
@@ -41,10 +42,9 @@ export default defineComponent({
 
   data() {
     return {
-      cardOpen: false,
+      modalOpen: false,
 
       releaseData: null as ReleaseAPIData | null,
-      isUpToDate: true,
 
       icons: {
         logo: require('@/assets/stacjownik-header-logo.svg'),
@@ -54,24 +54,32 @@ export default defineComponent({
 
   methods: {
     async fetchReleases() {
-      try {
-        const releaseData: ReleaseAPIData = await (await axios.get(GH_LASTEST_RELEASE_URL)).data;
-        if (!releaseData) return;
+      const storedVersion = StorageManager.getStringValue('appVersion');
+      const appVersion = packageInfo.version;
 
-        const tagVersion = releaseData.tag_name.slice(1);
+      console.log(storedVersion, appVersion);
+      
 
-        setTimeout(() => {
-          this.releaseData = releaseData;
-          this.isUpToDate = packageInfo.version == tagVersion;
-        }, 1500);
-      } catch (error) {
-        console.error(`Wystąpił błąd podczas pobierania danych z API GitHuba: ${error}`);
+      // Zmiana
+      if (appVersion != storedVersion) {
+        StorageManager.setStringValue('appVersion', appVersion);
+
+        // Znajdź changelog na GitHubie, jeśli jest pokaż modal
+        try {
+          const releaseData: ReleaseAPIData = await (await axios.get(GH_LASTEST_RELEASE_URL)).data;
+          if (!releaseData) return;
+
+          const lastReleaseVersion = releaseData.tag_name.slice(1);
+
+          if (lastReleaseVersion == appVersion) {
+            this.releaseData = releaseData;
+            this.modalOpen = true;
+          }
+        } catch (error) {
+          console.error(`Wystąpił błąd podczas pobierania danych z API GitHuba: ${error}`);
+        }
       }
     },
-
-    reload() {
-      window.location.reload();
-    },
   },
 });
 </script>
diff --git a/src/locales/en.json b/src/locales/en.json
index 8c9c122..a435da4 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -12,9 +12,9 @@
   },
   "update": {
       "title": "New Stacjownik version is available!",
-      "paragraph1": "Refresh the page with the button below to apply all changes!",
+      "paragraph1": "Enjoy the application and may the green signal be with you!",
       "release-link": "Click here to browse version changelog (GitHub)",
-      "refresh-button": "Refresh the page" 
+      "confirm-button": "Understood!" 
   },
   "data-status": {
     "S1a-connection": "<b>S1a signal</b> <br> Cannot connect with Stacjownik API service!",
diff --git a/src/locales/pl.json b/src/locales/pl.json
index fd1d290..2cdf2b9 100644
--- a/src/locales/pl.json
+++ b/src/locales/pl.json
@@ -13,9 +13,9 @@
 
   "update": {
     "title": "Nowa wersja Stacjownika jest dostępna!",
-    "paragraph1": "Odśwież stronę, aby zaaplikować zmiany!",
+    "paragraph1": "Miłego korzystania z aplikacji i niech S2 będzie z wami!",
     "release-link": "Kliknij, aby przejrzeć listę zmian (GitHub)",
-    "refresh-button": "Odśwież stronę"
+    "confirm-button": "Przyjąłem!"
   },
 
   "data-status": {