Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
121 commits
Select commit Hold shift + click to select a range
85a32cd
esqueleto
AnaKarine27 Mar 7, 2022
45d5494
paginas
AnaKarine27 Mar 7, 2022
299e7e9
demais pastas
AnaKarine27 Mar 7, 2022
c371052
imagemnavegador
AnaKarine27 Mar 7, 2022
c81f133
rotas
AnaKarine27 Mar 8, 2022
244e359
home
GledsonLucas111 Mar 8, 2022
4975eed
Merge pull request #1 from future4code/gledson
GledsonLucas111 Mar 8, 2022
8c3febe
estado global
GledsonLucas111 Mar 9, 2022
8dbea4d
Merge pull request #2 from future4code/gledson
GledsonLucas111 Mar 9, 2022
635918e
passando por props da home pro componente cardPokemon
GledsonLucas111 Mar 9, 2022
a930319
Merge pull request #3 from future4code/gledson
GledsonLucas111 Mar 9, 2022
8f8cc5c
subindo nada
AnaKarine27 Mar 9, 2022
caf8b17
pokedex
GeysonMes Mar 9, 2022
0ea770a
asa
GledsonLucas111 Mar 9, 2022
f9bec50
Merge pull request #4 from future4code/karine
GledsonLucas111 Mar 9, 2022
dd75fc8
ass
GledsonLucas111 Mar 9, 2022
4824e0f
master
GledsonLucas111 Mar 9, 2022
a85363e
atualizando
GledsonLucas111 Mar 9, 2022
213c6e9
Merge pull request #6 from future4code/gledson
GledsonLucas111 Mar 9, 2022
8c6148f
renderizacao quase ok
AnaKarine27 Mar 9, 2022
b3b8991
Merge pull request #7 from future4code/karine
GledsonLucas111 Mar 10, 2022
3b1a706
Revert "renderizacao detalhes quase ok"
GledsonLucas111 Mar 10, 2022
045ad1f
Merge pull request #8 from future4code/revert-7-karine
GledsonLucas111 Mar 10, 2022
f4a70c2
resolvendo probelma
GeysonMes Mar 10, 2022
0d209f5
resolvendo conflitos
GeysonMes Mar 10, 2022
a1a4a45
subindooo detalhes
AnaKarine27 Mar 10, 2022
31380cf
carrinho pokedex
GeysonMes Mar 10, 2022
09c003c
Merge pull request #10 from future4code/geyson
AnaKarine27 Mar 10, 2022
2d98c56
salvando
AnaKarine27 Mar 10, 2022
ddd543f
conflitos
AnaKarine27 Mar 10, 2022
4a9cd72
salvando alteracoes
GeysonMes Mar 10, 2022
92e1977
Merge branch 'master' into geyson
GeysonMes Mar 10, 2022
86163df
tentando subir detalhes :(
AnaKarine27 Mar 10, 2022
8ffddb0
Merge pull request #11 from future4code/karine
GeysonMes Mar 10, 2022
89da44e
alterações
GeysonMes Mar 10, 2022
fc70f79
carrinho pronto
GeysonMes Mar 10, 2022
09911ff
mudando imagem
AnaKarine27 Mar 11, 2022
f5b669e
Merge pull request #12 from future4code/karine
GledsonLucas111 Mar 11, 2022
ecd1e93
cards pokemons
GledsonLucas111 Mar 11, 2022
c9d4247
resolvendo conflitos
GledsonLucas111 Mar 11, 2022
bed3f8b
atual
GledsonLucas111 Mar 11, 2022
09cb429
Merge pull request #13 from future4code/gledson
AnaKarine27 Mar 11, 2022
3174c4c
para dar pull
AnaKarine27 Mar 11, 2022
88457cc
Merge branch 'master' into karine
AnaKarine27 Mar 11, 2022
fcff00d
nada
GeysonMes Mar 11, 2022
5df11b1
funcção adicionnar
GeysonMes Mar 11, 2022
a0aaedf
um pouco de estilo
AnaKarine27 Mar 11, 2022
768e6bd
Merge pull request #14 from future4code/geyson
AnaKarine27 Mar 11, 2022
5d980a0
Merge branch 'master' into karine
AnaKarine27 Mar 11, 2022
fa1bb7a
Merge pull request #15 from future4code/karine
AnaKarine27 Mar 11, 2022
27da78f
as
GledsonLucas111 Mar 11, 2022
fc2a60e
resolvendo conflitos
GledsonLucas111 Mar 11, 2022
731f6a0
header
AnaKarine27 Mar 11, 2022
b5d6433
header
AnaKarine27 Mar 11, 2022
bae090e
Merge pull request #16 from future4code/karine
AnaKarine27 Mar 11, 2022
efdd63b
complemento
GeysonMes Mar 11, 2022
27ea256
sedf
GeysonMes Mar 12, 2022
86881ff
subindo
GeysonMes Mar 12, 2022
26d0216
Merge pull request #17 from future4code/geyson
AnaKarine27 Mar 12, 2022
7a04eb6
salvando
AnaKarine27 Mar 12, 2022
4834bd1
Merge branch 'master' into karine
AnaKarine27 Mar 12, 2022
d041b42
alteracoes
GledsonLucas111 Mar 12, 2022
3bfb12b
resolvendo conflitos
GledsonLucas111 Mar 12, 2022
50c6052
Merge pull request #18 from future4code/gledson
GledsonLucas111 Mar 12, 2022
fe34671
barra de status
AnaKarine27 Mar 12, 2022
0ab1701
Merge branch 'master' into karine
AnaKarine27 Mar 12, 2022
7b18fd4
remmover funcao
GeysonMes Mar 12, 2022
5226d3e
finalizando estilo
AnaKarine27 Mar 12, 2022
d639419
salvando
AnaKarine27 Mar 13, 2022
0110aad
Merge pull request #19 from future4code/geyson
AnaKarine27 Mar 13, 2022
7bf1f02
Merge branch 'master' into karine
AnaKarine27 Mar 13, 2022
b3757c8
Merge pull request #20 from future4code/karine
AnaKarine27 Mar 13, 2022
3be5595
Merge branch 'master' into karine
AnaKarine27 Mar 13, 2022
2c4b4d5
ajustes
AnaKarine27 Mar 13, 2022
0a44ff1
Merge pull request #21 from future4code/karine
AnaKarine27 Mar 13, 2022
83265d7
as
GledsonLucas111 Mar 13, 2022
79d1e12
as
GledsonLucas111 Mar 13, 2022
5d8a81a
conflitos
GledsonLucas111 Mar 13, 2022
90ad371
pagina de erro
AnaKarine27 Mar 13, 2022
9b96cbe
Merge pull request #22 from future4code/karine
AnaKarine27 Mar 13, 2022
6ce5831
pokedex vazia ou com pokemons
GeysonMes Mar 13, 2022
7b904f7
estilo e responsividade
AnaKarine27 Mar 13, 2022
90f9103
Merge pull request #24 from future4code/karine
AnaKarine27 Mar 13, 2022
a6a31aa
Merge pull request #23 from future4code/geyson
AnaKarine27 Mar 13, 2022
6d761e5
Update README.md
AnaKarine27 Mar 13, 2022
fbb63d5
Update README.md
AnaKarine27 Mar 13, 2022
d4cbc91
Update README.md
AnaKarine27 Mar 13, 2022
8f53366
Update README.md
AnaKarine27 Mar 13, 2022
0908061
Update README.md
AnaKarine27 Mar 13, 2022
3441f11
Update README.md
AnaKarine27 Mar 13, 2022
662ff04
Update README.md
AnaKarine27 Mar 13, 2022
4b1ffe3
teste
AnaKarine27 Mar 13, 2022
56f3c05
Merge pull request #25 from future4code/karine
AnaKarine27 Mar 13, 2022
f27f654
Update README.md
AnaKarine27 Mar 13, 2022
62d0cb3
Update README.md
AnaKarine27 Mar 13, 2022
c4b11aa
Update README.md
AnaKarine27 Mar 13, 2022
552246c
Update README.md
AnaKarine27 Mar 13, 2022
8daf1c7
as
GledsonLucas111 Mar 13, 2022
584d23b
resolvendo conflitos
GledsonLucas111 Mar 13, 2022
746a171
Update README.md
AnaKarine27 Mar 13, 2022
675909c
Update README.md
AnaKarine27 Mar 13, 2022
a898df6
Update README.md
AnaKarine27 Mar 13, 2022
ab83b14
asasas
GledsonLucas111 Mar 14, 2022
2d13e71
Merge pull request #26 from future4code/gledson
GledsonLucas111 Mar 14, 2022
23c450a
comitando para pull
AnaKarine27 Mar 14, 2022
3a1047e
Update README.md
AnaKarine27 Mar 14, 2022
ebf506e
to com sonoo
AnaKarine27 Mar 14, 2022
907bbcc
Merge pull request #27 from future4code/karine
AnaKarine27 Mar 14, 2022
c6121d3
assas
GledsonLucas111 Mar 14, 2022
a5679f2
ultimas alteracoes
GledsonLucas111 Mar 14, 2022
60e808c
Merge pull request #28 from future4code/gledson
GledsonLucas111 Mar 14, 2022
88b9184
as
GledsonLucas111 Mar 14, 2022
b4c976b
Merge pull request #29 from future4code/gledson
GledsonLucas111 Mar 14, 2022
4c3cff8
Update README.md
AnaKarine27 Mar 14, 2022
0dc9156
Update README.md
AnaKarine27 Mar 14, 2022
e4d3d03
Update README.md
AnaKarine27 Mar 14, 2022
73b64a6
Update README.md
AnaKarine27 Mar 14, 2022
abfa4f2
Update README.md
AnaKarine27 Mar 14, 2022
852b0ec
Update README.md
AnaKarine27 Mar 14, 2022
1cff702
Update README.md
AnaKarine27 Mar 14, 2022
f9bcde3
Update README.md
AnaKarine27 Apr 8, 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
131 changes: 119 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,123 @@
# POKEDEX
<h1 id= "top" align="center"><img src="https://user-images.githubusercontent.com/94838711/158078960-ab5d5a98-be1b-4ee1-a17b-c41a847fa338.png" />
</h1>

Nome dos integrantes:
- Pessoa 1
- Pessoa 2
- Pessoa 3
<p align="center">
<a href="#sobre">Sobre</a> &#xa0; | &#xa0;
<a href="#funciona">O que funciona</a> &#xa0; | &#xa0;
<a href="#nao-funciona">O que não funciona</a> &#xa0; | &#xa0;
<a href="#pendente">Em desenvolvimento</a> &#xa0; | &#xa0;
<a href="#imagens">Imagens do Site</a> &#xa0; | &#xa0;
<a href="#desenvolvedores">Desenvolvedores</a>
</p>

Link do Surge: www.link.com.br
<h2 id="sobre">:notebook: Sobre </h2>

O que funciona:
- Item 1
- Item 2
<p align="center">🖥️ Projeto desenvolvido conforme proposta do bootcamp ministrado pela Labenu baseado em React JS, para o desenvolvimento de um web site inspirado na Pokédex do anime Pokémon. Nele você pode criar sua própria pokédex com os seus pokémons preferidos. </p>

O que não funciona:
- Item 3
- Item 4
<h2 id="link">:link: Link Surge - link para visualização do site</h2>
<a href="https://pokedex-vaughan3.surge.sh">PokeDéx</a>

<h2 id="tecnologias"> 🛠 Tecnologias </h2>

Ferramentas usadas na construção do projeto:

* React JS
* Styled-components
* Chakra UI Design System
* Customs e React Hooks
* React Router DOM
* Integração com API
* Axios

<h2 id="funciona">:heavy_check_mark: O que funciona</h2>
<h3> 👤 Header</h3>

* Possui um botão que direciona para página home
* Possui um botão que direciona para pokedéx

<h3>🏠 Página Home</h3>

* Mostra a lista de pokemons ao usuário
* Botão de adicionar o pokemon à pokedéx
* Botão de ver os detalhes de um pokemon

<h3>🔮 Página Pokedéx</h3>

* Mostra a lista de pokemons adicionados pelo usuário
* Botão de remover o pokemon da pokedéx
* Botão de ver os detalhes de um pokemon
* Quando a pokedéx está vazia, isso é mostrado ao usuário

<h3>👀 Página de Detalhes<h3>

<h4>

* Mostra o nome e imagem frontal do pokemon
* Mostra o stats (HP, ataque, defesa, ataque especial, defesa especial, velocidade)
* Mostra o tipo do pokemon
* Mostra os principais movimentos/ataques do pokemon

</h4>

<h3>➕ Outras funcionalidades</h3>

* Responsividade para mobile
* Caso o usuário digite uma url inválida o mesmo será direcionado para a página de erro
* Paginação

<h2 id="nao-funciona">:x: O que não funciona</h2>

* Ao clicar no botão de adicionar, o card do Pokemon clicado deve desaparecer da tela (Página Home);
* Botão para adicionar ou remover o pokemon da Pokedex a partir da página de detalhes (Página de Detalhes);

<h2 id="pendente">:construction: Em desenvolvimento</h2>

- [ ] Ao clicar no botão de adicionar, o card do Pokemon clicado deve desaparecer da tela (Página Home);
- [ ] Botão para adicionar ou remover o pokemon da Pokedex a partir da página de detalhes (Página de Detalhes);
- [ ] Batalha dos pokemons

<h2 id="imagens"> 🖥️ Imagens do site (computador)</h2>

![2](https://user-images.githubusercontent.com/94838711/158102210-f85342d8-53f9-43ff-af1e-545cede78f28.png)

![1](https://user-images.githubusercontent.com/94838711/158102215-253ad9b9-114b-419e-94f6-bc458d3aebac.png)

![image](https://user-images.githubusercontent.com/94838711/158102496-9defe43f-7324-45c2-8e61-c420fac74f49.png)

![3](https://user-images.githubusercontent.com/94838711/158102217-041ecd64-6a31-4596-8b6f-cc325bc67267.png)

![image](https://user-images.githubusercontent.com/94838711/158102297-7fb2328b-3c6f-49fd-bcf7-be43ab0f819d.png)

<h2> 📱 Imagens do site (mobile)</h2>

![image](https://user-images.githubusercontent.com/94838711/158102630-0855cc00-cb4a-4396-bcec-7f7f26b81834.png)

![image](https://user-images.githubusercontent.com/94838711/158102677-29ec7bda-ba39-48e1-a12d-fc6494939cd1.png)

![image](https://user-images.githubusercontent.com/94838711/158102694-3c680fcd-aa80-453c-85b1-5fccaa9a3fd0.png)

![image](https://user-images.githubusercontent.com/94838711/158102710-be5ea9df-330b-4686-a526-4453371e7564.png)

![image](https://user-images.githubusercontent.com/94838711/158102728-3937c4ba-bd9a-4c3c-aa93-8d8f63469452.png)

<h2 id="desenvolvedores">:construction_worker: Desenvolvedores</h2>

<table>
<tr>

<td align="center"><a href="https://github.com/future4code/vaughan-Ana-Silva"><img style="border-radius: 50%" src="https://user-images.githubusercontent.com/94838711/158080211-ef52ad45-7600-4479-998b-f6c423de7576.png" width="100px" alt=""/>
<br />
<sub><b>Ana Karine</b></sub></a> <a href="https://github.com/future4code/vaughan-Ana-Silva">👩🏻‍💻</a></td>

<td align="center"><a href="https://github.com/future4code/vaughan-Geyson-Sousa"><img style="border-radius: 50%" src="https://user-images.githubusercontent.com/94838711/158080839-3526a9ab-2ccf-4278-bd97-6e4f8c1a424d.png" width="100px" alt=""/>
<br />
<sub><b>Geyson Mesquita</b></sub></a> <a href="https://github.com/future4code/vaughan-Geyson-Sousa">👨🏽‍💻</a></td>

<td align="center"><a href="https://github.com/future4code/vaughan-Gledson-Souto"><img style="border-radius: 50%" src="https://user-images.githubusercontent.com/94838711/158081019-60ba355e-131e-4b30-bf9f-c6ab73ea976c.png" width="100px" alt=""/>
<br />
<sub><b>Gledson Lucas</b></sub></a> <a href="https://github.com/future4code/vaughan-Gledson-Souto">🧑🏻‍💻</a></td>

</tr>
</table>

<a href="#top">Voltar para o topo 🔝</a>
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*
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