cdricms/latosa-escrima
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev/guerby' into dev/cedric

Browse Source
This commit is contained in:
cdricms
2025-02-11 10:27:23 +01:00
parent f84f7fcf8b 3412a764fc
commit 155eee127b
2 changed files with 48 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
frontend/components/event-dialog.tsx
View File

@@ -61,14 +61,14 @@ export const EventForm: React.FC<
const form = useForm<EventFormValues>({
resolver: zodResolver(eventFormSchema),
defaultValues: {
title: isCalendarEventExternal(event) ? event.title : "",
startDate: isCalendarEventExternal(event) ? new Date(event.start) : new Date(),
startTime: isCalendarEventExternal(event) ? `${new Date(event.start).getHours()}:${new Date(event.start).getMinutes()}` : "10:00",
endDate: isCalendarEventExternal(event) ? new Date(event.end) : new Date(),
endTime: isCalendarEventExternal(event) ? `${new Date(event.end).getHours()}:${new Date(event.end).getMinutes()}` : "11:00",
fullDay: isCalendarEventExternal(event) ? event.fullday : false,
frequency: isCalendarEventExternal(event) ? event.rrule : "unique",
isVisible: isCalendarEventExternal(event) ? event.visibility : true,
title: event.title ? event.title : "",
startDate: new Date(), // event.start),
startTime: `${new Date(event.start).getHours()}:${new Date(event.start).getMinutes()}`,
endDate: new Date(), // event.end),
endTime: `${new Date(event.end).getHours()}:${new Date(event.end).getMinutes()}`,
fullDay: event.fullday,
frequency: "unique",
isVisible: event.isVisible,
},
})
@@ -114,7 +114,7 @@ export const EventForm: React.FC<
variant="outline"
className={cn("w-full pl-3 text-left font-normal", !field.value && "text-muted-foreground")}
>
{field.value ? format(field.value, "dd/MM/yyyy") : <span>Choisis une date</span>}
{field.value ? format(field.value, "yyyy-mm-dd hh:mm") : <span>Choisis une date</span>}
<CalendarIcon className="ml-auto h-4 w-4 opacity-50" />
</Button>
</FormControl>
@@ -156,7 +156,7 @@ export const EventForm: React.FC<
variant="outline"
className={cn("w-full pl-3 text-left font-normal", !field.value && "text-muted-foreground")}
>
{field.value ? format(field.value, "MM/dd/yyyy") : <span>Choisis une date</span>}
{field.value ? format(field.value, "yyyy-mm-dd hh:mm") : <span>Choisis une date</span>}
<CalendarIcon className="ml-auto h-4 w-4 opacity-50" />
</Button>
</FormControl>

48
frontend/components/gallery.tsx
View File

@@ -52,6 +52,30 @@ const data = [
href: "#",
image: "https://shadcnblocks.com/images/block/placeholder-dark-1.svg",
},
{
id: "item-6",
title: "Duis sem sem, gravida vel porttitor eu, volutpat ut arcu",
summary:
"Pellentesque eget quam ligula. Sed felis ante, consequat nec ultrices ut, ornare quis metus. Vivamus sit amet tortor vel enim sollicitudin hendrerit.",
href: "#",
image: "https://shadcnblocks.com/images/block/placeholder-dark-1.svg",
},
{
id: "item-5",
title: "Duis sem sem, gravida vel porttitor eu, volutpat ut arcu",
summary:
"Pellentesque eget quam ligula. Sed felis ante, consequat nec ultrices ut, ornare quis metus. Vivamus sit amet tortor vel enim sollicitudin hendrerit.",
href: "#",
image: "https://shadcnblocks.com/images/block/placeholder-dark-1.svg",
},
{
id: "item-6",
title: "Duis sem sem, gravida vel porttitor eu, volutpat ut arcu",
summary:
"Pellentesque eget quam ligula. Sed felis ante, consequat nec ultrices ut, ornare quis metus. Vivamus sit amet tortor vel enim sollicitudin hendrerit.",
href: "#",
image: "https://shadcnblocks.com/images/block/placeholder-dark-1.svg",
},
];
const Gallery: React.FC<
@@ -136,16 +160,20 @@ const Gallery: React.FC<
}}
>
<CarouselContent className="">
{children
? children
: data.map((item) => (
<CarouselItem
key={item.id}
className="pl-[20px] md:max-w-[452px]"
>
<DefaultGalleryItem item={item} />
</CarouselItem>
))}
{children ? children
: data.map((it) => (
<CarouselItem>
<div className="grid gap-y-8 grid-cols-4 grid-rows-2">
{data.map(item => (
<div
key={item.id}
className="pl-[20px] md:max-w-[452px]">
<DefaultGalleryItem item={item} />
</div>))}
</div>
</CarouselItem>
))
}
</CarouselContent>
</Carousel>
</div>