Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
a0d37e7
Projeto Iniciado, rotas definidas, pages criadas
Murilohim Oct 18, 2021
d158910
Update README.md
sarahromanhol Oct 18, 2021
394e000
Update README.md
sarahromanhol Oct 18, 2021
513724f
Update README.md
sarahromanhol Oct 18, 2021
d3bbeaa
Add files via upload
Dhenlok Oct 18, 2021
558f9da
Merge pull request #1 from future4code/lucas-api
Dhenlok Oct 18, 2021
6981d96
Adicionado DetailPage incompleta
Dhenlok Oct 20, 2021
19f865a
Layout da pokedex inicial
Murilohim Oct 20, 2021
e6fa80b
Merge pull request #2 from future4code/lucas-detailpage
Dhenlok Oct 20, 2021
ebde7af
Merge pull request #3 from future4code/murilo-estilizacaoPokedex
Dhenlok Oct 20, 2021
77fbd73
Estilização da Home e ajuste do Header
sarahromanhol Oct 20, 2021
bb09b5d
Merge pull request #4 from future4code/EstilizacaoHome-Sarah
sarahromanhol Oct 20, 2021
219b8d4
Adicionada requisições
Dhenlok Oct 20, 2021
4ae7066
Merge pull request #5 from future4code/lucas-requisicoes
Dhenlok Oct 20, 2021
0f4f7d6
Rotas organizadas
sarahromanhol Oct 20, 2021
2c2088a
Merge pull request #6 from future4code/AjusesRoutes-Sarah
sarahromanhol Oct 20, 2021
8a4990d
Context Global criado, estados de lista de pokemons, detalhes, e pokedex
Murilohim Oct 20, 2021
b1997a3
Header no pokedex, correção do context
Murilohim Oct 20, 2021
6de9245
Merge branch 'master' into globalState-Murilo
Murilohim Oct 20, 2021
e59b78c
Merge pull request #7 from future4code/globalState-Murilo
Murilohim Oct 20, 2021
4cc4b14
Finalizado
sarahromanhol Oct 20, 2021
f678151
Merge branch 'master' into PastaParaRequisicoes-Sarah
sarahromanhol Oct 20, 2021
adc9716
Merge pull request #8 from future4code/PastaParaRequisicoes-Sarah
sarahromanhol Oct 20, 2021
96f1016
ajustes
sarahromanhol Oct 20, 2021
6036cf9
Merge pull request #9 from future4code/AjustesGlobalContext-Sarah
sarahromanhol Oct 20, 2021
079416f
Ajustes detail page
Dhenlok Oct 21, 2021
a266038
sei la
Dhenlok Oct 21, 2021
5e0950e
Merge branch 'master' of https://github.com/future4code/maryam-pokedex5
Dhenlok Oct 21, 2021
e4f5cb1
Changesss
sarahromanhol Oct 21, 2021
a8868e7
Merge pull request #11 from future4code/AjustesGlobalContext-Sarah
sarahromanhol Oct 21, 2021
05b0f0a
Merge branch 'master' of https://github.com/future4code/maryam-pokedex5
Dhenlok Oct 21, 2021
ca95b72
Arrumando home com card de imagens de pokes
Murilohim Oct 21, 2021
36c6867
Merge branch 'master' of https://github.com/future4code/maryam-pokedex5
Dhenlok Oct 21, 2021
e74aa8a
Ajustes home
sarahromanhol Oct 22, 2021
f7acb5f
Pokemons adicionados à pokedex, renderização da imagem ao clicar na l…
Murilohim Oct 22, 2021
4fe8902
Merge pull request #12 from future4code/AjusterHome-Sarah
sarahromanhol Oct 22, 2021
9d80da8
...
Murilohim Oct 22, 2021
92bf014
Merge branch 'master' into funcionalidadePokedex-Murilo
Murilohim Oct 22, 2021
9ecd156
Merge pull request #13 from future4code/funcionalidadePokedex-Murilo
Murilohim Oct 22, 2021
64d3591
Details funcionando
Dhenlok Oct 22, 2021
dfc396d
Merge pull request #14 from future4code/lucas-funcaodetalhes
Dhenlok Oct 22, 2021
0f7d4f3
atualizacoes
sarahromanhol Oct 22, 2021
ac4f674
Merge pull request #15 from future4code/SelectHome-Sarah
sarahromanhol Oct 22, 2021
e6a04b4
Ajuste na home, useEffect global, pokemons adicionados e limpos da po…
Murilohim Oct 22, 2021
23f4bf3
Pagina de pokedex ajustada, com imagens e limpar pokedex
Murilohim Oct 22, 2021
c45c91a
Ajuste do código, e letras iniciais dos pokes
Murilohim Oct 22, 2021
ae20d24
Merge pull request #16 from future4code/ajustandoHome-Murilo
Murilohim Oct 22, 2021
a26bad0
Funcionalidade remover add, pokemon volta ao pokehome e ordenado com …
Murilohim Oct 22, 2021
a687655
Merge pull request #17 from future4code/funcaoRemoverPokedex-Murilo
Murilohim Oct 22, 2021
bb0f9dc
Botão funcional
Murilohim Oct 22, 2021
6e6482b
Merge pull request #18 from future4code/botaoDetalhesPokedex-Murilo
Murilohim Oct 22, 2021
8f8daad
Arrumando peso e altura, background e fonte
Murilohim Oct 23, 2021
7d34cf9
Merge pull request #19 from future4code/detailsPage-Murilo
Murilohim Oct 23, 2021
7f463be
ajuster
sarahromanhol Oct 23, 2021
9573fb1
Merge pull request #20 from future4code/AjusteSelect-Sarah
sarahromanhol Oct 23, 2021
7a2e776
Nome do site
Murilohim Oct 23, 2021
add9aa2
Merge branch 'master' of https://github.com/future4code/maryam-pokedex5
Murilohim Oct 23, 2021
2a9e05c
Update README.md
Murilohim Oct 23, 2021
02a47e7
Update README.md
Murilohim Oct 23, 2021
fdb02c0
Mexi na master
Murilohim Oct 24, 2021
0b3e324
Merge branch 'master' of https://github.com/future4code/maryam-pokedex5
Murilohim Oct 24, 2021
2a283df
Botões ajustados
Murilohim Oct 24, 2021
a300bc1
Merge pull request #21 from future4code/botoes-Murilo
Murilohim Oct 24, 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*
42 changes: 30 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,34 @@
# POKEDEX
# POKEDEV

Nome dos integrantes:
- Pessoa 1
- Pessoa 2
- Pessoa 3
O projeto Pokedev é baseado na utilização da API pública "Poke Api" para criar uma pokedex online, aonde o usuário do aplicativo, poderá através de uma lista personalizada adicionar, remover e visualizar os destalhes de determinados pokemons escolhidos para sua pokedex.

Link do Surge: www.link.com.br
* Listagem de Pokemons disponíveis na HomePage.
* Filtrar Pokemons por seu tipo.
* Adicionar Pokemons para a pokedex.
* Remover Pokemons adicionados na página da pokedex.
* Limpar toda a lista da pokedex.
* Detalhes de determinado pokemon.

O que funciona:
- Item 1
- Item 2
### LINK DO SITE
https://pokedev-labenu.surge.sh/

O que não funciona:
- Item 3
- Item 4
### LOGO
![PokeDev 905fe1d0](https://user-images.githubusercontent.com/84817937/138535643-9a88817a-2318-41d7-b089-43e49a70d65e.png)

### PALETA DE CORES
https://coolors.co/1c3144-fafafa-686963-e3f2fd-db5461

### NOME DOS INTEGRANTES

- Lucas Homero Sabino
- Murilo Terenciani Carolino
- Sarah Romanhol Falconiere

### PRINT DO SITE
![image](https://user-images.githubusercontent.com/84817937/138536308-1bb358f4-efb5-4241-a82c-5076e279b2df.png)
![image](https://user-images.githubusercontent.com/84817937/138536341-585895b6-db3f-4317-9b0b-b60126a87b45.png)
![image](https://user-images.githubusercontent.com/84817937/138536346-8811f7ef-6ac6-4b59-a7b6-96d762a7c56d.png)

### WIREFRAME

![PokeDex](https://user-images.githubusercontent.com/84152828/137816291-baaf940f-2d60-4cf3-b0a4-cb141ac93039.jpg)
64 changes: 64 additions & 0 deletions api-pokedex/Pokedex.postman_collection.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
{
"info": {
"_postman_id": "6a4ad754-aacb-4463-8cab-7501338f86ee",
"name": "Pokedex",
"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
},
"item": [
{
"name": "Get Pokemons (20)",
"request": {
"method": "GET",
"header": [],
"url": {
"raw": "https://pokeapi.co/api/v2/pokemon?",
"protocol": "https",
"host": [
"pokeapi",
"co"
],
"path": [
"api",
"v2",
"pokemon"
],
"query": [
{
"key": "",
"value": null
}
]
}
},
"response": []
},
{
"name": "Get Pokemon Detail",
"request": {
"method": "GET",
"header": [],
"url": {
"raw": "https://pokeapi.co/api/v2/pokemon/:name",
"protocol": "https",
"host": [
"pokeapi",
"co"
],
"path": [
"api",
"v2",
"pokemon",
":name"
],
"variable": [
{
"key": "name",
"value": null
}
]
}
},
"response": []
}
]
}
Loading