From 56402a374d2e9699437ea4bd34fdf2575bc0997a Mon Sep 17 00:00:00 2001 From: Marco Pedone Date: Wed, 18 Mar 2026 18:01:02 +0100 Subject: [PATCH] feat: refactor button imports and usage across forms and pages for consistency --- .../components/servizio/modale_contatti.tsx | 18 ++++----- .../src/forms/FormChangePassword.tsx | 2 +- apps/infoalloggi/src/forms/FormNewUser.tsx | 17 ++++---- .../src/forms/FormOverridePassword.tsx | 17 ++++---- .../src/forms/FormRstPwFromToken.tsx | 2 +- .../src/pages/auth/accetta-invito/[token].tsx | 2 +- .../src/pages/servizio/pagamento-status.tsx | 40 +++++++++---------- 7 files changed, 42 insertions(+), 56 deletions(-) diff --git a/apps/infoalloggi/src/components/servizio/modale_contatti.tsx b/apps/infoalloggi/src/components/servizio/modale_contatti.tsx index c615971..976ca0f 100644 --- a/apps/infoalloggi/src/components/servizio/modale_contatti.tsx +++ b/apps/infoalloggi/src/components/servizio/modale_contatti.tsx @@ -2,7 +2,6 @@ import { CircleUser, Navigation, Phone, TriangleAlert } from "lucide-react"; import Link from "next/link"; import { useMemo, useState } from "react"; import toast from "react-hot-toast"; -import { cn } from "~/lib/utils"; import { useTranslation } from "~/providers/I18nProvider"; import { useServizio, useServizioAnnuncio } from "~/providers/ServizioProvider"; import type { UsersStorageUserStorageId } from "~/schemas/public/UsersStorage"; @@ -21,7 +20,7 @@ import { } from "../custom_ui/credenza"; import { LoadingPage } from "../loading"; import { WhatsAppIcon2 } from "../svgs"; -import { Button, buttonVariants } from "../ui/button"; +import { Button } from "../ui/button"; export const ContattiProprietarioModal = () => { const { servizio } = useServizio(); @@ -343,15 +342,12 @@ const PostUnlock = () => { {propData.comune} ({propData.provincia})

{navigationUrl && ( - - - {t.contatto.apri_nav} - + + + )} diff --git a/apps/infoalloggi/src/forms/FormChangePassword.tsx b/apps/infoalloggi/src/forms/FormChangePassword.tsx index ec311c8..357b233 100644 --- a/apps/infoalloggi/src/forms/FormChangePassword.tsx +++ b/apps/infoalloggi/src/forms/FormChangePassword.tsx @@ -149,7 +149,7 @@ export const ChangePasswordForm = () => { aria-controls="password" aria-label={isVisible ? "Hide password" : "Show password"} aria-pressed={isVisible} - className="absolute end-0 top-1 flex size-9 items-center justify-center rounded-e-lg text-muted-foreground/80 transition-shadow hover:text-foreground focus-visible:border focus-visible:border-ring focus-visible:text-foreground focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring/30 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50" + className="absolute end-0 top-1 flex size-9 cursor-pointer items-center justify-center rounded-e-lg text-muted-foreground/80 transition-shadow hover:text-foreground focus-visible:border focus-visible:border-ring focus-visible:text-foreground focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring/30 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50" onClick={toggleVisibility} type="button" > diff --git a/apps/infoalloggi/src/forms/FormNewUser.tsx b/apps/infoalloggi/src/forms/FormNewUser.tsx index 177ec7d..ef4307c 100644 --- a/apps/infoalloggi/src/forms/FormNewUser.tsx +++ b/apps/infoalloggi/src/forms/FormNewUser.tsx @@ -10,7 +10,7 @@ import { FormMessage, } from "~/components/custom_ui/form"; import { PhoneInput } from "~/components/phone-input"; -import { Button, buttonVariants } from "~/components/ui/button"; +import { Button } from "~/components/ui/button"; import Input from "~/components/ui/input"; import { useStrongPassword } from "~/hooks/useStrongPassword"; import { generatePassword } from "~/lib/basicPwGenerator"; @@ -152,21 +152,18 @@ export const FormNewUser = ({ {t.auth.signup.password} {" "} - + diff --git a/apps/infoalloggi/src/forms/FormOverridePassword.tsx b/apps/infoalloggi/src/forms/FormOverridePassword.tsx index 00e49ae..8e9fc76 100644 --- a/apps/infoalloggi/src/forms/FormOverridePassword.tsx +++ b/apps/infoalloggi/src/forms/FormOverridePassword.tsx @@ -10,7 +10,7 @@ import { FormLabel, FormMessage, } from "~/components/custom_ui/form"; -import { Button, buttonVariants } from "~/components/ui/button"; +import { Button } from "~/components/ui/button"; import { Dialog, DialogContent, @@ -150,21 +150,18 @@ export const OverridePasswordForm = ({ id }: { id: UsersId }) => { {t.auth.signup.password} {" "} - + { aria-controls="password" aria-label={isVisible ? "Hide password" : "Show password"} aria-pressed={isVisible} - className="absolute end-0 top-1 flex size-9 items-center justify-center rounded-e-lg text-muted-foreground/80 transition-shadow hover:text-foreground focus-visible:border focus-visible:border-ring focus-visible:text-foreground focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring/30 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50" + className="absolute end-0 top-1 flex size-9 cursor-pointer items-center justify-center rounded-e-lg text-muted-foreground/80 transition-shadow hover:text-foreground focus-visible:border focus-visible:border-ring focus-visible:text-foreground focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring/30 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50" onClick={toggleVisibility} type="button" > diff --git a/apps/infoalloggi/src/forms/FormRstPwFromToken.tsx b/apps/infoalloggi/src/forms/FormRstPwFromToken.tsx index dd0df64..73377f8 100644 --- a/apps/infoalloggi/src/forms/FormRstPwFromToken.tsx +++ b/apps/infoalloggi/src/forms/FormRstPwFromToken.tsx @@ -152,7 +152,7 @@ export const FormRstPwFromToken = (props: { token: string }) => { aria-controls="password" aria-label={isVisible ? "Hide password" : "Show password"} aria-pressed={isVisible} - className="absolute end-0 top-1 flex size-9 items-center justify-center rounded-e-lg text-muted-foreground/80 transition-shadow hover:text-foreground focus-visible:border focus-visible:border-ring focus-visible:text-foreground focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring/30 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50" + className="absolute end-0 top-1 flex size-9 cursor-pointer items-center justify-center rounded-e-lg text-muted-foreground/80 transition-shadow hover:text-foreground focus-visible:border focus-visible:border-ring focus-visible:text-foreground focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring/30 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50" onClick={toggleVisibility} type="button" > diff --git a/apps/infoalloggi/src/pages/auth/accetta-invito/[token].tsx b/apps/infoalloggi/src/pages/auth/accetta-invito/[token].tsx index 14358bf..28bf713 100644 --- a/apps/infoalloggi/src/pages/auth/accetta-invito/[token].tsx +++ b/apps/infoalloggi/src/pages/auth/accetta-invito/[token].tsx @@ -154,7 +154,7 @@ const AcceptInvitePage: NextPageWithLayout = ({ aria-controls="password" aria-label={isVisible ? "Hide password" : "Show password"} aria-pressed={isVisible} - className="absolute end-0 top-1 flex size-9 items-center justify-center rounded-e-lg text-muted-foreground/80 transition-shadow hover:text-foreground focus-visible:border focus-visible:border-ring focus-visible:text-foreground focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring/30 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50" + className="absolute end-0 top-1 flex size-9 cursor-pointer items-center justify-center rounded-e-lg text-muted-foreground/80 transition-shadow hover:text-foreground focus-visible:border focus-visible:border-ring focus-visible:text-foreground focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring/30 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50" onClick={toggleVisibility} type="button" > diff --git a/apps/infoalloggi/src/pages/servizio/pagamento-status.tsx b/apps/infoalloggi/src/pages/servizio/pagamento-status.tsx index 5b358fc..f4fe2e4 100644 --- a/apps/infoalloggi/src/pages/servizio/pagamento-status.tsx +++ b/apps/infoalloggi/src/pages/servizio/pagamento-status.tsx @@ -4,9 +4,9 @@ import Link from "next/link"; import { useRouter } from "next/router"; import PaymentStatus from "~/components/payment_status"; import { ProgressRedirect } from "~/components/progress_redirect"; -import { Button, buttonVariants } from "~/components/ui/button"; +import { Button } from "~/components/ui/button"; import stripe from "~/lib/stripe"; -import { cn, redirectTo500 } from "~/lib/utils"; +import { redirectTo500 } from "~/lib/utils"; import { useTranslation } from "~/providers/I18nProvider"; import OrderTypeEnum from "~/schemas/public/OrderTypeEnum"; import PaymentStatusEnum from "~/schemas/public/PaymentStatusEnum"; @@ -120,11 +120,10 @@ export default function AcquistoProcessing({ status="processing" title={t.acquisto_elaborazione.processing_title} /> - - {t.acquisto_elaborazione.to_dashboard} + + )} @@ -135,11 +134,10 @@ export default function AcquistoProcessing({ status="error" title={t.acquisto_elaborazione.failed_title} /> - - {t.acquisto_elaborazione.to_chat} + + )} @@ -150,11 +148,10 @@ export default function AcquistoProcessing({ status="error" title={t.acquisto_elaborazione.internal_error_title} /> - - {t.acquisto_elaborazione.to_chat} + + )} @@ -173,11 +170,10 @@ export default function AcquistoProcessing({ {t.indietro} - - {t.acquisto_elaborazione.to_chat} + + )}