From 2df24024d72e6aed2bb6c6e197490265f6db88ba Mon Sep 17 00:00:00 2001
From: Antoine Ordonneau <antoine.ordonneau@univ-lyon1.fr>
Date: Sat, 27 Dec 2025 17:51:12 +0100
Subject: [PATCH 1/4] correction eventDetail

---
 src/layout.jsx                               |  4 +-
 src/pages/eventDetail/eventDetail.jsx        | 58 ++++++++++++++++++++
 src/pages/eventDetail/eventDetail.module.css | 44 +++++++++++++++
 src/router.js                                |  7 ++-
 4 files changed, 110 insertions(+), 3 deletions(-)
 create mode 100644 src/pages/eventDetail/eventDetail.jsx
 create mode 100644 src/pages/eventDetail/eventDetail.module.css

diff --git a/src/layout.jsx b/src/layout.jsx
index 4fa0991..313b6ae 100644
--- a/src/layout.jsx
+++ b/src/layout.jsx
@@ -9,11 +9,11 @@ import { AuthContext } from "./contexts/auth/AuthContext.js";
 
 function Layout(){
 
-    const { user, loading } = useContext(AuthContext);
+    /*const { user, loading } = useContext(AuthContext);
 
     if (loading) return <p>Loading</p>;
     if (!user) return <Navigate to="/login" />;
-    if(user && user.validate === 0) return <Navigate to="/error/validation" />;
+    if(user && user.validate === 0) return <Navigate to="/error/validation" />;*/
 
     return (
         <div>
diff --git a/src/pages/eventDetail/eventDetail.jsx b/src/pages/eventDetail/eventDetail.jsx
new file mode 100644
index 0000000..5f196cb
--- /dev/null
+++ b/src/pages/eventDetail/eventDetail.jsx
@@ -0,0 +1,58 @@
+import { useState } from "react";
+import styles from "./eventDetail.module.css";
+
+
+function eventDetail(){
+
+    const [tasks, setTasks] = useState([
+        { text: "Préparer les slides", completed: false },
+        { text: "Réserver la salle", completed: false },
+        { text: "Envoyer les invitations", completed: false },
+        { text: "Tester la configuration technique", completed: false },
+        { text: "Organiser le catering", completed: false },
+    ]);
+
+    const event = {
+        title: "Conférence React 2025",
+        date: "27 Décembre 2025",
+        location: "Paris, France",
+        description:
+            "Une conférence dédiée aux développeurs React pour partager les dernières nouveautés et bonnes pratiques.",
+    };
+
+    const toggleTask = (index) => {
+        const newTasks = [...tasks];
+        newTasks[index].completed = !newTasks[index].completed;
+        setTasks(newTasks);
+    };
+
+    return (
+        <div className={styles.container}>
+            <h1 className={styles.title}>{event.title}</h1>
+            <div className={styles.eventInfo}>
+                <p><strong>Date:</strong> {event.date}</p>
+                <p><strong>Lieu:</strong> {event.location}</p>
+                <p><strong>Description:</strong> {event.description}</p>
+            </div>
+
+            <h2>Tâches</h2>
+            <ul className={styles.tasks}>
+                {tasks.map((task, index) => (
+                    <li
+                        key={index}
+                        className={task.completed ? styles.completed : ""}
+                    >
+                        <input
+                            type="checkbox"
+                            checked={task.completed}
+                            onChange={() => toggleTask(index)}
+                        />
+                        <span>{task.text}</span>
+                    </li>
+                ))}
+            </ul>
+        </div>
+    );
+}
+
+export default eventDetail;
diff --git a/src/pages/eventDetail/eventDetail.module.css b/src/pages/eventDetail/eventDetail.module.css
new file mode 100644
index 0000000..3c314c4
--- /dev/null
+++ b/src/pages/eventDetail/eventDetail.module.css
@@ -0,0 +1,44 @@
+.container {
+    max-width: 600px;
+    margin: 40px auto;
+    background-color: #fff;
+    border-radius: 10px;
+    box-shadow: 0 4px 8px rgba(0,0,0,0.1);
+    padding: 20px;
+    font-family: Arial, sans-serif;
+}
+
+.title {
+    font-size: 2rem;
+    color: #333;
+    margin-bottom: 10px;
+}
+
+.eventInfo p {
+    margin: 5px 0;
+    font-size: 1rem;
+    color: #555;
+}
+
+.tasks {
+    list-style: none;
+    padding: 0;
+}
+
+.tasks li {
+    background-color: #f9f9f9;
+    margin: 5px 0;
+    padding: 10px;
+    border-radius: 5px;
+    display: flex;
+    align-items: center;
+}
+
+.tasks li.completed {
+    text-decoration: line-through;
+    opacity: 0.6;
+}
+
+.tasks input[type="checkbox"] {
+    margin-right: 10px;
+}
diff --git a/src/router.js b/src/router.js
index 73e049e..abe0254 100644
--- a/src/router.js
+++ b/src/router.js
@@ -10,6 +10,7 @@ import AdminPage from "./pages/Admin/AdminPage.jsx";
 import ValidationErrorPage from "./pages/waitValidationPage/ValidationErrorPage.jsx";
 import VolunteerProfilePage from "./pages/VolunteerProfile/VolunteerProfilePage.jsx";
 import PageNotFound from "./pages/PageNotFound/PageNotFound.jsx";
+import eventDetail from "./pages/eventDetail/eventDetail.jsx";
 
 const router = createBrowserRouter([
     {
@@ -59,7 +60,11 @@ const router = createBrowserRouter([
             {
                 path: "/profile/:id",
                 Component: VolunteerProfilePage,
-            }
+            },
+            {
+                path: "/eventDetail",
+                Component: eventDetail,
+            },
         ]
     }
 ])

From 31e494bb36dd4229b9c155a12e92700696e23508 Mon Sep 17 00:00:00 2001
From: Antoine Ordonneau <antoine.ordonneau@univ-lyon1.fr>
Date: Mon, 5 Jan 2026 09:37:07 +0100
Subject: [PATCH 2/4] merge dev

---
 src/components/Header/Header.jsx      |  8 ++++----
 src/pages/eventDetail/eventDetail.jsx | 13 +------------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/components/Header/Header.jsx b/src/components/Header/Header.jsx
index d467539..a83573b 100644
--- a/src/components/Header/Header.jsx
+++ b/src/components/Header/Header.jsx
@@ -55,9 +55,9 @@ function Header() {
                             <NavLink to="/volunteers" className={({ isActive }) => isActive ? styles.activeLink : styles.link}>
                                 Bénévoles
                             </NavLink>
-                            {user.isAdmin && <NavLink to="/admin" className={({ isActive }) => isActive ? styles.activeLink : styles.link}>
+                            {/*{user.isAdmin && <NavLink to="/admin" className={({ isActive }) => isActive ? styles.activeLink : styles.link}>
                                 Administration
-                            </NavLink>}
+                            </NavLink>}*/}
                         </div>
                     </div>
 
@@ -89,9 +89,9 @@ function Header() {
                     <NavLink to="/volunteers" className={({ isActive }) => isActive ? styles.activeLink : styles.link}>
                         Bénévoles
                     </NavLink>
-                    {user.isAdmin && <NavLink to="/admin" className={({ isActive }) => isActive ? styles.activeLink : styles.link}>
+                    {/*{user.isAdmin && <NavLink to="/admin" className={({ isActive }) => isActive ? styles.activeLink : styles.link}>
                         Administration
-                    </NavLink>}
+                    </NavLink>}*/}
                 </nav>
 
 
diff --git a/src/pages/eventDetail/eventDetail.jsx b/src/pages/eventDetail/eventDetail.jsx
index 5f196cb..64c7721 100644
--- a/src/pages/eventDetail/eventDetail.jsx
+++ b/src/pages/eventDetail/eventDetail.jsx
@@ -4,7 +4,7 @@ import styles from "./eventDetail.module.css";
 
 function eventDetail(){
 
-    const [tasks, setTasks] = useState([
+    const [tasks] = useState([
         { text: "Préparer les slides", completed: false },
         { text: "Réserver la salle", completed: false },
         { text: "Envoyer les invitations", completed: false },
@@ -20,12 +20,6 @@ function eventDetail(){
             "Une conférence dédiée aux développeurs React pour partager les dernières nouveautés et bonnes pratiques.",
     };
 
-    const toggleTask = (index) => {
-        const newTasks = [...tasks];
-        newTasks[index].completed = !newTasks[index].completed;
-        setTasks(newTasks);
-    };
-
     return (
         <div className={styles.container}>
             <h1 className={styles.title}>{event.title}</h1>
@@ -42,11 +36,6 @@ function eventDetail(){
                         key={index}
                         className={task.completed ? styles.completed : ""}
                     >
-                        <input
-                            type="checkbox"
-                            checked={task.completed}
-                            onChange={() => toggleTask(index)}
-                        />
                         <span>{task.text}</span>
                     </li>
                 ))}

From 4a5e2210c8140cef886e496c58123677d2b1afb1 Mon Sep 17 00:00:00 2001
From: Antoine Ordonneau <antoine.ordonneau@univ-lyon1.fr>
Date: Mon, 5 Jan 2026 16:06:32 +0100
Subject: [PATCH 3/4] resolve merge conflict

---
 src/components/Header/Header.jsx | 8 ++++----
 src/layout.jsx                   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/Header/Header.jsx b/src/components/Header/Header.jsx
index a83573b..d467539 100644
--- a/src/components/Header/Header.jsx
+++ b/src/components/Header/Header.jsx
@@ -55,9 +55,9 @@ function Header() {
                             <NavLink to="/volunteers" className={({ isActive }) => isActive ? styles.activeLink : styles.link}>
                                 Bénévoles
                             </NavLink>
-                            {/*{user.isAdmin && <NavLink to="/admin" className={({ isActive }) => isActive ? styles.activeLink : styles.link}>
+                            {user.isAdmin && <NavLink to="/admin" className={({ isActive }) => isActive ? styles.activeLink : styles.link}>
                                 Administration
-                            </NavLink>}*/}
+                            </NavLink>}
                         </div>
                     </div>
 
@@ -89,9 +89,9 @@ function Header() {
                     <NavLink to="/volunteers" className={({ isActive }) => isActive ? styles.activeLink : styles.link}>
                         Bénévoles
                     </NavLink>
-                    {/*{user.isAdmin && <NavLink to="/admin" className={({ isActive }) => isActive ? styles.activeLink : styles.link}>
+                    {user.isAdmin && <NavLink to="/admin" className={({ isActive }) => isActive ? styles.activeLink : styles.link}>
                         Administration
-                    </NavLink>}*/}
+                    </NavLink>}
                 </nav>
 
 
diff --git a/src/layout.jsx b/src/layout.jsx
index 313b6ae..4fa0991 100644
--- a/src/layout.jsx
+++ b/src/layout.jsx
@@ -9,11 +9,11 @@ import { AuthContext } from "./contexts/auth/AuthContext.js";
 
 function Layout(){
 
-    /*const { user, loading } = useContext(AuthContext);
+    const { user, loading } = useContext(AuthContext);
 
     if (loading) return <p>Loading</p>;
     if (!user) return <Navigate to="/login" />;
-    if(user && user.validate === 0) return <Navigate to="/error/validation" />;*/
+    if(user && user.validate === 0) return <Navigate to="/error/validation" />;
 
     return (
         <div>

From a028340cc109cad370c327b8c2797656d6ac12ba Mon Sep 17 00:00:00 2001
From: Antoine Ordonneau <antoine.ordonneau@univ-lyon1.fr>
Date: Sun, 11 Jan 2026 12:56:14 +0100
Subject: [PATCH 4/4] fix admin et eventdetail

---
 .../IncompleteEvent/IncompleteEvent.jsx       |   2 +-
 .../IncompleteEvent.module.css                |  21 +---
 .../PendingMembers/PendingMembers.jsx         |   2 +-
 .../PendingMembers/PendingMembers.module.css  |  16 +--
 src/components/chart/ParticipationChart.jsx   |   2 +-
 src/components/homePage/calendar.jsx          |   4 +-
 src/components/homePage/calendar.module.css   |  19 +---
 src/components/homePage/eventList.jsx         |   4 +-
 src/components/homePage/eventList.module.css  |  20 +---
 src/index.css                                 |  47 ++++----
 src/pages/eventDetail/eventDetail.jsx         |  81 +++++++++-----
 src/pages/eventDetail/eventDetail.module.css  | 104 +++++++++++++-----
 src/router.js                                 |   2 +-
 13 files changed, 166 insertions(+), 158 deletions(-)

diff --git a/src/components/IncompleteEvent/IncompleteEvent.jsx b/src/components/IncompleteEvent/IncompleteEvent.jsx
index b8e3355..3f9beb3 100644
--- a/src/components/IncompleteEvent/IncompleteEvent.jsx
+++ b/src/components/IncompleteEvent/IncompleteEvent.jsx
@@ -21,7 +21,7 @@ function IncompleteEvent() {
       <h2>Événements incomplets</h2>
       <div className={styles.eventsContainer}>
         {incompleteEvents.map((event, index) => (
-          <div key={index} className={`glassCard ${styles.eventCard}`}>
+          <div key={index} className={`glassBorder ${styles.eventCard}`}>
             <h3>{event.title}</h3>
             <ul className={styles.tasksList}>
             {event.tasks.map((task, taskIndex) => (
diff --git a/src/components/IncompleteEvent/IncompleteEvent.module.css b/src/components/IncompleteEvent/IncompleteEvent.module.css
index b3f1d70..0140936 100644
--- a/src/components/IncompleteEvent/IncompleteEvent.module.css
+++ b/src/components/IncompleteEvent/IncompleteEvent.module.css
@@ -28,21 +28,7 @@
 }
 
 .eventsContainer::-webkit-scrollbar {
-  height: 8px;
-}
-
-.eventsContainer::-webkit-scrollbar-track {
-  background: rgba(0, 0, 0, 0.1);
-  border-radius: 10px;
-}
-
-.eventsContainer::-webkit-scrollbar-thumb {
-  background: rgba(30, 96, 249, 0.5);
-  border-radius: 10px;
-}
-
-.eventsContainer::-webkit-scrollbar-thumb:hover {
-  background: rgba(30, 96, 249, 0.7);
+display: none;
 }
 
 .eventCard {
@@ -58,7 +44,6 @@
   opacity: 0;
   transform: translateX(20px);
   animation: slideInEvent 1s ease forwards;
-
   flex-shrink: 1;
   padding: 10px;
   text-align: center;
@@ -89,6 +74,10 @@
   animation-delay: 0.5s;
 }
 
+.eventCard::-webkit-scrollbar {
+  display: none;
+}
+
 .eventCard>h3 {
   font-size: 24px;
 }
diff --git a/src/components/PendingMembers/PendingMembers.jsx b/src/components/PendingMembers/PendingMembers.jsx
index 27dace2..a931496 100644
--- a/src/components/PendingMembers/PendingMembers.jsx
+++ b/src/components/PendingMembers/PendingMembers.jsx
@@ -26,7 +26,7 @@ function pendingMembers() {
       <h2>Membres en attente de validation</h2>
       <div className={styles.membersContainer}>
         {pendingMembers.map((member, index) => (
-          <div key={index} className={`glassCard ${styles.memberCard}`}>
+          <div key={index} className={`glassBorder ${styles.memberCard}`}>
             <p>{member.name}</p>
             <div className={styles.buttonGroup}>
               <Button onClick={() => handleValidate(member.name)} variant="primary">
diff --git a/src/components/PendingMembers/PendingMembers.module.css b/src/components/PendingMembers/PendingMembers.module.css
index 9eaef39..57919c3 100644
--- a/src/components/PendingMembers/PendingMembers.module.css
+++ b/src/components/PendingMembers/PendingMembers.module.css
@@ -19,21 +19,7 @@
 
 
 .membersContainer::-webkit-scrollbar {
-  width: 8px;
-}
-
-.membersContainer::-webkit-scrollbar-track {
-  background: rgba(0, 0, 0, 0.1);
-  border-radius: 10px;
-}
-
-.membersContainer::-webkit-scrollbar-thumb {
-  background: rgba(255, 0, 0, 0.5);
-  border-radius: 10px;
-}
-
-.membersContainer::-webkit-scrollbar-thumb:hover {
-  background: rgba(125, 249, 30, 0.7);
+  display: none;
 }
 
 .memberCard {
diff --git a/src/components/chart/ParticipationChart.jsx b/src/components/chart/ParticipationChart.jsx
index 7ebd731..6af6d0d 100644
--- a/src/components/chart/ParticipationChart.jsx
+++ b/src/components/chart/ParticipationChart.jsx
@@ -40,7 +40,7 @@ function participationChart() {
   return (
     <div className={`${styles.leftBlock} glassCard`}>
       <div className={styles.participationHeader}>
-        <div className={`${styles.partiText} glassCard`}>
+        <div className={`${styles.partiText} glassBorder`}>
           <label htmlFor={styles.months}>Taux de participation depuis :</label>
           <div className={styles.formControl}>
             <FormControl className={styles.formDesign}>
diff --git a/src/components/homePage/calendar.jsx b/src/components/homePage/calendar.jsx
index f8ed8f2..9ee4d57 100644
--- a/src/components/homePage/calendar.jsx
+++ b/src/components/homePage/calendar.jsx
@@ -73,7 +73,7 @@ function Calendar() {
     };
 
     return (
-        <div className={styles.glassCard}>
+        <div className={`${styles.glassCard} glassCard`}>
             <div className={styles.calendarContainer}>
                 <div className={styles.calendarHeader}>
                     <button onClick={handlePrevMonth}>◀</button>
@@ -124,7 +124,7 @@ function Calendar() {
                 </table>
 
                 {selectedDay && (
-                    <div className={styles.eventBox}>
+                    <div className={`${styles.eventBox} glassBorder`}>
                         <h3>Événements du {formatDateLetter(selectedDay.date)}</h3>
 
                         {selectedDay.events.length > 0 ? (
diff --git a/src/components/homePage/calendar.module.css b/src/components/homePage/calendar.module.css
index 534d2c1..ef2f189 100644
--- a/src/components/homePage/calendar.module.css
+++ b/src/components/homePage/calendar.module.css
@@ -109,13 +109,6 @@
     border-radius: 20px;
     padding: 15px;
     margin-top: 16px;
-    border: none;
-    background: rgb(255, 255, 255, 0.25);
-    box-shadow:
-            inset 1.25px 1.25px 1px rgba(255, 255, 255, 1),
-            inset -1.25px -1.25px 1px rgba(255, 255, 255, 1),
-            inset -0.25px 0.25px 1px rgba(0, 0, 0, 0.2),
-            inset 0.25px -0.25px 1px rgba(0, 0, 0, 0.2);
 }
 
 .eventBox ul {
@@ -137,21 +130,11 @@
 
 .glassCard {
     width: 45%;
-    max-height: 450px;
+    max-height: 100%;
     margin: 16px 0px 16px 0px;
     padding: 10px 20px 10px 20px;
     height: fit-content;
-    background: rgba(255, 255, 255, 0.65);
-    backdrop-filter: blur(3px);
-    -webkit-backdrop-filter: blur(3px);
-    border-radius: 20px;
-    border: 1px solid rgba(255, 255, 255, 0.3);
-    box-shadow: 0 8px 32px rgba(0, 0, 0, 0.1),
-    inset 0 1px 0 rgba(255, 255, 255, 0.5),
-    inset 0 -1px 0 rgba(255, 255, 255, 0.1),
-    inset 0 0 8px 4px rgba(255, 255, 255, 0.4);
     overflow: scroll;
-
 }
 
 .glassCard::-webkit-scrollbar{
diff --git a/src/components/homePage/eventList.jsx b/src/components/homePage/eventList.jsx
index be7e903..f6e1de4 100644
--- a/src/components/homePage/eventList.jsx
+++ b/src/components/homePage/eventList.jsx
@@ -17,12 +17,12 @@ function eventList() {
     }, [events]);
 
     return (
-        <div className={styles.glassCard}>
+        <div className={`${styles.glassCard} glassCard`}>
                 <h2>Liste des événements à venir</h2>
                 {sortedEvents.length > 0 ? (
                     <ul className={styles.eventList}>
                         {sortedEvents.map((eventGroup) => (
-                            <li key={eventGroup.date} className={styles.eventGroup}>
+                            <li key={eventGroup.date} className={`${styles.eventGroup} glassBorder`}>
                                 <div className={styles.eventDate}>
                                     <strong>{formatDateLetter(eventGroup.date)}</strong>
                                 </div>
diff --git a/src/components/homePage/eventList.module.css b/src/components/homePage/eventList.module.css
index 0b27a64..b0598e2 100644
--- a/src/components/homePage/eventList.module.css
+++ b/src/components/homePage/eventList.module.css
@@ -1,20 +1,10 @@
 .glassCard {
     width: 45%;
-    max-height: 450px;
+    max-height: 100%;
     margin: 16px 0px 16px 0px;
     padding: 10px 20px 10px 20px;
     height: fit-content;
-    background: rgba(255, 255, 255, 0.65);
-    backdrop-filter: blur(3px);
-    -webkit-backdrop-filter: blur(3px);
-    border-radius: 20px;
-    border: 1px solid rgba(255, 255, 255, 0.3);
-    box-shadow: 0 8px 32px rgba(0, 0, 0, 0.1),
-    inset 0 1px 0 rgba(255, 255, 255, 0.5),
-    inset 0 -1px 0 rgba(255, 255, 255, 0.1),
-    inset 0 0 8px 4px rgba(255, 255, 255, 0.4);
     overflow: scroll;
-
 }
 
 .glassCard::-webkit-scrollbar{
@@ -53,14 +43,6 @@ h2{
 .eventGroup{
     margin: 16px 0px 16px 0px;
     padding: 10px 20px 10px 20px;
-    border-radius: 20px;
-    border: none;
-    background: transparent;
-    box-shadow:
-            inset 1.25px 1.25px 1px rgba(255, 255, 255, 1),
-            inset -1.25px -1.25px 1px rgba(255, 255, 255, 1),
-            inset -0.25px 0.25px 1px rgba(0, 0, 0, 0.2),
-            inset 0.25px -0.25px 1px rgba(0, 0, 0, 0.2);
 }
 
 @media (max-width: 768px) {
diff --git a/src/index.css b/src/index.css
index a4fe9a0..be95afd 100644
--- a/src/index.css
+++ b/src/index.css
@@ -52,33 +52,30 @@ body {
 }
 
 
-/*.glassCard {
-  width: 100%;
-  height: fit-content;
-  background: rgba(255, 255, 255, 0.65);
-  backdrop-filter: blur(3px);
-  -webkit-backdrop-filter: blur(3px);
-  border-radius: 20px;
-  border: 1px solid rgba(255, 255, 255, 0.3);
-  box-shadow:
-          0 8px 32px rgba(0, 0, 0, 0.1),
-          inset 0 1px 0 rgba(255, 255, 255, 0.5),
-          inset 0 -1px 0 rgba(255, 255, 255, 0.1),
-          inset 0 0 8px 4px rgba(255, 255, 255, 0.4);
-  position: relative;
-  overflow: hidden;
-}*/
-
-
-/* style a montrer a giovanni prcq il est + bo */
 .glassCard {
-  background: rgba(255, 255, 255, 0.2);
-  backdrop-filter: blur(10px);
-  border-radius: 20px;
-  padding: 15px;
-  box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
-  border: 1px solid rgba(255, 255, 255, 0.3);
+    padding: 10px 20px 10px 20px;
+    background: rgba(255, 255, 255, 0.54);
+    backdrop-filter: blur(3px);
+    -webkit-backdrop-filter: blur(3px);
+    border-radius: 20px;
+    border: 1px solid rgba(255, 255, 255, 0.2);
+    box-shadow: 0 8px 32px rgba(0, 0, 0, 0.1),
+    inset 0 1px 0 rgba(255, 255, 255, 0.3),
+    inset 0 -1px 0 rgba(255, 255, 255, 0.05),
+    inset 0 0 8px 4px rgba(255, 255, 255, 0.2);
 }
+
+.glassBorder{
+    border-radius: 20px;
+    border: none;
+    background: rgba(255, 255, 255, 0.5);
+    box-shadow:
+            inset 1.25px 1.25px 1px rgba(255, 255, 255, 1),
+            inset -1.25px -1.25px 1px rgba(255, 255, 255, 1),
+            inset -0.25px 0.25px 1px rgba(0, 0, 0, 0.2),
+            inset 0.25px -0.25px 1px rgba(0, 0, 0, 0.2);
+}
+
 h1 {
   font-size: 3.2em;
   line-height: 1.1;
diff --git a/src/pages/eventDetail/eventDetail.jsx b/src/pages/eventDetail/eventDetail.jsx
index 64c7721..4d4669a 100644
--- a/src/pages/eventDetail/eventDetail.jsx
+++ b/src/pages/eventDetail/eventDetail.jsx
@@ -1,47 +1,70 @@
-import { useState } from "react";
+import {useState} from "react";
 import styles from "./eventDetail.module.css";
+import { useParams } from "react-router";
 
 
-function eventDetail(){
+function eventDetail() {
 
-    const [tasks] = useState([
-        { text: "Préparer les slides", completed: false },
-        { text: "Réserver la salle", completed: false },
-        { text: "Envoyer les invitations", completed: false },
-        { text: "Tester la configuration technique", completed: false },
-        { text: "Organiser le catering", completed: false },
+    const params = useParams();
+    const id = params.id;
+
+    const [tasks, setTasks] = useState([
+        { text: "Préparer les slides", registered: false },
+        { text: "Réserver la salle", registered: false },
+        { text: "Envoyer les invitations", registered: false },
+        { text: "Tester la configuration technique", registered: false },
+        { text: "Organiser le catering", registered: false },
     ]);
 
     const event = {
         title: "Conférence React 2025",
         date: "27 Décembre 2025",
         location: "Paris, France",
-        description:
-            "Une conférence dédiée aux développeurs React pour partager les dernières nouveautés et bonnes pratiques.",
+        description: "azertyuiop azertyuiop azertyuiop azertyuiop azertyuiop azertyuiop azertyuiop azertyuiop azertyuiop azertyuiop azertyuiop azertyuiop"
+    };
+
+    const toggleRegister = (index) => {
+        setTasks((prevTasks) =>
+            prevTasks.map((task, i) =>
+                i === index
+                    ? { ...task, registered: !task.registered }
+                    : task
+            )
+        );
     };
 
     return (
-        <div className={styles.container}>
-            <h1 className={styles.title}>{event.title}</h1>
-            <div className={styles.eventInfo}>
-                <p><strong>Date:</strong> {event.date}</p>
-                <p><strong>Lieu:</strong> {event.location}</p>
-                <p><strong>Description:</strong> {event.description}</p>
-            </div>
+        <div className={styles.allContent}>
+            <div className={`glassCard`}>
+                <div className={styles.textImage}>
+                    <img src="/public/icons/theme/dark.svg" alt="Illustration événement" className={styles.eventImage}/>
+                    <div className={styles.eventInfo}>
+                        <h2>{event.title}</h2>
+                        <p>Date: {event.date}</p>
+                        <p>Lieu: {event.location}</p>
+                        <p>Description: {event.description}</p>
+                    </div>
+                </div>
 
-            <h2>Tâches</h2>
-            <ul className={styles.tasks}>
-                {tasks.map((task, index) => (
-                    <li
-                        key={index}
-                        className={task.completed ? styles.completed : ""}
-                    >
-                        <span>{task.text}</span>
-                    </li>
-                ))}
-            </ul>
+                <h2>Tâches</h2>
+                <ul className={styles.tasks}>
+                    {tasks.map((task, index) => (
+                        <li style={{"--i": index}} key={index}>
+                            <div className={styles.tasksButton}>
+                                <span><strong>{task.text}</strong></span>
+                                <button
+                                    className={styles.registerButton}
+                                    onClick={() => toggleRegister(index)}
+                                >
+                                    {task.registered ? "Se désinscrire" : "S’inscrire"}
+                                </button>
+                            </div>
+                        </li>
+                    ))}
+                </ul>
+            </div>
         </div>
     );
 }
 
-export default eventDetail;
+export default eventDetail;
\ No newline at end of file
diff --git a/src/pages/eventDetail/eventDetail.module.css b/src/pages/eventDetail/eventDetail.module.css
index 3c314c4..4c81bb5 100644
--- a/src/pages/eventDetail/eventDetail.module.css
+++ b/src/pages/eventDetail/eventDetail.module.css
@@ -1,23 +1,62 @@
-.container {
-    max-width: 600px;
-    margin: 40px auto;
-    background-color: #fff;
-    border-radius: 10px;
-    box-shadow: 0 4px 8px rgba(0,0,0,0.1);
-    padding: 20px;
-    font-family: Arial, sans-serif;
+.allContent{
+    margin: 16px 0px 16px 0px;
+    align-self: center;
+    width: 90%;
 }
 
-.title {
-    font-size: 2rem;
-    color: #333;
-    margin-bottom: 10px;
+
+.textImage {
+    display: flex;
+    gap: 24px;
+}
+
+.eventImage {
+    width: 40%;
+    aspect-ratio: 16 / 9;
+    background-color: #e0e0e0;
+    border-radius: 16px;
+    flex-shrink: 0;
+}
+
+.eventInfo {
+    flex: 1;
+    min-width: 0;
+    overflow-wrap: break-word;
 }
 
 .eventInfo p {
-    margin: 5px 0;
-    font-size: 1rem;
-    color: #555;
+    white-space: normal;
+    overflow-wrap: break-word;
+}
+
+.eventImage {
+    width: 40%;
+    height: 100%;
+    aspect-ratio: 16 / 9;
+    background-color: #e0e0e0;
+    border-radius: 16px;
+    flex-shrink: 0;
+}
+
+.registerButton {
+    margin-left: auto;
+    padding: 5px 10px;
+    border-radius: 12px;
+    border: none;
+    cursor: pointer;
+    background: #019AFF;
+    color: white;
+    font-weight: 600;
+}
+
+.registerButton:hover {
+    opacity: 0.85;
+}
+
+.tasksButton {
+    display: flex;
+    align-items: center;
+    gap: 16px;
 }
 
 .tasks {
@@ -26,19 +65,28 @@
 }
 
 .tasks li {
-    background-color: #f9f9f9;
-    margin: 5px 0;
-    padding: 10px;
-    border-radius: 5px;
-    display: flex;
-    align-items: center;
+    margin: 16px 0px 16px 0px;
+    padding: 10px 20px 10px 20px;
+    border-radius: 20px;
+    border: none;
+    background: transparent;
+    box-shadow:
+            inset 1.25px 1.25px 1px rgba(255, 255, 255, 1),
+            inset -1.25px -1.25px 1px rgba(255, 255, 255, 1),
+            inset -0.25px 0.25px 1px rgba(0, 0, 0, 0.2),
+            inset 0.25px -0.25px 1px rgba(0, 0, 0, 0.2);
+    opacity: 0;
+    animation: fadeInUp 0.6s ease-out forwards;
+    animation-delay: calc(var(--i) * 0.1s);
 }
 
-.tasks li.completed {
-    text-decoration: line-through;
-    opacity: 0.6;
-}
-
-.tasks input[type="checkbox"] {
-    margin-right: 10px;
+@keyframes fadeInUp {
+    from {
+        opacity: 0;
+        transform: translateY(10px);
+    }
+    to {
+        opacity: 1;
+        transform: translateY(0);
+    }
 }
diff --git a/src/router.js b/src/router.js
index abe0254..9e3d04f 100644
--- a/src/router.js
+++ b/src/router.js
@@ -62,7 +62,7 @@ const router = createBrowserRouter([
                 Component: VolunteerProfilePage,
             },
             {
-                path: "/eventDetail",
+                path: "/events/:id",
                 Component: eventDetail,
             },
         ]