diff --git a/client/src/components/map/Map.tsx b/client/src/components/map/Map.tsx index 6417662..ec7e24f 100644 --- a/client/src/components/map/Map.tsx +++ b/client/src/components/map/Map.tsx @@ -67,16 +67,19 @@ const Map = ({ return (
+ { currentStep ? () : null } + { flamiPosition ? () : null } + - Étape n°{marker.etape} -

{marker.date}

-

{marker.ville}

+ Étape n°{marker.etape} +

{marker.date}

+

{marker.ville}

{ currentStep && currentStep?.etape_numero === marker.etape_numero ? ( - + })}> + Récupérer le badge + ) : null }
diff --git a/client/src/components/profile/BadgeDisplay.tsx b/client/src/components/profile/BadgeDisplay.tsx index 8df5ecd..6883176 100644 --- a/client/src/components/profile/BadgeDisplay.tsx +++ b/client/src/components/profile/BadgeDisplay.tsx @@ -25,8 +25,8 @@ const BadgeDisplay = ({ badge }: { badge: Badge }) => { alt={`Badge de ${badge.name}`} />
-

{side ? badge.region : badge.name}

-

{side ? badge.description_region : badge.description}

+

{side ? badge.region : badge.name}

+

{side ? badge.description_region : badge.description}

); }; diff --git a/client/src/components/ui/button.tsx b/client/src/components/ui/button.tsx index a7d98a4..a5dafe3 100644 --- a/client/src/components/ui/button.tsx +++ b/client/src/components/ui/button.tsx @@ -2,15 +2,15 @@ import { cva, VariantProps } from "class-variance-authority"; import React from "react"; const baseButton = - "text-center w-full px-8 py-4 font-roboto font-bold uppercase cursor-pointer"; + "text-center px-8 py-4 font-roboto font-bold uppercase cursor-pointer"; const buttonVariants = { primary: - "bg-tree-poppy-500 text-alabaster-950 rounded-xl shadow-primary active:shadow-none active:translate-y-1 hover:brightness-90 disabled:cursor-not-allowed disabled:bg-alabaster-600 disabled:text-alabaster-300 disabled:shadow-none disabled:hover:brightness-100 disabled:active:translate-y-0", + "bg-tree-poppy-500 w-full text-alabaster-950 rounded-xl shadow-primary active:shadow-none active:translate-y-1 hover:brightness-90 disabled:cursor-not-allowed disabled:bg-alabaster-600 disabled:text-alabaster-300 disabled:shadow-none disabled:hover:brightness-100 disabled:active:translate-y-0", secondary: - "bg-alabaster-950 text-alabaster-50 rounded-xl shadow-secondary border-3 border-alabaster-400 active:shadow-none active:translate-y-1 hover:brightness-90 disabled:cursor-not-allowed disabled:bg-alabaster-600 disabled:text-alabaster-300 disabled:shadow-none disabled:hover:brightness-100 disabled:active:translate-y-0 disabled:border-0", + "bg-alabaster-950 w-full text-alabaster-50 rounded-xl shadow-secondary border-3 border-alabaster-400 active:shadow-none active:translate-y-1 hover:brightness-90 disabled:cursor-not-allowed disabled:bg-alabaster-600 disabled:text-alabaster-300 disabled:shadow-none disabled:hover:brightness-100 disabled:active:translate-y-0 disabled:border-0", tertiary: - "text-mandy-500 hover:text-mandy-600 disabled:cursor-not-allowed disabled:text-alabaster-300 disabled:hover:text-alabaster-300", + "text-mandy-500 w-full hover:text-mandy-600 disabled:cursor-not-allowed disabled:text-alabaster-300 disabled:hover:text-alabaster-300", }; const button = cva(baseButton, {