Merge branch 'dev' into features/notifications

# Conflicts:
#	package-lock.json
#	package.json
#	src/components/Header/Header.jsx

src/pages/Profile/ProfilePage.jsx

@@ -8,7 +8,6 @@ import SettingsModal from "../../components/SettingsModal/SettingsModal.jsx";
 function ProfilePage() {
 
     const { user } = useContext(AuthContext);
-
   return (
     <div className={styles.container}>
       <div className={`${styles.profileboard} glassCard`}>
@@ -31,12 +30,12 @@ function ProfilePage() {
               </div>
               <div className={styles.infoBlock}>
                 <p><strong>Mail :</strong> {user.email} </p>
-                <p><strong>Téléphone :</strong> {user.phone}</p>
+                <p><strong>Téléphone :</strong> {user.phone === null ? "Pas de numéro enregistré" : user.phone}</p>
               </div>
                 <SettingsModal />
             </div>
 
-            <h2>Vos Événements :</h2>
+            <h2>Tâches :</h2>
               {user.tasks && user.tasks.length > 0 ? (
                   user.tasks.map((task, index) => (
                       <Task key={index} task={task} />

src/pages/Profile/ProfilePage.module.css

@@ -131,7 +131,6 @@
     margin-bottom: 20px;
 }
 
-/* Desktop (1024px et plus) */
 @media screen and (min-width: 1024px) {
   .container {
     max-width: 100%;