Merge branch 'dev' into 'eventDetail'

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

src/components/Header/Header.jsx

@@ -55,11 +55,11 @@ function Header() {
                             <NavLink to="/volunteers" className={({ isActive }) => isActive ? styles.activeLink : styles.link}>
                                 Bénévoles
                             </NavLink>
-                            {/*{user?.isAdmin && (
+                            {user?.isAdmin && (
                                 <NavLink to="/admin" className={({ isActive }) => isActive ? styles.activeLink : styles.link}>
                                     Administration
                                 </NavLink>
-                            )}*/}
+                            )}
                         </div>
                     </div>
 
@@ -91,11 +91,11 @@ function Header() {
                     <NavLink to="/volunteers" className={({ isActive }) => isActive ? styles.activeLink : styles.link}>
                         Bénévoles
                     </NavLink>
-                    {/*{user?.isAdmin && (
+                    {user?.isAdmin && (
                         <NavLink to="/admin" className={({ isActive }) => isActive ? styles.activeLink : styles.link}>
                             Administration
                         </NavLink>
-                    )}*/}
+                    )}
                 </nav>
 
 

src/components/createEventBtn/CreateEventBtn.jsx

@@ -11,10 +11,15 @@ export default function CreateEventBtn() {
     const [isOpen, setIsOpen] = useState(false);
     const [name, setName] = useState("");
     const [description, setDescription] = useState("");
+    const [start, setStart] = useState("");
+    const [end, setEnd] = useState("");
 
     const handleCreateEvent = async () => {
 
-        if(name !== "" || description !== "") await createEvent(name, description);
+        if(name !== "" || description !== "" || start !== "" || end !== "") {
+            await createEvent(name, description, start, end);
+            console.log(start);
+        }
         setIsOpen(false);
     }
 
@@ -26,16 +31,29 @@ export default function CreateEventBtn() {
             <section className={styles.section}>
                 <div className={styles.inputContainer}>
                     <h2>Titre</h2>
-                    <TextInput placeholder={"Nom de l'événement"} value={name} onChange={e => setName(e.target.value)} />
+                    <TextInput className={styles.input} placeholder={"Nom de l'événement"} value={name} onChange={e => setName(e.target.value)} />
                 </div>
 
                 <div className={styles.inputContainer}>
                     <h2>Description</h2>
-                    <TextInput placeholder={"Description de l'événement"} value={description} onChange={e => setDescription(e.target.value)} />
+                    <TextInput className={styles.input} placeholder={"Description de l'événement"} value={description} onChange={e => setDescription(e.target.value)} />
+                </div>
+
+                <div className={styles.inputContainer}>
+                    <h2>Date</h2>
+                    <div className={styles.dateInputContainer}>
+                        <div className={styles.dateInput}>
+                            <p>Début</p>
+                            <TextInput type={"datetime-local"} value={start} onChange={e => setStart(e.target.value)} />
+                        </div>
+                        <div className={styles.dateInput}>
+                            <p>Fin</p>
+                            <TextInput type={"datetime-local"} value={end} onChange={e => setEnd(e.target.value)} />
+                        </div>
+                    </div>
                 </div>
 
                 <Button onClick={handleCreateEvent} className={styles.create}>Créer</Button>
-
             </section>
         </Modal>
     </>

src/components/createEventBtn/createEventBtn.module.css

@@ -26,6 +26,14 @@
     }
 
     margin: 1em;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+}
+
+.input {
+    width: 70%;
 }
 
 .create {
@@ -38,4 +46,14 @@
     gap: 10px;
     margin-top: 15px;
     margin-bottom: 15px;
+}
+
+.dateInputContainer {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-evenly;
+}
+
+.dateInput {
+ margin: 1em;
 }

src/components/homePage/calendar.jsx

@@ -1,30 +1,39 @@
-import {useState} from "react";
+import { useState, useMemo, useEffect } from "react";
 import styles from "./calendar.module.css";
-import formatDateLetter from "../../utils/date/formatDateLetter.js";
+import { formatDateLetterJS } from "../../utils/date/formatDateLetter.js";
+
+function Calendar({ events = [] }) {
 
-function Calendar() {
-    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"],
-    };
     const monthNames = [
         "Janvier", "Février", "Mars", "Avril", "Mai", "Juin",
         "Juillet", "Août", "Septembre", "Octobre", "Novembre", "Décembre"
     ];
 
     const today = new Date();
+
     const [currentMonth, setCurrentMonth] = useState(today.getMonth());
     const [currentYear, setCurrentYear] = useState(today.getFullYear());
-    const [selectedDay, setSelectedDay] = useState(() => {
-        const year = today.getFullYear();
-        const month = String(today.getMonth() + 1).padStart(2, "0");
-        const day = String(today.getDate()).padStart(2, "0");
-        const key = `${year}-${month}-${day}`;
-        return {date: key, events: events[key] || []};
-    });
+    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 (!acc[dateKey]) acc[dateKey] = [];
+            acc[dateKey].push(ev);
+            return acc;
+        }, {});
+    }, [events]);
+
+    useEffect(() => {
+        const key = `${today.getFullYear()}-${String(today.getMonth() + 1).padStart(2, "0")}-${String(today.getDate()).padStart(2, "0")}`;
+
+        setSelectedDay({
+            date: key,
+            events: eventsByDate[key] || []
+        });
+    }, [eventsByDate]);
 
     const daysInMonth = new Date(currentYear, currentMonth + 1, 0).getDate();
     const firstDay = new Date(currentYear, currentMonth, 1).getDay();
@@ -34,87 +43,55 @@ function Calendar() {
     for (let i = 0; i < startDay; i++) days.push(null);
     for (let i = 1; i <= daysInMonth; i++) days.push(i);
 
-    const handlePrevMonth = () => {
-        let newMonth = currentMonth - 1;
-        let newYear = currentYear;
-
-        if (newMonth < 0) {
-            newMonth = 11;
-            newYear--;
-        }
-
-        setCurrentMonth(newMonth);
-        setCurrentYear(newYear);
-
-        const key = `${newYear}-${String(newMonth + 1).padStart(2, "0")}-01`;
-        setSelectedDay({date: key, events: events[key] || []});
-    };
-
-    const handleNextMonth = () => {
-        let newMonth = currentMonth + 1;
-        let newYear = currentYear;
-
-        if (newMonth > 11) {
-            newMonth = 0;
-            newYear++;
-        }
-
-        setCurrentMonth(newMonth);
-        setCurrentYear(newYear);
-
-        const key = `${newYear}-${String(newMonth + 1).padStart(2, "0")}-01`;
-        setSelectedDay({date: key, events: events[key] || []});
+    const selectDay = (year, month, day) => {
+        const key = `${year}-${String(month + 1).padStart(2, "0")}-${String(day).padStart(2, "0")}`;
+        setSelectedDay({
+            date: key,
+            events: eventsByDate[key] || []
+        });
     };
 
     const handleDayClick = (day) => {
         if (!day) return;
-        const key = `${currentYear}-${String(currentMonth + 1).padStart(2, "0")}-${String(day).padStart(2, "0")}`;
-        setSelectedDay({date: key, events: events[key] || []});
+        selectDay(currentYear, currentMonth, day);
     };
 
     return (
         <div className={`${styles.glassCard} glassCard`}>
             <div className={styles.calendarContainer}>
+
                 <div className={styles.calendarHeader}>
-                    <button onClick={handlePrevMonth}>◀</button>
+                    <button onClick={() => setCurrentMonth(m => m === 0 ? 11 : m - 1)}>◀</button>
                     <p>{monthNames[currentMonth]} {currentYear}</p>
-                    <button onClick={handleNextMonth}>▶</button>
+                    <button onClick={() => setCurrentMonth(m => m === 11 ? 0 : m + 1)}>▶</button>
                 </div>
 
                 <table className={styles.calendar}>
                     <thead>
                     <tr>
-                        <th>Lun</th>
-                        <th>Mar</th>
-                        <th>Mer</th>
-                        <th>Jeu</th>
-                        <th>Ven</th>
-                        <th>Sam</th>
-                        <th>Dim</th>
+                        <th>Lun</th><th>Mar</th><th>Mer</th>
+                        <th>Jeu</th><th>Ven</th><th>Sam</th><th>Dim</th>
                     </tr>
                     </thead>
-
                     <tbody>
-                    {Array.from({length: Math.ceil(days.length / 7)}).map((_, weekIndex) => (
-                        <tr key={weekIndex}>
-                            {days.slice(weekIndex * 7, weekIndex * 7 + 7).map((day, index) => {
+                    {Array.from({ length: Math.ceil(days.length / 7) }).map((_, w) => (
+                        <tr key={w}>
+                            {days.slice(w * 7, w * 7 + 7).map((day, i) => {
+                                if (!day) return <td key={i}></td>;
+
                                 const key = `${currentYear}-${String(currentMonth + 1).padStart(2, "0")}-${String(day).padStart(2, "0")}`;
-                                const hasEvent = events[key];
+                                const hasEvent = (eventsByDate[key]?.length ?? 0) > 0;
 
                                 return (
                                     <td
-                                        key={index}
+                                        key={i}
                                         className={[
-                                            day === today.getDate() &&
-                                            currentMonth === today.getMonth() &&
-                                            currentYear === today.getFullYear()
-                                                ? styles.today : "",
                                             hasEvent ? styles.hasEvent : "",
                                             selectedDay?.date === key ? styles.selected : ""
                                         ].join(" ")}
                                         onClick={() => handleDayClick(day)}
                                     >
-                                        {day || ""}
+                                        {day}
                                     </td>
                                 );
                             })}
@@ -129,8 +106,11 @@ function Calendar() {
 
                         {selectedDay.events.length > 0 ? (
                             <ul>
-                                {selectedDay.events.map((ev, i) => (
-                                    <li key={i}>{ev}</li>
+                                {selectedDay.events.map(ev => (
+                                    <li key={ev.id}>
+                                        <strong>{ev.name}</strong><br />
+                                        {ev.description}
+                                    </li>
                                 ))}
                             </ul>
                         ) : (

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;

src/components/homePage/eventList.module.css

@@ -25,9 +25,8 @@
 }
 
 .eventDetails {
-    list-style: none;
+    margin-top: 10px;
     padding: 0;
-    margin: 0;
 }
 
 .dateSelected{
@@ -45,6 +44,22 @@ h2{
     padding: 10px 20px 10px 20px;
 }
 
+.eventTitle {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+}
+
+.title {
+    font-weight: bold;
+}
+
+.eventTasks {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+}
+
 @media (max-width: 768px) {
     .glassCard {
         width: 100%;

src/pages/Home/HomePage.jsx

@@ -1,15 +1,26 @@
 import styles from "./HomePage.module.css";
 import Calendar from "../../components/homePage/calendar.jsx";
 import EventList from "../../components/homePage/eventList.jsx";
+import { useState, useEffect } from "react";
+import getAllEvents from "../../utils/event/getAllEvents.js";
 
 function HomePage() {
+
+    const [events, setEvents] = useState([]);
+
+    useEffect(() => {
+        (async () => {
+            const data = await getAllEvents();
+            setEvents(data.data);
+        }) ()
+    }, [])
+
     return (
         <div className={styles.allContent}>
-            <Calendar />
-
-            <EventList />
+            <Calendar events={events} />
+            <EventList events={events} />
         </div>
     );
 }
 
-export default HomePage;
+export default HomePage;

src/utils/date/formatDateLetter.js

@@ -1,8 +1,22 @@
-export default function formatDateLetter(d) {
+export function formatDateLetter(d) {
     const monthNames = [
         "Janvier", "Février", "Mars", "Avril", "Mai", "Juin",
         "Juillet", "Août", "Septembre", "Octobre", "Novembre", "Décembre"
     ];
-        const [year, month, day] = d.split('-');
-        return `${day} ${monthNames[parseInt(month) - 1]} ${year}`;
-};
+
+    const [datePart, timePart] = d.split(' ');
+    const [year, month, day] = datePart.split('-');
+    const [hours, minutes] = timePart.split(':');
+
+    return `${day} ${monthNames[parseInt(month, 10) - 1]} ${year} à ${hours}:${minutes}`;
+}
+
+
+export function formatDateLetterJS(d) {
+    const monthNames = [
+        "Janvier", "Février", "Mars", "Avril", "Mai", "Juin",
+        "Juillet", "Août", "Septembre", "Octobre", "Novembre", "Décembre"
+    ];
+    const [year, month, day] = d.split('-');
+    return `${day} ${monthNames[parseInt(month) - 1]} ${year}`;
+}

src/utils/event/createEvent.js

@@ -1,6 +1,6 @@
 import getXSRFToken from "../getXSRF.js";
 
-export default async function createEvent(name, description) {
+export default async function createEvent(name, description, start, end) {
     const csrfToken = await getXSRFToken();
 
     try {
@@ -12,7 +12,7 @@ export default async function createEvent(name, description) {
                 'X-XSRF-TOKEN': csrfToken,
                 'Accept': 'application/json'
             },
-            body: JSON.stringify({ name, description }),
+            body: JSON.stringify({ name, description, start, end }),
         });
 
         const data = await response.json();