Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
22bcb6c
adicionado a estrutura html e removidos arquivos desnecessários
lenaschwantes Feb 21, 2022
20a497d
Merge pull request #1 from JackeAguiar/estrutura-html
lenaschwantes Feb 21, 2022
0491a02
"cards adicionados"
lenaschwantes Feb 22, 2022
05958bd
Merge pull request #2 from JackeAguiar/cards-adicionados
lenaschwantes Feb 22, 2022
ae3a71c
barra de pesquisa e botoes
Feb 23, 2022
acea8a8
Merge branch 'main' into barras-de-pesquisas
lenaschwantes Feb 23, 2022
ab3719d
Merge pull request #3 from JackeAguiar/barras-de-pesquisas
lenaschwantes Feb 23, 2022
68781d2
retirada de cards do html
Feb 25, 2022
5e44cf3
Merge pull request #5 from JackeAguiar/atualizacao-botoes
JackeAguiar Feb 25, 2022
b4403b3
tentativa de colocar os cards na tela
Mar 7, 2022
d8ed842
Merge branch 'main' into cards-na-tela
lenaschwantes Mar 7, 2022
95b715a
Merge pull request #6 from JackeAguiar/cards-na-tela
lenaschwantes Mar 7, 2022
4253761
tentativa de colocar o card na tela
Mar 7, 2022
a6442db
Merge pull request #7 from JackeAguiar/cards-na-tela
JackeAguiar Mar 7, 2022
2db0fa8
mudanças js
lenaschwantes Mar 8, 2022
a741a24
adicionada função sort
lenaschwantes Mar 9, 2022
bbd8507
add sort filter
lenaschwantes Mar 9, 2022
4a70fb4
sort filter added
lenaschwantes Mar 9, 2022
fe58b5a
adicionados filtro sort
lenaschwantes Mar 9, 2022
95032dc
Merge pull request #8 from JackeAguiar/sort-filter
lenaschwantes Mar 9, 2022
5221c94
informaçoes na tela
Mar 9, 2022
d1069ab
resolver os conflitos
Mar 9, 2022
ac021d6
added button images
lenaschwantes Mar 9, 2022
09ccff4
added buttons images
lenaschwantes Mar 9, 2022
decff16
Merge pull request #9 from JackeAguiar/buttons
lenaschwantes Mar 9, 2022
0fa1313
adicionado botão de limpar filtros
lenaschwantes Mar 13, 2022
e44b7fd
Merge pull request #10 from JackeAguiar/botão
lenaschwantes Mar 13, 2022
9426a4a
cálculo agregado adiiconado
lenaschwantes Mar 14, 2022
50a6acd
Merge pull request #11 from JackeAguiar/calculo
lenaschwantes Mar 14, 2022
ed1735f
cards adicionados na tela
Mar 14, 2022
f41de88
Merge branch 'main' into cards
lenaschwantes Mar 14, 2022
ddfdfb3
Merge pull request #12 from JackeAguiar/cards
JackeAguiar Mar 14, 2022
8479e28
commit teste
lenaschwantes Mar 14, 2022
34a5e36
teste
lenaschwantes Mar 14, 2022
a259423
test1
Mar 14, 2022
23056d7
correções css
lenaschwantes Mar 17, 2022
c880faf
Merge pull request #13 from JackeAguiar/css
lenaschwantes Mar 17, 2022
23fc45a
tudo do 0
Mar 17, 2022
b5c3e6d
atualizado
Mar 17, 2022
5044751
pequenas alterações
Mar 17, 2022
8888731
cards adicionados novamente
Mar 17, 2022
1d3958a
background alterado
lenaschwantes Mar 18, 2022
c07ced7
botão refresh
Mar 18, 2022
86d4f70
..
Mar 18, 2022
5b2be83
filtro type funcionando
lenaschwantes Mar 18, 2022
1055132
atualização
Mar 18, 2022
3542776
um filtro funcionando
Mar 19, 2022
504d5af
dados
lenaschwantes Mar 20, 2022
38c63d5
sei lá
lenaschwantes Mar 20, 2022
5e35833
calculo adicionado'
lenaschwantes Mar 20, 2022
5f34851
..
Mar 21, 2022
641b4b0
atulizado
Mar 21, 2022
b4cfb45
...
Mar 21, 2022
0ee6637
cards
lenaschwantes Mar 21, 2022
7621bec
cards
Mar 21, 2022
2d698e9
sort A-Z
Mar 21, 2022
1fbb8fb
font e cards
lenaschwantes Mar 21, 2022
32c3989
font e cards
lenaschwantes Mar 21, 2022
0bf4fc3
font e cards
lenaschwantes Mar 21, 2022
632cf78
botão de refresh
Mar 23, 2022
3130140
botao refresh funcionando
Mar 23, 2022
1b404c5
nao sei
lenaschwantes Mar 23, 2022
6aff696
nao sei
lenaschwantes Mar 23, 2022
b934cc7
problema com a barra de pesquisa
Mar 27, 2022
a741c82
filtros add
lenaschwantes Mar 27, 2022
67b250a
filtros add
lenaschwantes Mar 27, 2022
13a728b
add
Mar 27, 2022
02e4f5b
Merge branch 'main' of github.com:JackeAguiar/SAP007-data-lovers
Mar 27, 2022
7da2c17
erro
lenaschwantes Mar 28, 2022
89a2426
testes atualizados
lenaschwantes Mar 28, 2022
28a59b5
footer adicionado
lenaschwantes Mar 28, 2022
60f494f
Merge branch 'main' of github.com:JackeAguiar/SAP007-data-lovers
Mar 28, 2022
1e3b3b1
finalmente tudo esta funcionando
Mar 28, 2022
2f32fb6
ajustes
lenaschwantes Apr 1, 2022
c31bd29
ajustes
lenaschwantes Apr 1, 2022
d2243ee
imagens adicionadas naspastas, imagens de Kanto atualizadas
lenaschwantes Apr 5, 2022
9f48a1b
correção de imagens trocadas e adição de pokémon johto
lenaschwantes Apr 5, 2022
bbd3646
linhas adicionadas no title
lenaschwantes Apr 5, 2022
4597f41
correções css
lenaschwantes Apr 5, 2022
4baa3b2
adicionadas imagens de pokemons de kanto
lenaschwantes May 18, 2022
665be13
refatorando
lenaschwantes Jun 14, 2022
d563931
Merge pull request #14 from JackeAguiar/refatorando
lenaschwantes Jun 14, 2022
ad0216b
refatorando
lenaschwantes Jun 15, 2022
1e5a1a8
refatorando
lenaschwantes Jun 15, 2022
7ba1cc1
refatorando
lenaschwantes Jun 15, 2022
a7bd5f7
imagens
lenaschwantes Jun 15, 2022
880e924
adicionado favicon
lenaschwantes Jun 15, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
618 changes: 18 additions & 600 deletions README.md

Large diffs are not rendered by default.

11,655 changes: 11,655 additions & 0 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@
"engines": {
"node": ">=14.x"
}
}
}
25 changes: 20 additions & 5 deletions src/data.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,24 @@
// estas funciones son de ejemplo
export const searchByName = (selectByName, pokemons) =>
pokemons.filter((select) => select.name.includes(selectByName));

export const example = () => {
return 'example';


export const selectType = (selectByType, pokemons) =>
pokemons.filter((select) => select.type.includes(selectByType));


export const calcType = (pokemons, selectByType) => {
const type = pokemons.filter(search => search.type.includes(selectByType));
return Math.round(((type.length * 100) / pokemons.length) * 100) / 100;
};

export const anotherExample = () => {
return 'OMG';
export const sortAZ = (data, order) => {
const sortaz = [...data]
if (order === "A-Z") {
return sortaz.sort((a, z) => a.name > z.name ? 1 : -1);
} else {
return sortaz.sort((a, z) => a.name > z.name ? -1 : 1);
}
};


28 changes: 0 additions & 28 deletions src/data/athletes/README.md

This file was deleted.

27 changes: 0 additions & 27 deletions src/data/athletes/README.pt-BR.md

This file was deleted.

Loading