From c207f494c7d2026af33f1e4a8775fac2bfe60755 Mon Sep 17 00:00:00 2001 From: Alma Date: Sun, 13 Apr 2025 17:44:51 +0200 Subject: [PATCH] calendar 40 --- components/calendar/calendar-client.tsx | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/components/calendar/calendar-client.tsx b/components/calendar/calendar-client.tsx index 710f7b39..a1f744dd 100644 --- a/components/calendar/calendar-client.tsx +++ b/components/calendar/calendar-client.tsx @@ -1107,11 +1107,11 @@ export function CalendarClient({ initialCalendars, userId, userProfile }: Calend .filter(cal => visibleCalendarIds.includes(cal.id)) .flatMap(cal => (cal.events || []).map(event => ({ - id: event.id, - title: event.title, + id: event.id, + title: event.title, start: new Date(event.start), end: new Date(event.end), - allDay: event.isAllDay, + allDay: event.isAllDay, description: event.description, location: event.location, calendarId: event.calendarId, @@ -1122,19 +1122,20 @@ export function CalendarClient({ initialCalendars, userId, userProfile }: Calend location: event.location, description: event.description, calendarId: event.calendarId, - originalEvent: event + originalEvent: event, + color: cal.color } })) )} eventContent={(arg) => (
-
+
{!arg.event.allDay && ( {new Date(arg.event.start).toLocaleTimeString('fr-FR', { @@ -1151,7 +1152,7 @@ export function CalendarClient({ initialCalendars, userId, userProfile }: Calend )} eventClassNames={(arg) => [ 'hover:ring-2 hover:ring-offset-1', - 'transition-all duration-200', + 'transition-all duration-150', arg.event.allDay ? 'py-1' : '' ]} locale={frLocale}