feat(MED-111): update navigation links and adjust invitation handling
This commit is contained in:
@@ -222,12 +222,13 @@ export function NotificationsPopover(params: {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className={'py-2'}>
|
||||
<div className="py-2">
|
||||
<Button
|
||||
className={'max-h-6 max-w-6'}
|
||||
size={'icon'}
|
||||
variant={'ghost'}
|
||||
className="max-h-6 max-w-6"
|
||||
size="icon"
|
||||
variant="ghost"
|
||||
onClick={() => {
|
||||
console.log('test');
|
||||
setNotifications((existing) => {
|
||||
return existing.filter(
|
||||
(existingNotification) =>
|
||||
@@ -238,7 +239,7 @@ export function NotificationsPopover(params: {
|
||||
return dismissNotification(notification.id);
|
||||
}}
|
||||
>
|
||||
<XIcon className={'h-3'} />
|
||||
<XIcon className="h-3" />
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import Image from 'next/image';
|
||||
|
||||
import { useDismissNotification } from '@kit/notifications/hooks';
|
||||
import { Heading } from '@kit/ui/heading';
|
||||
import { If } from '@kit/ui/if';
|
||||
import { Separator } from '@kit/ui/separator';
|
||||
@@ -25,7 +26,7 @@ export function AcceptInvitationContainer(props: {
|
||||
|
||||
paths: {
|
||||
signOutNext: string;
|
||||
accountHome: string;
|
||||
membershipConfirmation: string;
|
||||
};
|
||||
}) {
|
||||
return (
|
||||
@@ -42,36 +43,36 @@ export function AcceptInvitationContainer(props: {
|
||||
<If condition={props.invitation.account.picture_url}>
|
||||
{(url) => (
|
||||
<Image
|
||||
alt={`Logo`}
|
||||
alt="Logo"
|
||||
src={url}
|
||||
width={64}
|
||||
height={64}
|
||||
className={'object-cover'}
|
||||
className="object-cover"
|
||||
/>
|
||||
)}
|
||||
</If>
|
||||
|
||||
<div className={'text-muted-foreground text-center text-sm'}>
|
||||
<div className="text-muted-foreground text-center text-sm">
|
||||
<Trans
|
||||
i18nKey={'teams:acceptInvitationDescription'}
|
||||
i18nKey="teams:acceptInvitationDescription"
|
||||
values={{
|
||||
accountName: props.invitation.account.name,
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className={'flex flex-col space-y-4'}>
|
||||
<div className="flex flex-col space-y-4">
|
||||
<form
|
||||
data-test={'join-team-form'}
|
||||
className={'w-full'}
|
||||
data-test="join-team-form"
|
||||
className="w-full"
|
||||
action={acceptInvitationAction}
|
||||
>
|
||||
<input type="hidden" name={'inviteToken'} value={props.inviteToken} />
|
||||
<input type="hidden" name="inviteToken" value={props.inviteToken} />
|
||||
|
||||
<input
|
||||
type={'hidden'}
|
||||
name={'nextPath'}
|
||||
value={props.paths.accountHome}
|
||||
type="hidden"
|
||||
name="nextPath"
|
||||
value={props.paths.membershipConfirmation}
|
||||
/>
|
||||
|
||||
<InvitationSubmitButton
|
||||
@@ -84,8 +85,8 @@ export function AcceptInvitationContainer(props: {
|
||||
|
||||
<SignOutInvitationButton nextPath={props.paths.signOutNext} />
|
||||
|
||||
<span className={'text-muted-foreground text-center text-xs'}>
|
||||
<Trans i18nKey={'teams:signInWithDifferentAccountDescription'} />
|
||||
<span className="text-muted-foreground text-center text-xs">
|
||||
<Trans i18nKey="teams:signInWithDifferentAccountDescription" />
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user