Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
eac5ef1
Iniciando-projeto
LincolnRp Jul 18, 2022
5496dbb
Merge pull request #1 from future4code/iniciando-projeto
LincolnRp Jul 18, 2022
3b8d65b
Inciando o projeto Pokédex
savioayres Jul 19, 2022
24e27b4
Merge pull request #2 from future4code/inicio-projeto
savioayres Jul 19, 2022
99f7f76
pagina detalhes
Jul 19, 2022
d3ce1c1
Merge branch 'master' into raoni-pokedex
RaoniLobo Jul 19, 2022
5c8f456
Merge pull request #3 from future4code/raoni-pokedex
RaoniLobo Jul 19, 2022
aaa90f3
card-home
LincolnRp Jul 19, 2022
b99971a
Merge pull request #4 from future4code/branch-lin2
LincolnRp Jul 19, 2022
e682339
funcao listaPokemons
Jul 19, 2022
3f1ca8d
Merge pull request #5 from future4code/raoni-listaPokemons
RaoniLobo Jul 19, 2022
678b361
Tentativa de implementação da api
savioayres Jul 19, 2022
1c203cb
Merge pull request #6 from future4code/savio-branch2
savioayres Jul 19, 2022
c8e6ee0
funcao
Jul 19, 2022
85b8460
Merge pull request #7 from future4code/raoni-1
RaoniLobo Jul 19, 2022
72b92b3
alteracao Global
Jul 20, 2022
69af9c3
Merge pull request #8 from future4code/globalState
RaoniLobo Jul 20, 2022
aac344c
dados do get
Jul 20, 2022
73eca41
Merge pull request #9 from future4code/raoni-Global
RaoniLobo Jul 20, 2022
1a1bee9
Iniciando-cards
LincolnRp Jul 20, 2022
41c40f2
Merge pull request #10 from future4code/branch-lin7
LincolnRp Jul 20, 2022
f6eb1ee
cards-2
LincolnRp Jul 20, 2022
e49c466
Merge pull request #11 from future4code/branch-lin8
LincolnRp Jul 20, 2022
f9a8286
botao addPokedex
Jul 21, 2022
2cacf56
Merge pull request #12 from future4code/raoni-addPokedex
RaoniLobo Jul 21, 2022
fc38bcc
typeOfPokemon
LincolnRp Jul 21, 2022
47f7edd
Merge pull request #13 from future4code/branch-lin11
LincolnRp Jul 21, 2022
d605397
pagina Detalhes Pokemon
Jul 21, 2022
fbbe5f5
Merge pull request #14 from future4code/raoni-detalhePokemon
RaoniLobo Jul 21, 2022
76f3489
pokemons detalhes
Jul 22, 2022
deb97c8
Merge pull request #15 from future4code/detail-Pokemon
RaoniLobo Jul 22, 2022
9727aa9
button-capturar
LincolnRp Jul 22, 2022
a486609
Merge branch 'master' into branch-lin12
LincolnRp Jul 22, 2022
6335af0
Merge pull request #16 from future4code/branch-lin12
LincolnRp Jul 22, 2022
90841f1
Inicio mapeamento da pokedex
savioayres Jul 22, 2022
99a2628
Merge pull request #17 from future4code/page-pokedex
savioayres Jul 22, 2022
676c175
teste-pokedex
LincolnRp Jul 22, 2022
26c2b3c
Merge pull request #18 from future4code/branch-lin14
LincolnRp Jul 22, 2022
b23f486
página pokedex
savioayres Jul 22, 2022
28071ac
Merge branch 'master' into page-pokedex2
savioayres Jul 22, 2022
c38d9b4
Merge pull request #19 from future4code/page-pokedex2
savioayres Jul 22, 2022
834e364
atualizacoes-lin
LincolnRp Jul 22, 2022
9f71b1c
Merge pull request #20 from future4code/branch-lin015
LincolnRp Jul 22, 2022
ca1a085
atualizacao pOKEDEX
Jul 23, 2022
af84a5a
Merge branch 'master' into raoni-paginas
RaoniLobo Jul 23, 2022
fb1cad8
Merge pull request #21 from future4code/raoni-paginas
RaoniLobo Jul 23, 2022
11d127a
home edit
Jul 23, 2022
575ebf0
Merge pull request #22 from future4code/home-pokemon
RaoniLobo Jul 23, 2022
f63dc2d
paginacao terminada
Jul 23, 2022
b07a928
Merge pull request #24 from future4code/paginando
RaoniLobo Jul 23, 2022
af0ba35
removePokemon
LincolnRp Jul 23, 2022
fffaf30
Merge branch 'master' into branch0
LincolnRp Jul 23, 2022
ba07edb
Merge pull request #25 from future4code/branch0
LincolnRp Jul 23, 2022
ff5351c
logica final
Jul 24, 2022
95cbc38
projeto-final
Jul 24, 2022
2a0240c
pokedex-vazia
LincolnRp Jul 24, 2022
af643bc
Merge pull request #26 from future4code/logica-final
RaoniLobo Jul 24, 2022
8439b05
Merge branch 'master' into useEffect
LincolnRp Jul 24, 2022
562e361
Merge pull request #27 from future4code/useEffect
LincolnRp Jul 24, 2022
3eb2fd3
estilizacao
Jul 24, 2022
db3ccf7
Merge branch 'master' into styled-pokedex
RaoniLobo Jul 24, 2022
fa27e63
Merge pull request #29 from future4code/styled-pokedex
RaoniLobo Jul 24, 2022
d335104
estilização-home
LincolnRp Jul 24, 2022
a83faef
Merge pull request #30 from future4code/estilizacao-lin
LincolnRp Jul 24, 2022
8b098df
alteracoes finais
Jul 24, 2022
65e2e36
Merge branch 'master' into styled-final
RaoniLobo Jul 24, 2022
c14aaf7
Merge pull request #31 from future4code/styled-final
RaoniLobo Jul 24, 2022
d27fa69
revisao final
Jul 24, 2022
b8c376b
Merge pull request #32 from future4code/revisao-projeto
RaoniLobo Jul 24, 2022
780894e
add-readme
LincolnRp Jul 24, 2022
d15fd58
Merge pull request #33 from future4code/add-readme
LincolnRp Jul 24, 2022
6698120
Update README.md
LincolnRp Jul 24, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 25 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,30 @@
# POKEDEX

Nome dos integrantes:
- Pessoa 1
- Pessoa 2
- Pessoa 3
Introdução: Projeto consiste em visualizar uma gama de pokémons de diferentes tipos e forças. É possível ver seus status (Hp, Attack, Defense..) e escolhe-los para colocar em sua prórpia pokédex personalizada, compare os status e escolha seus pokémons !

Link do Surge: www.link.com.br
Integrantes:

O que funciona:
- Item 1
- Item 2
Lincoln Ribeiro
Raoni Lobo
Savio Ayres

O que não funciona:
- Item 3
- Item 4
Tecnologias utilizadas:
- React-router-dom (pagination)
- Javascript, Jsx, Styled-Components
- Chackra Ui (estilização)
- Componentização
- GlobalState
- Hooks (useEffect, useState, useContext, useParams, useNavigate)
- Lotties


![page1](https://user-images.githubusercontent.com/93271677/180662349-01419beb-a6fc-46c9-8a81-d59f60fc6b99.png)
![page1-next](https://user-images.githubusercontent.com/93271677/180662352-8ebcfb7d-8d7e-4e27-80ba-386817336c92.png)
![page2](https://user-images.githubusercontent.com/93271677/180662353-d169ee67-7d5f-4403-8e6f-9e8ea33d78c7.png)
![page3](https://user-images.githubusercontent.com/93271677/180662354-5cdfd004-96da-4260-8219-bc917ee3922f.png)
![page4](https://user-images.githubusercontent.com/93271677/180662355-7850e845-753d-4bcf-ba95-13ca3b464151.png)




Link do Surge: wanting-drink.surge.sh
Loading