Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
5ff8e47
Postman, routers and screens
josevictorsss Feb 8, 2021
781d495
Update README.md
josevictorsss Feb 8, 2021
1017d8c
Merge pull request #1 from future4code/jose-branch
allisonaraujoo Feb 8, 2021
b919952
Component CardPokemon
josevictorsss Feb 8, 2021
ddf7e2e
Merge pull request #2 from future4code/cardpokemon
josevictorsss Feb 8, 2021
7b3798f
Router, Pagina de Erro, e Estilização Error
allisonaraujoo Feb 8, 2021
75de425
Feito o Header para todas as páginas
josevictorsss Feb 8, 2021
19d2c16
Style page details
Francianebrito Feb 9, 2021
6d0583a
Merge pull request #4 from future4code/Style-detayls
josevictorsss Feb 9, 2021
375930b
Merge branch 'master' into jose-header
josevictorsss Feb 9, 2021
4448cba
Merge pull request #3 from future4code/jose-header
josevictorsss Feb 9, 2021
8d6a17c
resolução de conflito
allisonaraujoo Feb 9, 2021
fe0b734
Merge pull request #5 from future4code/poke-allison
allisonaraujoo Feb 9, 2021
901c7de
Home/card Estilizados, Espaçamento no Hedear
allisonaraujoo Feb 9, 2021
9d48c88
Merge pull request #6 from future4code/poke-allison
josevictorsss Feb 9, 2021
34d7113
Atualizando style da pagina de detalhes
Francianebrito Feb 10, 2021
b927ea1
Atualizações
Francianebrito Feb 10, 2021
174599b
Merge pull request #7 from future4code/style-atual-details
josevictorsss Feb 10, 2021
a1fc734
Utilização do global state, renderização dos pokemons
josevictorsss Feb 10, 2021
401a7ca
Merge pull request #8 from future4code/globalstate-render
josevictorsss Feb 10, 2021
29aa9a5
COMMIT PARA O PULL
allisonaraujoo Feb 10, 2021
5dc41fd
Ajuste do card
allisonaraujoo Feb 10, 2021
84a1668
Merge pull request #9 from future4code/poke-allison
allisonaraujoo Feb 10, 2021
6001fe5
Botões de acordo com a Pagina
allisonaraujoo Feb 10, 2021
43ba178
Merge pull request #10 from future4code/poke-allison
allisonaraujoo Feb 10, 2021
720f354
Estilização do Button
allisonaraujoo Feb 10, 2021
16cf7ce
Merge pull request #11 from future4code/poke-allison
allisonaraujoo Feb 10, 2021
1b9b2f8
Function do goToPage por props antigo
allisonaraujoo Feb 10, 2021
ed0c7e1
Merge pull request #12 from future4code/poke-allison
allisonaraujoo Feb 10, 2021
b97b17b
Renderização dos pokemons escolhidos na pokedex
josevictorsss Feb 10, 2021
6d1926f
Merge pull request #13 from future4code/funcionais-pokedexpage
allisonaraujoo Feb 10, 2021
818150b
Adicionada a função de remover da pokedex
josevictorsss Feb 11, 2021
9e4752c
Merge pull request #14 from future4code/removefromprokedex
allisonaraujoo Feb 11, 2021
63c68cb
Botões de Add e Remove
allisonaraujoo Feb 11, 2021
19690c6
Merge pull request #15 from future4code/poke-allison
allisonaraujoo Feb 11, 2021
00aed5f
Create README.md
josevictorsss Feb 11, 2021
395e2cc
Animação de loading
josevictorsss Feb 11, 2021
aedd3d2
Merge pull request #16 from future4code/loading-animation
josevictorsss Feb 11, 2021
b2f63c3
Funcionalidades
Francianebrito Feb 12, 2021
66bb240
Merge pull request #17 from future4code/details
josevictorsss Feb 12, 2021
dd8c178
Primeira revisão no código
josevictorsss Feb 12, 2021
359158e
Merge pull request #18 from future4code/firstcheck
josevictorsss Feb 12, 2021
bed4c15
Update README.md
josevictorsss Feb 12, 2021
cb421a8
Create README.md
josevictorsss Feb 12, 2021
751ea65
Update README.md
josevictorsss Feb 12, 2021
bd4b599
Ajuste da fonte para pegar em todo o site
josevictorsss Feb 12, 2021
8f57aac
Merge pull request #19 from future4code/fontfix
josevictorsss Feb 12, 2021
37211db
Alterando para master
allisonaraujoo Feb 14, 2021
333785d
Melhoria de código do useLocation | Estilização do mobile | Ajuste do…
allisonaraujoo Feb 15, 2021
713599b
Merge pull request #20 from future4code/poke-allison
allisonaraujoo Feb 15, 2021
0713ed6
Update README.md
allisonaraujoo Feb 15, 2021
a4a63cb
Update README.md
allisonaraujoo Feb 15, 2021
8a03bfd
Botão voltar
Francianebrito Feb 22, 2021
c8adf9c
titulo
Francianebrito Feb 22, 2021
3f3d7b7
Merge pull request #22 from future4code/details-button
franciane-brito Feb 22, 2021
f2e55a7
Update README.md
franciane-brito Feb 22, 2021
1690033
Update README.md
josevictorsss Feb 23, 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
17 changes: 9 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
# POKEDEX

Nome dos integrantes:
- Pessoa 1
- Pessoa 2
- Pessoa 3
- Allison Araujo Marques Moreira
- Franciane Brito
- José Victor Tiburtino Ferreira

Link do Surge: www.link.com.br
Link do Surge: http://tearful-battle.surge.sh/

O que funciona:
- Item 1
- Item 2
- Visualização dos detalhes dos pokemons
- Adição de pokemons a sua pokedex
- Remoção de pokemons a sua pokedex
- responsividade

O que não funciona:
- Item 3
- Item 4
- Desafios.
23 changes: 23 additions & 0 deletions projeto-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 projeto-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 the browser.

The page will reload if you make edits.\
You will 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