Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR de Correção #22

Open
wants to merge 58 commits into
base: correcao-projeto
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
4ac9968
iniciei a criação dos componentes visuais
AlvaroBarrosJunior Nov 23, 2020
0e84e6b
Merge pull request #1 from future4code/pokecard
Diegodossantos23 Nov 23, 2020
6621c00
continuando os componentes visuais
AlvaroBarrosJunior Nov 23, 2020
2b632e4
Merge pull request #2 from future4code/pokecard
vitorfarias001 Nov 23, 2020
ad919f1
Criei rotas para as tres paginas
Diegodossantos23 Nov 23, 2020
fda57c1
Adicionei a pasta zip com os endpoints necessario para o projeto
Diegodossantos23 Nov 23, 2020
2d2d19a
Criei o header e alinhei o conteudo principal da pagina
Diegodossantos23 Nov 23, 2020
e712287
Update
Diegodossantos23 Nov 24, 2020
c91f43f
Update
Diegodossantos23 Nov 24, 2020
10c9e30
Merge branch 'master' into semana11-projeto
vitorfarias001 Nov 24, 2020
e0330c5
Merge pull request #3 from future4code/semana11-projeto
Diegodossantos23 Nov 24, 2020
a743b2a
Update
Diegodossantos23 Nov 24, 2020
1d58c5e
adicionando_hooks
vitorfarias001 Nov 24, 2020
979a58a
Merge pull request #4 from future4code/projetoPokedex
vitorfarias001 Nov 24, 2020
28129df
erro
AlvaroBarrosJunior Nov 24, 2020
ed46130
Update
Diegodossantos23 Nov 25, 2020
b62345d
Merge branch 'master' into semana11-projeto
Diegodossantos23 Nov 25, 2020
1b69df6
Merge pull request #5 from future4code/semana11-projeto
Diegodossantos23 Nov 25, 2020
f2f0455
Realizei a refatoração utilizando global state
AlvaroBarrosJunior Nov 26, 2020
9724198
Merge branch 'master' into pokecard
AlvaroBarrosJunior Nov 26, 2020
5132fa6
Merge pull request #6 from future4code/pokecard
Diegodossantos23 Nov 26, 2020
92d4f4c
Update
Diegodossantos23 Nov 26, 2020
e7f3aa9
dd
Diegodossantos23 Nov 26, 2020
82a3d8c
dd
Diegodossantos23 Nov 26, 2020
3f69f66
gg
Diegodossantos23 Nov 26, 2020
93bb22c
Files Update
Diegodossantos23 Nov 26, 2020
af9c54d
Merge branch 'master' into semana11-projeto
Diegodossantos23 Nov 26, 2020
4e529bd
Merge pull request #7 from future4code/semana11-projeto
Diegodossantos23 Nov 26, 2020
387ad9d
resolvendo bugs
AlvaroBarrosJunior Nov 27, 2020
be7b2a7
Merge pull request #10 from future4code/history
Diegodossantos23 Nov 27, 2020
cce2949
Solved conflicts
Diegodossantos23 Nov 27, 2020
e80f2be
Update README.md
Diegodossantos23 Nov 27, 2020
776b174
subindo pra nuvem
Diegodossantos23 Nov 27, 2020
39ac91a
Merge pull request #12 from future4code/projeto-react
Diegodossantos23 Nov 27, 2020
60a8f31
Tudo certo pra criar as implementaçoes
Diegodossantos23 Nov 27, 2020
85cd3e5
Merge pull request #13 from future4code/projeto-react
Diegodossantos23 Nov 27, 2020
8b23069
Fiz a página detalhes renderizar os detalhes do pokemon
AlvaroBarrosJunior Nov 27, 2020
a97a4db
Merge pull request #14 from future4code/pagina-detalhes
Diegodossantos23 Nov 27, 2020
7f2e57d
Update README.md
Diegodossantos23 Nov 27, 2020
ce38881
Updted
Diegodossantos23 Nov 27, 2020
586ee95
Merge pull request #15 from future4code/implementations
Diegodossantos23 Nov 27, 2020
e23654c
Fiz alguns ajustes para melhorar a acessibilidade
Diegodossantos23 Nov 28, 2020
bd12837
Merge pull request #17 from future4code/implementations
Diegodossantos23 Nov 28, 2020
e3fe445
Finalizei as funções de adicionar e remover os pokemons da pokedex
AlvaroBarrosJunior Nov 30, 2020
2dd590b
Merge pull request #18 from future4code/pokedex
AlvaroBarrosJunior Nov 30, 2020
4d144a1
Update README.md
Diegodossantos23 Nov 30, 2020
464b6ec
ok
Diegodossantos23 Nov 30, 2020
6ddb9d8
Update README.md
Diegodossantos23 Nov 30, 2020
76bed63
ok
Diegodossantos23 Nov 30, 2020
5c21939
Update README.md
Diegodossantos23 Nov 30, 2020
783f18b
Update README.md
Diegodossantos23 Nov 30, 2020
a3b8cd9
Revolvi conflitos ao subir as alteraçoes do projeto
Diegodossantos23 Nov 30, 2020
95fcbea
Update README.md
Diegodossantos23 Nov 30, 2020
68fa854
Update README.md
Diegodossantos23 Nov 30, 2020
8fa8115
Mergeado
Diegodossantos23 Nov 30, 2020
24573a6
Tive problemas com conflitos que não consegui resolver pelo github
Diegodossantos23 Nov 30, 2020
f450e72
Problemas com conflitos resolvidos
Diegodossantos23 Nov 30, 2020
3cf3a80
Merge pull request #21 from future4code/newBranch
Diegodossantos23 Nov 30, 2020
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
20 changes: 12 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
# POKEDEX

Nome dos integrantes:
- Pessoa 1
- Pessoa 2
- Pessoa 3
- Diego dos Santos Rosa
- Alvaro Joaquim de Faria Barros Junior
- Vitor de Farias

Link do Surge: www.link.com.br
Link do codesandbox: https://wxqtf.codesandbox.io/

O que funciona:
- Item 1
- Item 2
- Funciona os routers das páginas, sendo possível navegar entre elas.
- É possível ver os detalhes de um pokemon
- A lista dos 20 primeiros pokemons estão sendo renderizadas na página home
- A lista dos pokemons na pokedex estão sendo renderizadas na página pokedex
- O conteudo se adapta a qualqer tamanho de tela

O que não funciona:
- Item 3
- Item 4
- O desafio
- Problemas ao gerar o link do surge

1 change: 1 addition & 0 deletions pokedex/.eslintcache
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"/home/diego/Documents/Labenu/Week-Projects/Diego-Rosa/semana11/dumont-pokedex7/pokedex/src/App.js":"1","/home/diego/Documents/Labenu/Week-Projects/Diego-Rosa/semana11/dumont-pokedex7/pokedex/src/index.js":"2","/home/diego/Documents/Labenu/Week-Projects/Diego-Rosa/semana11/dumont-pokedex7/pokedex/src/reportWebVitals.js":"3","/home/diego/Documents/Labenu/Week-Projects/Diego-Rosa/semana11/dumont-pokedex7/pokedex/src/global/GlobalState.js.js":"4","/home/diego/Documents/Labenu/Week-Projects/Diego-Rosa/semana11/dumont-pokedex7/pokedex/src/screens/HomePage/index.js":"5","/home/diego/Documents/Labenu/Week-Projects/Diego-Rosa/semana11/dumont-pokedex7/pokedex/src/router/Coordinator.js":"6","/home/diego/Documents/Labenu/Week-Projects/Diego-Rosa/semana11/dumont-pokedex7/pokedex/src/components/PokeCard/PokeCard.js":"7","/home/diego/Documents/Labenu/Week-Projects/Diego-Rosa/semana11/dumont-pokedex7/pokedex/src/components/DetailsCard/index.js":"8","/home/diego/Documents/Labenu/Week-Projects/Diego-Rosa/semana11/dumont-pokedex7/pokedex/src/screens/PokeDexPage/index.js":"9"},{"size":409,"mtime":1606710622000,"results":"10","hashOfConfig":"11"},{"size":500,"mtime":1606451386157,"results":"12","hashOfConfig":"11"},{"size":362,"mtime":1606451386157,"results":"13","hashOfConfig":"11"},{"size":1031,"mtime":1606705095659,"results":"14","hashOfConfig":"11"},{"size":1657,"mtime":1606710806938,"results":"15","hashOfConfig":"11"},{"size":310,"mtime":1606485742505,"results":"16","hashOfConfig":"11"},{"size":2842,"mtime":1606705078882,"results":"17","hashOfConfig":"11"},{"size":3147,"mtime":1606711057792,"results":"18","hashOfConfig":"11"},{"size":1394,"mtime":1606711282029,"results":"19","hashOfConfig":"11"},{"filePath":"20","messages":"21","errorCount":1,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},"xq4l04",{"filePath":"22","messages":"23","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"24","messages":"25","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"26","messages":"27","errorCount":0,"warningCount":1,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"28","messages":"29","errorCount":0,"warningCount":3,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"30","messages":"31","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"32","messages":"33","errorCount":0,"warningCount":2,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"34","messages":"35","errorCount":0,"warningCount":6,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"36","messages":"37","errorCount":0,"warningCount":3,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},"/home/diego/Documents/Labenu/Week-Projects/Diego-Rosa/semana11/dumont-pokedex7/pokedex/src/App.js",["38"],"/home/diego/Documents/Labenu/Week-Projects/Diego-Rosa/semana11/dumont-pokedex7/pokedex/src/index.js",[],"/home/diego/Documents/Labenu/Week-Projects/Diego-Rosa/semana11/dumont-pokedex7/pokedex/src/reportWebVitals.js",[],"/home/diego/Documents/Labenu/Week-Projects/Diego-Rosa/semana11/dumont-pokedex7/pokedex/src/global/GlobalState.js.js",["39"],"/home/diego/Documents/Labenu/Week-Projects/Diego-Rosa/semana11/dumont-pokedex7/pokedex/src/screens/HomePage/index.js",["40","41","42"],"/home/diego/Documents/Labenu/Week-Projects/Diego-Rosa/semana11/dumont-pokedex7/pokedex/src/router/Coordinator.js",[],"/home/diego/Documents/Labenu/Week-Projects/Diego-Rosa/semana11/dumont-pokedex7/pokedex/src/components/PokeCard/PokeCard.js",["43","44"],"/home/diego/Documents/Labenu/Week-Projects/Diego-Rosa/semana11/dumont-pokedex7/pokedex/src/components/DetailsCard/index.js",["45","46","47","48","49","50"],"/home/diego/Documents/Labenu/Week-Projects/Diego-Rosa/semana11/dumont-pokedex7/pokedex/src/screens/PokeDexPage/index.js",["51","52","53"],{"ruleId":null,"fatal":true,"severity":2,"message":"54","line":3,"column":1},{"ruleId":"55","severity":1,"message":"56","line":30,"column":5,"nodeType":"57","messageId":"58","endLine":30,"endColumn":18},{"ruleId":"59","severity":1,"message":"60","line":24,"column":31,"nodeType":"61","endLine":24,"endColumn":40},{"ruleId":"62","severity":1,"message":"63","line":25,"column":27,"nodeType":"64","endLine":25,"endColumn":60},{"ruleId":"65","severity":1,"message":"66","line":25,"column":27,"nodeType":"64","endLine":25,"endColumn":60},{"ruleId":"67","severity":1,"message":"68","line":13,"column":29,"nodeType":"69","messageId":"70","endLine":13,"endColumn":37},{"ruleId":"71","severity":1,"message":"72","line":25,"column":8,"nodeType":"73","endLine":25,"endColumn":10,"suggestions":"74"},{"ruleId":"71","severity":1,"message":"75","line":21,"column":6,"nodeType":"73","endLine":21,"endColumn":8,"suggestions":"76"},{"ruleId":"71","severity":1,"message":"77","line":35,"column":6,"nodeType":"73","endLine":35,"endColumn":12,"suggestions":"78"},{"ruleId":"59","severity":1,"message":"60","line":58,"column":31,"nodeType":"61","endLine":58,"endColumn":40},{"ruleId":"59","severity":1,"message":"60","line":61,"column":43,"nodeType":"61","endLine":61,"endColumn":51},{"ruleId":"59","severity":1,"message":"60","line":72,"column":31,"nodeType":"61","endLine":72,"endColumn":40},{"ruleId":"59","severity":1,"message":"60","line":80,"column":29,"nodeType":"61","endLine":80,"endColumn":38},{"ruleId":"59","severity":1,"message":"60","line":27,"column":19,"nodeType":"61","endLine":27,"endColumn":28},{"ruleId":"62","severity":1,"message":"63","line":28,"column":15,"nodeType":"64","endLine":28,"endColumn":48},{"ruleId":"65","severity":1,"message":"66","line":28,"column":15,"nodeType":"64","endLine":28,"endColumn":48},"Parsing error: Unexpected token\n\n 1 | import React from 'react'\n 2 | import Router from './router/Router'\n> 3 | <<<<<<< HEAD\n | ^\n 4 | import GlobalState from './global/GlobalState.js'\n 5 | =======\n 6 | import GlobalState from './global/GlobalState.js.js'","no-lone-blocks","Nested block is redundant.","BlockStatement","redundantNestedBlock","jsx-a11y/aria-role","Elements with ARIA roles must use a valid, non-abstract ARIA role.","JSXAttribute","jsx-a11y/alt-text","img elements must have an alt prop, either with meaningful text, or an empty string for decorative images.","JSXOpeningElement","jsx-a11y/no-redundant-roles","The element img has an implicit role of img. Defining this explicitly is redundant and should be avoided.","no-unused-vars","'requests' is assigned a value but never used.","Identifier","unusedVar","react-hooks/exhaustive-deps","React Hook useEffect has a missing dependency: 'pokemonPhoto'. Either include it or remove the dependency array.","ArrayExpression",["79"],"React Hook useEffect has a missing dependency: 'getPokeDetails'. Either include it or remove the dependency array.",["80"],"React Hook useEffect has a missing dependency: 'renderMoves'. Either include it or remove the dependency array.",["81"],{"desc":"82","fix":"83"},{"desc":"84","fix":"85"},{"desc":"86","fix":"87"},"Update the dependencies array to be: [pokemonPhoto]",{"range":"88","text":"89"},"Update the dependencies array to be: [getPokeDetails]",{"range":"90","text":"91"},"Update the dependencies array to be: [data, renderMoves]",{"range":"92","text":"93"},[832,834],"[pokemonPhoto]",[638,640],"[getPokeDetails]",[913,919],"[data, renderMoves]"]
24 changes: 24 additions & 0 deletions pokedex/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# 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
.eslintcache

npm-debug.log*
yarn-debug.log*
yarn-error.log*
43 changes: 43 additions & 0 deletions pokedex/PokeAPI.postman_collection.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{
"info": {
"_postman_id": "45503251-2a81-465a-b809-76de25a7adc9",
"name": "PokeAPI",
"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
},
"item": [
{
"name": "Lista de Pokemon",
"request": {
"method": "GET",
"header": [],
"url": {
"raw": "https://pokeapi.co/api/v2/pokemon/",
"protocol": "https",
"host": [
"pokeapi",
"co"
],
"path": [
"api",
"v2",
"pokemon",
""
]
}
},
"response": []
},
{
"name": "Detalhes do pokemon",
"request": {
"method": "GET",
"header": [],
"url": {
"raw": ""
}
},
"response": []
}
],
"protocolProfileBehavior": {}
}
80 changes: 80 additions & 0 deletions pokedex/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
# Getting Started with Create React App


Integrantes do Grupo:

Daltro William Leandro Machado
Daniel Henrique Coelho Rezende
Joyce Roberta dos Santos


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