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 #19

Open
wants to merge 47 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
47 commits
Select commit Hold shift + click to select a range
6966760
[criação do app] comentário no App.js
indiomedeiros Nov 23, 2020
c055e5e
Merge pull request #1 from future4code/segunda-feira
indiomedeiros Nov 23, 2020
becd796
Parte header e router segunda-feira
LilianNicolau Nov 23, 2020
092862d
[Criação do layout] PokerCard e PokeImage sem lógica
indiomedeiros Nov 23, 2020
789258b
[Criação do layout] PokerCard e PokeImage sem lógica
indiomedeiros Nov 23, 2020
5488db2
cardPokemon
nicksoto1 Nov 23, 2020
4afc010
Adicionado Styled Pokecard, pokestatos e pokedetails
indiomedeiros Nov 24, 2020
065bfe8
Testado e adicionado as trocas de páginas nos botões do header
indiomedeiros Nov 24, 2020
c717555
Merge pull request #2 from future4code/header-e-router
indiomedeiros Nov 24, 2020
8158575
cardPokemon
nicksoto1 Nov 24, 2020
9627db5
Merge branch 'master' into componentes-visuais
indiomedeiros Nov 25, 2020
52c7894
Merge pull request #3 from future4code/componentes-visuais
indiomedeiros Nov 25, 2020
0a8ad3b
resolvendo conflitos
indiomedeiros Nov 25, 2020
4606987
resolvendo conflitos
indiomedeiros Nov 25, 2020
e0462aa
Merge pull request #5 from future4code/resolvendo-conflitos
indiomedeiros Nov 25, 2020
3e87d29
[Todas os componentes visutais dos detalhes do pokemon]
indiomedeiros Nov 25, 2020
bfa2d55
Merge pull request #6 from future4code/TelaDetalhes
LilianNicolau Nov 26, 2020
2ee7ef8
Modifiquei globalState,criei componente Home
nicksoto1 Nov 26, 2020
9fb9b47
Merge branch 'master' into projeto-pokeCard
nicksoto1 Nov 26, 2020
874a075
Merge pull request #7 from future4code/projeto-pokeCard
nicksoto1 Nov 26, 2020
7605e8b
Ajustes na requisição, agora tem todos os pokemons com todos os atrib…
indiomedeiros Nov 26, 2020
73ed8d9
Merge pull request #8 from future4code/ajustes-globalstate
indiomedeiros Nov 26, 2020
f973d9e
Feito componente PokeCard,Home,adc Home no Router
nicksoto1 Nov 26, 2020
4535501
Merge pull request #9 from future4code/pokeApi-Michael
nicksoto1 Nov 26, 2020
f1af718
Adicionei cores, apliquei o designer[pokecard, header] , o header mud…
indiomedeiros Nov 27, 2020
4db6233
Merge pull request #10 from future4code/ajustes-design
indiomedeiros Nov 27, 2020
0ff458e
Funcionalidade do botao
nicksoto1 Nov 27, 2020
4fbd8b8
Merge pull request #11 from future4code/projeto-Home
nicksoto1 Nov 27, 2020
4d78873
Componente Pokedex
LilianNicolau Nov 27, 2020
f166a74
Update README.md
indiomedeiros Nov 27, 2020
da466be
Merge branch 'master' into componente-pokedex
indiomedeiros Nov 27, 2020
4c3946a
Merge pull request #12 from future4code/componente-pokedex
indiomedeiros Nov 27, 2020
484dc04
ajustes gerais e limpeza de código 1 na HOME
indiomedeiros Nov 28, 2020
ad9a71d
Merge branch 'master' into ajustes-design
indiomedeiros Nov 28, 2020
8c0a9b6
Merge pull request #13 from future4code/ajustes-design
indiomedeiros Nov 28, 2020
4c4534d
debuggando master e limpeza de código 2 : recuperando pokecard
indiomedeiros Nov 28, 2020
9436351
Merge pull request #14 from future4code/debugged-master
indiomedeiros Nov 28, 2020
6eff320
ajustes pokedex e home. Adicionado função de retira pokecard e adicionar
indiomedeiros Nov 29, 2020
e748519
Merge pull request #15 from future4code/ajustes-pokedex
indiomedeiros Nov 29, 2020
1942543
Update README.md
indiomedeiros Nov 29, 2020
9bcf758
ajustes finais da pokedex: adicionados alinhamento e correção do bug …
indiomedeiros Nov 29, 2020
f3ad01b
Merge pull request #16 from future4code/ajustes-layout-pokedex
indiomedeiros Nov 29, 2020
0d597e1
Adocionado toda lógica da página de detalhes + limpeza de código
indiomedeiros Nov 29, 2020
a47872f
Merge pull request #17 from future4code/pokedetalhes-lógica
indiomedeiros Nov 29, 2020
f6522d8
Update README.md
indiomedeiros Nov 29, 2020
37039df
Limpeza de código geral finalizada. Projeto 100/100
indiomedeiros Nov 30, 2020
336921d
Merge pull request #18 from future4code/limpeza-de-codigo
indiomedeiros 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
19 changes: 10 additions & 9 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
- Michael Soto
- Lilian Aparecida Verônica Nicolau
- Índio Medeiros

Link do Surge: www.link.com.br
http://dumont.pokedex10.surge.sh/

O que funciona:
- Item 1
- Item 2
- Listar porkemons
- Trocar de páginas
- adicionar pokemons na pokedex
-remover pokemons na pokedex
- ver detalhes do pokemon
OBS: todas as funções do projeto sem desafios.

O que não funciona:
- Item 3
- Item 4
1 change: 1 addition & 0 deletions pokedex/.eslintcache
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"F:\\LABENU\\Trabalho em grupoo\\dumont\\dumont-pokedex10\\pokedex\\src\\reportWebVitals.js":"1","F:\\LABENU\\Trabalho em grupoo\\dumont\\dumont-pokedex10\\pokedex\\src\\Components\\PokeCard\\PokeCard.js":"2","F:\\LABENU\\Trabalho em grupoo\\dumont\\dumont-pokedex10\\pokedex\\src\\Components\\PokeCard\\styledPokeCard.js":"3","F:\\LABENU\\Trabalho em grupoo\\dumont\\dumont-pokedex10\\pokedex\\src\\Components\\global\\GlobalState.js":"4","F:\\LABENU\\Trabalho em grupoo\\dumont\\dumont-pokedex10\\pokedex\\src\\App.js":"5","F:\\LABENU\\Trabalho em grupoo\\dumont\\dumont-pokedex10\\pokedex\\src\\Components\\PokeCard\\Pokedex.js":"6","F:\\LABENU\\Trabalho em grupoo\\dumont\\dumont-pokedex10\\pokedex\\src\\Components\\Home\\Home.js":"7","F:\\LABENU\\Trabalho em grupoo\\dumont\\dumont-pokedex10\\pokedex\\src\\routes\\Router.js":"8","F:\\LABENU\\Trabalho em grupoo\\dumont\\dumont-pokedex10\\pokedex\\src\\Components\\Home\\styled.js":"9","F:\\LABENU\\Trabalho em grupoo\\dumont\\dumont-pokedex10\\pokedex\\src\\Components\\PokeDetalis\\PageDetails.js":"10","F:\\LABENU\\Trabalho em grupoo\\dumont\\dumont-pokedex10\\pokedex\\src\\Components\\PokeDetalis\\styledDetails.js":"11","F:\\LABENU\\Trabalho em grupoo\\dumont\\dumont-pokedex10\\pokedex\\src\\Components\\PokeDetalis\\PokeStats.js":"12","F:\\LABENU\\Trabalho em grupoo\\dumont\\dumont-pokedex10\\pokedex\\src\\Components\\PokeDetalis\\StyledPageDetails.js":"13","F:\\LABENU\\Trabalho em grupoo\\dumont\\dumont-pokedex10\\pokedex\\src\\Components\\PokeDetalis\\PokeMoves.js":"14","F:\\LABENU\\Trabalho em grupoo\\dumont\\dumont-pokedex10\\pokedex\\src\\Components\\PokeDetalis\\PokeType.js":"15","F:\\LABENU\\Trabalho em grupoo\\dumont\\dumont-pokedex10\\pokedex\\src\\Components\\PokeDetalis\\PokeImage.js":"16","F:\\LABENU\\Trabalho em grupoo\\dumont\\dumont-pokedex10\\pokedex\\src\\hearder\\Header.js":"17"},{"size":362,"mtime":1606155479034,"results":"18","hashOfConfig":"19"},{"size":704,"mtime":1606691851864,"results":"20","hashOfConfig":"19"},{"size":1069,"mtime":1606669613952,"results":"21","hashOfConfig":"19"},{"size":1782,"mtime":1606696992135,"results":"22","hashOfConfig":"19"},{"size":279,"mtime":1606689884346,"results":"23","hashOfConfig":"19"},{"size":1361,"mtime":1606697092661,"results":"24","hashOfConfig":"19"},{"size":1382,"mtime":1606696840501,"results":"25","hashOfConfig":"19"},{"size":1050,"mtime":1606667721161,"results":"26","hashOfConfig":"19"},{"size":159,"mtime":1606496534708,"results":"27","hashOfConfig":"19"},{"size":546,"mtime":1606671596503,"results":"28","hashOfConfig":"19"},{"size":1294,"mtime":1606674800257,"results":"29","hashOfConfig":"19"},{"size":1161,"mtime":1606694271140,"results":"30","hashOfConfig":"19"},{"size":416,"mtime":1606674875880,"results":"31","hashOfConfig":"19"},{"size":572,"mtime":1606697117480,"results":"32","hashOfConfig":"19"},{"size":481,"mtime":1606693891977,"results":"33","hashOfConfig":"19"},{"size":788,"mtime":1606696769558,"results":"34","hashOfConfig":"19"},{"size":1302,"mtime":1606696729905,"results":"35","hashOfConfig":"19"},{"filePath":"36","messages":"37","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1ivzh0c",{"filePath":"38","messages":"39","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"40","messages":"41","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"42","messages":"43","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"44","messages":"45","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"46","messages":"47","errorCount":0,"warningCount":2,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"48","messages":"49","errorCount":0,"warningCount":1,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"50","messages":"51","errorCount":0,"warningCount":1,"fixableErrorCount":0,"fixableWarningCount":0,"source":"52","usedDeprecatedRules":"53"},{"filePath":"54","messages":"55","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"56","messages":"57","errorCount":0,"warningCount":1,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"58","messages":"59","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"60","messages":"61","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"62","messages":"63","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"64","messages":"65","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"66","messages":"67","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"68","messages":"69","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"70","messages":"71","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"F:\\LABENU\\Trabalho em grupoo\\dumont\\dumont-pokedex10\\pokedex\\src\\reportWebVitals.js",[],"F:\\LABENU\\Trabalho em grupoo\\dumont\\dumont-pokedex10\\pokedex\\src\\Components\\PokeCard\\PokeCard.js",[],"F:\\LABENU\\Trabalho em grupoo\\dumont\\dumont-pokedex10\\pokedex\\src\\Components\\PokeCard\\styledPokeCard.js",[],"F:\\LABENU\\Trabalho em grupoo\\dumont\\dumont-pokedex10\\pokedex\\src\\Components\\global\\GlobalState.js",[],"F:\\LABENU\\Trabalho em grupoo\\dumont\\dumont-pokedex10\\pokedex\\src\\App.js",[],"F:\\LABENU\\Trabalho em grupoo\\dumont\\dumont-pokedex10\\pokedex\\src\\Components\\PokeCard\\Pokedex.js",["72","73"],"F:\\LABENU\\Trabalho em grupoo\\dumont\\dumont-pokedex10\\pokedex\\src\\Components\\Home\\Home.js",["74"],"F:\\LABENU\\Trabalho em grupoo\\dumont\\dumont-pokedex10\\pokedex\\src\\routes\\Router.js",["75"],"import React, {useState} from 'react';\nimport {BrowserRouter, Switch, Route} from 'react-router-dom';\nimport Home from '../Components/Home/Home';\nimport Pokedex from '../Components/PokeCard/Pokedex';\nimport PageDetails from '../Components/PokeDetalis/PageDetails';\nimport Header from '../hearder/Header';\n\n\nconst Router = () => {\n //const [bla, setBla] = useState([]) aqui deve vir um estado\n\n return (\n <BrowserRouter>\n <Switch>\n {/* página home */}\n <Route exact path={'/'}>\n <Header/>\n <Home />\n </Route>\n {/* página pokedex */}\n <Route exact path={'/pokedex'}>\n <Header/>\n <Pokedex/>\n </Route>\n {/* página detalhes */}\n <Route exact path={'/detalhes'}>\n <Header/>\n <PageDetails/>\n </Route>\n\n </Switch>\n </BrowserRouter>\n )\n}\n\nexport default Router",["76","77"],"F:\\LABENU\\Trabalho em grupoo\\dumont\\dumont-pokedex10\\pokedex\\src\\Components\\Home\\styled.js",[],"F:\\LABENU\\Trabalho em grupoo\\dumont\\dumont-pokedex10\\pokedex\\src\\Components\\PokeDetalis\\PageDetails.js",["78"],"F:\\LABENU\\Trabalho em grupoo\\dumont\\dumont-pokedex10\\pokedex\\src\\Components\\PokeDetalis\\styledDetails.js",[],"F:\\LABENU\\Trabalho em grupoo\\dumont\\dumont-pokedex10\\pokedex\\src\\Components\\PokeDetalis\\PokeStats.js",[],"F:\\LABENU\\Trabalho em grupoo\\dumont\\dumont-pokedex10\\pokedex\\src\\Components\\PokeDetalis\\StyledPageDetails.js",[],"F:\\LABENU\\Trabalho em grupoo\\dumont\\dumont-pokedex10\\pokedex\\src\\Components\\PokeDetalis\\PokeMoves.js",[],"F:\\LABENU\\Trabalho em grupoo\\dumont\\dumont-pokedex10\\pokedex\\src\\Components\\PokeDetalis\\PokeType.js",[],"F:\\LABENU\\Trabalho em grupoo\\dumont\\dumont-pokedex10\\pokedex\\src\\Components\\PokeDetalis\\PokeImage.js",[],"F:\\LABENU\\Trabalho em grupoo\\dumont\\dumont-pokedex10\\pokedex\\src\\hearder\\Header.js",[],{"ruleId":"79","severity":1,"message":"80","line":1,"column":16,"nodeType":"81","messageId":"82","endLine":1,"endColumn":24},{"ruleId":"79","severity":1,"message":"83","line":1,"column":38,"nodeType":"81","messageId":"82","endLine":1,"endColumn":47},{"ruleId":"79","severity":1,"message":"80","line":1,"column":29,"nodeType":"81","messageId":"82","endLine":1,"endColumn":37},{"ruleId":"79","severity":1,"message":"80","line":1,"column":16,"nodeType":"81","messageId":"82","endLine":1,"endColumn":24},{"ruleId":"84","replacedBy":"85"},{"ruleId":"86","replacedBy":"87"},{"ruleId":"79","severity":1,"message":"88","line":1,"column":8,"nodeType":"81","messageId":"82","endLine":1,"endColumn":17},"no-unused-vars","'useState' is defined but never used.","Identifier","unusedVar","'useEffect' is defined but never used.","no-native-reassign",["89"],"no-negated-in-lhs",["90"],"'PokeImage' is defined but never used.","no-global-assign","no-unsafe-negation"]
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 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