Code

PR de Correção#22

Code

Open

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

+17,599-8

Commits

Commits on Nov 23, 2020

• iniciei a criação dos componentes visuais

  AlvaroBarrosJunior

  committed
  4ac9968

• Merge pull request #1 from future4code/pokecard

  Show description for 0e84e6b
  Diegodossantos23

  authored
  0e84e6b

• continuando os componentes visuais

  AlvaroBarrosJunior

  committed
  6621c00

• Merge pull request #2 from future4code/pokecard

  Show description for 2b632e4
  vitorfarias001

  authored
  2b632e4

• Criei rotas para as tres paginas

  Diegodossantos23

  committed
  ad919f1

• Adicionei a pasta zip com os endpoints necessario para o projeto

  Diegodossantos23

  committed
  fda57c1

• Criei o header e alinhei o conteudo principal da pagina

  Diegodossantos23

  committed
  2d2d19a

Commits on Nov 24, 2020

• Update

  Diegodossantos23

  committed
  e712287

• Update

  Diegodossantos23

  committed
  c91f43f

• Merge branch 'master' into semana11-projeto

  vitorfarias001

  authored
  10c9e30

• Merge pull request #3 from future4code/semana11-projeto

  Show description for e0330c5
  Diegodossantos23

  authored
  e0330c5

• Update

  Diegodossantos23

  committed
  a743b2a

• adicionando_hooks

  vitorfarias001

  committed
  1d58c5e

• Merge pull request #4 from future4code/projetoPokedex

  Show description for 979a58a
  vitorfarias001

  authored
  979a58a

• erro

  AlvaroBarrosJunior

  committed
  28129df

Commits on Nov 25, 2020

• Update

  Diegodossantos23

  committed
  ed46130

• Merge branch 'master' into semana11-projeto

  Diegodossantos23

  authored
  b62345d

• Merge pull request #5 from future4code/semana11-projeto

  Show description for 1b69df6
  Diegodossantos23

  authored
  1b69df6

Commits on Nov 26, 2020

• Realizei a refatoração utilizando global state

  AlvaroBarrosJunior

  committed
  f2f0455

• Merge branch 'master' into pokecard

  AlvaroBarrosJunior

  authored
  9724198

• Merge pull request #6 from future4code/pokecard

  Show description for 5132fa6
  Diegodossantos23

  authored
  5132fa6

• Update

  Diegodossantos23

  committed
  92d4f4c

• dd

  Diegodossantos23

  committed
  e7f3aa9

• dd

  Diegodossantos23

  committed
  82a3d8c

• gg

  Diegodossantos23

  committed
  3f69f66

• Files Update

  Diegodossantos23

  committed
  93bb22c

• Merge branch 'master' into semana11-projeto

  Diegodossantos23

  authored
  af9c54d

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

  Show description for 4e529bd
  Diegodossantos23

  authored
  4e529bd

Commits on Nov 27, 2020

• resolvendo bugs

  AlvaroBarrosJunior

  committed
  387ad9d

• Merge pull request #10 from future4code/history

  Show description for be7b2a7
  Diegodossantos23

  authored
  be7b2a7

• Solved conflicts

  Diegodossantos23

  committed
  cce2949

• Update README.md

  Diegodossantos23

  authored
  e80f2be

• subindo pra nuvem

  Diegodossantos23

  committed
  776b174

• Merge pull request #12 from future4code/projeto-react

  Show description for 39ac91a
  Diegodossantos23

  authored
  39ac91a

• Tudo certo pra criar as implementaçoes

  Diegodossantos23

  committed
  60a8f31

• Merge pull request #13 from future4code/projeto-react

  Show description for 85cd3e5
  Diegodossantos23

  authored
  85cd3e5

• Fiz a página detalhes renderizar os detalhes do pokemon

  AlvaroBarrosJunior

  committed
  8b23069

• Merge pull request #14 from future4code/pagina-detalhes

  Show description for a97a4db
  Diegodossantos23

  authored
  a97a4db

• Update README.md

  Diegodossantos23

  authored
  7f2e57d

• Updted

  Diegodossantos23

  committed
  ce38881

• Merge pull request #15 from future4code/implementations

  Show description for 586ee95
  Diegodossantos23

  authored
  586ee95

Commits on Nov 28, 2020

• Fiz alguns ajustes para melhorar a acessibilidade

  Diegodossantos23

  committed
  e23654c

• Merge pull request #17 from future4code/implementations

  Show description for bd12837
  Diegodossantos23

  authored
  bd12837

Commits on Nov 30, 2020

• Finalizei as funções de adicionar e remover os pokemons da pokedex

  AlvaroBarrosJunior

  committed
  e3fe445

• Merge pull request #18 from future4code/pokedex

  Show description for 2dd590b
  AlvaroBarrosJunior

  authored
  2dd590b

• Update README.md

  Diegodossantos23

  authored
  4d144a1

• ok

  Diegodossantos23

  committed
  464b6ec

• Update README.md

  Diegodossantos23

  authored
  6ddb9d8

• ok

  Diegodossantos23

  committed
  76bed63

• Update README.md

  Diegodossantos23

  authored
  5c21939

• Update README.md

  Diegodossantos23

  authored
  783f18b

• Revolvi conflitos ao subir as alteraçoes do projeto

  Diegodossantos23

  committed
  a3b8cd9

• Update README.md

  Diegodossantos23

  authored
  95fcbea

• Update README.md

  Diegodossantos23

  authored
  68fa854

• Mergeado

  Diegodossantos23

  committed
  8fa8115

• Tive problemas com conflitos que não consegui resolver pelo github

  Diegodossantos23

  committed
  24573a6

• Problemas com conflitos resolvidos

  Diegodossantos23

  committed
  f450e72

• Merge pull request #21 from future4code/newBranch

  Show description for 3cf3a80
  Diegodossantos23

  authored
  3cf3a80