mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-17 14:47:53 +01:00
* Change update username API call
The call no longer requires a password and also validates the username.
* Implement API call to verify username without setting it
* Improve coding style
* Apply username verification to registration
* Update error messages
* Validate display names.
* Fix API early Stat Point allocation (#10680)
* Refactor hasClass check to common so it can be used in shared & server-side code
* Check that user has selected class before allocating stat points
* chore(event): end Ember Hatching Potions
* chore(analytics): reenable navigation tracking
* update bcrypt
* Point achievement modal links to main site (#10709)
* Animal ears after death (#10691)
* Animal Ears purchasable with Gold if lost in Death
* remove ears from pinned items when set is bought
* standardise css and error handling for gems and coins
* revert accidental new line
* fix client tests
* Reduce margin-bottom of checklist-item from 10px to -3px. (#10684)
* chore(i18n): update locales
* 4.61.1
* feat(content): Subscriber Items and Magic Potions
* chore(sprites): compile
* chore(i18n): update locales
* 4.62.0
* Display notification for users to confirm their username
* fix typo
* WIP(usernames): Changes to address #10694
* WIP(usernames): Further changes for #10694
* fix(usernames): don't show spurious headings
* Change verify username notification to new version
* Improve feedback for invalid usernames
* Allow user to set their username again to confirm it
* Improve validation display for usernames
* Temporarily move display name validation outside of schema
* Improve rendering banner about sleeping in the inn
See #10695
* Display settings in one column
* Position inn banner when window is resized
* Update inn banner handling
* Fix banner offset on initial load
* Fix minor issues.
* Issue: 10660 - Fixed. Changed default to Please Enter A Value (#10718)
* Issue: 10660 - Fixed. Changed default to Please Enter A Value
* Issue: 10660 - Fixed/revision 2 Changed default to Enter A Value
* chore(news): Bailey announcements
* chore(i18n): update locales
* 4.62.1
* adjust wiki link for usernameInfo string
https://github.com/HabitRPG/habitica-private/issues/7#issuecomment-425405425
* raise coverage for tasks api calls (#10029)
* - updates a group task - approval is required
- updates a group task with checklist
* add expect to test the new checklist length
* - moves tasks to a specified position out of length
* remove unused line
* website getter tasks tests
* re-add sanitizeUserChallengeTask
* change config.json.example variable to be a string not a boolean
* fix tests - pick the text / up/down props too
* fix test - remove changes on text/up/down - revert sanitize condition - revert sanitization props
* Change update username API call
The call no longer requires a password and also validates the username.
* feat(content): Subscriber Items and Magic Potions
* Re-add register call
* Fix merge issue
* Fix issue with setting username
* Implement new alert style
* Display username confirmation status in settings
* Add disclaimer to change username field
* validate username in settings
* Allow specific fields to be focused when opening site settings
* Implement requested changes.
* Fix merge issue
* Fix failing tests
* verify username when users register with username and password
* Set ID for change username notification
* Disable submit button if username is invalid
* Improve username confirmation handling
* refactor(settings): address remaining code comments on auth form
* Revert "refactor(settings): address remaining code comments on auth form"
This reverts commit 9b6609ad64.
* Social user username (#10620)
* Refactored private functions to library
* Refactored social login code
* Added username to social registration
* Changed id library
* Added new local auth check
* Fixed export error. Fixed password check error
* fix(settings): password not available on client
* refactor(settings): more sensible placement of methods
* chore(migration): script to hand out procgen usernames
* fix(migration): don't give EVERYONE new names you doofus
* fix(migration): limit data retrieved, be extra careful about updates
* fix(migration): use missing field, not migration tag, for query
* fix(migration): unused var
* fix(usernames): only generate 20 characters
* fix(migration): set lowerCaseUsername
274 lines
9.1 KiB
Vue
274 lines
9.1 KiB
Vue
<template lang="pug">
|
|
menu-dropdown.item-notifications(:right="true", @toggled="handleOpenStatusChange", :openStatus="openStatus")
|
|
div(slot="dropdown-toggle")
|
|
div(v-b-tooltip.hover.bottom="$t('notifications')")
|
|
message-count(
|
|
v-if='notificationsCount > 0',
|
|
:count="notificationsCount",
|
|
:top="true",
|
|
:gray="!hasUnseenNotifications",
|
|
)
|
|
.top-menu-icon.svg-icon.notifications(v-html="icons.notifications")
|
|
div(slot="dropdown-content")
|
|
.dropdown-item.dropdown-separated.d-flex.justify-content-between.dropdown-inactive.align-items-center(
|
|
@click.stop=""
|
|
)
|
|
h4.dropdown-title(v-once) {{ $t('notifications') }}
|
|
a.small-link.standard-link(@click="dismissAll", :disabled="notificationsCount === 0") {{ $t('dismissAll') }}
|
|
world-boss
|
|
component(
|
|
:is="notification.type",
|
|
:key="notification.id",
|
|
v-for="notification in notifications",
|
|
:notification="notification",
|
|
:can-remove="!isActionable(notification)",
|
|
)
|
|
.dropdown-item.dropdown-separated.d-flex.justify-content-center.dropdown-inactive.no-notifications.flex-column(
|
|
v-if="notificationsCount === 0"
|
|
)
|
|
.svg-icon(v-html="icons.success")
|
|
h2 {{ $t('noNotifications') }}
|
|
p {{ $t('noNotificationsText') }}
|
|
</template>
|
|
|
|
<style lang='scss' scoped>
|
|
@import '~client/assets/scss/colors.scss';
|
|
|
|
.dropdown-item {
|
|
padding: 16px 24px;
|
|
width: 378px;
|
|
}
|
|
|
|
.dropdown-title {
|
|
margin-bottom: 0px;
|
|
margin-right: 8px;
|
|
line-height: 1.5;
|
|
}
|
|
|
|
.no-notifications {
|
|
h2, p {
|
|
text-align: center;
|
|
color: $gray-200 !important;
|
|
}
|
|
|
|
h2 {
|
|
margin-top: 24px;
|
|
}
|
|
|
|
p {
|
|
white-space: normal;
|
|
margin-bottom: 43px;
|
|
margin-left: 24px;
|
|
margin-right: 24px;
|
|
}
|
|
|
|
.svg-icon {
|
|
margin: 0 auto;
|
|
width: 256px;
|
|
height: 104px;
|
|
}
|
|
}
|
|
</style>
|
|
|
|
<script>
|
|
import { mapState, mapActions } from 'client/libs/store';
|
|
import quests from 'common/script/content/quests';
|
|
import notificationsIcon from 'assets/svg/notifications.svg';
|
|
import MenuDropdown from '../ui/customMenuDropdown';
|
|
import MessageCount from './messageCount';
|
|
import successImage from 'assets/svg/success.svg';
|
|
|
|
// Notifications
|
|
import NEW_STUFF from './notifications/newStuff';
|
|
import GROUP_TASK_NEEDS_WORK from './notifications/groupTaskNeedsWork';
|
|
import GUILD_INVITATION from './notifications/guildInvitation';
|
|
import PARTY_INVITATION from './notifications/partyInvitation';
|
|
import CHALLENGE_INVITATION from './notifications/challengeInvitation';
|
|
import QUEST_INVITATION from './notifications/questInvitation';
|
|
import GROUP_TASK_APPROVAL from './notifications/groupTaskApproval';
|
|
import GROUP_TASK_APPROVED from './notifications/groupTaskApproved';
|
|
import UNALLOCATED_STATS_POINTS from './notifications/unallocatedStatsPoints';
|
|
import NEW_MYSTERY_ITEMS from './notifications/newMysteryItems';
|
|
import CARD_RECEIVED from './notifications/cardReceived';
|
|
import NEW_INBOX_MESSAGE from './notifications/newInboxMessage';
|
|
import NEW_CHAT_MESSAGE from './notifications/newChatMessage';
|
|
import WORLD_BOSS from './notifications/worldBoss';
|
|
import VERIFY_USERNAME from './notifications/verifyUsername';
|
|
|
|
export default {
|
|
components: {
|
|
MenuDropdown,
|
|
MessageCount,
|
|
// One component for each type
|
|
NEW_STUFF, GROUP_TASK_NEEDS_WORK,
|
|
GUILD_INVITATION, PARTY_INVITATION, CHALLENGE_INVITATION,
|
|
QUEST_INVITATION, GROUP_TASK_APPROVAL, GROUP_TASK_APPROVED,
|
|
UNALLOCATED_STATS_POINTS, NEW_MYSTERY_ITEMS, CARD_RECEIVED,
|
|
NEW_INBOX_MESSAGE, NEW_CHAT_MESSAGE,
|
|
WorldBoss: WORLD_BOSS,
|
|
VERIFY_USERNAME,
|
|
},
|
|
data () {
|
|
return {
|
|
icons: Object.freeze({
|
|
notifications: notificationsIcon,
|
|
success: successImage,
|
|
}),
|
|
quests,
|
|
openStatus: undefined,
|
|
actionableNotifications: [
|
|
'GUILD_INVITATION', 'PARTY_INVITATION', 'CHALLENGE_INVITATION',
|
|
'QUEST_INVITATION', 'GROUP_TASK_NEEDS_WORK',
|
|
],
|
|
// A list of notifications handled by this component,
|
|
// listed in the order they should appear in the notifications panel.
|
|
// NOTE: Those not listed here won't be shown in the notification panel!
|
|
handledNotifications: [
|
|
'NEW_STUFF', 'GROUP_TASK_NEEDS_WORK',
|
|
'GUILD_INVITATION', 'PARTY_INVITATION', 'CHALLENGE_INVITATION',
|
|
'QUEST_INVITATION', 'GROUP_TASK_APPROVAL', 'GROUP_TASK_APPROVED',
|
|
'NEW_MYSTERY_ITEMS', 'CARD_RECEIVED',
|
|
'NEW_INBOX_MESSAGE', 'NEW_CHAT_MESSAGE', 'UNALLOCATED_STATS_POINTS',
|
|
'VERIFY_USERNAME',
|
|
],
|
|
};
|
|
},
|
|
computed: {
|
|
...mapState({user: 'user.data'}),
|
|
notificationsOrder () {
|
|
// Returns a map of NOTIFICATION_TYPE -> POSITION
|
|
const orderMap = {};
|
|
|
|
this.handledNotifications.forEach((type, index) => {
|
|
orderMap[type] = index;
|
|
});
|
|
|
|
return orderMap;
|
|
},
|
|
notifications () {
|
|
// Convert the notifications not stored in user.notifications
|
|
const notifications = [];
|
|
|
|
// Parties invitations
|
|
notifications.push(...this.user.invitations.parties.map(partyInvitation => {
|
|
return {
|
|
type: 'PARTY_INVITATION',
|
|
data: partyInvitation,
|
|
// Create a custom id for notifications outside user.notifications (must be unique)
|
|
id: `custom-party-invitation-${partyInvitation.id}`,
|
|
};
|
|
}));
|
|
|
|
// Guilds invitations
|
|
notifications.push(...this.user.invitations.guilds.map(guildInvitation => {
|
|
return {
|
|
type: 'GUILD_INVITATION',
|
|
data: guildInvitation,
|
|
// Create a custom id for notifications outside user.notifications (must be unique)
|
|
id: `custom-guild-invitation-${guildInvitation.id}`,
|
|
};
|
|
}));
|
|
|
|
// Quest invitation
|
|
if (this.user.party.quest.RSVPNeeded === true) {
|
|
notifications.push({
|
|
type: 'QUEST_INVITATION',
|
|
data: {
|
|
quest: this.user.party.quest.key,
|
|
partyId: this.user.party._id,
|
|
},
|
|
// Create a custom id for notifications outside user.notifications (must be unique)
|
|
id: `custom-quest-invitation-${this.user.party._id}`,
|
|
});
|
|
}
|
|
|
|
if (this.user.flags.verifiedUsername !== true) {
|
|
notifications.push({
|
|
type: 'VERIFY_USERNAME',
|
|
data: {
|
|
username: this.user.auth.local.username,
|
|
},
|
|
id: 'custom-change-username',
|
|
});
|
|
}
|
|
|
|
const orderMap = this.notificationsOrder;
|
|
|
|
// Push the notifications stored in user.notifications
|
|
// skipping those not defined in the handledNotifications object
|
|
notifications.push(...this.user.notifications.filter(notification => {
|
|
if (notification.type === 'UNALLOCATED_STATS_POINTS') {
|
|
if (!this.hasClass) return false;
|
|
}
|
|
|
|
return orderMap[notification.type] !== undefined;
|
|
}));
|
|
|
|
// Sort notifications
|
|
notifications.sort((a, b) => { // a and b are notifications
|
|
const aOrder = orderMap[a.type];
|
|
const bOrder = orderMap[b.type];
|
|
|
|
if (aOrder === bOrder) return 0; // Same position
|
|
if (aOrder > bOrder) return 1; // b is higher
|
|
if (aOrder < bOrder) return -1; // a is higher
|
|
});
|
|
|
|
return notifications;
|
|
},
|
|
// The total number of notification, shown inside the dropdown
|
|
notificationsCount () {
|
|
return this.notifications.length;
|
|
},
|
|
hasUnseenNotifications () {
|
|
return this.notifications.some((notification) => {
|
|
return notification.seen === false ? true : false;
|
|
});
|
|
},
|
|
hasClass () {
|
|
return this.$store.getters['members:hasClass'](this.user);
|
|
},
|
|
},
|
|
methods: {
|
|
...mapActions({
|
|
readNotifications: 'notifications:readNotifications',
|
|
seeNotifications: 'notifications:seeNotifications',
|
|
}),
|
|
handleOpenStatusChange (openStatus) {
|
|
this.openStatus = openStatus === true ? 1 : 0;
|
|
|
|
// Mark notifications as seen when the menu is opened
|
|
if (openStatus) this.markAllAsSeen();
|
|
},
|
|
markAllAsSeen () {
|
|
const idsToSee = this.notifications.map(notification => {
|
|
// We check explicitly for notification.id not starting with `custom-` because some
|
|
// notification don't follow the standard
|
|
// (all those not stored in user.notifications)
|
|
if (notification.seen === false && notification.id && notification.id.indexOf('custom-') !== 0) {
|
|
return notification.id;
|
|
}
|
|
}).filter(id => Boolean(id));
|
|
|
|
if (idsToSee.length > 0) this.seeNotifications({notificationIds: idsToSee});
|
|
},
|
|
dismissAll () {
|
|
const idsToRead = this.notifications.map(notification => {
|
|
// We check explicitly for notification.id not starting with `custom-` because some
|
|
// notification don't follow the standard
|
|
// (all those not stored in user.notifications)
|
|
if (!this.isActionable(notification) && notification.id.indexOf('custom-') !== 0) {
|
|
return notification.id;
|
|
}
|
|
}).filter(id => Boolean(id));
|
|
this.openStatus = 0;
|
|
|
|
if (idsToRead.length > 0) this.readNotifications({notificationIds: idsToRead});
|
|
},
|
|
isActionable (notification) {
|
|
return this.actionableNotifications.indexOf(notification.type) !== -1;
|
|
},
|
|
},
|
|
};
|
|
</script>
|