aaf32cc09b
* WIP(a11y): task modal updates * fix(tasks): borders in modal * fix(tasks): circley locks * fix(task-modal): placeholders * WIP(task-modal): disabled states, hide empty options, +/- restyle * fix(task-modal): box shadows instead of borders, habit control pointer * fix(task-modal): button states? * fix(modal): tighten up layout, new spacing utils * fix(tasks): more stylin * fix(tasks): habit hovers * fix(css): checklist labels, a11y colors * fix(css): one more missed hover issue * fix(css): lock Challenges, label fixes * fix(css): scope input/textarea changes * fix(style): task tweakies * fix(style): more button fixage * WIP(component): start select list story * working example of a templated selectList * fix(style): more button corrections * fix(lint): EOL * fix(buttons): factor btn-secondary to better override Bootstrap * fix(styles): standardize more buttons * wip: difficulty select - style fixes * selectDifficulty works! 🎉 - fix styles * change the dropdown-item sizes only for the selectList ones * selectTranslatedArray * changed many label margins * more correct dropdown style * fix(modals): button corrections * input-group styling + datetime picker without today button * Style/margins for "repeat every" - extract selectTag.vue * working tag-selection / update - cleanup * fix stories * fix svg color on create modal (purple) * fix task modal bottom padding * correct dropdown shadow * update dropdown-toggle caret size / color * fixed checklist style * sync checked state * selectTag padding * fix spacing between positive/negative streak inputs * toggle-checkbox + fix some spacings * disable repeat-on when its a groupTask * fix new checklist-item * fix toggle-checkbox style - fix difficulty style * fix checklist ui * add tags label , when there arent any tags selected * WORKING select-tag component 🎉 * fix taglist story * show max 5 items in tag dropdown + "X more" label * fix datetime clear button * replace m-b-xs to mb-1 (bootstrap) - fix input-group-text style * fix styles of advanced settings * fix delete task styles * always show grippy on hover of the item * extract modal-text-input mixin + fix the borders/dropshadow * fix(spacing): revert most to Bootstrap * feat(checklists): make local copy of master checklist non-editable also aggressively update checklists because they weren't syncing?? * fix(checklists): handle add/remove options better * feat(teams): manager notes field * fix select/dropdown styles * input border + icon colors * delete task underline color * fix checklist "delete icon" vertical position * selectTag fixes - normal open/close toggle working again - remove icon color * fixing icons: Trash can - Delete Little X - Remove Big X - Close Block - Block * fix taglist margins / icon sizes * wip margin overview (in storybook) * fix routerlink * remove unused method * new selectTag style + add markdown inside tagList + scrollable tag selection * fix selectTag / selectList active border * fix difficulty select (svg default color) * fix input padding-left + fix reset habit streak fullwidth / padding + "repeat every" gray text (no border) * feat(teams): improved approval request > approve > reward flow * fix(tests): address failures * fix(lint): oops only * fix(tasks): short-circuit group related logic * fix(tasks): more short circuiting * fix(tasks): more lines, less lint * fix(tasks): how do i keep missing these * feat(teams): provide assigning user summary * fix(teams): don't attempt to record assiging user if not supplied * fix advanced-settings styling / margin * fix merge + hide advanced streak settings when none enabled * fix styles * set Roboto font for advanced settings * Add Challenge flag to the tag list * add tag with enter, when no other tag is found * fix styles + tag cancel button * refactor footer / margin * split repeat fields into option mt-3 groups * button all the things * fix(tasks): style updates * no hover state for non-editable tasks on team board * keep assign/claim footer on task after requesting approval * disable more fields on user copy of team task, and remove hover states for them * fix(tasks): functional revisions * "Claim Rewards" instead of "x" in task approved notif * Remove default transition supplied by Bootstrap, apply individually to some elements * Delete individual tasks and related notifications when master task deleted from team board * Manager notes now save when supplied at task initial creation * Can no longer dismiss rewards from approved task by hitting Dismiss All * fix(tasks): clean tasksOrder also adjust related test expectation * fix(tests): adjust integration expectations * fix(test): ratzen fratzen only * fix(teams): checklist, notes * fix(teams): improve disabled states * fix(teams): more style fixage * BREAKING(teams): return 202 instead of 401 for approval request * fix(teams): better taskboard sync also re-re-fix checklist borders * fix(tests): update expectations for breaking change * refactor(task-modal): lockable label component * refactor(teams): move task scoring to mixin * fix(teams): style corrections * fix(tasks): spacing and wording corrections * fix(teams): don't bork manager notes * fix(teams): assignment fix and more approval flow revisions * WIP(teams): use tag dropdown control for assignment * refactor(tasks): better spacing, generic multi select * fix(tasks): various visual and behavior updates * fix(tasks): incidental style tweaks * fix(teams): standardize approval request response * refactor(teams): correct test, use res.respond message param * fix(storybook): renamed component * fix(teams): age approval-required To Do's Fixes #8730 * fix(teams): sync personal data as well as team on mixin sync * fix(teams): hide unclaim button, not whole footer; fix switch focus * fix(achievements): unrevert width fix Co-authored-by: Sabe Jones <sabrecat@gmail.com>
372 lines
12 KiB
Vue
372 lines
12 KiB
Vue
<template>
|
|
<menu-dropdown
|
|
class="item-notifications"
|
|
:right="true"
|
|
:open-status="openStatus"
|
|
@toggled="handleOpenStatusChange"
|
|
>
|
|
<div slot="dropdown-toggle">
|
|
<div
|
|
v-b-tooltip.hover.bottom="$t('notifications')"
|
|
:aria-label="$t('notifications')"
|
|
>
|
|
<message-count
|
|
v-if="notificationsCount > 0 || hasSpecialBadge"
|
|
:count="notificationsCount"
|
|
:top="true"
|
|
:gray="!hasUnseenNotifications && !hasSpecialBadge"
|
|
:badge="hasSpecialBadge ? icons.starBadge : null"
|
|
/>
|
|
<div
|
|
class="top-menu-icon svg-icon notifications"
|
|
v-html="icons.notifications"
|
|
></div>
|
|
</div>
|
|
</div>
|
|
<div
|
|
v-if="openStatus === 1"
|
|
slot="dropdown-content"
|
|
>
|
|
<div
|
|
class="dropdown-item dropdown-separated
|
|
d-flex justify-content-between dropdown-inactive align-items-center"
|
|
@click.stop
|
|
>
|
|
<h4
|
|
v-once
|
|
class="dropdown-title"
|
|
>
|
|
{{ $t('notifications') }}
|
|
</h4>
|
|
<a
|
|
class="small-link standard-link"
|
|
:disabled="notificationsCount === 0"
|
|
@click="dismissAll"
|
|
>{{ $t('dismissAll') }}</a>
|
|
</div>
|
|
<world-boss />
|
|
<onboarding-guide
|
|
v-if="showOnboardingGuide"
|
|
:never-seen="hasSpecialBadge"
|
|
/>
|
|
<component
|
|
:is="notification.type"
|
|
v-for="notification in notifications"
|
|
:key="notification.id"
|
|
:notification="notification"
|
|
:can-remove="!isActionable(notification)"
|
|
/>
|
|
<div
|
|
v-if="notificationsCount === 0 && !showOnboardingGuide"
|
|
class="dropdown-item dropdown-separated
|
|
d-flex justify-content-center dropdown-inactive no-notifications flex-column"
|
|
>
|
|
<div
|
|
class="svg-icon"
|
|
v-html="icons.success"
|
|
></div>
|
|
<h2>{{ $t('noNotifications') }}</h2>
|
|
<p>{{ $t('noNotificationsText') }}</p>
|
|
</div>
|
|
</div>
|
|
</menu-dropdown>
|
|
</template>
|
|
|
|
<style lang='scss' scoped>
|
|
@import '~@/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 '@/libs/store';
|
|
import * as quests from '@/../../common/script/content/quests';
|
|
import {
|
|
hasCompletedOnboarding,
|
|
hasActiveOnboarding,
|
|
} from '@/../../common/script/libs/onboarding';
|
|
import notificationsIcon from '@/assets/svg/notifications.svg';
|
|
import MenuDropdown from '../ui/customMenuDropdown';
|
|
import MessageCount from './messageCount';
|
|
import { CONSTANTS, getLocalSetting, setLocalSetting } from '@/libs/userlocalManager';
|
|
import successImage from '@/assets/svg/success.svg';
|
|
import starBadge from '@/assets/svg/star-badge.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 GROUP_TASK_ASSIGNED from './notifications/groupTaskAssigned';
|
|
import GROUP_TASK_CLAIMED from './notifications/groupTaskClaimed';
|
|
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/newPrivateMessage';
|
|
import NEW_CHAT_MESSAGE from './notifications/newChatMessage';
|
|
import WORLD_BOSS from './notifications/worldBoss';
|
|
import VERIFY_USERNAME from './notifications/verifyUsername';
|
|
import ACHIEVEMENT_JUST_ADD_WATER from './notifications/justAddWater';
|
|
import ACHIEVEMENT_LOST_MASTERCLASSER from './notifications/lostMasterclasser';
|
|
import ACHIEVEMENT_MIND_OVER_MATTER from './notifications/mindOverMatter';
|
|
import ONBOARDING_COMPLETE from './notifications/onboardingComplete';
|
|
import GIFT_ONE_GET_ONE from './notifications/g1g1';
|
|
import OnboardingGuide from './onboardingGuide';
|
|
|
|
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,
|
|
GROUP_TASK_ASSIGNED,
|
|
GROUP_TASK_CLAIMED,
|
|
UNALLOCATED_STATS_POINTS,
|
|
NEW_MYSTERY_ITEMS,
|
|
CARD_RECEIVED,
|
|
NEW_INBOX_MESSAGE,
|
|
NEW_CHAT_MESSAGE,
|
|
ACHIEVEMENT_JUST_ADD_WATER,
|
|
ACHIEVEMENT_LOST_MASTERCLASSER,
|
|
ACHIEVEMENT_MIND_OVER_MATTER,
|
|
WorldBoss: WORLD_BOSS,
|
|
VERIFY_USERNAME,
|
|
OnboardingGuide,
|
|
ONBOARDING_COMPLETE,
|
|
GIFT_ONE_GET_ONE,
|
|
},
|
|
data () {
|
|
return {
|
|
icons: Object.freeze({
|
|
notifications: notificationsIcon,
|
|
success: successImage,
|
|
starBadge,
|
|
}),
|
|
hasSpecialBadge: false,
|
|
quests,
|
|
openStatus: undefined,
|
|
actionableNotifications: [
|
|
'GUILD_INVITATION', 'PARTY_INVITATION', 'CHALLENGE_INVITATION',
|
|
'QUEST_INVITATION', 'GROUP_TASK_APPROVAL', 'GROUP_TASK_APPROVED',
|
|
],
|
|
// 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', 'GIFT_ONE_GET_ONE', 'GROUP_TASK_NEEDS_WORK',
|
|
'GUILD_INVITATION', 'PARTY_INVITATION', 'CHALLENGE_INVITATION',
|
|
'QUEST_INVITATION', 'GROUP_TASK_ASSIGNED', 'GROUP_TASK_APPROVAL', 'GROUP_TASK_APPROVED',
|
|
'GROUP_TASK_CLAIMED', 'NEW_MYSTERY_ITEMS', 'CARD_RECEIVED',
|
|
'NEW_INBOX_MESSAGE', 'NEW_CHAT_MESSAGE', 'UNALLOCATED_STATS_POINTS',
|
|
'ACHIEVEMENT_JUST_ADD_WATER', 'ACHIEVEMENT_LOST_MASTERCLASSER', 'ACHIEVEMENT_MIND_OVER_MATTER',
|
|
'VERIFY_USERNAME', 'ONBOARDING_COMPLETE',
|
|
],
|
|
};
|
|
},
|
|
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 => ({
|
|
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 => ({
|
|
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
|
|
// a and b are notifications
|
|
notifications.sort((a, b) => { // eslint-disable-line array-callback-return, consistent-return
|
|
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 => (notification.seen === false));
|
|
},
|
|
hasClass () {
|
|
return this.$store.getters['members:hasClass'](this.user);
|
|
},
|
|
showOnboardingGuide () {
|
|
return hasActiveOnboarding(this.user) && !hasCompletedOnboarding(this.user);
|
|
},
|
|
},
|
|
mounted () {
|
|
const onboardingPanelState = getLocalSetting(CONSTANTS.keyConstants.ONBOARDING_PANEL_STATE);
|
|
if (
|
|
onboardingPanelState !== CONSTANTS.onboardingPanelValues.PANEL_OPENED
|
|
&& this.showOnboardingGuide
|
|
) {
|
|
// The first time the onboarding panel is opened a special
|
|
// badge for notifications should be used
|
|
this.hasSpecialBadge = true;
|
|
}
|
|
},
|
|
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();
|
|
|
|
// Reset the special notification badge as soon as it's opened
|
|
if (this.hasSpecialBadge) {
|
|
setLocalSetting(
|
|
CONSTANTS.keyConstants.ONBOARDING_PANEL_STATE,
|
|
CONSTANTS.onboardingPanelValues.PANEL_OPENED,
|
|
);
|
|
|
|
setTimeout(() => {
|
|
this.hasSpecialBadge = false;
|
|
}, 100);
|
|
}
|
|
},
|
|
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;
|
|
}
|
|
return null;
|
|
}).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;
|
|
}
|
|
return null;
|
|
}).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>
|