Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
1186cc1
Esqueleto
May 2, 2022
8dcbd7a
Merge pull request #1 from future4code/Desenvolvimento
martinelle-dev May 2, 2022
3612e7d
Adicionando a colecao do Postman
lisfribeiro May 2, 2022
07b55bc
Merge pull request #2 from future4code/Desenvolvimento
lisfribeiro May 2, 2022
89e711f
Atualizacao README projeto
lisfribeiro May 2, 2022
a633f59
hook (useRequestData)
lisfribeiro May 4, 2022
92c6691
Merge pull request #3 from future4code/parte-Lis
lisfribeiro May 4, 2022
9e76014
Base para os stats e types concluída e criação do theme do chackra
LayaneB May 4, 2022
663c3af
Merge branch 'Desenvolvimento' of https://github.com/future4code/Shaw…
LayaneB May 4, 2022
57ffad3
Ajustes no types
LayaneB May 4, 2022
2cad713
Merge pull request #4 from future4code/layane-detailsPage
martinelle-dev May 4, 2022
a04cb4e
Global State + constant
lisfribeiro May 4, 2022
72f094b
Merge pull request #5 from future4code/parte-Lis
lisfribeiro May 4, 2022
e4baa0d
Header 99%
May 5, 2022
c10085e
Conflito
May 5, 2022
131ef85
Merge pull request #6 from future4code/Matheus-Header
martinelle-dev May 5, 2022
f76332b
Conclusão da página de detalhes
LayaneB May 5, 2022
be4cfcc
Merge pull request #7 from future4code/layane-detailsPage
martinelle-dev May 5, 2022
85ac625
Header 99%, falta contagem da pokédex
May 5, 2022
2fbb675
Merge pull request #8 from future4code/Matheus-Header
LayaneB May 5, 2022
ade93e3
Cards renderizados Home
lisfribeiro May 5, 2022
f7d60ab
Resolvendo conflito
lisfribeiro May 5, 2022
bbbc721
Merge pull request #9 from future4code/parte-Lis
lisfribeiro May 5, 2022
52a0a55
Ajustes-parte1
LayaneB May 5, 2022
717d509
Merge pull request #10 from future4code/layane-detailsPage
martinelle-dev May 5, 2022
61a569e
Ajustes - parte2
LayaneB May 5, 2022
0789c90
Merge pull request #11 from future4code/layane-detailsPage
LayaneB May 5, 2022
a926f15
Adicionando os icons dos tipos
LayaneB May 5, 2022
6cd7935
Merge pull request #12 from future4code/layane-typesIcons
LayaneB May 5, 2022
d89023e
Imagem das pokebolas
LayaneB May 5, 2022
67b0cef
Merge pull request #13 from future4code/layane-typesIcons
LayaneB May 5, 2022
908121e
ajustes cards
lisfribeiro May 5, 2022
a1aa7de
Ajustes-parte3
LayaneB May 5, 2022
f31837b
Merge pull request #14 from future4code/layane-detailsPage
LayaneB May 5, 2022
7984da6
Começando Footer
May 5, 2022
cd18f90
Merge branch 'Desenvolvimento' of https://github.com/future4code/Shaw…
May 5, 2022
7682d42
Header falta botão voltar, Footer OK, Implementados em Pages
May 6, 2022
05c46e9
Merge pull request #15 from future4code/Matheus-Header
martinelle-dev May 6, 2022
516f7c0
Cards estilizados
lisfribeiro May 6, 2022
d2b2062
Merge branch 'Desenvolvimento' into parte-Lis
lisfribeiro May 6, 2022
d83c74f
Merge pull request #16 from future4code/parte-Lis
lisfribeiro May 6, 2022
380758e
Footer att, Style Card att
May 6, 2022
2be093e
Adicionando a Paginação
LayaneB May 6, 2022
70d7338
Merge pull request #18 from future4code/Matheus-Header
martinelle-dev May 6, 2022
cfb6cf0
Merge pull request #17 from future4code/layane-pagination
lisfribeiro May 6, 2022
4b916c3
Revert "Matheus header"
LayaneB May 6, 2022
f0e4e18
Merge pull request #19 from future4code/revert-18-Matheus-Header
LayaneB May 6, 2022
6277fb4
subindo att footer e card
May 6, 2022
2d1b250
Merge pull request #20 from future4code/Matheus-Header
martinelle-dev May 6, 2022
0f7bfcd
ajustes home e card
LayaneB May 6, 2022
26d74bd
ajustes gerais
LayaneB May 6, 2022
8a4b7d8
Merge pull request #21 from future4code/layane-pagination
LayaneB May 6, 2022
09d3c32
Pokedex
lisfribeiro May 6, 2022
2dee02c
Merge pull request #22 from future4code/Lis-Pokedex
lisfribeiro May 6, 2022
fbf7c0f
Página de erro
May 7, 2022
c4318f1
Merge branch 'Desenvolvimento' of https://github.com/future4code/Shaw…
May 7, 2022
d47cfea
Update README.md
LayaneB May 7, 2022
3b0a768
Organização...
May 7, 2022
6a3060a
Merge pull request #23 from future4code/Ajustes-Matheus
martinelle-dev May 7, 2022
89e5d41
loading e ajustes
LayaneB May 7, 2022
42f9652
Merge pull request #24 from future4code/layane-loading
LayaneB May 7, 2022
78686ab
att Pokémon Stats
May 7, 2022
60da965
Merge pull request #25 from future4code/Ajustes-Matheus
martinelle-dev May 7, 2022
b0b6556
Pokedex vazia
lisfribeiro May 7, 2022
79ad5d2
Merge branch 'Desenvolvimento' into Lis-Pokedex
lisfribeiro May 7, 2022
fb2c82b
Declaração de solicitação de extração #26 de future4code/Lis-Pokedex
lisfribeiro May 7, 2022
f64c887
att pokedexpage
May 7, 2022
3260561
Merge branch 'Desenvolvimento' into Ajustes-Matheus
martinelle-dev May 7, 2022
b27ba41
Merge pull request #27 from future4code/Ajustes-Matheus
martinelle-dev May 7, 2022
c53f646
Att
May 7, 2022
e51e7d2
Merge pull request #28 from future4code/Ajustes-Matheus
martinelle-dev May 7, 2022
66300c1
correção do armazenamento no local storage
LayaneB May 8, 2022
d887529
correção botão de voltar do header
LayaneB May 8, 2022
0839712
correção largura máxima pokédex
LayaneB May 8, 2022
b8f7770
Update README.md
LayaneB May 8, 2022
4150cf7
Merge pull request #29 from future4code/layane-ajustes
LayaneB May 8, 2022
16826c8
Resolvendo o merging
LayaneB May 8, 2022
6304c2c
paginação fixa
LayaneB May 8, 2022
03bdc7a
Merge pull request #31 from future4code/layane-ajustesPag
LayaneB May 8, 2022
484b33f
Update README.md
martinelle-dev May 9, 2022
7b7cb3a
Update README.md
martinelle-dev May 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
Binary file added .DS_Store
Binary file not shown.
80 changes: 68 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,72 @@
# POKEDEX
# 💻 Projeto Pokédex

Nome dos integrantes:
- Pessoa 1
- Pessoa 2
- Pessoa 3
<center>
<img src="https://1hitgames.com/wp-content/uploads/2020/05/4747613-8059908709-Scree.png" width="100%" height="350" />
</center

Link do Surge: www.link.com.br
<br>

## :dart: Objetivo do projeto:
A ideia é usar a Poke Api como fonte de dados para o projeto. Ela é uma API pública, bastante utilizada como fonte de dados para aplicações focadas em aprendizado de programação. Assim o objetivo é criar um site sobre Pokémon com o intuito de aplicar os conhcemintos adquiridos ao longo da décima primeira semana do bootcamp de desenvolvimento web fullstack da Labenu. O foco principal desse projeto foi aplicar os conhecimentos sobre: Estado Global, React Context, Providers e Consumers, Hook useContext, Organização dos dados e do componente de Estado Global. Consequentemente contribuiu para fixar conhcecimentos anteriores sobre o desenvolvimento com React.

O que funciona:
- Item 1
- Item 2
## :small_blue_diamond: Requisitos do projeto:

- **Home**
- Receber uma lista de Pokémon vinda da API;
- Poder adicionar o Pokémon em sua Pokédex;
- Poder acessar os detalhes clicando naquele Pokémon;
- Não conseguir adicionar o mesmo Pokémon duas vezes na Pokédex;
- Ao adicionar o Pokémon, o botão deve mudar para remover da Pokédex;
- Poder acessar a Pokédex.

- **Pokédex**
- Ver os Pokémon adicionados;
- Poder remover o Pokémon da Pokédex;
- Poder acessar os detalhes clicando naquele Pokémon;
- Poder voltar pra Home.

- **Detalhes do Pokemon**
- Ver imagens do Pokémon;
- Ver o tipo do Pokémon;
- Ver as estatísticas do Pokémon;
- Ver uma tabela de movimentos do Pokémon;
- Poder voltar para as outras páginas.

<br>

O que não funciona:
- Item 3
- Item 4
## ✍️ Wireframe:
[Wireframe (protótipo das páginas).](https://github.com/future4code/Shaw-pokedex1/files/8648275/Pokedex.team.library.pdf)

## ⚙️ Funcionalidades:
- Header dinâmico: Botões para transitar entre as páginas de batalha, pokédex, home e um botão de voltar de acordo com a página na qual ele está sendo renderizado;
- Páginação: São renderizados ao todo 898 pokémon, sendo 21 por página;
- Cards: Ao clicar na imagem do pokémon o usuário é redirecionado para a tela de detalhes do mesmo, além disso ele pode adicionar ou remover um pokémon da pokédex ao clicar na pokebola;
- Pokédex: Renderiza todos os pokémon que foram capturados e permite que o usuário os remova da mesma, também permitindo acessar a página de detalhes do respectivo pokémon;
- Página de Detalhes: Rederiza os detalhes do pokémon que o usuário clicou na home ou na pokédex, além disso ele consegue transitar entre os detalhes de todos os pokémon ao clicar nas setas de próximo e anterior.

## :books: Bibliotecas utilizadas:
- [styled-components](https://styled-components.com/)
- [axios](https://github.com/axios/axios)
- [react-icons](https://react-icons.github.io/react-icons)
- [react-router-dom](https://v5.reactrouter.com/)
- [chackra ui](https://chakra-ui.com/)
- [ajna/pagination](https://www.npmjs.com/package/@ajna/pagination)

## 🔗 Link Surge:
[Acesse nosso site Pokédex clicando aqui!!!](http://pokedex-grupo1-shaw.surge.sh/)

## 📸 Imagens:

#### DESKTOP

![image](https://user-images.githubusercontent.com/50851374/167298952-4509cda7-dd6d-43d7-ae3e-ba9c56f3bb41.png)
![image](https://user-images.githubusercontent.com/50851374/167299012-feed2804-f668-481b-99ee-361da2e2106b.png)
![image](https://user-images.githubusercontent.com/50851374/167299195-21a2d44a-9c2c-47f7-bdfa-1d5dbdd53ec2.png)
![image](https://user-images.githubusercontent.com/50851374/167299272-dcbe50ee-cbff-4387-8f7b-bfa877cfd268.png)
![image](https://user-images.githubusercontent.com/50851374/167299308-126e8dbf-0fbe-4bce-8ac5-b995e73dac3e.png)
![image](https://user-images.githubusercontent.com/50851374/167299327-b516171f-d9e4-4ae4-b8c6-7c4248ad3b5b.png)

## 👨‍💻 Desenvolvedores:

| [<img src="https://avatars.githubusercontent.com/u/50851374?v=4" width=115><br><sub>Layane Bastos Juvito</sub>](https://github.com/LayaneB) | [<img src="https://avatars.githubusercontent.com/u/99182969?v=4" width=115><br><sub>Lis Fernanda Ribeiro dos Santos</sub>](https://github.com/lisfribeiro) | [<img src="https://avatars.githubusercontent.com/u/98998030?v=4" width=115><br><sub>Matheus Martinelle Barros</sub>](https://github.com/MatthsMB) |
| :---: | :---: | :---: |
23 changes: 23 additions & 0 deletions pokedex/.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*
87 changes: 87 additions & 0 deletions pokedex/Pokedex Collection/Pokedex_collection.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
{
"info": {
"_postman_id": "e562d2bd-3d9e-4c65-b0a0-9c7b908a9a3e",
"name": "Pokedex",
"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
},
"item": [
{
"name": "Get All Pokemon",
"request": {
"method": "GET",
"header": [],
"url": {
"raw": "https://pokeapi.co/api/v2/pokemon/1",
"protocol": "https",
"host": [
"pokeapi",
"co"
],
"path": [
"api",
"v2",
"pokemon",
"1"
]
}
},
"response": []
},
{
"name": "Get Pokemon By Id",
"request": {
"method": "GET",
"header": [],
"url": {
"raw": "https://pokeapi.co/api/v2/pokemon/:idPokemon",
"protocol": "https",
"host": [
"pokeapi",
"co"
],
"path": [
"api",
"v2",
"pokemon",
":idPokemon"
],
"variable": [
{
"key": "idPokemon",
"value": null
}
]
}
},
"response": []
},
{
"name": "Get Pokemon By Name",
"request": {
"method": "GET",
"header": [],
"url": {
"raw": "https://pokeapi.co/api/v2/pokemon/:namePokemon",
"protocol": "https",
"host": [
"pokeapi",
"co"
],
"path": [
"api",
"v2",
"pokemon",
":namePokemon"
],
"variable": [
{
"key": "namePokemon",
"value": null
}
]
}
},
"response": []
}
]
}
70 changes: 70 additions & 0 deletions pokedex/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
# Getting Started with Create React App

This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).

## Available Scripts

In the project directory, you can run:

### `npm start`

Runs the app in the development mode.\
Open [http://localhost:3000](http://localhost:3000) to view it in your browser.

The page will reload when you make changes.\
You may also see any lint errors in the console.

### `npm test`

Launches the test runner in the interactive watch mode.\
See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.

### `npm run build`

Builds the app for production to the `build` folder.\
It correctly bundles React in production mode and optimizes the build for the best performance.

The build is minified and the filenames include the hashes.\
Your app is ready to be deployed!

See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.

### `npm run eject`

**Note: this is a one-way operation. Once you `eject`, you can't go back!**

If you aren't satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.

Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you're on your own.

You don't have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn't feel obligated to use this feature. However we understand that this tool wouldn't be useful if you couldn't customize it when you are ready for it.

## Learn More

You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).

To learn React, check out the [React documentation](https://reactjs.org/).

### Code Splitting

This section has moved here: [https://facebook.github.io/create-react-app/docs/code-splitting](https://facebook.github.io/create-react-app/docs/code-splitting)

### Analyzing the Bundle Size

This section has moved here: [https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size](https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size)

### Making a Progressive Web App

This section has moved here: [https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app](https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app)

### Advanced Configuration

This section has moved here: [https://facebook.github.io/create-react-app/docs/advanced-configuration](https://facebook.github.io/create-react-app/docs/advanced-configuration)

### Deployment

This section has moved here: [https://facebook.github.io/create-react-app/docs/deployment](https://facebook.github.io/create-react-app/docs/deployment)

### `npm run build` fails to minify

This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify)
Loading