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.

Sign up for GitHub

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

Ultima actualización #19

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Ultima actualización #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2f8af05
diseño de pagina
karenfn Feb 28, 2020
78b0422
Ingreso de div
akaren29 Feb 28, 2020
c018044
Obtendiendo data de .js
akaren29 Mar 2, 2020
1d7003f
Lista función para mostrar en tarjetas a los Pokemones
akaren29 Mar 5, 2020
bb7dfa2
test
akaren29 Mar 5, 2020
c602afe
Cambios en divs
akaren29 Mar 6, 2020
25a5e9e
Se alineo los pokemones y se agrego option para ordenar
akaren29 Mar 8, 2020
9abe985
Se implemento función ordenar
akaren29 Mar 11, 2020
6a623c5
Cambios finales
akaren29 Mar 13, 2020
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
67 changes: 55 additions & 12 deletions src/data.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,56 @@
// import data from './data/injuries/injuries.js';
// import data from './data/lol/lol.js';
// import data from './data/patient/patient.js';
// import data from './data/pokemon/pokemon.js';
// import data from './data/rickandmorty/rickandmorty.js';
// import data from './data/steam/steam.js';
// import data from './data/steam/worldbank.js';

// esta es una función de ejemplo

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

const sortData = (data, sortBy, sortOrder) => {
let arrOrder = [];
/*Ordenar Alfabeticamente*/
if (sortBy === 'name'){
if (sortOrder === 'A-Z'){
arrOrder = data.sort(function(abc,bcd){
if (abc.name > bcd.name) return 1;
if (abc.name === bcd.name) return 0;
return -1;
});
}else{
arrOrder = data.sort(function (abc, bcd){
if (bcd.name > abc.name) return 1;
if (bcd.name === abc.name) return 0;
return -1;
});
}
/*Ordenar por número*/
} else if (sortBy === 'number'){
if (sortOrder === 'asc'){
arrOrder = data.sort(function (abc, bcd){
if(abc.num > bcd.num) return 1;
if(abc.num === bcd.num) return 0;
return -1;
});
}else {
arrOrder = data.sort(function(abc, bcd){
if (bcd.num > abc.num) return 1;
if (bcd.num === abc.num) return 0;
return -1;
});
}
}
return arrOrder;
};





//funcion filtrar

const filterData = (data, condition) => {
let arrType = [];
for (let i = 0; i < data.length; i++) {
for (let x = 0; x < data[i].type.length; x++) {
if (data[i].type[x] === condition) {
arrType.push(data[i]);
}
}
}
return arrType;
};

export {sortData, filterData}
94 changes: 90 additions & 4 deletions src/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,99 @@
<html lang="es">
<head>
<meta charset="UTF-8">
<title>Data Lovers</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>POKEFAN</title>
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0,
maximum-scale=1.0, minimum-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<link rel="stylesheet" href="style.css" />
<link rel="icon" type="image" href="./logo-pokefan.png">
</head>
<body>
<div id="root"></div>

<!-- contenedor padre -->
<div class="contenedor">
<section class="header-inicio" id="header-inicio">
<div class="contenedor-inicio"><!-- contenedor hijo de pagina de inicio -->
<div class="logo-letras">
<img src=https://i.ibb.co/vV89K5T/logo-pokefan.png alt="">
</div>
<div class="poner-nombre">
<div id="name">
</div>
<div>
<input type="text" name="name" id="namecontent" placeholder="Escribe tu nombre"><br>
<div class="boton-pokebola">
<a href=#segunda-seccion type="button" id="acceder" class="boton-pokebola"><img src= "https://i.ibb.co/RBBXcN3/pokebola.png" alt=""></div></a>


</div>
</div>
</section>
<!-- pagina principal -->
<section class="contenido">
<a name="segunda-seccion" id="segunda-seccion"></a>
<div class="contenido-principal">
<div class="header">
<img src="https://i.ibb.co/cbwJy0K/logo-principal1.png" class="logo-principal" alt="">
</div>
<div class="contenedor-contenido">
<div class="container-portada">
<div class="capa-degradado"></div>
<div class="container-details"></div>
<div class="details"></div>
<div id="paginaContenedorNombre"></div>
<p>En esta aplicación podras encontrar <br>todos los pokémones de la región Kanto,<br> primera generación desde Bulbasaur hasta Mew. </p>
</div>
<div class="pokemones">
<a name=ir-pokemones></a>
<div class="cuadrado"></div>
<a href=#ir-pokemones><p>Pokémones</p></a>
<div class="cuadrado-1"></div>
</div>
<div id="ListadePokemones">
<aside>
<a id="verOrder">
<div id="orderPoke" class="orderPoke">
<select id="orderPokemon" class="orderPokemon">
<option>Ordenar:</option>
<option value="00">A-Z</option>
<option value="01">Z-A</option>
<option value="02">1-151</option>
<option value="03">151-1</option>
</select></a>
<br>
<!-- Aqui colocamos un select para filtrar por tipo de pokemon -->
<a id="verFiltro">
<div id="filterTypePokemon">
<select id="typePokemones">
<option value="00">Tipo pokémon</option>
<option value="01">Agua</option>
<option value="02">Bicho</option>
<option value="03">Dragon</option>
<option value="04">Electrico</option>
<option value="04">Fantasma</option>
<option value="05">Fuego</option>
<option value="06">Hielo</option>
<option value="07">Lucha</option>
<option value="08">Normal</option>
<option value="09">Hierba</option>
<option value="10">Psiquico</option>
<option value="11">Roca</option>
<option value="12">Tierra</option>
<option value="13">Veneno</option>
<option value="14">Volador</option>
</select>
</div>
</a>

</div>
</aside>
<!-- aqui se muestran todas las tarjetas de los pokemones -->
<div id="container-cards-pokemon" class="container-cards-pokemon"></div>
</div>
</div>
</div>
<div class="footer"></div>
<script type="module" src="main.js"></script>
</body>
</html>
</html>
111 changes: 109 additions & 2 deletions src/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,111 @@
import { example } from './data.js';
import data from './data/pokemon/pokemon.js';
import {sortData,filterData} from './data.js';
console.log(data.pokemon);

console.log(example);
// funcion traer nombre
let obtenerNombre = name => {
let nameresult = document.getElementById('namecontent').value;
if (nameresult.length > 0){
document.getElementById('paginaContenedorNombre').innerText=('Hola ' + nameresult + ' Bienvenid@');
}
}
let botonacceder = document.getElementById('acceder');
botonacceder.addEventListener('click', obtenerNombre);



//Funcion traer pokemones a pagina contenedor
const pokemones = data.pokemon;
const template = (list) => {
let templateListPokemon= '';
list.forEach((pokemones) => {
const card = `
<div class = 'card-link'>
<article class='container-cards id='container-cards'>
<div class="cuadro-dentro">
<div class='contimg'><img class='img' src='${pokemones.img}' /></div>
<div class='article-details'>
<h3 class='num' > ${pokemones.num} </h3>
<h4 class='nombre'>${pokemones.name}</h4>
<h6 class='tipo'>Tipo: ${pokemones.type}</h6>
</div>
</article>
</div>
`;
templateListPokemon += card;
});
document.getElementById('container-cards-pokemon').innerHTML = templateListPokemon
};
template(pokemones);


//Función para ordenar a los pokemones
document.getElementById('orderPokemon').addEventListener( 'click', (event) =>{
const selectedIndex = event.currentTarget.selectedIndex;
if (selectedIndex === 1){
template(sortData(pokemones, 'name', 'A-Z'));
}else if (selectedIndex === 2){
template(sortData(pokemones, 'name', 'Z-A'));
}else if (selectedIndex === 3){
template(sortData(pokemones, 'number', 'asc'));
}else if(selectedIndex === 4){
template(sortData(pokemones, 'number', 'des'));
}
});


//filtrado por tipo
document.getElementById('typePokemones').addEventListener('change', (event) => {
const selectedIndex = event.currentTarget.selectedIndex;
if (selectedIndex === 1) {
template(filterData(pokemones, 'Water'));
} else if (selectedIndex === 2) {
template(filterData(pokemones, 'Bug'));
} else if (selectedIndex === 3) {
template(filterData(pokemones, 'Dragon'));
console.log((filterData(pokemones, 'Dragon')))
} else if (selectedIndex === 4) {
template(filterData(pokemones, 'Electric'));
} else if (selectedIndex === 5) {
template(filterData(pokemones, 'Ghost'));
} else if (selectedIndex === 6) {
template(filterData(pokemones, 'Fire'));
} else if (selectedIndex === 7) {
template(filterData(pokemones, 'Ice'));
} else if (selectedIndex === 8) {
template(filterData(pokemones, 'Fighting'));
} else if (selectedIndex === 9) {
template(filterData(pokemones, 'Normal'));
} else if (selectedIndex === 10) {
template(filterData(pokemones, 'Grass'));
} else if (selectedIndex === 11) {
template(filterData(pokemones, 'Psychic'));
} else if (selectedIndex === 12) {
template(filterData(pokemones, 'Rock'));
} else if (selectedIndex === 13) {
template(filterData(pokemones, 'Ground'));
} else if (selectedIndex === 14) {
template(filterData(pokemones, 'Poison'));
} else if (selectedIndex === 15) {
template(filterData(pokemones , 'Flying'));
}
});


// se muestra la segunda y desaparece la primera seccion
document.getElementById("acceder").addEventListener('click', () => {
document.getElementById("segunda-seccion").style.display = 'block';
document.getElementById("header-inicio").style.display = 'none';
});

// se muestra la segunda y desaparece la primera seccion
document.getElementById("verOrder").addEventListener('click', () => {
document.getElementById("segunda-seccion").style.display = 'block';
document.getElementById("header-inicio").style.display = 'none';
});

// se muestra la segunda y desaparece la primera seccion
document.getElementById("verFiltro").addEventListener('click', () => {
document.getElementById("segunda-seccion").style.display = 'block';
document.getElementById("header-inicio").style.display = 'none';
});
Loading