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] 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>