From b59c0f8b15e4a01ee726536a215f4219d1fca67c Mon Sep 17 00:00:00 2001 From: Diego Pavani Date: Mon, 19 Feb 2024 19:22:41 -0300 Subject: [PATCH 1/3] rollback --- src/pages/cep/[...cep].tsx | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/src/pages/cep/[...cep].tsx b/src/pages/cep/[...cep].tsx index 27099b5..01c3850 100644 --- a/src/pages/cep/[...cep].tsx +++ b/src/pages/cep/[...cep].tsx @@ -18,7 +18,17 @@ export const getServerSideProps: GetServerSideProps = async (context: any) => { }; } - const response = await fetch(`${process.env.API_LINK}/cep/${cep}`); + const credentials = `${process.env.CLIENT_ID}:${process.env.CLIENT_SECRET}`; + const base64Credentials = btoa(credentials); + + const response = await fetch(`${process.env.API_LINK}/cep/${cep}`, { + headers: { + Authorization: `Basic ${base64Credentials}`, + }, + next: { + revalidate: 2592000, + }, + }); const post = await response.json(); return { @@ -38,9 +48,19 @@ const CepPage: FunctionComponent = ({ post, cep }) => { const pageTitle = post.cep ? `Informações do CEP ${post.cep}` : "CEP não encontrado"; - const pageDescription = post.cep - ? `Detalhes do CEP ${post.cep}: ${post.logradouro}, ${post.bairro}, ${post.cidade}, ${post.estado}.` - : "A busca pelo CEP não retornou resultados."; + const pageDescriptionParts = [ + post.cep && `Detalhes do CEP ${post.cep}`, + post.logradouro && `${post.tipoLogradouro} ${post.logradouro}`, + post.bairro?.nome && post.bairro.nome, + post.cidade?.nome && post.cidade.nome, + post.estado?.nome && post.estado?.nome, + post.estado?.uf && post.estado?.uf, + ].filter(Boolean); + + const pageDescription = + pageDescriptionParts.length > 0 + ? pageDescriptionParts.join(", ") + : "A busca pelo CEP não retornou resultados."; mixpanel.track("Cep Search", { cep: post?.cep, From 47bf42299914122191b7d8756cd2e0c4630c9293 Mon Sep 17 00:00:00 2001 From: Diego Pavani Date: Mon, 19 Feb 2024 19:23:53 -0300 Subject: [PATCH 2/3] added config --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index eb2d0ec..65059ab 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,6 +9,7 @@ workflows: only: - main - dev + - rollback jobs: build_docker_image: From af225535831d8b5b548da29bec1826c0845cc92c Mon Sep 17 00:00:00 2001 From: Diego Pavani Date: Thu, 22 Feb 2024 19:05:22 -0300 Subject: [PATCH 3/3] added logradouro tipo --- package.json | 2 +- src/components/cepResult/cepResult.tsx | 4 +++- src/pages/cep/[...cep].tsx | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index bc8fdf6..d371a37 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.1.0", "private": true, "scripts": { - "dev": "next dev", + "dev": "next dev -p 8080", "build": "next build", "start": "next start", "lint": "next lint" diff --git a/src/components/cepResult/cepResult.tsx b/src/components/cepResult/cepResult.tsx index c4effcf..26c6eb8 100644 --- a/src/components/cepResult/cepResult.tsx +++ b/src/components/cepResult/cepResult.tsx @@ -16,6 +16,7 @@ interface propsCepResult { estado: string; latitude: number; longitude: number; + tipoLogradouro: string; } export const CepResult: FunctionComponent = ({ @@ -26,6 +27,7 @@ export const CepResult: FunctionComponent = ({ estado, latitude, longitude, + tipoLogradouro, }) => { return ( <> @@ -35,7 +37,7 @@ export const CepResult: FunctionComponent = ({ CEP: {cep}

- Logradouro: {logradouro} + Logradouro: {`${tipoLogradouro} ${logradouro}`}

Bairro: {bairro} diff --git a/src/pages/cep/[...cep].tsx b/src/pages/cep/[...cep].tsx index 01c3850..b8401cb 100644 --- a/src/pages/cep/[...cep].tsx +++ b/src/pages/cep/[...cep].tsx @@ -107,6 +107,7 @@ const CepPage: FunctionComponent = ({ post, cep }) => { estado={`${post.estado?.nome} - ${post.estado?.uf}`} latitude={post.latitude} longitude={post.longitude} + tipoLogradouro={post.tipoLogradouro} /> )}