Reload after rebirth (#11125)

* Add restart after rebirth Page will be reloaded after purchasing "Orb of Rebirth" * Remove restart after closing achievement This reload is not needed, as the page now reloads immediately after purchasing "Orb of Rebirth" * Move rebirth notification to modal * Delete references to rebirth notification
HabitRPG · Apr 27, 2019 · 5a15c73 · 5a15c73
1 parent 3f99c14
commit 5a15c73
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 22 deletions.
diff --git 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", @hidden="reloadPage()")
+  b-modal#rebirth(:title="$t('modalAchievement')", size='md', :hide-footer="true")
     .modal-body
       .col-12
         // @TODO: +achievementAvatar('sun',0)
@@ -41,9 +41,6 @@
       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
@@ -132,11 +132,6 @@ const NOTIFICATIONS = {
     label: ($t) => `${$t('achievement')}: ${$t('gearAchievementNotification')}`,
     modalId: 'ultimate-gear',
   },
-  REBIRTH_ACHIEVEMENT: {
-    label: ($t) => `${$t('achievement')}: ${$t('rebirthBegan')}`,
-    achievement: true,
-    modalId: 'rebirth',
-  },
   GUILD_JOINED_ACHIEVEMENT: {
     label: ($t) => `${$t('achievement')}: ${$t('joinedGuild')}`,
     achievement: true,
@@ -360,18 +355,7 @@ export default {
         this.playSound(config.sound);
       }
 
-      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) {
+      if (forceToModal) {
         this.$root.$emit('bv::show::modal', config.modalId);
       } else {
         this.text(config.label(this.$t), () => {
@@ -573,8 +557,11 @@ export default {
             }, this.user.preferences.suppressModals.streak);
             this.playSound('Achievement_Unlocked');
             break;
-          case 'ULTIMATE_GEAR_ACHIEVEMENT':
           case 'REBIRTH_ACHIEVEMENT':
+            this.playSound('Achievement_Unlocked');
+            this.$root.$emit('bv::show::modal', 'rebirth');
+            break;
+          case 'ULTIMATE_GEAR_ACHIEVEMENT':
           case 'GUILD_JOINED_ACHIEVEMENT':
           case 'CHALLENGE_JOINED_ACHIEVEMENT':
           case 'INVITED_FRIEND_ACHIEVEMENT':

diff --git a/website/client/components/shops/buyModal.vue b/website/client/components/shops/buyModal.vue
@@ -397,6 +397,10 @@
 
         this.$emit('buyPressed', this.item);
         this.hideDialog();
+
+        if (this.item.key === 'rebirth_orb') {
+          window.location.reload(true);
+        }
       },
       purchaseGems () {
         if (this.item.key === 'rebirth_orb') {