From 5632031f166e6ff6ec453d95f08e75ffbdee99c3 Mon Sep 17 00:00:00 2001
From: negue <eugen.bolz@gmail.com>
Date: Sun, 30 Sep 2018 17:22:44 +0200
Subject: [PATCH] reload page if the user closes the modal or not clicking on
 the notification

---
 .../components/achievements/rebirth.vue       | 37 ++++++++++---------
 website/client/components/notifications.vue   | 13 ++++++-
 website/client/store/actions/user.js          |  2 -
 3 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/website/client/components/achievements/rebirth.vue b/website/client/components/achievements/rebirth.vue
index aeb61ecb33..7f8f07e83e 100644
--- a/website/client/components/achievements/rebirth.vue
+++ b/website/client/components/achievements/rebirth.vue
@@ -1,5 +1,5 @@
 <template lang="pug">
-  b-modal#rebirth(:title="$t('modalAchievement')", size='md', :hide-footer="true")
+  b-modal#rebirth(:title="$t('modalAchievement')", size='md', :hide-footer="true", @hidden="reloadPage()")
     .modal-body
       .col-12
         // @TODO: +achievementAvatar('sun',0)
@@ -24,23 +24,26 @@
 </style>
 
 <script>
-import achievementFooter from './achievementFooter';
-import achievementAvatar from './achievementAvatar';
+  import achievementFooter from './achievementFooter';
+  import achievementAvatar from './achievementAvatar';
 
-import { mapState } from 'client/libs/store';
+  import {mapState} from 'client/libs/store';
 
-export default {
-  components: {
-    achievementFooter,
-    achievementAvatar,
-  },
-  computed: {
-    ...mapState({user: 'user.data'}),
-  },
-  methods: {
-    close () {
-      this.$root.$emit('bv::hide::modal', 'rebirth');
+  export default {
+    components: {
+      achievementFooter,
+      achievementAvatar,
     },
-  },
-};
+    computed: {
+      ...mapState({user: 'user.data'}),
+    },
+    methods: {
+      close () {
+        this.$root.$emit('bv::hide::modal', 'rebirth');
+      },
+      reloadPage () {
+        window.location.reload(true);
+      },
+    },
+  };
 </script>
diff --git a/website/client/components/notifications.vue b/website/client/components/notifications.vue
index c1516a0644..0e0092d363 100644
--- a/website/client/components/notifications.vue
+++ b/website/client/components/notifications.vue
@@ -363,7 +363,18 @@ export default {
         this.playSound(config.sound);
       }
 
-      if (forceToModal) {
+      if (type === 'REBIRTH_ACHIEVEMENT') {
+        // reload if the user hasn't clicked on the notification
+        const timeOut = setTimeout(() => {
+          window.location.reload(true);
+        }, 60000);
+
+        this.text(config.label(this.$t), () => {
+          // prevent the current reload timeout
+          clearTimeout(timeOut);
+          this.$root.$emit('bv::show::modal', config.modalId);
+        }, false);
+      } else if (forceToModal) {
         this.$root.$emit('bv::show::modal', config.modalId);
       } else {
         this.text(config.label(this.$t), () => {
diff --git a/website/client/store/actions/user.js b/website/client/store/actions/user.js
index d87fd8862f..9ae2ef3f3c 100644
--- a/website/client/store/actions/user.js
+++ b/website/client/store/actions/user.js
@@ -139,8 +139,6 @@ export function newStuffLater (store) {
 export async function rebirth () {
   let result = await axios.post('/api/v4/user/rebirth');
 
-  window.location.reload(true);
-
   return result;
 }