Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
f32d639
prueba
AndreaVazquez22 May 29, 2023
08e48f8
Merge pull request #1 from AndreaVazquez22/feature-andrea-data
mariadanielaorregopotosi May 29, 2023
126b1b0
Update index.html
mariadanielaorregopotosi May 29, 2023
ee06e4b
prueba2
AndreaVazquez22 May 29, 2023
096738f
Prueba 3
AndreaVazquez22 May 30, 2023
837519d
Update index.html
mariadanielaorregopotosi May 30, 2023
9e244f9
sehacen cambios en el html, css y main
mariadanielaorregopotosi May 31, 2023
c4d88f8
se guardan camios en html,css y js
mariadanielaorregopotosi May 31, 2023
f256ce1
se guardan cambios en css en htmly en js
mariadanielaorregopotosi May 31, 2023
f3b16e3
se guardan cambios en html,css y js
mariadanielaorregopotosi May 31, 2023
c7db53e
Imagenes
AndreaVazquez22 Jun 1, 2023
41a4908
Merge pull request #2 from AndreaVazquez22/main
mariadanielaorregopotosi Jun 1, 2023
ffb8fec
Guardar cambios
AndreaVazquez22 Jun 1, 2023
0800830
Funcion Visualizar Poster Y Titulo
AndreaVazquez22 Jun 1, 2023
ba46f4e
Merge branch 'mariadanielaorregopotosi:main' into main
AndreaVazquez22 Jun 1, 2023
5dedce8
Merge pull request #3 from AndreaVazquez22/main
mariadanielaorregopotosi Jun 1, 2023
3a6ab0c
Poster Titulo
AndreaVazquez22 Jun 1, 2023
adb1db5
Merge branch 'mariadanielaorregopotosi:main' into main
AndreaVazquez22 Jun 1, 2023
5cb191f
no hay cambios
mariadanielaorregopotosi Jun 1, 2023
26504fd
Merge branch 'main' of https://github.com/mariadanielaorregopotosi/DE…
mariadanielaorregopotosi Jun 1, 2023
05afdd1
cambios en el css
mariadanielaorregopotosi Jun 8, 2023
93e4c46
Funcion busqueda en js
AndreaVazquez22 Jun 8, 2023
4d06f0c
cambios guardados
mariadanielaorregopotosi Jun 9, 2023
da66519
Merge branch 'main' of https://github.com/AndreaVazquez22/DEV008-data…
mariadanielaorregopotosi Jun 9, 2023
efd35c7
cambios en css 3 colum
mariadanielaorregopotosi Jun 9, 2023
6907473
Boton de ordenar y cursor
AndreaVazquez22 Jun 9, 2023
a2935c1
Merge branch 'main' of https://github.com/AndreaVazquez22/DEV008-data…
AndreaVazquez22 Jun 9, 2023
c5ff886
Merge pull request #5 from AndreaVazquez22/main
mariadanielaorregopotosi Jun 9, 2023
2734e7c
cambion en html y css
mariadanielaorregopotosi Jun 10, 2023
12bd721
cambios en css
mariadanielaorregopotosi Jun 13, 2023
18aec84
cambios guaradados de andre
mariadanielaorregopotosi Jun 20, 2023
dcefe8d
guardar cambios main
mariadanielaorregopotosi Jun 20, 2023
9aa402a
cambios guardados del 21
mariadanielaorregopotosi Jun 21, 2023
0d60e0f
sendunda parte del 21
mariadanielaorregopotosi Jun 21, 2023
1a403c9
guardo cabios agrego descripcion de peliculas
mariadanielaorregopotosi Jun 21, 2023
c258ab2
se guarda cambios en la descrpcion
mariadanielaorregopotosi Jun 21, 2023
b8557d7
guardar cambion de descripcion en sistema
mariadanielaorregopotosi Jun 21, 2023
20ddfba
guardo cabios solo modificando lo que tenemos
mariadanielaorregopotosi Jun 21, 2023
9eddee9
guardo ultimos cambios del dia
mariadanielaorregopotosi Jun 21, 2023
7efd79a
Final
AndreaVazquez22 Jun 27, 2023
49547fb
Merge branch 'main' of https://github.com/AndreaVazquez22/DEV008-data…
AndreaVazquez22 Jun 27, 2023
2e394a8
Final
AndreaVazquez22 Jun 27, 2023
7cd7fae
Final 1
AndreaVazquez22 Jun 27, 2023
a36fe3f
cambios del 27
mariadanielaorregopotosi Jun 27, 2023
f2b2066
Merge branch 'main' of https://github.com/AndreaVazquez22/DEV008-data…
mariadanielaorregopotosi Jun 27, 2023
348d6e5
final de 29
mariadanielaorregopotosi Jun 29, 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
Binary file added ImagenesHU/Buscador Peliculas.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 ImagenesHU/Buscador Personajes.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 ImagenesHU/Datos Personaje.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 ImagenesHU/Miniaturas.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 ImagenesHU/Personaje.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 ImagenesHU/Sinopsis.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 ImagenesHU/buscar.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 ImagenesHU/directores.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 ImagenesHU/kiki.gif
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 ImagenesHU/ordenar.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 ImagenesHU/pagina.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 ImagenesHU/personajes.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 ImagenesHU/sinopsis1.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 ImagenesHU/sinopsis2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
608 changes: 19 additions & 589 deletions README.md

Large diffs are not rendered by default.

Binary file added image.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7,511 changes: 7,511 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 @@ -19,7 +19,7 @@
"eslint": "^8.3.0",
"gh-pages": "^3.1.0",
"htmlhint": "^1.0.0",
"jest": "^27.0.1",
"jest": "^27.5.1",
"opener": "^1.5.1",
"serve": "^13.0.2"
},
Expand All @@ -31,4 +31,4 @@
"version": "6.2.0",
"commit": "da890e27d7d1949d74bbea9f12216b48ff8185e9"
}
}
}
71 changes: 64 additions & 7 deletions src/data.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,66 @@
// estas funciones son de ejemplo

export const example = () => {
return 'example';
// importa data de ghibli.js//
import ghibli from "./data/ghibli/ghibli.js";
//se crea const=getData
export const getData = () => {
return ghibli.films;
};

export const anotherExample = () => {
return 'OMG';
};
export function buscarPeliculas(pelis, titulo) {
const peliculasEncontradas = pelis.filter((pelicula) =>
pelicula.title.toLowerCase().includes(titulo.toLowerCase())
);

return peliculasEncontradas;
}

export function ordenarPeliculas(peliculas, tipoDeOrden) {
if (tipoDeOrden === "year") {
peliculas.sort(function (a, b) {
const parametroa = a.release_date.toLowerCase();
const parametrob = b.release_date.toLowerCase();

if (parametroa === parametrob) {
return 0;
}
if (parametroa < parametrob) {
return -1;
}
return 1;
});
}
if (tipoDeOrden === "az") {
peliculas.sort(function (a, b) {
const parametroa = a.title.toLowerCase();
const parametrob = b.title.toLowerCase();

if (parametroa === parametrob) {
return 0;
}
if (parametroa < parametrob) {
return -1;
}
return 1;
});
}
if (tipoDeOrden === "za") {
peliculas.sort(function (a, b) {
const parametroa = a.title.toLowerCase();
const parametrob = b.title.toLowerCase();

if (parametroa === parametrob) {
return 0;
}
if (parametroa > parametrob) {
return -1;
}
return 1;
});
}
return peliculas;
}
export function filtrarPeliculas(peliculas, tipoFiltrado) {

return peliculas.filter(
(pelicula) => pelicula.director.toLowerCase() === tipoFiltrado
);
}
63 changes: 60 additions & 3 deletions src/index.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,69 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>Data Lovers</title>
<meta charset="utf-8" />
<title>Data de Peliculas</title>
<link rel="stylesheet" href="style.css" />
<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=Poppins&display=swap" rel="stylesheet">
</head>

<body>
<img id="gif" src="https://pa1.aminoapps.com/6611/9a69bd112b266c1545b4685ea6055c152e3d5125_hq.gif" width="70px" alt="GIF">

<div class="container">
<img
src="https://i0.wp.com/www.sir-apfelot.de/wp-content/uploads/2017/03/studio-ghibli-logo-620x288.png"
alt="titulo"
/>
<form></form>
<input
type="text"
name="search"
id="listaPeliculas"
placeholder="Buscar Películas..."
/>

<button id="buscar" type="submit"><strong>BUSCAR</strong></button>
<select id="ordenar">
<option>Ordenar</option>
<option value="year">Año de lanzamiento</option>
<option value= "az">A-Z</option>
<option value="za">Z-A</option>
</select>

<select id="director">
<option >Directores</option>
<option value="hayao miyazaki">Hayao Miyazaki</option>
<option value="isao takahata">Isao Takahata</option>
<option value="yoshifumi kondō">Yoshifumi Kondō</option>
<option value="hiroyuki morita">Hiroyuki Morita</option>
<option value="gorō miyazaki">Gorō Miyazaki</option>
<option value="hiromasa yonebayashi">Hiromasa Yonebayashi</option>
</select>
<button id = "limpiar"><strong>LIMPIAR</strong></button>
</div>

<ul id="peliculas-container"></ul>

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

</body>
</html>
<footer>
<div class="container grid-3">
<div class="copyright">
<h1>STUDIO GHIBLI</h1>
<p>Copyright &copy; 2023</p>
</div>
<div class="profiles">
<a href="https://twitter.com/i/flow/login?input_flow_data=%7B%22requested_variant%22%3A%22eyJsYW5nIjoiZXMifQ%3D%3D%22%7D"><em class="fab fa-twitter fa-2x"></em><img src="https://cdn.cms-twdigitalassets.com/content/dam/help-twitter/twitter_logo_blue.png.twimg.768.png" alt="twitter"></a>
<a href="https://www.instagram.com/accounts/login/?source=reset_password"><em class="fab fa-instagram fa-2x"></em><img src="https://upload.wikimedia.org/wikipedia/commons/thumb/5/58/Instagram-Icon.png/769px-Instagram-Icon.png" alt="instagram"></a>
<a href="https://es-la.facebook.com/login/device-based/regular/login/"><em class="fab fa-facebook fa-2x"></em><img src="https://upload.wikimedia.org/wikipedia/en/thumb/0/04/Facebook_f_logo_%282021%29.svg/1200px-Facebook_f_logo_%282021%29.svg.png" alt="facebook"></a>
<a href="https://web.whatsapp.com/"><em class="fab fa-whatsapp fa-2x"></em><img src="https://upload.wikimedia.org/wikipedia/commons/thumb/6/6b/WhatsApp.svg/1200px-WhatsApp.svg.png" alt="whatsapp"></a>
</div>
</div>
</footer>

</html>
65 changes: 60 additions & 5 deletions src/main.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,61 @@
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 { getData, buscarPeliculas, ordenarPeliculas, filtrarPeliculas} from "./data.js";
const peliculas = getData();
//console.log(peliculas);

console.log(example, data);
function mostrarPeliculas(dataset) {
const contenedor = document.getElementById("peliculas-container");
contenedor.innerHTML = "";
for (let i = 0; i < dataset.length; i++) {
const plantilla = `<li><img src = ${dataset[i].poster}></img><h1> ${dataset[i].title}</h1<p2>${dataset[i].director}</p2> <details>
<summary>Historia</summary>
<p3>${dataset[i].description}</p3>
</details></li>`;
contenedor.innerHTML += plantilla;
}
}

document.addEventListener("mousemove", function (event) {
const gif = document.getElementById("gif");
const x = event.clientX - gif.width / 1;
const y = event.clientY - gif.height / 1;
gif.style.left = x + "px";
gif.style.top = y + "px";
});

mostrarPeliculas(peliculas);

const peliculasOrdenadas = ordenarPeliculas(peliculas, "year")

mostrarPeliculas(peliculasOrdenadas);

function inicio() {
const botonbusqueda = document.getElementById("buscar");
botonbusqueda.addEventListener("click", function (evento) {
evento.preventDefault();
const titulo = document.getElementById("listaPeliculas").value;

const encontrarPeliculas = buscarPeliculas(peliculas, titulo);
mostrarPeliculas(encontrarPeliculas);
});
}
inicio();

const selectOrdenar = document.getElementById("ordenar");
selectOrdenar.addEventListener("change", function () {
const tipoDeOrden = document.getElementById("ordenar").value;

const orden = ordenarPeliculas(peliculas, tipoDeOrden);

mostrarPeliculas(orden);

});

const selectDirectores = document.getElementById("director");
selectDirectores.addEventListener("change", function () {
const tipoDirector = document.getElementById("director").value;

const directores = filtrarPeliculas(peliculas,tipoDirector);

mostrarPeliculas(directores);

} );
Loading