Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
6c9bc6d
Instalação do App, styled e axios
AyrtonMedrano Jul 18, 2022
82d1471
Requisições do Postman - entrega 18/07
andressadarze Jul 18, 2022
cc1e4a8
Merge pull request #1 from future4code/andressa-postman
AyrtonMedrano Jul 18, 2022
e172667
router e cordinator feitos
AyrtonMedrano Jul 18, 2022
67edc5d
Merge pull request #2 from future4code/ayrton-router
davidshenrique Jul 18, 2022
bfe9380
icons importados
davidshenrique Jul 19, 2022
ea3d792
adicionado header e global styles
davidshenrique Jul 19, 2022
cdd5d90
header home estilizado mais estilizações menores
davidshenrique Jul 19, 2022
65c3d04
adicionada pequena responsividade no header home
davidshenrique Jul 19, 2022
a6b4d7a
adicionado animação ao logo e hover melhorado do botão header
davidshenrique Jul 19, 2022
688b1f4
Merge pull request #3 from future4code/david-henrique
davidshenrique Jul 19, 2022
53a398f
PokemonCards -> DetailsPage
andressadarze Jul 19, 2022
63b2b1f
Criação do card e styled
AyrtonMedrano Jul 19, 2022
47447fa
Merge pull request #5 from future4code/ayrton-cards
davidshenrique Jul 20, 2022
82a29e5
Merge branch 'master' into andressa-pokemon-cards
davidshenrique Jul 20, 2022
e3a2cfc
Merge pull request #4 from future4code/andressa-pokemon-cards
davidshenrique Jul 20, 2022
329a5bf
Acrescentei o GlobalState
andressadarze Jul 20, 2022
b814640
Merge branch 'master' into andressa-global-state
andressadarze Jul 20, 2022
6ada411
Merge pull request #6 from future4code/andressa-global-state
AyrtonMedrano Jul 20, 2022
533e402
Consegui adicionar Pokemons à Pokedex
andressadarze Jul 20, 2022
42508ff
Estilização do Ayrton
andressadarze Jul 20, 2022
61623ef
Merge pull request #7 from future4code/andressa-pokedex
AyrtonMedrano Jul 20, 2022
cccd1b1
Correções da estilização
AyrtonMedrano Jul 20, 2022
5d0b766
Merge pull request #8 from future4code/estilizacao-home
andressadarze Jul 21, 2022
dc21dd6
Tentando fazer a Pokedex guardar os Pokemons
andressadarze Jul 21, 2022
168d084
faltando mudar a cor do card
AyrtonMedrano Jul 21, 2022
15b9434
Merge pull request #9 from future4code/andressa-pokedex-storage
AyrtonMedrano Jul 22, 2022
be66393
Merge branch 'master' into estilizacao-home
AyrtonMedrano Jul 22, 2022
d5d0db3
Debug Clara
AyrtonMedrano Jul 22, 2022
a8e6a42
debug clara
AyrtonMedrano Jul 22, 2022
0f5ee5f
Finalizando a estilização e a branch
AyrtonMedrano Jul 22, 2022
87190de
Merge pull request #10 from future4code/estilizacao-home
andressadarze Jul 22, 2022
753064b
Deu mais certo o armazenamento da pokedex, salvar por enquanto
andressadarze Jul 22, 2022
ac0c423
Lógica final do storage da pokedex
andressadarze Jul 22, 2022
10b7e87
Cards incompletos na Pokedex
andressadarze Jul 22, 2022
714e19e
Merge pull request #11 from future4code/andressa-storage-pokedex
AyrtonMedrano Jul 22, 2022
cf49a11
Merge pull request #12 from future4code/andressa-pokedex-cards
AyrtonMedrano Jul 22, 2022
f6a32a0
comecando estilizacao pokedex
AyrtonMedrano Jul 22, 2022
a1e0774
Merge branch 'master' into ayrton-pokedex-estilizacao
AyrtonMedrano Jul 22, 2022
7e7ecec
Merge pull request #13 from future4code/ayrton-pokedex-estilizacao
AyrtonMedrano Jul 22, 2022
15f7b79
Estilização pokedex finalizada e responsividade implantada
AyrtonMedrano Jul 22, 2022
8f646a5
Update README.md
AyrtonMedrano Jul 22, 2022
59b044d
Update README.md
AyrtonMedrano Jul 22, 2022
5c15db3
Update README.md
AyrtonMedrano Jul 22, 2022
00c6ed7
Merge pull request #14 from future4code/ayrton-pokedex-estilizacao
andressadarze Jul 23, 2022
ad98979
Limpeza do código
andressadarze Jul 23, 2022
efcee81
Merge pull request #15 from future4code/andressa-cleaning-code
AyrtonMedrano Jul 24, 2022
36475d2
Implementação do Loading
AyrtonMedrano Jul 24, 2022
67b210a
página de detalhes finalizada mais algumas pequenas melhorias
davidshenrique Jul 24, 2022
9c3723b
Merge pull request #16 from future4code/ayrton-loading
davidshenrique Jul 24, 2022
c0778af
Merge branch 'master' into david-henrique-detalhes
davidshenrique Jul 24, 2022
a8f1ad8
Merge pull request #17 from future4code/david-henrique-detalhes
davidshenrique Jul 24, 2022
2b967ee
header detalhes
davidshenrique Jul 24, 2022
f603633
ajustes
davidshenrique Jul 24, 2022
50bb061
Merge branch 'master' of https://github.com/future4code/Alves-pokedex…
davidshenrique Jul 24, 2022
8572e24
ajustes
davidshenrique Jul 24, 2022
37fa04c
Merge pull request #18 from future4code/david-henrique-detalhes
davidshenrique Jul 24, 2022
c5a46ee
Update README.md
AyrtonMedrano Jul 25, 2022
5f3d43b
Update README.md
AyrtonMedrano Jul 25, 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
69 changes: 69 additions & 0 deletions Pokedex.postman_collection.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
{
"info": {
"_postman_id": "e2398e4d-e39b-4229-ad23-b4974de9b1d0",
"name": "Pokedex",
"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json",
"_exporter_id": "21556158"
},
"item": [
{
"name": "getAllPokemons",
"request": {
"method": "GET",
"header": [],
"url": {
"raw": "https://pokeapi.co/api/v2/pokemon?limit=20&offset=0",
"protocol": "https",
"host": [
"pokeapi",
"co"
],
"path": [
"api",
"v2",
"pokemon"
],
"query": [
{
"key": "limit",
"value": "20"
},
{
"key": "offset",
"value": "0"
}
]
}
},
"response": []
},
{
"name": "getPokemonDetails",
"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": ""
}
]
}
},
"response": []
}
]
}
42 changes: 30 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,34 @@
# POKEDEX
# POKEDEV
![image](https://user-images.githubusercontent.com/104565942/180577329-363bca4b-bb97-4057-b62f-a1f1237b9ac1.png)

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

Link do Surge: www.link.com.br
O projeto foi baseado na utilização da API pública PokeApi para acessar informações sobre pokémons, o usuário poderá através de uma lista personalizada adicionar, remover e visualizar os destalhes de determinados pokemons escolhidos para sua pokedex.

* Lista de Pokemons disponíveis na Home.
* Adicionar Pokemons para uma página separada (Pokedex).
* Remover os pokemons adicionados na pokedex.
* Detalhes de determinado pokemon.
* Aplicação disponível para telas mobile, tablets e desktop.

### LINK DO SITE
https://makeshift-grape.surge.sh

### NOME DOS DESENVOLVEDORES

- Andressa Urbano de Sousa Darzé
- Ayrton de Oliveira Medrano
- David Henrique Souza da Silva

### Prints das telas
![image](https://user-images.githubusercontent.com/104565942/180577627-2539ea0c-55de-4740-8138-c721e707dfb0.png)

![image](https://user-images.githubusercontent.com/104565942/180577695-91db8673-5c46-40e8-910d-f5d043e8c5ec.png)

![image](https://user-images.githubusercontent.com/104565942/180675306-52fffbd1-2950-4a42-bee9-79de32c9517f.png)

![image](https://user-images.githubusercontent.com/104565942/180577720-319ef731-b303-451a-a3f4-6677395e5efd.png)

![image](https://user-images.githubusercontent.com/104565942/180577770-98cd0208-b8f5-4937-9598-e0666c447785.png)


O que funciona:
- Item 1
- Item 2

O que não funciona:
- Item 3
- Item 4
6 changes: 6 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"dependencies": {
"axios": "^0.27.2",
"styled-components": "^5.3.5"
}
}
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