krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' into develop

Browse Source
This commit is contained in:
Sabe Jones
2020-07-28 10:01:31 -05:00
parent 35a6f4cb19 9490159f64
commit 7546733ae9
63 changed files with 5660 additions and 5605 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
website/client/src/components/notifications.vue
View File

@@ -327,6 +327,14 @@ const NOTIFICATIONS = {
achievement: 'bareNecessities', // defined manually until the server sends all the necessary data
},
},
ACHIEVEMENT_FRESHWATER_FRIENDS: {
achievement: true,
label: $t => `${$t('achievement')}: ${$t('achievementFreshwaterFriends')}`,
modalId: 'generic-achievement',
data: {
achievement: 'freshwaterFriends', // defined manually until the server sends all the necessary data
},
},
};
export default {
@@ -386,6 +394,7 @@ export default {
'ACHIEVEMENT_MONSTER_MAGUS', 'ACHIEVEMENT_UNDEAD_UNDERTAKER', 'ACHIEVEMENT_PRIMED_FOR_PAINTING',
'ACHIEVEMENT_PEARLY_PRO', 'ACHIEVEMENT_TICKLED_PINK', 'ACHIEVEMENT_ROSY_OUTLOOK', 'ACHIEVEMENT',
'ONBOARDING_COMPLETE', 'FIRST_DROPS', 'ACHIEVEMENT_BUG_BONANZA', 'ACHIEVEMENT_BARE_NECESSITIES',
'ACHIEVEMENT_FRESHWATER_FRIENDS',
].forEach(type => {
handledNotifications[type] = true;
});
@@ -800,6 +809,7 @@ export default {
case 'ACHIEVEMENT_ROSY_OUTLOOK':
case 'ACHIEVEMENT_BUG_BONANZA':
case 'ACHIEVEMENT_BARE_NECESSITIES':
case 'ACHIEVEMENT_FRESHWATER_FRIENDS':
case 'GENERIC_ACHIEVEMENT':
this.showNotificationWithModal(notification);
break;