Skip to content

Commit 4d0ed06

Browse files
committed
des changements pour faire fonctionner le group wishlist, ajouter des idées
1 parent 66cc350 commit 4d0ed06

File tree

3 files changed

+24
-29
lines changed

3 files changed

+24
-29
lines changed

frontend/src/components/groups/Wishlist.tsx

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,18 @@ export default function Wishlist({ groupId, beneficiaryItems, groupItems, onAddI
9797
colour="orange"
9898
title="Wishlist du groupe"
9999
classNameTitle="text-[1.125rem]"
100-
button={<Button text="Proposer une idée" icon="plus" colour="green" onClick={() => {
101-
setEditingGift(null);
102-
setFormData({ name: "", description: "", imageUrl: "", url: "" });
103-
setIsModalOpen(true);
104-
}} />}
100+
button={
101+
<Button
102+
text="Proposer une idée"
103+
icon="plus"
104+
colour="green"
105+
onClick={() => {
106+
setEditingGift(null);
107+
setFormData({ name: "", description: "", imageUrl: "", url: "" });
108+
setIsModalOpen(true);
109+
}}
110+
/>
111+
}
105112
>
106113
{/* Beneficiary wishlist */}
107114
<section className="mb-6">
@@ -183,7 +190,6 @@ export default function Wishlist({ groupId, beneficiaryItems, groupItems, onAddI
183190
className="px-2 py-1 rounded-md bg-[#A74228] text-white text-sm shadow cursor-pointer"
184191
disabled={deleting}
185192
/>
186-
187193
</>
188194
) : null
189195
}

frontend/src/components/utils/Card.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ export default function Card({
7373
src={isExternalImage ? img : `/images/${img}.jpg`}
7474
alt={title}
7575
className={`h-12 w-12 ${square ? "rounded-xl" : "rounded-full"} object-cover mr-4`}
76-
onError={(e) => {
77-
(e.currentTarget as HTMLImageElement).src = "/images/papier-theme.jpg";
78-
}}
76+
onError={(e) => {
77+
(e.currentTarget as HTMLImageElement).src = "/images/papier-theme.jpg";
78+
}}
7979
/>
8080

8181
{nbNewMessages && nbNewMessages > 0 ? (

frontend/src/pages/Conversations.tsx

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ export default function Conversations() {
4040
const [isCreateGroupModalOpen, setIsCreateGroupModalOpen] = useState(false);
4141
const [isAddFundsModalOpen, setIsAddFundsModalOpen] = useState(false);
4242

43+
4344
const { data: groupData, refetch: refetchGroups } = useGetAllMyGroupsQuery({
4445
fetchPolicy: "no-cache",
4546
nextFetchPolicy: "no-cache",
@@ -363,30 +364,18 @@ export default function Conversations() {
363364
)}
364365

365366
{/* Wishlist View */}
366-
{mobileView === "wishlist" && indexGroups !== -1 && (
367+
{mobileView === "wishlist" && indexGroups !== -1 && groups[indexGroups] && (
367368
<div className="mobile-subview-content mobile-wishlist-bg">
368-
{/* Idées du bénéficiaire */}
369-
<div className="mobile-wishlist-section">
370-
<h3 className="mobile-wishlist-section-title">Idées du bénéficiaire</h3>
371-
<p className="mobile-wishlist-section-empty">Aucune idée ajoutée par le bénéficiaire.</p>
372-
</div>
373-
374-
{/* Idées du groupe */}
375-
<div className="mobile-wishlist-section">
376-
<h3 className="mobile-wishlist-section-title">Idées proposées par le groupe</h3>
377-
<p className="mobile-wishlist-section-empty">Aucune idée proposée pour le moment.</p>
378-
</div>
379-
380-
{/* Button */}
381-
<div className="mobile-subview-button-container">
382-
<button type="button" className="mobile-subview-button">
383-
<LuCirclePlus className="text-xl" />
384-
Proposer une idée
385-
</button>
386-
</div>
369+
<Wishlist
370+
groupId={Number(groups[indexGroups].id)}
371+
beneficiaryItems={beneficiaryItems}
372+
groupItems={groupItems}
373+
onAddIdea={() => refetchWishlist()}
374+
/>
387375
</div>
388376
)}
389377

378+
390379
{/* Cagnotte View */}
391380
{mobileView === "cagnotte" && indexGroups !== -1 && groups[indexGroups] && (
392381
<div className="mobile-subview-content mobile-cagnotte-bg">

0 commit comments

Comments
 (0)