PR de Correção - #16

Open

leticia-chijo wants to merge 50 commits into

correcao-projetofrom

Commits on Nov 23, 2020

Esqueleto do projeto com pastas
tainah12
committed
bf03cfc
Merge pull request #1 from future4code/pokedex
tainah12
authored
f428d7f
Update README.md
tainah12
authored
cd4e042
Layout básico dos cards da Home feito
tainah12
committed
cad518d
Update README.md
tainah12
authored
42dc41f
Criado o header
Augustoluna
committed
37ab8c7
Merge pull request #2 from future4code/pokedex-header
tainah12
authored
b01151d
Merge branch 'master' into pokedex
tainah12
authored
ee1f111
Merge pull request #3 from future4code/pokedex
tainah12
authored
fca6f46
teste
tainah12
committed
415e0a5
teste
tainah12
committed
95c320a

Commits on Nov 24, 2020

mudei o readme
tainah12
committed
ba17852
conflitos na master teste de resolução1
tainah12
committed
be8249d
instalei o npm react-router-dom na master
tainah12
committed
6148bf0
mudei os estilos do header de lugar. Coloquei na pasta styled.js
tainah12
committed
f7d24db
Criada a página de detalhes estática
Augustoluna
committed
18a0b51
iniciei a lógica dos botoes do header
tainah12
committed
b04c211
botoes do header funcionando
tainah12
committed
21e91e0

Commits on Nov 25, 2020

Commits on Nov 26, 2020

requisição de imagem de pokemom em andamento
tainah12
committed
294429c
Merge pull request #6 from future4code/requisicoes-api
tainah12
authored
a61f752
requisição de imagens e nomes dos pokemons prontas na homme
tainah12
committed
a119ac9
Merge pull request #7 from future4code/requisicoes-api
tainah12
authored
ff50d6a
testando de novo essa joça
Augustoluna
committed
def4482
Merge branch 'master' into pokedex-implementacoes
Augustoluna
authored
6383839
Merge pull request #8 from future4code/pokedex-implementacoes
Augustoluna
authored
2d64e3f
teste2
tainah12
committed
63026b6
Merge pull request #9 from future4code/requisicoes-api
tainah12
authored
85ac982
teste4
tainah12
committed
cdfbcab
Merge branch 'master' into requisicoes-api
tainah12
authored
7a8348b
Merge pull request #10 from future4code/requisicoes-api
tainah12
authored
53d7d51
Estilizacoes do Card pokemon
Augustoluna
committed
627f3b1
Merge pull request #11 from future4code/estilizacoes-CardPokemon
Augustoluna
authored
47a3dec
comecei a fazer a lógica de adicionar
tainah12
committed
409fa19
Botoes do header estilizados e posicionados
Augustoluna
committed
5f5a9a8
Merge pull request #12 from future4code/estilizacao-header
Augustoluna
authored
8777666
logo estilizada
patricia-abreu
committed
babedd2

Commits on Nov 27, 2020