Update notifications modal with new component

This commit is contained in:
Anton 2024-01-15 16:09:19 +01:00
parent 427f7a7b2e
commit d4b68407ef
4 changed files with 106 additions and 117 deletions

View file

@ -4,14 +4,6 @@
.sci--navigation--notificaitons-flyout-container { .sci--navigation--notificaitons-flyout-container {
position: relative; position: relative;
.sci--navigation--notificaitons-flyout-backdrop {
bottom: 0;
left: 0;
position: fixed;
right: 0;
top: 0;
}
.has-unseen { .has-unseen {
&::after { &::after {
align-items: center; align-items: center;
@ -31,18 +23,13 @@
white-space: nowrap; white-space: nowrap;
} }
} }
}
.sci--navigation--notificaitons-flyout { .sci--navigation--notificaitons-flyout {
background-color: $color-white;
border-radius: 0 0 $border-radius-default $border-radius-default;
box-shadow: $flyout-shadow;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
height: calc(100vh - var(--top-navigation-height) - 2em); height: calc(100vh - 8rem);
padding: 1.5rem; padding: 1.5rem;
position: absolute;
right: 0;
top: calc(var(--top-navigation-height) - 1.5rem);
width: 400px; width: 400px;
.sci--navigation--notificaitons-flyout-title { .sci--navigation--notificaitons-flyout-title {
@ -70,6 +57,7 @@
.sci--navigation--notificaitons-flyout-notifications { .sci--navigation--notificaitons-flyout-notifications {
margin-left: -1.5rem; margin-left: -1.5rem;
overscroll-behavior: contain;
padding: 0 1.5rem; padding: 0 1.5rem;
position: relative; position: relative;
width: calc(100% + 3rem); width: calc(100% + 3rem);
@ -126,5 +114,4 @@
} }
} }
} }
}
} }

View file

@ -5,7 +5,7 @@
<i class="sn-icon sn-icon-close" @click="$emit('close')"></i> <i class="sn-icon sn-icon-close" @click="$emit('close')"></i>
</div> </div>
<hr> <hr>
<perfect-scrollbar ref="scrollContainer" class="sci--navigation--notificaitons-flyout-notifications"> <perfect-scrollbar @wheel="preventPropagation" ref="scrollContainer" class="sci--navigation--notificaitons-flyout-notifications">
<div class="sci-navigation--notificaitons-flyout-subtitle" v-if="todayNotifications.length"> <div class="sci-navigation--notificaitons-flyout-subtitle" v-if="todayNotifications.length">
{{ i18n.t('nav.notifications.today') }} {{ i18n.t('nav.notifications.today') }}
</div> </div>
@ -73,6 +73,10 @@ export default {
} }
}, },
methods: { methods: {
preventPropagation(e) {
e.stopPropagation();
e.preventDefault();
},
loadNotifications() { loadNotifications() {
if (this.nextPageUrl == null || this.loadingPage) return; if (this.nextPageUrl == null || this.loadingPage) return;

View file

@ -20,23 +20,28 @@
:position="'right'" :position="'right'"
:btnIcon="'sn-icon sn-icon-settings'" :btnIcon="'sn-icon sn-icon-settings'"
></MenuDropdown> ></MenuDropdown>
<div v-if="user" class="sci--navigation--notificaitons-flyout-container" > <GeneralDropdown
v-if="user"
ref="notificationDropdown"
position="right"
class="sci--navigation--notificaitons-flyout-container">
<template v-slot:field>
<button class="btn btn-light icon-btn btn-black" <button class="btn btn-light icon-btn btn-black"
:title="i18n.t('nav.notifications.title')" :title="i18n.t('nav.notifications.title')"
:class="{ 'has-unseen': unseenNotificationsCount > 0 }" :class="{ 'has-unseen': unseenNotificationsCount > 0 }"
:data-unseen="unseenNotificationsCount" :data-unseen="unseenNotificationsCount"
data-toggle="dropdown" data-toggle="dropdown">
@click="notificationsOpened = !notificationsOpened">
<i class="sn-icon sn-icon-notifications"></i> <i class="sn-icon sn-icon-notifications"></i>
</button> </button>
<div v-if="notificationsOpened" class="sci--navigation--notificaitons-flyout-backdrop" @click="notificationsOpened = false"></div> </template>
<template v-slot:flyout >
<NotificationsFlyout <NotificationsFlyout
v-if="notificationsOpened"
:notificationsUrl="notificationsUrl" :notificationsUrl="notificationsUrl"
:unseenNotificationsCount="unseenNotificationsCount" :unseenNotificationsCount="unseenNotificationsCount"
@update:unseenNotificationsCount="checkUnseenNotifications()" @update:unseenNotificationsCount="checkUnseenNotifications()"
@close="notificationsOpened = false" /> @close="$refs.notificationDropdown.$refs.field.click();"/>
</div> </template>
</GeneralDropdown>
<div v-if="user" class="dropdown" :title="i18n.t('nav.user_profile')"> <div v-if="user" class="dropdown" :title="i18n.t('nav.user_profile')">
<div class="sci--navigation--top-menu-user btn btn-light icon-btn btn-black" data-toggle="dropdown"> <div class="sci--navigation--top-menu-user btn btn-light icon-btn btn-black" data-toggle="dropdown">
<img class="avatar w-6 h-6" :src="user.avatar_url"> <img class="avatar w-6 h-6" :src="user.avatar_url">
@ -63,6 +68,7 @@ import NotificationsFlyout from './notifications/notifications_flyout.vue';
import DropdownSelector from '../shared/legacy/dropdown_selector.vue'; import DropdownSelector from '../shared/legacy/dropdown_selector.vue';
import SelectDropdown from '../shared/select_dropdown.vue'; import SelectDropdown from '../shared/select_dropdown.vue';
import MenuDropdown from '../shared/menu_dropdown.vue'; import MenuDropdown from '../shared/menu_dropdown.vue';
import GeneralDropdown from '../shared/general_dropdown.vue';
export default { export default {
name: 'TopMenuContainer', name: 'TopMenuContainer',
@ -70,7 +76,8 @@ export default {
DropdownSelector, DropdownSelector,
NotificationsFlyout, NotificationsFlyout,
SelectDropdown, SelectDropdown,
MenuDropdown MenuDropdown,
GeneralDropdown
}, },
props: { props: {
url: String, url: String,
@ -88,7 +95,6 @@ export default {
helpMenu: null, helpMenu: null,
settingsMenu: null, settingsMenu: null,
userMenu: null, userMenu: null,
notificationsOpened: false,
unseenNotificationsCount: 0 unseenNotificationsCount: 0
}; };
}, },
@ -119,15 +125,6 @@ export default {
); );
} }
}, },
watch: {
notificationsOpened(newVal) {
if (newVal === true) {
document.body.style.overflow = 'hidden';
} else if (newVal === false) {
document.body.style.overflow = 'scroll';
}
}
},
methods: { methods: {
fetchData() { fetchData() {
$.get(this.url, (result) => { $.get(this.url, (result) => {

View file

@ -33,7 +33,8 @@ export default {
btnText: { type: String, required: false }, btnText: { type: String, required: false },
btnIcon: { type: String, required: false }, btnIcon: { type: String, required: false },
caret: { type: Boolean, default: false }, caret: { type: Boolean, default: false },
alwaysShow: { type: Boolean, default: false } alwaysShow: { type: Boolean, default: false },
closeDropdown: { type: Boolean, default: false }
}, },
data() { data() {
return { return {