From f2b9263cc9635a2b94c54a8acb74ec53900927a6 Mon Sep 17 00:00:00 2001 From: Diogo Caxiado Date: Mon, 5 Aug 2024 22:15:12 -0300 Subject: [PATCH 1/8] refactor: clear imports and style button --- src/app/(app)/pet-register/components/DateBirth.tsx | 4 ++-- .../components/{DefaultScren.tsx => DefaultScreen.tsx} | 8 ++------ src/app/(app)/pet-register/components/NameAndGender.tsx | 6 ++---- src/app/(app)/pet-register/components/PetRegister.tsx | 2 +- src/app/(app)/pet-register/components/SizeAndBreed.tsx | 7 +++---- src/app/(app)/pet-register/components/Specie.tsx | 7 +++---- 6 files changed, 13 insertions(+), 21 deletions(-) rename src/app/(app)/pet-register/components/{DefaultScren.tsx => DefaultScreen.tsx} (89%) diff --git a/src/app/(app)/pet-register/components/DateBirth.tsx b/src/app/(app)/pet-register/components/DateBirth.tsx index 7978d7e..7e35f62 100644 --- a/src/app/(app)/pet-register/components/DateBirth.tsx +++ b/src/app/(app)/pet-register/components/DateBirth.tsx @@ -121,12 +121,12 @@ export function DateBirth() {
- +
); diff --git a/src/app/(app)/pet-register/components/DefaultScren.tsx b/src/app/(app)/pet-register/components/DefaultScreen.tsx similarity index 89% rename from src/app/(app)/pet-register/components/DefaultScren.tsx rename to src/app/(app)/pet-register/components/DefaultScreen.tsx index 6b81bf9..45bc810 100644 --- a/src/app/(app)/pet-register/components/DefaultScren.tsx +++ b/src/app/(app)/pet-register/components/DefaultScreen.tsx @@ -9,11 +9,7 @@ import { BreadcrumbList, BreadcrumbItem, BreadcrumbLink, - BreadcrumbSeparator, - BreadcrumbEllipsis, - BreadcrumbPage, } from '@/components/Breadcrump'; -import { Home } from 'lucide-react'; export function DefaultScreen() { const { nextStep, previousStep, resetPetNewsValues } = @@ -63,12 +59,12 @@ export function DefaultScreen() {
- +
); diff --git a/src/app/(app)/pet-register/components/NameAndGender.tsx b/src/app/(app)/pet-register/components/NameAndGender.tsx index d6e803f..4596f98 100644 --- a/src/app/(app)/pet-register/components/NameAndGender.tsx +++ b/src/app/(app)/pet-register/components/NameAndGender.tsx @@ -8,7 +8,6 @@ import { PetRegisterContext } from '../context/PetRegisterContext'; import { usePetRegisterSteps } from './usePetRegisterSteps'; import { species } from '@/utils/species'; import { InputControl } from '@/components/Fields/InputControl'; -import { Label } from '@/components/Label'; import { Input } from '@/components/Fields/Input'; import { Breadcrumb, @@ -16,7 +15,6 @@ import { BreadcrumbItem, BreadcrumbLink, } from '@/components/Breadcrump'; -import { Home } from 'lucide-react'; import Image from 'next/image'; export function NameAndGender() { @@ -134,12 +132,12 @@ export function NameAndGender() {
- +
); diff --git a/src/app/(app)/pet-register/components/PetRegister.tsx b/src/app/(app)/pet-register/components/PetRegister.tsx index 8796ac8..6e92bd9 100644 --- a/src/app/(app)/pet-register/components/PetRegister.tsx +++ b/src/app/(app)/pet-register/components/PetRegister.tsx @@ -1,6 +1,6 @@ 'use client'; import { useContext, useEffect, useState } from 'react'; -import { DefaultScreen } from './DefaultScren'; +import { DefaultScreen } from './DefaultScreen'; import { Specie } from './Specie'; import { NameAndGender } from './NameAndGender'; import { SizeAndBreed } from './SizeAndBreed'; diff --git a/src/app/(app)/pet-register/components/SizeAndBreed.tsx b/src/app/(app)/pet-register/components/SizeAndBreed.tsx index 8ebf6d3..262496e 100644 --- a/src/app/(app)/pet-register/components/SizeAndBreed.tsx +++ b/src/app/(app)/pet-register/components/SizeAndBreed.tsx @@ -1,6 +1,6 @@ 'use client'; import { Button } from '@/components/Button'; -import { ChangeEvent, useContext, useEffect, useState } from 'react'; +import { useContext } from 'react'; import { PetRegisterContext } from '../context/PetRegisterContext'; import { usePetRegisterSteps } from './usePetRegisterSteps'; import { @@ -20,7 +20,6 @@ import { BreadcrumbLink, BreadcrumbSeparator, } from '@/components/Breadcrump'; -import { Home } from 'lucide-react'; export function SizeAndBreed() { const { newPet, breeds, sizes } = useContext(PetRegisterContext); @@ -162,12 +161,12 @@ export function SizeAndBreed() {
- +
); diff --git a/src/app/(app)/pet-register/components/Specie.tsx b/src/app/(app)/pet-register/components/Specie.tsx index 9512851..b9e0798 100644 --- a/src/app/(app)/pet-register/components/Specie.tsx +++ b/src/app/(app)/pet-register/components/Specie.tsx @@ -3,7 +3,7 @@ import { Button } from '@/components/Button'; import { ToggleGroup, ToggleGroupItem } from '@/components/ToggleGroup'; import { IconCat } from '@/components/icons/IconCat'; import { IconDog } from '@/components/icons/IconDog'; -import { useContext, useState } from 'react'; +import { useContext } from 'react'; import { PetRegisterContext } from '../context/PetRegisterContext'; import { usePetRegisterSteps } from './usePetRegisterSteps'; @@ -13,7 +13,6 @@ import { BreadcrumbItem, BreadcrumbLink, } from '@/components/Breadcrump'; -import { Home } from 'lucide-react'; import Image from 'next/image'; export function Specie() { @@ -99,12 +98,12 @@ export function Specie() {
- +
); From b609f7db7400590ccf63d3d6173af312b0e9678f Mon Sep 17 00:00:00 2001 From: Herison Pereira Date: Sun, 18 Aug 2024 18:05:09 -0300 Subject: [PATCH 2/8] refactor: use SearchInput component on SizeAndBreed step --- .../pet-register/components/SizeAndBreed.tsx | 30 ++++++++----------- 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/src/app/(app)/pet-register/components/SizeAndBreed.tsx b/src/app/(app)/pet-register/components/SizeAndBreed.tsx index d2ef0a0..48d91e5 100644 --- a/src/app/(app)/pet-register/components/SizeAndBreed.tsx +++ b/src/app/(app)/pet-register/components/SizeAndBreed.tsx @@ -20,6 +20,7 @@ import { BreadcrumbLink, BreadcrumbSeparator, } from '@/components/Breadcrump'; +import { SearchInput } from '@/components/Fields/SearchInput'; export function SizeAndBreed() { const { newPet, breeds, sizes } = useContext(PetRegisterContext); @@ -54,7 +55,6 @@ export function SizeAndBreed() { function handleOnChangeBreed(value: string) { setError(false); - setPet((state) => ({ ...state, breedName: value, @@ -106,25 +106,19 @@ export function SizeAndBreed() { - {/* TODO: Adicionar a opção de outros */} )} From 025f8e9465b9f3d6213835de89aa681ae4c2faf5 Mon Sep 17 00:00:00 2001 From: Herison Pereira Date: Sun, 18 Aug 2024 18:06:12 -0300 Subject: [PATCH 3/8] style: change button border radius --- src/components/Button.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Button.tsx b/src/components/Button.tsx index 5208de3..cf089ac 100644 --- a/src/components/Button.tsx +++ b/src/components/Button.tsx @@ -2,7 +2,7 @@ import { cn } from '@/utils/twmerge'; import { ButtonHTMLAttributes, Ref, forwardRef } from 'react'; const buttonStyleBase = - 'flex self-center font-medium items-center justify-center rounded-[45px] px-11 py-3'; + 'flex self-center font-medium items-center justify-center px-11 py-3 rounded-2xl'; const buttonVariants = { variant: { From 5a8160ca9adf44d8e59ecc016720174801dd03ee Mon Sep 17 00:00:00 2001 From: Herison Pereira Date: Sun, 18 Aug 2024 18:07:15 -0300 Subject: [PATCH 4/8] style: change color and size text on SearchInput component --- src/components/Fields/SearchInput.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Fields/SearchInput.tsx b/src/components/Fields/SearchInput.tsx index 440396e..dcd4725 100644 --- a/src/components/Fields/SearchInput.tsx +++ b/src/components/Fields/SearchInput.tsx @@ -22,7 +22,7 @@ interface SearchInputItems { } const searchVariants = { - normal: `w-full h-10 p-2 border border-[#B2B2B2] border-dashed outline-none rounded-2xl bg-white text-[#2E2E2E] focus:outline-none focus:border-solid focus:border-[#B78AF7] focus:shadow-custom-select transition-all`, + normal: `w-full h-10 p-2 text-sm border border-[#B2B2B2] border-dashed outline-none rounded-2xl bg-white focus:outline-none focus:border-solid focus:border-[#B78AF7] focus:shadow-custom-select transition-all`, error: `border-[#FF917A] border-solid`, }; @@ -123,4 +123,4 @@ function SearchInput({ ); } -export { SearchInput }; \ No newline at end of file +export { SearchInput }; From f06f30dc0ca71740569e9a7e68eaa837a79b5d81 Mon Sep 17 00:00:00 2001 From: Herison Pereira Date: Sun, 18 Aug 2024 18:11:19 -0300 Subject: [PATCH 5/8] style: change some styles in the NameAndGender component --- src/app/(app)/pet-register/components/NameAndGender.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/(app)/pet-register/components/NameAndGender.tsx b/src/app/(app)/pet-register/components/NameAndGender.tsx index b9da69b..b206904 100644 --- a/src/app/(app)/pet-register/components/NameAndGender.tsx +++ b/src/app/(app)/pet-register/components/NameAndGender.tsx @@ -84,7 +84,7 @@ export function NameAndGender() { - + Qual o nome do seu companheiro? @@ -103,8 +109,8 @@ export function NameAndGender() { Qual o sexo de seu Pet? Fêmea - {errors.gender ? ( + {errors?.gender && ( - ) : ( - )} @@ -140,6 +144,7 @@ export function NameAndGender() { diff --git a/src/app/(app)/pet-register/components/Specie.tsx b/src/app/(app)/pet-register/components/Specie.tsx index f399f1b..d405317 100644 --- a/src/app/(app)/pet-register/components/Specie.tsx +++ b/src/app/(app)/pet-register/components/Specie.tsx @@ -109,7 +109,11 @@ export function Specie() { > Voltar - diff --git a/src/schemas/PetRegister/NameAndGender.ts b/src/schemas/PetRegister/NameAndGender.ts index 1a33dc9..61b70eb 100644 --- a/src/schemas/PetRegister/NameAndGender.ts +++ b/src/schemas/PetRegister/NameAndGender.ts @@ -7,7 +7,7 @@ export const nameAndGenderSchema = z.object({ .regex(/^[A-Za-zÀ-ÖØ-öø-ÿ\s]+$/, { message: "*O nome fornecido deve ter entre 2 e 30 caracteres, não são permitidos caracteres especiais, nem números. Por favor, insira um nome válido.", }), - gender: z.string(), + gender: z.string({message: '* Campo obrigatório.'}) }); export type NameAndGenderProps = z.infer;