Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
d33501c
react-app criado, boilerplate pronto
cptvictor95 Feb 8, 2021
303cacb
axios, router and chakra added
cptvictor95 Feb 8, 2021
d01025f
Rotas
diegogaldino Feb 8, 2021
4aa0200
Merge pull request #1 from future4code/diego-branch
a-bemporad Feb 8, 2021
0ffaa17
Postman collection
a-bemporad Feb 8, 2021
b54186d
route functions made, route names changed, buttons and content centra…
cptvictor95 Feb 8, 2021
7794201
Merge pull request #2 from future4code/victor-branch
diegogaldino Feb 9, 2021
5dfcb1e
to do comments made on pages, generic button started
cptvictor95 Feb 9, 2021
be5582c
Merge pull request #3 from future4code/victor-branch
cptvictor95 Feb 9, 2021
b21c864
details and pokedex pages fixed
cptvictor95 Feb 9, 2021
b8660cb
Merge pull request #4 from future4code/victor-branch
cptvictor95 Feb 9, 2021
9a36d0a
generic button fixed
cptvictor95 Feb 9, 2021
365fa12
Merge pull request #5 from future4code/victor-branch
cptvictor95 Feb 9, 2021
9dfc3e9
CardPokemon com imagem e botões
diegogaldino Feb 9, 2021
aef38b4
Merge branch 'master' into diego-branch1
cptvictor95 Feb 9, 2021
4e03c6a
Merge pull request #6 from future4code/diego-branch1
cptvictor95 Feb 9, 2021
125e397
homepage fixed
cptvictor95 Feb 9, 2021
44e0de4
Merge pull request #7 from future4code/victor-branch
cptvictor95 Feb 9, 2021
0109d76
header fixed, details made, homepage updated
cptvictor95 Feb 9, 2021
98b78b9
Merge pull request #8 from future4code/victor-branch
diegogaldino Feb 9, 2021
8fb4e74
random pokemons list function made
cptvictor95 Feb 9, 2021
d0316e5
Merge pull request #9 from future4code/victor-branch
cptvictor95 Feb 9, 2021
d7d8df3
Pokedex component created, getPokemons, useEffect and Spinner
abemporad Feb 10, 2021
015458a
Merge branch 'master' into astrid-branch
cptvictor95 Feb 10, 2021
0df8abd
Merge pull request #10 from future4code/astrid-branch
cptvictor95 Feb 10, 2021
88701f4
detail updated
cptvictor95 Feb 10, 2021
ac42150
Merge pull request #11 from future4code/victor-branch
cptvictor95 Feb 10, 2021
ed7b899
new font added
cptvictor95 Feb 10, 2021
e8f0630
Merge pull request #12 from future4code/victor-branch
cptvictor95 Feb 10, 2021
1871836
PokemonList and PokedexList fixed
diegogaldino Feb 10, 2021
a93502f
Merge pull request #13 from future4code/diego-branch1
a-bemporad Feb 10, 2021
43dc4fb
context made, useContext on homePage
cptvictor95 Feb 10, 2021
ccc4912
Merge branch 'master' into victor-branch
cptvictor95 Feb 10, 2021
0f563f8
Merge pull request #14 from future4code/victor-branch
cptvictor95 Feb 10, 2021
ab4b75c
imports fixed
cptvictor95 Feb 10, 2021
904f637
Merge pull request #15 from future4code/victor-branch
cptvictor95 Feb 10, 2021
c6befc6
addToPokedex made on context
cptvictor95 Feb 10, 2021
13e2589
Merge pull request #16 from future4code/victor-branch
cptvictor95 Feb 10, 2021
6c7fbc8
Randon list
diegogaldino Feb 10, 2021
7675fbb
Merge pull request #17 from future4code/diego-branch
diegogaldino Feb 10, 2021
4063042
remove from pokedex finished
cptvictor95 Feb 10, 2021
5426685
details design fixed
cptvictor95 Feb 11, 2021
f6f160a
shiny version added
cptvictor95 Feb 11, 2021
f01cd38
colorMode started for cards
cptvictor95 Feb 11, 2021
515068e
Merge pull request #18 from future4code/victor-branch
cptvictor95 Feb 11, 2021
da273c7
details type colors changing based on type name
cptvictor95 Feb 11, 2021
40035f0
Merge pull request #19 from future4code/victor-branch
cptvictor95 Feb 11, 2021
c7840ce
toaster added, getMoveByName started
cptvictor95 Feb 11, 2021
95e3085
Merge pull request #20 from future4code/victor-branch
cptvictor95 Feb 11, 2021
13405e6
Home and Pokedex Grid Layout
diegogaldino Feb 11, 2021
8b20587
Merge branch 'master' into diego-branch1
diegogaldino Feb 11, 2021
ffd98c7
Merge pull request #21 from future4code/diego-branch1
diegogaldino Feb 11, 2021
ea9a170
Persistency of data started
abemporad Feb 12, 2021
e046e71
Merge pull request #22 from future4code/astrid-branch
a-bemporad Feb 12, 2021
ab191a7
Replace Url Image
diegogaldino Feb 12, 2021
b09911b
Merge artWork with master
diegogaldino Feb 12, 2021
2b7ded9
Merge pull request #23 from future4code/diego-branch1
diegogaldino Feb 12, 2021
c16eb3f
Retrieve pokedex data from localstorage is working
abemporad Feb 12, 2021
46a817e
Merge pull request #24 from future4code/astrid-branch
a-bemporad Feb 12, 2021
18cb60f
UseEffect dependencies fixed, loop solved
abemporad Feb 12, 2021
b287889
Merge pull request #25 from future4code/astrid-branch
a-bemporad Feb 12, 2021
7b8e9e4
artwork img on details, getPokedex and localStorage working
cptvictor95 Feb 12, 2021
3497be4
Merge pull request #26 from future4code/victor-branch
cptvictor95 Feb 12, 2021
3aff97d
details artwork img finished
cptvictor95 Feb 12, 2021
91e2bec
homepage cards updated with sprites instead of artwork
cptvictor95 Feb 12, 2021
75598e0
Merge pull request #27 from future4code/victor-branch
cptvictor95 Feb 12, 2021
6281d07
Update README.md
cptvictor95 Feb 12, 2021
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
23 changes: 23 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
/.pnp
.pnp.js

# testing
/coverage

# production
/build

# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local

npm-debug.log*
yarn-debug.log*
yarn-error.log*
158 changes: 158 additions & 0 deletions Poke API.postman_collection.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
{
"info": {
"_postman_id": "ede4630e-3fb7-4fe9-8cf8-73ff1a49d214",
"name": "Poke API",
"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
},
"item": [
{
"name": "Get 20 pokemons",
"request": {
"method": "GET",
"header": [],
"url": {
"raw": "https://pokeapi.co/api/v2/pokemon/?offset=20&limit=20",
"protocol": "https",
"host": [
"pokeapi",
"co"
],
"path": [
"api",
"v2",
"pokemon",
""
],
"query": [
{
"key": "offset",
"value": "20"
},
{
"key": "limit",
"value": "20"
}
]
}
},
"response": []
},
{
"name": "Get Pokemon Info",
"request": {
"method": "GET",
"header": [],
"url": {
"raw": "https://pokeapi.co/api/v2/pokemon/:id/",
"protocol": "https",
"host": [
"pokeapi",
"co"
],
"path": [
"api",
"v2",
"pokemon",
":id",
""
],
"variable": [
{
"key": "id",
"value": ""
}
]
}
},
"response": []
},
{
"name": "Get Pokemon Stats",
"request": {
"method": "GET",
"header": [],
"url": {
"raw": "https://pokeapi.co/api/v2/stat/:name/",
"protocol": "https",
"host": [
"pokeapi",
"co"
],
"path": [
"api",
"v2",
"stat",
":name",
""
],
"variable": [
{
"key": "name",
"value": ""
}
]
}
},
"response": []
},
{
"name": "Get Moves",
"request": {
"method": "GET",
"header": [],
"url": {
"raw": "https://pokeapi.co/api/v2/move/:id/",
"protocol": "https",
"host": [
"pokeapi",
"co"
],
"path": [
"api",
"v2",
"move",
":id",
""
],
"variable": [
{
"key": "id",
"value": "2"
}
]
}
},
"response": []
},
{
"name": "Get Types",
"request": {
"method": "GET",
"header": [],
"url": {
"raw": "https://pokeapi.co/api/v2/type/:id/",
"protocol": "https",
"host": [
"pokeapi",
"co"
],
"path": [
"api",
"v2",
"type",
":id",
""
],
"variable": [
{
"key": "id",
"value": "1"
}
]
},
"description": "Get Types"
},
"response": []
}
]
}
54 changes: 43 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,48 @@
# POKEDEX

Nome dos integrantes:
- Pessoa 1
- Pessoa 2
- Pessoa 3
### Nome dos integrantes:

Link do Surge: www.link.com.br
- Ástrid Bemporad
- Diego Galdino
- Victor Cardoso Pudo Torres

O que funciona:
- Item 1
- Item 2
### Dependêcias:
- Axios
- React-icons
- React-router-dom
- Chakra-UI

O que não funciona:
- Item 3
- Item 4
### API:
https://pokeapi.co

### Link do Surge:
http://exotic-beef.surge.sh

### O que funciona:
- pokéContext
- pokéProvider
- getPokémons
- pokéDex
- addToPokéDex
- removeFromPokéDex
- pokémonDetails
- imagem da arte do pokémon em details
- tag de color baseada no tipo do pokémon em details
- localStorage do pokéDex
- navegação entre as páginas com rotas e coordinator
- validação do addToPokéDex
- botões condicionais no cardPokémon
- componentes genéricos de uso: cardPokémon e button
- tema global de estilização
- tipografia no tema global
- toaster de sucesso com addToPokéDex
- toaster de warning com removeFromPokéDex
- spinner de carregamento para requisições get
- grid na homePage e pokéDex para cards
- versão normal e shiny mostradas em details
- responsivo para desktop & tablet

### O que não funciona:
- limpar pokéDex inteira
- paginação da homePage do desafio
- batalha pokémon do desafio
Loading