Error
+
+
+
+ The token you provided is invalid.
+
@@ -39,23 +33,25 @@
{{
comment.actor.name
}}
- @{{ usernameWithDomain(comment.actor) }}
-
- {{
- formatDistanceToNow(new Date(comment.updatedAt), {
- locale: $dateFnsLocale,
- addSuffix: true,
- })
- }}
-
+ {{
+ usernameWithDomain(comment.actor)
+ }}
{{ $t("[deleted]") }}
+
+ {{
+ formatDistanceToNow(new Date(comment.updatedAt), {
+ locale: $dateFnsLocale,
+ addSuffix: true,
+ })
+ }}
+
diff --git a/js/src/views/Admin/Profiles.vue b/js/src/views/Admin/Profiles.vue
index 71384cf5a..edde5d05b 100644
--- a/js/src/views/Admin/Profiles.vue
+++ b/js/src/views/Admin/Profiles.vue
@@ -23,6 +23,12 @@
paginated
backend-pagination
backend-filtering
+ :debounce-search="200"
+ :current-page.sync="page"
+ :aria-next-label="$t('Next page')"
+ :aria-previous-label="$t('Previous page')"
+ :aria-page-label="$t('Page')"
+ :aria-current-label="$t('Current page')"
:total="persons.total"
:per-page="PROFILES_PER_PAGE"
@page-change="onPageChange"
@@ -81,20 +87,21 @@
-
-
- {{ $t("No profile matches the filters") }}
-@@ -112,8 +122,8 @@ :href="`@${preferredUsername}/feed/atom`" :title="$t('Atom feed for events and posts')" > - {{ $t("RSS/Atom Feed") }}
@@ -232,8 +242,8 @@ :href="`@${preferredUsername}/feed/atom`" :title="$t('Atom feed for events and posts')" > - {{ $t("RSS/Atom Feed") }}
-
-
-
+
-
+
-
@@ -41,48 +41,71 @@
-++ -{{ $t("No open reports yet") }} - + -{{ $t("No resolved reports yet") }} - + +{{ $t("No closed reports yet") }} - + -
+
+ {{ $t("Browser notifications") }}
+
+
+ {{ $t("Notification settings") }}
++ {{ + $t( + "Select the activities for which you wish to receive an email or a push notification." + ) + }} +
+| + {{ notificationType.label }} + | +||
|---|---|---|
| + {{ method }} + | ++ | |
|
+ |
+ + {{ subType.label }} + | +|
{{ $t("Participation notifications") }}
@@ -194,18 +252,31 @@ import { Component, Vue, Watch } from "vue-property-decorator"; import { INotificationPendingEnum } from "@/types/enums"; import { - USER_SETTINGS, SET_USER_SETTINGS, FEED_TOKENS_LOGGED_USER, + USER_NOTIFICATIONS, + UPDATE_ACTIVITY_SETTING, } from "../../graphql/user"; import { IUser } from "../../types/current-user.model"; import RouteName from "../../router/name"; import { IFeedToken } from "@/types/feedtoken.model"; import { CREATE_FEED_TOKEN, DELETE_FEED_TOKEN } from "@/graphql/feed_tokens"; +import { + subscribeUserToPush, + unsubscribeUserToPush, +} from "../../services/push-subscription"; +import { + REGISTER_PUSH_MUTATION, + UNREGISTER_PUSH_MUTATION, +} from "@/graphql/webPush"; +import { merge } from "lodash"; + +type NotificationSubType = { label: string; id: string }; +type NotificationType = { label: string; subtypes: NotificationSubType[] }; @Component({ apollo: { - loggedUser: USER_SETTINGS, + loggedUser: USER_NOTIFICATIONS, feedTokens: { query: FEED_TOKENS_LOGGED_USER, update: (data) => @@ -214,6 +285,11 @@ import { CREATE_FEED_TOKEN, DELETE_FEED_TOKEN } from "@/graphql/feed_tokens"; ), }, }, + metaInfo() { + return { + title: this.$t("Notifications") as string, + }; + }, }) export default class Notifications extends Vue { loggedUser!: IUser; @@ -235,6 +311,203 @@ export default class Notifications extends Vue { showCopiedTooltip = { ics: false, atom: false }; + subscribed = false; + + notificationMethods = { + email: this.$t("Email") as string, + push: this.$t("Push") as string, + }; + + defaultNotificationValues = { + participation_event_updated: { + email: true, + push: true, + disabled: true, + }, + participation_event_comment: { + email: true, + push: true, + }, + event_new_pending_participation: { + email: true, + push: true, + }, + event_new_participation: { + email: false, + push: false, + }, + event_created: { + email: false, + push: false, + }, + event_updated: { + email: false, + push: false, + }, + discussion_updated: { + email: false, + push: false, + }, + post_published: { + email: false, + push: false, + }, + post_updated: { + email: false, + push: false, + }, + resource_updated: { + email: false, + push: false, + }, + member_request: { + email: true, + push: true, + }, + member_updated: { + email: false, + push: false, + }, + user_email_password_updated: { + email: true, + push: false, + disabled: true, + }, + event_comment_mention: { + email: true, + push: true, + }, + discussion_mention: { + email: true, + push: false, + }, + event_new_comment: { + email: true, + push: false, + }, + }; + + notificationTypes: NotificationType[] = [ + { + label: this.$t("Mentions") as string, + subtypes: [ + { + id: "event_comment_mention", + label: this.$t( + "I've been mentionned in a comment under an event" + ) as string, + }, + { + id: "discussion_mention", + label: this.$t( + "I've been mentionned in a group discussion" + ) as string, + }, + ], + }, + { + label: this.$t("Participations") as string, + subtypes: [ + { + id: "participation_event_updated", + label: this.$t("An event I'm going to has been updated") as string, + }, + { + id: "participation_event_comment", + label: this.$t( + "An event I'm going to has posted an announcement" + ) as string, + }, + ], + }, + { + label: this.$t("Organizers") as string, + subtypes: [ + { + id: "event_new_pending_participation", + label: this.$t( + "An event I'm organizing has a new pending participation" + ) as string, + }, + { + id: "event_new_participation", + label: this.$t( + "An event I'm organizing has a new participation" + ) as string, + }, + { + id: "event_new_comment", + label: this.$t("An event I'm organizing has a new comment") as string, + }, + ], + }, + { + label: this.$t("Group activity") as string, + subtypes: [ + { + id: "event_created", + label: this.$t( + "An event from one of my groups has been published" + ) as string, + }, + { + id: "event_updated", + label: this.$t( + "An event from one of my groups has been updated or deleted" + ) as string, + }, + { + id: "discussion_updated", + label: this.$t("A discussion has been created or updated") as string, + }, + { + id: "post_published", + label: this.$t("A post has been published") as string, + }, + { + id: "post_updated", + label: this.$t("A post has been updated") as string, + }, + { + id: "resource_updated", + label: this.$t("A resource has been created or updated") as string, + }, + { + id: "member_request", + label: this.$t( + "A member requested to join one of my groups" + ) as string, + }, + { + id: "member_updated", + label: this.$t("A member has been updated") as string, + }, + ], + }, + { + label: this.$t("User settings") as string, + subtypes: [ + { + id: "user_email_password_updated", + label: this.$t("You changed your email or password") as string, + }, + ], + }, + ]; + + get userNotificationValues(): Record
+
+
+
+ + Password reset +
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+ + Password reset +
+
+
+
|
+|||||||||||
+
+
|
+
.group.avatar.url %>){kind=avatar}
+