Merge branch 'dev' into 'features/linkEventsPage'

# Conflicts:
#   src/pages/Profile/ProfilePage.jsx
This commit is contained in:
T'JAMPENS QUENTIN p2406187
2026-01-12 14:55:23 +00:00
46 changed files with 515 additions and 111 deletions
+2 -2
View File
@@ -25,11 +25,11 @@ function ProfilePage() {
<h2> {user?.name} {user?.lastname} </h2>
</div>
<div className={styles.topDescription}>
<div className={styles.infoBlock}>
<div className={`${styles.infoBlock} glassBorder`}>
<p><strong>Role :</strong> {user?.role}</p>
<p><strong>Membre depuis :</strong> {user && formatDate(user.created_at)}</p>
</div>
<div className={styles.infoBlock}>
<div className={`${styles.infoBlock} glassBorder`}>
<p><strong>Mail :</strong> {user?.email} </p>
<p><strong>Téléphone :</strong> {user?.phone === null ? "Pas de numéro enregistré" : user?.phone}</p>
</div>