Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
33dbdb5
Guardar rama de yen
yulietma Jan 22, 2024
f801d81
Rama de Julieta
yulietma Jan 23, 2024
0e66f29
Se agregat la data
YenCastro Jan 23, 2024
8537462
Agregamos URL a la data
YenCastro Jan 25, 2024
b173839
Merge pull request #1 from YenCastro/Castro
yulietma Jan 25, 2024
1d100d4
Merge remote-tracking branch 'upstream/Castro' into Castro
YenCastro Jan 29, 2024
bfa501e
agregamos datos de fltrado a la data
YenCastro Jan 29, 2024
62ecf3e
Merge pull request #2 from YenCastro/Castro
yulietma Jan 29, 2024
bd84e25
Se corrige filtrado dejando solo 4 en la data
YenCastro Jan 29, 2024
50771e9
Merge pull request #3 from YenCastro/Castro
yulietma Jan 29, 2024
5c14dab
Data Con filtros Genro Rango de edad y con imagenes cargadas
yulietma Jan 29, 2024
e9636ae
Estructura de prueba con primera data
yulietma Jan 29, 2024
7f017e9
Estructura con la data actualizada pero con 8 errores
yulietma Jan 29, 2024
26ab82e
Dataset aprobada
yulietma Jan 29, 2024
ad193db
agregamos la renderización de la data
YenCastro Jan 31, 2024
712ed8c
Agregamos la renderizción
YenCastro Jan 31, 2024
879d75e
Agregamos nuevamente renderización después de generar el mergen
YenCastro Jan 31, 2024
a0ad3f0
Se gusrada el primer fondo y La fuente de inicio
yulietma Jan 31, 2024
2eb4433
Añadir nueva imagen y eliminar imagen anterior
yulietma Jan 31, 2024
0491bb9
Agregamos renderización hecha desde main y view
YenCastro Feb 2, 2024
ef33295
Se carga index, view y main
YenCastro Feb 2, 2024
0ed94f5
Agregamos todos los cambios
YenCastro Feb 2, 2024
ba96960
Agregamos datos index, main y view
YenCastro Feb 2, 2024
f77e931
Agregamos cambios correspondientes a la renderización de la data
YenCastro Feb 2, 2024
10991f3
Merge pull request #5 from YenCastro/Castro
yulietma Feb 2, 2024
2a89edb
Agregamos primeros cambios de CSS junto a HTML
YenCastro Feb 6, 2024
57c1e2a
Merge pull request #6 from YenCastro/Castro
yulietma Feb 6, 2024
a2780ea
Se agrega barra fija fiktrado en HTML y CSS, adicional se corrigen do…
YenCastro Feb 13, 2024
5259850
Diseño css sin flexbox
yulietma Feb 13, 2024
cfaa63e
Merge pull request #8 from YenCastro/Castro
yulietma Feb 13, 2024
73f535a
Revicion de Barra de filtros
yulietma Feb 13, 2024
a0db11f
Agregamos nuevamente lo anterior sin errores
YenCastro Feb 13, 2024
ef26f43
Agregamos cambios css
YenCastro Feb 13, 2024
126df6f
Diseño de la class contenido,de las tarjetas y cambios de la data de …
yulietma Feb 14, 2024
6807667
Agregand dato css
YenCastro Feb 14, 2024
e094293
CSS y button readmore
YenCastro Feb 14, 2024
7d46150
CSS y button Read
YenCastro Feb 14, 2024
c083d02
CSS y button ReadMore
YenCastro Feb 14, 2024
3be49a1
ultimos cambiosCSS
YenCastro Feb 14, 2024
514b9c6
Merge pull request #11 from YenCastro/Castro
yulietma Feb 14, 2024
0350bfc
creamos funcion deslizado
YenCastro Feb 15, 2024
33e2e78
Funcion chage y funcion de filtro de Rango de edad
yulietma Feb 23, 2024
8734b74
Funcion genero
YenCastro Feb 23, 2024
dc06e21
Merge branch 'main' into Castro
YenCastro Feb 23, 2024
87eed7d
agregamos filtrado genero
YenCastro Feb 23, 2024
4aa1a51
Merge branch 'Castro' of github.com:YenCastro/DEV013-dataverse into C…
YenCastro Feb 23, 2024
346bdf7
agregamos funcion genero y edad, se tiene en borrador funcion ordenam…
YenCastro Feb 26, 2024
27e127f
agregamos 2 funciones y borrador ordenamiento
YenCastro Feb 26, 2024
6fc6fc0
funciones y borrador ordenamiento
YenCastro Feb 26, 2024
55ae7e5
Merge pull request #13 from YenCastro/Castro
yulietma Feb 26, 2024
2dc2dfa
se completa funcion de ordenamiento
YenCastro Feb 28, 2024
24ad99c
Funcion de Rango de edad y Boton limpiar
yulietma Feb 28, 2024
a7fbecc
test HTML, CSS, OAS
yulietma Feb 28, 2024
08b1faa
Update README.md
yulietma Mar 1, 2024
2c0b45b
Merge branch 'main' into Castro
YenCastro Mar 1, 2024
f89aa62
Responsive y corrección conflictos
YenCastro Mar 1, 2024
aa4165c
Merge branch 'Castro' of github.com:YenCastro/DEV013-dataverse into C…
YenCastro Mar 1, 2024
b97bac6
responsive
YenCastro Mar 1, 2024
9c55e4a
Dataverse README.md
yulietma Mar 3, 2024
216caec
Resposive sin conflictos, se carga extracción
YenCastro Mar 3, 2024
909e015
Merge pull request #15 from YenCastro/Castro
yulietma Mar 3, 2024
099755c
Rreadme fotos
yulietma Mar 3, 2024
fd34de3
Datavers README.md
yulietma Mar 3, 2024
d086e30
REnombrara fotos de Readme
yulietma Mar 3, 2024
9869eb4
Merge branch 'main' of https://github.com/yulietma/DEV013-dataverse
yulietma Mar 3, 2024
e8463f2
primer intento de test
YenCastro Mar 3, 2024
527b27e
Merge branch 'yulietma:main' into Castro
YenCastro Mar 4, 2024
d0ec030
Merge pull request #16 from YenCastro/Castro
yulietma Mar 4, 2024
fe94af6
Ultimos cambios y test corregido de order
YenCastro Mar 6, 2024
8e72123
Merge branch 'Castro' of github.com:YenCastro/DEV013-dataverse into C…
YenCastro Mar 6, 2024
77a3f08
Agregamos cambios en test y ultimos cambios
YenCastro Mar 6, 2024
ea8026f
Merge pull request #17 from YenCastro/Castro
yulietma Mar 6, 2024
4b178a4
Creacion de test Finalizados
yulietma Mar 6, 2024
72b9003
Finalizamos test creados
yulietma Mar 6, 2024
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
Binary file added Bienvenida.jpeg
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 Data.jpeg
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 Edad.jpeg
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 Filtros.jpeg
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 Fondo1.jpg
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 Genero.jpeg
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 GreatVibes-Regular.ttf
Binary file not shown.
Binary file added Imagenes/bienvenida.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 Ordenamiento.jpeg
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 Pagina.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1,013 changes: 79 additions & 934 deletions README.md

Large diffs are not rendered by default.

Binary file added Trajetas.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1,570 changes: 1,044 additions & 526 deletions package-lock.json

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,5 @@
"jest": {
"testEnvironment": "jsdom"
}
}
}

Binary file added src/assets/img/bienvenida.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 src/assets/img/footer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
497 changes: 217 additions & 280 deletions src/data/dataset.js

Large diffs are not rendered by default.

58 changes: 53 additions & 5 deletions src/dataFunctions.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,57 @@
// Estas funciones son ejemplos, aquí puedes desarrollar tus propias funciones.
// Estas funciones son ejemplos aquí puedes desarrollar tus propias funciones.
//Este archivo va a contener toda la funcionalidad que corresponda a obtener, procesar y manipular datos (tus funciones).

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

//Primer filtrado, género.
export const filterGender = (data, selectGender) => {
//console.log(selectGender);
return data.filter(item => {
if (selectGender === item.facts.genero) {

return true;
}
else {
return false;
}
})
};

//Segundo filtrado, rango edad..
export const filterByAge = (data, range) => {
// console.log (range);
return data.filter(item => {
if (range === item.facts.RangoDeEdad) {
return true;
} else {
return false;
}
})
};
<<<<<<< HEAD

=======
>>>>>>> ea8026f38d386808aa1e6105dcfa36d27b61f9e8


/*Funcion ordenamiento
- data: Es el arreglo de objetos que se va a ordenar. Cada objeto en este arreglo representa un elemento que se ordenará, como un libro en este caso.
- sortBy: Es la clave o propiedad por la cual se va a ordenar cada objeto en el arreglo data. Indica qué característica del objeto se utilizará para determinar el orden, como el título del libro, el autor, etc.
- ortOrder: Es el orden en el que se deben ordenar los objetos en el arreglo data. Puede ser "asc" para ascendente (de menor a mayor) o "desc" para descendente (de mayor a menor). Este parámetro determina la dirección de la ordenación.
*/

export const sortData = (data, sortBy, sortOrder) => {
const datatwo = data.sort((a, b) => {
const valueA = a[sortBy];
const valueB = b[sortBy];
const compare = valueA.localeCompare(valueB);
//console.log(compare);
return sortOrder === "asc" ? compare : compare * -1; });

return datatwo;
};

/*Funcion de Limpiar filtros */
export const clearFilters = (data) => {// se crea la funcion y la exportamos
return data;//muestrame la data

export const anotherExample = () => {
return [];
};
83 changes: 79 additions & 4 deletions src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,85 @@
<html>
<head>
<meta charset="utf-8">
<title>Data Lovers</title>
<title>Cuantos Cuentos 📚 </title>
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Great+Vibes&display=swap">
<link rel="stylesheet" href="style.css" />
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0,
minimum-scale=1.0">
<script src="https://kit.fontawesome.com/ce357ab3c2.js" crossorigin="anonymous"></script>
</head>
<body>
<script src="main.js" type="module"></script>
</body>

<body >

<header id="main-header">
<div class="content">

<!-- Category menu -->
<label for="filter">Filtrar por: </label>
<select data-testid="select-filter" name="filter" id="filter">
<option value="Seleccionar">Seleccionar</option>
<option value="Literatura infantil">Literatura infantil</option>
<option value="Fantasía">Fantasía</option>
<option value="Fábula">Fábula</option>
<option value="Cuento de hadas">Cuento de hadas</option>
<option value="Cuento popular">Cuento popular</option>
<option value="Aventura">Aventura</option>
</select>

<label for="order">Ordenar por rango de edad: </label>
<select data-testid="select-age" name="OrderAge" id="order">
<option value="SeleccionarAge">Seleccionar</option>
<option value="Todas las edades">Todas las edades</option>
<option value="3 a 5 años">3 a 5 años</option>
<option value="6 a 10 años">6 a 10 años</option>
<option value="11 a 13 años">11 a 13 años</option>
</select>

<label for="orderad">Ordenar por:</label>
<select name="orderad" id="orderad" data-testid="select-order">
<option value="all">Elige una opción</option>
<option value="asc">Ordenar de la A-Z</option>
<option value="desc">Ordenar de la Z-A</option>
</select>

<!-- Category clean button -->

<label for="button">
<button class="clearButton" data-testid="button-clear" type="button">Limpiar</button>
</label>

<div class="icon-menu">
<i class="fa-solid fa-bars"></i></button>

</div>
</div>

</header>

<main>
<div class="seccion">
<h1>Cuantos Cuentos</h1>
<p>¡Déjate llevar por la magia de la imaginación en cada página!</p>
</div>

<div class="ReadMore">
<button id="scrollButton">Deslizar</button>
</div>

<div class="seccion2" id="root" ></div>


<script src="main.js" type="module"></script>

<div class="seccion3">
<footer>
<h2>Julieta y Yenny</h2>
<div>
<h4>¡Que tus aventuras de lectura sean emocionantes y llenas de magia! ¡Hasta pronto!</h4>
</div>
</footer>
</div>
</main>
</body>

</html>
65 changes: 62 additions & 3 deletions src/main.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,65 @@
import { example } from './dataFunctions.js';
import { filterGender, filterByAge, sortData, clearFilters} from './dataFunctions.js';
import { renderItems } from './view.js';
import data from './data/dataset.js'; // Importa los datos primero

import data from './data/dataset.js';
document.getElementById('root').appendChild(renderItems(data));

console.log(example, renderItems(data), data);

let filteredData= data;
const selectElement = document.querySelector("#filter");
const root = document.querySelector("#root");
const selectAge= document.querySelector("#order")
const orderBook = document.querySelector("#orderad");
filteredData = [...data];


// Evento change para el elemento select, género.
selectElement.addEventListener("change", ()=>{
const selectGender = selectElement.options[selectElement.selectedIndex].value
/*console.log(selectGender);*/

const resultFilter = filterGender(data, selectGender)
/*console.log(resultFilter);*/
root.innerHTML = "";
root.appendChild(renderItems(resultFilter));
});


// Evento change por Filtro rango de edad
selectAge.addEventListener("change", () => {
const range = selectAge.options[selectAge.selectedIndex].value;
//console.log(range);

const resultAge= filterByAge(data,range)
//console.log(resultAge);
root.innerHTML = "";
root.appendChild(renderItems(resultAge));
});


//CleanButton
document.querySelector(".clearButton").addEventListener("click", () => {
root.innerHTML = "";//limpia contenedor
root.appendChild(renderItems(clearFilters(data)));//renderia de nuevo la data original
selectElement.selectedIndex = 0;// lo establece ala opcion pre determinada al inicio
selectAge.selectedIndex = 0;
orderBook.selectedIndex = 0;

});

// Evento change para el ordenamiento.
orderBook.addEventListener("change", (event) => {

// Ordenamos los datos filtrados por nombre
filteredData = sortData(filteredData, "name", event.target.value);

// Limpiamos el contenido anterior y renderizamos los datos ordenados
root.innerHTML = '';
root.appendChild(renderItems(filteredData));
});

//Funcion para botòn deslizante//
document.getElementById('scrollButton').addEventListener('click', function () {
const root = document.getElementById('root');
root.scrollIntoView({ behavior: 'smooth' });
});
Loading