diff --git a/components/houses/HouseCard.tsx b/components/houses/HouseCard.tsx index 48d8cb3..5767d62 100644 --- a/components/houses/HouseCard.tsx +++ b/components/houses/HouseCard.tsx @@ -72,7 +72,7 @@ export default function HouseCard({ house, onRequestSent }: HouseCardProps) {
-

+

{house.name}

{house.description && ( diff --git a/components/houses/HouseManagement.tsx b/components/houses/HouseManagement.tsx index b0dd03a..ae75afb 100644 --- a/components/houses/HouseManagement.tsx +++ b/components/houses/HouseManagement.tsx @@ -4,7 +4,6 @@ import { useState, useEffect, useTransition } from "react"; import { useSession } from "next-auth/react"; import Card from "@/components/ui/Card"; import Button from "@/components/ui/Button"; -import SectionTitle from "@/components/ui/SectionTitle"; import HouseForm from "./HouseForm"; import RequestList from "./RequestList"; import Alert from "@/components/ui/Alert"; @@ -164,7 +163,9 @@ export default function HouseManagement({ if (!house) { return ( - Ma Maison +

+ Ma Maison +

Vous n'êtes membre d'aucune maison pour le moment.

@@ -174,10 +175,25 @@ export default function HouseManagement({ return (
- +
- {house.name} +

+ {house.name} +

{house.description && (

{house.description} @@ -224,38 +240,83 @@ export default function HouseManagement({ /> ) : (

-

+

Membres ({house.memberships?.length ?? 0}) -

+
- {(house.memberships || []).map((membership) => ( -
-
- {membership.user.avatar && ( - {membership.user.username} - )} -
- - {membership.user.username} - - - ({membership.user.score} pts - Niveau {membership.user.level}) - + {(house.memberships || []).map((membership) => { + const isCurrentUser = membership.user.id === session?.user?.id; + const roleColor = + membership.role === "OWNER" ? "var(--accent)" : + membership.role === "ADMIN" ? "var(--primary)" : + "var(--muted-foreground)"; + + return ( +
+
+ {membership.user.avatar && ( + {membership.user.username} + )} +
+ + {membership.user.username} + {isCurrentUser && " (Vous)"} + + + + {membership.user.score} pts + + {" • "} + + Niveau {membership.user.level} + + +
+ + {membership.role === "OWNER" && "👑 "} + {membership.role} +
- - {membership.role} - -
- ))} + ); + })}
{isAdmin && ( @@ -317,7 +378,16 @@ export default function HouseManagement({ {isAdmin && pendingRequests.length > 0 && ( - Demandes d'adhésion +

+ Demandes d'adhésion +

)} diff --git a/components/houses/HousesSection.tsx b/components/houses/HousesSection.tsx index 2c96a86..8a0363e 100644 --- a/components/houses/HousesSection.tsx +++ b/components/houses/HousesSection.tsx @@ -165,13 +165,17 @@ export default function HousesSection({ <> {invitations.length > 0 && ( - Mes Invitations +

+ Mes Invitations +

)} - Ma Maison +

+ Ma Maison +

{myHouse ? ( - Toutes les Maisons +

+ Toutes les Maisons +