From 6a4bb9c62e6169c2cbae03546a0be3cdd2b7e9b7 Mon Sep 17 00:00:00 2001 From: Maycon Padilha Date: Mon, 20 May 2024 18:24:42 -0300 Subject: [PATCH 1/2] =?UTF-8?q?remo=C3=A7=C3=A3o=20do=20link=20no=20header?= =?UTF-8?q?=20ao=20entrar=20nos=20detalhes/edi=C3=A7=C3=A3o=20do=20abrigo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Header/Header.tsx | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx index 9dde1265..200274df 100644 --- a/src/components/Header/Header.tsx +++ b/src/components/Header/Header.tsx @@ -24,9 +24,15 @@ const Header = React.forwardRef((props, ref) => { >
{startAdornment} - - {title} - + {title === 'SOS Rio Grande do Sul' ? ( + + {title} + + ) : ( + + {title} + + )}
{endAdornment}
From 9415620eeb08a4377c6d8d22f576035c3c23a4b9 Mon Sep 17 00:00:00 2001 From: Maycon Padilha Date: Fri, 24 May 2024 22:59:30 -0300 Subject: [PATCH 2/2] =?UTF-8?q?melhoria=20dos=20links=20ao=20voltar=20do?= =?UTF-8?q?=20header=20ao=20estar=20na=20edi=C3=A7=C3=A3o=20e=20atualizaca?= =?UTF-8?q?o=20do=20abrigo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Header/Header.tsx | 11 +++++------ src/components/Header/types.ts | 1 + src/pages/EditShelterSupply/EditShelterSupply.tsx | 1 + src/pages/UpdateShelter/UpdateShelter.tsx | 1 + 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx index 200274df..41561f20 100644 --- a/src/components/Header/Header.tsx +++ b/src/components/Header/Header.tsx @@ -10,6 +10,7 @@ const Header = React.forwardRef((props, ref) => { startAdornment, title, className = '', + to = '', ...rest } = props; @@ -24,15 +25,13 @@ const Header = React.forwardRef((props, ref) => { >
{startAdornment} - {title === 'SOS Rio Grande do Sul' ? ( - + {to ? ( + {title} ) : ( - - {title} - - )} + {title} + )}
{endAdornment}
diff --git a/src/components/Header/types.ts b/src/components/Header/types.ts index 3274cc16..2109dc10 100644 --- a/src/components/Header/types.ts +++ b/src/components/Header/types.ts @@ -2,4 +2,5 @@ export interface IHeader extends React.ComponentPropsWithoutRef<'div'> { title: string; startAdornment?: React.ReactNode; endAdornment?: React.ReactNode; + to?: string; } diff --git a/src/pages/EditShelterSupply/EditShelterSupply.tsx b/src/pages/EditShelterSupply/EditShelterSupply.tsx index c7729e6e..7823594a 100644 --- a/src/pages/EditShelterSupply/EditShelterSupply.tsx +++ b/src/pages/EditShelterSupply/EditShelterSupply.tsx @@ -159,6 +159,7 @@ const EditShelterSupply = () => { } + to={`/abrigo/${shelterId}`} />
Editar itens do abrigo
diff --git a/src/pages/UpdateShelter/UpdateShelter.tsx b/src/pages/UpdateShelter/UpdateShelter.tsx index c1c8f739..0cae08e9 100644 --- a/src/pages/UpdateShelter/UpdateShelter.tsx +++ b/src/pages/UpdateShelter/UpdateShelter.tsx @@ -115,6 +115,7 @@ const UpdateShelter = () => { } + to={`/abrigo/${shelterId}`} />