Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
6ca52a5
react base
paulogm15 Jul 18, 2022
f6927a3
Merge pull request #1 from future4code/paulo-inicial
lorransantos Jul 18, 2022
111729a
pages, routes, coordinator
alinegfchagas Jul 18, 2022
1729efd
pokeLogo
alinegfchagas Jul 18, 2022
f095e4b
header e pokeCard
alinegfchagas Jul 18, 2022
dc245c4
links postman
paulogm15 Jul 18, 2022
878ef0b
estrutura basica s/ estilizacao
paulogm15 Jul 19, 2022
7304e03
Merge pull request #2 from future4code/paulo-start
lorransantos Jul 19, 2022
5675032
Adicionei os ícones de cada elemento
lorransantos Jul 19, 2022
861cb78
Merge pull request #3 from future4code/adicionando-icones
lorransantos Jul 19, 2022
82e78fa
Adicionei o Header inicial
lorransantos Jul 19, 2022
b02aedf
Merge branch 'master' into header
lorransantos Jul 19, 2022
038f0e6
Merge pull request #4 from future4code/header
lorransantos Jul 19, 2022
ac48d32
url base
lorransantos Jul 19, 2022
b883641
Pagina detalhes, falta os moves do pokemon
lorransantos Jul 19, 2022
839bd35
estado global
alinegfchagas Jul 20, 2022
3540739
context e provider
alinegfchagas Jul 20, 2022
e07dae4
Merge pull request #5 from future4code/aline
lorransantos Jul 20, 2022
35d65f1
atualização estados detailList
alinegfchagas Jul 20, 2022
b1c5a9d
agora vai
alinegfchagas Jul 20, 2022
44c6996
adaptação com branch master
alinegfchagas Jul 20, 2022
53b7493
adaptação provider com branch master
alinegfchagas Jul 20, 2022
502a383
pokecard inicio
alinegfchagas Jul 20, 2022
b013906
Atualizações e testes de requisições no pokeCars.js
lorransantos Jul 20, 2022
90f900f
Merge pull request #6 from future4code/lorran-card-test
lorransantos Jul 20, 2022
888425c
Adicionei o componente Card, passei a props dos pokemons e iniciei a …
lorransantos Jul 21, 2022
3fdd67f
Merge pull request #7 from future4code/lorran-card-test
lorransantos Jul 21, 2022
58cea66
Modifiquei a estilização do pokeCard e do Card, pokeCard alterado de …
lorransantos Jul 21, 2022
36ec42d
Merge pull request #8 from future4code/lorran-card-test
lorransantos Jul 21, 2022
cf15a83
função addd pokedex
alinegfchagas Jul 21, 2022
4d89528
Função de alterar a cor do card de acordo com o tipo
lorransantos Jul 21, 2022
cfebbfa
Merge branch 'master' into lorran-card-test
lorransantos Jul 21, 2022
f788960
Merge pull request #9 from future4code/lorran-card-test
lorransantos Jul 21, 2022
2d948e9
vai dar merda?
alinegfchagas Jul 21, 2022
fc2a273
Merge branch 'master' into aline2
alinegfchagas Jul 21, 2022
90d3208
Merge pull request #10 from future4code/aline2
alinegfchagas Jul 21, 2022
dc93898
Corrigido o erro do type
lorransantos Jul 21, 2022
14bdbd4
Inicio da correção de cores de acordo com o tipo
lorransantos Jul 21, 2022
26d1a58
cores tipo pokemon
alinegfchagas Jul 21, 2022
6779503
icones tipo pokemon
alinegfchagas Jul 21, 2022
aee7a25
alteracoes no header e botoes funcionais
paulogm15 Jul 21, 2022
cdd7c57
Merge branch 'master' into paulo-header-botoes
lorransantos Jul 22, 2022
5821a5c
Merge pull request #11 from future4code/paulo-header-botoes
lorransantos Jul 22, 2022
a551305
Correção de bugs nas imagens
lorransantos Jul 22, 2022
b8c0b8d
Corrigido bug do details
lorransantos Jul 22, 2022
6cb3d54
Merge pull request #12 from future4code/lorran-rotas
lorransantos Jul 22, 2022
b4ae7fb
Atualizações no pokedex e header
lorransantos Jul 22, 2022
5153bbe
Merge pull request #13 from future4code/button-test
lorransantos Jul 22, 2022
cdafcad
Atualizei a página details e corrigi um bug na página pokedex
lorransantos Jul 22, 2022
88fe64e
Merge pull request #14 from future4code/icons-type
lorransantos Jul 22, 2022
8e788fc
remocao info temp da pagina de detalhes
paulogm15 Jul 22, 2022
8d306b7
Merge branch 'master' into paulo-detail
paulogm15 Jul 22, 2022
d42ef6f
Merge pull request #15 from future4code/paulo-detail
paulogm15 Jul 22, 2022
62301ed
Update README.md
alinegfchagas Jul 24, 2022
799be9e
Update README.md
alinegfchagas Jul 24, 2022
009e550
Update README.md
alinegfchagas Jul 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
23 changes: 15 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,23 @@

# POKEDEX

Nome dos integrantes:
- Pessoa 1
- Pessoa 2
- Pessoa 3
- Aline Gonçalves Fontes Chagas
- Lorran Christo dos Santos
- Paulo Gabriel Mendes dos Santos

Link do Surge: www.link.com.br
Link do Surge: https://dramatic-good-bye.surge.sh/

O que funciona:
- Item 1
- Item 2
- botão capturar, botão detalhes, visualização da pokedex


O que não funciona:
- Item 3
- Item 4
- não foi feito o botão "remover"
- botão capturar não desativa após o clique


![Screenshot from 2022-07-24 09-24-54](https://user-images.githubusercontent.com/104767043/180647058-924eea75-e66f-4495-ac2f-76ccd51f0f8c.png)
![Screenshot from 2022-07-24 09-24-47](https://user-images.githubusercontent.com/104767043/180647059-ca2e21ce-bfde-47a3-92ea-2da06e506f3d.png)
![Screenshot from 2022-07-24 09-24-41](https://user-images.githubusercontent.com/104767043/180647060-06ea3815-3846-4267-9af0-e5d198a203bb.png)
![Screenshot from 2022-07-24 09-30-08](https://user-images.githubusercontent.com/104767043/180647133-4e265c7d-fd2b-483f-8853-daabf092b1ef.png)
23 changes: 23 additions & 0 deletions pokedex7/.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 pokedex7/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