From 2273b816f10f9b1472f3f439ba193a18d405ee07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Poncin?= <remiponcin55@gmail.com>
Date: Wed, 24 Jun 2026 17:55:15 +0200
Subject: [PATCH 1/4] refactor:challenge creation & invalidation

---
 .../AdminChallenge/adminChalengeList.tsx      |  21 +-
 .../AdminChallenge/adminChallengeEditor.tsx   |  12 +-
 .../adminChallengeValidatedList.tsx           | 242 +++++++++++++++---
 3 files changed, 230 insertions(+), 45 deletions(-)

diff --git a/frontend/src/components/Admin/AdminChallenge/adminChalengeList.tsx b/frontend/src/components/Admin/AdminChallenge/adminChalengeList.tsx
index 2b1661d..27fe698 100644
--- a/frontend/src/components/Admin/AdminChallenge/adminChalengeList.tsx
+++ b/frontend/src/components/Admin/AdminChallenge/adminChalengeList.tsx
@@ -1,6 +1,6 @@
 import { CheckCircle2, Edit, Search, Trash2 } from "lucide-react";
 import { useMemo, useState } from "react";
-import Select, { type SingleValue } from "react-select";
+import Select from "react-select";
 import Swal from "sweetalert2";
 
 import { type Challenge } from "../../../interfaces/challenge.interface";
@@ -62,6 +62,11 @@ const AdminChallengeList = ({ challenges, refreshChallenges, onEdit, teams, fact
         }
     };
 
+    const handleValidationCLick = async (c: Challenge) => {
+        setShowValidationFormForId(c.id);
+        setValidationType(c.category.toLowerCase() as ValidationTarget);
+    }
+
     const handleValidate = async () => {
         if (!showValidationFormForId || !validationType || !selectedTargetId) return;
 
@@ -145,7 +150,7 @@ const AdminChallengeList = ({ challenges, refreshChallenges, onEdit, teams, fact
                                             <Trash2 className="w-4 h-4" /> Supprimer
                                         </Button>
                                         <Button
-                                            onClick={() => setShowValidationFormForId(c.id)}
+                                            onClick={() => {handleValidationCLick(c)}}
                                             className="bg-blue-600 hover:bg-blue-700 text-white flex items-center gap-2"
                                         >
                                             <CheckCircle2 className="w-4 h-4" /> Valider
@@ -157,18 +162,6 @@ const AdminChallengeList = ({ challenges, refreshChallenges, onEdit, teams, fact
                                             <CardContent className="p-4 space-y-4">
                                                 <h4 className="font-bold text-lg">✅ Valider le challenge</h4>
 
-                                                <Select
-                                                    placeholder="Choisir le type de cible"
-                                                    onChange={(option: SingleValue<{ value: ValidationTarget; label: string }>) => {
-                                                        setValidationType(option?.value ?? null);
-                                                        setSelectedTargetId(null);
-                                                    }}
-                                                    options={[
-                                                        { value: "user", label: "Utilisateur" },
-                                                        { value: "team", label: "Équipe" },
-                                                        { value: "faction", label: "Faction" },
-                                                    ]}
-                                                />
 
                                                 {validationType === "user" && (
                                                     <Select
diff --git a/frontend/src/components/Admin/AdminChallenge/adminChallengeEditor.tsx b/frontend/src/components/Admin/AdminChallenge/adminChallengeEditor.tsx
index 0e72df2..73dd80b 100644
--- a/frontend/src/components/Admin/AdminChallenge/adminChallengeEditor.tsx
+++ b/frontend/src/components/Admin/AdminChallenge/adminChallengeEditor.tsx
@@ -42,9 +42,19 @@ const ChallengeEditor = ({ editingChallenge, setEditingChallenge, refreshChallen
         setEditingChallenge(null);
     };
 
+    const resetFormPostCreation = () => {
+        setForm({ title: "", description: "", category: form.category, points: 0 });
+        setEditingChallenge(null);
+    };
+
+
     const handleSubmit = async () => {
         setLoading(true);
         try {
+            if (!form.title || !form.description || !form.category) {
+                Swal.fire({ icon: "error", title: "Tous les champs doivent être remplis" });
+                return;
+            } 
             if (editingChallenge) {
                 await updateChallenge({ id: editingChallenge.id, ...form });
                 Swal.fire({ icon: "success", title: "Challenge mis à jour !" });
@@ -53,7 +63,7 @@ const ChallengeEditor = ({ editingChallenge, setEditingChallenge, refreshChallen
                 Swal.fire({ icon: "success", title: "Challenge créé !" });
             }
             refreshChallenges();
-            resetForm();
+            resetFormPostCreation();
         } catch {
             Swal.fire({ icon: "error", title: "Erreur lors de l'enregistrement" });
         } finally {
diff --git a/frontend/src/components/Admin/AdminChallenge/adminChallengeValidatedList.tsx b/frontend/src/components/Admin/AdminChallenge/adminChallengeValidatedList.tsx
index ecc732e..c49e727 100644
--- a/frontend/src/components/Admin/AdminChallenge/adminChallengeValidatedList.tsx
+++ b/frontend/src/components/Admin/AdminChallenge/adminChallengeValidatedList.tsx
@@ -1,5 +1,6 @@
 import { Search } from "lucide-react";
 import { useMemo, useState } from "react";
+import  Select  from "react-select";
 import Swal from "sweetalert2";
 
 import { type ValidatedChallenge } from "../../../interfaces/challenge.interface";
@@ -8,6 +9,8 @@ import { Button } from "../../ui/button";
 import { Card, CardContent, CardHeader, CardTitle } from "../../ui/card";
 import { Input } from "../../ui/input";
 
+
+
 interface Props {
     validatedChallenges: ValidatedChallenge[];
     fetchValidatedChallenges: () => void | Promise<void>;
@@ -18,6 +21,8 @@ export const AdminValidatedChallengesList = ({
     fetchValidatedChallenges,
 }: Props) => {
     const [search, setSearch] = useState("");
+    const [showUnvalidationFormForId, setShowUnvalidationFormForId] = useState<number | null>(null);
+    const [selectedUnvalidationTargetIds, setSelectedUnvalidationTargetIds] = useState<number[]>([]);
 
     const filtered = useMemo(() => {
         const q = search.toLowerCase();
@@ -37,11 +42,64 @@ export const AdminValidatedChallengesList = ({
         );
     }, [validatedChallenges, search]);
 
+    const groupedValidatedChallenges = useMemo(() => {
+        const groups = new Map<
+            number,
+            {
+                challenge_id: number;
+                challenge_name: string;
+                challenge_categorie: string;
+                challenge_description: string;
+                points: number;
+                validated_at: string;
+                recipients: Array<{ id: number; label: string }>;
+            }
+        >();
+
+        filtered.forEach((c) => {
+            const category = c.challenge_categorie?.toLowerCase();
+            const recipientId =
+                category === "user"
+                    ? c.target_user_id
+                    : category === "team"
+                    ? c.target_team_id
+                    : category === "faction"
+                    ? c.target_faction_id
+                    : null;
+            const recipientLabel =
+                category === "user"
+                    ? `${c.target_user_firstname ?? ""} ${c.target_user_lastname ?? ""}`.trim()
+                    : category === "team"
+                    ? c.target_team_name
+                    : category === "faction"
+                    ? c.target_faction_name
+                    : null;
+
+            if (!groups.has(c.challenge_id)) {
+                groups.set(c.challenge_id, {
+                    challenge_id: c.challenge_id,
+                    challenge_name: c.challenge_name,
+                    challenge_categorie: c.challenge_categorie,
+                    challenge_description: c.challenge_description,
+                    points: c.points,
+                    validated_at: c.validated_at,
+                    recipients: [],
+                });
+            }
+
+            const group = groups.get(c.challenge_id);
+            if (group && recipientId != null && recipientLabel) {
+                const alreadyAdded = group.recipients.some((r) => r.id === recipientId);
+                if (!alreadyAdded) {
+                    group.recipients.push({ id: recipientId, label: recipientLabel });
+                }
+            }
+        });
+
+        return Array.from(groups.values());
+    }, [filtered]);
+
     const handleUnvalidate = async (
-        challengeId: number,
-        factionId: number | null,
-        teamId: number | null,
-        userId: number | null
     ) => {
         const confirm = await Swal.fire({
             title: "Confirmer la dévalidation ?",
@@ -54,19 +112,96 @@ export const AdminValidatedChallengesList = ({
             cancelButtonText: "Annuler",
         });
         if (!confirm.isConfirmed) return;
+        for (const targetId of selectedUnvalidationTargetIds) {
+            console.log("Dévalidation du challenge pour l'ID cible :", targetId);
+            console.log(validatedChallenges);
+            const challengeToUnvalidate = validatedChallenges.find(
+                (c) => c.challenge_id === showUnvalidationFormForId
+            );
+            console.log("Challenge à dévalider :", challengeToUnvalidate);
+            if (!challengeToUnvalidate) {
+                Swal.fire({ icon: "error", title: "Erreur", text: "Challenge non trouvé." });
+                return;
+            }
+            try {
+                const res = await unvalidateChallenge({
+                    challengeId: showUnvalidationFormForId as number,
+                    factionId: challengeToUnvalidate.target_faction_id ?? 0,
+                    teamId: challengeToUnvalidate.target_team_id ?? 0,
+                    userId: challengeToUnvalidate.target_user_id ?? 0,
+                });
+                console.log("Réponse de la dévalidation :", res);
+                validatedChallenges = validatedChallenges.filter(
+                    (c) =>
+                        c.challenge_id === showUnvalidationFormForId &&
+                        c.target_user_id !== targetId &&
+                        c.target_team_id !== targetId &&
+                        c.target_faction_id !== targetId
+                );
+            } catch {
+                Swal.fire({ icon: "error", title: "Erreur", text: "Impossible de dévalider ce challenge." });
+            }
+        }
 
-        try {
-            const res = await unvalidateChallenge({
-                challengeId,
-                factionId: factionId ?? 0,
-                teamId: teamId ?? 0,
-                userId: userId ?? 0,
-            });
-            Swal.fire({ icon: "success", title: "Dévalidé", text: res.message, timer: 1800, showConfirmButton: false });
-            await fetchValidatedChallenges();
-        } catch {
-            Swal.fire({ icon: "error", title: "Erreur", text: "Impossible de dévalider ce challenge." });
+        Swal.fire({
+            icon: "success",
+            title: "Dévalidé",
+            text: "Les challenges ont été dévalidés.",
+            timer: 1800,
+            showConfirmButton: false,
+        });
+        await fetchValidatedChallenges();
+        setSelectedUnvalidationTargetIds([]);
+        setShowUnvalidationFormForId(null);
+    }
+
+    const handleUnvalidateAll = async () => {
+        const confirm = await Swal.fire({
+            title: "Confirmer la dévalidation ?",
+            text: "Cette action retirera la validation du challenge.",
+            icon: "warning",
+            showCancelButton: true,
+            confirmButtonColor: "#e3342f",
+            cancelButtonColor: "#6b7280",
+            confirmButtonText: "Oui, dévalider",
+            cancelButtonText: "Annuler",
+        });
+
+        if (!confirm.isConfirmed) return;
+
+        const challengesToUnvalidate = validatedChallenges.filter(
+            (c) => c.challenge_id === showUnvalidationFormForId
+        );
+
+        for (const challenge of challengesToUnvalidate) {
+            try {
+                await unvalidateChallenge({
+                    challengeId: showUnvalidationFormForId as number,
+                    factionId: challenge.target_faction_id ?? 0,
+                    teamId: challenge.target_team_id ?? 0,
+                    userId: challenge.target_user_id ?? 0,
+                });
+            } catch {
+                Swal.fire({
+                    icon: "error",
+                    title: "Erreur",
+                    text: "Impossible de dévalider un ou plusieurs challenges.",
+                });
+                return;
+            }
         }
+
+        Swal.fire({
+            icon: "success",
+            title: "Dévalidé",
+            text: "Les challenges ont été dévalidés.",
+            timer: 1800,
+            showConfirmButton: false,
+        });
+
+        await fetchValidatedChallenges();
+        setSelectedUnvalidationTargetIds([]);
+        setShowUnvalidationFormForId(null);
     };
 
     return (
@@ -95,39 +230,86 @@ export const AdminValidatedChallengesList = ({
                         <p className="text-center text-gray-500">Aucun challenge validé trouvé.</p>
                     ) : (
                         <div className="grid gap-6 grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4">
-                            {filtered.map((c) => (
+                            {groupedValidatedChallenges.map((group) => (
                                 <div
-                                    key={c.challenge_id}
+                                    key={group.challenge_id}
                                     className="flex flex-col justify-between space-y-4 p-4 border rounded-xl bg-gray-50 hover:shadow-md transition"
                                 >
                                     <div>
-                                        <h3 className="font-semibold text-lg text-gray-900">{c.challenge_name}</h3>
-                                        <p className="text-gray-600">{c.challenge_categorie}</p>
-                                        <p className="text-gray-500 text-sm">{c.challenge_description}</p>
+                                        <h3 className="font-semibold text-lg text-gray-900">{group.challenge_name}</h3>
+                                        <p className="text-gray-600">{group.challenge_categorie}</p>
+                                        <p className="text-gray-500 text-sm">{group.challenge_description}</p>
                                     </div>
 
                                     <div className="space-y-1">
-                                        <p className="text-gray-700"><strong>Points :</strong> {c.points}</p>
+                                        <p className="text-gray-700"><strong>Points :</strong> {group.points}</p>
                                         <p className="text-gray-500 text-sm">
-                                            <strong>Validé le :</strong> {new Date(c.validated_at).toLocaleDateString()}
+                                            <strong>Validé le :</strong> {new Date(group.validated_at).toLocaleDateString()}
                                         </p>
                                     </div>
 
-                                    <div className="space-y-1">
-                                        <p className="text-gray-800 font-semibold">Destinataire :</p>
-                                        {c.target_faction_name && <p className="text-gray-700">{c.target_faction_name}</p>}
-                                        {c.target_team_name && <p className="text-gray-700">{c.target_team_name}</p>}
-                                        {(c.target_user_firstname || c.target_user_lastname) && (
-                                            <p className="text-gray-700">{c.target_user_firstname} {c.target_user_lastname}</p>
+                                    <div className="space-y-2">
+                                        <p className="text-gray-800 font-semibold">Destinataires :</p>
+                                        {group.recipients.length > 0 ? (
+                                            <ul className="list-disc list-inside text-gray-700 space-y-1">
+                                                {group.recipients.map((recipient) => (
+                                                    <li key={recipient.id}>{recipient.label}</li>
+                                                ))}
+                                            </ul>
+                                        ) : (
+                                            <p className="text-gray-700">Aucun destinataire connu.</p>
                                         )}
                                     </div>
 
                                     <Button
-                                        onClick={() => handleUnvalidate(c.challenge_id, c.target_faction_id, c.target_team_id, c.target_user_id)}
+                                        onClick={() => setShowUnvalidationFormForId(group.challenge_id)}
                                         className="bg-red-600 hover:bg-red-700 text-white text-sm px-4 py-2 rounded w-full"
                                     >
-                                        ❌ Invalider
+                                        Invalidation
                                     </Button>
+                                    {showUnvalidationFormForId === group.challenge_id && (
+                                        <Card className="mt-6 bg-white border shadow-inner">
+                                            <CardContent className="p-4 space-y-4">
+
+                                                <h4 className="font-bold text-lg">❌ Invalider le challenge</h4>
+
+                                                <Select
+                                                    isMulti
+                                                    placeholder="Sélectionner les validations à retirer"
+                                                    onChange={(options) =>
+                                                        setSelectedUnvalidationTargetIds(options.map((o) => Number(o.value)))
+                                                    }
+                                                    options={group.recipients.map((recipient) => ({
+                                                        value: recipient.id,
+                                                        label: recipient.label,
+                                                    }))}
+                                                />
+
+                                                <div className="flex gap-4">
+                                                    <Button
+                                                        onClick={() => handleUnvalidate()}
+                                                        className="bg-red-600 hover:bg-red-700 text-white"
+                                                    >
+                                                        ❌ Invalider
+                                                    </Button>
+
+                                                    <Button
+                                                        onClick={() => handleUnvalidateAll()}
+                                                        className="bg-orange-600 hover:bg-orange-700 text-white"
+                                                    >
+                                                        🚨 Invalider tous
+                                                    </Button>
+
+                                                    <Button
+                                                        onClick={() => setShowUnvalidationFormForId(null)}
+                                                        className="bg-gray-400 hover:bg-gray-500 text-white"
+                                                    >
+                                                        Annuler
+                                                    </Button>
+                                                </div>
+                                            </CardContent>
+                                        </Card>
+                                    )}
                                 </div>
                             ))}
                         </div>

From 3544a1d394d4870e1a166d765cc2d1b83eebaf12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Poncin?= <remiponcin55@gmail.com>
Date: Wed, 24 Jun 2026 18:49:26 +0200
Subject: [PATCH 2/4] feat: multiselection for validation + prevent validation
 of same target multiple times

---
 backend/src/services/challenge.service.ts     |  26 ++-
 .../AdminChallenge/adminChalengeList.tsx      |  27 +--
 .../adminChallengeAddPointsForm.tsx           |   2 +-
 .../AdminChallenge/adminChallengeEditor.tsx   |   2 +-
 .../adminChallengeValidatedList.tsx           | 166 +++++++++---------
 5 files changed, 122 insertions(+), 101 deletions(-)

diff --git a/backend/src/services/challenge.service.ts b/backend/src/services/challenge.service.ts
index 44d7ece..759d874 100644
--- a/backend/src/services/challenge.service.ts
+++ b/backend/src/services/challenge.service.ts
@@ -82,7 +82,29 @@ export const validateChallenge = async ({
             throw new Error("Type de challenge non valide");
     }
 
-    // 3. Créer l'objet de validation du challenge
+    // 3. Vérifier si ce challenge a déjà été validé pour cette cible
+    const targetColumn =
+        type === "user"
+            ? challengeValidationSchema.target_user_id
+            : type === "team"
+            ? challengeValidationSchema.target_team_id
+            : challengeValidationSchema.target_faction_id;
+
+    const existingValidation = await db
+        .select()
+        .from(challengeValidationSchema)
+        .where(
+            and(
+                eq(challengeValidationSchema.challenge_id, challengeId),
+                eq(targetColumn, targetId)
+            )
+        );
+
+    if (existingValidation.length > 0) {
+        throw new Error("Ce challenge a déjà été validé pour cette cible");
+    }
+
+    // 4. Créer l'objet de validation du challenge
     const newChallengeValidationPoints = {
         challenge_id: challengeId,
         validated_by_admin_id: validatedBy,
@@ -94,7 +116,7 @@ export const validateChallenge = async ({
         target_faction_id: target_faction_id,
     };
 
-    // 4. Insérer la validation du challenge dans la base de données
+    // 5. Insérer la validation du challenge dans la base de données
     const inserted = await db.insert(challengeValidationSchema).values(newChallengeValidationPoints).returning();
 
     return inserted[0];
diff --git a/frontend/src/components/Admin/AdminChallenge/adminChalengeList.tsx b/frontend/src/components/Admin/AdminChallenge/adminChalengeList.tsx
index 27fe698..4395fb1 100644
--- a/frontend/src/components/Admin/AdminChallenge/adminChalengeList.tsx
+++ b/frontend/src/components/Admin/AdminChallenge/adminChalengeList.tsx
@@ -26,7 +26,7 @@ type ValidationTarget = "user" | "team" | "faction";
 const AdminChallengeList = ({ challenges, refreshChallenges, onEdit, teams, factions, users }: Props) => {
     const [showValidationFormForId, setShowValidationFormForId] = useState<number | null>(null);
     const [validationType, setValidationType] = useState<ValidationTarget | null>(null);
-    const [selectedTargetId, setSelectedTargetId] = useState<number | null>(null);
+    const [selectedTargetIds, setSelectedTargetIds] = useState<number[]>([]);
     const [searchTerm, setSearchTerm] = useState("");
 
 
@@ -68,13 +68,14 @@ const AdminChallengeList = ({ challenges, refreshChallenges, onEdit, teams, fact
     }
 
     const handleValidate = async () => {
-        if (!showValidationFormForId || !validationType || !selectedTargetId) return;
-
+        if (!showValidationFormForId || !validationType || selectedTargetIds.length === 0) return;
+        
+        for (const targetId of selectedTargetIds) {
         try {
             const res = await validateChallenge({
                 challengeId: showValidationFormForId,
                 type: validationType,
-                targetId: selectedTargetId,
+                targetId: targetId, 
             });
 
             Swal.fire({
@@ -87,20 +88,21 @@ const AdminChallengeList = ({ challenges, refreshChallenges, onEdit, teams, fact
 
             setShowValidationFormForId(null);
             setValidationType(null);
-            setSelectedTargetId(null);
+            setSelectedTargetIds([]);
             refreshChallenges();
         } catch (err) {
             console.error("Erreur lors de la validation du challenge", err);
             Swal.fire({
                 icon: "error",
                 title: "Erreur ❌",
-                text: "Impossible de valider ce challenge. Réessaie plus tard.",
+                text: "Impossible de valider ce challenge. Réessaie plus tard. (cette erreur peut survenir si le challenge a déjà été validé pour cet utilisateur/équipe/faction)",
             });
         }
+    }
     };
 
     return (
-        <Card className="w-full max-w-3xl mx-auto">
+        <Card className="w-full max-w-7xl mx-auto">
             <CardHeader>
                 <CardTitle className="text-2xl font-semibold text-gray-800 text-center">
                     📜 Challenges
@@ -165,8 +167,9 @@ const AdminChallengeList = ({ challenges, refreshChallenges, onEdit, teams, fact
 
                                                 {validationType === "user" && (
                                                     <Select
+                                                        isMulti
                                                         placeholder="Sélectionner un utilisateur"
-                                                        onChange={(option) => setSelectedTargetId(Number(option?.value))}
+                                                        onChange={(options) => setSelectedTargetIds(options.map((o) => Number(o.value)))}
                                                         options={users.map((u: User) => ({
                                                             value: u.userId,
                                                             label: `${u.firstName} ${u.lastName}`,
@@ -176,8 +179,9 @@ const AdminChallengeList = ({ challenges, refreshChallenges, onEdit, teams, fact
 
                                                 {validationType === "team" && (
                                                     <Select
+                                                        isMulti
                                                         placeholder="Sélectionner une équipe"
-                                                        onChange={(option) => setSelectedTargetId(Number(option?.value))}
+                                                        onChange={(options) => setSelectedTargetIds(options.map((o) => Number(o.value)))}
                                                         options={teams.map((t: Team) => ({
                                                             value: t.teamId,
                                                             label: t.name,
@@ -187,8 +191,9 @@ const AdminChallengeList = ({ challenges, refreshChallenges, onEdit, teams, fact
 
                                                 {validationType === "faction" && (
                                                     <Select
+                                                        isMulti
                                                         placeholder="Sélectionner une faction"
-                                                        onChange={(option) => setSelectedTargetId(Number(option?.value))}
+                                                        onChange={(options) => setSelectedTargetIds(options.map((o) => Number(o.value)))}
                                                         options={factions.map((f: Faction) => ({
                                                             value: f.factionId,
                                                             label: f.name,
@@ -207,7 +212,7 @@ const AdminChallengeList = ({ challenges, refreshChallenges, onEdit, teams, fact
                                                         onClick={() => {
                                                             setShowValidationFormForId(null);
                                                             setValidationType(null);
-                                                            setSelectedTargetId(null);
+                                                            setSelectedTargetIds([]);
                                                         }}
                                                         className="bg-gray-400 hover:bg-gray-500 text-white"
                                                     >
diff --git a/frontend/src/components/Admin/AdminChallenge/adminChallengeAddPointsForm.tsx b/frontend/src/components/Admin/AdminChallenge/adminChallengeAddPointsForm.tsx
index 1fa1e03..6a27268 100644
--- a/frontend/src/components/Admin/AdminChallenge/adminChallengeAddPointsForm.tsx
+++ b/frontend/src/components/Admin/AdminChallenge/adminChallengeAddPointsForm.tsx
@@ -67,7 +67,7 @@ export const AdminChallengeAddPointsForm = () => {
 
     return (
         <div>
-            <Card className="w-full max-w-3xl mx-auto">
+            <Card className="w-full max-w-7xl mx-auto">
                 <CardHeader>
                     <CardTitle className="text-2xl font-semibold text-gray-800 text-center">
                         🎯 Ajouter des points à une faction
diff --git a/frontend/src/components/Admin/AdminChallenge/adminChallengeEditor.tsx b/frontend/src/components/Admin/AdminChallenge/adminChallengeEditor.tsx
index 73dd80b..b1d5a84 100644
--- a/frontend/src/components/Admin/AdminChallenge/adminChallengeEditor.tsx
+++ b/frontend/src/components/Admin/AdminChallenge/adminChallengeEditor.tsx
@@ -72,7 +72,7 @@ const ChallengeEditor = ({ editingChallenge, setEditingChallenge, refreshChallen
     };
 
     return (
-        <Card className="w-full max-w-3xl mx-auto">
+        <Card className="w-full max-w-7xl mx-auto">
             <CardHeader>
                 <CardTitle className="text-2xl font-semibold text-gray-800 text-center">
                     {editingChallenge ? "✏️ Modifier Challenge" : "🛠️ Créer Challenge"}
diff --git a/frontend/src/components/Admin/AdminChallenge/adminChallengeValidatedList.tsx b/frontend/src/components/Admin/AdminChallenge/adminChallengeValidatedList.tsx
index c49e727..7420b64 100644
--- a/frontend/src/components/Admin/AdminChallenge/adminChallengeValidatedList.tsx
+++ b/frontend/src/components/Admin/AdminChallenge/adminChallengeValidatedList.tsx
@@ -1,6 +1,6 @@
-import { Search } from "lucide-react";
+import { Search, Trash2, X } from "lucide-react";
 import { useMemo, useState } from "react";
-import  Select  from "react-select";
+import Select from "react-select";
 import Swal from "sweetalert2";
 
 import { type ValidatedChallenge } from "../../../interfaces/challenge.interface";
@@ -205,7 +205,7 @@ export const AdminValidatedChallengesList = ({
     };
 
     return (
-        <div className="w-full max-w-3xl mx-auto">
+        <div className="w-full max-w-7xl mx-auto">
             <Card>
                 <CardHeader>
                     <CardTitle className="text-2xl font-semibold text-gray-800 text-center">
@@ -226,94 +226,88 @@ export const AdminValidatedChallengesList = ({
                     </div>
 
                     {/* Grille */}
-                    {filtered.length === 0 ? (
-                        <p className="text-center text-gray-500">Aucun challenge validé trouvé.</p>
-                    ) : (
-                        <div className="grid gap-6 grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4">
-                            {groupedValidatedChallenges.map((group) => (
-                                <div
-                                    key={group.challenge_id}
-                                    className="flex flex-col justify-between space-y-4 p-4 border rounded-xl bg-gray-50 hover:shadow-md transition"
-                                >
-                                    <div>
-                                        <h3 className="font-semibold text-lg text-gray-900">{group.challenge_name}</h3>
-                                        <p className="text-gray-600">{group.challenge_categorie}</p>
-                                        <p className="text-gray-500 text-sm">{group.challenge_description}</p>
-                                    </div>
+                    <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
+                        {filtered.length > 0 ? (
+                            groupedValidatedChallenges.map((group) => (
+                                <Card key={group.challenge_id} className="bg-gray-100 border shadow flex flex-col justify-between">
+                                    <CardContent className="p-4">
+                                        <div>
+                                            <h4 className="font-bold text-lg">{group.challenge_name}</h4>
+                                            <p className="text-gray-700">{group.challenge_description}</p>
+                                            <p className="text-sm text-gray-500 mt-1">Catégorie : {group.challenge_categorie}</p>
+                                            <p className="text-sm text-gray-500">Points : {group.points}</p>
+                                            <p className="text-sm text-gray-500">Validé le : {new Date(group.validated_at).toLocaleDateString()}</p>
+                                        </div>
 
-                                    <div className="space-y-1">
-                                        <p className="text-gray-700"><strong>Points :</strong> {group.points}</p>
-                                        <p className="text-gray-500 text-sm">
-                                            <strong>Validé le :</strong> {new Date(group.validated_at).toLocaleDateString()}
-                                        </p>
-                                    </div>
+                                        <div className="space-y-2 mt-4">
+                                            <p className="text-gray-800 font-semibold">Destinataires :</p>
+                                            {group.recipients.length > 0 ? (
+                                                <ul className="list-disc list-inside text-gray-700 space-y-1">
+                                                    {group.recipients.map((recipient) => (
+                                                        <li key={recipient.id}>{recipient.label}</li>
+                                                    ))}
+                                                </ul>
+                                            ) : (
+                                                <p className="text-gray-700">Aucun destinataire connu.</p>
+                                            )}
+                                        </div>
 
-                                    <div className="space-y-2">
-                                        <p className="text-gray-800 font-semibold">Destinataires :</p>
-                                        {group.recipients.length > 0 ? (
-                                            <ul className="list-disc list-inside text-gray-700 space-y-1">
-                                                {group.recipients.map((recipient) => (
-                                                    <li key={recipient.id}>{recipient.label}</li>
-                                                ))}
-                                            </ul>
-                                        ) : (
-                                            <p className="text-gray-700">Aucun destinataire connu.</p>
-                                        )}
-                                    </div>
-
-                                    <Button
-                                        onClick={() => setShowUnvalidationFormForId(group.challenge_id)}
-                                        className="bg-red-600 hover:bg-red-700 text-white text-sm px-4 py-2 rounded w-full"
-                                    >
-                                        Invalidation
-                                    </Button>
-                                    {showUnvalidationFormForId === group.challenge_id && (
-                                        <Card className="mt-6 bg-white border shadow-inner">
-                                            <CardContent className="p-4 space-y-4">
-
-                                                <h4 className="font-bold text-lg">❌ Invalider le challenge</h4>
+                                        <div className="flex flex-wrap gap-2 mt-4">
+                                            <Button
+                                                onClick={() => setShowUnvalidationFormForId(group.challenge_id)}
+                                                className="bg-red-600 hover:bg-red-700 text-white flex items-center gap-2"
+                                            >
+                                                <Trash2 className="w-4 h-4" /> Invalider
+                                            </Button>
+                                        </div>
 
-                                                <Select
-                                                    isMulti
-                                                    placeholder="Sélectionner les validations à retirer"
-                                                    onChange={(options) =>
-                                                        setSelectedUnvalidationTargetIds(options.map((o) => Number(o.value)))
-                                                    }
-                                                    options={group.recipients.map((recipient) => ({
-                                                        value: recipient.id,
-                                                        label: recipient.label,
-                                                    }))}
-                                                />
+                                        {showUnvalidationFormForId === group.challenge_id && (
+                                            <Card className="mt-6 bg-white border shadow-inner">
+                                                <CardContent className="p-4 space-y-4">
+                                                    <h4 className="font-bold text-lg">❌ Invalider le challenge</h4>
 
-                                                <div className="flex gap-4">
-                                                    <Button
-                                                        onClick={() => handleUnvalidate()}
-                                                        className="bg-red-600 hover:bg-red-700 text-white"
-                                                    >
-                                                        ❌ Invalider
-                                                    </Button>
+                                                    <Select
+                                                        isMulti
+                                                        placeholder="Sélectionner les validations à retirer"
+                                                        onChange={(options) =>
+                                                            setSelectedUnvalidationTargetIds(options.map((o) => Number(o.value)))
+                                                        }
+                                                        options={group.recipients.map((recipient) => ({
+                                                            value: recipient.id,
+                                                            label: recipient.label,
+                                                        }))}
+                                                    />
 
-                                                    <Button
-                                                        onClick={() => handleUnvalidateAll()}
-                                                        className="bg-orange-600 hover:bg-orange-700 text-white"
-                                                    >
-                                                        🚨 Invalider tous
-                                                    </Button>
-
-                                                    <Button
-                                                        onClick={() => setShowUnvalidationFormForId(null)}
-                                                        className="bg-gray-400 hover:bg-gray-500 text-white"
-                                                    >
-                                                        Annuler
-                                                    </Button>
-                                                </div>
-                                            </CardContent>
-                                        </Card>
-                                    )}
-                                </div>
-                            ))}
-                        </div>
-                    )}
+                                                    <div className="flex flex-col gap-2">
+                                                        <Button
+                                                            onClick={() => handleUnvalidate()}
+                                                            className="bg-red-600 hover:bg-red-700 text-white flex items-center gap-2 w-full"
+                                                        >
+                                                            <Trash2 className="w-4 h-4" /> Invalider
+                                                        </Button>
+                                                        <Button
+                                                            onClick={() => handleUnvalidateAll()}
+                                                            className="bg-orange-600 hover:bg-orange-700 text-white w-full"
+                                                        >
+                                                            🚨 Invalider tous
+                                                        </Button>
+                                                        <Button
+                                                            onClick={() => setShowUnvalidationFormForId(null)}
+                                                            className="bg-gray-400 hover:bg-gray-500 text-white flex items-center gap-2 w-full"
+                                                        >
+                                                            <X className="w-4 h-4" /> Annuler
+                                                        </Button>
+                                                    </div>
+                                                </CardContent>
+                                            </Card>
+                                        )}
+                                    </CardContent>
+                                </Card>
+                            ))
+                        ) : (
+                            <p className="text-center text-gray-500 col-span-full">Aucun challenge validé trouvé.</p>
+                        )}
+                    </div>
                 </CardContent>
             </Card>
         </div>

From bf1234df48d059b6706d3810a7d7389ce58431fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Poncin?= <remiponcin55@gmail.com>
Date: Thu, 25 Jun 2026 10:57:35 +0200
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20"d=C3=A9valider=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/controllers/tent.controller.ts    |  4 +--
 backend/src/services/tent.service.ts          |  2 +-
 backend/src/utils/emailtemplates.ts           |  2 +-
 .../adminChallengeValidatedList.tsx           | 26 +++++++++----------
 frontend/src/components/Admin/adminTent.tsx   |  6 ++---
 .../src/services/requests/tent.service.ts     |  2 +-
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/backend/src/controllers/tent.controller.ts b/backend/src/controllers/tent.controller.ts
index 5dd067b..2f87a81 100644
--- a/backend/src/controllers/tent.controller.ts
+++ b/backend/src/controllers/tent.controller.ts
@@ -90,7 +90,7 @@ export const toggleTentConfirmation = async (req: Request, res: Response) => {
             to: [user1.email, user2.email],
             subject: confirmed
                 ? "🎉 Votre tente a été validée !"
-                : "⛺ Votre tente a été dévalidée",
+                : "⛺ Votre tente a été invalidée",
             text: "", // optionnel
             html: htmlEmail,
         };
@@ -101,7 +101,7 @@ export const toggleTentConfirmation = async (req: Request, res: Response) => {
         Ok(res, {
             msg: confirmed
                 ? "Tente validée et email envoyé."
-                : "Tente dévalidée et email envoyé.",
+                : "Tente invalidée et email envoyé.",
         });
     } catch (err: any) {
         console.error(err);
diff --git a/backend/src/services/tent.service.ts b/backend/src/services/tent.service.ts
index ed9b32b..5f02fce 100644
--- a/backend/src/services/tent.service.ts
+++ b/backend/src/services/tent.service.ts
@@ -131,5 +131,5 @@ export const toggleTentConfirmation = async (
             )
         );
 
-    return { success: true, message: confirmed ? "Tente validée." : "Tente dévalidée." };
+    return { success: true, message: confirmed ? "Tente validée." : "Tente invalidée." };
 };
diff --git a/backend/src/utils/emailtemplates.ts b/backend/src/utils/emailtemplates.ts
index 309068e..3d53f57 100644
--- a/backend/src/utils/emailtemplates.ts
+++ b/backend/src/utils/emailtemplates.ts
@@ -341,7 +341,7 @@ export const templateNotifyTentConfirmation = `
       <p style="margin: 10px 0; font-size: 16px;">
         La tente entre <strong>{{user1}}</strong> et <strong>{{user2}}</strong> a été 
         <strong style="color: {{#if confirmed}}green{{else}}red{{/if}};">
-          {{#if confirmed}}validée{{else}}dévalidée{{/if}}
+          {{#if confirmed}}validée{{else}}invalidée{{/if}}
         </strong>.
       </p>
 
diff --git a/frontend/src/components/Admin/AdminChallenge/adminChallengeValidatedList.tsx b/frontend/src/components/Admin/AdminChallenge/adminChallengeValidatedList.tsx
index 7420b64..a136943 100644
--- a/frontend/src/components/Admin/AdminChallenge/adminChallengeValidatedList.tsx
+++ b/frontend/src/components/Admin/AdminChallenge/adminChallengeValidatedList.tsx
@@ -102,23 +102,23 @@ export const AdminValidatedChallengesList = ({
     const handleUnvalidate = async (
     ) => {
         const confirm = await Swal.fire({
-            title: "Confirmer la dévalidation ?",
+            title: "Confirmer la invalidation ?",
             text: "Cette action retirera la validation du challenge.",
             icon: "warning",
             showCancelButton: true,
             confirmButtonColor: "#e3342f",
             cancelButtonColor: "#6b7280",
-            confirmButtonText: "Oui, dévalider",
+            confirmButtonText: "Oui, invalider",
             cancelButtonText: "Annuler",
         });
         if (!confirm.isConfirmed) return;
         for (const targetId of selectedUnvalidationTargetIds) {
-            console.log("Dévalidation du challenge pour l'ID cible :", targetId);
+            console.log("Invalidation du challenge pour l'ID cible :", targetId);
             console.log(validatedChallenges);
             const challengeToUnvalidate = validatedChallenges.find(
                 (c) => c.challenge_id === showUnvalidationFormForId
             );
-            console.log("Challenge à dévalider :", challengeToUnvalidate);
+            console.log("Challenge à invalider :", challengeToUnvalidate);
             if (!challengeToUnvalidate) {
                 Swal.fire({ icon: "error", title: "Erreur", text: "Challenge non trouvé." });
                 return;
@@ -130,7 +130,7 @@ export const AdminValidatedChallengesList = ({
                     teamId: challengeToUnvalidate.target_team_id ?? 0,
                     userId: challengeToUnvalidate.target_user_id ?? 0,
                 });
-                console.log("Réponse de la dévalidation :", res);
+                console.log("Réponse de la invalidation :", res);
                 validatedChallenges = validatedChallenges.filter(
                     (c) =>
                         c.challenge_id === showUnvalidationFormForId &&
@@ -139,14 +139,14 @@ export const AdminValidatedChallengesList = ({
                         c.target_faction_id !== targetId
                 );
             } catch {
-                Swal.fire({ icon: "error", title: "Erreur", text: "Impossible de dévalider ce challenge." });
+                Swal.fire({ icon: "error", title: "Erreur", text: "Impossible de invalider ce challenge." });
             }
         }
 
         Swal.fire({
             icon: "success",
-            title: "Dévalidé",
-            text: "Les challenges ont été dévalidés.",
+            title: "Invalidé",
+            text: "Les challenges ont été invalidés.",
             timer: 1800,
             showConfirmButton: false,
         });
@@ -157,13 +157,13 @@ export const AdminValidatedChallengesList = ({
 
     const handleUnvalidateAll = async () => {
         const confirm = await Swal.fire({
-            title: "Confirmer la dévalidation ?",
+            title: "Confirmer la invalidation ?",
             text: "Cette action retirera la validation du challenge.",
             icon: "warning",
             showCancelButton: true,
             confirmButtonColor: "#e3342f",
             cancelButtonColor: "#6b7280",
-            confirmButtonText: "Oui, dévalider",
+            confirmButtonText: "Oui, invalider",
             cancelButtonText: "Annuler",
         });
 
@@ -185,7 +185,7 @@ export const AdminValidatedChallengesList = ({
                 Swal.fire({
                     icon: "error",
                     title: "Erreur",
-                    text: "Impossible de dévalider un ou plusieurs challenges.",
+                    text: "Impossible de invalider un ou plusieurs challenges.",
                 });
                 return;
             }
@@ -193,8 +193,8 @@ export const AdminValidatedChallengesList = ({
 
         Swal.fire({
             icon: "success",
-            title: "Dévalidé",
-            text: "Les challenges ont été dévalidés.",
+            title: "Invalidé",
+            text: "Les challenges ont été invalidés.",
             timer: 1800,
             showConfirmButton: false,
         });
diff --git a/frontend/src/components/Admin/adminTent.tsx b/frontend/src/components/Admin/adminTent.tsx
index 644492d..df4ecf6 100644
--- a/frontend/src/components/Admin/adminTent.tsx
+++ b/frontend/src/components/Admin/adminTent.tsx
@@ -41,7 +41,7 @@ export const TentAdmin = () => {
     };
 
     const handleToggle = async (pair: TentPair) => {
-        const action = pair.confirmed ? "dévalider" : "valider";
+        const action = pair.confirmed ? "invalider" : "valider";
 
         const confirm = await Swal.fire({
             title: '⚠️ Confirmation requise',
@@ -73,7 +73,7 @@ export const TentAdmin = () => {
 
             Swal.fire(
                 "Succès ✅",
-                `La tente a bien été ${pair.confirmed ? "dévalidée" : "validée"}.`,
+                `La tente a bien été ${pair.confirmed ? "invalidée" : "validée"}.`,
                 "success"
             );
 
@@ -194,7 +194,7 @@ export const TentAdmin = () => {
                                                         : "bg-green-600 hover:bg-green-700 text-white"
                                                 }
                                             >
-                                                {pair.confirmed ? "❌ Dévalider" : "✅ Valider"}
+                                                {pair.confirmed ? "❌ Invalidée" : "✅ Validée"}
                                             </Button>
                                         </td>
                                     </tr>
diff --git a/frontend/src/services/requests/tent.service.ts b/frontend/src/services/requests/tent.service.ts
index 945fe85..83709f8 100644
--- a/frontend/src/services/requests/tent.service.ts
+++ b/frontend/src/services/requests/tent.service.ts
@@ -24,7 +24,7 @@ export const getAllTentPairs = async () => {
     return response.data;
 };
 
-// Valider ou dévalider une tente (admin)
+// Valider ou invalider une tente (admin)
 export const toggleTentConfirmation = async (
     userId1: number,
     userId2: number,

From 19b36d4ef8a64599bf859707a75f6e8444685e31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Poncin?= <remiponcin55@gmail.com>
Date: Wed, 1 Jul 2026 09:17:42 +0200
Subject: [PATCH 4/4] fix: error message

---
 .../AdminChallenge/adminChalengeList.tsx      |  2 +-
 .../services/requests/challenge.service.ts    | 56 ++++++++++++++-----
 2 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/frontend/src/components/Admin/AdminChallenge/adminChalengeList.tsx b/frontend/src/components/Admin/AdminChallenge/adminChalengeList.tsx
index 4395fb1..c3cccf5 100644
--- a/frontend/src/components/Admin/AdminChallenge/adminChalengeList.tsx
+++ b/frontend/src/components/Admin/AdminChallenge/adminChalengeList.tsx
@@ -95,7 +95,7 @@ const AdminChallengeList = ({ challenges, refreshChallenges, onEdit, teams, fact
             Swal.fire({
                 icon: "error",
                 title: "Erreur ❌",
-                text: "Impossible de valider ce challenge. Réessaie plus tard. (cette erreur peut survenir si le challenge a déjà été validé pour cet utilisateur/équipe/faction)",
+                text: err as string,
             });
         }
     }
diff --git a/frontend/src/services/requests/challenge.service.ts b/frontend/src/services/requests/challenge.service.ts
index 5a90014..9bf8a91 100644
--- a/frontend/src/services/requests/challenge.service.ts
+++ b/frontend/src/services/requests/challenge.service.ts
@@ -1,5 +1,27 @@
+import { type AxiosError } from "axios";
+
 import api from "../api";
 
+interface ApiErrorResponse {
+    message?: string;
+    error?: string;
+}
+
+type ApiErrorWithStatus = Error & { status?: number };
+
+const buildApiError = (error: unknown): ApiErrorWithStatus => {
+    const axiosError = error as AxiosError<ApiErrorResponse>;
+    const message =
+        axiosError.response?.data?.message ||
+        axiosError.response?.data?.error ||
+        axiosError.message ||
+        "Une erreur est survenue lors de la requête.";
+
+    const apiError = new Error(message) as ApiErrorWithStatus;
+    apiError.status = axiosError.response?.status;
+    return apiError;
+};
+
 // Récupérer tous les challenges (utilisateur ou admin, en fonction du token)
 export const getAllChallenges = async () => {
     const response = await api.get("challenge/user/challenges");
@@ -44,12 +66,16 @@ export const validateChallenge = async ({
     type: "user" | "team" | "faction";
     targetId: number;
 }) => {
-    const response = await api.post("challenge/admin/validate", {
-        challengeId,
-        type,
-        targetId,
-    });
-    return response.data;
+    try {
+        const response = await api.post("challenge/admin/validate", {
+            challengeId,
+            type,
+            targetId,
+        });
+        return response.data;
+    } catch (error) {
+        throw buildApiError(error);
+    }
 };
 
 export const unvalidateChallenge = async ({
@@ -63,13 +89,17 @@ export const unvalidateChallenge = async ({
     teamId: number;
     userId: number;
 }) => {
-    const response = await api.post("challenge/admin/unvalidate", {
-        challengeId,
-        factionId,
-        teamId,
-        userId
-    });
-    return response.data;
+    try {
+        const response = await api.post("challenge/admin/unvalidate", {
+            challengeId,
+            factionId,
+            teamId,
+            userId
+        });
+        return response.data;
+    } catch (error) {
+        throw buildApiError(error);
+    }
 };
 
 // Supprimer un challenge (ADMIN uniquement)