Merge branch 'main' of https://github.com/VAR-Virtual-Air-Rescue/var-monorepo
This commit is contained in:
@@ -1,3 +1,5 @@
|
||||
NEXTAUTH_SECRET=
|
||||
NEXT_PUBLIC_PUBLIC_URL=
|
||||
NEXT_PUBLIC_HUB_URL=
|
||||
NEXT_PUBLIC_SERVICE_ID=
|
||||
NEXTAUTH_SECRET=
|
||||
NEXTAUTH_SECRET=
|
||||
|
||||
@@ -48,7 +48,7 @@ export const KursItem = ({
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div className="col-span-2">
|
||||
<div className="flex col-span-2 justify-end">
|
||||
{event.finishedBadges.map((b) => {
|
||||
return <Badge name={b} key={b} />;
|
||||
})}
|
||||
|
||||
@@ -94,22 +94,21 @@ const ModalBtn = ({
|
||||
date.id === selectAppointmentForm.watch("eventAppointmentId") ||
|
||||
selectedAppointment?.id,
|
||||
);
|
||||
const ownIndexInParticipantList =
|
||||
(selectedDate as any)?.Participants?.findIndex(
|
||||
(p: Participant) => p.userId === user.id,
|
||||
) || (selectedDate as any)?.Participants?.length + 1;
|
||||
const ownIndexInParticipantList = (
|
||||
selectedDate as any
|
||||
)?.Participants?.findIndex((p: Participant) => p.userId === user.id);
|
||||
|
||||
const ownPlaceInParticipantList =
|
||||
ownIndexInParticipantList === -1
|
||||
? (selectedDate as any)?.Participants?.length + 1
|
||||
: ownIndexInParticipantList + 1;
|
||||
|
||||
console.log(
|
||||
console.log({
|
||||
selectedDate,
|
||||
ownPlaceInParticipantList > event.maxParticipants!,
|
||||
ownPlaceInParticipantList,
|
||||
event.maxParticipants,
|
||||
);
|
||||
ownIndexInParticipantList,
|
||||
maxParticipants: event.maxParticipants,
|
||||
});
|
||||
|
||||
return (
|
||||
<>
|
||||
|
||||
@@ -28,9 +28,7 @@ export const Badge = ({
|
||||
const image = BadgeImage[name];
|
||||
|
||||
return (
|
||||
<span
|
||||
className={cn("badge badge-secondary badge-outline h-fit p-1", className)}
|
||||
>
|
||||
<span className={cn("flex h-fit p-1", className)}>
|
||||
<img src={image.src} alt={name} width={100} />
|
||||
</span>
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user