-
Notifications
You must be signed in to change notification settings - Fork 6
feat(notifications): add accepted and refused membership request #928
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
nicolaskempf57
merged 8 commits into
main
from
feat_add_membership_response_notifications
Feb 23, 2026
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
57ad3d5
feat(notifications): add accepted and refused membership request
nicolaskempf57 2c0bbf1
fix: PR review
nicolaskempf57 4f325f2
Merge branch 'main' into feat_add_membership_response_notifications
nicolaskempf57 2e8f3e9
Merge branch 'main' into feat_add_membership_response_notifications
nicolaskempf57 0e9611b
Merge branch 'main' into feat_add_membership_response_notifications
nicolaskempf57 b27b4f9
fix(notifications): merge conflict
nicolaskempf57 d48f4b7
fix(notifications): remove DeepReadonly after merge
nicolaskempf57 da9e460
Merge branch 'main' into feat_add_membership_response_notifications
nicolaskempf57 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| <template> | ||
| <div class="p-3 flex gap-3 relative hover:bg-gray-some"> | ||
| <div class="flex-none"> | ||
| <RiCheckboxCircleLine class="size-4" /> | ||
| </div> | ||
| <div class="flex-1 truncate"> | ||
| <p class="m-0 text-xs font-bold"> | ||
| {{ $t('Votre adhésion a été acceptée') }} | ||
| </p> | ||
| <p class="m-0 text-xs flex items-center gap-1 truncate"> | ||
| {{ $t(`pour rejoindre`) }} | ||
| <OrganizationOwner | ||
| :organization="notification.details.organization as OrganizationReference" | ||
| logo-size-class="size-3" | ||
| :logo-no-border="true" | ||
| name-size="xs" | ||
| name-color="text-gray-plain" | ||
| :with-link="false" | ||
| /> | ||
| </p> | ||
| </div> | ||
| <div class="flex-none flex m-0 gap-1.5"> | ||
| <p class="m-0 text-xs"> | ||
| {{ formatDate(notification.created_at) }} | ||
| </p> | ||
| <AnimatedLoader | ||
| v-if="loading" | ||
| class="size-2" | ||
| /> | ||
| <div | ||
| v-else-if="!notification.handled_at" | ||
| class="size-2 rounded-full bg-new-primary mt-0.5" | ||
| /> | ||
| </div> | ||
| <button | ||
| v-if="!notification.handled_at" | ||
| class="after:absolute after:inset-0 bg-none" | ||
| :title="$t('Marquer la notification comme lue')" | ||
| @click="markAsRead(notification)" | ||
| /> | ||
| </div> | ||
| </template> | ||
|
|
||
| <script setup lang="ts"> | ||
| import { AnimatedLoader, useFormatDate, type OrganizationReference } from '@datagouv/components-next' | ||
| import { RiCheckboxCircleLine } from '@remixicon/vue' | ||
| import type { MembershipAcceptedNotification } from '~/types/notifications' | ||
|
|
||
| defineProps<{ | ||
| notification: MembershipAcceptedNotification | ||
| }>() | ||
|
|
||
| const { formatDate } = useFormatDate() | ||
| const { loading, markAsRead } = useMarkAsRead() | ||
| </script> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| <template> | ||
| <div class="p-3 flex gap-3 relative hover:bg-gray-some"> | ||
| <div class="flex-none"> | ||
| <RiCloseCircleLine class="size-4" /> | ||
| </div> | ||
| <div class="flex-1 truncate"> | ||
| <p class="m-0 text-xs font-bold"> | ||
| {{ $t('Votre adhésion a été refusée') }} | ||
| </p> | ||
| <p class="m-0 text-xs flex items-center gap-1 truncate"> | ||
| {{ $t('pour rejoindre') }} | ||
| <OrganizationOwner | ||
| :organization="notification.details.organization as OrganizationReference" | ||
| logo-size-class="size-3" | ||
| :logo-no-border="true" | ||
| name-size="xs" | ||
| name-color="text-gray-plain" | ||
| :with-link="false" | ||
| /> | ||
| </p> | ||
| </div> | ||
| <div class="flex-none flex m-0 gap-1.5"> | ||
| <p class="m-0 text-xs"> | ||
| {{ formatDate(notification.created_at) }} | ||
| </p> | ||
| <AnimatedLoader | ||
|
nicolaskempf57 marked this conversation as resolved.
|
||
| v-if="loading" | ||
| class="size-2" | ||
| /> | ||
| <div | ||
| v-else-if="!notification.handled_at" | ||
| class="size-2 rounded-full bg-new-primary mt-0.5" | ||
| /> | ||
| </div> | ||
| <button | ||
| v-if="!notification.handled_at" | ||
| class="after:absolute after:inset-0 bg-none" | ||
| :title="$t('Marquer la notification comme lue')" | ||
| @click="markAsRead(notification)" | ||
| /> | ||
| </div> | ||
| </template> | ||
|
|
||
| <script setup lang="ts"> | ||
| import { AnimatedLoader, useFormatDate, type OrganizationReference } from '@datagouv/components-next' | ||
| import { RiCloseCircleLine } from '@remixicon/vue' | ||
| import type { MembershipRefusedNotification } from '~/types/notifications' | ||
|
|
||
| defineProps<{ | ||
| notification: MembershipRefusedNotification | ||
| }>() | ||
|
|
||
| const { formatDate } = useFormatDate() | ||
| const { loading, markAsRead } = useMarkAsRead() | ||
| </script> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.