Code

PR de Correção#19

Code

Open

leticia-chijo wants to merge 47 commits intocorrecao-projetofuture4code/dumont-pokedex10:correcao-projetofrom masterfuture4code/dumont-pokedex10:masterCopy head branch name to clipboard

+17,474-9

Commits

Commits on Nov 23, 2020

• [criação do app] comentário no App.js

  indiomedeiros

  committed
  6966760

  Copy full SHA for 6966760

• Merge pull request #1 from future4code/segunda-feira

  Show description for c055e5e
  indiomedeiros

  authored
  c055e5e

  Copy full SHA for c055e5e

• Parte header e router segunda-feira

  LilianNicolau

  committed
  becd796

  Copy full SHA for becd796

• [Criação do layout] PokerCard e PokeImage sem lógica

  indiomedeiros

  committed
  092862d

  Copy full SHA for 092862d

• [Criação do layout] PokerCard e PokeImage sem lógica

  indiomedeiros

  committed
  789258b

  Copy full SHA for 789258b

• cardPokemon

  nicksoto1

  committed
  5488db2

  Copy full SHA for 5488db2

Commits on Nov 24, 2020

• Adicionado Styled Pokecard, pokestatos e pokedetails

  indiomedeiros

  committed
  4afc010

  Copy full SHA for 4afc010

• Testado e adicionado as trocas de páginas nos botões do header

  indiomedeiros

  committed
  065bfe8

  Copy full SHA for 065bfe8

• Merge pull request #2 from future4code/header-e-router

  Show description for c717555
  indiomedeiros

  authored
  c717555

  Copy full SHA for c717555

• cardPokemon

  nicksoto1

  committed
  8158575

  Copy full SHA for 8158575

Commits on Nov 25, 2020

• Merge branch 'master' into componentes-visuais

  indiomedeiros

  authored
  9627db5

  Copy full SHA for 9627db5

• Merge pull request #3 from future4code/componentes-visuais

  Show description for 52c7894
  indiomedeiros

  authored
  52c7894

  Copy full SHA for 52c7894

• resolvendo conflitos

  indiomedeiros

  committed
  0a8ad3b

  Copy full SHA for 0a8ad3b

• resolvendo conflitos

  indiomedeiros

  committed
  4606987

  Copy full SHA for 4606987

• Merge pull request #5 from future4code/resolvendo-conflitos

  Show description for e0462aa
  indiomedeiros

  authored
  e0462aa

  Copy full SHA for e0462aa

• [Todas os componentes visutais dos detalhes do pokemon]

  indiomedeiros

  committed
  3e87d29

  Copy full SHA for 3e87d29

Commits on Nov 26, 2020

• Merge pull request #6 from future4code/TelaDetalhes

  Show description for bfa2d55
  LilianNicolau

  authored
  bfa2d55

  Copy full SHA for bfa2d55

• Modifiquei globalState,criei componente Home

  nicksoto1

  committed
  2ee7ef8

  Copy full SHA for 2ee7ef8

• Merge branch 'master' into projeto-pokeCard

  nicksoto1

  authored
  9fb9b47

  Copy full SHA for 9fb9b47

• Merge pull request #7 from future4code/projeto-pokeCard

  Show description for 874a075
  nicksoto1

  authored
  874a075

  Copy full SHA for 874a075

• Ajustes na requisição, agora tem todos os pokemons com todos os atribuos que precisamos mapeados

  indiomedeiros

  committed
  7605e8b

  Copy full SHA for 7605e8b

• Merge pull request #8 from future4code/ajustes-globalstate

  Show description for 73ed8d9
  indiomedeiros

  authored
  73ed8d9

  Copy full SHA for 73ed8d9

• Feito componente PokeCard,Home,adc Home no Router

  nicksoto1

  committed
  f973d9e

  Copy full SHA for f973d9e

• Merge pull request #9 from future4code/pokeApi-Michael

  Show description for 4535501
  nicksoto1

  authored
  4535501

  Copy full SHA for 4535501

Commits on Nov 27, 2020

• Adicionei cores, apliquei o designer[pokecard, header] , o header muda o nome de acordo com a página

  indiomedeiros

  committed
  f1af718

  Copy full SHA for f1af718

• Merge pull request #10 from future4code/ajustes-design

  Show description for 4db6233
  indiomedeiros

  authored
  4db6233

  Copy full SHA for 4db6233

• Funcionalidade do botao

  nicksoto1

  committed
  0ff458e

  Copy full SHA for 0ff458e

• Merge pull request #11 from future4code/projeto-Home

  Show description for 4fbd8b8
  nicksoto1

  authored
  4fbd8b8

  Copy full SHA for 4fbd8b8

• Componente Pokedex

  LilianNicolau

  committed
  4d78873

  Copy full SHA for 4d78873

• Update README.md

  indiomedeiros

  authored
  f166a74

  Copy full SHA for f166a74

• Merge branch 'master' into componente-pokedex

  indiomedeiros

  authored
  da466be

  Copy full SHA for da466be

• Merge pull request #12 from future4code/componente-pokedex

  Show description for 4c3946a
  indiomedeiros

  authored
  4c3946a

  Copy full SHA for 4c3946a

Commits on Nov 28, 2020

• ajustes gerais e limpeza de código 1 na HOME

  indiomedeiros

  committed
  484dc04

  Copy full SHA for 484dc04

• Merge branch 'master' into ajustes-design

  indiomedeiros

  authored
  ad9a71d

  Copy full SHA for ad9a71d

• Merge pull request #13 from future4code/ajustes-design

  Show description for 8c0a9b6
  indiomedeiros

  authored
  8c0a9b6

  Copy full SHA for 8c0a9b6

• debuggando master e limpeza de código 2 : recuperando pokecard

  indiomedeiros

  committed
  4c4534d

  Copy full SHA for 4c4534d

• Merge pull request #14 from future4code/debugged-master

  Show description for 9436351
  indiomedeiros

  authored
  9436351

  Copy full SHA for 9436351

Commits on Nov 29, 2020

• ajustes pokedex e home. Adicionado função de retira pokecard e adicionar

  indiomedeiros

  committed
  6eff320

  Copy full SHA for 6eff320

• Merge pull request #15 from future4code/ajustes-pokedex

  Show description for e748519
  indiomedeiros

  authored
  e748519

  Copy full SHA for e748519

• Update README.md

  indiomedeiros

  authored
  1942543

  Copy full SHA for 1942543

• ajustes finais da pokedex: adicionados alinhamento e correção do bug de remover pokemons

  indiomedeiros

  committed
  9bcf758

  Copy full SHA for 9bcf758

• Merge pull request #16 from future4code/ajustes-layout-pokedex

  Show description for f3ad01b
  indiomedeiros

  authored
  f3ad01b

  Copy full SHA for f3ad01b

• Adocionado toda lógica da página de detalhes + limpeza de código

  indiomedeiros

  committed
  0d597e1

  Copy full SHA for 0d597e1

• Merge pull request #17 from future4code/pokedetalhes-lógica

  Show description for a47872f
  indiomedeiros

  authored
  a47872f

  Copy full SHA for a47872f

• Update README.md

  indiomedeiros

  authored
  f6522d8

  Copy full SHA for f6522d8

Commits on Nov 30, 2020

• Limpeza de código geral finalizada. Projeto 100/100

  indiomedeiros

  committed
  37039df

  Copy full SHA for 37039df

• Merge pull request #18 from future4code/limpeza-de-codigo

  Show description for 336921d
  indiomedeiros

  authored
  336921d

  Copy full SHA for 336921d