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

Feat/add ordenar titulos #75

Open
wants to merge 52 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
4186fcd
add-pasta de imagens-logo-fundo
JessikaMirella Feb 22, 2022
1fa13a0
Merge pull request #1 from Brulibra/feat/add-imagens-logo
Brulibra Feb 23, 2022
5b2e518
Apagando dados que não pertencem ao Studio Ghibli
Brulibra Feb 23, 2022
7c5c241
resolvendo conflitos
Brulibra Feb 24, 2022
b861e4d
Add primeiro seletor, Filtro Diretores; Alteração marging e padding Logo
Brulibra Feb 24, 2022
c0f38a3
funcionalidade: imagens e footer
JessikaMirella Feb 25, 2022
c1fc0db
Input seletores Diretores e Personagens, Versão 1
Brulibra Feb 25, 2022
f9e7e6b
Merge branch 'feat/posicionamento-imagens-css' of https://github.com/…
Brulibra Feb 25, 2022
7b047da
Resolver conflitos
JessikaMirella Feb 26, 2022
c3fca74
solução de conflitos branch filtros branch alinhamento imagens
Brulibra Feb 26, 2022
d9db00c
Correção CSS input seleção diretores e personagens, adição input de ano
Brulibra Mar 1, 2022
5d2a36f
Funcionalidade: textos, e animação no css
JessikaMirella Mar 2, 2022
1129ae6
Merge pull request #3 from Brulibra/feat/add-filtro-diretores
Brulibra Mar 2, 2022
293cead
Merge branch 'feat/add-filtro-diretores' of https://github.com/Brulib…
Brulibra Mar 2, 2022
69a0573
merging alterações input
Brulibra Mar 2, 2022
88106fd
Funcionalidade: ajuste de logo e animaçao
JessikaMirella Mar 2, 2022
8a08c13
animaçoes e logo
JessikaMirella Mar 2, 2022
657e41e
merging animação e alteração logo
Brulibra Mar 2, 2022
5049c31
Puxando alteraçoes e resolvendo conflitos
JessikaMirella Mar 2, 2022
b2c63e1
resolvendo conflitos
JessikaMirella Mar 3, 2022
0af5d68
Resolução conflitos parte 2
Brulibra Mar 3, 2022
ee8b9ed
alteraçoes pos conflito
JessikaMirella Mar 4, 2022
02bfda7
Footer ajustado, add meta tag viewport; criação de div p/ guardar ima…
Brulibra Mar 4, 2022
ec18114
alinhamento botoes e header
JessikaMirella Mar 5, 2022
68f560e
Pequenas correções em ids no HTML, criação Filtro de Diretores, Corri…
Brulibra Mar 7, 2022
181e8eb
correção opções de filmes que haviam sumido
Brulibra Mar 7, 2022
af81fab
print dos filmes na tela
JessikaMirella Mar 11, 2022
b21352d
Filtro Diretores funcionando no console, puxar p/ tela; verificar ret…
Brulibra Mar 11, 2022
5d46ed5
add mais iformaçoes aos cards
JessikaMirella Mar 14, 2022
ffba904
puxando alteraçoes
JessikaMirella Mar 14, 2022
083fecd
Merge pull request #6 from Brulibra/ajuste-do-footer
Brulibra Mar 14, 2022
7c351ff
Merge branch 'main' into feat/add-alinhamento
Brulibra Mar 14, 2022
fbbcd82
Merge pull request #7 from Brulibra/feat/add-alinhamento
Brulibra Mar 14, 2022
cd10867
Merge branch 'main' into feat/add-printar-cards
Brulibra Mar 14, 2022
33b7681
Merge pull request #9 from Brulibra/feat/add-printar-cards
Brulibra Mar 15, 2022
5fa849a
salvando alteraçoes
JessikaMirella Mar 15, 2022
6afcdb9
salvando alteraçoes
JessikaMirella Mar 15, 2022
b08c2d9
Merge pull request #10 from Brulibra/feat/add-printar-cards
Brulibra Mar 15, 2022
decadaf
main atualizada, filtroFilmesPorDiretores criado, mas ainda quebrado;…
Brulibra Mar 15, 2022
c20692e
main atualizada, filtroFilmesPorDiretores criado, mas ainda quebrado;…
Brulibra Mar 15, 2022
e1a7dc6
printando no html films
JessikaMirella Mar 17, 2022
5583acc
correção filtro parte1, ainda finalizar
Brulibra Mar 17, 2022
25703b4
puxando pag films
Brulibra Mar 17, 2022
dbc38e3
filtro corrigidooo!
Brulibra Mar 17, 2022
4b1181d
salvando alteraçoes
JessikaMirella Mar 17, 2022
0765d58
puxando alteraçoes
JessikaMirella Mar 17, 2022
8245986
redirecionando botoes
JessikaMirella Mar 17, 2022
6fc728a
ano de lançamento em ordem crescente
JessikaMirella Mar 20, 2022
d96f687
ordenaçao crescente por ano
JessikaMirella Mar 20, 2022
897adcb
funçao oredenar por ano finalizada
JessikaMirella Mar 22, 2022
39e8e38
botao az funcionando
JessikaMirella Mar 22, 2022
c154863
salvando alteraçoes
JessikaMirella Mar 23, 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
11,801 changes: 11,801 additions & 0 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"pretest": "npm run eslint && npm run htmlhint",
"test": "jest --verbose --coverage",
"open-coverage-report": "opener ./coverage/lcov-report/index.html",
"start": "serve -s src/",
"start": "serve src/",
"deploy": "gh-pages -d src"
},
"dependencies": {
Expand All @@ -26,4 +26,4 @@
"engines": {
"node": ">=14.x"
}
}
}
52 changes: 47 additions & 5 deletions src/data.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,51 @@
// estas funciones son de ejemplo

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

export const filmesDiretores = (filmes, directorSelect) => {
return filmes.films.filter((directorName) => {
return directorName.director === directorSelect
});
};

export const anotherExample = () => {
return 'OMG';
export const sortMoviesByyear = (data, orderSelect) => {
const moviesByyear = data.films

if (orderSelect === "Crescente") {
return moviesByyear.sort((a,b) => Number(a.release_date) > Number(b.release_date) ? 1: -1);

} //operador de condiçao

else {

return moviesByyear.sort((a,b) => Number(a.release_date) > Number(b.release_date) ? -1: 1);

};

};


export const sortMoviesAz = (data, orderSelect) => {
const moviesAz = data.films

if (orderSelect === "filmsAz") {

return moviesAz.sort((a,b) => a.title > b.title ? 1: -1);
}
else {

return moviesAz.sort((a,b) => a.title > b.title ? -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