From f7e041658def57740b50f147e291dda5894c2d54 Mon Sep 17 00:00:00 2001 From: ORDONNEAU Antoine Date: Tue, 3 Mar 2026 11:12:24 +0100 Subject: [PATCH] correction calendrier + correction export ics --- .../Home/components/Calendar/calendar.jsx | 40 ++++++++++++++----- .../components/Calendar/calendar.module.css | 4 ++ 2 files changed, 33 insertions(+), 11 deletions(-) diff --git a/src/pages/Home/components/Calendar/calendar.jsx b/src/pages/Home/components/Calendar/calendar.jsx index 556c099..9519b77 100644 --- a/src/pages/Home/components/Calendar/calendar.jsx +++ b/src/pages/Home/components/Calendar/calendar.jsx @@ -1,11 +1,15 @@ import {useState, useMemo, useEffect, useContext} from "react"; import styles from "./calendar.module.css"; -import { formatDateLetterJS } from "../../../../utils/date/formatDateLetter.js"; +import {formatDateLetterJS} from "../../../../utils/date/formatDateLetter.js"; import {EventContext} from "../../../../contexts/events/EventContext.js"; +import Button from "../../../../components/ui/button/button.jsx"; +import {AuthContext} from "../../../../contexts/auth/AuthContext.ts"; function Calendar() { const { events } = useContext(EventContext); + const { user } = useContext(AuthContext); + const monthNames = [ "Janvier", "Février", "Mars", "Avril", "Mai", "Juin", @@ -19,15 +23,15 @@ function Calendar() { const [selectedDay, setSelectedDay] = useState(null); const eventsByDate = useMemo(() => { - return events.reduce((acc, ev) => { - if (!ev?.start) return acc; - - const dateKey = ev.start.split(" ")[0]; // YYYY-MM-DD + if (!user?.tasks) return {}; + return user.tasks.reduce((acc, task) => { + if (!task?.start) return acc; + const dateKey = task.start.split(" ")[0]; if (!acc[dateKey]) acc[dateKey] = []; - acc[dateKey].push(ev); + acc[dateKey].push(task); return acc; }, {}); - }, [events]); + }, [user]); useEffect(() => { const key = `${today.getFullYear()}-${String(today.getMonth() + 1).padStart(2, "0")}-${String(today.getDate()).padStart(2, "0")}`; @@ -72,12 +76,17 @@ function Calendar() { - - + + + + + + + - {Array.from({ length: Math.ceil(days.length / 7) }).map((_, w) => ( + {Array.from({length: Math.ceil(days.length / 7)}).map((_, w) => ( {days.slice(w * 7, w * 7 + 7).map((day, i) => { if (!day) return ; @@ -111,7 +120,7 @@ function Calendar() {
LunMarMerJeuVenSamDimLunMarMerJeuVenSamDim