Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
bb9130f
cambios Adri
Adrianazambrano Nov 17, 2022
c8f3c08
Readme.md
ErikaSuesca Nov 17, 2022
6e3fa52
Merge pull request #1 from ErikaSuesca/ErikaSuesca
Adrianazambrano Nov 17, 2022
f25cbf1
Cambios en el Readme
ErikaSuesca Nov 17, 2022
a28626c
cambios de prueba
Adrianazambrano Nov 18, 2022
9191ef1
Merge pull request #2 from Adrianazambrano/Adri
Adrianazambrano Nov 18, 2022
f3391ff
Cambios en html y css
ErikaSuesca Nov 18, 2022
ae68d18
Merge branch 'main' into ErikaSuesca
ErikaSuesca Nov 18, 2022
fe52978
Merge pull request #3 from ErikaSuesca/ErikaSuesca
ErikaSuesca Nov 18, 2022
690aac8
rama adri
Adrianazambrano Nov 21, 2022
d00aad9
botones
Adrianazambrano Nov 21, 2022
6f98c78
Pagina Princpal
Adrianazambrano Nov 22, 2022
aacdce5
Merge pull request #4 from ErikaSuesca/Adri
ErikaSuesca Nov 22, 2022
8d3efd0
Cambios Tarjeta Pokemones
Adrianazambrano Nov 22, 2022
09eaa72
Merge pull request #5 from ErikaSuesca/Adri2
Adrianazambrano Nov 22, 2022
59f15a6
Cambios en html para mostrar filtros
ErikaSuesca Nov 23, 2022
8e488a3
Filtros en html
ErikaSuesca Nov 23, 2022
cc980f1
Merge pull request #6 from ErikaSuesca/Filtros
ErikaSuesca Nov 23, 2022
5cc5fd4
hola
Adrianazambrano Nov 23, 2022
bd20aa7
Merge pull request #7 from ErikaSuesca/Adri2
Adrianazambrano Nov 23, 2022
13a1f16
Insertamos imagenes y nombres de pokemones
Adrianazambrano Nov 23, 2022
761451b
Merge pull request #8 from ErikaSuesca/TarjetasJS
Adrianazambrano Nov 23, 2022
4bf60f6
cambios
Adrianazambrano Nov 24, 2022
64e38b1
Tarjetas organizadas en grid
Adrianazambrano Nov 24, 2022
37d6b70
Merge pull request #9 from ErikaSuesca/cambiosTarjeta
Adrianazambrano Nov 24, 2022
b53d3d4
Cambios estilos pagina Pokemones
ErikaSuesca Nov 25, 2022
133f2eb
cambios en stilo de tarjeta
Adrianazambrano Nov 26, 2022
62411a2
Modificacion de la posicion de filtros y tarjetas
Adrianazambrano Nov 26, 2022
510fd08
cambios
Adrianazambrano Nov 26, 2022
356d9eb
Filtros html
Adrianazambrano Nov 28, 2022
670c223
Merge pull request #10 from ErikaSuesca/paginaPokemones
Adrianazambrano Nov 28, 2022
9934f2f
Funcion filtrar por tipo
Adrianazambrano Nov 30, 2022
d9690cc
Merge pull request #12 from ErikaSuesca/Filtros
Adrianazambrano Nov 30, 2022
2ed5161
djfjfjfjfj
Adrianazambrano Nov 30, 2022
424a9d5
Merge pull request #13 from ErikaSuesca/funcionesFiltros
ErikaSuesca Dec 1, 2022
9fc6691
Cambios en main y data
ErikaSuesca Dec 3, 2022
1229146
Merge pull request #14 from ErikaSuesca/InicioTest
ErikaSuesca Dec 3, 2022
a1d7a31
main.js div de resietncias y debilidades
Adrianazambrano Dec 5, 2022
5ddc838
funciones de A-Z mas botones de resitencias y debilidades
Adrianazambrano Dec 5, 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
628 changes: 30 additions & 598 deletions README.md

Large diffs are not rendered by default.

11,851 changes: 11,851 additions & 0 deletions package-lock.json

Large diffs are not rendered by default.

24 changes: 20 additions & 4 deletions src/data.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,25 @@
// estas funciones son de ejemplo
export const filtrarTipo = (todoslosPokemones,seleccionTipoPokemon ) => {
return todoslosPokemones.filter(pokemonTipo=>pokemonTipo.type[0] === seleccionTipoPokemon)
};

export const example = () => {
return 'example';
export const buquedaPorNombre = (todoslosPokemones, nombrePokemon) => {
console.log(nombrePokemon);
console.log(todoslosPokemones);
};

export const anotherExample = () => {
return 'OMG';
export const ordenarData = (todoslosPokemones, key, orden) => {

return todoslosPokemones.sort(function (a, b) {
var x = a[key],
y = b[key];

if (orden === 'asc') {
return ((x < y) ? -1 : ((x > y) ? 1 : 0));
}

if (orden === 'desc') {
return ((x > y) ? -1 : ((x < y) ? 1 : 0));
}
});
};
Binary file added src/img/facebook.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/img/instagram.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/img/paginaPokemonesDesktop.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 src/img/paginaPokemonesMovil.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 src/img/pokemongo.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/img/prototipoDesktop.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 src/img/prototipoDesktopbyn.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 src/img/prototipoMovil.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 src/img/prototipoMovilbyn.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 src/img/youtube.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
129 changes: 128 additions & 1 deletion src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,138 @@
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0" user-scalable="no" maximum-scale="1.0" minimum-scale="1.0">
<title>Data Lovers</title>
<link rel="stylesheet" href="style.css" />
</head>

<body>
<div id="root"></div>
<section class="paginaPrincipal">
<div class="Botones">

<button type="button" id="btnPokemones" class = "btn" >POKEMONES</button>
<button type="button" id="btnEstadistica" class = "btn" >ESTADISTICAS</button>

</div>

<footer>
<div class="redesSociales">
<img src="img/facebook.png" alt="" class="redes">
<img src="img/instagram.png" alt="" class="redes">
<img src="img/youtube.png" alt="" class="redes">

</div>
<div class="cajaAutores">
<p class="autores"> by: Adriana Zambrano - Erika Suesca 2022</p>
</div>

</footer>
</section>

<!-- PAGINA DE POKEMONES-->
<section class="filtrosBusqueda">
<div class="opcionesFiltros" >
<h3>Type</h3>
<select id="tipoPokemones" placeholder="type">

<option value="bug">Bug</option>
<option value="dark" selected>Dark</option>
<option value="dragon">Dragon</option>
<option value="electric">Electric</option>
<option value="fighting">Fighting</option>
<option value="flying">Flying</option>
<option value="ghost">Ghost</option>
<option value="grass">Grass</option>
<option value="ground">Ground</option>
<option value="ice">Ice</option>
<option value="normal">Normal</option>
<option value="poison">Poison</option>
<option value="psychic">Psychic</option>
<option value="rock">Rock</option>
<option value="steel">Steel</option>
<option value="water">Water</option>
</select>

</div>
<div class="opcionesFiltros">
<h3>Resistant</h3>
<select id="debilidadPokemon">
<option value="bug">Bug</option>
<option value="dark" selected>Dark</option>
<option value="dragon">Dragon</option>
<option value="electric">Electric</option>
<option value="fighting">Fighting</option>
<option value="flying">Flying</option>
<option value="ghost">Ghost</option>
<option value="grass">Grass</option>
<option value="ground">Ground</option>
<option value="ice">Ice</option>
<option value="normal">Normal</option>
<option value="poison">Poison</option>
<option value="psychic">Psychic</option>
<option value="rock">Rock</option>
<option value="steel">Steel</option>
<option value="water">Water</option>
</select>


</div>
<div class="opcionesFiltros" >
<h3>Weaknesses</h3>
<select id="fortalezaPokemon">
<option value="bug">Bug</option>
<option value="dark" selected>Dark</option>
<option value="dragon">Dragon</option>
<option value="electric">Electric</option>
<option value="fighting">Fighting</option>
<option value="flying">Flying</option>
<option value="ghost">Ghost</option>
<option value="grass">Grass</option>
<option value="ground">Ground</option>
<option value="ice">Ice</option>
<option value="normal">Normal</option>
<option value="poison">Poison</option>
<option value="psychic">Psychic</option>
<option value="rock">Rock</option>
<option value="steel">Steel</option>
<option value="water">Water</option>
</select>


</div>
<button id="btn-filtrar"> Filtrar </button>
</section>

<section class="tiposInput">

<input type="text" placeholder="Buscar por nombre" id="inputBuscarNombre">
<select id = "ordenPokemonAz">
<input type="button" value="ordenarAZ↓" id="buttonAZ">
<input type="button" value="ordenarZA↑" id="buttonZA">
</select>
</section>




<section id="seccionPokemones" >


</section>


<!-- PAGINA DE ESTADISTICAS-->


<section class="paginaEstadistica">
<div class="estadisticas">

</div>
</section>




<script src="main.js" type="module"></script>
</body>
</html>
134 changes: 129 additions & 5 deletions src/main.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,130 @@
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 pokemon from './data/pokemon/pokemon.js';
import { filtrarTipo, ordenarData, buquedaPorNombre} from './data.js';

console.log(example, data);
// Funciones para visualizar las secciones del html:
document.getElementById("btnPokemones").addEventListener("click", () => {
document.querySelector('.paginaPrincipal').style.display= 'none';
document.querySelector('.paginaEstadistica').style.display= 'none';
document.querySelector('.paginaPokemones').style.display= 'block';
document.querySelector('.tiposInput').style.display= 'block';
document.querySelector('.filtrosBusqueda').style.display= 'block';
});

document.getElementById("btnEstadistica").addEventListener("click", () => {
document.querySelector('.paginaPrincipal').style.display= 'none';
document.querySelector('.paginaEstadistica').style.display= 'block';
document.querySelector('.paginaPokemones').style.display= 'none';
document.querySelector('.tiposInput').style.display= 'none';
document.querySelector('.filtrosBusqueda').style.display= 'none';
});

const todoslosPokemones = pokemon.pokemon;
const inputBuscarNombre = document.getElementById('inputBuscarNombre');
const botonFiltrar = document.getElementById('btn-filtrar');
const ordenPokemonAz = document.getElementById('buttonAZ');
const ordenPokemonZa = document.getElementById('buttonZA');

const seccion = document.getElementById('seccionPokemones');
seccion.setAttribute('class', 'paginaPokemones');

const contenedorPadre = document.createElement('div');
contenedorPadre.setAttribute('class', 'contenedorP');

const contenedor = document.createElement('div');
contenedor.setAttribute('class', 'contenedorTarjetas');

const filtros = document.createElement('div');
filtros.setAttribute('class', 'contenedorFiltros');

contenedorPadre.appendChild(contenedor);
contenedorPadre.appendChild(filtros);
seccion.appendChild(contenedorPadre);

// const tipoEmoticon= {

// grass:'😉',
// water:'💖',
// poison:'🦢',

// };

const mostrar = (pokemones) => {

pokemones.forEach((pokemon) => {
contenedor.innerHTML +=
` <div class="tarjetaPokemones" id="tarjetaPokemones" >
<h2 id="nombrePokemon" class="nombreP">${pokemon.name} </h2>
<h3 id="numeroPokemon" class="textoh3">${pokemon.num} </h3>
<div class="encabezadoTarjeta">
<img src="${pokemon.img}" alt="" id="imagenPokemon" class="imgPokemon">
<div class = 'contenedorh3'> <h3 id="tipoPokemon" class="textoh3">Type: ${pokemon.type} </h3>
<h3 id="generacionPokemon" class="textoh3"> Generation:${pokemon.generation.name} </h3>
</div>
</div>
<div class="descripcionTarjeta">
<p id="heightPokemon" class="sizeP"> height: ${pokemon.size.height}</p>
<p id="weightPokemon" class="sizeP"> weight: ${pokemon.size.weight}</p>
</div>
<div class="botonesTarjeta">
<button id="btnStats" class="bntS"> Stats </button>
<button id="btnResistencia" class="btnR">Characteristics</button>
</div>
<div id="contenedorResydebi" class="cajaResydebi">

<ul class="contenedorListas" >
<li class="listaResistencia ">
<h2 class='tituloLista'>Resistant<h2>
<div id="contenedorResistencia">
<p class='debiyresis'>${pokemon.resistant } </p>


</div>
</li>

<li class="listaDebilidades" >
<h2 class='tituloLista'>Weaknesses</h2>
<div id="contenedorDebilidades">
<p class='debiyresis'> ${pokemon.weaknesses}</p>
</div>
</li>



</ul>


</div>
</div> `
});
}


mostrar(todoslosPokemones);

botonFiltrar.addEventListener('click', () => {
document.getElementById("tipoPokemones").addEventListener("change", () => {
let seleccionTipoPokemon = document.getElementById('tipoPokemones').value;
if (seleccionTipoPokemon == "") {
mostrar(pokemon.pokemon);
}
else {
contenedor.innerHTML = '';
const dataTipoPokemon = filtrarTipo(todoslosPokemones, seleccionTipoPokemon);
mostrar(dataTipoPokemon);
}
});
});

ordenPokemonAz.addEventListener("click", () => {
contenedor.innerHTML = '';
mostrar(ordenarData(todoslosPokemones, 'name', 'asc'));
});

ordenPokemonZa.addEventListener("click", () => {
contenedor.innerHTML = '';
mostrar(ordenarData(todoslosPokemones, 'name', 'desc'));
});

inputBuscarNombre.addEventListener("input",() => {
buquedaPorNombre (todoslosPokemones,inputBuscarNombre.value );
});
Loading