Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
pleroma-fe
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pleroma
pleroma-fe
Commits
30c4a665
Commit
30c4a665
authored
2 years ago
by
HJ
Browse files
Options
Downloads
Patches
Plain Diff
use user popovers in notifications as well
parent
d3b5d27f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
3 merge requests
!1711
Update stable - 2.5.0 release
,
!1585
Fixing merge conflicts and lint for report notifications MR
,
!1540
Disjointed popovers
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/components/notification/notification.js
+3
-1
3 additions, 1 deletion
src/components/notification/notification.js
src/components/notification/notification.vue
+27
-12
27 additions, 12 deletions
src/components/notification/notification.vue
with
30 additions
and
13 deletions
src/components/notification/notification.js
+
3
−
1
View file @
30c4a665
...
...
@@ -5,6 +5,7 @@ import UserAvatar from '../user_avatar/user_avatar.vue'
import
UserCard
from
'
../user_card/user_card.vue
'
import
Timeago
from
'
../timeago/timeago.vue
'
import
RichContent
from
'
src/components/rich_content/rich_content.jsx
'
import
Popover
from
'
../popover/popover.vue
'
import
{
isStatusNotification
}
from
'
../../services/notification_utils/notification_utils.js
'
import
{
highlightClass
,
highlightStyle
}
from
'
../../services/user_highlighter/user_highlighter.js
'
import
generateProfileLink
from
'
src/services/user_profile_link_generator/user_profile_link_generator
'
...
...
@@ -46,7 +47,8 @@ const Notification = {
UserCard
,
Timeago
,
Status
,
RichContent
RichContent
,
Popover
},
methods
:
{
toggleUserExpanded
()
{
...
...
This diff is collapsed.
Click to expand it.
src/components/notification/notification.vue
+
27
−
12
View file @
30c4a665
...
...
@@ -34,21 +34,36 @@
<a
class=
"avatar-container"
:href=
"$router.resolve(userProfileLink).href"
@
click.
stop.
prevent
.capture=
"toggleUserExpanded"
@
click.prevent
>
<UserAvatar
:compact=
"true"
:better-shadow=
"betterShadow"
:user=
"notification.from_profile"
/>
<Popover
trigger=
"click"
popover-class=
"popover-default user-popover"
:overlay-centers=
"true"
overlay-centers-selector=
".user-info-avatar-link .Avatar"
>
<template
v-slot:trigger
>
<UserAvatar
class=
"post-avatar"
:bot=
"botIndicator"
:compact=
"true"
:better-shadow=
"betterShadow"
:user=
"notification.from_profile"
/>
</
template
>
<
template
v-slot:content
>
<UserCard
class=
"mention-link-popover"
:user-id=
"getUser(notification).id"
:hide-bio=
"true"
:bordered=
"false"
:allow-zooming-avatar=
"true"
:rounded=
"true"
/>
</
template
>
</Popover>
</a>
<div
class=
"notification-right"
>
<UserCard
v-if=
"userExpanded"
:user-id=
"getUser(notification).id"
:rounded=
"true"
:bordered=
"true"
/>
<span
class=
"notification-details"
>
<div
class=
"name-and-action"
>
<!-- eslint-disable vue/no-v-html -->
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment