fix: sélection enseignants dans les plannings

Back-End/Auth/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.1.3 on 2026-04-04 09:15
+# Generated by Django 5.1.3 on 2026-04-05 08:05
 
 import django.contrib.auth.models
 import django.contrib.auth.validators

Back-End/Common/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.1.3 on 2026-04-04 09:15
+# Generated by Django 5.1.3 on 2026-04-05 08:05
 
 import django.db.models.deletion
 from django.db import migrations, models

Back-End/Establishment/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.1.3 on 2026-04-04 09:15
+# Generated by Django 5.1.3 on 2026-04-05 08:05
 
 import Establishment.models
 import django.contrib.postgres.fields

Back-End/GestionMessagerie/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.1.3 on 2026-04-04 09:15
+# Generated by Django 5.1.3 on 2026-04-05 08:05
 
 import django.db.models.deletion
 import django.utils.timezone

Back-End/GestionNotification/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.1.3 on 2026-04-04 09:15
+# Generated by Django 5.1.3 on 2026-04-05 08:05
 
 import django.db.models.deletion
 from django.conf import settings

Back-End/Planning/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.1.3 on 2026-04-04 09:15
+# Generated by Django 5.1.3 on 2026-04-05 08:05
 
 import django.db.models.deletion
 from django.db import migrations, models

Back-End/School/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.1.3 on 2026-04-04 09:15
+# Generated by Django 5.1.3 on 2026-04-05 08:05
 
 import django.contrib.postgres.fields
 import django.db.models.deletion
@@ -124,6 +124,7 @@ class Migration(migrations.Migration):
                 ('name', models.CharField(max_length=100)),
                 ('updated_date', models.DateTimeField(auto_now=True)),
                 ('color_code', models.CharField(default='#FFFFFF', max_length=7)),
+                ('school_year', models.CharField(blank=True, max_length=9)),
                 ('establishment', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='specialities', to='Establishment.establishment')),
             ],
         ),
@@ -153,6 +154,7 @@ class Migration(migrations.Migration):
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('last_name', models.CharField(max_length=100)),
                 ('first_name', models.CharField(max_length=100)),
+                ('school_year', models.CharField(blank=True, max_length=9)),
                 ('updated_date', models.DateTimeField(auto_now=True)),
                 ('profile_role', models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='teacher_profile', to='Auth.profilerole')),
                 ('specialities', models.ManyToManyField(blank=True, to='School.speciality')),

Back-End/School/models.py

@@ -21,7 +21,6 @@ class Speciality(models.Model):
     name = models.CharField(max_length=100)
     updated_date = models.DateTimeField(auto_now=True)
     color_code = models.CharField(max_length=7, default='#FFFFFF')
-    school_year = models.CharField(max_length=9, blank=True)
     establishment = models.ForeignKey('Establishment.Establishment', on_delete=models.CASCADE, related_name='specialities')
 
     def __str__(self):
@@ -32,7 +31,6 @@ class Teacher(models.Model):
     first_name = models.CharField(max_length=100)
     specialities = models.ManyToManyField(Speciality, blank=True)
     profile_role = models.OneToOneField('Auth.ProfileRole', on_delete=models.CASCADE, related_name='teacher_profile', null=True, blank=True)
-    school_year = models.CharField(max_length=9, blank=True)
     updated_date = models.DateTimeField(auto_now=True)
 
     def __str__(self):

Back-End/School/views.py

@@ -73,15 +73,12 @@ class SpecialityListCreateView(APIView):
 
     def get(self, request):
         establishment_id = request.GET.get('establishment_id', None)
-        school_year = request.GET.get('school_year', None)
         if establishment_id is None:
             return JsonResponse({'error': 'establishment_id est requis'}, safe=False, status=status.HTTP_400_BAD_REQUEST)
 
         specialities_list = getAllObjects(Speciality)
         if establishment_id:
             specialities_list = specialities_list.filter(establishment__id=establishment_id).distinct()
-        if school_year:
-            specialities_list = specialities_list.filter(school_year=school_year)
         specialities_serializer = SpecialitySerializer(specialities_list, many=True)
         return JsonResponse(specialities_serializer.data, safe=False)
 

Back-End/Settings/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.1.3 on 2026-04-04 09:15
+# Generated by Django 5.1.3 on 2026-04-05 08:05
 
 import django.db.models.deletion
 from django.db import migrations, models

Back-End/Subscriptions/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.1.3 on 2026-04-04 09:15
+# Generated by Django 5.1.3 on 2026-04-05 08:05
 
 import Subscriptions.models
 import django.db.models.deletion
@@ -53,7 +53,7 @@ class Migration(migrations.Migration):
                 ('name', models.CharField(default='', max_length=255)),
                 ('file', models.FileField(blank=True, null=True, upload_to=Subscriptions.models.registration_school_file_upload_to)),
                 ('formTemplateData', models.JSONField(blank=True, default=list, null=True)),
-                ('isValidated', models.BooleanField(default=False)),
+                ('isValidated', models.BooleanField(blank=True, default=None, null=True)),
             ],
         ),
         migrations.CreateModel(
@@ -200,7 +200,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('file', models.FileField(blank=True, null=True, upload_to=Subscriptions.models.registration_parent_file_upload_to)),
-                ('isValidated', models.BooleanField(default=False)),
+                ('isValidated', models.BooleanField(blank=True, default=None, null=True)),
                 ('master', models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, related_name='parent_file_templates', to='Subscriptions.registrationparentfilemaster')),
                 ('registration_form', models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, related_name='parent_file_templates', to='Subscriptions.registrationform')),
             ],

Back-End/Subscriptions/models.py

@@ -54,17 +54,38 @@ class Sibling(models.Model):
         return "SIBLING"
 
 def registration_photo_upload_to(instance, filename):
-    return f"registration_files/dossier_rf_{instance.pk}/parent/{filename}"
+    """
+    Génère le chemin de stockage pour la photo élève.
+    Structure : Etablissement/dossier_NomEleve_PrenomEleve/filename
+    """
+    register_form = getattr(instance, 'registrationform', None)
+    if register_form and register_form.establishment:
+        est_name = register_form.establishment.name
+    elif instance.associated_class and instance.associated_class.establishment:
+        est_name = instance.associated_class.establishment.name
+    else:
+        est_name = "unknown_establishment"
+
+    student_last = instance.last_name if instance and instance.last_name else "unknown"
+    student_first = instance.first_name if instance and instance.first_name else "unknown"
+    return f"{est_name}/dossier_{student_last}_{student_first}/{filename}"
 
 def registration_bilan_form_upload_to(instance, filename):
-    # On récupère le RegistrationForm lié à l'élève
+    """
+    Génère le chemin de stockage pour les bilans de compétences.
+    Structure : Etablissement/dossier_NomEleve_PrenomEleve/filename
+    """
     register_form = getattr(instance.student, 'registrationform', None)
-    if register_form:
-        pk = register_form.pk
+    if register_form and register_form.establishment:
+        est_name = register_form.establishment.name
+    elif instance.student.associated_class and instance.student.associated_class.establishment:
+        est_name = instance.student.associated_class.establishment.name
     else:
-        # fallback sur l'id de l'élève si pas de registrationform
-        pk = instance.student.pk
-    return f"registration_files/dossier_rf_{pk}/bilan/{filename}"
+        est_name = "unknown_establishment"
+
+    student_last = instance.student.last_name if instance.student else "unknown"
+    student_first = instance.student.first_name if instance.student else "unknown"
+    return f"{est_name}/dossier_{student_last}_{student_first}/{filename}"
 
 class BilanCompetence(models.Model):
     student = models.ForeignKey('Subscriptions.Student', on_delete=models.CASCADE, related_name='bilans')

Back-End/Subscriptions/templates/pdfs/bilan_competences.html

@@ -4,9 +4,22 @@
     <meta charset="UTF-8">
     <title>Bilan de compétences</title>
     <style>
-        body { font-family: Arial, sans-serif; margin: 2em; }
+        body { font-family: Arial, sans-serif; margin: 1.2em; color: #111827; }
         h1, h2 { color: #059669; }
-        .student-info { margin-bottom: 2em; }
+        .top-header { width: 100%; border-bottom: 2px solid #d1fae5; border-collapse: collapse; margin-bottom: 14px; }
+        .top-header td { vertical-align: top; border: none; padding: 0; }
+        .school-logo { width: 54px; height: 54px; object-fit: contain; margin-right: 8px; }
+        .product-logo { width: 58px; }
+        .title-row { margin: 8px 0 10px 0; }
+        .student-info {
+            margin-bottom: 1em;
+            border: 1px solid #e5e7eb;
+            border-radius: 8px;
+            padding: 8px 12px;
+            background: #f8fafc;
+        }
+        .student-info table { width: 100%; border-collapse: collapse; font-size: 0.98em; }
+        .student-info td { border: none; padding: 1px 0; }
         .domain-table { width: 100%; border-collapse: collapse; margin-bottom: 2em; }
         .domain-header th {
             background: #d1fae5;
@@ -25,16 +38,77 @@
         th, td { border: 1px solid #e5e7eb; padding: 0.5em; }
         th.competence-header { background: #d1fae5; }
         td.competence-nom { word-break: break-word; max-width: 320px; }
+        .footer-note { margin-top: 32px; }
+        .comment-space {
+            min-height: 180px;
+            margin-top: 18px;
+            margin-bottom: 78px;
+        }
+        .footer-grid { width: 100%; border-collapse: collapse; }
+        .footer-grid td {
+            border: none;
+            padding: 0;
+            vertical-align: top;
+        }
+        .field-line { border-bottom: 1px solid #9ca3af; height: 24px; margin-top: 6px; }
+        .signature-line { border-bottom: 2px solid #059669; height: 30px; margin-top: 6px; }
     </style>
 </head>
 <body>
+    <table class="top-header">
+        <tr>
+            <td style="width: 68%; padding-bottom: 8px;">
+                <table style="border-collapse: collapse; width: 100%;">
+                    <tr>
+                        {% if establishment.logo_path %}
+                        <td style="width: 64px; border: none; vertical-align: top;">
+                            <img src="{{ establishment.logo_path }}" alt="Logo établissement" class="school-logo">
+                        </td>
+                        {% endif %}
+                        <td style="border: none; vertical-align: top;">
+                            <div style="font-size: 1.25em; font-weight: 700; color: #065f46; margin-top: 2px;">{{ establishment.name }}</div>
+                            {% if establishment.address %}
+                            <div style="font-size: 0.9em; color: #4b5563; margin-top: 4px;">{{ establishment.address }}</div>
+                            {% endif %}
+                        </td>
+                    </tr>
+                </table>
+            </td>
+            <td style="width: 32%; text-align: right; padding-bottom: 8px;">
+                <table style="border-collapse: collapse; width: 100%; margin-left: auto;">
+                    <tr>
+                        <td style="border: none; text-align: right;">
+                            <div style="font-size: 0.86em; color: #6b7280; margin-bottom: 4px;">Généré avec</div>
+                            {% if product.logo_path %}
+                            <div style="margin-bottom: 4px;"><img src="{{ product.logo_path }}" alt="Logo n3wt" class="product-logo"></div>
+                            {% endif %}
+                            <div style="font-size: 0.95em; font-weight: 700; color: #059669;">{{ product.name }}</div>
+                        </td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+    </table>
+
+    <div class="title-row">
         <h1>Bilan de compétences</h1>
+    </div>
+
     <div class="student-info">
-        <strong>Élève :</strong> {{ student.last_name }} {{ student.first_name }}<br>
-        <strong>Niveau :</strong> {{ student.level }}<br>
-        <strong>Classe :</strong> {{ student.class_name }}<br>
-        <strong>Période :</strong> {{ period }}<br>
-        <strong>Date :</strong> {{ date }}
+        <table>
+            <tr>
+                <td><strong>Élève :</strong> {{ student.last_name }} {{ student.first_name }}</td>
+                <td style="text-align: right;"><strong>Date :</strong> {{ date }}</td>
+            </tr>
+            <tr>
+                <td><strong>Niveau :</strong> {{ student.level }}</td>
+                <td style="text-align: right;"><strong>Période :</strong> {{ period }}</td>
+            </tr>
+            <tr>
+                <td><strong>Classe :</strong> {{ student.class_name }}</td>
+                <td></td>
+            </tr>
+        </table>
     </div>
 
     {% for domaine in domaines %}
@@ -72,41 +146,33 @@
     </table>
     {% endfor %}
 
-    <div style="margin-top: 60px; padding: 0; max-width: 700px;">
-        <div style="
-            min-height: 180px;
-            background: #fff;
-            border: 1.5px dashed #a7f3d0;
-            border-radius: 12px;
-            padding: 24px 24px 18px 24px;
-            display: flex;
-            flex-direction: column;
-            justify-content: flex-start;
-            position: relative;
-            margin-bottom: 64px; /* Augmente l'espace après l'encadré */
-        ">
-            <div style="font-weight: bold; color: #059669; font-size: 1.25em; display: flex; align-items: center; gap: 8px; margin-bottom: 8px;">
-                <span>Appréciation générale / Commentaire : </span>
-            </div>
-            <!-- Espace vide pour écrire -->
-            <div style="flex:1;"></div>
-            <div style="flex:1;"></div>
-            <div style="flex:1;"></div>
-            <div style="flex:1;"></div>
-            <div style="flex:1;"></div>
-            <div style="flex:1;"></div>
-            <div style="flex:1;"></div>
-        </div>
-        <div style="display: flex; justify-content: flex-end; gap: 48px; margin-top: 32px;">
-            <div>
-                <span style="font-weight: bold; color: #059669;font-size: 1.25em;">Date :</span>
-                <span style="display: inline-block; min-width: 120px; border-bottom: 1.5px solid #a7f3d0; margin-left: 8px;">&nbsp;</span>
-            </div>
-            <div>
-                <span style="font-weight: bold; color: #059669;font-size: 1.25em;">Signature :</span>
-                <span style="display: inline-block; min-width: 180px; border-bottom: 2px solid #059669; margin-left: 8px;">&nbsp;</span>
-            </div>
+    <div class="footer-note">
+        <div style="font-weight: 700; color: #059669; font-size: 1.1em;">
+            Appréciation générale / Commentaire
         </div>
+        <div class="comment-space"></div>
+
+        <table class="footer-grid">
+            <tr>
+                <td style="width: 45%;">
+                    <table style="width: 100%; border-collapse: collapse;">
+                        <tr>
+                            <td style="width: 70px; border: none; font-weight: 700; color: #059669;">Date :</td>
+                            <td style="border: none;"><div class="field-line"></div></td>
+                        </tr>
+                    </table>
+                </td>
+                <td style="width: 10%;"></td>
+                <td style="width: 45%;">
+                    <table style="width: 100%; border-collapse: collapse;">
+                        <tr>
+                            <td style="width: 90px; border: none; font-weight: 700; color: #059669;">Signature :</td>
+                            <td style="border: none;"><div class="signature-line"></div></td>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
+        </table>
     </div>
 </body>
 </html>

Back-End/Subscriptions/views/student_competencies_views.py

@@ -176,12 +176,42 @@ class StudentCompetencyListCreateView(APIView):
                 if domaine_dict["categories"]:
                     result.append(domaine_dict)
 
+            establishment = None
+            if student.associated_class and student.associated_class.establishment:
+                establishment = student.associated_class.establishment
+            else:
+                try:
+                    establishment = student.registrationform.establishment
+                except Exception:
+                    establishment = None
+
+            establishment_logo_path = None
+            if establishment and establishment.logo:
+                try:
+                    if establishment.logo.path and os.path.exists(establishment.logo.path):
+                        establishment_logo_path = establishment.logo.path
+                except Exception:
+                    establishment_logo_path = None
+
+            n3wt_logo_path = os.path.join(settings.BASE_DIR, 'static', 'img', 'logo_min.svg')
+            if not os.path.exists(n3wt_logo_path):
+                n3wt_logo_path = None
+            
             context = {
                 "student": {
                     "first_name": student.first_name,
                     "last_name": student.last_name,
                     "level": student.level,
-                    "class_name": student.associated_class.atmosphere_name,
+                    "class_name": student.associated_class.atmosphere_name if student.associated_class else "Non assignée",
+                },
+                "establishment": {
+                    "name": establishment.name if establishment else "Établissement",
+                    "address": establishment.address if establishment else "",
+                    "logo_path": establishment_logo_path,
+                },
+                "product": {
+                    "name": "n3wt-school",
+                    "logo_path": n3wt_logo_path,
                 },
                 "period": period,
                 "date": date.today().strftime("%d/%m/%Y"),

Back-End/static/img/n3wt.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="420" height="120" viewBox="0 0 420 120" role="img" aria-label="n3wt-school">
+  <rect width="420" height="120" rx="16" fill="#F0FDF4"/>
+  <circle cx="56" cy="60" r="30" fill="#10B981"/>
+  <path d="M42 60h28M56 46v28" stroke="#064E3B" stroke-width="8" stroke-linecap="round"/>
+  <text x="104" y="70" font-family="Arial, sans-serif" font-size="42" font-weight="700" fill="#064E3B">n3wt</text>
+  <text x="245" y="70" font-family="Arial, sans-serif" font-size="30" font-weight="600" fill="#059669">school</text>
+</svg>

Front-End/src/app/500.js

@@ -3,16 +3,19 @@ import Logo from '../components/Logo';
 
 export default function Custom500() {
   return (
-    <div className="flex items-center justify-center min-h-screen bg-emerald-500">
-      <div className="text-center p-6 ">
+    <div className="flex items-center justify-center min-h-screen bg-primary">
+      <div className="text-center p-6 bg-white rounded-md shadow-sm border border-gray-200">
         <Logo className="w-32 h-32 mx-auto mb-4" />
-        <h2 className="text-2xl font-bold text-emerald-900 mb-4">
+        <h2 className="font-headline text-2xl font-bold text-secondary mb-4">
           500 | Erreur interne
         </h2>
-        <p className="text-emerald-900 mb-4">
+        <p className="font-body text-gray-600 mb-4">
           Une erreur interne est survenue.
         </p>
-        <Link className="text-gray-900 hover:underline" href="/">
+        <Link
+          className="inline-flex items-center justify-center min-h-[44px] px-4 py-2 rounded font-label font-medium bg-primary hover:bg-secondary text-white transition-colors"
+          href="/"
+        >
           Retour Accueil
         </Link>
       </div>

Front-End/src/app/[locale]/admin/directory/page.js

@@ -2,8 +2,17 @@
 import React, { useState, useEffect } from 'react';
 import { useEstablishment } from '@/context/EstablishmentContext';
 import { PARENT_FILTER, SCHOOL_FILTER } from '@/utils/constants';
-import { Trash2, ToggleLeft, ToggleRight, Info, XCircle } from 'lucide-react';
+import {
+  Trash2,
+  ToggleLeft,
+  ToggleRight,
+  Info,
+  XCircle,
+  Users,
+  UserPlus,
+} from 'lucide-react';
 import Table from '@/components/Table';
+import EmptyState from '@/components/EmptyState';
 import Popup from '@/components/Popup';
 import StatusLabel from '@/components/StatusLabel';
 import SpecialityItem from '@/components/Structure/Configuration/SpecialityItem';
@@ -17,7 +26,6 @@ import { dissociateGuardian } from '@/app/actions/subscriptionAction';
 import { useCsrfToken } from '@/context/CsrfContext';
 import DjangoCSRFToken from '@/components/DjangoCSRFToken';
 import logger from '@/utils/logger';
-import AlertMessage from '@/components/AlertMessage';
 
 const roleTypeToLabel = (roleType) => {
   switch (roleType) {
@@ -39,7 +47,7 @@ const roleTypeToBadgeClass = (roleType) => {
     case 1:
       return 'bg-red-100 text-red-600';
     case 2:
-      return 'bg-green-100 text-green-600';
+      return 'bg-tertiary/10 text-tertiary';
     default:
       return 'bg-gray-100 text-gray-600';
   }
@@ -378,7 +386,7 @@ export default function Page() {
             type="button"
             className={
               row.is_active
-                ? 'text-emerald-500 hover:text-emerald-700'
+                ? 'text-primary hover:text-secondary'
                 : 'text-orange-500 hover:text-orange-700'
             }
             onClick={() => handleConfirmActivateProfile(row)}
@@ -474,7 +482,7 @@ export default function Page() {
             type="button"
             className={
               row.is_active
-                ? 'text-emerald-500 hover:text-emerald-700'
+                ? 'text-primary hover:text-secondary'
                 : 'text-orange-500 hover:text-orange-700'
             }
             onClick={() => handleConfirmActivateProfile(row)}
@@ -516,10 +524,10 @@ export default function Page() {
                   totalPages={totalProfilesParentPages}
                   onPageChange={handlePageChange}
                   emptyMessage={
-                    <AlertMessage
-                      type="info"
-                      title="Aucun profil PARENT enregistré"
-                      message="Un profil Parent est ajouté lors de la création d'un nouveau dossier d'inscription."
+                    <EmptyState
+                      icon={Users}
+                      title="Aucun profil parent enregistré"
+                      description="Les profils parents sont créés automatiquement lors de la création d'un dossier d'inscription."
                     />
                   }
                 />
@@ -540,10 +548,10 @@ export default function Page() {
                   totalPages={totalProfilesSchoolPages}
                   onPageChange={handlePageChange}
                   emptyMessage={
-                    <AlertMessage
-                      type="info"
-                      title="Aucun profil ECOLE enregistré"
-                      message="Un profil ECOLE est ajouté lors de la création d'un nouvel enseignant."
+                    <EmptyState
+                      icon={UserPlus}
+                      title="Aucun profil école enregistré"
+                      description="Les profils école sont créés automatiquement lors de l'ajout d'un enseignant."
                     />
                   }
                 />

Front-End/src/app/[locale]/admin/feedback/page.js

@@ -82,12 +82,12 @@ export default function FeedbackPage() {
   return (
     <div className="h-full flex flex-col p-4">
       <div className="max-w-3xl mx-auto w-full">
-        <h1 className="text-2xl font-headline font-bold text-gray-800 mb-2">
+        <h1 className="font-headline text-2xl font-bold text-gray-800 mb-2">
           {t('title')}
         </h1>
         <p className="text-gray-600 mb-6">{t('description')}</p>
 
-        <div className="bg-white rounded-lg shadow-md p-6">
+        <div className="bg-white rounded-md shadow-sm border border-gray-200 p-6">
           {/* Catégorie */}
           <SelectChoice
             name="category"

Front-End/src/app/[locale]/admin/grades/[studentId]/page.js

@@ -251,31 +251,31 @@ export default function StudentGradesPage() {
       <div className="flex items-center gap-3">
         <button
           onClick={() => router.push('/admin/grades')}
-          className="p-2 rounded-md hover:bg-gray-100 border border-gray-200"
+          className="p-2 rounded hover:bg-gray-100 border border-gray-200 min-h-[44px] min-w-[44px] flex items-center justify-center transition-colors"
           aria-label="Retour à la liste"
         >
           <ArrowLeft size={20} />
         </button>
-        <h1 className="text-xl font-bold text-gray-800">Suivi pédagogique</h1>
+        <h1 className="font-headline text-xl font-bold text-gray-800">Suivi pédagogique</h1>
       </div>
 
       {/* Student profile */}
       {student && (
-        <div className="bg-stone-50 rounded-lg shadow-sm border border-gray-100 p-4 md:p-6 flex flex-col sm:flex-row items-center sm:items-start gap-4">
+        <div className="bg-neutral rounded-md shadow-sm border border-gray-100 p-4 md:p-6 flex flex-col sm:flex-row items-center sm:items-start gap-4">
           {student.photo ? (
             <img
               src={getSecureFileUrl(student.photo)}
               alt={`${student.first_name} ${student.last_name}`}
-              className="w-24 h-24 object-cover rounded-full border-4 border-emerald-200 shadow"
+              className="w-24 h-24 object-cover rounded-full border-4 border-primary/20 shadow"
             />
           ) : (
-            <div className="w-24 h-24 flex items-center justify-center bg-gray-200 rounded-full text-gray-500 font-bold text-3xl border-4 border-emerald-100">
+            <div className="w-24 h-24 flex items-center justify-center bg-gray-200 rounded-full text-gray-500 font-bold text-3xl border-4 border-primary/10">
               {student.first_name?.[0]}
               {student.last_name?.[0]}
             </div>
           )}
           <div className="flex-1 text-center sm:text-left">
-            <div className="text-xl font-bold text-emerald-800">
+            <div className="text-xl font-bold text-secondary">
               {student.last_name} {student.first_name}
             </div>
             <div className="text-sm text-gray-600 mt-1">
@@ -322,7 +322,7 @@ export default function StudentGradesPage() {
                   `${FE_ADMIN_GRADES_STUDENT_COMPETENCIES_URL}?studentId=${studentId}&period=${periodString}`
                 );
               }}
-              className="px-4 py-2 rounded-md shadow bg-emerald-500 text-white hover:bg-emerald-600 w-full sm:w-auto"
+              className="px-4 py-2 rounded shadow bg-primary text-white font-label font-medium hover:bg-secondary w-full sm:w-auto min-h-[44px] transition-colors"
               icon={<Award className="w-5 h-5" />}
               text="Évaluer"
               title="Évaluer l'élève"
@@ -351,10 +351,10 @@ export default function StudentGradesPage() {
         </div>
 
         {/* Évaluations par matière */}
-        <div className="bg-stone-50 rounded-lg shadow-sm border border-gray-200 p-4 md:p-6">
+        <div className="bg-neutral rounded-md shadow-sm border border-gray-200 p-4 md:p-6">
           <div className="flex items-center gap-2 mb-4">
-            <BookOpen className="w-6 h-6 text-emerald-600" />
-            <h2 className="text-xl font-semibold text-gray-800">
+            <BookOpen className="w-6 h-6 text-primary" />
+            <h2 className="font-headline text-xl font-semibold text-gray-800">
               Évaluations par matière
             </h2>
           </div>

Front-End/src/app/[locale]/admin/grades/page.js

@@ -10,14 +10,19 @@ import {
   Pencil,
   Trash2,
   Save,
-  Download
+  Download,
+  FileText,
+  UserPlus,
+  Users,
 } from 'lucide-react';
 import SectionHeader from '@/components/SectionHeader';
 import Table from '@/components/Table';
+import EmptyState from '@/components/EmptyState';
 import logger from '@/utils/logger';
 import {
   FE_ADMIN_GRADES_STUDENT_COMPETENCIES_URL,
   FE_ADMIN_STRUCTURE_SCHOOLCLASS_MANAGEMENT_URL,
+  FE_ADMIN_SUBSCRIPTIONS_CREATE_URL,
 } from '@/utils/Url';
 import { getSecureFileUrl } from '@/utils/fileUrl';
 import {
@@ -35,12 +40,22 @@ import { useClasses } from '@/context/ClassesContext';
 import { useCsrfToken } from '@/context/CsrfContext';
 import { exportToCSV } from '@/utils/exportCSV';
 import SchoolYearFilter from '@/components/SchoolYearFilter';
-import { getCurrentSchoolYear, getNextSchoolYear, getHistoricalYears } from '@/utils/Date';
-import { CURRENT_YEAR_FILTER, NEXT_YEAR_FILTER, HISTORICAL_FILTER } from '@/utils/constants';
+import {
+  getCurrentSchoolYear,
+  getNextSchoolYear,
+  getHistoricalYears,
+} from '@/utils/Date';
+import {
+  CURRENT_YEAR_FILTER,
+  NEXT_YEAR_FILTER,
+  HISTORICAL_FILTER,
+} from '@/utils/constants';
 import dayjs from 'dayjs';
 
 function getPeriodString(periodValue, frequency, schoolYear = null) {
-  const year = schoolYear || (() => {
+  const year =
+    schoolYear ||
+    (() => {
       const y = dayjs().month() >= 8 ? dayjs().year() : dayjs().year() - 1;
       return `${y}-${y + 1}`;
     })();
@@ -96,7 +111,7 @@ const COMPETENCY_COLUMNS = [
   {
     key: 'acquired',
     label: 'Acquises',
-    color: 'bg-emerald-100 text-emerald-700',
+    color: 'bg-primary/10 text-secondary',
   },
   {
     key: 'inProgress',
@@ -144,7 +159,7 @@ function PercentBadge({ value, loading, color }) {
   const badgeColor =
     color ||
     (value >= 75
-      ? 'bg-emerald-100 text-emerald-700'
+      ? 'bg-primary/10 text-secondary'
       : value >= 50
         ? 'bg-yellow-100 text-yellow-700'
         : 'bg-red-100 text-red-600');
@@ -192,9 +207,10 @@ export default function Page() {
     return historicalYears[0];
   }, [activeYearFilter, currentSchoolYear, nextSchoolYear, historicalYears]);
 
-  const periodColumns = useMemo(() => getPeriodColumns(
-    selectedEstablishmentEvaluationFrequency
-  ), [selectedEstablishmentEvaluationFrequency]);
+  const periodColumns = useMemo(
+    () => getPeriodColumns(selectedEstablishmentEvaluationFrequency),
+    [selectedEstablishmentEvaluationFrequency]
+  );
 
   const currentPeriodValue = getCurrentPeriodValue(
     selectedEstablishmentEvaluationFrequency
@@ -228,7 +244,11 @@ export default function Page() {
 
     const tasks = students.flatMap((student) =>
       periodColumns.map(({ value: periodValue }) => {
-        const periodStr = getPeriodString(periodValue, frequency, selectedSchoolYear);
+        const periodStr = getPeriodString(
+          periodValue,
+          frequency,
+          selectedSchoolYear
+        );
         return fetchStudentCompetencies(student.id, periodStr)
           .then((data) => ({ studentId: student.id, periodValue, data }))
           .catch(() => ({ studentId: student.id, periodValue, data: null }));
@@ -280,7 +300,12 @@ export default function Page() {
       setStatsMap(map);
       setStatsLoading(false);
     });
-  }, [students, selectedEstablishmentEvaluationFrequency, selectedSchoolYear, periodColumns]);
+  }, [
+    students,
+    selectedEstablishmentEvaluationFrequency,
+    selectedSchoolYear,
+    periodColumns,
+  ]);
 
   const filteredStudents = students.filter(
     (student) =>
@@ -329,12 +354,16 @@ export default function Page() {
       { key: 'last_name', label: 'Nom' },
       { key: 'first_name', label: 'Prénom' },
       { key: 'birth_date', label: 'Date de naissance' },
-      { key: 'level', label: 'Niveau', transform: (value) => getNiveauLabel(value) },
+      {
+        key: 'level',
+        label: 'Niveau',
+        transform: (value) => getNiveauLabel(value),
+      },
       { key: 'associated_class_name', label: 'Classe' },
       {
         key: 'id',
         label: 'Absences',
-        transform: (value) => absencesMap[value] || 0
+        transform: (value) => absencesMap[value] || 0,
       },
     ];
 
@@ -346,7 +375,7 @@ export default function Page() {
         transform: (value) => {
           const stats = statsMap[value];
           return stats?.[key] !== undefined ? `${stats[key]}%` : '';
-        }
+        },
       });
     });
 
@@ -435,6 +464,37 @@ export default function Page() {
     );
   };
 
+  const getBilanForStudent = (student) => {
+    const bilans = Array.isArray(student?.bilans) ? student.bilans : [];
+    if (!bilans.length) return null;
+
+    const currentPeriodStr = currentPeriodValue
+      ? getPeriodString(
+          currentPeriodValue,
+          selectedEstablishmentEvaluationFrequency,
+          selectedSchoolYear
+        )
+      : null;
+
+    if (currentPeriodStr) {
+      const exact = bilans.find(
+        (bilan) => bilan?.period === currentPeriodStr && bilan?.file
+      );
+      if (exact) return exact;
+    }
+
+    const schoolYearSuffix = `_${selectedSchoolYear}`;
+    const sameYearBilans = bilans.filter(
+      (bilan) => bilan?.file && bilan?.period?.endsWith(schoolYearSuffix)
+    );
+
+    if (!sameYearBilans.length) return null;
+
+    return [...sameYearBilans].sort(
+      (a, b) => new Date(b.created_at || 0) - new Date(a.created_at || 0)
+    )[0];
+  };
+
   const columns = [
     { name: 'Photo', transform: () => null },
     { name: 'Élève', transform: () => null },
@@ -494,7 +554,7 @@ export default function Page() {
                 `${FE_ADMIN_STRUCTURE_SCHOOLCLASS_MANAGEMENT_URL}?schoolClassId=${student.associated_class_id}`
               );
             }}
-            className="text-emerald-700 hover:underline font-medium"
+            className="text-secondary hover:underline font-medium"
           >
             {student.associated_class_name}
           </button>
@@ -510,8 +570,23 @@ export default function Page() {
           <span className="text-gray-400 text-xs">0</span>
         );
       case 'Actions':
+        const bilan = getBilanForStudent(student);
+
         return (
           <div className="flex items-center justify-center gap-2">
+            {bilan?.file && (
+              <a
+                href={getSecureFileUrl(bilan.file)}
+                target="_blank"
+                rel="noopener noreferrer"
+                onClick={(e) => e.stopPropagation()}
+                className="flex items-center gap-1 px-2 py-1 rounded text-xs font-medium bg-cyan-100 text-cyan-700 hover:bg-cyan-200 transition whitespace-nowrap"
+                title={`Télécharger le bilan de compétences (${bilan.period})`}
+              >
+                <FileText size={14} />
+                Bilan
+              </a>
+            )}
             <button
               onClick={(e) => {
                 e.stopPropagation();
@@ -534,7 +609,7 @@ export default function Page() {
             <button
               onClick={(e) => handleEvaluer(e, student.id)}
               disabled={!currentPeriodValue}
-              className="flex items-center gap-1 px-2 py-1 rounded text-xs font-medium bg-emerald-100 text-emerald-700 hover:bg-emerald-200 transition whitespace-nowrap disabled:opacity-40 disabled:cursor-not-allowed"
+              className="flex items-center gap-1 px-2 py-1 rounded text-xs font-medium bg-primary/10 text-secondary hover:bg-primary/20 transition whitespace-nowrap disabled:opacity-40 disabled:cursor-not-allowed"
               title="Évaluer"
             >
               <Award size={14} />
@@ -587,7 +662,7 @@ export default function Page() {
         </div>
         <button
           onClick={handleExportCSV}
-          className="flex items-center gap-2 px-4 py-2 text-sm font-medium text-emerald-700 bg-emerald-100 rounded-lg hover:bg-emerald-200 transition-colors ml-4"
+          className="flex items-center gap-2 px-4 py-2 text-sm font-medium text-secondary bg-primary/10 rounded hover:bg-primary/20 transition-colors ml-4"
           title="Exporter en CSV"
         >
           <Download className="w-4 h-4" />
@@ -604,7 +679,22 @@ export default function Page() {
         totalPages={totalPages}
         onPageChange={setCurrentPage}
         emptyMessage={
-          <span className="text-gray-400 text-sm">Aucun élève trouvé</span>
+          students.length === 0 && !searchTerm ? (
+            <EmptyState
+              icon={Users}
+              title="Aucun élève inscrit"
+              description="Commencez par inscrire des élèves pour suivre leur parcours pédagogique."
+              actionLabel="Inscrire un élève"
+              actionIcon={UserPlus}
+              onAction={() => router.push(FE_ADMIN_SUBSCRIPTIONS_CREATE_URL)}
+            />
+          ) : (
+            <EmptyState
+              icon={Search}
+              title="Aucun élève trouvé"
+              description="Modifiez votre recherche pour trouver un élève."
+            />
+          )
         }
       />
 
@@ -615,7 +705,7 @@ export default function Page() {
             {/* Header */}
             <div className="flex items-center justify-between px-6 py-4 border-b bg-gray-50">
               <div>
-                <h2 className="text-lg font-semibold text-gray-800">
+                <h2 className="font-headline text-lg font-semibold text-gray-800">
                   Notes de {gradesModalStudent.first_name}{' '}
                   {gradesModalStudent.last_name}
                 </h2>
@@ -636,7 +726,7 @@ export default function Page() {
             <div className="flex-1 overflow-y-auto p-6">
               {gradesLoading ? (
                 <div className="flex items-center justify-center py-12">
-                  <div className="animate-spin rounded-full h-8 w-8 border-b-2 border-emerald-600"></div>
+                  <div className="animate-spin rounded-full h-8 w-8 border-b-2 border-primary"></div>
                 </div>
               ) : Object.keys(groupedBySubject).length === 0 ? (
                 <div className="text-center py-12 text-gray-400">
@@ -673,13 +763,13 @@ export default function Page() {
                       : null;
 
                     return (
-                      <div className="bg-gradient-to-r from-emerald-50 to-blue-50 rounded-lg p-4 border border-emerald-100">
+                      <div className="bg-gradient-to-r from-primary/5 to-blue-50 rounded-lg p-4 border border-primary/10">
                         <div className="flex items-center justify-between mb-3">
                           <span className="text-sm font-medium text-gray-600">
                             Résumé
                           </span>
                           {overallAvg !== null && (
-                            <span className="text-lg font-bold text-emerald-700">
+                            <span className="text-lg font-bold text-secondary">
                               Moyenne générale : {overallAvg}/20
                             </span>
                           )}
@@ -831,7 +921,7 @@ export default function Page() {
                                             onClick={() =>
                                               handleSaveEval(evalItem)
                                             }
-                                            className="p-1 text-emerald-600 hover:bg-emerald-50 rounded"
+                                            className="p-1 text-primary hover:bg-primary/5 rounded"
                                             title="Enregistrer"
                                           >
                                             <Save size={14} />

Front-End/src/app/[locale]/admin/grades/studentCompetencies/page.js

@@ -70,7 +70,7 @@ export default function StudentCompetenciesPage() {
           'success',
           'Succès'
         );
-        router.push(`/admin/grades/${studentId}`);
+        router.push('/admin/grades');
       })
       .catch((error) => {
         showNotification(
@@ -86,12 +86,12 @@ export default function StudentCompetenciesPage() {
       <div className="flex items-center gap-3 mb-4">
         <button
           onClick={() => router.push('/admin/grades')}
-          className="p-2 rounded-md hover:bg-gray-100 border border-gray-200"
+          className="p-2 rounded hover:bg-gray-100 border border-gray-200 min-h-[44px] min-w-[44px] flex items-center justify-center transition-colors"
           aria-label="Retour à la fiche élève"
         >
           <ArrowLeft size={20} />
         </button>
-        <h1 className="text-xl font-bold text-gray-800">Bilan de compétence</h1>
+        <h1 className="font-headline text-xl font-bold text-gray-800">Bilan de compétence</h1>
       </div>
       <div className="flex-1 min-h-0 flex flex-col">
         <form

Front-End/src/app/[locale]/admin/layout.js

@@ -158,7 +158,7 @@ export default function Layout({ children }) {
       )}
 
       {/* Main container */}
-      <div className="absolute overflow-auto bg-gradient-to-br from-emerald-50 via-sky-50 to-emerald-100 top-14 md:top-0 bottom-16 left-0 md:left-64 right-0">
+      <div className="absolute overflow-auto bg-gradient-to-br from-primary/5 via-sky-50 to-primary/10 top-14 md:top-0 bottom-16 left-0 md:left-64 right-0">
         {children}
       </div>
 

Front-End/src/app/[locale]/admin/page.js

@@ -174,14 +174,14 @@ export default function DashboardPage() {
         <StatCard
           title={t('pendingRegistrations')}
           value={pendingRegistrationCount}
-          icon={<Clock className="text-green-500" size={24} />}
-          color="green"
+          icon={<Clock className="text-tertiary" size={24} />}
+          color="tertiary"
         />
         <StatCard
           title={t('structureCapacity')}
           value={selectedEstablishmentTotalCapacity}
-          icon={<School className="text-green-500" size={24} />}
-          color="emerald"
+          icon={<School className="text-primary" size={24} />}
+          color="primary"
         />
         <StatCard
           title={t('capacityRate')}
@@ -200,8 +200,8 @@ export default function DashboardPage() {
         {/* Colonne de gauche : Graphique des inscriptions + Présence */}
         <div className="flex flex-col gap-6">
           {/* Graphique des inscriptions */}
-          <div className="bg-stone-50 p-4 md:p-6 rounded-lg shadow-sm border border-gray-100 flex-1">
-            <h2 className="text-lg font-semibold mb-4 md:mb-6">
+          <div className="bg-neutral p-4 md:p-6 rounded-md shadow-sm border border-gray-100 flex-1">
+            <h2 className="font-headline text-lg font-semibold mb-4 md:mb-6">
               {t('inscriptionTrends')}
             </h2>
             <div className="flex flex-col sm:flex-row gap-6 mt-4">
@@ -214,14 +214,14 @@ export default function DashboardPage() {
             </div>
           </div>
           {/* Présence et assiduité */}
-          <div className="bg-stone-50 p-4 md:p-6 rounded-lg shadow-sm border border-gray-100 flex-1">
+          <div className="bg-neutral p-4 md:p-6 rounded-md shadow-sm border border-gray-100 flex-1">
             <Attendance absences={absencesToday} readOnly={true} />
           </div>
         </div>
 
         {/* Colonne de droite : Événements à venir */}
-        <div className="bg-stone-50 p-4 md:p-6 rounded-lg shadow-sm border border-gray-100 flex-1 h-full">
-          <h2 className="text-lg font-semibold mb-4">{t('upcomingEvents')}</h2>
+        <div className="bg-neutral p-4 md:p-6 rounded-md shadow-sm border border-gray-100 flex-1 h-full">
+          <h2 className="font-headline text-lg font-semibold mb-4">{t('upcomingEvents')}</h2>
           {upcomingEvents.map((event, index) => (
             <EventCard key={index} {...event} />
           ))}

Front-End/src/app/[locale]/admin/planning/page.js

@@ -9,6 +9,7 @@ import EventModal from '@/components/Calendar/EventModal';
 import ScheduleNavigation from '@/components/Calendar/ScheduleNavigation';
 import { useState } from 'react';
 import { useEstablishment } from '@/context/EstablishmentContext';
+import { usePlanning } from '@/context/PlanningContext';
 
 export default function Page() {
   const [isModalOpen, setIsModalOpen] = useState(false);
@@ -29,17 +30,24 @@ export default function Page() {
   });
   const { selectedEstablishmentId } = useEstablishment();
 
+  const PlanningContent = ({ isDrawerOpen, setIsDrawerOpen, isModalOpen, setIsModalOpen, eventData, setEventData }) => {
+    const { selectedSchedule, schedules } = usePlanning();
+
     const initializeNewEvent = (date = new Date()) => {
-    // S'assurer que date est un objet Date valide
       const eventDate = date instanceof Date ? date : new Date();
 
+      const selected =
+        schedules.find((schedule) => Number(schedule.id) === Number(selectedSchedule)) ||
+        schedules[0];
+
       setEventData({
         title: '',
         description: '',
         start: eventDate.toISOString(),
         end: new Date(eventDate.getTime() + 2 * 60 * 60 * 1000).toISOString(),
         location: '',
-      planning: '', // Ne pas définir de valeur par défaut ici non plus
+        planning: selected?.id || '',
+        color: selected?.color || '',
         recursionType: RecurrenceType.NONE,
         selectedDays: [],
         recursionEnd: new Date(
@@ -52,10 +60,6 @@ export default function Page() {
     };
 
     return (
-    <PlanningProvider
-      establishmentId={selectedEstablishmentId}
-      modeSet={PlanningModes.PLANNING}
-    >
       <div className="flex h-full overflow-hidden">
         <ScheduleNavigation
           isOpen={isDrawerOpen}
@@ -76,6 +80,22 @@ export default function Page() {
           setEventData={setEventData}
         />
       </div>
+    );
+  };
+
+  return (
+    <PlanningProvider
+      establishmentId={selectedEstablishmentId}
+      modeSet={PlanningModes.PLANNING}
+    >
+      <PlanningContent
+        isDrawerOpen={isDrawerOpen}
+        setIsDrawerOpen={setIsDrawerOpen}
+        isModalOpen={isModalOpen}
+        setIsModalOpen={setIsModalOpen}
+        eventData={eventData}
+        setEventData={setEventData}
+      />
     </PlanningProvider>
   );
 }

Front-End/src/app/[locale]/admin/settings/page.js

@@ -1,7 +1,5 @@
 'use client';
 import React, { useState, useEffect } from 'react';
-import Tab from '@/components/Tab';
-import TabContent from '@/components/TabContent';
 import Button from '@/components/Form/Button';
 import InputText from '@/components/Form/InputText';
 import CheckBox from '@/components/Form/CheckBox'; // Import du composant CheckBox
@@ -13,13 +11,8 @@ import {
 import { useEstablishment } from '@/context/EstablishmentContext';
 import { useCsrfToken } from '@/context/CsrfContext'; // Import du hook pour récupérer le csrfToken
 import { useNotification } from '@/context/NotificationContext';
-import { useSearchParams } from 'next/navigation'; // Ajoute cet import
 
 export default function SettingsPage() {
-  const [activeTab, setActiveTab] = useState('smtp');
-  const [email, setEmail] = useState('');
-  const [password, setPassword] = useState('');
-  const [confirmPassword, setConfirmPassword] = useState('');
   const [smtpServer, setSmtpServer] = useState('');
   const [smtpPort, setSmtpPort] = useState('');
   const [smtpUser, setSmtpUser] = useState('');
@@ -29,23 +22,10 @@ export default function SettingsPage() {
   const { selectedEstablishmentId } = useEstablishment();
   const csrfToken = useCsrfToken(); // Récupération du csrfToken
   const { showNotification } = useNotification();
-  const searchParams = useSearchParams();
-
-  const handleTabClick = (tab) => {
-    setActiveTab(tab);
-  };
-
-  // Ajout : sélection automatique de l'onglet via l'ancre ou le paramètre de recherche
-  useEffect(() => {
-    const tabParam = searchParams.get('tab');
-    if (tabParam === 'smtp') {
-      setActiveTab('smtp');
-    }
-  }, [searchParams]);
 
   // Charger les paramètres SMTP existants
   useEffect(() => {
-    if (activeTab === 'smtp') {
+    if (csrfToken && selectedEstablishmentId) {
       fetchSmtpSettings(csrfToken, selectedEstablishmentId) // Passer le csrfToken ici
         .then((data) => {
           setSmtpServer(data.smtp_server || '');
@@ -75,7 +55,7 @@ export default function SettingsPage() {
           }
         });
     }
-  }, [activeTab, csrfToken]); // Ajouter csrfToken comme dépendance
+  }, [csrfToken, selectedEstablishmentId]);
 
   const handleSmtpServerChange = (e) => {
     setSmtpServer(e.target.value);
@@ -128,16 +108,14 @@ export default function SettingsPage() {
   };
 
   return (
-    <div className="p-8">
-      <div className="flex space-x-4 mb-4">
-        <Tab
-          text="Paramètres SMTP"
-          active={activeTab === 'smtp'}
-          onClick={() => handleTabClick('smtp')}
-        />
-      </div>
-      <div className="mt-4">
-        <TabContent isActive={activeTab === 'smtp'}>
+    <div className="p-6">
+      <h1 className="font-headline text-2xl font-bold text-gray-900 mb-6">
+        Paramètres
+      </h1>
+      <div className="bg-white rounded-md border border-gray-200 shadow-sm p-6">
+        <h2 className="font-headline text-lg font-semibold text-gray-800 mb-4">
+          Paramètres SMTP
+        </h2>
         <form onSubmit={handleSmtpSubmit}>
           <div className="grid grid-cols-2 gap-4">
             <InputText
@@ -187,7 +165,6 @@ export default function SettingsPage() {
             className="mt-6"
           ></Button>
         </form>
-        </TabContent>
       </div>
     </div>
   );

Front-End/src/app/[locale]/admin/structure/FormBuilder/page.js

@@ -204,7 +204,7 @@ export default function FormBuilderPage() {
           <ArrowLeft size={20} />
           Retour
         </button>
-        <h1 className="text-lg font-headline font-semibold text-gray-800">
+        <h1 className="font-headline text-lg font-headline font-semibold text-gray-800">
           {isEditing ? 'Modifier le formulaire' : 'Créer un formulaire personnalisé'}
         </h1>
       </div>

Front-End/src/app/[locale]/admin/structure/SchoolClassManagement/page.js

@@ -1,10 +1,28 @@
 'use client';
 
 import React, { useState, useEffect } from 'react';
-import { Users, Layers, CheckCircle, Clock, XCircle, ClipboardList, Plus } from 'lucide-react';
+import {
+  Users,
+  Layers,
+  CheckCircle,
+  Clock,
+  XCircle,
+  ClipboardList,
+  Plus,
+} from 'lucide-react';
 import Table from '@/components/Table';
 import Popup from '@/components/Popup';
-import { fetchClasse, fetchSpecialities, fetchEvaluations, createEvaluation, updateEvaluation, deleteEvaluation, fetchStudentEvaluations, saveStudentEvaluations, deleteStudentEvaluation } from '@/app/actions/schoolAction';
+import {
+  fetchClasse,
+  fetchSpecialities,
+  fetchEvaluations,
+  createEvaluation,
+  updateEvaluation,
+  deleteEvaluation,
+  fetchStudentEvaluations,
+  saveStudentEvaluations,
+  deleteStudentEvaluation,
+} from '@/app/actions/schoolAction';
 import { useSearchParams } from 'next/navigation';
 import logger from '@/utils/logger';
 import { useClasses } from '@/context/ClassesContext';
@@ -17,7 +35,11 @@ import {
   editAbsences,
   deleteAbsences,
 } from '@/app/actions/subscriptionAction';
-import { EvaluationForm, EvaluationList, EvaluationGradeTable } from '@/components/Evaluation';
+import {
+  EvaluationForm,
+  EvaluationList,
+  EvaluationGradeTable,
+} from '@/components/Evaluation';
 
 import { useCsrfToken } from '@/context/CsrfContext';
 import { useEstablishment } from '@/context/EstablishmentContext';
@@ -53,7 +75,8 @@ export default function Page() {
   const [editingEvaluation, setEditingEvaluation] = useState(null);
 
   const csrfToken = useCsrfToken();
-  const { selectedEstablishmentId, selectedEstablishmentEvaluationFrequency } = useEstablishment();
+  const { selectedEstablishmentId, selectedEstablishmentEvaluationFrequency } =
+    useEstablishment();
 
   // Périodes selon la fréquence d'évaluation
   const getPeriods = () => {
@@ -212,16 +235,25 @@ export default function Page() {
       const currentSchoolYear = `${year}-${year + 1}`;
       fetchSpecialities(selectedEstablishmentId, currentSchoolYear)
         .then((data) => setSpecialities(data))
-        .catch((error) => logger.error('Erreur lors du chargement des matières:', error));
+        .catch((error) =>
+          logger.error('Erreur lors du chargement des matières:', error)
+        );
     }
   }, [selectedEstablishmentId]);
 
   // Load evaluations when tab is active and period is selected
   useEffect(() => {
-    if (activeTab === 'evaluations' && selectedEstablishmentId && schoolClassId && selectedPeriod) {
+    if (
+      activeTab === 'evaluations' &&
+      selectedEstablishmentId &&
+      schoolClassId &&
+      selectedPeriod
+    ) {
       fetchEvaluations(selectedEstablishmentId, schoolClassId, selectedPeriod)
         .then((data) => setEvaluations(data))
-        .catch((error) => logger.error('Erreur lors du chargement des évaluations:', error));
+        .catch((error) =>
+          logger.error('Erreur lors du chargement des évaluations:', error)
+        );
     }
   }, [activeTab, selectedEstablishmentId, schoolClassId, selectedPeriod]);
 
@@ -230,7 +262,9 @@ export default function Page() {
     if (selectedEvaluation && schoolClassId) {
       fetchStudentEvaluations(null, selectedEvaluation.id, null, schoolClassId)
         .then((data) => setStudentEvaluations(data))
-        .catch((error) => logger.error('Erreur lors du chargement des notes:', error));
+        .catch((error) =>
+          logger.error('Erreur lors du chargement des notes:', error)
+        );
     }
   }, [selectedEvaluation, schoolClassId]);
 
@@ -241,7 +275,11 @@ export default function Page() {
       showNotification('Évaluation créée avec succès', 'success', 'Succès');
       setShowEvaluationForm(false);
       // Reload evaluations
-      const updatedEvaluations = await fetchEvaluations(selectedEstablishmentId, schoolClassId, selectedPeriod);
+      const updatedEvaluations = await fetchEvaluations(
+        selectedEstablishmentId,
+        schoolClassId,
+        selectedPeriod
+      );
       setEvaluations(updatedEvaluations);
     } catch (error) {
       logger.error('Erreur lors de la création:', error);
@@ -261,7 +299,11 @@ export default function Page() {
       setShowEvaluationForm(false);
       setEditingEvaluation(null);
       // Reload evaluations
-      const updatedEvaluations = await fetchEvaluations(selectedEstablishmentId, schoolClassId, selectedPeriod);
+      const updatedEvaluations = await fetchEvaluations(
+        selectedEstablishmentId,
+        schoolClassId,
+        selectedPeriod
+      );
       setEvaluations(updatedEvaluations);
     } catch (error) {
       logger.error('Erreur lors de la modification:', error);
@@ -272,20 +314,31 @@ export default function Page() {
   const handleDeleteEvaluation = async (evaluationId) => {
     await deleteEvaluation(evaluationId, csrfToken);
     // Reload evaluations
-    const updatedEvaluations = await fetchEvaluations(selectedEstablishmentId, schoolClassId, selectedPeriod);
+    const updatedEvaluations = await fetchEvaluations(
+      selectedEstablishmentId,
+      schoolClassId,
+      selectedPeriod
+    );
     setEvaluations(updatedEvaluations);
   };
 
   const handleSaveGrades = async (gradesData) => {
     await saveStudentEvaluations(gradesData, csrfToken);
     // Reload student evaluations
-    const updatedStudentEvaluations = await fetchStudentEvaluations(null, selectedEvaluation.id, null, schoolClassId);
+    const updatedStudentEvaluations = await fetchStudentEvaluations(
+      null,
+      selectedEvaluation.id,
+      null,
+      schoolClassId
+    );
     setStudentEvaluations(updatedStudentEvaluations);
   };
 
   const handleDeleteGrade = async (studentEvalId) => {
     await deleteStudentEvaluation(studentEvalId, csrfToken);
-    setStudentEvaluations((prev) => prev.filter((se) => se.id !== studentEvalId));
+    setStudentEvaluations((prev) =>
+      prev.filter((se) => se.id !== studentEvalId)
+    );
   };
 
   const handleLevelClick = (label) => {
@@ -543,14 +596,16 @@ export default function Page() {
 
   return (
     <div className="p-6 space-y-6">
-      <h1 className="text-2xl font-bold">{classe?.atmosphere_name}</h1>
+      <h1 className="font-headline text-2xl font-bold">
+        {classe?.atmosphere_name}
+      </h1>
 
       {/* Section Niveaux et Enseignants */}
       <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
         {/* Section Niveaux */}
-        <div className="bg-white p-4 rounded-lg shadow-md">
-          <h2 className="text-xl font-semibold mb-4 flex items-center">
-            <Layers className="w-6 h-6 mr-2" />
+        <div className="bg-white p-4 rounded-md shadow-sm">
+          <h2 className="font-headline text-xl font-semibold mb-4 flex items-center">
+            <Layers className="w-6 h-6 mr-2 text-primary" />
             Niveaux
           </h2>
           <p className="text-sm text-gray-500 mb-4">
@@ -559,24 +614,24 @@ export default function Page() {
           <div className="flex flex-wrap gap-2">
             {classe?.levels?.length > 0 ? (
               getNiveauxLabels(classe.levels).map((label, index) => (
-                <span
+                <button
                   key={index}
-                  onClick={() => handleLevelClick(label)} // Gérer le clic sur un niveau
-                  className={`px-4 py-2 rounded-full cursor-pointer border transition-all duration-200 ${
+                  onClick={() => handleLevelClick(label)}
+                  className={`px-4 py-2 rounded font-label font-medium cursor-pointer border transition-colors min-h-[44px] ${
                     selectedLevels.includes(label)
-                      ? 'bg-emerald-200 text-emerald-800 border-emerald-300 shadow-md'
+                      ? 'bg-primary/20 text-secondary border-primary/30 shadow-sm'
                       : 'bg-gray-200 text-gray-800 border-gray-300 hover:bg-gray-300'
                   }`}
                 >
                   {selectedLevels.includes(label) ? (
                     <span className="flex items-center gap-2">
-                      <CheckCircle className="w-4 h-4 text-emerald-600" />
+                      <CheckCircle className="w-4 h-4 text-primary" />
                       {label}
                     </span>
                   ) : (
                     label
                   )}
-                </span>
+                </button>
               ))
             ) : (
               <span className="text-gray-500">Aucun niveau associé</span>
@@ -585,9 +640,9 @@ export default function Page() {
         </div>
 
         {/* Section Enseignants */}
-        <div className="bg-white p-4 rounded-lg shadow-md">
-          <h2 className="text-xl font-semibold mb-4 flex items-center">
-            <Users className="w-6 h-6 mr-2" />
+        <div className="bg-white p-4 rounded-md shadow-sm">
+          <h2 className="font-headline text-xl font-semibold mb-4 flex items-center">
+            <Users className="w-6 h-6 mr-2 text-primary" />
             Enseignants
           </h2>
           <p className="text-sm text-gray-500 mb-4">Liste des enseignants</p>
@@ -595,7 +650,7 @@ export default function Page() {
             {classe?.teachers_details?.map((teacher) => (
               <span
                 key={teacher.id}
-                className="px-3 py-1 bg-emerald-200 rounded-full text-emerald-800"
+                className="px-3 py-1 bg-primary/20 rounded text-secondary font-label text-sm"
               >
                 {teacher.last_name} {teacher.first_name}
               </span>
@@ -605,14 +660,14 @@ export default function Page() {
       </div>
 
       {/* Tabs Navigation */}
-      <div className="bg-white rounded-lg shadow-md overflow-hidden">
+      <div className="bg-white rounded-md shadow-sm overflow-hidden">
         <div className="flex border-b border-gray-200">
           <button
             onClick={() => setActiveTab('attendance')}
-            className={`flex-1 py-3 px-4 text-center font-medium transition-colors ${
+            className={`flex-1 py-3 px-4 text-center font-label font-medium transition-colors min-h-[44px] ${
               activeTab === 'attendance'
-                ? 'text-emerald-600 border-b-2 border-emerald-600 bg-emerald-50'
-                : 'text-gray-500 hover:text-gray-700 hover:bg-gray-50'
+                ? 'text-primary border-b-2 border-primary bg-primary/5'
+                : 'text-gray-500 hover:text-secondary hover:bg-gray-50'
             }`}
           >
             <div className="flex items-center justify-center gap-2">
@@ -622,10 +677,10 @@ export default function Page() {
           </button>
           <button
             onClick={() => setActiveTab('evaluations')}
-            className={`flex-1 py-3 px-4 text-center font-medium transition-colors ${
+            className={`flex-1 py-3 px-4 text-center font-label font-medium transition-colors min-h-[44px] ${
               activeTab === 'evaluations'
-                ? 'text-emerald-600 border-b-2 border-emerald-600 bg-emerald-50'
-                : 'text-gray-500 hover:text-gray-700 hover:bg-gray-50'
+                ? 'text-primary border-b-2 border-primary bg-primary/5'
+                : 'text-gray-500 hover:text-secondary hover:bg-gray-50'
             }`}
           >
             <div className="flex items-center justify-center gap-2">
@@ -640,14 +695,14 @@ export default function Page() {
       {activeTab === 'attendance' && (
         <>
           {/* Affichage de la date du jour */}
-          <div className="flex justify-between items-center mb-4 bg-white p-4 rounded-lg shadow-md">
+          <div className="flex justify-between items-center mb-4 bg-white p-4 rounded-md shadow-sm">
             <div className="flex items-center space-x-3">
-              <div className="flex items-center justify-center w-10 h-10 bg-emerald-100 text-emerald-600 rounded-full">
+              <div className="flex items-center justify-center w-10 h-10 bg-primary/10 text-primary rounded">
                 <Clock className="w-6 h-6" />
               </div>
-              <h2 className="text-lg font-semibold text-gray-800">
+              <h2 className="font-headline text-lg font-semibold text-gray-800">
                 Appel du jour :{' '}
-                <span className="ml-2 text-emerald-600">{today}</span>
+                <span className="ml-2 text-primary">{today}</span>
               </h2>
             </div>
             <div className="flex items-center">
@@ -656,14 +711,14 @@ export default function Page() {
                   text="Faire l'appel"
                   onClick={handleToggleAttendanceMode}
                   primary
-                  className="px-4 py-2 bg-emerald-500 text-white rounded-lg shadow hover:bg-emerald-600 transition-all"
+                  className="px-4 py-2 bg-primary text-white font-label font-medium rounded shadow-sm hover:bg-secondary transition-colors min-h-[44px]"
                 />
               ) : (
                 <Button
                   text="Valider l'appel"
                   onClick={handleValidateAttendance}
                   primary
-                  className="px-4 py-2 bg-emerald-500 text-white rounded-lg shadow hover:bg-emerald-600 transition-all"
+                  className="px-4 py-2 bg-primary text-white font-label font-medium rounded shadow-sm hover:bg-secondary transition-colors min-h-[44px]"
                 />
               )}
             </div>
@@ -702,7 +757,9 @@ export default function Page() {
                                 <CheckBox
                                   item={{ id: row.id }}
                                   formData={{
-                                attendance: attendance[row.id] ? [row.id] : [],
+                                    attendance: attendance[row.id]
+                                      ? [row.id]
+                                      : [],
                                   }}
                                   handleChange={() =>
                                     handleAttendanceChange(row.id)
@@ -733,10 +790,10 @@ export default function Page() {
 
                           {/* Détails absence/retard */}
                           {!attendance[row.id] && (
-                        <div className="w-full bg-emerald-50 border border-emerald-100 rounded-lg p-3 mt-2 shadow-sm">
+                            <div className="w-full bg-primary/5 border border-primary/10 rounded-lg p-3 mt-2 shadow-sm">
                               <div className="flex items-center gap-2 mb-2">
-                            <Clock className="w-4 h-4 text-emerald-500" />
-                            <span className="font-semibold text-emerald-700 text-sm">
+                                <Clock className="w-4 h-4 text-primary" />
+                                <span className="font-semibold text-secondary text-sm">
                                   Motif d&apos;absence
                                 </span>
                               </div>
@@ -790,7 +847,9 @@ export default function Page() {
                                   type="text"
                                   className="border rounded px-2 py-1 text-sm w-full"
                                   placeholder="Commentaire"
-                              value={formAbsences[row.id]?.commentaire || ''}
+                                  value={
+                                    formAbsences[row.id]?.commentaire || ''
+                                  }
                                   onChange={(e) =>
                                     setFormAbsences((prev) => ({
                                       ...prev,
@@ -807,7 +866,8 @@ export default function Page() {
                                   <CheckBox
                                     item={{ id: `justified-${row.id}` }}
                                     formData={{
-                                  justified: !!formAbsences[row.id]?.justified,
+                                      justified:
+                                        !!formAbsences[row.id]?.justified,
                                     }}
                                     handleChange={() =>
                                       setFormAbsences((prev) => ({
@@ -838,7 +898,8 @@ export default function Page() {
                           formAbsences[row.id] ||
                           Object.values(fetchedAbsences).find(
                             (absence) =>
-                          absence.student === row.id && absence.day === today
+                              absence.student === row.id &&
+                              absence.day === today
                           );
 
                         if (!absence) {
@@ -900,11 +961,11 @@ export default function Page() {
       {activeTab === 'evaluations' && (
         <div className="space-y-4">
           {/* Header avec sélecteur de période et bouton d'ajout */}
-          <div className="bg-white p-4 rounded-lg shadow-md">
+          <div className="bg-white p-4 rounded-md shadow-sm border border-gray-200">
             <div className="flex flex-col sm:flex-row items-start sm:items-center justify-between gap-4">
               <div className="flex items-center gap-4">
-                <ClipboardList className="w-6 h-6 text-emerald-600" />
-                <h2 className="text-lg font-semibold text-gray-800">
+                <ClipboardList className="w-6 h-6 text-primary" />
+                <h2 className="font-headline text-lg font-semibold text-gray-800">
                   Évaluations de la classe
                 </h2>
               </div>
@@ -936,7 +997,11 @@ export default function Page() {
               schoolClassId={parseInt(schoolClassId)}
               establishmentId={selectedEstablishmentId}
               initialValues={editingEvaluation}
-              onSubmit={editingEvaluation ? handleUpdateEvaluation : handleCreateEvaluation}
+              onSubmit={
+                editingEvaluation
+                  ? handleUpdateEvaluation
+                  : handleCreateEvaluation
+              }
               onCancel={() => {
                 setShowEvaluationForm(false);
                 setEditingEvaluation(null);
@@ -945,12 +1010,14 @@ export default function Page() {
           )}
 
           {/* Liste des évaluations */}
-          <div className="bg-white p-4 rounded-lg shadow-md">
+          <div className="bg-white p-4 rounded-md shadow-sm border border-gray-200">
             <EvaluationList
               evaluations={evaluations}
               onDelete={handleDeleteEvaluation}
               onEdit={handleEditEvaluation}
-              onGradeStudents={(evaluation) => setSelectedEvaluation(evaluation)}
+              onGradeStudents={(evaluation) =>
+                setSelectedEvaluation(evaluation)
+              }
             />
           </div>
 

Front-End/src/app/[locale]/admin/structure/page.js

@@ -60,12 +60,8 @@ export default function Page() {
   const scheduleClasses = classes.filter(
     (classe) => classe?.school_year === currentSchoolYear
   );
-  const scheduleSpecialities = specialities.filter(
-    (speciality) => speciality?.school_year === currentSchoolYear
-  );
-  const scheduleTeachers = teachers.filter(
-    (teacher) => teacher?.school_year === currentSchoolYear
-  );
+  const scheduleSpecialities = specialities;
+  const scheduleTeachers = teachers;
 
   useEffect(() => {
     if (selectedEstablishmentId) {

Front-End/src/app/[locale]/admin/subscriptions/createSubscription/page.js

@@ -1,7 +1,7 @@
 'use client';
 
 import React, { useState, useRef, useEffect } from 'react';
-import { User, Mail } from 'lucide-react';
+import { User, Mail, Info } from 'lucide-react';
 import InputTextIcon from '@/components/Form/InputTextIcon';
 import ToggleSwitch from '@/components/Form/ToggleSwitch';
 import Button from '@/components/Form/Button';
@@ -43,6 +43,23 @@ import { FE_ADMIN_SUBSCRIPTIONS_URL } from '@/utils/Url';
 import { getSecureFileUrl } from '@/utils/fileUrl';
 import { useNotification } from '@/context/NotificationContext';
 
+function NoInfoAlert({ message }) {
+  return (
+    <div
+      className="w-full rounded border border-orange-300 bg-orange-50 px-4 py-3 text-orange-800"
+      role="alert"
+    >
+      <div className="flex items-start gap-3">
+        <Info className="mt-0.5 h-4 w-4 shrink-0" />
+        <div className="text-sm leading-6">
+          <span className="font-semibold">Information :</span>{' '}
+          <span>{message}</span>
+        </div>
+      </div>
+    </div>
+  );
+}
+
 export default function CreateSubscriptionPage() {
   const [formData, setFormData] = useState({
     studentLastName: '',
@@ -729,11 +746,11 @@ export default function CreateSubscriptionPage() {
   return (
     <div className="mx-auto p-12 space-y-12">
       {registerFormID ? (
-        <h1 className="text-2xl font-bold">
+        <h1 className="font-headline text-2xl font-bold">
           Modifier un dossier d&apos;inscription
         </h1>
       ) : (
-        <h1 className="text-2xl font-bold">
+        <h1 className="font-headline text-2xl font-bold">
           Créer un dossier d&apos;inscription
         </h1>
       )}
@@ -936,7 +953,7 @@ export default function CreateSubscriptionPage() {
             }}
             rowClassName={(row) =>
               selectedStudent && selectedStudent.id === row.id
-                ? 'bg-emerald-600 text-white'
+                ? 'bg-primary text-white'
                 : ''
             }
             selectedRows={selectedStudent ? [selectedStudent.id] : []} // Assurez-vous que selectedRows est un tableau
@@ -948,7 +965,7 @@ export default function CreateSubscriptionPage() {
 
           {selectedStudent && (
             <div className="mt-4">
-              <h3 className="font-bold">
+              <h3 className="font-headline font-bold">
                 Responsables associés à {selectedStudent.last_name}{' '}
                 {selectedStudent.first_name} :
               </h3>
@@ -1003,22 +1020,13 @@ export default function CreateSubscriptionPage() {
                     }
                   />
                 ) : (
-                  <p
-                    className="bg-orange-100 border border-orange-400 text-orange-700 px-4 py-3 rounded relative"
-                    role="alert"
-                  >
-                    <strong className="font-bold">Information</strong>
-                    <span className="block sm:inline">
-                      Aucune réduction n&apos;a été créée sur les frais
-                      d&apos;inscription.
-                    </span>
-                  </p>
+                  <NoInfoAlert message="Aucune réduction n&apos;a été créée sur les frais d&apos;inscription." />
                 )}
               </div>
             </div>
 
             {/* Montant total */}
-            <div className="flex items-center justify-between bg-gray-50 p-4 rounded-lg shadow-sm border border-gray-300 mt-4">
+            <div className="flex items-center justify-between bg-gray-50 p-4 rounded-md shadow-sm border border-gray-300 mt-4">
               <span className="text-sm font-medium text-gray-600">
                 Montant total des frais d&apos;inscription :
               </span>
@@ -1028,15 +1036,7 @@ export default function CreateSubscriptionPage() {
             </div>
           </>
         ) : (
-          <p
-            className="bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded relative"
-            role="alert"
-          >
-            <strong className="font-bold">Attention!</strong>
-            <span className="block sm:inline">
-              Aucun frais d&apos;inscription n&apos;a été créé.
-            </span>
-          </p>
+          <NoInfoAlert message="Aucun frais d&apos;inscription n&apos;a été créé." />
         )}
       </SectionTitle>
 
@@ -1067,22 +1067,13 @@ export default function CreateSubscriptionPage() {
                     handleDiscountSelection={handleTuitionDiscountSelection}
                   />
                 ) : (
-                  <p
-                    className="bg-orange-100 border border-orange-400 text-orange-700 px-4 py-3 rounded relative"
-                    role="alert"
-                  >
-                    <strong className="font-bold">Information</strong>
-                    <span className="block sm:inline">
-                      Aucune réduction n&apos;a été créée sur les frais de
-                      scolarité.
-                    </span>
-                  </p>
+                  <NoInfoAlert message="Aucune réduction n&apos;a été créée sur les frais de scolarité." />
                 )}
               </div>
             </div>
 
             {/* Montant total */}
-            <div className="flex items-center justify-between bg-gray-50 p-4 rounded-lg shadow-sm border border-gray-300 mt-4">
+            <div className="flex items-center justify-between bg-gray-50 p-4 rounded-md shadow-sm border border-gray-300 mt-4">
               <span className="text-sm font-medium text-gray-600">
                 Montant total des frais de scolarité :
               </span>
@@ -1092,15 +1083,7 @@ export default function CreateSubscriptionPage() {
             </div>
           </>
         ) : (
-          <p
-            className="bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded relative"
-            role="alert"
-          >
-            <strong className="font-bold">Attention!</strong>
-            <span className="block sm:inline">
-              Aucun frais de scolarité n&apos;a été créé.
-            </span>
-          </p>
+          <NoInfoAlert message="Aucun frais de scolarité n&apos;a été créé." />
         )}
       </SectionTitle>
 
@@ -1153,7 +1136,7 @@ export default function CreateSubscriptionPage() {
           className={`px-6 py-2 rounded-md shadow ${
             isSubmitDisabled()
               ? 'bg-gray-300 text-gray-500 cursor-not-allowed'
-              : 'bg-emerald-500 text-white hover:bg-emerald-600'
+              : 'bg-primary text-white hover:bg-primary'
           }`}
           primary
           disabled={isSubmitDisabled()}

Front-End/src/app/[locale]/admin/subscriptions/page.js

@@ -1,7 +1,7 @@
 'use client';
 import React, { useState, useEffect } from 'react';
 import Table from '@/components/Table';
-import Tab from '@/components/Tab';
+import SidebarTabs from '@/components/SidebarTabs';
 import Textarea from '@/components/Textarea';
 import { useTranslations } from 'next-intl';
 import StatusLabel from '@/components/StatusLabel';
@@ -55,6 +55,7 @@ import {
   HISTORICAL_FILTER,
 } from '@/utils/constants';
 import AlertMessage from '@/components/AlertMessage';
+import EmptyState from '@/components/EmptyState';
 import { useNotification } from '@/context/NotificationContext';
 import { exportToCSV } from '@/utils/exportCSV';
 
@@ -167,24 +168,65 @@ export default function Page({ params: { locale } }) {
 
   // Export CSV
   const handleExportCSV = () => {
-    const dataToExport = activeTab === CURRENT_YEAR_FILTER
+    const dataToExport =
+      activeTab === CURRENT_YEAR_FILTER
         ? registrationFormsDataCurrentYear
         : activeTab === NEXT_YEAR_FILTER
           ? registrationFormsDataNextYear
           : registrationFormsDataHistorical;
 
     const exportColumns = [
-      { key: 'student', label: 'Nom', transform: (value) => value?.last_name || '' },
-      { key: 'student', label: 'Prénom', transform: (value) => value?.first_name || '' },
-      { key: 'student', label: 'Date de naissance', transform: (value) => value?.birth_date || '' },
-      { key: 'student', label: 'Email contact', transform: (value) => value?.guardians?.[0]?.associated_profile_email || '' },
-      { key: 'student', label: 'Téléphone contact', transform: (value) => value?.guardians?.[0]?.phone || '' },
-      { key: 'student', label: 'Nom responsable 1', transform: (value) => value?.guardians?.[0]?.last_name || '' },
-      { key: 'student', label: 'Prénom responsable 1', transform: (value) => value?.guardians?.[0]?.first_name || '' },
-      { key: 'student', label: 'Nom responsable 2', transform: (value) => value?.guardians?.[1]?.last_name || '' },
-      { key: 'student', label: 'Prénom responsable 2', transform: (value) => value?.guardians?.[1]?.first_name || '' },
+      {
+        key: 'student',
+        label: 'Nom',
+        transform: (value) => value?.last_name || '',
+      },
+      {
+        key: 'student',
+        label: 'Prénom',
+        transform: (value) => value?.first_name || '',
+      },
+      {
+        key: 'student',
+        label: 'Date de naissance',
+        transform: (value) => value?.birth_date || '',
+      },
+      {
+        key: 'student',
+        label: 'Email contact',
+        transform: (value) =>
+          value?.guardians?.[0]?.associated_profile_email || '',
+      },
+      {
+        key: 'student',
+        label: 'Téléphone contact',
+        transform: (value) => value?.guardians?.[0]?.phone || '',
+      },
+      {
+        key: 'student',
+        label: 'Nom responsable 1',
+        transform: (value) => value?.guardians?.[0]?.last_name || '',
+      },
+      {
+        key: 'student',
+        label: 'Prénom responsable 1',
+        transform: (value) => value?.guardians?.[0]?.first_name || '',
+      },
+      {
+        key: 'student',
+        label: 'Nom responsable 2',
+        transform: (value) => value?.guardians?.[1]?.last_name || '',
+      },
+      {
+        key: 'student',
+        label: 'Prénom responsable 2',
+        transform: (value) => value?.guardians?.[1]?.first_name || '',
+      },
       { key: 'school_year', label: 'Année scolaire' },
-      { key: 'status', label: 'Statut', transform: (value) => {
+      {
+        key: 'status',
+        label: 'Statut',
+        transform: (value) => {
           const statusMap = {
             0: 'En attente',
             1: 'En cours',
@@ -195,11 +237,13 @@ export default function Page({ params: { locale } }) {
             6: 'Archivé',
           };
           return statusMap[value] || value;
-      }},
+        },
+      },
       { key: 'formatted_last_update', label: 'Dernière mise à jour' },
     ];
 
-    const yearLabel = activeTab === CURRENT_YEAR_FILTER
+    const yearLabel =
+      activeTab === CURRENT_YEAR_FILTER
         ? currentSchoolYear
         : activeTab === NEXT_YEAR_FILTER
           ? nextSchoolYear
@@ -506,7 +550,7 @@ export default function Page({ params: { locale } }) {
         {
           icon: (
             <span title="Envoyer le dossier">
-              <Send className="w-5 h-5 text-green-500 hover:text-green-700" />
+              <Send className="w-5 h-5 text-primary hover:text-secondary" />
             </span>
           ),
           onClick: () =>
@@ -536,7 +580,7 @@ export default function Page({ params: { locale } }) {
         {
           icon: (
             <span title="Renvoyer le dossier">
-              <Send className="w-5 h-5 text-green-500 hover:text-green-700" />
+              <Send className="w-5 h-5 text-primary hover:text-secondary" />
             </span>
           ),
           onClick: () =>
@@ -575,7 +619,7 @@ export default function Page({ params: { locale } }) {
         {
           icon: (
             <span title="Valider le dossier">
-              <CheckCircle className="w-5 h-5 text-green-500 hover:text-green-700" />
+              <CheckCircle className="w-5 h-5 text-primary hover:text-secondary" />
             </span>
           ),
           onClick: () => {
@@ -690,7 +734,7 @@ export default function Page({ params: { locale } }) {
         {
           icon: (
             <span title="Uploader un mandat SEPA">
-              <Upload className="w-5 h-5 text-emerald-500 hover:text-emerald-700" />
+              <Upload className="w-5 h-5 text-primary hover:text-secondary" />
             </span>
           ),
           onClick: () => openSepaUploadModal(row),
@@ -800,90 +844,51 @@ export default function Page({ params: { locale } }) {
     },
   ];
 
-  let emptyMessage;
-  if (activeTab === CURRENT_YEAR_FILTER && searchTerm === '') {
-    emptyMessage = (
-      <AlertMessage
-        type="warning"
-        title="Aucun dossier d'inscription pour l'année en cours"
-        message="Veuillez procéder à la création d'un nouveau dossier d'inscription pour l'année scolaire en cours."
-      />
-    );
-  } else if (activeTab === NEXT_YEAR_FILTER && searchTerm === '') {
-    emptyMessage = (
-      <AlertMessage
-        type="info"
-        title="Aucun dossier d'inscription pour l'année prochaine"
-        message="Aucun dossier n'a encore été créé pour la prochaine année scolaire."
-      />
-    );
-  } else if (activeTab === HISTORICAL_FILTER && searchTerm === '') {
-    emptyMessage = (
-      <AlertMessage
-        type="info"
-        title="Aucun dossier d'inscription historique"
-        message="Aucun dossier archivé n'est disponible pour les années précédentes."
-      />
-    );
-  }
-
-  if (isLoading) {
-    return <Loader />;
-  }
-
+  const getEmptyMessageForTab = (tabFilter) => {
+    if (searchTerm !== '') {
       return (
-    <div className="p-8">
-      <div className="border-b border-gray-200 mb-6">
-        <div className="flex items-center gap-8">
-          {/* Tab pour l'année scolaire en cours */}
-          <Tab
-            text={
-              <>
-                {currentSchoolYear}
-                <span className="ml-2 text-sm text-gray-400">
-                  ({totalCurrentYear})
-                </span>
-              </>
-            }
-            active={activeTab === CURRENT_YEAR_FILTER}
-            onClick={() => setActiveTab(CURRENT_YEAR_FILTER)}
+        <EmptyState
+          icon={Search}
+          title="Aucun dossier trouvé"
+          description="Modifiez votre recherche pour trouver un dossier d'inscription."
         />
-
-          {/* Tab pour l'année scolaire prochaine */}
-          <Tab
-            text={
-              <>
-                {nextSchoolYear}
-                <span className="ml-2 text-sm text-gray-400">
-                  ({totalNextYear})
-                </span>
-              </>
+      );
     }
-            active={activeTab === NEXT_YEAR_FILTER}
-            onClick={() => setActiveTab(NEXT_YEAR_FILTER)}
+    if (tabFilter === CURRENT_YEAR_FILTER) {
+      return (
+        <EmptyState
+          icon={FileText}
+          title="Aucun dossier d'inscription pour l'année en cours"
+          description="Commencez par créer un dossier d'inscription pour l'année scolaire en cours."
+          actionLabel="Créer un dossier"
+          actionIcon={Plus}
+          onAction={() => router.push(FE_ADMIN_SUBSCRIPTIONS_CREATE_URL)}
         />
-
-          {/* Tab pour l'historique */}
-          <Tab
-            text={
-              <>
-                {t('historical')}
-                <span className="ml-2 text-sm text-gray-400">
-                  ({totalHistorical})
-                </span>
-              </>
+      );
     }
-            active={activeTab === HISTORICAL_FILTER}
-            onClick={() => setActiveTab(HISTORICAL_FILTER)}
+    if (tabFilter === NEXT_YEAR_FILTER) {
+      return (
+        <EmptyState
+          icon={FileText}
+          title="Aucun dossier pour l'année prochaine"
+          description="Aucun dossier n'a encore été créé pour la prochaine année scolaire."
+          actionLabel="Créer un dossier"
+          actionIcon={Plus}
+          onAction={() => router.push(FE_ADMIN_SUBSCRIPTIONS_CREATE_URL)}
         />
-        </div>
-      </div>
+      );
+    }
+    return (
+      <EmptyState
+        icon={Archive}
+        title="Aucun dossier archivé"
+        description="Aucun dossier archivé n'est disponible pour les années précédentes."
+      />
+    );
+  };
 
-      <div className="border-b border-gray-200 mb-6 w-full">
-        {activeTab === CURRENT_YEAR_FILTER ||
-        activeTab === NEXT_YEAR_FILTER ||
-        activeTab === HISTORICAL_FILTER ? (
-          <React.Fragment>
+  const renderTabContent = (data, currentPage, totalPages, tabFilter) => (
+    <div className="p-4">
       <div className="flex justify-between items-center mb-4 w-full">
         <div className="relative flex-grow">
           <Search
@@ -901,7 +906,7 @@ export default function Page({ params: { locale } }) {
         <div className="flex items-center gap-2 ml-4">
           <button
             onClick={handleExportCSV}
-                  className="flex items-center gap-2 px-4 py-2 text-sm font-medium text-emerald-700 bg-emerald-100 rounded-lg hover:bg-emerald-200 transition-colors"
+            className="flex items-center gap-2 px-4 py-2 text-sm font-medium text-secondary bg-primary/10 rounded hover:bg-primary/20 transition-colors"
             title="Exporter en CSV"
           >
             <Download className="w-4 h-4" />
@@ -909,52 +914,69 @@ export default function Page({ params: { locale } }) {
           </button>
           {profileRole !== 0 && (
             <button
-                    onClick={() => {
-                      const url = `${FE_ADMIN_SUBSCRIPTIONS_CREATE_URL}`;
-                      router.push(url);
-                    }}
-                    className="flex items-center bg-emerald-600 text-white p-2 rounded-full shadow hover:bg-emerald-900 transition duration-200"
+              onClick={() => router.push(FE_ADMIN_SUBSCRIPTIONS_CREATE_URL)}
+              className="flex items-center bg-primary text-white p-2 rounded-full shadow hover:bg-secondary transition duration-200"
             >
               <Plus className="w-5 h-5" />
             </button>
           )}
         </div>
       </div>
-
-            <div className="w-full">
       <DjangoCSRFToken csrfToken={csrfToken} />
       <Table
-                key={`${currentSchoolYearPage}-${searchTerm}`}
-                data={
-                  activeTab === CURRENT_YEAR_FILTER
-                    ? registrationFormsDataCurrentYear
-                    : activeTab === NEXT_YEAR_FILTER
-                      ? registrationFormsDataNextYear
-                      : registrationFormsDataHistorical
-                }
+        key={`${tabFilter}-${currentPage}-${searchTerm}`}
+        data={data}
         columns={columns}
         itemsPerPage={itemsPerPage}
-                currentPage={
-                  activeTab === CURRENT_YEAR_FILTER
-                    ? currentSchoolYearPage
-                    : activeTab === NEXT_YEAR_FILTER
-                      ? currentSchoolNextYearPage
-                      : currentSchoolHistoricalYearPage
-                }
-                totalPages={
-                  activeTab === CURRENT_YEAR_FILTER
-                    ? totalCurrentSchoolYearPages
-                    : activeTab === NEXT_YEAR_FILTER
-                      ? totalNextSchoolYearPages
-                      : totalHistoricalPages
-                }
+        currentPage={currentPage}
+        totalPages={totalPages}
         onPageChange={handlePageChange}
-                emptyMessage={emptyMessage}
+        emptyMessage={getEmptyMessageForTab(tabFilter)}
       />
     </div>
-          </React.Fragment>
-        ) : null}
-      </div>
+  );
+
+  if (isLoading) {
+    return <Loader />;
+  }
+
+  return (
+    <div className="h-full flex flex-col">
+      <SidebarTabs
+        tabs={[
+          {
+            id: CURRENT_YEAR_FILTER,
+            label: `${currentSchoolYear}${totalCurrentYear > 0 ? ` (${totalCurrentYear})` : ''}`,
+            content: renderTabContent(
+              registrationFormsDataCurrentYear,
+              currentSchoolYearPage,
+              totalCurrentSchoolYearPages,
+              CURRENT_YEAR_FILTER
+            ),
+          },
+          {
+            id: NEXT_YEAR_FILTER,
+            label: `${nextSchoolYear}${totalNextYear > 0 ? ` (${totalNextYear})` : ''}`,
+            content: renderTabContent(
+              registrationFormsDataNextYear,
+              currentSchoolNextYearPage,
+              totalNextSchoolYearPages,
+              NEXT_YEAR_FILTER
+            ),
+          },
+          {
+            id: HISTORICAL_FILTER,
+            label: `${t('historical')}${totalHistorical > 0 ? ` (${totalHistorical})` : ''}`,
+            content: renderTabContent(
+              registrationFormsDataHistorical,
+              currentSchoolHistoricalYearPage,
+              totalHistoricalPages,
+              HISTORICAL_FILTER
+            ),
+          },
+        ]}
+        onTabChange={(newTab) => setActiveTab(newTab)}
+      />
       <Popup
         isOpen={confirmPopupVisible}
         message={confirmPopupMessage}

Front-End/src/app/[locale]/page.js

@@ -10,10 +10,10 @@ export default function Home() {
   const t = useTranslations('homePage');
 
   return (
-    <div className="flex flex-col items-center justify-center min-h-screen py-2">
-      <Logo className="mb-4" /> {/* Ajout du logo */}
-      <h1 className="text-4xl font-bold mb-4">{t('welcomeParents')}</h1>
-      <p className="text-lg mb-8">{t('pleaseLogin')}</p>
+    <div className="flex flex-col items-center justify-center min-h-screen py-2 bg-neutral">
+      <Logo className="mb-4" />
+      <h1 className="font-headline text-4xl font-bold mb-4">{t('welcomeParents')}</h1>
+      <p className="font-body text-lg mb-8">{t('pleaseLogin')}</p>
       <Button text={t('loginButton')} primary href="/users/login" />
     </div>
   );

Front-End/src/app/[locale]/parents/layout.js

@@ -100,7 +100,7 @@ export default function Layout({ children }) {
 
       {/* Main container */}
       <div
-        className={`absolute overflow-auto bg-gradient-to-br from-emerald-50 via-sky-50 to-emerald-100 top-14 md:top-0 bottom-16 left-0 md:left-64 right-0 ${!isMessagingPage ? 'p-4 md:p-8' : ''}`}
+        className={`absolute overflow-auto bg-gradient-to-br from-primary/5 via-sky-50 to-primary/10 top-14 md:top-0 bottom-16 left-0 md:left-64 right-0 ${!isMessagingPage ? 'p-4 md:p-8' : ''}`}
       >
         {children}
       </div>

Front-End/src/app/[locale]/parents/page.js

@@ -282,10 +282,10 @@ export default function ParentHomePage() {
         <>
           <div className="p-4 flex items-center border-b">
             <button
-              className="text-emerald-600 hover:text-emerald-800 font-semibold flex items-center"
+              className="text-primary hover:text-secondary font-label font-medium min-h-[44px] flex items-center transition-colors"
               onClick={() => setShowPlanning(false)}
             >
-              ← Retour
+              <ArrowLeft className="w-4 h-4 mr-1" /> Retour
             </button>
           </div>
           <div className="flex-1 flex overflow-hidden">
@@ -309,7 +309,7 @@ export default function ParentHomePage() {
                 title="Événements à venir"
                 description="Prochains événements de l'établissement"
               />
-              <div className="bg-stone-50 p-4 rounded-lg shadow-sm border border-gray-100">
+              <div className="bg-neutral p-4 rounded-md shadow-sm border border-gray-100">
                 {upcomingEvents.slice(0, 3).map((event, index) => (
                   <EventCard key={index} {...event} />
                 ))}
@@ -343,7 +343,7 @@ export default function ParentHomePage() {
               return (
                 <div
                   key={student.id}
-                  className="bg-white rounded-lg shadow-sm border border-gray-200 overflow-hidden"
+                  className="bg-white rounded-md shadow-sm border border-gray-200 overflow-hidden"
                 >
                   {/* En-tête de la carte (toujours visible) */}
                   <div
@@ -373,7 +373,7 @@ export default function ParentHomePage() {
 
                     {/* Infos principales */}
                     <div className="flex-1 min-w-0">
-                      <h3 className="text-lg font-semibold text-gray-800">
+                      <h3 className="font-headline text-lg font-semibold text-gray-800">
                         {student.last_name} {student.first_name}
                       </h3>
                       <div className="mt-1">
@@ -399,7 +399,7 @@ export default function ParentHomePage() {
                     <div className="flex items-center gap-2 flex-shrink-0">
                       {child.status === 2 && (
                         <button
-                          className="p-2 text-blue-500 hover:text-blue-700 hover:bg-blue-50 rounded-full"
+                          className="p-2 min-h-[44px] min-w-[44px] flex items-center justify-center text-blue-500 hover:text-blue-700 hover:bg-blue-50 rounded-full transition-colors"
                           onClick={(e) => {
                             e.stopPropagation();
                             handleEdit(student.id);
@@ -412,7 +412,7 @@ export default function ParentHomePage() {
 
                       {(child.status === 3 || child.status === 8 || child.status === 5 || child.status === 7) && (
                         <button
-                          className="p-2 text-purple-500 hover:text-purple-700 hover:bg-purple-50 rounded-full"
+                          className="p-2 min-h-[44px] min-w-[44px] flex items-center justify-center text-purple-500 hover:text-purple-700 hover:bg-purple-50 rounded-full transition-colors"
                           onClick={(e) => {
                             e.stopPropagation();
                             handleView(student.id);
@@ -429,14 +429,14 @@ export default function ParentHomePage() {
                             href={getSecureFileUrl(child.sepa_file)}
                             target="_blank"
                             rel="noopener noreferrer"
-                            className="p-2 text-green-500 hover:text-green-700 hover:bg-green-50 rounded-full"
+                            className="p-2 min-h-[44px] min-w-[44px] flex items-center justify-center text-primary hover:text-secondary hover:bg-primary/5 rounded-full transition-colors"
                             onClick={(e) => e.stopPropagation()}
                             title="Télécharger le mandat SEPA"
                           >
                             <Download className="h-5 w-5" />
                           </a>
                           <button
-                            className={`p-2 rounded-full ${
+                            className={`p-2 min-h-[44px] min-w-[44px] flex items-center justify-center rounded-full transition-colors ${
                               uploadingStudentId === student.id && uploadState === 'on'
                                 ? 'bg-blue-100 text-blue-600'
                                 : 'text-blue-500 hover:text-blue-700 hover:bg-blue-50'
@@ -455,7 +455,7 @@ export default function ParentHomePage() {
                       {isEnrolled && (
                         <>
                           <button
-                            className="p-2 text-primary hover:text-secondary hover:bg-tertiary/10 rounded-full"
+                            className="p-2 min-h-[44px] min-w-[44px] flex items-center justify-center text-primary hover:text-secondary hover:bg-tertiary/10 rounded-full transition-colors"
                             onClick={(e) => {
                               e.stopPropagation();
                               showClassPlanning(student);
@@ -484,7 +484,7 @@ export default function ParentHomePage() {
                         onFileSelect={handleFileUpload}
                       />
                       <button
-                        className={`mt-4 px-6 py-2 rounded-md ${
+                        className={`mt-4 px-4 py-2 rounded font-label font-medium min-h-[44px] transition-colors ${
                           uploadedFile
                             ? 'bg-primary text-white hover:bg-secondary'
                             : 'bg-gray-300 text-gray-700 cursor-not-allowed'
@@ -499,10 +499,10 @@ export default function ParentHomePage() {
 
                   {/* Section détaillée pour les élèves inscrits (expanded) */}
                   {isEnrolled && isExpanded && (
-                    <div className="border-t bg-stone-50 p-4 space-y-6">
+                    <div className="border-t bg-neutral p-4 space-y-6">
 
                       {/* Bloc période : compétences + notes */}
-                      <div className="bg-white rounded-lg border border-primary/20 p-4 space-y-4">
+                      <div className="bg-white rounded-md border border-primary/20 p-4 space-y-4">
                         {/* Sélecteur de période */}
                         <div className="flex items-center gap-3 pb-3 border-b border-gray-100">
                           <div className="w-full sm:w-48">
@@ -540,10 +540,10 @@ export default function ParentHomePage() {
                             const pctNotEvaluated = total ? Math.round((notEvaluated / total) * 100) : 0;
 
                             return (
-                              <div className="border border-gray-100 rounded-lg p-4">
+                              <div className="border border-gray-100 rounded-md p-4">
                                 <div className="flex items-center gap-2 mb-4">
                                   <Award className="w-5 h-5 text-primary" />
-                                  <h3 className="text-lg font-semibold text-gray-800">
+                                  <h3 className="font-headline text-lg font-semibold text-gray-800">
                                     Compétences
                                   </h3>
                                   {total > 0 && (
@@ -552,19 +552,19 @@ export default function ParentHomePage() {
                                 </div>
                                 {total > 0 ? (
                                   <div className="grid grid-cols-2 sm:grid-cols-4 gap-4">
-                                    <div className="flex flex-col items-center p-3 bg-emerald-50 rounded-lg">
-                                      <span className="text-2xl font-bold text-emerald-600">{pctAcquired}%</span>
-                                      <span className="text-sm text-emerald-700">Acquises</span>
+                                    <div className="flex flex-col items-center p-3 bg-primary/5 rounded-md">
+                                      <span className="text-2xl font-bold text-primary">{pctAcquired}%</span>
+                                      <span className="text-sm text-secondary">Acquises</span>
                                     </div>
-                                    <div className="flex flex-col items-center p-3 bg-yellow-50 rounded-lg">
+                                    <div className="flex flex-col items-center p-3 bg-yellow-50 rounded-md">
                                       <span className="text-2xl font-bold text-yellow-600">{pctInProgress}%</span>
                                       <span className="text-sm text-yellow-700">En cours</span>
                                     </div>
-                                    <div className="flex flex-col items-center p-3 bg-red-50 rounded-lg">
+                                    <div className="flex flex-col items-center p-3 bg-red-50 rounded-md">
                                       <span className="text-2xl font-bold text-red-500">{pctNotAcquired}%</span>
                                       <span className="text-sm text-red-600">Non acquises</span>
                                     </div>
-                                    <div className="flex flex-col items-center p-3 bg-gray-100 rounded-lg">
+                                    <div className="flex flex-col items-center p-3 bg-gray-100 rounded-md">
                                       <span className="text-2xl font-bold text-gray-500">{pctNotEvaluated}%</span>
                                       <span className="text-sm text-gray-600">Non évaluées</span>
                                     </div>
@@ -577,10 +577,10 @@ export default function ParentHomePage() {
                           })()}
 
                           {/* Notes par matière - Vue simplifiée */}
-                          <div className="border border-gray-100 rounded-lg p-4">
+                          <div className="border border-gray-100 rounded-md p-4">
                             <div className="flex items-center gap-2 mb-4">
                               <Award className="w-5 h-5 text-primary" />
-                              <h3 className="text-lg font-semibold text-gray-800">
+                              <h3 className="font-headline text-lg font-semibold text-gray-800">
                                 Notes par matière
                               </h3>
                             </div>
@@ -617,7 +617,7 @@ export default function ParentHomePage() {
                                     return (
                                       <div
                                         key={group.name}
-                                        className="rounded-lg p-4 border"
+                                        className="rounded-md p-4 border"
                                         style={{
                                           backgroundColor: `${group.color}10`,
                                           borderColor: `${group.color}40`,
@@ -657,28 +657,28 @@ export default function ParentHomePage() {
                       {/* Fin bloc période */}
 
                       {/* Section Absences — toute l'année scolaire */}
-                      <div className="bg-white rounded-lg border border-gray-200 p-4">
+                      <div className="bg-white rounded-md border border-gray-200 p-4">
                         <div className="flex items-center gap-2 mb-1">
                           <Clock className="w-5 h-5 text-primary" />
-                          <h3 className="text-lg font-semibold text-gray-800">
+                          <h3 className="font-headline text-lg font-semibold text-gray-800">
                             Absences & Retards
                           </h3>
                         </div>
                         <p className="text-xs text-gray-400 mb-4">Toute l&apos;année scolaire</p>
                         <div className="grid grid-cols-2 sm:grid-cols-4 gap-4">
-                          <div className="flex flex-col items-center p-3 bg-green-50 rounded-lg">
-                            <span className="text-2xl font-bold text-green-600">{absenceStats.justifiedAbsence}</span>
-                            <span className="text-sm text-green-700 text-center">Absences justifiées</span>
+                          <div className="flex flex-col items-center p-3 bg-primary/5 rounded-md">
+                            <span className="text-2xl font-bold text-primary">{absenceStats.justifiedAbsence}</span>
+                            <span className="text-sm text-secondary text-center">Absences justifiées</span>
                           </div>
-                          <div className="flex flex-col items-center p-3 bg-red-50 rounded-lg">
+                          <div className="flex flex-col items-center p-3 bg-red-50 rounded-md">
                             <span className="text-2xl font-bold text-red-500">{absenceStats.unjustifiedAbsence}</span>
                             <span className="text-sm text-red-600 text-center">Absences non justifiées</span>
                           </div>
-                          <div className="flex flex-col items-center p-3 bg-blue-50 rounded-lg">
+                          <div className="flex flex-col items-center p-3 bg-blue-50 rounded-md">
                             <span className="text-2xl font-bold text-blue-600">{absenceStats.justifiedLate}</span>
                             <span className="text-sm text-blue-700 text-center">Retards justifiés</span>
                           </div>
-                          <div className="flex flex-col items-center p-3 bg-orange-50 rounded-lg">
+                          <div className="flex flex-col items-center p-3 bg-orange-50 rounded-md">
                             <span className="text-2xl font-bold text-orange-500">{absenceStats.unjustifiedLate}</span>
                             <span className="text-sm text-orange-600 text-center">Retards non justifiés</span>
                           </div>

Front-End/src/app/[locale]/parents/settings/page.js

@@ -39,9 +39,12 @@ export default function SettingsPage() {
   };
 
   return (
-    <div className="p-4">
-      <h2 className="text-xl mb-4">Paramètres du compte</h2>
-      <form onSubmit={handleSubmit}>
+    <div className="p-6">
+      <h1 className="font-headline text-2xl font-bold text-gray-900 mb-6">
+        Paramètres du compte
+      </h1>
+      <div className="bg-white rounded-md border border-gray-200 shadow-sm p-6 max-w-md">
+        <form onSubmit={handleSubmit} className="space-y-4">
           <InputText
             type="email"
             id="email"
@@ -66,10 +69,11 @@ export default function SettingsPage() {
             onChange={handleConfirmPasswordChange}
             required
           />
-        <div className="flex items-center justify-between">
+          <div className="flex items-center justify-between pt-2">
             <Button type="submit" primary text={'Mettre à jour'} />
           </div>
         </form>
       </div>
+    </div>
   );
 }

Front-End/src/app/[locale]/users/login/page.js

@@ -80,16 +80,20 @@ export default function Page() {
     return <Loader />; // Affichez le composant Loader
   } else {
     return (
-      <>
-        <div className="container max mx-auto p-4">
-          <div className="flex justify-center mb-4">
+      <div
+        className="min-h-screen flex items-center justify-center p-4"
+        style={{
+          background: 'linear-gradient(135deg, #80fdd6 100%, #2bb180 100%)',
+        }}
+      >
+        <div className="bg-white rounded-md border border-gray-200 shadow-sm p-8 w-full max-w-md">
+          <div className="flex justify-center mb-6">
             <Logo className="h-150 w-150" />
           </div>
-          <h1 className="text-2xl font-bold text-center mb-4">
+          <h1 className="font-headline text-2xl font-bold text-center text-gray-900 mb-6">
             Authentification
           </h1>
           <form
-            className="max-w-md mx-auto"
             onSubmit={(e) => {
               e.preventDefault();
               handleFormLogin(new FormData(e.target));
@@ -112,16 +116,14 @@ export default function Page() {
               placeholder="Mot de passe"
               className="w-full mb-5"
             />
-            <div className="input-group mb-4"></div>
-            <label>
+            <div className="flex justify-end mb-4">
               <a
-                className="float-right mb-4"
+                className="text-sm text-primary hover:text-secondary font-label transition-colors"
                 href={`${FE_USERS_NEW_PASSWORD_URL}`}
               >
                 Mot de passe oublié ?
               </a>
-            </label>
-            <div className="form-group-submit mt-4">
+            </div>
             <Button
               text="Se Connecter"
               className="w-full"
@@ -129,10 +131,9 @@ export default function Page() {
               type="submit"
               name="connect"
             />
-            </div>
           </form>
         </div>
-      </>
+      </div>
     );
   }
 }

Front-End/src/app/[locale]/users/password/new/page.js

@@ -48,16 +48,15 @@ export default function Page() {
     return <Loader />;
   } else {
     return (
-      <>
-        <div className="container max mx-auto p-4">
-          <div className="flex justify-center mb-4">
+      <div className="min-h-screen bg-neutral flex items-center justify-center p-4">
+        <div className="bg-white rounded-md border border-gray-200 shadow-sm p-8 w-full max-w-md">
+          <div className="flex justify-center mb-6">
             <Logo className="h-150 w-150" />
           </div>
-          <h1 className="text-2xl font-bold text-center mb-4">
+          <h1 className="font-headline text-2xl font-bold text-center text-gray-900 mb-6">
             Nouveau Mot de passe
           </h1>
           <form
-            className="max-w-md mx-auto"
             onSubmit={(e) => {
               e.preventDefault();
               validate(new FormData(e.target));
@@ -70,28 +69,23 @@ export default function Page() {
               IconItem={User}
               label="Identifiant"
               placeholder="Identifiant"
-              className="w-full"
+              className="w-full mb-6"
             />
-            <div className="form-group-submit mt-4">
             <Button
               text="Réinitialiser"
-                className="w-full"
+              className="w-full mb-3"
               primary
               type="submit"
               name="validate"
             />
-            </div>
-          </form>
-          <br />
-          <div className="flex justify-center mt-2 max-w-md mx-auto">
             <Button
               text="Annuler"
               className="w-full"
               href={`${FE_USERS_LOGIN_URL}`}
             />
+          </form>
         </div>
       </div>
-      </>
     );
   }
 }

Front-End/src/app/[locale]/users/password/reset/page.js

@@ -61,16 +61,15 @@ export default function Page() {
     return <Loader />;
   } else {
     return (
-      <>
-        <div className="container max mx-auto p-4">
-          <div className="flex justify-center mb-4">
+      <div className="min-h-screen bg-neutral flex items-center justify-center p-4">
+        <div className="bg-white rounded-md border border-gray-200 shadow-sm p-8 w-full max-w-md">
+          <div className="flex justify-center mb-6">
             <Logo className="h-150 w-150" />
           </div>
-          <h1 className="text-2xl font-bold text-center mb-4">
+          <h1 className="font-headline text-2xl font-bold text-center text-gray-900 mb-6">
             Réinitialisation du mot de passe
           </h1>
           <form
-            className="max-w-md mx-auto"
             onSubmit={(e) => {
               e.preventDefault();
               validate(new FormData(e.target));
@@ -91,28 +90,23 @@ export default function Page() {
               IconItem={KeySquare}
               label="Confirmation mot de passe"
               placeholder="Confirmation mot de passe"
-              className="w-full"
+              className="w-full mb-6"
             />
-            <div className="form-group-submit mt-4">
             <Button
               text="Enregistrer"
-                className="w-full"
+              className="w-full mb-3"
               primary
               type="submit"
               name="validate"
             />
-            </div>
-          </form>
-          <br />
-          <div className="flex justify-center mt-2 max-w-md mx-auto">
             <Button
               text="Annuler"
               className="w-full"
               href={`${FE_USERS_LOGIN_URL}`}
             />
+          </form>
         </div>
       </div>
-      </>
     );
   }
 }

Front-End/src/app/[locale]/users/subscribe/page.js

@@ -65,16 +65,15 @@ export default function Page() {
     return <Loader />;
   } else {
     return (
-      <>
-        <div className="container max mx-auto p-4">
-          <div className="flex justify-center mb-4">
+      <div className="min-h-screen bg-neutral flex items-center justify-center p-4">
+        <div className="bg-white rounded-md border border-gray-200 shadow-sm p-8 w-full max-w-md">
+          <div className="flex justify-center mb-6">
             <Logo className="h-150 w-150" />
           </div>
-          <h1 className="text-2xl font-bold text-center mb-4">
+          <h1 className="font-headline text-2xl font-bold text-center text-gray-900 mb-6">
             Nouveau profil
           </h1>
           <form
-            className="max-w-md mx-auto"
             onSubmit={(e) => {
               e.preventDefault();
               subscribeFormSubmit(new FormData(e.target));
@@ -103,30 +102,23 @@ export default function Page() {
               IconItem={KeySquare}
               label="Confirmation mot de passe"
               placeholder="Confirmation mot de passe"
-              className="w-full"
+              className="w-full mb-6"
             />
-            <div className="form-group-submit mt-4">
             <Button
               text="Enregistrer"
-                className="w-full"
+              className="w-full mb-3"
               primary
               type="submit"
               name="validate"
             />
-            </div>
-          </form>
-          <br />
-          <div className="flex justify-center mt-2 max-w-md mx-auto">
             <Button
               text="Annuler"
               className="w-full"
-              onClick={() => {
-                router.push(`${FE_USERS_LOGIN_URL}`);
-              }}
+              onClick={() => router.push(`${FE_USERS_LOGIN_URL}`)}
             />
+          </form>
         </div>
       </div>
-      </>
     );
   }
 }

Front-End/src/app/layout.js

@@ -1,19 +1,19 @@
 import React from 'react';
 import { getMessages } from 'next-intl/server';
-import { Inter, Manrope } from 'next/font/google';
+import localFont from 'next/font/local';
 import Providers from '@/components/Providers';
 import ServiceWorkerRegister from '@/components/ServiceWorkerRegister';
 import '@/css/tailwind.css';
 import { headers } from 'next/headers';
 
-const inter = Inter({
-  subsets: ['latin'],
+const inter = localFont({
+  src: '../fonts/Inter-Variable.woff2',
   variable: '--font-inter',
   display: 'swap',
 });
 
-const manrope = Manrope({
-  subsets: ['latin'],
+const manrope = localFont({
+  src: '../fonts/Manrope-Variable.woff2',
   variable: '--font-manrope',
   display: 'swap',
 });

Front-End/src/app/not-found.js

@@ -3,16 +3,19 @@ import Logo from '../components/Logo';
 
 export default function NotFound() {
   return (
-    <div className="flex items-center justify-center min-h-screen bg-emerald-500">
-      <div className="text-center p-6 ">
+    <div className="flex items-center justify-center min-h-screen bg-primary">
+      <div className="text-center p-6 bg-white rounded-md shadow-sm border border-gray-200">
         <Logo className="w-32 h-32 mx-auto mb-4" />
-        <h2 className="text-2xl font-bold text-emerald-900 mb-4">
+        <h2 className="font-headline text-2xl font-bold text-secondary mb-4">
           404 | Page non trouvée
         </h2>
-        <p className="text-emerald-900 mb-4">
+        <p className="font-body text-gray-600 mb-4">
           La ressource que vous souhaitez consulter n&apos;existe pas ou plus.
         </p>
-        <Link className="text-gray-900 hover:underline" href="/">
+        <Link
+          className="inline-flex items-center justify-center min-h-[44px] px-4 py-2 rounded font-label font-medium bg-primary hover:bg-secondary text-white transition-colors"
+          href="/"
+        >
           Retour Accueil
         </Link>
       </div>

Front-End/src/components/Admin/AnnouncementScheduler.js

@@ -14,7 +14,7 @@ export default function AnnouncementScheduler({ csrfToken }) {
 
   return (
     <div className="p-4 bg-white rounded shadow">
-      <h2 className="text-xl font-bold mb-4">Planifier une Annonce</h2>
+      <h2 className="font-headline text-xl font-bold mb-4">Planifier une Annonce</h2>
       <div className="mb-4">
         <label className="block font-medium">Titre</label>
         <input

Front-End/src/components/AffectationClasseForm.js

@@ -39,7 +39,7 @@ const AffectationClasseForm = ({ eleve = {}, onSubmit, classes }) => {
                 value={classe.id}
                 checked={formData.classeAssocie_id === classe.id}
                 onChange={handleChange}
-                className="form-radio h-3 w-3 text-emerald-600 focus:ring-emerald-500 hover:ring-emerald-400 checked:bg-emerald-600 checked:h-3 checked:w-3"
+                className="form-radio h-3 w-3 text-primary focus:ring-primary hover:ring-tertiary checked:bg-primary checked:h-3 checked:w-3"
               />
               <label
                 htmlFor={`classe-${classe.id}`}
@@ -57,7 +57,7 @@ const AffectationClasseForm = ({ eleve = {}, onSubmit, classes }) => {
           className={`px-4 py-2 rounded-md shadow-sm focus:outline-none ${
             !formData.classeAssocie_id
               ? 'bg-gray-300 text-gray-700 cursor-not-allowed'
-              : 'bg-emerald-500 text-white hover:bg-emerald-600'
+              : 'bg-primary text-white hover:bg-primary'
           }`}
           disabled={!formData.classeAssocie_id}
         >

Front-End/src/components/AlertMessage.js

@@ -7,7 +7,6 @@ const AlertMessage = ({
   actionLabel,
   onAction,
 }) => {
-  // Définir les styles en fonction du type d'alerte
   const typeStyles = {
     info: 'bg-blue-100 border-blue-500 text-blue-700',
     warning: 'bg-yellow-100 border-yellow-500 text-yellow-700',
@@ -18,13 +17,13 @@ const AlertMessage = ({
   const alertStyle = typeStyles[type] || typeStyles.info;
 
   return (
-    <div className={`alert centered border-l-4 p-4 ${alertStyle}`} role="alert">
-      <h3 className="font-bold">{title}</h3>
+    <div className={`alert centered border-l-4 p-4 rounded ${alertStyle}`} role="alert">
+      <h3 className="font-headline font-bold">{title}</h3>
       <p className="mt-2">{message}</p>
       {actionLabel && onAction && (
         <div className="alert-actions mt-4">
           <button
-            className="btn primary bg-emerald-500 text-white rounded-md px-4 py-2 hover:bg-emerald-600"
+            className="bg-primary text-white font-label font-medium rounded px-4 py-2 hover:bg-secondary transition-colors min-h-[44px]"
             onClick={onAction}
           >
             {actionLabel}

Front-End/src/components/AlertWithModal.js

@@ -14,11 +14,11 @@ const AlertWithModal = ({ title, message, buttonText }) => {
       className="alert centered bg-yellow-100 border-l-4 border-yellow-500 text-yellow-700 p-4"
       role="alert"
     >
-      <h3 className="font-bold">{title}</h3>
+      <h3 className="font-headline font-bold">{title}</h3>
       <p className="mt-2">{message}</p>
       <div className="alert-actions mt-4">
         <button
-          className="btn primary bg-emerald-500 text-white rounded-md px-4 py-2 hover:bg-emerald-600 flex items-center"
+          className="btn primary bg-primary text-white rounded-md px-4 py-2 hover:bg-primary flex items-center"
           onClick={openModal}
         >
           {buttonText} <UserPlus size={20} className="ml-2" />

Front-End/src/components/AlphabetLinks.js

@@ -4,7 +4,7 @@ const AlphabetPaginationNumber = ({ letter, active, onClick }) => (
   <button
     className={`w-8 h-8 flex items-center justify-center rounded ${
       active
-        ? 'bg-emerald-500 text-white'
+        ? 'bg-primary text-white'
         : 'text-gray-600 bg-gray-200 hover:bg-gray-50'
     }`}
     onClick={onClick}

Front-End/src/components/Calendar/Calendar.js

@@ -126,7 +126,7 @@ const Calendar = ({ modeSet, onDateClick, onEventClick, planningClassName = '',
                     onClick={() => setShowDatePicker(!showDatePicker)}
                     className="flex items-center gap-1 px-2 py-1 hover:bg-gray-100 rounded-md"
                   >
-                    <h2 className="text-xl font-semibold">
+                    <h2 className="font-headline text-xl font-semibold">
                       {format(currentDate, viewType === 'year' ? 'yyyy' : 'MMMM yyyy', { locale: fr })}
                     </h2>
                     <ChevronDown className="w-4 h-4" />
@@ -185,7 +185,7 @@ const Calendar = ({ modeSet, onDateClick, onEventClick, planningClassName = '',
               {(planningMode === PlanningModes.PLANNING || (planningMode === PlanningModes.CLASS_SCHEDULE && !parentView)) && (
                 <button
                   onClick={onDateClick}
-                  className="w-10 h-10 flex items-center justify-center bg-emerald-600 text-white rounded-full hover:bg-emerald-700 shadow-md transition-colors"
+                  className="w-10 h-10 flex items-center justify-center bg-primary text-white rounded-full hover:bg-secondary shadow-md transition-colors"
                 >
                   <Plus className="w-5 h-5" />
                 </button>

Front-End/src/components/Calendar/DayView.js

@@ -13,7 +13,7 @@ import { getWeekEvents } from '@/utils/events';
 import { CalendarDays, ChevronLeft, ChevronRight, Plus } from 'lucide-react';
 
 const DayView = ({ onDateClick, onEventClick, events, onOpenDrawer }) => {
-  const { currentDate, setCurrentDate, parentView } = usePlanning();
+  const { currentDate, setCurrentDate, parentView, schedules } = usePlanning();
   const [currentTime, setCurrentTime] = useState(new Date());
   const scrollRef = useRef(null);
 
@@ -43,11 +43,28 @@ const DayView = ({ onDateClick, onEventClick, events, onOpenDrawer }) => {
     return `${(hours + minutes / 60) * 5}rem`;
   };
 
+  const getScheduleColor = (event) => {
+    const schedule = schedules?.find(
+      (item) => Number(item.id) === Number(event.planning)
+    );
+    return schedule?.color || event.color || '#6B7280';
+  };
+
+  const getScheduleClassLevelLabel = (event) => {
+    const schedule = schedules?.find(
+      (item) => Number(item.id) === Number(event.planning)
+    );
+    const scheduleName = schedule?.name || '';
+    if (!scheduleName) return '';
+    return scheduleName;
+  };
+
   const calculateEventStyle = (event, allDayEvents) => {
     const start = new Date(event.start);
     const end = new Date(event.end);
     const startMinutes = (start.getMinutes() / 60) * 5;
     const duration = ((end - start) / (1000 * 60 * 60)) * 5;
+    const scheduleColor = getScheduleColor(event);
 
     const overlapping = allDayEvents.filter((other) => {
       if (other.id === event.id) return false;
@@ -114,7 +131,7 @@ const DayView = ({ onDateClick, onEventClick, events, onOpenDrawer }) => {
 
         <button
           onClick={() => onDateClick?.(currentDate)}
-          className="w-9 h-9 flex items-center justify-center bg-emerald-600 text-white rounded-full hover:bg-emerald-700 shadow-md transition-colors"
+          className="w-9 h-9 flex items-center justify-center bg-primary text-white rounded-full hover:bg-secondary shadow-md transition-colors"
         >
           <Plus className="w-4 h-4" />
         </button>
@@ -128,9 +145,9 @@ const DayView = ({ onDateClick, onEventClick, events, onOpenDrawer }) => {
             onClick={() => setCurrentDate(day)}
             className={`flex flex-col items-center min-w-[2.75rem] px-1 py-1.5 rounded-xl transition-colors ${
               isSameDay(day, currentDate)
-                ? 'bg-emerald-600 text-white'
+                ? 'bg-primary text-white'
                 : isToday(day)
-                  ? 'border border-emerald-400 text-emerald-600'
+                  ? 'border border-tertiary text-primary'
                   : 'text-gray-600 hover:bg-gray-100'
             }`}
           >
@@ -146,10 +163,10 @@ const DayView = ({ onDateClick, onEventClick, events, onOpenDrawer }) => {
       <div ref={scrollRef} className="flex-1 overflow-y-auto relative">
         {isCurrentDay && (
           <div
-            className="absolute left-0 right-0 z-10 border-emerald-500 border pointer-events-none"
+            className="absolute left-0 right-0 z-10 border-primary border pointer-events-none"
             style={{ top: getCurrentTimePosition() }}
           >
-            <div className="absolute -left-2 -top-2 w-2 h-2 rounded-full bg-emerald-500" />
+            <div className="absolute -left-2 -top-2 w-2 h-2 rounded-full bg-primary" />
           </div>
         )}
 
@@ -163,8 +180,8 @@ const DayView = ({ onDateClick, onEventClick, events, onOpenDrawer }) => {
                 {`${hour.toString().padStart(2, '0')}:00`}
               </div>
               <div
-                className={`h-20 relative border-b border-gray-100 ${
-                  isCurrentDay ? 'bg-emerald-50/30' : 'bg-white'
+                className={`h-20 relative ${
+                  isCurrentDay ? 'bg-primary/5/30' : 'bg-white'
                 }`}
                 onClick={
                   parentView
@@ -179,7 +196,10 @@ const DayView = ({ onDateClick, onEventClick, events, onOpenDrawer }) => {
               >
                 {dayEvents
                   .filter((e) => new Date(e.start).getHours() === hour)
-                  .map((event) => (
+                  .map((event) => {
+                    const scheduleColor = getScheduleColor(event);
+                    const classLevelLabel = getScheduleClassLevelLabel(event);
+                    return (
                       <div
                       key={event.id}
                       className="rounded-sm overflow-hidden cursor-pointer hover:shadow-lg"
@@ -193,12 +213,32 @@ const DayView = ({ onDateClick, onEventClick, events, onOpenDrawer }) => {
                             }
                       }
                       >
+                        {classLevelLabel && (
+                          <div
+                            className="px-1 py-0.5 border-t-2"
+                            style={{
+                              borderTopColor: scheduleColor,
+                              backgroundColor: `${scheduleColor}22`,
+                            }}
+                          >
+                            <span
+                              className="text-[10px] font-semibold uppercase tracking-wide truncate block text-center"
+                              style={{ color: scheduleColor }}
+                            >
+                              {classLevelLabel}
+                            </span>
+                          </div>
+                        )}
                         <div className="p-1">
                           <div
-                          className="font-semibold text-xs truncate"
+                            className="font-semibold text-xs truncate flex items-center gap-1"
                             style={{ color: event.color }}
                           >
-                          {event.title}
+                            <span
+                              className="w-2 h-2 rounded-full shrink-0"
+                              style={{ backgroundColor: event.color }}
+                            />
+                            <span className="truncate flex-1">{event.title}</span>
                           </div>
                           <div
                             className="text-xs"
@@ -217,7 +257,8 @@ const DayView = ({ onDateClick, onEventClick, events, onOpenDrawer }) => {
                           )}
                         </div>
                       </div>
-                  ))}
+                    );
+                  })}
               </div>
             </React.Fragment>
           ))}

Front-End/src/components/Calendar/EventModal.js

@@ -10,20 +10,31 @@ export default function EventModal({
   eventData,
   setEventData,
 }) {
-  const { addEvent, handleUpdateEvent, handleDeleteEvent, schedules } =
+  const {
+    addEvent,
+    handleUpdateEvent,
+    handleDeleteEvent,
+    schedules,
+    selectedSchedule,
+  } =
     usePlanning();
   const { showNotification } = useNotification();
 
   // S'assurer que planning est défini lors du premier rendu
   React.useEffect(() => {
     if (!eventData?.planning && schedules.length > 0) {
+      const defaultSchedule =
+        schedules.find(
+          (schedule) => Number(schedule.id) === Number(selectedSchedule)
+        ) || schedules[0];
+
       setEventData((prev) => ({
         ...prev,
-        planning: schedules[0].id,
-        color: schedules[0].color,
+        planning: defaultSchedule.id,
+        color: defaultSchedule.color,
       }));
     }
-  }, [schedules, eventData?.planning]);
+  }, [schedules, selectedSchedule, eventData?.planning]);
 
   if (!isOpen) return null;
 
@@ -105,7 +116,7 @@ export default function EventModal({
             onChange={(e) =>
               setEventData({ ...eventData, title: e.target.value })
             }
-            className="w-full p-2 border rounded focus:outline-none focus:ring-2 focus:ring-emerald-500"
+            className="w-full p-2 border rounded focus:outline-none focus:ring-2 focus:ring-primary"
             required
           />
         </div>
@@ -120,7 +131,7 @@ export default function EventModal({
             onChange={(e) =>
               setEventData({ ...eventData, description: e.target.value })
             }
-            className="w-full p-2 border rounded focus:outline-none focus:ring-2 focus:ring-emerald-500"
+            className="w-full p-2 border rounded focus:outline-none focus:ring-2 focus:ring-primary"
             rows="3"
           />
         </div>
@@ -142,7 +153,7 @@ export default function EventModal({
                 color: selectedSchedule?.color || '#10b981',
               });
             }}
-            className="w-full p-2 border rounded focus:outline-none focus:ring-2 focus:ring-emerald-500"
+            className="w-full p-2 border rounded focus:outline-none focus:ring-2 focus:ring-primary"
             required
           >
             {schedules.map((schedule) => (
@@ -185,7 +196,7 @@ export default function EventModal({
                 recursionType: e.target.value,
               });
             }}
-            className="w-full p-2 border rounded focus:outline-none focus:ring-2 focus:ring-emerald-500"
+            className="w-full p-2 border rounded focus:outline-none focus:ring-2 focus:ring-primary"
           >
             {recurrenceOptions.map((option) => (
               <option key={option.value} value={option.value}>
@@ -215,7 +226,7 @@ export default function EventModal({
                   }}
                   className={`px-3 py-1 rounded-full text-sm ${
                     (eventData.selectedDays || []).includes(day.value)
-                      ? 'bg-emerald-100 text-emerald-800'
+                      ? 'bg-primary/10 text-secondary'
                       : 'bg-gray-100 text-gray-600'
                   }`}
                 >
@@ -247,7 +258,7 @@ export default function EventModal({
                     : null,
                 })
               }
-              className="w-full p-2 border rounded focus:outline-none focus:ring-2 focus:ring-emerald-500"
+              className="w-full p-2 border rounded focus:outline-none focus:ring-2 focus:ring-primary"
             />
           </div>
         )}
@@ -267,7 +278,7 @@ export default function EventModal({
                   start: new Date(e.target.value).toISOString(),
                 })
               }
-              className="w-full p-2 border rounded focus:outline-none focus:ring-2 focus:ring-emerald-500"
+              className="w-full p-2 border rounded focus:outline-none focus:ring-2 focus:ring-primary"
               required
             />
           </div>
@@ -284,7 +295,7 @@ export default function EventModal({
                   end: new Date(e.target.value).toISOString(),
                 })
               }
-              className="w-full p-2 border rounded focus:outline-none focus:ring-2 focus:ring-emerald-500"
+              className="w-full p-2 border rounded focus:outline-none focus:ring-2 focus:ring-primary"
               required
             />
           </div>
@@ -301,7 +312,7 @@ export default function EventModal({
             onChange={(e) =>
               setEventData({ ...eventData, location: e.target.value })
             }
-            className="w-full p-2 border rounded focus:outline-none focus:ring-2 focus:ring-emerald-500"
+            className="w-full p-2 border rounded focus:outline-none focus:ring-2 focus:ring-primary"
           />
         </div>
 
@@ -328,7 +339,7 @@ export default function EventModal({
             </button>
             <button
               type="submit"
-              className="px-4 py-2 bg-emerald-600 text-white rounded hover:bg-emerald-700"
+              className="px-4 py-2 bg-primary text-white rounded hover:bg-secondary"
             >
               {eventData.id ? 'Modifier' : 'Créer'}
             </button>

Front-End/src/components/Calendar/MonthView.js

@@ -14,7 +14,24 @@ import { fr } from 'date-fns/locale';
 import { getEventsForDate } from '@/utils/events';
 
 const MonthView = ({ onDateClick, onEventClick }) => {
-  const { currentDate, setViewType, setCurrentDate, events } = usePlanning();
+  const { currentDate, setViewType, setCurrentDate, events, schedules } =
+    usePlanning();
+
+  const getScheduleColor = (event) => {
+    const schedule = schedules?.find(
+      (item) => Number(item.id) === Number(event.planning)
+    );
+    return schedule?.color || event.color || '#6B7280';
+  };
+
+  const getScheduleClassLevelLabel = (event) => {
+    const schedule = schedules?.find(
+      (item) => Number(item.id) === Number(event.planning)
+    );
+    const scheduleName = schedule?.name || '';
+    if (!scheduleName) return '';
+    return scheduleName;
+  };
 
   // Obtenir tous les jours du mois actuel
   const monthStart = startOfMonth(currentDate);
@@ -39,21 +56,24 @@ const MonthView = ({ onDateClick, onEventClick }) => {
         key={day.toString()}
         className={`p-2 overflow-y-auto relative flex flex-col
           ${!isCurrentMonth ? 'bg-gray-100 text-gray-400' : ''}
-          ${isCurrentDay ? 'bg-emerald-50' : ''}
+          ${isCurrentDay ? 'bg-primary/5' : ''}
           hover:bg-gray-100 cursor-pointer border-b border-r`}
         onClick={() => handleDayClick(day)}
       >
         <div className="flex justify-between items-center mb-1">
           <span
             className={`text-sm font-medium rounded-full w-7 h-7 flex items-center justify-center
-            ${isCurrentDay ? 'bg-emerald-500 text-white' : ''}
+            ${isCurrentDay ? 'bg-primary text-white' : ''}
             ${!isCurrentMonth ? 'text-gray-400' : ''}`}
           >
             {format(day, 'd')}
           </span>
         </div>
         <div className="space-y-1 flex-1">
-          {dayEvents.map((event, index) => (
+          {dayEvents.map((event) => {
+            const scheduleColor = getScheduleColor(event);
+            const classLevelLabel = getScheduleClassLevelLabel(event);
+            return (
               <div
               key={event.id}
               className="text-xs p-1 rounded truncate cursor-pointer"
@@ -67,9 +87,32 @@ const MonthView = ({ onDateClick, onEventClick }) => {
                 onEventClick(event);
               }}
             >
-              {event.title}
+                {classLevelLabel && (
+                  <div
+                    className="-mx-1 -mt-1 mb-1 px-1 py-0.5 border-t-2"
+                    style={{
+                      borderTopColor: scheduleColor,
+                      backgroundColor: `${scheduleColor}22`,
+                    }}
+                  >
+                    <span
+                      className="text-[10px] font-semibold uppercase tracking-wide truncate block text-center"
+                      style={{ color: scheduleColor }}
+                    >
+                      {classLevelLabel}
+                    </span>
                   </div>
-          ))}
+                )}
+              <span className="inline-flex items-center gap-1 max-w-full">
+                <span
+                  className="w-2 h-2 rounded-full shrink-0"
+                  style={{ backgroundColor: event.color }}
+                />
+                <span className="truncate flex-1">{event.title}</span>
+              </span>
+            </div>
+            );
+          })}
         </div>
       </div>
     );

Front-End/src/components/Calendar/ScheduleNavigation.js

@@ -247,7 +247,7 @@ export default function ScheduleNavigation({ classes, modeSet = 'event', isOpen
       {/* Desktop : sidebar fixe */}
       <nav className="hidden md:flex flex-col w-64 border-r p-4 h-full overflow-y-auto shrink-0">
         <div className="flex items-center justify-between mb-4">
-          <h2 className="font-semibold">{title}</h2>
+          <h2 className="font-headline font-semibold">{title}</h2>
           <button onClick={() => setIsAddingNew(true)} className="p-1 hover:bg-gray-100 rounded">
             <Plus className="w-4 h-4" />
           </button>
@@ -268,7 +268,7 @@ export default function ScheduleNavigation({ classes, modeSet = 'event', isOpen
           }`}
         >
           <div className="flex items-center justify-between p-4 border-b shrink-0">
-            <h2 className="font-semibold">{title}</h2>
+            <h2 className="font-headline font-semibold">{title}</h2>
             <div className="flex items-center gap-1">
               <button onClick={() => setIsAddingNew(true)} className="p-1 hover:bg-gray-100 rounded">
                 <Plus className="w-4 h-4" />

Front-End/src/components/Calendar/WeekView.js

@@ -7,7 +7,7 @@ import { isToday } from 'date-fns';
 
 
 const WeekView = ({ onDateClick, onEventClick, events }) => {
-  const { currentDate, planningMode, parentView } = usePlanning();
+  const { currentDate, planningMode, parentView, schedules } = usePlanning();
   const [currentTime, setCurrentTime] = useState(new Date());
   const scrollContainerRef = useRef(null); // Ajouter cette référence
 
@@ -54,6 +54,8 @@ const WeekView = ({ onDateClick, onEventClick, events }) => {
     return acc;
   }, {});
 
+  const todayIndex = weekDays.findIndex((day) => isToday(day));
+
   const isWeekend = (date) => {
     const day = date.getDay();
     return day === 0 || day === 6;
@@ -71,11 +73,28 @@ const WeekView = ({ onDateClick, onEventClick, events }) => {
     });
   };
 
+  const getScheduleColor = (event) => {
+    const schedule = schedules?.find(
+      (item) => Number(item.id) === Number(event.planning)
+    );
+    return schedule?.color || event.color || '#6B7280';
+  };
+
+  const getScheduleClassLevelLabel = (event) => {
+    const schedule = schedules?.find(
+      (item) => Number(item.id) === Number(event.planning)
+    );
+    const scheduleName = schedule?.name || '';
+    if (!scheduleName) return '';
+    return scheduleName;
+  };
+
   const calculateEventStyle = (event, dayEvents) => {
     const start = new Date(event.start);
     const end = new Date(event.end);
     const startMinutes = (start.getMinutes() / 60) * 5;
     const duration = ((end - start) / (1000 * 60 * 60)) * 5;
+    const scheduleColor = getScheduleColor(event);
 
     // Trouver les événements qui se chevauchent
     const overlappingEvents = findOverlappingEvents(event, dayEvents);
@@ -101,6 +120,8 @@ const WeekView = ({ onDateClick, onEventClick, events }) => {
 
   const renderEventInCell = (event, dayEvents) => {
     const eventStyle = calculateEventStyle(event, dayEvents);
+    const scheduleColor = getScheduleColor(event);
+    const classLevelLabel = getScheduleClassLevelLabel(event);
 
     return (
       <div
@@ -116,12 +137,32 @@ const WeekView = ({ onDateClick, onEventClick, events }) => {
               }
         }
       >
+        {classLevelLabel && (
+          <div
+            className="px-1 py-0.5 border-t-2"
+            style={{
+              borderTopColor: scheduleColor,
+              backgroundColor: `${scheduleColor}22`,
+            }}
+          >
+            <span
+              className="text-[10px] font-semibold uppercase tracking-wide truncate block text-center"
+              style={{ color: scheduleColor }}
+            >
+              {classLevelLabel}
+            </span>
+          </div>
+        )}
         <div className="p-1">
           <div
-            className="font-semibold text-xs truncate"
+            className="font-semibold text-xs truncate flex items-center gap-1"
             style={{ color: event.color }}
           >
-            {event.title}
+            <span
+              className="w-2 h-2 rounded-full shrink-0"
+              style={{ backgroundColor: event.color }}
+            />
+            <span className="truncate flex-1">{event.title}</span>
           </div>
           <div
             className="text-xs"
@@ -156,14 +197,14 @@ const WeekView = ({ onDateClick, onEventClick, events }) => {
             key={day}
             className={`h-14 p-2 text-center border-b
               ${isWeekend(day) ? 'bg-gray-50' : 'bg-white'}
-              ${isToday(day) ? 'bg-emerald-100 border-x border-emerald-600' : ''}`}
+              ${isToday(day) ? 'bg-primary/10 border-x border-primary' : ''}`}
           >
             <div className="text-xs font-medium text-gray-500">
               {format(day, 'EEEE', { locale: fr })}
             </div>
             <div
               className={`text-sm font-semibold inline-block rounded-full w-7 h-7 leading-7
-              ${isToday(day) ? 'bg-emerald-500 text-white' : ''}`}
+              ${isToday(day) ? 'bg-primary text-white' : ''}`}
             >
               {format(day, 'd', { locale: fr })}
             </div>
@@ -173,15 +214,25 @@ const WeekView = ({ onDateClick, onEventClick, events }) => {
 
       {/* Grille horaire */}
       <div ref={scrollContainerRef} className="flex-1  relative">
+        {isCurrentWeek && todayIndex >= 0 && (
+          <div
+            className="absolute top-0 bottom-0 z-[5] border-x border-primary pointer-events-none"
+            style={{
+              left: `calc(2.5rem + ((100% - 2.5rem) / 7) * ${todayIndex})`,
+              width: 'calc((100% - 2.5rem) / 7)',
+            }}
+          />
+        )}
+
         {/* Ligne de temps actuelle */}
         {isCurrentWeek && (
           <div
-            className="absolute left-0 right-0 z-10 border-emerald-500 border pointer-events-none"
+            className="absolute left-0 right-0 z-10 border-primary border pointer-events-none"
             style={{
               top: getCurrentTimePosition(),
             }}
           >
-            <div className="absolute -left-2 -top-2 w-2 h-2 rounded-full bg-emerald-500" />
+            <div className="absolute -left-2 -top-2 w-2 h-2 rounded-full bg-primary" />
           </div>
         )}
 
@@ -202,7 +253,7 @@ const WeekView = ({ onDateClick, onEventClick, events }) => {
                     key={`${hour}-${day}`}
                     className={`h-20 relative border-b border-gray-100
                       ${isWeekend(day) ? 'bg-gray-50' : 'bg-white'}
-                      ${isToday(day) ? 'bg-emerald-100/50 border-x border-emerald-600' : ''}`}
+                      ${isToday(day) ? 'bg-primary/10/50' : ''}`}
                     onClick={
                       parentView
                         ? undefined

Front-End/src/components/Calendar/YearView.js

@@ -8,14 +8,14 @@ import { isSameMonth } from 'date-fns';
 const MonthCard = ({ month, eventCount, onClick }) => (
   <div
     className={`bg-white p-4 rounded shadow hover:shadow-lg cursor-pointer
-      ${isSameMonth(month, new Date()) ? 'ring-2 ring-emerald-500' : ''}`}
+      ${isSameMonth(month, new Date()) ? 'ring-2 ring-primary' : ''}`}
     onClick={onClick}
   >
-    <h3 className="font-medium text-center mb-2">
+    <h3 className="font-headline font-medium text-center mb-2">
       {format(month, 'MMMM', { locale: fr })}
     </h3>
     <div className="text-center text-sm">
-      <span className="inline-flex items-center justify-center bg-emerald-100 text-emerald-800 px-2 py-1 rounded-full">
+      <span className="inline-flex items-center justify-center bg-primary/10 text-secondary px-2 py-1 rounded-full">
         {eventCount} événements
       </span>
     </div>

Front-End/src/components/Charts/LineChart.js

@@ -31,7 +31,7 @@ export default function LineChart({ data }) {
               style={{ height: chartHeight }}
             >
               <div
-                className={`${isMax ? 'bg-emerald-400' : 'bg-blue-400'} rounded-t w-4`}
+                className={`${isMax ? 'bg-tertiary' : 'bg-blue-400'} rounded-t w-4`}
                 style={{ height: `${barHeight}px`, transition: 'height 0.3s' }}
                 title={`${point.month}: ${point.value}`}
               />

Front-End/src/components/Chat/ConversationItem.js

@@ -51,7 +51,7 @@ const ConversationItem = ({
   const getLastMessageText = () => {
     if (isTyping) {
       return (
-        <span className="text-emerald-500 italic">Tape un message...</span>
+        <span className="text-primary italic">Tape un message...</span>
       );
     }
 
@@ -96,7 +96,7 @@ const ConversationItem = ({
   const getPresenceColor = (status) => {
     switch (status) {
       case 'online':
-        return 'bg-emerald-400';
+        return 'bg-tertiary';
       case 'away':
         return 'bg-yellow-400';
       case 'busy':
@@ -127,7 +127,7 @@ const ConversationItem = ({
     <div
       className={`group flex items-center p-3 cursor-pointer rounded-lg transition-all duration-200 hover:bg-gray-50 ${
         isSelected
-          ? 'bg-emerald-50 border-l-4 border-emerald-500'
+          ? 'bg-primary/5 border-l-4 border-primary'
           : 'hover:bg-gray-50'
       }`}
       onClick={onClick}
@@ -154,8 +154,8 @@ const ConversationItem = ({
       <div className="flex-1 ml-3 overflow-hidden">
         <div className="flex items-center justify-between">
           <h3
-            className={`font-semibold truncate ${
-              isSelected ? 'text-emerald-700' : 'text-gray-900'
+            className={`font-headline font-semibold truncate ${
+              isSelected ? 'text-secondary' : 'text-gray-900'
             }`}
           >
             {getInterlocutorName()}

Front-End/src/components/Chat/InstantChat.js

@@ -116,7 +116,7 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
   const handleWebSocketMessage = useCallback(
     (data) => {
       // Debug : vérifier userProfileId à chaque message
-      logger.debug('🔍 handleWebSocketMessage appelé:', {
+      logger.debug(' handleWebSocketMessage appelé:', {
         messageType: data.type,
         currentUserProfileId: userProfileId,
         userProfileIdType: typeof userProfileId,
@@ -153,7 +153,7 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
         case 'new_message':
           const newMessage = data.message;
 
-          logger.debug('🆕 NOUVEAU MESSAGE WebSocket reçu:', {
+          logger.debug(' NOUVEAU MESSAGE WebSocket reçu:', {
             senderId: newMessage.sender?.id,
             content: newMessage.content?.substring(0, 50),
             conversationId:
@@ -171,14 +171,14 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
 
           // Vérifier si ce message a déjà été traité
           if (processedMessages.has(messageId)) {
-            logger.debug('🔍 Message déjà traité, ignoré:', {
+            logger.debug(' Message déjà traité, ignoré:', {
               messageId,
               processedCount: processedMessages.size,
             });
             break;
           }
 
-          logger.debug('🆔 ID unique généré pour le message:', messageId);
+          logger.debug(' ID unique généré pour le message:', messageId);
 
           // Marquer le message comme traité
           setProcessedMessages((prev) => {
@@ -193,7 +193,7 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
           });
 
           // Debug: vérifier le type de message reçu
-          logger.debug('🔍 Message reçu:', {
+          logger.debug(' Message reçu:', {
             content: newMessage.content?.substring(0, 50),
             message_type: newMessage.message_type,
             sender_id: newMessage.sender_id,
@@ -235,7 +235,7 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
                   String(newMessage.sender.id) === String(userProfileId);
 
                 // Debug détaillé pour comprendre le problème d'incrémentation
-                logger.debug('🔍 Analyse du message pour compteur:', {
+                logger.debug(' Analyse du message pour compteur:', {
                   messageId: messageId,
                   senderId: newMessage.sender.id,
                   userProfileId: userProfileId,
@@ -253,12 +253,12 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
 
                 if (shouldIncrementUnread) {
                   logger.debug(
-                    '🔺 INCRÉMENTATION du compteur non lu pour conversation:',
+                    ' INCRÉMENTATION du compteur non lu pour conversation:',
                     convId
                   );
                 } else {
                   logger.debug(
-                    "➡️ Pas d'incrémentation (message de l'utilisateur connecté)"
+                    " Pas d'incrémentation (message de l'utilisateur connecté)"
                   );
                 }
 
@@ -278,7 +278,7 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
 
         case 'typing_status':
           const { user_id, is_typing, conversation_id, user_name } = data;
-          logger.debug('📝 Typing status reçu:', {
+          logger.debug(' Typing status reçu:', {
             user_id,
             is_typing,
             conversation_id,
@@ -294,13 +294,13 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
             String(currentConversationId) === String(conversation_id)
           ) {
             logger.debug(
-              '📝 Mise à jour typing pour conversation sélectionnée'
+              ' Mise à jour typing pour conversation sélectionnée'
             );
             setTypingUsers((prev) => {
               // Utiliser le nom de l'utilisateur s'il est disponible, sinon l'ID
               const displayName = user_name || `Utilisateur ${user_id}`;
               logger.debug(
-                '📝 Display name:',
+                ' Display name:',
                 displayName,
                 'is_typing:',
                 is_typing
@@ -311,21 +311,21 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
                   ? prev
                   : [...prev, displayName];
                 logger.debug(
-                  '📝 Nouveaux utilisateurs en train de taper:',
+                  ' Nouveaux utilisateurs en train de taper:',
                   newUsers
                 );
                 return newUsers;
               } else {
                 const newUsers = prev.filter((name) => name !== displayName);
                 logger.debug(
-                  '📝 Utilisateurs en train de taper après suppression:',
+                  ' Utilisateurs en train de taper après suppression:',
                   newUsers
                 );
                 return newUsers;
               }
             });
           } else {
-            logger.debug('📝 Typing status pour une autre conversation:', {
+            logger.debug(' Typing status pour une autre conversation:', {
               selectedConversationId: currentConversationId,
               messageConversationId: conversation_id,
             });
@@ -378,7 +378,7 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
 
       setConversations(data || []);
     } catch (error) {
-      logger.error('❌ Erreur lors du chargement des conversations:', error);
+      logger.error(' Erreur lors du chargement des conversations:', error);
       setConversations([]);
     } finally {
       setLoading(false);
@@ -539,30 +539,30 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
   // Sélectionner une conversation
   const selectConversation = useCallback(
     (conversation) => {
-      logger.debug('🔄 Sélection de la conversation:', conversation);
+      logger.debug(' Sélection de la conversation:', conversation);
       setSelectedConversation(conversation);
       setTypingUsers([]);
       setIsMobileSidebarOpen(false);
 
       // Utiliser id ou conversation_id selon ce qui est disponible
       const conversationId = conversation.id || conversation.conversation_id;
-      logger.debug('🔄 ID de conversation extrait:', conversationId);
+      logger.debug(' ID de conversation extrait:', conversationId);
 
       if (conversationId) {
         logger.debug(
-          '🔄 Chargement des messages pour conversation:',
+          ' Chargement des messages pour conversation:',
           conversationId
         );
         loadMessages(conversationId);
 
         logger.debug(
-          '🔄 Tentative de rejoindre la conversation:',
+          ' Tentative de rejoindre la conversation:',
           conversationId
         );
         const joinResult = joinConversation(conversationId);
-        logger.debug('🔄 Résultat joinConversation:', joinResult);
+        logger.debug(' Résultat joinConversation:', joinResult);
       } else {
-        logger.error("❌ Impossible de trouver l'ID de conversation");
+        logger.error(" Impossible de trouver l'ID de conversation");
       }
     },
     [loadMessages, joinConversation]
@@ -571,20 +571,20 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
   // Envoyer un message
   const handleSendMessage = useCallback(
     (content, attachment = null) => {
-      logger.debug('📤 handleSendMessage appelé:', {
+      logger.debug(' handleSendMessage appelé:', {
         content,
         attachment,
         selectedConversation,
       });
 
       if (!selectedConversation) {
-        logger.warn('❌ Aucune conversation sélectionnée');
+        logger.warn(' Aucune conversation sélectionnée');
         return;
       }
 
       // Vérifier qu'on a soit du contenu, soit un fichier
       if (!content.trim() && !attachment) {
-        logger.warn('❌ Aucun contenu ni fichier à envoyer');
+        logger.warn(' Aucun contenu ni fichier à envoyer');
         return;
       }
 
@@ -592,7 +592,7 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
       const conversationId =
         selectedConversation.id || selectedConversation.conversation_id;
       if (!conversationId) {
-        logger.error("❌ Impossible de trouver l'ID de la conversation");
+        logger.error(" Impossible de trouver l'ID de la conversation");
         return;
       }
 
@@ -608,23 +608,23 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
         messageData.attachment = attachment;
       }
 
-      logger.debug('📤 Envoi du message via WebSocket:', messageData);
-      logger.debug('📤 Type de message:', messageData.type);
-      logger.debug('📤 État de la connexion:', {
+      logger.debug(' Envoi du message via WebSocket:', messageData);
+      logger.debug(' Type de message:', messageData.type);
+      logger.debug(' État de la connexion:', {
         isConnected,
         connectionStatus,
       });
 
       const success = sendChatMessage(messageData);
 
-      logger.debug('📤 Résultat envoi message:', success);
+      logger.debug(' Résultat envoi message:', success);
 
       if (!success) {
         logger.error(
-          "❌ Impossible d'envoyer le message - WebSocket non connecté"
+          " Impossible d'envoyer le message - WebSocket non connecté"
         );
       } else {
-        logger.debug('✅ Message envoyé avec succès');
+        logger.debug(' Message envoyé avec succès');
       }
     },
     [
@@ -834,7 +834,7 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
         {/* En-tête */}
         <div className="p-4 border-b border-gray-200">
           <div className="flex items-center justify-between mb-3">
-            <h2 className="text-lg font-semibold text-gray-900">Messages</h2>
+            <h2 className="font-headline text-lg font-semibold text-gray-900">Messages</h2>
             <button
               onClick={handleStartNewConversation}
               className="p-2 hover:bg-gray-200 rounded-lg transition-colors"
@@ -857,7 +857,7 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
               value={searchQuery}
               onChange={(e) => handleSearch(e.target.value)}
               className={`w-full pl-10 pr-4 py-2 bg-white border border-gray-200 rounded-lg focus:outline-none focus:ring-2 ${
-                showSearch ? 'focus:ring-emerald-500' : 'focus:ring-emerald-500'
+                showSearch ? 'focus:ring-primary' : 'focus:ring-primary'
               }`}
             />
             {showSearch && searchQuery && (
@@ -896,7 +896,7 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
             </div>
           ) : showSearch && searchResults.length > 0 ? (
             <div className="p-2">
-              <h3 className="text-sm font-medium text-gray-700 mb-2 px-2">
+              <h3 className="font-headline text-sm font-medium text-gray-700 mb-2 px-2">
                 Résultats de recherche
               </h3>
               {searchResults.map((user) => (
@@ -915,7 +915,7 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
                     <div
                       className={`absolute -bottom-0.5 -right-0.5 w-3 h-3 ${
                         userPresences[user.id]?.status === 'online'
-                          ? 'bg-emerald-400'
+                          ? 'bg-tertiary'
                           : 'bg-gray-400'
                       } border-2 border-white rounded-full`}
                       title={
@@ -937,7 +937,7 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
                     <div
                       className={`text-xs ${
                         userPresences[user.id]?.status === 'online'
-                          ? 'text-emerald-500'
+                          ? 'text-primary'
                           : 'text-gray-500'
                       }`}
                     >
@@ -1019,7 +1019,7 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
                         selectedConversation.interlocuteur?.id &&
                         userPresences[selectedConversation.interlocuteur.id]
                           ?.status === 'online'
-                          ? 'bg-emerald-400'
+                          ? 'bg-tertiary'
                           : 'bg-gray-400'
                       } border-2 border-white rounded-full`}
                       title={
@@ -1032,7 +1032,7 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
                     ></div>
                   </div>
                   <div className="flex-1 ml-3 overflow-hidden">
-                    <h3 className="font-semibold text-gray-900">
+                    <h3 className="font-headline font-semibold text-gray-900">
                       {selectedConversation.interlocuteur
                         ? selectedConversation.interlocuteur.first_name &&
                           selectedConversation.interlocuteur.last_name
@@ -1046,7 +1046,7 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
                         selectedConversation.interlocuteur?.id &&
                         userPresences[selectedConversation.interlocuteur.id]
                           ?.status === 'online'
-                          ? 'text-emerald-500'
+                          ? 'text-primary'
                           : 'text-gray-500'
                       }`}
                     >
@@ -1140,10 +1140,10 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
         ) : (
           <div className="flex-1 flex items-center justify-center bg-gray-50">
             <div className="text-center">
-              <div className="w-16 h-16 bg-emerald-200 rounded-full flex items-center justify-center mx-auto mb-4">
-                <MessageSquare className="w-8 h-8 text-emerald-600" />
+              <div className="w-16 h-16 bg-primary/20 rounded-full flex items-center justify-center mx-auto mb-4">
+                <MessageSquare className="w-8 h-8 text-primary" />
               </div>
-              <h3 className="text-lg font-medium text-gray-900 mb-2">
+              <h3 className="font-headline text-lg font-medium text-gray-900 mb-2">
                 Sélectionnez une conversation
               </h3>
               <p className="text-gray-500">

Front-End/src/components/Chat/MessageInput.js

@@ -60,19 +60,19 @@ const MessageInput = ({
 
   const handleSend = () => {
     const trimmedMessage = message.trim();
-    logger.debug('📝 MessageInput: handleSend appelé:', {
+    logger.debug(' MessageInput: handleSend appelé:', {
       message,
       trimmedMessage,
       disabled,
     });
 
     if (!trimmedMessage || disabled) {
-      logger.debug('❌ MessageInput: Message vide ou désactivé');
+      logger.debug(' MessageInput: Message vide ou désactivé');
       return;
     }
 
     logger.debug(
-      '📤 MessageInput: Appel de onSendMessage avec:',
+      ' MessageInput: Appel de onSendMessage avec:',
       trimmedMessage
     );
     onSendMessage(trimmedMessage);

Front-End/src/components/ClasseDetails.js

@@ -10,7 +10,7 @@ const ClasseDetails = ({ classe }) => {
   const pourcentage = Math.round((nombreElevesInscrits / capaciteTotale) * 100);
 
   const getColor = (pourcentage) => {
-    if (pourcentage < 50) return 'bg-emerald-500';
+    if (pourcentage < 50) return 'bg-primary';
     if (pourcentage < 75) return 'bg-orange-500';
     return 'bg-red-500';
   };
@@ -52,7 +52,7 @@ const ClasseDetails = ({ classe }) => {
         </div>
       </div>
 
-      <h3 className="text-xl font-semibold mb-4">Liste des élèves</h3>
+      <h3 className="font-headline text-xl font-semibold mb-4">Liste des élèves</h3>
       <div className="bg-white rounded-lg border border-gray-200 shadow-md">
         <Table
           columns={[

Front-End/src/components/DateTab.js

@@ -50,7 +50,7 @@ const DateTab = ({
       <div className="flex flex-col space-y-3">
         {dates[activeTab]?.map((date, index) => (
           <div key={index} className="flex items-center space-x-3">
-            <span className="text-emerald-700 font-semibold">
+            <span className="text-secondary font-semibold">
               Échéance {index + 1}
             </span>
             <input
@@ -63,7 +63,7 @@ const DateTab = ({
                   e.target.value
                 )
               }
-              className="p-2 border border-emerald-300 rounded focus:outline-none focus:ring-2 focus:ring-emerald-500 cursor-pointer"
+              className="p-2 border border-primary/30 rounded focus:outline-none focus:ring-2 focus:ring-primary cursor-pointer"
             />
             {modifiedDates[`${activeTab}-${index}`] && (
               <button
@@ -74,7 +74,7 @@ const DateTab = ({
                     due_dates: dates[activeTab],
                   })
                 }
-                className="text-emerald-500 hover:text-emerald-800"
+                className="text-primary hover:text-secondary"
               >
                 <Check className="w-5 h-5" />
               </button>

Front-End/src/components/EmptyState.js

@@ -0,0 +1,36 @@
+import React from 'react';
+import { Inbox } from 'lucide-react';
+
+const EmptyState = ({
+  icon: Icon = Inbox,
+  title,
+  description,
+  actionLabel,
+  onAction,
+  actionIcon: ActionIcon,
+}) => {
+  return (
+    <div className="flex flex-col items-center justify-center py-12 px-4 text-center">
+      <div className="bg-neutral p-4 rounded-full mb-4">
+        <Icon size={40} className="text-gray-400" />
+      </div>
+      <h3 className="font-headline text-lg font-semibold text-gray-700 mb-2">
+        {title}
+      </h3>
+      {description && (
+        <p className="text-sm text-gray-500 max-w-md mb-6">{description}</p>
+      )}
+      {actionLabel && onAction && (
+        <button
+          onClick={onAction}
+          className="flex items-center gap-2 bg-primary hover:bg-secondary text-white font-label font-medium px-6 py-2.5 rounded transition-colors min-h-[44px]"
+        >
+          {ActionIcon && <ActionIcon size={18} />}
+          {actionLabel}
+        </button>
+      )}
+    </div>
+  );
+};
+
+export default EmptyState;

Front-End/src/components/Evaluation/EvaluationForm.js

@@ -74,7 +74,7 @@ export default function EvaluationForm({
       className="space-y-4 p-4 bg-white rounded-lg border border-gray-200 shadow-sm"
     >
       <div className="flex items-center justify-between">
-        <h3 className="font-semibold text-lg text-gray-800">
+        <h3 className="font-headline font-semibold text-lg text-gray-800">
           {isEditing ? 'Modifier l\'évaluation' : 'Nouvelle évaluation'}
         </h3>
         <button

Front-End/src/components/Evaluation/EvaluationGradeTable.js

@@ -112,7 +112,7 @@ export default function EvaluationGradeTable({
       <div className="p-4 border-b border-gray-200 bg-gray-50 rounded-t-lg">
         <div className="flex items-center justify-between">
           <div>
-            <h3 className="font-semibold text-lg text-gray-800">
+            <h3 className="font-headline font-semibold text-lg text-gray-800">
               {evaluation.name}
             </h3>
             <div className="text-sm text-gray-500 flex gap-3">
@@ -191,7 +191,7 @@ export default function EvaluationGradeTable({
                         handleScoreChange(student.id, e.target.value)
                       }
                       disabled={isAbsent}
-                      className={`w-20 px-2 py-1 text-center border rounded focus:ring-2 focus:ring-emerald-500 focus:border-emerald-500 ${
+                      className={`w-20 px-2 py-1 text-center border rounded focus:ring-2 focus:ring-primary focus:border-primary ${
                         isAbsent
                           ? 'bg-gray-100 text-gray-400 cursor-not-allowed'
                           : 'border-gray-300'
@@ -219,7 +219,7 @@ export default function EvaluationGradeTable({
                         handleCommentChange(student.id, e.target.value)
                       }
                       placeholder="Commentaire..."
-                      className="w-full px-2 py-1 border border-gray-300 rounded focus:ring-2 focus:ring-emerald-500 focus:border-emerald-500"
+                      className="w-full px-2 py-1 border border-gray-300 rounded focus:ring-2 focus:ring-primary focus:border-primary"
                     />
                   </td>
                   {onDeleteGrade && (
@@ -258,7 +258,7 @@ export default function EvaluationGradeTable({
             <div className="flex gap-4 text-sm text-gray-600">
               <span>
                 Moyenne:{' '}
-                <span className="font-semibold text-emerald-600">
+                <span className="font-semibold text-primary">
                   {stats.avg.toFixed(2)}
                 </span>
               </span>

Front-End/src/components/Evaluation/EvaluationStudentView.js

@@ -123,14 +123,14 @@ export default function EvaluationStudentView({
     <div className="space-y-4">
       {/* Moyenne générale */}
       {generalAverage !== null && (
-        <div className="bg-emerald-50 border border-emerald-200 rounded-lg p-4 flex items-center justify-between">
+        <div className="bg-primary/5 border border-primary/20 rounded-lg p-4 flex items-center justify-between">
           <div className="flex items-center gap-2">
-            <BookOpen className="text-emerald-600" size={24} />
-            <span className="font-medium text-emerald-800">Moyenne générale</span>
+            <BookOpen className="text-primary" size={24} />
+            <span className="font-medium text-secondary">Moyenne générale</span>
           </div>
           <div className="flex items-center gap-2">
             {getAverageIcon(generalAverage)}
-            <span className="text-2xl font-bold text-emerald-700">
+            <span className="text-2xl font-bold text-secondary">
               {generalAverage.toFixed(2)}/20
             </span>
           </div>
@@ -233,7 +233,7 @@ export default function EvaluationStudentView({
                         <span className="text-gray-500">/{ev.max_score}</span>
                         <button
                           onClick={() => handleSaveEdit(ev, studentEval)}
-                          className="p-1 text-emerald-600 hover:bg-emerald-50 rounded"
+                          className="p-1 text-primary hover:bg-primary/5 rounded"
                           title="Enregistrer"
                         >
                           <Save size={16} />

Front-End/src/components/EventCard.js

@@ -103,12 +103,12 @@ const EventCard = ({ title, start, end, date, description, type }) => {
     <div className="bg-white p-4 rounded-lg shadow-sm border border-gray-200 mb-3 hover:shadow-md transition-shadow">
       <div className="flex items-start gap-3">
         <div className="flex-shrink-0 mt-1">
-          <CalendarCheck className="text-emerald-500" size={20} />
+          <CalendarCheck className="text-primary" size={20} />
         </div>
         <div className="flex-1">
           <h4 className="font-medium text-gray-900 mb-1">{title}</h4>
           <div className="flex flex-col text-sm text-gray-500">
-            <span className="font-medium text-emerald-600">{dayName}</span>
+            <span className="font-medium text-primary">{dayName}</span>
             <span>{formattedDate}</span>
             {timeRange && (
               <span className="text-xs text-gray-600 mt-1">{timeRange}</span>

Front-End/src/components/Form/AddFieldModal.js

@@ -159,7 +159,7 @@ export default function AddFieldModal({
     <div className="fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center z-50">
       <div className="bg-white rounded-lg p-6 max-w-xl w-full mx-4 max-h-[90vh] overflow-y-auto">
         <div className="flex justify-between items-center mb-4">
-          <h3 className="text-xl font-semibold">
+          <h3 className="font-headline text-xl font-semibold">
             {isEditing ? 'Modifier le champ' : 'Ajouter un champ'}
           </h3>
           <button
@@ -720,7 +720,7 @@ export default function AddFieldModal({
             <Button
               type="submit"
               text={isEditing ? 'Modifier' : 'Ajouter'}
-              className="px-4 py-2 bg-green-500 text-white rounded-md hover:bg-green-600"
+              className="px-4 py-2 bg-primary text-white rounded hover:bg-secondary"
             />
             <Button
               type="button"

Front-End/src/components/Form/Button.js

@@ -12,8 +12,8 @@ const Button = ({
 }) => {
   const router = useRouter();
   const baseClass =
-    'px-4 py-2 rounded-md text-white h-8 flex items-center justify-center';
-  const primaryClass = 'bg-emerald-500 hover:bg-emerald-600';
+    'px-4 py-2 rounded font-label font-medium min-h-[44px] flex items-center justify-center transition-colors';
+  const primaryClass = 'bg-primary hover:bg-secondary text-white';
   const secondaryClass = 'bg-gray-300 hover:bg-gray-400 text-black';
   const buttonClass = `${baseClass} ${primary && !disabled ? primaryClass : secondaryClass} ${className}`;
 

Front-End/src/components/Form/CheckBox.js

@@ -34,7 +34,7 @@ const CheckBox = ({
         value={item.id}
         checked={isChecked}
         onChange={handleChange}
-        className={`form-checkbox h-4 w-4 rounded-mg text-emerald-600 hover:ring-emerald-400 checked:bg-emerald-600 hover:border-emerald-500 hover:bg-emerald-500 cursor-pointer ${horizontal ? 'mt-1' : 'mr-2'}`}
+        className={`form-checkbox h-4 w-4 rounded-mg text-primary hover:ring-tertiary checked:bg-primary hover:border-primary hover:bg-primary cursor-pointer ${horizontal ? 'mt-1' : 'mr-2'}`}
         style={{ borderRadius: '6px', outline: 'none', boxShadow: 'none' }}
       />
       {!horizontal && (

Front-End/src/components/Form/FieldTypeSelector.js

@@ -44,7 +44,7 @@ export default function FieldTypeSelector({ isOpen, onClose, onSelect }) {
     <div className="fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center z-50">
       <div className="bg-white rounded-lg p-6 max-w-4xl w-full mx-4 max-h-[85vh] overflow-y-auto">
         <div className="flex justify-between items-center mb-4">
-          <h3 className="text-lg font-semibold">
+          <h3 className="font-headline text-lg font-semibold">
             Choisir un type de champ ({filteredFieldTypes.length} /{' '}
             {FIELD_TYPES.length} types)
           </h3>

Front-End/src/components/Form/FileUpload.js

@@ -46,7 +46,7 @@ export default function FileUpload({
         !enable ? 'bg-gray-100 cursor-not-allowed' : ''
       }`}
     >
-      <h3 className="text-lg font-semibold mb-4">
+      <h3 className="font-headline text-lg font-semibold mb-4">
         {`${selectionMessage}`}
         {required && <span className="text-red-500 ml-1">*</span>}
       </h3>
@@ -54,7 +54,7 @@ export default function FileUpload({
         className={`border-2 border-dashed p-6 rounded-lg flex flex-col items-center justify-center ${
           !enable
             ? 'border-gray-300 bg-gray-100 cursor-not-allowed'
-            : 'border-gray-500 hover:border-emerald-500'
+            : 'border-gray-500 hover:border-primary'
         }`}
         onClick={() => enable && fileInputRef.current.click()} // Désactiver le clic si `enable` est false
         onDragOver={(e) => enable && e.preventDefault()}
@@ -62,7 +62,7 @@ export default function FileUpload({
       >
         <CloudUpload
           className={`w-12 h-12 mb-4 ${
-            !enable ? 'text-gray-400' : 'text-emerald-500'
+            !enable ? 'text-gray-400' : 'text-primary'
           }`}
         />
         <input
@@ -93,7 +93,7 @@ export default function FileUpload({
       {/* Affichage du fichier existant */}
       {existingFile && !localFileName && (
         <div className="mt-4 flex items-center space-x-4 bg-gray-100 p-3 rounded-md shadow-sm">
-          <CloudUpload className="w-6 h-6 text-emerald-500" />
+          <CloudUpload className="w-6 h-6 text-primary" />
           <p className="text-sm font-medium text-gray-800">
             <span className="font-semibold">
               {typeof existingFile === 'string'
@@ -107,7 +107,7 @@ export default function FileUpload({
       {/* Affichage du fichier sélectionné */}
       {localFileName && (
         <div className="mt-4 flex items-center space-x-4 bg-gray-100 p-3 rounded-md shadow-sm">
-          <CloudUpload className="w-6 h-6 text-emerald-500" />
+          <CloudUpload className="w-6 h-6 text-primary" />
           <p className="text-sm font-medium text-gray-800">
             <span className="font-semibold">{localFileName}</span>
           </p>

Front-End/src/components/Form/FormRenderer.js

@@ -36,6 +36,8 @@ export default function FormRenderer({
   }, // Callback de soumission personnalisé (optionnel)
   masterFile = null,
 }) {
+  const formFields = formConfig?.fields || [];
+
   const resolveMasterFileUrl = (fileValue) => {
     if (!fileValue) return null;
     if (typeof fileValue !== 'string') return null;
@@ -50,6 +52,52 @@ export default function FormRenderer({
 
   const masterFileUrl = resolveMasterFileUrl(masterFile);
 
+  const detectMasterFileType = (fileUrl) => {
+    if (!fileUrl || typeof fileUrl !== 'string') return 'unknown';
+
+    let candidate = fileUrl;
+
+    if (fileUrl.startsWith('/api/download?')) {
+      const queryPart = fileUrl.split('?')[1] || '';
+      const params = new URLSearchParams(queryPart);
+      const pathFromQuery = params.get('path') || params.get('file');
+      if (pathFromQuery) {
+        candidate = pathFromQuery;
+      }
+    }
+
+    const cleanUrl = candidate.split('?')[0];
+
+    let lowerUrl = cleanUrl.toLowerCase();
+    try {
+      lowerUrl = decodeURIComponent(cleanUrl).toLowerCase();
+    } catch {
+      lowerUrl = cleanUrl.toLowerCase();
+    }
+
+    if (lowerUrl.endsWith('.pdf')) return 'pdf';
+    if (
+      lowerUrl.endsWith('.png') ||
+      lowerUrl.endsWith('.jpg') ||
+      lowerUrl.endsWith('.jpeg') ||
+      lowerUrl.endsWith('.gif') ||
+      lowerUrl.endsWith('.webp') ||
+      lowerUrl.endsWith('.bmp') ||
+      lowerUrl.endsWith('.svg')
+    ) {
+      return 'image';
+    }
+
+    return 'other';
+  };
+
+  const masterFileType = detectMasterFileType(masterFileUrl);
+  const hasFileField = formFields.some((field) => field.type === 'file');
+
+  const formContainerClass = hasFileField
+    ? 'w-full max-w-4xl mx-auto'
+    : 'w-full max-w-md mx-auto';
+
   const {
     handleSubmit,
     control,
@@ -149,26 +197,26 @@ export default function FormRenderer({
   return (
     <form
       onSubmit={handleSubmit(onSubmit, onError)}
-      className="max-w-md mx-auto"
+      className={formContainerClass}
     >
       {csrfToken ? <DjangoCSRFToken csrfToken={csrfToken} /> : null}
-      <h2 className="text-2xl font-bold text-center mb-4">
+      <h2 className="font-headline text-2xl font-bold text-center mb-4">
         {formConfig?.title || 'Formulaire'}
       </h2>
 
-      {(formConfig?.fields || []).map((field) => (
+      {formFields.map((field) => (
         <div
           key={field.id || `field-${Math.random().toString(36).substr(2, 9)}`}
           className="flex flex-col mt-4"
         >
           {field.type === 'heading1' && (
-            <h1 className="text-3xl font-bold mb-3">{field.text}</h1>
+            <h1 className="font-headline text-3xl font-bold mb-3">{field.text}</h1>
           )}
           {field.type === 'heading2' && (
-            <h2 className="text-2xl font-bold mb-3">{field.text}</h2>
+            <h2 className="font-headline text-2xl font-bold mb-3">{field.text}</h2>
           )}
           {field.type === 'heading3' && (
-            <h3 className="text-xl font-bold mb-2">{field.text}</h3>
+            <h3 className="font-headline text-xl font-bold mb-2">{field.text}</h3>
           )}
           {field.type === 'heading4' && (
             <h4 className="text-lg font-bold mb-2">{field.text}</h4>
@@ -355,12 +403,29 @@ export default function FormRenderer({
                         {field.label}
                       </p>
                     )}
+                    {masterFileType === 'image' ? (
+                      <img
+                        src={masterFileUrl}
+                        alt={field.label || 'Document'}
+                        className="w-full h-auto rounded border border-gray-200 bg-white"
+                      />
+                    ) : masterFileType === 'pdf' ? (
                       <iframe
                         src={masterFileUrl}
                         title={field.label || 'Document'}
                         className="w-full rounded border border-gray-200 bg-white"
-                      style={{ height: '520px', border: 'none' }}
+                        style={{ height: '720px', border: 'none' }}
                       />
+                    ) : (
+                      <a
+                        href={masterFileUrl}
+                        target="_blank"
+                        rel="noopener noreferrer"
+                        className="inline-flex items-center px-4 py-2 rounded bg-primary text-white hover:bg-secondary"
+                      >
+                        Ouvrir le document
+                      </a>
+                    )}
                   </div>
                 ) : (
                   <FileUpload
@@ -451,7 +516,7 @@ export default function FormRenderer({
           type="submit"
           primary
           text={formConfig?.submitLabel || 'Envoyer'}
-          className="mb-1 px-4 py-2 rounded-md shadow bg-emerald-500 text-white hover:bg-emerald-600 w-full"
+          className="mb-1 px-4 py-2 rounded-md shadow bg-primary text-white hover:bg-primary w-full"
         />
       </div>
     </form>

Front-End/src/components/Form/FormTemplateBuilder.js

@@ -459,14 +459,14 @@ export default function FormTemplateBuilder({
             }
           >
             <div className="bg-white p-6 rounded-lg shadow">
-              <h2 className="text-xl font-bold mb-6">
+              <h2 className="font-headline text-xl font-bold mb-6">
                 Configuration du formulaire
               </h2>
 
               {/* Configuration générale */}
               <div className="space-y-4 mb-6">
                 <div className="flex justify-between items-center">
-                  <h3 className="text-lg font-semibold mr-4">
+                  <h3 className="font-headline text-lg font-semibold mr-4">
                     Paramètres généraux
                   </h3>
                   <div className="flex gap-2">
@@ -509,7 +509,7 @@ export default function FormTemplateBuilder({
                     className={`p-3 rounded ${
                       saveMessage.type === 'error'
                         ? 'bg-red-100 text-red-700'
-                        : 'bg-green-100 text-green-700'
+                        : 'bg-primary/10 text-secondary'
                     }`}
                   >
                     {saveMessage.text}
@@ -578,7 +578,7 @@ export default function FormTemplateBuilder({
               {/* Liste des champs */}
               <div className="space-y-4">
                 <div className="flex justify-between items-center">
-                  <h3 className="text-lg font-semibold mr-4">
+                  <h3 className="font-headline text-lg font-semibold mr-4">
                     Champs du formulaire ({formConfig.fields.length})
                   </h3>
                   <button
@@ -587,7 +587,7 @@ export default function FormTemplateBuilder({
                       setSelectedFieldType(null);
                       setShowFieldTypeSelector(true);
                     }}
-                    className="p-2 bg-green-500 text-white rounded-md hover:bg-green-600 transition-colors"
+                    className="p-2 bg-primary text-white rounded hover:bg-secondary transition-colors"
                     title="Ajouter un champ"
                   >
                     <PlusCircle size={18} />
@@ -605,7 +605,7 @@ export default function FormTemplateBuilder({
                         setSelectedFieldType(null);
                         setShowFieldTypeSelector(true);
                       }}
-                      className="px-4 py-2 bg-green-500 text-white rounded-md hover:bg-green-600 transition-colors inline-flex items-center gap-2"
+                      className="px-4 py-2 bg-primary text-white rounded hover:bg-secondary transition-colors inline-flex items-center gap-2"
                     >
                       <PlusCircle size={18} />
                       <span>Ajouter mon premier champ</span>
@@ -639,7 +639,7 @@ export default function FormTemplateBuilder({
             <div className="lg:col-span-2">
               <div className="bg-white p-6 rounded-lg shadow h-full">
                 <div className="flex justify-between items-center mb-4">
-                  <h3 className="text-lg font-semibold mr-4">JSON généré</h3>
+                  <h3 className="font-headline text-lg font-semibold mr-4">JSON généré</h3>
                   <div className="flex gap-2">
                     <button
                       onClick={exportJson}
@@ -673,7 +673,7 @@ export default function FormTemplateBuilder({
         {/* Aperçu */}
         <div className="mt-6">
           <div className="bg-white p-6 rounded-lg shadow">
-            <h3 className="text-lg font-semibold mb-4">Aperçu du formulaire</h3>
+            <h3 className="font-headline text-lg font-semibold mb-4">Aperçu du formulaire</h3>
             <div className="border-2 border-dashed border-gray-300 p-6 rounded">
               {formConfig.fields.length > 0 ? (
                 <FormRenderer formConfig={formConfig} masterFile={masterFile} />

Front-End/src/components/Form/IconSelector.js

@@ -42,7 +42,7 @@ export default function IconSelector({
     <div className="fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center z-50">
       <div className="bg-white rounded-lg p-6 max-w-4xl w-full mx-4 max-h-[85vh] overflow-y-auto">
         <div className="flex justify-between items-center mb-4">
-          <h3 className="text-lg font-semibold">
+          <h3 className="font-headline text-lg font-semibold">
             Choisir une icône ({filteredIcons.length} / {allIcons.length}{' '}
             icônes)
           </h3>

Front-End/src/components/Form/MultiSelect.js

@@ -45,7 +45,7 @@ const MultiSelect = ({
       <div className="relative mt-1">
         <button
           type="button"
-          className="w-full bg-white border border-gray-300 rounded-md shadow-sm pl-3 pr-10 py-2 text-left cursor-pointer focus:outline-none sm:text-sm hover:border-emerald-500 focus:border-emerald-500"
+          className="w-full bg-white border border-gray-300 rounded-md shadow-sm pl-3 pr-10 py-2 text-left cursor-pointer focus:outline-none sm:text-sm hover:border-primary focus:border-primary"
           onClick={() => setIsOpen(!isOpen)}
         >
           {selectedOptions.length > 0 ? (
@@ -53,7 +53,7 @@ const MultiSelect = ({
               {selectedOptions.map((option) => (
                 <span
                   key={option.id}
-                  className="bg-emerald-100 text-emerald-700 px-2 py-1 rounded-md text-sm"
+                  className="bg-primary/10 text-secondary px-2 py-1 rounded-md text-sm"
                 >
                   {option.name}
                 </span>
@@ -71,8 +71,8 @@ const MultiSelect = ({
                 key={option.id}
                 className={`cursor-pointer select-none relative py-2 pl-3 pr-9 ${
                   selectedOptions.some((selected) => selected.id === option.id)
-                    ? 'text-white bg-emerald-600'
-                    : 'text-gray-900 hover:bg-emerald-100 hover:text-emerald-900'
+                    ? 'text-white bg-primary'
+                    : 'text-gray-900 hover:bg-primary/10 hover:text-secondary'
                 }`}
                 onClick={() => handleSelect(option)}
               >

Front-End/src/components/Form/RadioList.js

@@ -14,7 +14,7 @@ const RadioList = ({
   return (
     <div className={`mb-4 ${className}`}>
       {sectionLabel && (
-        <h3 className="text-lg font-semibold text-gray-800 mb-2">
+        <h3 className="font-headline text-lg font-semibold text-gray-800 mb-2">
           {sectionLabel}
           {required && <span className="text-red-500 ml-1">*</span>}
         </h3>
@@ -35,7 +35,7 @@ const RadioList = ({
               value={item.id}
               checked={parseInt(formData[fieldName], 10) === item.id}
               onChange={handleChange}
-              className="form-radio h-4 w-4 text-emerald-600 focus:ring-emerald-500 hover:ring-emerald-400 checked:bg-emerald-600 cursor-pointer"
+              className="form-radio h-4 w-4 text-primary focus:ring-primary hover:ring-tertiary checked:bg-primary cursor-pointer"
               style={{ outline: 'none', boxShadow: 'none' }}
               disabled={disabled}
             />

Front-End/src/components/Form/ToggleSwitch.js

@@ -20,12 +20,12 @@ const ToggleSwitch = ({ name, label, checked, onChange }) => {
           id={name}
           checked={checked}
           onChange={handleChange}
-          className="hover:text-emerald-500 absolute block w-6 h-6 rounded-full bg-white border-4 appearance-none cursor-pointer border-emerald-500 checked:right-0 checked:border-emerald-500 checked:bg-emerald-500 hover:border-emerald-500 hover:bg-emerald-500 focus:outline-none focus:ring-0"
+          className="hover:text-primary absolute block w-6 h-6 rounded-full bg-white border-4 appearance-none cursor-pointer border-primary checked:right-0 checked:border-primary checked:bg-primary hover:border-primary hover:bg-primary focus:outline-none focus:ring-0"
           ref={inputRef} // Reference to the input element
         />
         <label
           htmlFor={name}
-          className={`toggle-label block overflow-hidden h-6 rounded-full cursor-pointer transition-colors duration-200 ${checked ? 'bg-emerald-300' : 'bg-gray-300'}`}
+          className={`toggle-label block overflow-hidden h-6 rounded-full cursor-pointer transition-colors duration-200 ${checked ? 'bg-primary/30' : 'bg-gray-300'}`}
         ></label>
       </div>
     </div>

Front-End/src/components/Grades/AcademicResults.js

@@ -3,16 +3,16 @@ import React from 'react';
 export default function AcademicResults({ results }) {
   return (
     <div className="bg-white p-6 rounded-lg shadow-sm border border-gray-200">
-      <h2 className="text-xl font-semibold mb-4">Résultats académiques</h2>
+      <h2 className="font-headline text-xl font-semibold mb-4">Résultats académiques</h2>
       <div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
         {results.map((result, idx) => (
           <div
             key={idx}
-            className="p-4 rounded-lg bg-emerald-50 flex flex-col gap-2 shadow"
+            className="p-4 rounded-lg bg-primary/5 flex flex-col gap-2 shadow"
           >
             <div className="flex justify-between items-center">
               <span className="font-medium">{result.subject}</span>
-              <span className="text-emerald-700 font-bold text-lg">
+              <span className="text-secondary font-bold text-lg">
                 {result.grade}/20
               </span>
             </div>

Front-End/src/components/Grades/Attendance.js

@@ -21,16 +21,16 @@ export default function Attendance({
 
   return (
     <div className="w-full bg-stone-50 p-6 rounded-lg shadow-sm border border-gray-200">
-      <h2 className="text-xl font-semibold mb-4">Présence et assiduité</h2>
+      <h2 className="font-headline text-xl font-semibold mb-4">Présence et assiduité</h2>
       {absences.length === 0 ? (
-        <div className="text-center text-emerald-600 font-medium py-8">
-          Aucune absence enregistrée 🎉
+        <div className="text-center text-primary font-medium py-8">
+          Aucune absence enregistrée 
         </div>
       ) : (
-        <ol className="relative border-l border-emerald-200">
+        <ol className="relative border-l border-primary/20">
           {absences.map((absence, idx) => (
             <li key={idx} className="mb-6 ml-4">
-              <div className="absolute w-3 h-3 bg-emerald-400 rounded-full mt-1.5 -left-1.5 border border-white" />
+              <div className="absolute w-3 h-3 bg-tertiary rounded-full mt-1.5 -left-1.5 border border-white" />
               <div className="flex items-center justify-between gap-4">
                 {/* Infos principales à gauche */}
                 <div className="flex flex-col">
@@ -45,7 +45,7 @@ export default function Attendance({
                   <div className="flex items-center gap-2">
                     <span className="font-medium">{absence.type}</span>
                     <span
-                      className={`text-xs px-2 py-1 rounded ${absence.justified ? 'bg-emerald-100 text-emerald-700' : 'bg-red-100 text-red-700'}`}
+                      className={`text-xs px-2 py-1 rounded ${absence.justified ? 'bg-primary/10 text-secondary' : 'bg-red-100 text-red-700'}`}
                     >
                       {absence.justified ? 'Justifiée' : 'Non justifiée'}
                     </span>
@@ -92,7 +92,7 @@ export default function Attendance({
                             });
                         });
                       }}
-                      className="mb-1 px-4 py-2 rounded-md shadow bg-emerald-500 text-white hover:bg-emerald-600 w-full"
+                      className="mb-1 px-4 py-2 rounded-md shadow bg-primary text-white hover:bg-primary w-full"
                       icon={<Trash2 className="w-6 h-6" />}
                       text="Supprimer"
                       title="Evaluez l'élève"

Front-End/src/components/Grades/GradeView.js

@@ -16,7 +16,7 @@ const getGradeStyle = (grade) => {
     case 2:
       return 'bg-yellow-50 border-yellow-200';
     case 3:
-      return 'bg-emerald-50 border-emerald-200';
+      return 'bg-primary/5 border-primary/20';
     default:
       return 'bg-gray-50 border-gray-200';
   }
@@ -68,7 +68,7 @@ export default function GradeView({ data, grades, onGradeChange }) {
 
   return (
     <div className="w-full">
-      <div className="mb-4 mr-4 text-right text-emerald-700 font-semibold">
+      <div className="mb-4 mr-4 text-right text-secondary font-semibold">
         {totalCompetencies} compétence{totalCompetencies > 1 ? 's' : ''} au
         total
       </div>
@@ -76,19 +76,19 @@ export default function GradeView({ data, grades, onGradeChange }) {
         <div key={domaine.domaine_id} className="mb-8">
           <div
             className={
-              'flex items-center justify-between cursor-pointer px-6 py-4 rounded-lg transition bg-emerald-50 border border-emerald-200 shadow-sm hover:bg-emerald-100'
+              'flex items-center justify-between cursor-pointer px-6 py-4 rounded-lg transition bg-primary/5 border border-primary/20 shadow-sm hover:bg-primary/10'
             }
             onClick={() => toggleDomain(domaine.domaine_id)}
           >
             <div className="flex items-center gap-3">
-              <BookOpen className="w-7 h-7 text-emerald-600" />
-              <span className="text-2xl font-bold text-emerald-800">
+              <BookOpen className="w-7 h-7 text-primary" />
+              <span className="text-2xl font-bold text-secondary">
                 {domaine.domaine_nom}
               </span>
             </div>
             {openDomains[domaine.domaine_id]
-              ? <ChevronDown className="w-5 h-5 text-emerald-700" />
-              : <ChevronRight className="w-5 h-5 text-emerald-700" />
+              ? <ChevronDown className="w-5 h-5 text-secondary" />
+              : <ChevronRight className="w-5 h-5 text-secondary" />
             }
           </div>
           {openDomains[domaine.domaine_id] && (
@@ -97,7 +97,7 @@ export default function GradeView({ data, grades, onGradeChange }) {
                 <div key={categorie.categorie_id} className="mb-10 mr-4">
                   <button
                     type="button"
-                    className="flex items-center gap-2 text-lg font-semibold text-emerald-700 mb-4 hover:underline"
+                    className="flex items-center gap-2 text-lg font-semibold text-secondary mb-4 hover:underline"
                     onClick={() => toggleCategory(categorie.categorie_id)}
                   >
                     {openCategories[categorie.categorie_id]
@@ -115,7 +115,7 @@ export default function GradeView({ data, grades, onGradeChange }) {
                             key={competence.competence_id}
                             className={`border rounded-xl p-6 flex flex-col shadow transition hover:shadow-md ${getGradeStyle(grade)}`}
                           >
-                            <div className="mb-4 pb-4 border-b border-emerald-800 flex items-center min-h-[48px]">
+                            <div className="mb-4 pb-4 border-b border-secondary flex items-center min-h-[48px]">
                               <span className="text-gray-900 font-semibold text-base">
                                 {competence.nom}
                               </span>
@@ -154,7 +154,7 @@ export default function GradeView({ data, grades, onGradeChange }) {
               ))}
             </div>
           )}
-          <hr className="my-6 border-emerald-100" />
+          <hr className="my-6 border-primary/10" />
         </div>
       ))}
     </div>

Front-End/src/components/Grades/GradesDomainBarChart.js

@@ -27,13 +27,13 @@ export default function GradesDomainBarChart({ studentCompetencies }) {
     if (avg > 0 && avg <= 1) return 'bg-gradient-to-r from-red-200 to-red-400';
     if (avg > 1 && avg <= 2)
       return 'bg-gradient-to-r from-yellow-200 to-yellow-400';
-    if (avg > 2) return 'bg-gradient-to-r from-emerald-200 to-emerald-500';
+    if (avg > 2) return 'bg-gradient-to-r from-primary/20 to-primary';
     return 'bg-gray-200';
   };
 
   return (
     <div className="w-full flex flex-col items-center gap-4 bg-stone-50 p-6 rounded-lg shadow-sm border border-gray-200">
-      <h2 className="text-xl font-semibold mb-2">Moyenne par domaine</h2>
+      <h2 className="font-headline text-xl font-semibold mb-2">Moyenne par domaine</h2>
       <div className="w-full flex flex-col gap-2">
         {domainStats.map((d) => (
           <div key={d.name} className="flex items-center w-full">
@@ -41,7 +41,7 @@ export default function GradesDomainBarChart({ studentCompetencies }) {
               {d.name}
             </span>
             <div className="flex items-center" style={{ width: '40%' }}>
-              <div className="w-full bg-emerald-100 h-3 rounded overflow-hidden">
+              <div className="w-full bg-primary/10 h-3 rounded overflow-hidden">
                 <div
                   className={`h-3 rounded ${getBarGradient(d.avg)}`}
                   style={{ width: `${d.avg * 33.33}%` }}
@@ -49,7 +49,7 @@ export default function GradesDomainBarChart({ studentCompetencies }) {
               </div>
             </div>
             <span
-              className="text-xs font-semibold text-emerald-700 text-left pl-2 flex-shrink-0"
+              className="text-xs font-semibold text-secondary text-left pl-2 flex-shrink-0"
               style={{ width: '10%' }}
             >
               {d.avg}

Front-End/src/components/Grades/GradesStatsCircle.js

@@ -15,7 +15,7 @@ export default function GradesStatsCircle({ grades }) {
 
   return (
     <div className="w-full flex flex-col items-center gap-4 bg-stone-50 p-6 rounded-lg shadow-sm border border-gray-200">
-      <h2 className="text-xl font-semibold mb-2">Statistiques globales</h2>
+      <h2 className="font-headline text-xl font-semibold mb-2">Statistiques globales</h2>
       <div style={{ width: 120, height: 120 }}>
         <CircularProgressbar
           value={percent}
@@ -28,7 +28,7 @@ export default function GradesStatsCircle({ grades }) {
         />
       </div>
       <div className="flex flex-col items-center text-sm mt-2">
-        <span className="text-emerald-700 font-semibold">
+        <span className="text-secondary font-semibold">
           {acquired} acquis
         </span>
         <span className="text-yellow-600">{inProgress} en cours</span>

Front-End/src/components/Grades/Homeworks.js

@@ -3,7 +3,7 @@ import React from 'react';
 export default function Homeworks({ homeworks }) {
   return (
     <div className="bg-white p-6 rounded-lg shadow-sm border border-gray-200">
-      <h2 className="text-xl font-semibold mb-4">Suivi des devoirs</h2>
+      <h2 className="font-headline text-xl font-semibold mb-4">Suivi des devoirs</h2>
       <ul className="divide-y divide-gray-100">
         {homeworks.map((hw, idx) => (
           <li
@@ -15,7 +15,7 @@ export default function Homeworks({ homeworks }) {
               <span className="ml-2 text-xs text-gray-400">{hw.dueDate}</span>
             </div>
             <span
-              className={`text-xs px-2 py-1 rounded ${hw.status === 'Rendu' ? 'bg-emerald-100 text-emerald-700' : 'bg-yellow-100 text-yellow-700'}`}
+              className={`text-xs px-2 py-1 rounded ${hw.status === 'Rendu' ? 'bg-primary/10 text-secondary' : 'bg-yellow-100 text-yellow-700'}`}
             >
               {hw.status}
             </span>

Front-End/src/components/Grades/Orientation.js

@@ -3,7 +3,7 @@ import React from 'react';
 export default function Orientation({ orientation }) {
   return (
     <div className="bg-white p-6 rounded-lg shadow-sm border border-gray-200">
-      <h2 className="text-xl font-semibold mb-4">Orientation & conseils</h2>
+      <h2 className="font-headline text-xl font-semibold mb-4">Orientation & conseils</h2>
       <ul className="divide-y divide-gray-100">
         {orientation.map((item, idx) => (
           <li

Front-End/src/components/Grades/Remarks.js

@@ -3,7 +3,7 @@ import React from 'react';
 export default function Remarks({ remarks }) {
   return (
     <div className="bg-white p-6 rounded-lg shadow-sm border border-gray-200">
-      <h2 className="text-xl font-semibold mb-4">Remarques & observations</h2>
+      <h2 className="font-headline text-xl font-semibold mb-4">Remarques & observations</h2>
       <ul className="divide-y divide-gray-100">
         {remarks.map((remark, idx) => (
           <li

Front-End/src/components/Grades/SpecificEvaluations.js

@@ -3,7 +3,7 @@ import React from 'react';
 export default function SpecificEvaluations({ specificEvaluations }) {
   return (
     <div className="bg-white p-6 rounded-lg shadow-sm border border-gray-200">
-      <h2 className="text-xl font-semibold mb-4">Évaluations spécifiques</h2>
+      <h2 className="font-headline text-xl font-semibold mb-4">Évaluations spécifiques</h2>
       <div className="flex flex-col gap-3">
         {specificEvaluations.map((evalItem, idx) => (
           <div

Front-End/src/components/Grades/WorkPlan.js

@@ -3,14 +3,14 @@ import React from 'react';
 export default function WorkPlan({ workPlan }) {
   return (
     <div className="bg-white p-6 rounded-lg shadow-sm border border-gray-200">
-      <h2 className="text-xl font-semibold mb-4">
+      <h2 className="font-headline text-xl font-semibold mb-4">
         Plan de travail personnalisé
       </h2>
       <div className="flex flex-col gap-3">
         {workPlan.map((plan, idx) => (
           <div
             key={idx}
-            className="p-3 rounded border border-emerald-100 bg-emerald-50 flex flex-col sm:flex-row sm:items-center sm:justify-between"
+            className="p-3 rounded border border-primary/10 bg-primary/5 flex flex-col sm:flex-row sm:items-center sm:justify-between"
           >
             <div>
               <span className="font-medium">{plan.objective}</span>
@@ -18,7 +18,7 @@ export default function WorkPlan({ workPlan }) {
                 ({plan.support})
               </span>
             </div>
-            <span className="text-xs px-2 py-1 rounded bg-emerald-200 text-emerald-800 mt-1 sm:mt-0">
+            <span className="text-xs px-2 py-1 rounded bg-primary/20 text-secondary mt-1 sm:mt-0">
               {plan.followUp}
             </span>
           </div>

Front-End/src/components/Inscription/DynamicFormsList.js

@@ -259,10 +259,10 @@ export default function DynamicFormsList({
   }
 
   return (
-    <div className="mt-8 mb-4 w-full mx-auto flex gap-8">
+    <div className="mt-8 mb-4 w-full mx-auto flex flex-col lg:flex-row gap-8 overflow-x-hidden">
       {/* Liste des formulaires */}
-      <div className="w-1/4 bg-gray-50 p-4 rounded-lg shadow-sm border border-gray-200">
-        <h3 className="text-lg font-semibold text-gray-800 mb-4">
+      <div className="w-full lg:w-1/4 bg-gray-50 p-4 rounded-lg shadow-sm border border-gray-200">
+        <h3 className="font-headline text-lg font-semibold text-gray-800 mb-4">
           Formulaires à compléter
         </h3>
         <div className="text-sm text-gray-600 mb-4">
@@ -313,16 +313,16 @@ export default function DynamicFormsList({
                 if (isValidated === true) {
                   statusLabel = 'Validé';
                   statusColor = 'emerald';
-                  icon = <CheckCircle className="w-5 h-5 text-emerald-600" />;
-                  bgClass = 'bg-emerald-50';
-                  borderClass = 'border border-emerald-200';
-                  textClass = 'text-emerald-700';
-                  bgClass = isActive ? 'bg-emerald-200' : bgClass;
+                  icon = <CheckCircle className="w-5 h-5 text-primary" />;
+                  bgClass = 'bg-primary/5';
+                  borderClass = 'border border-primary/20';
+                  textClass = 'text-secondary';
+                  bgClass = isActive ? 'bg-primary/20' : bgClass;
                   borderClass = isActive
-                    ? 'border border-emerald-300'
+                    ? 'border border-primary/30'
                     : borderClass;
                   textClass = isActive
-                    ? 'text-emerald-900 font-semibold'
+                    ? 'text-secondary font-semibold'
                     : textClass;
                   canEdit = false;
                 } else if (isValidated === false) {
@@ -404,17 +404,17 @@ export default function DynamicFormsList({
         })()}
       </div>
 
-      <div className="w-3/4">
+      <div className="w-full lg:w-3/4 min-w-0">
         {currentTemplate && (
-          <div className="bg-white p-6 rounded-lg shadow-sm border border-gray-200">
+          <div className="bg-white p-6 rounded-lg shadow-sm border border-gray-200 overflow-x-hidden">
             <div className="mb-6">
               <div className="flex items-center gap-3 mb-2">
-                <h3 className="text-xl font-semibold text-gray-800">
+                <h3 className="font-headline text-xl font-semibold text-gray-800">
                   {currentTemplate.name}
                 </h3>
                 {/* Label d'état */}
                 {currentTemplate.isValidated === true ? (
-                  <span className="px-2 py-0.5 rounded bg-emerald-100 text-emerald-700 text-sm font-semibold">
+                  <span className="px-2 py-0.5 rounded bg-primary/10 text-secondary text-sm font-semibold">
                     Validé
                   </span>
                 ) : currentTemplate.isValidated === false ? (
@@ -478,7 +478,9 @@ export default function DynamicFormsList({
                     currentTemplate.formTemplateData?.submitLabel || 'Valider',
                 }}
                 masterFile={
-                  currentTemplate.master_file_url || currentTemplate.file || null
+                  currentTemplate.master_file_url ||
+                  currentTemplate.file ||
+                  null
                 }
                 initialValues={
                   extractResponses(formsData[currentTemplate.id]) ||
@@ -509,9 +511,13 @@ export default function DynamicFormsList({
                 {currentTemplate.isValidated !== true && (
                   <div className="flex flex-col items-center gap-4 w-full">
                     {/* Bouton télécharger le document source (fichier maître) */}
-                    {(currentTemplate.master_file_url || currentTemplate.file) && (
+                    {(currentTemplate.master_file_url ||
+                      currentTemplate.file) && (
                       <a
-                        href={getSecureFileUrl(currentTemplate.master_file_url || currentTemplate.file)}
+                        href={getSecureFileUrl(
+                          currentTemplate.master_file_url ||
+                            currentTemplate.file
+                        )}
                         className="flex items-center gap-2 px-4 py-2 bg-blue-500 text-white rounded hover:bg-blue-600 transition"
                         download
                       >
@@ -528,7 +534,9 @@ export default function DynamicFormsList({
                         onFileSelect={(file) =>
                           handleUpload(file, currentTemplate)
                         }
-                        existingFile={currentTemplate.file_url || currentTemplate.file}
+                        existingFile={
+                          currentTemplate.file_url || currentTemplate.file
+                        }
                         required
                         enable={true}
                       />
@@ -544,7 +552,7 @@ export default function DynamicFormsList({
         {currentTemplateIndex >= schoolFileTemplates.length && (
           <div className="text-center py-8">
             <CheckCircle className="w-16 h-16 text-green-600 mx-auto mb-4" />
-            <h3 className="text-lg font-semibold text-green-600 mb-2">
+            <h3 className="font-headline text-lg font-semibold text-green-600 mb-2">
               Tous les formulaires ont été complétés !
             </h3>
             <p className="text-gray-600">

Front-End/src/components/Inscription/FilesModal.js

@@ -107,7 +107,7 @@ const FilesModal = ({
         {/* Section Fiche élève */}
         {files.registrationFile && (
           <div>
-            <h3 className="text-lg font-semibold text-gray-800 mb-4">
+            <h3 className="font-headline text-lg font-semibold text-gray-800 mb-4">
               Fiche élève
             </h3>
             <div className="flex items-center gap-2">
@@ -127,7 +127,7 @@ const FilesModal = ({
         {/* Section Documents fusionnés */}
         {files.fusionFile && (
           <div>
-            <h3 className="text-lg font-semibold text-gray-800 mb-4">
+            <h3 className="font-headline text-lg font-semibold text-gray-800 mb-4">
               Documents fusionnés
             </h3>
             <div className="flex items-center gap-2">
@@ -148,7 +148,7 @@ const FilesModal = ({
 
         {/* Section Fichiers École */}
         <div>
-          <h3 className="text-lg font-semibold text-gray-800 mb-4">
+          <h3 className="font-headline text-lg font-semibold text-gray-800 mb-4">
             Formulaires de l&apos;établissement
           </h3>
           <ul className="space-y-2">
@@ -184,7 +184,7 @@ const FilesModal = ({
 
         {/* Section Fichiers Parent */}
         <div>
-          <h3 className="text-lg font-semibold text-gray-800 mb-4">
+          <h3 className="font-headline text-lg font-semibold text-gray-800 mb-4">
             Pièces fournies
           </h3>
           <ul className="space-y-2">
@@ -218,7 +218,7 @@ const FilesModal = ({
 
         {/* Section Mandat SEPA */}
         <div>
-          <h3 className="text-lg font-semibold text-gray-800 mb-4">
+          <h3 className="font-headline text-lg font-semibold text-gray-800 mb-4">
             Mandat SEPA
           </h3>
           {files.sepaFile ? (

Front-End/src/components/Inscription/FilesToSign.js

@@ -4,7 +4,7 @@ import Table from '@/components/Table';
 export default function FilesToSign({ fileTemplates, columns }) {
   return (
     <div className="bg-white p-6 rounded-lg shadow-sm border border-gray-200">
-      <h2 className="text-xl font-bold mb-4 text-gray-800">
+      <h2 className="font-headline text-xl font-bold mb-4 text-gray-800">
         Fichiers à remplir
       </h2>
       <Table

Front-End/src/components/Inscription/FilesToUpload.js

@@ -185,8 +185,8 @@ export default function FilesToUpload({
               <button
                 className={`flex items-center justify-center w-8 h-8 rounded-full ${
                   actionType === 'upload' && selectedFile?.id === row.id
-                    ? 'bg-emerald-100 text-emerald-600 ring-3 ring-emerald-500'
-                    : 'text-emerald-500 hover:text-emerald-700'
+                    ? 'bg-primary/10 text-primary ring-3 ring-primary'
+                    : 'text-primary hover:text-secondary'
                 }`}
                 onClick={() => {
                   if (actionType === 'upload' && selectedFile?.id === row.id) {
@@ -212,11 +212,11 @@ export default function FilesToUpload({
     <div className="mt-8 mb-4 w-3/5">
       <div className="flex items-center justify-between mb-6">
         <div className="flex items-center space-x-4">
-          <div className="bg-emerald-100 p-3 rounded-full shadow-md">
-            <FileText className="w-8 h-8 text-emerald-600" />
+          <div className="bg-primary/10 p-3 rounded-full shadow-md">
+            <FileText className="w-8 h-8 text-primary" />
           </div>
           <div>
-            <h2 className="text-2xl font-bold text-gray-800">
+            <h2 className="font-headline text-2xl font-bold text-gray-800">
               Pièces à fournir
             </h2>
             <p className="text-sm text-gray-500 italic">

Front-End/src/components/Inscription/InscriptionFormShared.js

@@ -31,6 +31,7 @@ import SiblingInputFields from '@/components/Inscription/SiblingInputFields';
 import PaymentMethodSelector from '@/components/Inscription/PaymentMethodSelector';
 import ProgressStep from '@/components/ProgressStep';
 import { useRouter } from 'next/navigation';
+import { ChevronLeft, ChevronRight, Check, X } from 'lucide-react';
 
 /**
  * Composant de formulaire d'inscription partagé
@@ -761,6 +762,19 @@ export default function InscriptionFormShared({
     'Documents parent',
   ];
 
+  const hasParentFilesStep = parentFileTemplates.length > 0;
+
+  const activeSteps = hasParentFilesStep ? steps : steps.slice(0, 5);
+  const activeStepTitles = hasParentFilesStep
+    ? stepTitles
+    : {
+        1: stepTitles[1],
+        2: stepTitles[2],
+        3: stepTitles[3],
+        4: stepTitles[4],
+        5: stepTitles[5],
+      };
+
   const isStepValid = (stepNumber) => {
     switch (stepNumber) {
       case 1:
@@ -780,13 +794,41 @@ export default function InscriptionFormShared({
     }
   };
 
+  useEffect(() => {
+    if (!hasParentFilesStep && currentPage > 5) {
+      setCurrentPage(5);
+    }
+  }, [hasParentFilesStep, currentPage]);
+
+  const nextDisabled =
+    (currentPage === 1 && !isPage1Valid) ||
+    (currentPage === 2 && !isPage2Valid) ||
+    (currentPage === 3 && !isPage3Valid) ||
+    (currentPage === 4 && !isPage4Valid) ||
+    (currentPage === 5 && !isPage5Valid);
+
+  const submitDisabled = !isStepValid(currentPage);
+
+  const navButtonBaseClass =
+    'min-w-[124px] min-h-[44px] px-5 rounded font-label text-sm font-semibold transition-colors duration-150 focus:outline-none focus:ring-2 focus:ring-primary/30';
+
+  const navPrimaryClass = nextDisabled
+    ? `${navButtonBaseClass} bg-gray-200 text-gray-500 cursor-not-allowed`
+    : `${navButtonBaseClass} bg-primary hover:bg-secondary text-white`;
+
+  const navSubmitClass = submitDisabled
+    ? `${navButtonBaseClass} bg-gray-200 text-gray-500 cursor-not-allowed`
+    : `${navButtonBaseClass} bg-primary hover:bg-secondary text-white`;
+
+  const navSecondaryClass = `${navButtonBaseClass} bg-neutral text-secondary border border-gray-300 hover:bg-white`;
+
   // Rendu du composant
   return (
     <div className="mx-auto p-6">
       <DjangoCSRFToken csrfToken={csrfToken} />
       <ProgressStep
-        steps={steps}
-        stepTitles={stepTitles}
+        steps={activeSteps}
+        stepTitles={activeStepTitles}
         currentStep={currentPage}
         setStep={setCurrentPage}
         isStepValid={isStepValid}
@@ -802,6 +844,64 @@ export default function InscriptionFormShared({
         />
       )}
 
+      {/* Navigation toujours au meme endroit (en haut a gauche) */}
+      <div className="mt-6 mb-4 flex items-center justify-start gap-3">
+        {enable ? (
+          <>
+            {currentPage > 1 && (
+              <Button
+                text="Précédent"
+                icon={<ChevronLeft size={16} strokeWidth={1.8} />}
+                onClick={(e) => {
+                  e.preventDefault();
+                  handlePreviousPage();
+                }}
+                primary
+                className={navSecondaryClass}
+              />
+            )}
+            {currentPage < activeSteps.length ? (
+              <Button
+                text={
+                  <span className="inline-flex items-center gap-2">
+                    <span>Suivant</span>
+                    <ChevronRight size={16} strokeWidth={1.8} />
+                  </span>
+                }
+                onClick={(e) => {
+                  e.preventDefault();
+                  handleNextPage();
+                }}
+                className={navPrimaryClass}
+                disabled={nextDisabled}
+                primary
+                name="Next"
+              />
+            ) : (
+              <Button
+                text="Valider"
+                icon={<Check size={16} strokeWidth={1.8} />}
+                onClick={(e) => {
+                  e.preventDefault();
+                  handleSubmit(e);
+                }}
+                className={navSubmitClass}
+                disabled={submitDisabled}
+                primary
+              />
+            )}
+          </>
+        ) : (
+          <Button
+            onClick={() => router.push(FE_PARENTS_HOME_URL)}
+            text="Quitter"
+            icon={<X size={16} strokeWidth={1.8} />}
+            primary
+            className={`${navButtonBaseClass} bg-primary text-white hover:bg-secondary shadow-sm`}
+          />
+        )}
+      </div>
+
       <div className="flex-1 h-full mt-6">
         {/* Page 1 : Informations sur l'élève */}
         {currentPage === 1 && (
@@ -874,7 +974,7 @@ export default function InscriptionFormShared({
         )}
 
         {/* Dernière page : Section Fichiers parents */}
-        {currentPage === 6 && (
+        {currentPage === 6 && hasParentFilesStep && (
           <FilesToUpload
             parentFileTemplates={parentFileTemplates}
             uploadedFiles={uploadedFiles}
@@ -884,73 +984,6 @@ export default function InscriptionFormShared({
           />
         )}
       </div>
-
-      {/* Boutons de contrôle */}
-      <div className="flex justify-center space-x-4 mt-12">
-        {enable ? (
-          <>
-            {currentPage > 1 && (
-              <Button
-                text="Précédent"
-                onClick={(e) => {
-                  e.preventDefault();
-                  handlePreviousPage();
-                }}
-                primary
-              />
-            )}
-            {currentPage < steps.length ? (
-              <Button
-                text="Suivant"
-                onClick={(e) => {
-                  e.preventDefault();
-                  handleNextPage();
-                }}
-                className={`px-4 py-2 rounded-md shadow-sm focus:outline-none ${
-                  (currentPage === 1 && !isPage1Valid) ||
-                  (currentPage === 2 && !isPage2Valid) ||
-                  (currentPage === 3 && !isPage3Valid) ||
-                  (currentPage === 4 && !isPage4Valid) ||
-                  (currentPage === 5 && !isPage5Valid)
-                    ? 'bg-gray-300 text-gray-700 cursor-not-allowed'
-                    : 'bg-emerald-500 text-white hover:bg-emerald-600'
-                }`}
-                disabled={
-                  (currentPage === 1 && !isPage1Valid) ||
-                  (currentPage === 2 && !isPage2Valid) ||
-                  (currentPage === 3 && !isPage3Valid) ||
-                  (currentPage === 4 && !isPage4Valid) ||
-                  (currentPage === 5 && !isPage5Valid)
-                }
-                primary
-                name="Next"
-              />
-            ) : (
-              <Button
-                text="Valider"
-                onClick={(e) => {
-                  e.preventDefault();
-                  handleSubmit(e);
-                }}
-                className={`px-4 py-2 rounded-md shadow-sm focus:outline-none ${
-                  currentPage === 6 && !isPage6Valid
-                    ? 'bg-gray-300 text-gray-700 cursor-not-allowed'
-                    : 'bg-emerald-500 text-white hover:bg-emerald-600'
-                }`}
-                disabled={currentPage === 6 && !isPage6Valid}
-                primary
-              />
-            )}
-          </>
-        ) : (
-          <Button
-            onClick={() => router.push(FE_PARENTS_HOME_URL)}
-            text="Quitter"
-            primary
-            className="bg-emerald-500 text-white hover:bg-emerald-600"
-          />
-        )}
-      </div>
     </div>
   );
 }

Front-End/src/components/Inscription/PaymentMethodSelector.js

@@ -76,7 +76,7 @@ export default function PaymentMethodSelector({
     <>
       {/* Frais d'inscription */}
       <div className="bg-white p-6 rounded-lg shadow-sm border border-gray-200">
-        <h2 className="text-2xl font-semibold mb-6 text-gray-800 border-b pb-2">
+        <h2 className="font-headline text-2xl font-semibold mb-6 text-gray-800 border-b pb-2">
           Frais d&apos;inscription
         </h2>
 
@@ -155,7 +155,7 @@ export default function PaymentMethodSelector({
 
       {/* Frais de scolarité */}
       <div className="bg-white p-6 rounded-lg shadow-sm border border-gray-200 mt-12">
-        <h2 className="text-2xl font-semibold mb-6 text-gray-800 border-b pb-2">
+        <h2 className="font-headline text-2xl font-semibold mb-6 text-gray-800 border-b pb-2">
           Frais de scolarité
         </h2>
 

Front-End/src/components/Inscription/ResponsableInputFields.js

@@ -132,7 +132,7 @@ export default function ResponsableInputFields({
       {guardians.map((item, index) => (
         <div className="p-6 " key={index}>
           <div className="flex justify-between items-center mb-4">
-            <h3 className="text-xl font-bold">
+            <h3 className="font-headline text-xl font-bold">
               {t('responsable')} {index + 1}
             </h3>
             {guardians.length > 1 && (
@@ -259,11 +259,11 @@ export default function ResponsableInputFields({
             className={`w-8 h-8 ${
               guardians.length >= MAX_GUARDIANS
                 ? 'text-gray-400 cursor-not-allowed'
-                : 'text-green-500 cursor-pointer hover:text-green-700'
+                : 'text-primary cursor-pointer hover:text-secondary'
             } transition-colors border-2 ${
               guardians.length >= MAX_GUARDIANS
                 ? 'border-gray-400'
-                : 'border-green-500 hover:border-green-700'
+                : 'border-primary hover:border-secondary'
             } rounded-full p-1`}
             onClick={(e) => {
               if (guardians.length < MAX_GUARDIANS) {

Front-End/src/components/Inscription/SiblingInputFields.js

@@ -103,7 +103,7 @@ export default function SiblingInputFields({
       {siblings.map((item, index) => (
         <div className="p-6" key={index}>
           <div className="flex justify-between items-center mb-4">
-            <h3 className="text-xl font-bold">Frère/Sœur {index + 1}</h3>
+            <h3 className="font-headline text-xl font-bold">Frère/Sœur {index + 1}</h3>
             <Trash2
               className="w-5 h-5 text-red-500 cursor-pointer hover:text-red-700 transition-colors"
               onClick={() => deleteSibling(index)}
@@ -160,7 +160,7 @@ export default function SiblingInputFields({
       {enable && (
         <div className="flex justify-center">
           <Plus
-            className="w-8 h-8 text-green-500 cursor-pointer hover:text-green-700 transition-colors border-2 border-green-500 hover:border-green-700 rounded-full p-1"
+            className="w-8 h-8 text-primary cursor-pointer hover:text-secondary transition-colors border-2 border-primary hover:border-secondary rounded-full p-1"
             onClick={addSibling}
           />
         </div>

Front-End/src/components/Inscription/ValidateSubscription.js

@@ -213,7 +213,7 @@ export default function ValidateSubscription({
         <div className="w-3/4">
           {currentTemplateIndex < allTemplates.length && (
             <div className="bg-white p-6 rounded-lg shadow-sm border border-gray-200">
-              <h3 className="text-lg font-semibold text-gray-800 mb-4">
+              <h3 className="font-headline text-lg font-semibold text-gray-800 mb-4">
                 {allTemplates[currentTemplateIndex].name || 'Document sans nom'}
               </h3>
               <iframe
@@ -241,7 +241,7 @@ export default function ValidateSubscription({
         <div className="w-1/4 flex flex-col flex-1 gap-4 h-full">
           {/* Liste des documents */}
           <div className="flex-1 bg-gray-50 p-4 rounded-lg shadow-sm border border-gray-200 overflow-y-auto">
-            <h3 className="text-lg font-semibold text-gray-800 mb-4">
+            <h3 className="font-headline text-lg font-semibold text-gray-800 mb-4">
               Liste des documents
             </h3>
             <ul className="space-y-2">
@@ -269,7 +269,7 @@ export default function ValidateSubscription({
                       <button
                         type="button"
                         className={`px-2 py-1 rounded-full text-xs font-medium border transition-colors focus:outline-none focus:ring-2 focus:ring-blue-400 flex items-center gap-1
-                          ${docStatuses[index] === 'accepted' ? 'bg-emerald-500 text-white border-emerald-500' : 'bg-white text-emerald-600 border-emerald-300'}`}
+                          ${docStatuses[index] === 'accepted' ? 'bg-primary text-white border-primary' : 'bg-white text-primary border-primary/30'}`}
                         aria-pressed={docStatuses[index] === 'accepted'}
                         onClick={(e) => {
                           e.stopPropagation();
@@ -414,7 +414,7 @@ export default function ValidateSubscription({
                 !allChecked ||
                 (allChecked && allValidated && !formData.associated_class)
                   ? 'bg-gray-300 text-gray-700 cursor-not-allowed'
-                  : 'bg-emerald-500 text-white hover:bg-emerald-600'
+                  : 'bg-primary text-white hover:bg-primary'
               }`}
               disabled={
                 !allChecked ||

Front-End/src/components/Loader.js

@@ -1,7 +1,7 @@
 const Loader = () => {
   return (
     <div className="flex justify-center items-center h-screen">
-      <div className="w-9 h-9 border-4 border-t-4 border-t-emerald-500 border-gray-200 rounded-full animate-spin"></div>
+      <div className="w-9 h-9 border-4 border-t-4 border-t-primary border-gray-200 rounded-full animate-spin"></div>
     </div>
   );
 };

Front-End/src/components/Pagination.js

@@ -48,7 +48,7 @@ const PaginationButton = ({ text, onClick }) => (
 const PaginationNumber = ({ number, active, onClick }) => (
   <button
     className={`w-8 h-8 flex items-center justify-center rounded ${
-      active ? 'bg-emerald-500 text-white' : 'text-gray-600 hover:bg-gray-50'
+      active ? 'bg-primary text-white' : 'text-gray-600 hover:bg-gray-50'
     }`}
     onClick={onClick}
   >

Front-End/src/components/PaymentModeSelector.js

@@ -69,22 +69,24 @@ const PaymentModeSelector = ({
   };
 
   return (
-    <div className="space-y-4">
-      <div className="flex items-center mb-4">
-        <DollarSign className="w-6 h-6 text-emerald-500 mr-2" />
-        <h2 className="text-xl font-semibold">Modes de paiement</h2>
+    <div className="space-y-3">
+      <div className="flex items-center gap-2 mb-3">
+        <DollarSign className="w-5 h-5 text-primary" />
+        <h3 className="font-headline text-base font-semibold text-gray-800">
+          Modes de paiement
+        </h3>
       </div>
-      <div className="grid grid-cols-2 gap-4 mt-4">
+      <div className="grid grid-cols-2 gap-3">
         {paymentModesOptions.map((mode) => (
           <button
             key={mode.id}
             type="button"
             onClick={() => handleModeToggle(mode.id)}
-            className={`p-4 rounded-lg shadow-md text-center text-gray-700 ${
+            className={`py-2 px-3 rounded border text-sm font-label font-medium text-center transition-colors min-h-[44px] ${
               activePaymentModes.includes(mode.id)
-                ? 'bg-emerald-100'
-                : 'bg-stone-50'
-            } hover:bg-emerald-200`}
+                ? 'bg-primary/10 border-primary text-primary'
+                : 'bg-white border-gray-200 text-gray-700 hover:bg-gray-50'
+            }`}
           >
             {mode.name}
           </button>

Front-End/src/components/PaymentPlanSelector.js

@@ -1,10 +1,7 @@
 import React, { useState, useEffect, useMemo } from 'react';
 import { Calendar } from 'lucide-react';
-import Table from '@/components/Table';
-import Popup from '@/components/Popup';
 import logger from '@/utils/logger';
 import { useEstablishment } from '@/context/EstablishmentContext';
-import CheckBox from '@/components/Form/CheckBox';
 
 const paymentPlansOptions = [
   { id: 1, name: '1 fois', frequency: 1 },
@@ -13,19 +10,6 @@ const paymentPlansOptions = [
   { id: 4, name: '12 fois', frequency: 12 },
 ];
 
-/**
- * Affiche les plans de paiement communs aux deux types de frais.
- * Quand `allPaymentPlans` est fourni (mode unifié), un plan coché est créé pour
- * les deux types (inscription 0 ET scolarité 1) en même temps.
- *
- * Props (mode unifié) :
- *   allPaymentPlans  : [{plan_type, type, ...}, ...] - liste combinée des deux types
- *   handleCreate     : (data) => Promise  - avec type et establishment déjà présent dans data
- *   handleDelete     : (id) => Promise
- *
- * Props (mode legacy) :
- *   paymentPlans, handleCreate, handleDelete, type
- */
 const PaymentPlanSelector = ({
   paymentPlans,
   allPaymentPlans,
@@ -33,8 +17,6 @@ const PaymentPlanSelector = ({
   handleDelete,
   type,
 }) => {
-  const [popupVisible, setPopupVisible] = useState(false);
-  const [popupMessage, setPopupMessage] = useState('');
   const { selectedEstablishmentId } = useEstablishment();
   const [checkedPlans, setCheckedPlans] = useState([]);
 
@@ -49,12 +31,10 @@ const PaymentPlanSelector = ({
   );
   const unified = !!allPaymentPlans;
 
-  // Un plan est coché si au moins un enregistrement existe pour cette option
   const isChecked = (planOption) => checkedPlans.includes(planOption.id);
 
   const handlePlanToggle = (planOption) => {
     if (isChecked(planOption)) {
-      // Supprimer tous les enregistrements correspondant à cette option (les deux types en mode unifié)
       const toDelete = plans.filter(
         (p) =>
           (typeof p.plan_type === 'object' ? p.plan_type.id : p.plan_type) ===
@@ -67,7 +47,6 @@ const PaymentPlanSelector = ({
     } else {
       setCheckedPlans((prev) => [...prev, planOption.id]);
       if (unified) {
-        // Créer pour inscription (0) et scolarité (1)
         [0, 1].forEach((t) =>
           handleCreate({
             plan_type: planOption.id,
@@ -97,50 +76,29 @@ const PaymentPlanSelector = ({
   }, [plans]);
 
   return (
-    <div className="space-y-4">
-      <div className="flex items-center mb-4">
-        <Calendar className="w-6 h-6 text-emerald-500 mr-2" />
-        <h2 className="text-xl font-semibold">Paiement en plusieurs fois</h2>
+    <div className="space-y-3">
+      <div className="flex items-center gap-2 mb-3">
+        <Calendar className="w-5 h-5 text-primary" />
+        <h3 className="font-headline text-base font-semibold text-gray-800">
+          Paiement en plusieurs fois
+        </h3>
       </div>
-      <div className="grid grid-cols-2 gap-4">
-        <Table
-          data={paymentPlansOptions}
-          columns={[
-            { name: 'OPTION', label: 'Option' },
-            { name: 'ACTIF', label: 'Actif' },
-          ]}
-          renderCell={(row, column) => {
-            switch (column) {
-              case 'OPTION':
-                return (
-                  <span className="text-sm font-medium text-gray-900">
-                    {row.name}
-                  </span>
-                );
-              case 'ACTIF':
-                return (
-                  <CheckBox
-                    item={{ id: row.id }}
-                    formData={{ checked: isChecked(row) }}
-                    handleChange={() => handlePlanToggle(row)}
-                    fieldName="checked"
-                    itemLabelFunc={() => ''}
-                    horizontal={true}
-                  />
-                );
-              default:
-                return null;
-            }
-          }}
-        />
+      <div className="grid grid-cols-2 gap-3">
+        {paymentPlansOptions.map((option) => (
+          <button
+            key={option.id}
+            type="button"
+            onClick={() => handlePlanToggle(option)}
+            className={`py-2 px-3 rounded border text-sm font-label font-medium text-center transition-colors min-h-[44px] ${
+              isChecked(option)
+                ? 'bg-primary/10 border-primary text-primary'
+                : 'bg-white border-gray-200 text-gray-700 hover:bg-gray-50'
+            }`}
+          >
+            {option.name}
+          </button>
+        ))}
       </div>
-      <Popup
-        isOpen={popupVisible}
-        message={popupMessage}
-        onConfirm={() => setPopupVisible(false)}
-        onCancel={() => setPopupVisible(false)}
-        uniqueConfirmButton={true}
-      />
     </div>
   );
 };

Front-End/src/components/Popup.js

@@ -53,10 +53,10 @@ const Popup = ({
             </button>
           )}
           <button
-            className="px-4 py-2 bg-emerald-500 text-white rounded-lg hover:bg-emerald-600 focus:outline-none transition"
+            className="px-4 py-2 bg-primary text-white rounded-lg hover:bg-primary focus:outline-none transition"
             onClick={() => {
-              if (setIsOpen) setIsOpen(false);
-              else if (onConfirm) onConfirm();
+              if (onConfirm) onConfirm();
+              else if (setIsOpen) setIsOpen(false);
             }}
           >
             {uniqueConfirmButton ? 'Fermer' : 'Confirmer'}

Front-End/src/components/ProfileSelector.js

@@ -152,13 +152,13 @@ const ProfileSelector = ({ onRoleChange, className = '', compact = false }) => {
           {user?.email}
         </div>
         <div
-          className="font-semibold text-base text-emerald-700 text-left truncate max-w-full"
+          className="font-semibold text-base text-secondary text-left truncate max-w-full"
           title={selectedEstablishment?.name || ''}
         >
           {selectedEstablishment?.name || ''}
         </div>
         <div
-          className="italic text-sm text-emerald-600 text-left truncate max-w-full"
+          className="italic text-sm text-primary text-left truncate max-w-full"
           title={getRightStr(selectedEstablishment?.role_type) || ''}
         >
           {getRightStr(selectedEstablishment?.role_type) || ''}

Front-End/src/components/ProgressStep.js

@@ -10,9 +10,9 @@ const Step = ({ number, title, isActive, isValid, isCompleted, onClick }) => {
                 text-sm font-semibold
                 ${
                   isCompleted
-                    ? 'bg-emerald-600 text-white'
+                    ? 'bg-primary text-white'
                     : isActive
-                      ? 'bg-emerald-600 text-white'
+                      ? 'bg-primary text-white'
                       : 'bg-gray-200 text-gray-600'
                 }
             `}
@@ -38,7 +38,7 @@ const Step = ({ number, title, isActive, isValid, isCompleted, onClick }) => {
         <span
           className={`
                     text-xs font-medium w-20 text-center block break-words
-                    ${isActive ? 'text-emerald-600' : 'text-gray-500'}
+                    ${isActive ? 'text-primary' : 'text-gray-500'}
                 `}
         >
           {title}
@@ -51,7 +51,7 @@ const Step = ({ number, title, isActive, isValid, isCompleted, onClick }) => {
 const SpacerStep = ({ isCompleted }) => {
   return (
     <div
-      className={`flex-1 h-0.5 ${isCompleted ? 'bg-emerald-600' : 'bg-gray-200'}`}
+      className={`flex-1 h-0.5 ${isCompleted ? 'bg-primary' : 'bg-gray-200'}`}
     />
   );
 };