Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
aead656
prueba
Mitzymora May 23, 2023
c6fbd83
html
Mitzymora May 26, 2023
22c36c1
prueba
Mitzymora May 29, 2023
ca8d70d
filtros
Mitzymora May 29, 2023
b7326f0
Cambio de titulo
DanielaCastrejon May 29, 2023
3834ee9
Merge pull request #1 from DanielaCastrejon/main
DanielaCastrejon May 29, 2023
e79e37e
Agregando los elementos de HTML
DanielaCastrejon May 30, 2023
5992a70
Merge branch 'Mitzymora:main' into main
DanielaCastrejon May 30, 2023
e980f9d
Modificando HTML
DanielaCastrejon May 30, 2023
e2457f1
Modificando HTML
DanielaCastrejon May 30, 2023
bb9d300
Modificando HTML
DanielaCastrejon May 30, 2023
2fd81ca
Merge pull request #2 from DanielaCastrejon/main
DanielaCastrejon May 30, 2023
643d8a7
Merge branch 'main' of https://github.com/DanielaCastrejon/DEV008-dat…
DanielaCastrejon May 30, 2023
d428853
regresohtml
Mitzymora May 30, 2023
c174fcd
Otra vez
DanielaCastrejon May 30, 2023
90c98f1
Merge pull request #3 from DanielaCastrejon/main
DanielaCastrejon May 30, 2023
4dc2424
Merge branch 'main' of https://github.com/Mitzymora/DEV008-data-lovers
Mitzymora May 30, 2023
867df38
prueba2
Mitzymora May 30, 2023
d46b0f0
PruebaTres
DanielaCastrejon May 30, 2023
e01daea
Merge pull request #4 from DanielaCastrejon/main
DanielaCastrejon May 30, 2023
670f057
boton
Mitzymora May 30, 2023
a5ae9be
Cuatro
DanielaCastrejon May 30, 2023
3a4b9b4
Merge branch 'main' of https://github.com/DanielaCastrejon/DEV008-dat…
DanielaCastrejon May 30, 2023
33869bc
prueba17353484
Mitzymora May 30, 2023
36b56dc
Merge branch 'Mitzymora:main' into main
DanielaCastrejon May 30, 2023
dd1e83c
Prueba Arti
DanielaCastrejon May 30, 2023
8a442c9
Merge pull request #5 from DanielaCastrejon/main
DanielaCastrejon May 30, 2023
1b40b31
buscar
Mitzymora May 30, 2023
38d2675
css
Mitzymora May 31, 2023
441acfb
estatus
Mitzymora May 31, 2023
eaad287
probandoexportysort
Mitzymora Jun 1, 2023
7bf1252
Otra prueba que me pidio
DanielaCastrejon Jun 1, 2023
b71336a
Otra prueba
DanielaCastrejon Jun 1, 2023
9c74f35
Merge branch 'main' of https://github.com/DanielaCastrejon/DEV008-dat…
DanielaCastrejon Jun 1, 2023
2b2e97a
Merge pull request #6 from DanielaCastrejon/main
DanielaCastrejon Jun 1, 2023
3ebb17b
Se importa TODA la data de got.js
DanielaCastrejon Jun 1, 2023
c1af0d5
Merge pull request #7 from DanielaCastrejon/main
DanielaCastrejon Jun 1, 2023
6ef4cb8
descartar
Mitzymora Jun 1, 2023
23ae92f
Merge branch 'main' of https://github.com/Mitzymora/DEV008-data-lovers
Mitzymora Jun 1, 2023
28e0e33
Me arrojo cambios de algo
DanielaCastrejon Jun 1, 2023
931268d
Merge branch 'main' of https://github.com/DanielaCastrejon/DEV008-dat…
DanielaCastrejon Jun 1, 2023
1c1c00d
Merge pull request #8 from DanielaCastrejon/main
DanielaCastrejon Jun 1, 2023
6a13f44
Se restaura TODA la data para estar en la misma rama
DanielaCastrejon Jun 1, 2023
330c61e
Merge pull request #9 from DanielaCastrejon/main
DanielaCastrejon Jun 1, 2023
200c00b
Prueba de orden por alfabeto
DanielaCastrejon Jun 1, 2023
5eeaf89
Merge pull request #10 from DanielaCastrejon/main
DanielaCastrejon Jun 1, 2023
b4e907b
sortdata
Mitzymora Jun 2, 2023
3321895
Puebas para el creado de tarjetas
DanielaCastrejon Jun 2, 2023
6afbc3c
Merge pull request #11 from DanielaCastrejon/main
DanielaCastrejon Jun 2, 2023
ff99d1f
infotrasladada
Mitzymora Jun 4, 2023
e3a2d7d
imagen encabezado
Mitzymora Jun 5, 2023
01209f0
Pruebas para hacer el filtrado
DanielaCastrejon Jun 5, 2023
84bffac
Merge pull request #12 from DanielaCastrejon/main
DanielaCastrejon Jun 5, 2023
ca39338
sort y
Mitzymora Jun 7, 2023
596fb4c
Me pidio hacer merge para hacer pull
DanielaCastrejon Jun 7, 2023
e7fa93e
Merge branch 'main' of https://github.com/DanielaCastrejon/DEV008-dat…
DanielaCastrejon Jun 7, 2023
0fe0ac6
Merge pull request #13 from DanielaCastrejon/main
DanielaCastrejon Jun 7, 2023
2717c2a
La terminal esta pidiendo que comente para continuar
DanielaCastrejon Jun 7, 2023
92dd637
Merge pull request #14 from DanielaCastrejon/main
DanielaCastrejon Jun 7, 2023
e4beedf
Algo
DanielaCastrejon Jun 7, 2023
b7dd6a5
Merge pull request #15 from DanielaCastrejon/main
DanielaCastrejon Jun 7, 2023
e801b49
Subiendo todos los cambios finales a Main :)
DanielaCastrejon Jun 22, 2023
7145587
Merge pull request #16 from DanielaCastrejon/main
DanielaCastrejon Jun 22, 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
7,515 changes: 7,515 additions & 0 deletions package-lock.json

Large diffs are not rendered by default.

Binary file added src/Images/1605791.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 src/Images/desktop-wallpaper-game-of-thrones.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 src/Images/wp6808094.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file added src/README.md
Empty file.
48 changes: 41 additions & 7 deletions src/data.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,43 @@
// estas funciones son de ejemplo
//Función de filtrado por orden alfabetico//

export const example = () => {
return 'example';
};
export function sortData(order, arregloDePersonajes) {
let ordenalfabetico;
if (order === "abc") {
ordenalfabetico = arregloDePersonajes.sort((a, b) => {
if (a.fullName < b.fullName) {
return -1;
}
if (a.fullName > b.fullName) {
return 1;
}
return 0;
});
} else if (order === "cba") {
ordenalfabetico = arregloDePersonajes.sort((a, b) => {
if (a.fullName > b.fullName) {
return -1;
}
if (a.fullName < b.fullName) {
return 1;
}
return 0;
});
}
return ordenalfabetico;
}

export const anotherExample = () => {
return 'OMG';
};
//Filtrado de búsqueda//
export function filterData(texto, personajes) {
const enElTrono = personajes.filter(
(personaje) => personaje.lastName.toLowerCase() === texto.toLowerCase()
);
return enElTrono;
}

//Filtrado por Casa//
export function familias(filtroCasa, casas) {
const enCasa = casas.filter((casa) =>
casa.family.toLowerCase().includes(filtroCasa.toLowerCase())
);
return enCasa;
}
10 changes: 5 additions & 5 deletions src/data/got/got.js
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ export default{
"lastName": "Baratheon",
"fullName": "Joffrey Baratheon",
"title": "Lord of the Seven Kingdoms, Protector of the Realm",
"family": "House Lanister",
"family": "House Lannister",
"imageUrl": "https://thronesapi.com/assets/images/joffrey.jpg",
"born": "286 DC",
"death": "300 DC"
Expand All @@ -151,7 +151,7 @@ export default{
"lastName": "Lannister",
"fullName": "Tyrion Lannister",
"title": "Hand of the Queen",
"family": "House Lanister",
"family": "House Lannister",
"imageUrl": "https://thronesapi.com/assets/images/tyrion-lannister.jpg",
"born": "272 DC"
},
Expand Down Expand Up @@ -273,10 +273,10 @@ export default{
{
"id": 26,
"firstName": "Viserys",
"lastName": "Targaryan",
"fullName": "Viserys Targaryn",
"lastName": "Targaryen",
"fullName": "Viserys Targaryen",
"title": "King Viserys III",
"family": "Targaryan",
"family": "Targaryen",
"imageUrl": "https://thronesapi.com/assets/images/viserys-targaryan.jpg",
"born": "276 DC",
"death": "298 DC"
Expand Down
Binary file added src/header/titulo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
73 changes: 72 additions & 1 deletion src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,81 @@
<html>
<head>
<meta charset="utf-8">
<title>Data Lovers</title>
<title>Game of Thrones</title>
<meta name="viewport" content="width=device-width initial-scale=1.0">
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Slabo+27px&display=swap" rel="stylesheet">
<link rel="stylesheet" href="style.css" />
</head>
<body>
<header class="active">
<img src="header/titulo.png" style="max-width:100%;height:180px;">
</header>
<br>

<nav>

<input type="search" id="buscador" placeholder="Apellido">
<button id="busqueda">
<span>Buscar</span></button>
<br>
<br>
<div class="selec-abc" id="order">
<select class="orden" id="ordenabc">
<option disabled selected>orden alfabetico</option>
<option value="abc"> A-Z</option>
<option value="cba">Z-A</option>
</select>
</div>
<br>
<select class= "casa" id="filtro-casas">
<option disabled selected>Casas</option>
<option value="todas">Todas</option>
<option value="Stark">Stark</option>
<option value="Targaryen">Targaryen</option>
<option value="Tarly">Tarly</option>
<option value="Baratheon">Baratheon</option>
<option value="Lannister">Lannister</option>
</select>
</nav>

<br>
<br>

<section class="Detalles" >
<article>
<details >
<p>En un mundo fantástico y en un contexto medieval varias familias, relativas a la nobleza, se disputan el poder para dominar el territorio ficticio de Poniente (Westeros) y tomar el control de los Siete Reinos desde el Trono de Hierro, lugar donde el rey ejerce el poder.

Mientras tiene lugar una guerra civil para conseguir el poder, detrás del Muro que divide el reino de Poniente y la zona norte, los muertos amenazan con librar la batalla contra los vivos.

Entretanto, Daenerys Targaryen, la hija del antiguo rey, regresa a Poniente para reclamar su lugar y así vengar el deceso de sus ascendientes en la guerra civil anterior.
</p>
</details>
</article>
</section>
<br>
<br>
<br>
<br>
<br>


<div class="container" id="gotImg" ></div>

<!-- <section class="modal">
<div class="modal_container">
<img src="Images/wp6808094.png" class="modal_img">
<h2 class="modal_title">!Bienvenido al Juego de Tronos¡</h2>
<p class="modal_paragraph">"Cuando cae la nieve y los vientos blancos soplan, el lobo solitario muere, pero la manada sobrevive".
Ned Stark</p>
<a href="#" class="modal_close">Cerrar Modal</a>
</div>
</section> -->



<div id="root"></div>
<script src="main.js" type="module"></script>
</body>
Expand Down
69 changes: 64 additions & 5 deletions src/main.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,65 @@
import { example } from './data.js';
// import data from './data/lol/lol.js';
import data from './data/pokemon/pokemon.js';
// import data from './data/rickandmorty/rickandmorty.js';
import { filterData, sortData, familias } from "./data.js";
import data from "./data/got/got.js";

console.log(example, data);
//Funcion muestra de tarjetas//
const GOTcontainer = document.getElementById("gotImg");

function gotImgCreator(gotImages) {
GOTcontainer.innerHTML = "";

for (const got of gotImages) {
const imagen = document.createElement("div");
imagen.setAttribute("id", "fullName");
imagen.setAttribute("class", "family");
imagen.innerHTML = ` <div class="card">
<div><h2 class="nombrePersonaje" id="nombrecompleto" >${got.fullName}</h2>
<img class="got-image.url" src=${got.imageUrl}
alt="Imagen GOT" width=150 height=150 ></img>
<p id="familia">${got.family}</p>
<p id="titulo">${got.title}</p>
<p id="nacimiento">${got.born} - ${got.death}</p>
</div>
</div>`;
GOTcontainer.append(imagen);
}
}
gotImgCreator(data.got);

//Filtrado de búsqueda por órden alfabetico//

const ordenarselect = document.getElementById("ordenabc");
ordenarselect.addEventListener("change", () => {
const ordenName = ordenarselect.value;
let ordenalfabetico;

if (ordenName === "abc") {
ordenalfabetico = sortData("abc", data.got);
} else if (ordenName === "cba") {
ordenalfabetico = sortData("cba", data.got);
}
document.getElementById("gotImg").innerHTML = "";

gotImgCreator(ordenalfabetico);
});

//Filtro de Búsqueda anclado//
document.getElementById("busqueda").addEventListener("click", function () {
const texto = document.getElementById("buscador").value;
const enElTrono = filterData(texto, data.got);
gotImgCreator(enElTrono);
});

//Filtro por Casas//
const filtroCasa = document.querySelector("#filtro-casas");
filtroCasa.addEventListener("change", () => {
const casasOption = filtroCasa.value;
const enCasa = familias(casasOption, data.got);
gotImgCreator(enCasa);
});

//const closeModal = document.querySelector(".modal_close");

//closeModal.addEventListener("click", (e) => {
//e.preventDefault();
//modal.classList.remove("modal--show");
//});
Loading