Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
8af0ac4
agrega un encabezado principal
kellyfabiolafc Feb 13, 2023
0cbaf96
Merge pull request #1 from kellyfabiolafc/feature-paginahtml
Alexas1903 Feb 13, 2023
d44c608
Se reduce la data , para solo trabajar con Studio Ghibli
kellyfabiolafc Feb 20, 2023
f4d7a52
Merge branch 'main' of github.com:kellyfabiolafc/DEV004-data-lovers i…
kellyfabiolafc Feb 20, 2023
02e55c4
agrega imagenes del logo
kellyfabiolafc Feb 20, 2023
9a374c3
Se ha eliminado data que no usaremos y hemos estructurado la pagina html
kellyfabiolafc Feb 20, 2023
cbc7720
Merge pull request #2 from kellyfabiolafc/feature-paginahtml
Alexas1903 Feb 20, 2023
ac41bb6
Merge pull request #1 from kellyfabiolafc/main
Alexas1903 Feb 20, 2023
3260e1d
Añade estilos generales de la pagina
kellyfabiolafc Feb 20, 2023
c435864
Incluye eventos para visualizar la data
kellyfabiolafc Feb 20, 2023
504fcf6
elimina data que no usaremos
kellyfabiolafc Feb 20, 2023
49181c0
Merge pull request #3 from kellyfabiolafc/feature-style.general
Alexas1903 Feb 20, 2023
2796298
Merge pull request #4 from kellyfabiolafc/feature-Visualizar.Data
Alexas1903 Feb 20, 2023
2a40989
Merge pull request #2 from kellyfabiolafc/main
Alexas1903 Feb 20, 2023
5c614a4
Merge pull request #5 from Alexas1903/main
Alexas1903 Feb 20, 2023
c36e958
Merge pull request #3 from kellyfabiolafc/main
Alexas1903 Feb 20, 2023
f437ead
Ajusta las tarjetas
kellyfabiolafc Feb 21, 2023
fe6d30d
Merge pull request #7 from Alexas1903/main
Alexas1903 Feb 21, 2023
aeac2e1
Merge pull request #4 from kellyfabiolafc/main
Alexas1903 Feb 21, 2023
75fe929
Merge pull request #8 from Alexas1903/main
Alexas1903 Feb 21, 2023
6684864
resuelve un conflicto
kellyfabiolafc Feb 21, 2023
50c738a
Merge pull request #5 from kellyfabiolafc/main
Alexas1903 Feb 21, 2023
3a793d8
Merge pull request #9 from kellyfabiolafc/feature-Visualizar.Data
Alexas1903 Feb 21, 2023
39d847d
Merge pull request #10 from Alexas1903/main
Alexas1903 Feb 21, 2023
6de4b40
ajuste de tarjetas de descripcion
Alexas1903 Feb 22, 2023
229c69e
Merge branch 'main' of github.com:kellyfabiolafc/DEV004-data-lovers
Alexas1903 Feb 22, 2023
a914572
reponsive pasa s20
Alexas1903 Feb 22, 2023
525b9a6
Merge pull request #11 from Alexas1903/feature-responsive500
Alexas1903 Feb 22, 2023
6677bd4
incluye el responsive para tablets
kellyfabiolafc Feb 22, 2023
88fd484
Merge pull request #12 from kellyfabiolafc/feature-Visualizar.Data
kellyfabiolafc Feb 22, 2023
eeb57a5
Merge pull request #6 from kellyfabiolafc/main
Alexas1903 Feb 23, 2023
fa2c8e8
agrega responsive tab
Alexas1903 Feb 23, 2023
4fb15c7
guarda cambios en main
kellyfabiolafc Mar 2, 2023
2801f3a
agrega todos los cambios que hemos trabajado
kellyfabiolafc Mar 2, 2023
a42118c
Merge pull request #13 from kellyfabiolafc/feature-sorft
Alexas1903 Mar 2, 2023
aa4d8cf
Merge branch 'main' of github.com:kellyfabiolafc/DEV004-data-lovers
Alexas1903 Mar 2, 2023
4318e53
filtrar
Alexas1903 Mar 2, 2023
bc5a119
Merge pull request #14 from Alexas1903/main
Alexas1903 Mar 2, 2023
4562200
incluye cambios de formato
kellyfabiolafc Mar 2, 2023
d36e798
sumo otro conflictooo
kellyfabiolafc Mar 2, 2023
01d613b
sube ajustes de
kellyfabiolafc Mar 2, 2023
5a6e32f
Merge pull request #15 from kellyfabiolafc/feature-filters
kellyfabiolafc Mar 2, 2023
8af65cc
agrega dos objetos y crea un encabezado
Alexas1903 Mar 2, 2023
8d02384
Merge pull request #16 from Alexas1903/alexad
kellyfabiolafc Mar 2, 2023
ca15fc4
Merge pull request #8 from Alexas1903/alexad
Alexas1903 Mar 2, 2023
5d62d55
incluye cambios en el encabezado de personajes
kellyfabiolafc Mar 3, 2023
85d9819
estilo de boton pensonaje
Alexas1903 Mar 3, 2023
4be7ffb
Merge pull request #9 from Alexas1903/alexad
Alexas1903 Mar 3, 2023
895252d
Merge pull request #17 from Alexas1903/main
kellyfabiolafc Mar 3, 2023
75fdaae
contiene stilos del encabezado de personajes
kellyfabiolafc Mar 3, 2023
8e67fc7
incluye un conflicto resuelto
kellyfabiolafc Mar 3, 2023
2693d70
Merge pull request #18 from kellyfabiolafc/feature-filters
Alexas1903 Mar 3, 2023
1977f23
tiene estilos acerca de personajess
kellyfabiolafc Mar 3, 2023
25177ed
Merge pull request #19 from kellyfabiolafc/feature-filters
Alexas1903 Mar 6, 2023
da1dc0a
contiene cambios de ordenamiento
kellyfabiolafc Mar 7, 2023
8180df5
Merge pull request #20 from kellyfabiolafc/feature-filters
Alexas1903 Mar 7, 2023
21644ed
contiene nuevos filtros
kellyfabiolafc Mar 8, 2023
6238ebf
incluye todas las img restantes de la data
kellyfabiolafc Mar 8, 2023
dc589f7
contiene ajustes
kellyfabiolafc Mar 8, 2023
3e4c9ad
contiene diseño del select
kellyfabiolafc Mar 8, 2023
f9bc9e4
contiene cambios deestilo en el contenedor de imagenes
kellyfabiolafc Mar 9, 2023
a742e6e
Merge pull request #21 from kellyfabiolafc/feature.Pulido
Alexas1903 Mar 9, 2023
e61470f
tiene ajustes en el responsive y un nuevo mediaqry
kellyfabiolafc Mar 9, 2023
9ae58c6
Merge pull request #22 from kellyfabiolafc/feature.Pulido
kellyfabiolafc Mar 9, 2023
499b7fc
contiene un nuevo boton volver y ajustes en el select
kellyfabiolafc Mar 10, 2023
f31d543
Merge pull request #23 from kellyfabiolafc/feature.Pulido
kellyfabiolafc Mar 10, 2023
92f8e24
agrega un cursor tipo pointer a los botones de forma global
kellyfabiolafc Mar 10, 2023
313aeb7
Merge pull request #24 from kellyfabiolafc/feature.Pulido
kellyfabiolafc Mar 10, 2023
8e0abef
tiene responsive para mobil
kellyfabiolafc Mar 10, 2023
249d775
borra un media query con el cual no estamos utilizando
kellyfabiolafc Mar 10, 2023
3bd4b10
Merge pull request #25 from kellyfabiolafc/feature-Retoques
kellyfabiolafc Mar 10, 2023
4993ae8
tiene cambios en calcular data
kellyfabiolafc Mar 11, 2023
9f139f0
responsive para tablets y mobiles
kellyfabiolafc Mar 11, 2023
7857931
contiene ultimos cambios test
kellyfabiolafc Mar 14, 2023
01757f4
tiene un ajuste en el texto
kellyfabiolafc Mar 14, 2023
356aaf8
readme
kellyfabiolafc Mar 14, 2023
b40e067
probando readme
kellyfabiolafc Mar 14, 2023
747eea5
pruebas en el readme
kellyfabiolafc Mar 14, 2023
a139c4e
contiene ajuste en las imagenes
kellyfabiolafc Mar 14, 2023
92e763f
contiene ajuste
kellyfabiolafc Mar 14, 2023
ea8bafe
ajustes
kellyfabiolafc Mar 14, 2023
8943183
ajustes en el % de img
kellyfabiolafc Mar 14, 2023
c7a3092
contiene pulicion del readme
kellyfabiolafc Mar 14, 2023
424699f
Tiene una imagen nueva
kellyfabiolafc Mar 14, 2023
8a354c7
Nuevos ajustes
kellyfabiolafc Mar 14, 2023
7f7e76f
contiene ultimos ajustes en el texto objetivoss
kellyfabiolafc Mar 14, 2023
de27234
ajustes en objetivos
kellyfabiolafc Mar 14, 2023
f3dd3e9
Ajuste en el salto de lineas
kellyfabiolafc Mar 14, 2023
7a30b36
contiene descripcion de el noveno test
kellyfabiolafc Mar 14, 2023
367accc
contiene ajustes en la imagen hu
kellyfabiolafc Mar 14, 2023
b50a7da
Merge pull request #26 from kellyfabiolafc/feature-Retoques
kellyfabiolafc Mar 14, 2023
4d07d0e
Update README.md
kellyfabiolafc Mar 14, 2023
d921102
contiene ultimos ajustes
kellyfabiolafc Mar 16, 2023
a6146aa
Merge pull request #27 from kellyfabiolafc/feature-repaso
kellyfabiolafc Mar 16, 2023
df7696c
Contiene arreglo en el boton volver
kellyfabiolafc Mar 16, 2023
f7bf99c
contiene arreglos
kellyfabiolafc Mar 18, 2023
21fee04
contiene ajustes en 4 archivos
kellyfabiolafc Mar 20, 2023
400fa57
Merge pull request #29 from kellyfabiolafc/fabiola
kellyfabiolafc Jun 30, 2023
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
454 changes: 93 additions & 361 deletions README.md

Large diffs are not rendered by default.

13,159 changes: 13,159 additions & 0 deletions package-lock.json

Large diffs are not rendered by default.

617 changes: 617 additions & 0 deletions readme

Large diffs are not rendered by default.

57 changes: 53 additions & 4 deletions src/data.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,58 @@
// estas funciones son de ejemplo
export const filterOfdata = (data, id) => {
// console.log(data,id);
const peoplefilter = data.filter((film) => film.id === id);
//console.log(peoplefilter[0].people);
// return peoplefilter[0].people; //array de personajes
// Objeto con titulo y personajes
return {
title: peoplefilter[0].title,
characters: peoplefilter[0].people,
};
};

export const filterOfdata2 = (data, id) => {
const vehiculosfilter = data.filter((film) => film.id === id);
return vehiculosfilter[0].vehicles; //array de vehiculos
};

export const filterOfdata3 = (data, id) => {
const locationesfilter = data.filter((film) => film.id === id);
return locationesfilter[0].locations; //array de locaciones
};

export const sortData = (data) => {
const sortedData = data.sort((a, b) => b.release_date - a.release_date);
return sortedData;
};

export const example = () => {
return 'example';
export const sortData2 = (data) => {
const a_z = data.sort((a, b) => a.title.localeCompare(b.title));
return a_z;
};

export const anotherExample = () => {
return 'OMG';
export const sortData3 = (data) => {
const menorAmayor = data.sort((a, b) => a.release_date - b.release_date);
return menorAmayor;
};

export const sortData4 = (data) => {
const z_a = data.sort((a, b) => b.title.localeCompare(a.title));
return z_a;
};

export const calculoData = (data) => {
const sumatoria = data.reduce((acumulado, actual) => {
return acumulado + parseFloat(actual.rt_score);
}, 0);
const promedio = sumatoria / data.length;
return promedio;
};

export const filterMoviesByScore = (data, topScore) => {
return data
.filter((movie) => parseInt(movie.rt_score) >= topScore)
.sort((a, b) => parseInt(b.rt_score) - parseInt(a.rt_score))
.slice(0, 10);
};

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