From 4323e5fc8541fa22ccb53f53116b2fe9d980ee65 Mon Sep 17 00:00:00 2001 From: Julien Rousseau Date: Fri, 7 Feb 2025 22:38:34 -0500 Subject: [PATCH] started work on desktop view --- packages/web/src/components/Calendar.astro | 23 +++++++++++------ packages/web/src/pages/horaire.astro | 29 +++++++++++++++++++++- 2 files changed, 44 insertions(+), 8 deletions(-) diff --git a/packages/web/src/components/Calendar.astro b/packages/web/src/components/Calendar.astro index 34e7d07..aa13f85 100644 --- a/packages/web/src/components/Calendar.astro +++ b/packages/web/src/components/Calendar.astro @@ -88,6 +88,13 @@ function formatTime(time: number | Time): string { typeof time === "number" ? Math.round((time - hour) * 60) : time.minute; return `${hour.toString().padStart(2, "0")}:${minutes.toString().padStart(2, "0")}`; } + +/*** + * Changes from a 'sunday to saturday' week index to a 'monday to sunday' week index. + */ +function shiftWeekday(weekday: number) { + return (weekday + 6) % 7; +} ---
@@ -100,12 +107,12 @@ function formatTime(time: number | Time): string { > { // --- Weekday column headers --- - ["L", "M", "M", "J", "V", "S", "D"].map((weekday, i) => ( + weekdays.map((weekday, i) => (
- {weekday} + {weekday[0]}
)) } @@ -162,13 +169,13 @@ function formatTime(time: number | Time): string { marginLeft, background: activity.color, "grid-row": `${(activity.time.start.hour - timeMin) * cellScale + activity.time.start.minute / minuteScale + 2} / span ${(activity.time.end.hour - activity.time.start.hour) * cellScale + (activity.time.end.minute - activity.time.start.minute) / minuteScale}`, - "grid-column": ((weekday + 6) % 7) + 2, + "grid-column": shiftWeekday(weekday) + 2, "outline-style": "solid", "outline-color": contrast(activity.color), }} class={cn([ "activity", - "min-w-0 min-h-0 rounded p-1 ml-auto bg-primary relative", + "min-w-0 min-h-0 rounded p-1 ml-auto bg-primary relative overflow-hidden", "outline-0 hocus:outline-2 hocus:border-none", "data-[showcased=true]:outline-2 data-[showcased=true]:border-none data-[showcased=true]:z-20 ", dark(activity.color) && "text-white", @@ -190,11 +197,13 @@ function formatTime(time: number | Time): string { {formatTime(activity.time.end)} - + {activity.title} {activity.subtitle?.length && ( - {activity.subtitle} + + {activity.subtitle} + )}