Merge branch 'dev' into 'eventDetail'

# Conflicts:
#   src/components/homePage/calendar.jsx
#   src/components/homePage/eventList.jsx

src/components/homePage/eventList.jsx

@@ -1,21 +1,17 @@
-import {useMemo} from "react";
+import { useMemo } from "react";
 import styles from "./eventList.module.css";
-import formatDateLetter from "../../utils/date/formatDateLetter.js";
-function eventList() {
-    const events = {
-        "2025-11-07": ["Réunion de projet", "Anniversaire de Marie"],
-        "2025-11-10": ["Cours de React", "Rendez-vous médecin"],
-        "2025-11-14": ["Sortie cinéma"],
-        "2025-11-15": ["Sortie cinéma"],
-        "2025-11-17": ["Sortie cinéma"],
-    };
+import { formatDateLetter } from "../../utils/date/formatDateLetter.js";
+
+
+function EventList({ events }) {
 
     const sortedEvents = useMemo(() => {
-        return Object.entries(events)
-            .map(([dateKey, eventList]) => ({date: dateKey, events: eventList}))
-            .sort((a, b) => new Date(a.date) - new Date(b.date));
+        return [...events].sort(
+            (a, b) => new Date(a.start) - new Date(b.start)
+        );
     }, [events]);
 
+
     return (
         <div className={`${styles.glassCard} glassCard`}>
                 <h2>Liste des événements à venir</h2>
@@ -27,11 +23,15 @@ function eventList() {
                                     <strong>{formatDateLetter(eventGroup.date)}</strong>
                                 </div>
                                 <ul className={styles.eventDetails}>
-                                    {eventGroup.events.map((event, i) => (
-                                        <li key={i}>- {event}</li>
+                                    {eventGroup.tasks.map((task, i) => (
+                                        <li key={i} className={styles.eventTasks}>
+                                            <p>- {task.name} - {task.description}</p>
+                                            <p>{formatDateLetter(task.start)} - {formatDateLetter(task.end)}</p>
+                                        </li>
                                     ))}
                                 </ul>
                             </li>
+
                         ))}
                     </ul>
                 ) : (
@@ -42,4 +42,4 @@ function eventList() {
     );
 }
 
-export default eventList;
+export default EventList;