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

Css #6

Open
wants to merge 50 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
39c7b3a
subiendo cambios de primera vista
gilliam24 Feb 4, 2022
34a4f19
Merge pull request #1 from gilliam24/main
angiephb Feb 4, 2022
cfca918
subiendo cambios ya actualizaciones de la segunda vista
gilliam24 Feb 4, 2022
d530eb1
Merge branch 'angiephb:main' into main
gilliam24 Feb 4, 2022
885557e
json
angiephb Feb 7, 2022
445f099
Merge pull request #2 from gilliam24/main
angiephb Feb 7, 2022
4a14059
Merge branch 'main' of github.com:angiephb/BOG004-data-lovers into ma…
angiephb Feb 7, 2022
d72b3f2
prueba
angiephb Feb 7, 2022
2f2e6a4
Merge pull request #3 from gilliam24/mainjs
angiephb Feb 7, 2022
551413b
subiendo slider
gilliam24 Feb 7, 2022
005954e
Merge branch 'main' of https://github.com/gilliam24/BOG004-data-lovers
gilliam24 Feb 7, 2022
8f053d6
Merge branch 'main' of https://github.com/gilliam24/BOG004-data-lovers
gilliam24 Feb 7, 2022
9314df7
Merge pull request #5 from gilliam24/main
angiephb Feb 7, 2022
433b22b
cambios en mainjs
angiephb Feb 7, 2022
4382af7
cambios en mainjs
angiephb Feb 7, 2022
0ac808d
cambios en main
angiephb Feb 7, 2022
78cb0f5
Merge pull request #6 from gilliam24/main
angiephb Feb 7, 2022
d107af5
cambios index
angiephb Feb 7, 2022
b8e372d
cambios en main
angiephb Feb 7, 2022
73e332d
cambios en mainjs
angiephb Feb 7, 2022
f3eb023
cambios en css
angiephb Feb 7, 2022
837a72e
cambios en css
angiephb Feb 7, 2022
c48e534
cambios en mainjs
angiephb Feb 7, 2022
4ad9482
Merge pull request #2 from angiephb/main
gilliam24 Feb 7, 2022
d19de1a
Merge pull request #3 from angiephb/mainjs
gilliam24 Feb 7, 2022
64fd408
subiendo html
gilliam24 Feb 7, 2022
16e7251
subiendo css
gilliam24 Feb 7, 2022
eeb3503
Merge pull request #4 from angiephb/css
gilliam24 Feb 7, 2022
e741027
subiendo slider css
gilliam24 Feb 7, 2022
781c64b
Merge pull request #7 from gilliam24/main
angiephb Feb 7, 2022
450fc45
Merge pull request #8 from gilliam24/css
angiephb Feb 7, 2022
9e7bbfa
aceptando cambios
angiephb Feb 7, 2022
8964190
Merge branch 'css' of github.com:angiephb/BOG004-data-lovers into css
angiephb Feb 7, 2022
b1a39cd
aceptando cambios
angiephb Feb 7, 2022
e81d327
Merge branch 'main' into css
angiephb Feb 8, 2022
bcef6bc
Merge pull request #9 from angiephb/css
angiephb Feb 8, 2022
8f0f993
Merge pull request #1 from angiephb/css
gilliam24 Feb 8, 2022
314bad6
Merge branch 'main' into mainjs
angiephb Feb 8, 2022
5045b57
Merge pull request #10 from angiephb/mainjs
angiephb Feb 8, 2022
6c9b413
Merge branch 'main' into mainjs
gilliam24 Feb 8, 2022
ba2421c
Merge pull request #5 from gilliam24/mainjs
gilliam24 Feb 8, 2022
9854727
subiendo cambios de la segunda pagina
gilliam24 Feb 8, 2022
adb5b35
es lo mismo
angiephb Feb 8, 2022
a35de35
Merge branch 'gilliam24-main'
angiephb Feb 8, 2022
cf56784
flexbox
angiephb Feb 9, 2022
9b6d9e1
Merge pull request #6 from angiephb/main
gilliam24 Feb 9, 2022
96f2555
Merge pull request #7 from gilliam24/css
gilliam24 Feb 9, 2022
feb1f70
subiendo actualizaciones
gilliam24 Feb 13, 2022
80f20d6
subiendo filtos terminados
gilliam24 Feb 15, 2022
8efe32f
Merge pull request #12 from gilliam24/main
angiephb Feb 15, 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,708 changes: 11,708 additions & 0 deletions package-lock.json

Large diffs are not rendered by default.

Binary file added src/bienvenida.otf
Binary file not shown.
45 changes: 38 additions & 7 deletions src/data.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,40 @@
// estas funciones son de ejemplo
import data from './data/ghibli/ghibli.js';// estas funciones son de ejemplo

export const example = () => {
return 'example';
};
const filtervehicles =() =>{ //filtro de vehiculos
let vehicles2 = data.films.filter( film => film.vehicles.length !==0)

export const anotherExample = () => {
return 'OMG';
};
console.log(vehicles2);
}

const filterlocation =() =>{ //filtro de locaciones
let location2 = data.films.filter( film => film.locations.length !==0)
console.log(location2);
}
// Filtros por score
const rtgood = () =>{
let rtscorebuena= data.films.filter(film =>film.rt_score >= 90)// filtro de puntaje pelicula buena
console.log('bueno',rtscorebuena);
}
const rtregular = () =>{
let rtscoreregular= data.films.filter(film => film.rt_score >= 80 && film.rt_score < 90 )// filtro de puntaje pelicula regular
console.log('regular', rtscoreregular)
}
const rtbad = () =>{
let rtscorebad= data.films.filter( film=> film.rt_score < 80)// filtro de puntaje pelicula mala
console.log('malo', rtscorebad)
}
// filtros por personajes
const characters =() =>{
let characters2= data.films.filter( film => {
film.people.map(personaje=> console.log(personaje.name))
})

console.log(characters2)
/* {

console.log('nombres personajes', characters2,"nombre",nombres)
}*/

}

export {filtervehicles, filterlocation, rtgood, rtregular, rtbad, characters};
Binary file added src/imagenes.img/img1.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/imagenes.img/img2.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/imagenes.img/img3.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/imagenes.img/img4.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/imagenes.img/img5.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/imagenes.img/img6.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
129 changes: 117 additions & 12 deletions src/index.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,117 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>Data Lovers</title>
<link rel="stylesheet" href="style.css" />
</head>
<body>
<div id="root"></div>
<script src="main.js" type="module"></script>
</body>
</html>
<!DOCTYPE html>
<html>

<head>
<meta charset="utf-8">
<title>Data Lovers</title>
<link rel="stylesheet" href="style.css" />
</head>

<body>
<!--Aqui va la pagina -->

<section id="pag1" class="pag1">
<div class="textoenc">
<h1>Ghibli Lovers</h1>
<h2>Bienvenidos!</h2>
<button type="button" id="btn1" class="btn1">Continuar</button>
</div>

<!--Aqui va slider pagina 1 -->

<div class="slider">

<ul>
<li> <img src="imagenes.img/img1.jpg" alt=""> </li>
<li> <img src="imagenes.img/img2.jpg" alt=""> </li>
<li> <img src="imagenes.img/img3.jpg" alt=""> </li>
<li> <img src="imagenes.img/img4.jpg" alt=""> </li>
</ul>

</div>
</section>

<!--Aqui va la pagina 2 -->

<section id="pag2">
<main id="username" class="flex-container">
<div class="grid">
<h3>Hola</h3>
<input type="text" id="name" placeholder="Ingresa tu nombre">
<button type="button" id="btn2" class="btn2">Ingresar</button>
<p id="msg"> </p>
</div>
<div class="list">
<ul id="list">

</ul>
<button type="button" id="btn3" class="btn3">Ver más...</button>
</div>
</main>

</section>

<!--Aqui va la pagina 3 -->

<main id="pag3">
<header>
<h4> <a href="https://gilliam24.github.io/BOG004-data-lovers/src/index.html">Ghibli Lovers</a></h4>
</header>

<!--Aqui van los filtros -->

<aside id="filterfimls" class="filterfilms">
<section id="filtersrt">
<p id="score">RT-Score</p>
<input type="radio" name="score" id="btnrt1" value="bueno">
<label for="btnrt1">Bueno</label>
<input type="radio" name="score" id="btnrt2" value="regular">
<label for="btnrt2">Regular</label>
<input type="radio" name="score" id="btnrt3" value="mala">
<label for="btnrt3">Mala</label>
</section>
<section id="filtersvh">
<label for="vehicles">Films que tienen Vehiculos</label>
<input type="radio" name="vehicles" id="vehicles">
</section>
<section id="filterslc">
<label for="location">Films con locaciones</label>
<input type="radio" name="location" id="location">
</section>
<section id="filterspj">
<label for="characters">Mostrar todos los personajes</label>
<input type="radio" name="characters" id="characters">
</section>
</aside>

<!--Aqui va el orden -->
<aside>
<section id="orderaz">
<input type="radio" name="az" id="ascendente" value="ascendente">
<label for="ascendente">Ordenar A-Z</label>
</section>
<section id="orderza">
<input type="radio" name="za" id="descendente" value="descendente">
<label for="descendente">Ordenar Z-A</label>
</section>
<section id="years">
<p>Ordenar por Año de Lanzamiento</p>
<input type="radio" name="yearsorder" id="btny1" value="reciente">
<label for="btnrt2">Más Reciente</label>
<input type="radio" name="yearsorder" id="btny2" value="Antigua">
<label for="btnrt3">Más Antiguo</label>
</section>





</aside>

</main>

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

</html>
47 changes: 43 additions & 4 deletions src/main.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,45 @@
import { example } from './data.js';
// import data from './data/lol/lol.js';
import data from './data/pokemon/pokemon.js';
import {filtervehicles, filterlocation, rtgood, rtregular, rtbad, characters} from './data.js';
//import data from './data/lol/lol.js';
import data from './data/ghibli/ghibli.js';
// import data from './data/rickandmorty/rickandmorty.js';

console.log(example, data);
document.getElementById("pag2").style.display="none";

const btn= document.getElementById("btn1");
btn.addEventListener("click", open1 =>{
document.getElementById("pag2").style.display="block";
document.getElementById("pag1").style.display="none";
})

let msg= document.getElementById("msg");
msg.innerHTML= " ";

let get= document.getElementById("btn2");
get.addEventListener("click", open2=>{
const nameuser= document.getElementById("name").value;
msg.innerHTML = nameuser + ' Aquí podras ver una pelicula a tu gusto y conocer algunas curiosidades ';
})
const crear =() =>{
const template = data.films.map((films) => `<li>${films.title } ${ - films.release_date}</li>`);
console.log( template );
let list=document.getElementById("list");
list.innerHTML = template.join('')

}

document.getElementById("pag3").style.display="none";

const btn1= document.getElementById("btn3");
btn1.addEventListener("click", open3 =>{
document.getElementById("pag3").style.display="block";
document.getElementById("pag2").style.display="none";
document.getElementById("pag1").style.display="none";
})
console.log(data);
crear();
filtervehicles();
filterlocation();
rtgood();
rtregular();
rtbad();
characters();
Loading