Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
1f631d5
React app boilerplate
Jan 3, 2022
54d3e8b
Initial boilerplate
Jan 3, 2022
eeac6ca
add gitignore, add react-router-dom, fix react files
Jan 3, 2022
396f095
Created app routes
Jan 3, 2022
ad7f178
layout basico
desatinar Jan 3, 2022
8e7138b
Merge branch 'master' into rodrigo-layout
soraia-aparecida Jan 3, 2022
abb61ea
Merge pull request #1 from future4code/rodrigo-layout
soraia-aparecida Jan 3, 2022
c71236d
arrumou a routes e renomeamos as paginas.Criamos uma url base e uma p…
Jan 3, 2022
e400d34
Finished details page
Jan 4, 2022
db60f4d
Merge pull request #3 from future4code/DetailPage
desatinar Jan 4, 2022
54eeb2f
Inicio da pokedex
soraia-aparecida Jan 4, 2022
7d08ca2
Merge branch 'master' of https://github.com/future4code/Carver-pokede…
soraia-aparecida Jan 4, 2022
9c3fc30
Merge pull request #4 from future4code/soraia-pokedex
brunagolinelli Jan 5, 2022
5175245
agora vai. parte de rodrigo
desatinar Jan 5, 2022
373f3c6
Merge pull request #6 from future4code/rodrigo-tentativa
soraia-aparecida Jan 5, 2022
7f95b4a
funcionalidade de deletar, ok
soraia-aparecida Jan 5, 2022
acb9146
Merge branch 'master' of https://github.com/future4code/Carver-pokede…
soraia-aparecida Jan 5, 2022
01a6791
add button goToHome and goToPokedex
Jan 5, 2022
453e144
Estado global, ok
soraia-aparecida Jan 5, 2022
fbcd931
Merge pull request #7 from future4code/soraia-pokedex
desatinar Jan 5, 2022
730e650
pokemons aparecendo na tela
desatinar Jan 5, 2022
5a1efce
Merge pull request #8 from future4code/rodrigo-pokemonsNaTela
brunagolinelli Jan 5, 2022
baa5047
Buttons, ok
Jan 5, 2022
d9444d4
Merge pull request #9 from future4code/detailPage
brunagolinelli Jan 5, 2022
d2f6650
Função de add ao carrinho
soraia-aparecida Jan 6, 2022
d3d6a10
Merge pull request #10 from future4code/soraia-pokedex
brunagolinelli Jan 6, 2022
4ca72f8
button detailpage
Jan 6, 2022
73e5460
Função de add funcionando, +-
soraia-aparecida Jan 6, 2022
aa879a3
Deletar não funciona
soraia-aparecida Jan 6, 2022
38cdfc5
Merge pull request #11 from future4code/soraia-pokedex
desatinar Jan 6, 2022
f1c6a7f
Principais funcionalidade ok
soraia-aparecida Jan 6, 2022
6e65b5b
Mudança no nome do estado
soraia-aparecida Jan 6, 2022
8719477
Merge branch 'master' into soraia-pokedex
desatinar Jan 6, 2022
9b69bb3
Merge pull request #12 from future4code/soraia-pokedex
desatinar Jan 6, 2022
e357923
resolução dos conflitos
soraia-aparecida Jan 6, 2022
6f205f4
Merge pull request #13 from future4code/soraia-pokedex
desatinar Jan 6, 2022
a2ab9e6
doing unclickable button
Jan 6, 2022
c539425
botoes pointer e imagem do psyduck na pagina de erro
desatinar Jan 6, 2022
d6fc2bf
Merge branch 'master' into PokedexCar
brunagolinelli Jan 6, 2022
476a914
Merge pull request #14 from future4code/PokedexCar
desatinar Jan 6, 2022
ab24c20
create diable button, and add a alert mensage
Jan 6, 2022
f9775bb
Merge pull request #15 from future4code/unclickableButton
brunagolinelli Jan 7, 2022
79f0593
layout da pagina da home feito
desatinar Jan 7, 2022
184c5d1
Merge branch 'master' into rodrigo-estilizacao
desatinar Jan 7, 2022
c6e6099
Merge pull request #16 from future4code/rodrigo-estilizacao
desatinar Jan 7, 2022
e875aa6
styled detailPage complete
Jan 7, 2022
7bb8878
Estilização e Loading
soraia-aparecida Jan 7, 2022
89afcfa
Merge pull request #17 from future4code/styledDetailPage
desatinar Jan 7, 2022
51b8fd2
Resolução de conflitos
soraia-aparecida Jan 7, 2022
5884f9e
resolução de conflitos
soraia-aparecida Jan 7, 2022
6c7f8ac
Merge pull request #19 from future4code/soraia-2
desatinar Jan 7, 2022
27cb66f
comparador fora da div
desatinar Jan 7, 2022
c96b6c9
Merge pull request #20 from future4code/rodrigo-comparador-pokedex
soraia-aparecida Jan 7, 2022
265c353
disabled button
Jan 7, 2022
21e26ea
readme
desatinar Jan 7, 2022
5e3b568
Merge pull request #21 from future4code/rodrigo-readme
soraia-aparecida Jan 7, 2022
62d915d
Loading na página de detalhes
soraia-aparecida Jan 7, 2022
4953195
Merge pull request #22 from future4code/soraia-2
soraia-aparecida Jan 7, 2022
3e865db
disabled button
Jan 7, 2022
18b5232
Merge branch 'master' into button-diable
brunagolinelli Jan 7, 2022
7db75ce
Merge pull request #23 from future4code/button-diable
brunagolinelli Jan 7, 2022
98d29ab
alterado o readme. falta imagens e o link do surge
desatinar Jan 7, 2022
b217709
Merge pull request #24 from future4code/rodrigo-readme2
soraia-aparecida Jan 7, 2022
076a22f
estilizacao pagina detalhes
desatinar Jan 8, 2022
17cee00
Merge pull request #25 from future4code/rodrigo-finalizacao
soraia-aparecida Jan 8, 2022
1e3e4b1
ajustado os containers da pagina detalhe e setado uma animacao de load
desatinar Jan 9, 2022
8ecd204
Merge pull request #26 from future4code/ajustes-finais
soraia-aparecida Jan 9, 2022
7b59ed1
header com estado de adicionar e remover nos detalhes pokemon
desatinar Jan 9, 2022
93cfe5c
adicionado acento em pokemon
desatinar Jan 9, 2022
7f4911e
adicionado acento no alert
desatinar Jan 9, 2022
83dde88
Merge pull request #27 from future4code/botao-header
desatinar Jan 9, 2022
48ca2f3
link do surge
desatinar Jan 9, 2022
3629083
Merge pull request #28 from future4code/surge
desatinar Jan 9, 2022
7f1ccc9
adicionado link das imagens no readme
desatinar Jan 10, 2022
5fa01c8
Merge pull request #29 from future4code/imagens
soraia-aparecida Jan 10, 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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
48 changes: 36 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,40 @@
# POKEDEX
# Pokédex

Nome dos integrantes:
- Pessoa 1
- Pessoa 2
- Pessoa 3
Projeto Pokédex foi feito com o intuito de simular um site com as informações dos Pokémons.

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

O que funciona:
- Item 1
- Item 2
- Página Home onde são exibidos os 20 primeiros pokémons da Pokédex
- Cards na Página Home que possuem dois botões (detalhes e adicionar na pokédex):
- Botão detalhes: leva a(o) usuária(o) para página de detalhes
- Botão adicionar: adiciona o pókemon na pokédex
- Página Detalhes possui fotos do pókemon, seus status, tipo e movimentos;
- Página Pokédex possui os cards dos pokémons selecionados e a possibilidade de remover eles da página.

### Tecnologias Utilizadas:

- React
- Axios
- Styled components
- Material UI
- Poké API
- Custom Hooks
- React Spinners

### Surge

http://tense-owner.surge.sh/

### Integrantes

- Bruna Nallis
- Rodrigo Santos do Nascimento
- Soraia Aparecida Chaves Cordeiro Lima

### Imagens

![image](https://media.discordapp.net/attachments/908398260580929567/930080534770614303/unknown.png?width=765&height=430)
![image](https://media.discordapp.net/attachments/908398260580929567/930080609865449513/unknown.png?width=765&height=430)
![image](https://media.discordapp.net/attachments/908398260580929567/930080730346840064/unknown.png?width=765&height=430)
![image](https://media.discordapp.net/attachments/908398260580929567/930081997894852638/unknown.png?width=765&height=430)

O que não funciona:
- Item 3
- Item 4
1 change: 1 addition & 0 deletions build/200.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>React App</title><style>#root,body,html{margin:0;padding:0;width:100%;min-height:100vh}button{cursor:pointer}</style><script defer="defer" src="/static/js/main.e9972e63.js"></script></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
11 changes: 11 additions & 0 deletions build/asset-manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"files": {
"main.js": "/static/js/main.e9972e63.js",
"static/media/error.jpg": "/static/media/error.00ad4beda443873a189e.jpg",
"index.html": "/index.html",
"main.e9972e63.js.map": "/static/js/main.e9972e63.js.map"
},
"entrypoints": [
"static/js/main.e9972e63.js"
]
}
Binary file added build/favicon.ico
Binary file not shown.
1 change: 1 addition & 0 deletions build/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>React App</title><style>#root,body,html{margin:0;padding:0;width:100%;min-height:100vh}button{cursor:pointer}</style><script defer="defer" src="/static/js/main.e9972e63.js"></script></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
Binary file added build/logo192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added build/logo512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions build/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"short_name": "React App",
"name": "Create React App Sample",
"icons": [
{
"src": "favicon.ico",
"sizes": "64x64 32x32 24x24 16x16",
"type": "image/x-icon"
},
{
"src": "logo192.png",
"type": "image/png",
"sizes": "192x192"
},
{
"src": "logo512.png",
"type": "image/png",
"sizes": "512x512"
}
],
"start_url": ".",
"display": "standalone",
"theme_color": "#000000",
"background_color": "#ffffff"
}
3 changes: 3 additions & 0 deletions build/robots.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# https://www.robotstxt.org/robotstxt.html
User-agent: *
Disallow:
3 changes: 3 additions & 0 deletions build/static/js/main.e9972e63.js

Large diffs are not rendered by default.

58 changes: 58 additions & 0 deletions build/static/js/main.e9972e63.js.LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
/*
object-assign
(c) Sindre Sorhus
@license MIT
*/

/**
* A better abstraction over CSS.
*
* @copyright Oleg Isonen (Slobodskoi) / Isonen 2014-present
* @website https://github.com/cssinjs/jss
* @license MIT
*/

/** @license React v0.20.2
* scheduler.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/** @license React v16.13.1
* react-is.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/** @license React v17.0.2
* react-dom.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/** @license React v17.0.2
* react-jsx-runtime.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/** @license React v17.0.2
* react.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
1 change: 1 addition & 0 deletions build/static/js/main.e9972e63.js.map

Large diffs are not rendered by default.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading