Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
bf03cfc
Esqueleto do projeto com pastas
tainah12 Nov 23, 2020
f428d7f
Merge pull request #1 from future4code/pokedex
tainah12 Nov 23, 2020
cd4e042
Update README.md
tainah12 Nov 23, 2020
cad518d
Layout básico dos cards da Home feito
tainah12 Nov 23, 2020
42dc41f
Update README.md
tainah12 Nov 23, 2020
37ab8c7
Criado o header
Augustoluna Nov 23, 2020
b01151d
Merge pull request #2 from future4code/pokedex-header
tainah12 Nov 23, 2020
ee1f111
Merge branch 'master' into pokedex
tainah12 Nov 23, 2020
fca6f46
Merge pull request #3 from future4code/pokedex
tainah12 Nov 23, 2020
415e0a5
teste
tainah12 Nov 23, 2020
95c320a
teste
tainah12 Nov 23, 2020
ba17852
mudei o readme
tainah12 Nov 24, 2020
be8249d
conflitos na master teste de resolução1
tainah12 Nov 24, 2020
6148bf0
instalei o npm react-router-dom na master
tainah12 Nov 24, 2020
f7d24db
mudei os estilos do header de lugar. Coloquei na pasta styled.js
tainah12 Nov 24, 2020
18a0b51
Criada a página de detalhes estática
Augustoluna Nov 24, 2020
b04c211
iniciei a lógica dos botoes do header
tainah12 Nov 24, 2020
21e91e0
botoes do header funcionando
tainah12 Nov 24, 2020
bdc5686
Merge pull request #4 from future4code/pokemon-details
tainah12 Nov 25, 2020
b39b0aa
Merge branch 'master' into requisicao-API-Home
tainah12 Nov 25, 2020
c6d0fbb
Merge pull request #5 from future4code/requisicao-API-Home
tainah12 Nov 25, 2020
e7a4e5b
movi o eslintcache para o gitignore
tainah12 Nov 25, 2020
294429c
requisição de imagem de pokemom em andamento
tainah12 Nov 26, 2020
a61f752
Merge pull request #6 from future4code/requisicoes-api
tainah12 Nov 26, 2020
a119ac9
requisição de imagens e nomes dos pokemons prontas na homme
tainah12 Nov 26, 2020
ff50d6a
Merge pull request #7 from future4code/requisicoes-api
tainah12 Nov 26, 2020
def4482
testando de novo essa joça
Augustoluna Nov 26, 2020
6383839
Merge branch 'master' into pokedex-implementacoes
Augustoluna Nov 26, 2020
2d64e3f
Merge pull request #8 from future4code/pokedex-implementacoes
Augustoluna Nov 26, 2020
63026b6
teste2
tainah12 Nov 26, 2020
85ac982
Merge pull request #9 from future4code/requisicoes-api
tainah12 Nov 26, 2020
cdfbcab
teste4
tainah12 Nov 26, 2020
7a8348b
Merge branch 'master' into requisicoes-api
tainah12 Nov 26, 2020
53d7d51
Merge pull request #10 from future4code/requisicoes-api
tainah12 Nov 26, 2020
627f3b1
Estilizacoes do Card pokemon
Augustoluna Nov 26, 2020
47a3dec
Merge pull request #11 from future4code/estilizacoes-CardPokemon
Augustoluna Nov 26, 2020
409fa19
comecei a fazer a lógica de adicionar
tainah12 Nov 26, 2020
5f5a9a8
Botoes do header estilizados e posicionados
Augustoluna Nov 26, 2020
8777666
Merge pull request #12 from future4code/estilizacao-header
Augustoluna Nov 26, 2020
babedd2
logo estilizada
Nov 26, 2020
667509d
Merge branch 'master' into header-styled
patriciadeabreu Nov 27, 2020
2c292c4
Merge pull request #13 from future4code/header-styled
patriciadeabreu Nov 27, 2020
8abe17a
home e pokedex com requisições feitas. Está repetindo cada pokemon 20…
tainah12 Nov 27, 2020
e93dcc5
requisiçoes home e pokedex funcionando + botao de add e ver detalhes …
tainah12 Nov 27, 2020
86e213f
função de deletar está pronta mas precisa arrumar para aparecer na tela
tainah12 Nov 27, 2020
f02aca6
teste
tainah12 Nov 27, 2020
e6b4e0d
Merge branch 'master' of https://github.com/future4code/dumont-pokede…
tainah12 Nov 27, 2020
28631f5
Merge branch 'master' into pokedex-semi-final
tainah12 Nov 27, 2020
77de3d9
Merge pull request #15 from future4code/pokedex-semi-final
tainah12 Nov 27, 2020
677f0ae
Update README.md
tainah12 Nov 27, 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: 11 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
# POKEDEX

Nome dos integrantes:
- Pessoa 1
- Pessoa 2
- Pessoa 3
- Tainah Bernardo
- Augusto Luna
- Patrícia de Abreu Otarão

Link do Surge: www.link.com.br
Link do Surge:

pokedex-18.surge.sh

O que funciona:
- Item 1
- Item 2
- Header com botões
- Requisições de API na Home e na pokedex
- Adicionar pokemon e botao de ver detalhes

O que não funciona:
- Item 3
- Item 4
- Ainda falta fazer a requisição na página de detalhes
- Botão deletar
3 changes: 3 additions & 0 deletions package-lock.json

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

Empty file added pokedex/.eslintcache
Empty file.
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
.eslintchache

# 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*
3 changes: 3 additions & 0 deletions pokedex/.vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"git.ignoreLimitWarning": true
}
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
Loading