mirror of
https://github.com/Ocelot-Social-Community/Ocelot-Social.git
synced 2025-12-13 07:46:06 +00:00
* Notifications view: - restructured broken layout - joined several columns for mobile view - moved button from footer to header - set alternating colors for the table rows UserTeaser - added injectedText - added injectedDate - fixed padding * fixed race-condition with default behavior of browser * - fixed: jumping menu / menu should get closed by click on notification - fixed: NotificationList replaced by NotificationTable * - fixed: menu gets closed when cursor leaves content area, but it is still within popup * - fixed: menu top buttons should be next to each other * - fixed: popup background overlay remains after NotificationMenu disappeared after viewport change to mobile * - fixed lint errors * - fixed tests + snapshots * - fixed e2e test * fix lint error Co-authored-by: Sebastian Stein <sebastian@codepassion.de> * Fix locale identifier to have single quotes 'notifications.reason.on_date' --------- Co-authored-by: Sebastian Stein <sebastian@codepassion.de> Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com> Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
139 lines
4.3 KiB
Vue
139 lines
4.3 KiB
Vue
<template>
|
|
<dropdown class="user-teaser">
|
|
<template #default="{ openMenu, closeMenu }">
|
|
<user-teaser-helper
|
|
v-if="showAvatar"
|
|
:link-to-profile="linkToProfile"
|
|
:show-popover="showPopover"
|
|
:user-link="userLink"
|
|
@open-menu="loadPopover(openMenu)"
|
|
@close-menu="closeMenu(false)"
|
|
data-test="avatarUserLink"
|
|
>
|
|
<profile-avatar :profile="user" size="small" />
|
|
</user-teaser-helper>
|
|
<div class="info flex-direction-column">
|
|
<div :class="wide ? 'flex-direction-row' : 'flex-direction-column'">
|
|
<user-teaser-helper
|
|
:link-to-profile="linkToProfile"
|
|
:show-popover="showPopover"
|
|
:user-link="userLink"
|
|
@open-menu="loadPopover(openMenu)"
|
|
@close-menu="closeMenu(false)"
|
|
>
|
|
<span class="slug">{{ userSlug }}</span>
|
|
<span class="name">{{ userName }}</span>
|
|
</user-teaser-helper>
|
|
<span v-if="wide"> </span>
|
|
<span v-if="group">
|
|
<span class="text">
|
|
{{ $t('group.in') }}
|
|
</span>
|
|
<nuxt-link :to="groupLink">
|
|
<span class="text">
|
|
<span class="slug">{{ groupSlug }}</span>
|
|
<span v-if="!userOnly" class="name">{{ groupName }}</span>
|
|
</span>
|
|
</nuxt-link>
|
|
</span>
|
|
<!-- eslint-disable-next-line prettier/prettier -->
|
|
<span>{{ injectedText }}<span v-if="injectedText && injectedDate && !userOnly && dateTime"> {{$t('notifications.reason.on_date')}} <date-time :date-time="dateTime" /></span></span>
|
|
</div>
|
|
<span v-if="!userOnly && !injectedDate && dateTime" class="text">
|
|
<base-icon name="clock" />
|
|
<date-time :date-time="dateTime" />
|
|
<slot name="dateTime"></slot>
|
|
</span>
|
|
</div>
|
|
</template>
|
|
<template #popover="{ isOpen }" v-if="showPopover">
|
|
<user-teaser-popover
|
|
v-if="isOpen"
|
|
:user-id="user.id"
|
|
:user-link="linkToProfile ? userLink : null"
|
|
/>
|
|
</template>
|
|
</dropdown>
|
|
</template>
|
|
|
|
<script>
|
|
import { mapGetters } from 'vuex'
|
|
|
|
import { userTeaserQuery } from '~/graphql/User.js'
|
|
import DateTime from '~/components/DateTime'
|
|
import Dropdown from '~/components/Dropdown'
|
|
import ProfileAvatar from '~/components/_new/generic/ProfileAvatar/ProfileAvatar'
|
|
import UserTeaserPopover from './UserTeaserPopover'
|
|
import UserTeaserHelper from './UserTeaserHelper.vue'
|
|
|
|
export default {
|
|
name: 'UserTeaser',
|
|
components: {
|
|
ProfileAvatar,
|
|
UserTeaserPopover,
|
|
UserTeaserHelper,
|
|
Dropdown,
|
|
DateTime,
|
|
},
|
|
props: {
|
|
linkToProfile: { type: Boolean, default: true },
|
|
user: { type: Object, default: null },
|
|
group: { type: Object, default: null },
|
|
wide: { type: Boolean, default: false },
|
|
showAvatar: { type: Boolean, default: true },
|
|
dateTime: { type: [Date, String], default: null },
|
|
showPopover: { type: Boolean, default: true },
|
|
injectedText: { type: String, default: null },
|
|
injectedDate: { type: Boolean, default: false },
|
|
},
|
|
computed: {
|
|
...mapGetters({
|
|
isModerator: 'auth/isModerator',
|
|
}),
|
|
|
|
itsMe() {
|
|
return this.user.slug === this.$store.getters['auth/user'].slug
|
|
},
|
|
userLink() {
|
|
const { id, slug } = this.user
|
|
if (!(id && slug)) return null
|
|
return { name: 'profile-id-slug', params: { slug, id } }
|
|
},
|
|
userSlug() {
|
|
const { slug } = this.user || {}
|
|
return slug && `@${slug}`
|
|
},
|
|
userName() {
|
|
const { name } = this.user || {}
|
|
return name || this.$t('profile.userAnonym')
|
|
},
|
|
userOnly() {
|
|
return !this.dateTime && !this.group
|
|
},
|
|
groupLink() {
|
|
const { id, slug } = this.group
|
|
if (!(id && slug)) return ''
|
|
return { name: 'groups-id-slug', params: { slug, id } }
|
|
},
|
|
groupSlug() {
|
|
const { slug } = this.group || {}
|
|
return slug && `&${slug}`
|
|
},
|
|
groupName() {
|
|
const { name } = this.group || {}
|
|
return name || this.$t('profile.userAnonym')
|
|
},
|
|
},
|
|
methods: {
|
|
async loadPopover(openMenu) {
|
|
// Load user data if not already loaded, to avoid flickering
|
|
await this.$apollo.query({
|
|
query: userTeaserQuery(this.$i18n),
|
|
variables: { id: this.user.id },
|
|
})
|
|
openMenu(false)
|
|
},
|
|
},
|
|
}
|
|
</script>
|