Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
8b9c54f
data borrada
Dynah1970 Jun 13, 2024
f6ed778
Merge pull request #1 from Dynah1970/main
Daniitrejo Jun 13, 2024
dc86ef5
cambios html
Daniitrejo Jun 13, 2024
487db5a
cambios en dataset.js
Dynah1970 Jun 13, 2024
8ce6e71
Merge pull request #2 from Dynah1970/main
Daniitrejo Jun 13, 2024
78d7632
modificacion view
Dynah1970 Jun 17, 2024
f3416d1
Merge pull request #3 from Dynah1970/main
Daniitrejo Jun 18, 2024
a5a7445
descripcion de tarjetas pokemon
Daniitrejo Jun 18, 2024
265152d
cambios en html
Dynah1970 Jun 18, 2024
28534ca
Merge pull request #4 from Dynah1970/main
Daniitrejo Jun 18, 2024
2424468
cambios de cartas
Daniitrejo Jun 19, 2024
bfb6771
adicionar facts
Dynah1970 Jun 21, 2024
3d25e91
Merge pull request #5 from Dynah1970/main
Dynah1970 Jun 21, 2024
cb65e02
primer arreglo de pruebas
Daniitrejo Jun 21, 2024
779a6a4
prototipo final
Dynah1970 Jun 24, 2024
89fc059
Merge pull request #6 from Dynah1970/main
Dynah1970 Jun 24, 2024
5951a52
cambios de pruebas
Daniitrejo Jun 24, 2024
e5f4e2b
movimiento a las cartas
Dynah1970 Jul 1, 2024
f5936d6
Merge pull request #7 from Dynah1970/main
Daniitrejo Jul 1, 2024
138146c
cambios en css
Daniitrejo Jul 2, 2024
f485701
Merge pull request #8 from Daniitrejo/primera-rama
Dynah1970 Jul 2, 2024
6bde69e
Merge pull request #2 from Daniitrejo/primera-rama
Dynah1970 Jul 2, 2024
fb4ec00
boton leer mas sin funcion
Dynah1970 Jul 4, 2024
bb98893
Merge pull request #9 from Dynah1970/primera-rama
Dynah1970 Jul 4, 2024
69b5def
nombres de botones
Dynah1970 Jul 4, 2024
947b55a
Merge pull request #11 from Dynah1970/primera-rama
Dynah1970 Jul 4, 2024
a0fcba8
prueba final
Dynah1970 Jul 6, 2024
9bfa94c
ultimas pruebas
Dynah1970 Jul 6, 2024
27ae3fc
Merge pull request #12 from Dynah1970/primera-rama
Daniitrejo Jul 6, 2024
c7789d1
Update README.md
Dynah1970 Jul 9, 2024
3f7ac70
Update README.md
Dynah1970 Jul 9, 2024
269a8d3
Update README.md
Dynah1970 Jul 9, 2024
35a236b
Update README.md
Dynah1970 Jul 9, 2024
b645149
Update README.md
Dynah1970 Jul 9, 2024
fbf5650
Update README.md
Dynah1970 Jul 9, 2024
3a264e6
Update README.md
Dynah1970 Jul 9, 2024
6b9a420
Update README.md
Dynah1970 Jul 9, 2024
a89942f
Update README.md
Dynah1970 Jul 9, 2024
fb331ee
Update README.md
Dynah1970 Jul 9, 2024
da4f316
Update README.md
Dynah1970 Jul 9, 2024
11e16f7
Update README.md
Dynah1970 Jul 9, 2024
e4eeddf
Update README.md
Dynah1970 Jul 9, 2024
904d75c
Add files via upload
Dynah1970 Jul 9, 2024
14c8992
Update README.md
Dynah1970 Jul 9, 2024
6f07fd5
Update README.md
Dynah1970 Jul 9, 2024
2f02159
Update README.md
Dynah1970 Jul 9, 2024
f137687
Update README.md
Dynah1970 Jul 9, 2024
d7b4279
Update README.md
Dynah1970 Jul 9, 2024
fdf59b3
Update README.md
Dynah1970 Jul 9, 2024
4ba80cb
Update README.md
Dynah1970 Jul 9, 2024
b16fd83
Update README.md
Dynah1970 Jul 9, 2024
aff24e1
Update README.md
Dynah1970 Jul 9, 2024
099dd21
Update README.md
Dynah1970 Jul 9, 2024
965a13f
Update README.md
Dynah1970 Jul 9, 2024
b29346c
Update README.md
Dynah1970 Jul 9, 2024
2d819b9
Update README.md
Dynah1970 Jul 13, 2024
f421ccd
Merge branch 'Daniitrejo:main' into main
Dynah1970 Jul 23, 2024
b4be3a7
Merge pull request #14 from Dynah1970/main
Dynah1970 Jul 23, 2024
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
1,107 changes: 119 additions & 988 deletions README.md

Large diffs are not rendered by default.

Binary file added captura base datos pokemon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7,975 changes: 7,975 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 @@ -31,7 +31,7 @@
"babel-jest": "^27.0.1",
"css": "^3.0.0",
"eslint": "^8.3.0",
"gh-pages": "^3.1.0",
"gh-pages": "^6.1.1",
"htmlhint": "^1.0.0",
"jest": "^27.0.1",
"jsdom": "^22.1.0",
Expand All @@ -49,4 +49,4 @@
"jest": {
"testEnvironment": "jsdom"
}
}
}
798 changes: 493 additions & 305 deletions src/data/dataset.js

Large diffs are not rendered by default.

52 changes: 45 additions & 7 deletions src/dataFunctions.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,47 @@
// Estas funciones son ejemplos, aquí puedes desarrollar tus propias funciones.
// dataFunctions.js
export function filterPokemonByElemental(data, elementalValue) {
if (elementalValue === 'Todo') return data;
return data.filter(pokemon => pokemon.type.includes(elementalValue));
}

export const example = () => {
return 'example';
};
export function filterPokemonByWeakness(data, weaknessValue) {
if (weaknessValue === 'Todo') return data;
return data.filter(pokemon => pokemon.weakness.includes(weaknessValue));
}


// Ordena los Pokémon por la característica seleccionada
export function filterPokemonByOrder(data, order) {
switch (order) {
case 'Numero':
return data.sort((a, b) => a.number - b.number);
case 'Nombre':
return data.sort((a, b) => a.name.localeCompare(b.name));
case 'Generación':
return data.sort((a, b) => a.generation - b.generation);
case 'Ataque':
return data.sort((a, b) => b.attack - a.attack);
case 'Defensa':
return data.sort((a, b) => b.defense - a.defense);
case 'Velocidad':
return data.sort((a, b) => b.speed - a.speed);
default:
return data;
}
}


export function filterPokemonByWord(data, wordValue) {
if (wordValue === 'z - a') {
return data.slice().sort((a, b) => b.name.localeCompare(a.name));
}

// Filtra los Pokémon cuyo nombre comienza con la letra seleccionada
return data.filter(pokemon => pokemon.name.charAt(0).toLowerCase() === wordValue.toLowerCase());
}

// Limpia los filtros y ordena por número
export function clearFiltersAndSort(data) {
return data.sort((a, b) => a.number - b.number);
}

export const anotherExample = () => {
return [];
};
143 changes: 134 additions & 9 deletions src/index.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,136 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>Dataverse</title>
<link rel="stylesheet" href="style.css" />
</head>
<body>
<script src="main.js" type="module"></script>
</body>

<html lang="es">

<head>

<meta charset="UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>PokemonGame</title>
<link rel="stylesheet" href="style.css" />

</head>

<body>

<header class="titulo-con-logo">
<img src="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcSlN7Bom07sPG8XqsISovyOghFONslfqtoxXQ&usqp=CAU" alt="logo de pokemon">

<main>

<div class="botones desplegables">
<label for="elemental"> ELEMENTOS:</label>
<select id="elemental" name="elementos" data-testid="select-elementos">
<option value="Todo">Todo</option>
<option value="Planta">Planta</option>
<option value="Agua">Agua</option>
<option value="Fuego">Fuego</option>
<option value="Veneno">Veneno</option>
<option value="Psiquico">Psiquico</option>
<option value="Volador">Volador</option>
<option value="Fantasma">Fantasma</option>
<option value="Electrico">Electrico</option>
<option value="Normal">Normal</option>
<option value="Hada">Hada</option>
<option value="Acero">Acero</option>
<option value="Lucha">Lucha</option>
<option value="Siniestro">Siniestro</option>
<option value="Dragon">Dragon</option>
</select>



<label for="weakness"> DEBILIDAD:</label>
<select id="weakness" name="debilidad" data-testid="select-debilidad">
<option value="Todo">Todo</option>
<option value="Planta">Planta</option>
<option value="Agua">Agua</option>
<option value="Fuego">Fuego</option>
<option value="Hielo">Hielo</option>
<option value="Tierra">Tierra</option>
<option value="Roca">Roca</option>
<option value="Bicho">Bicho</option>
<option value="Veneno">Veneno</option>
<option value="Psiquico">Psiquico</option>
<option value="Volador">Volador</option>
<option value="Fantasma">Fantasma</option>
<option value="Electrico">Electrico</option>
<option value="Hada">Hada</option>
<option value="Acero">Acero</option>
<option value="Lucha">Lucha</option>
<option value="Siniestro">Siniestro</option>
<option value="Dragon">Dragon</option>
</select>



<label for="order">CARACTERISTICA:</label>
<select id="order" name="ordenar" data-testid="select-ordenar">
<option value="Numero">Numero</option>
<option value="Nombre">Nombre</option>
<option value="Generación">Generación</option>
<option value="Ataque">Ataque</option>
<option value="Defensa">Defensa</option>
<option value="Velocidad">Velocidad</option>
</select>



<label for="word">LETRA:</label>
<select id="word" name="alfabeto">
<option value="">Mostrar todo</option>
<option value="a">A</option>
<option value="b">B</option>
<option value="C">C</option>
<option value="D">D</option>
<option value="E">E</option>
<option value="F">F</option>
<option value="G">G</option>
<option value="H">H</option>
<option value="I">I</option>
<option value="J">J</option>
<option value="K">K</option>
<option value="L">L</option>
<option value="M">M</option>
<option value="N">N</option>
<option value="O">O</option>
<option value="P">P</option>
<option value="Q">Q</option>
<option value="R">R</option>
<option value="S">S</option>
<option value="T">T</option>
<option value="U">U</option>
<option value="V">V</option>
<option value="W">W</option>
<option value="X">X</option>
<option value="Y">Y</option>
<option value="Z">Z</option>
<option value="Z - A">Z - A</option>
</select>


<button id="clear" data-testid="button-borrar">LIMPIAR</button>

</header>

<h1>Pokémon Cards</h1>

</div>

<div id="root">
<ul
id="pokemon-list"
itemscope
itemtype="http://schema.org/ItemList"
></ul>
</div>
</main>

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

<footer>
<p>Programa Pokemon Cards desarrollado por Daniela Trejo & Dinah Gomez</p>
</footer>
</body>
</html>
95 changes: 91 additions & 4 deletions src/main.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,93 @@
import { example } from './dataFunctions.js';
import { renderItems } from './view.js';
import data from "./data/dataset.js";
import { renderPokemonList } from "./view.js";
import {
filterPokemonByElemental,
filterPokemonByWeakness,
filterPokemonByOrder,
filterPokemonByWord,
clearFiltersAndSort,
} from "./dataFunctions.js";

import data from './data/dataset.js';
document.addEventListener("DOMContentLoaded", () => {
function initializeApp() {
renderPokemonList(data);
}

console.log(example, renderItems(data), data);
// Evento de cambio en el filtro de elementos
function handleElementalChange() {
const elementalValue = document.getElementById("elemental").value;
const elementalPokemon = filterPokemonByElemental(data, elementalValue);
renderPokemonList(elementalPokemon);
}

// Evento de cambio en el filtro de debilidad
function handleWeaknessChange() {
const weaknessValue = document.getElementById("weakness").value;
const weaknessPokemon = filterPokemonByWeakness(data, weaknessValue);
renderPokemonList(weaknessPokemon);
}

// Evento de cambio en la selección de ordenamiento
function handleOrderChange() {
const orderValue = document.getElementById("order").value;
const orderPokemon = filterPokemonByOrder(data, orderValue);
renderPokemonList(orderPokemon);
}

// Evento de cambio en la selección de palabra
function handleWordChange() {
const wordValue = document.getElementById("word").value;
const wordPokemon = filterPokemonByWord(data, wordValue);
renderPokemonList(wordPokemon);
}

// Evento de clic en el botón de borrar
function handleClearClick() {
document.getElementById("elemental").value = "Todo";
document.getElementById("weakness").value = "Todo";
document.getElementById("order").value = "Numero";
document.getElementById("word").value = "";
const clearedData = clearFiltersAndSort(data);
renderPokemonList(clearedData);
}

// Asignar event listeners
document
.getElementById("elemental")
.addEventListener("change", handleElementalChange);
document
.getElementById("weakness")
.addEventListener("change", handleWeaknessChange);
document
.getElementById("order")
.addEventListener("change", handleOrderChange);
document.getElementById("word").addEventListener("change", handleWordChange);
document.getElementById("clear").addEventListener("click", handleClearClick);

// Asignar eventos de hover para mostrar datos curiosos
const pokemonListElement = document.getElementById("pokemon-list");
pokemonListElement.addEventListener("mouseover", function (event) {
if (event.target.tagName === "LI") {
const facts = event.target.querySelector(".facts");
if (facts) {
facts.style.display = "block";
}
}
});

pokemonListElement.addEventListener("mouseout", function (event) {
if (event.target.tagName === "LI") {
const facts = event.target.querySelector(".facts");
if (facts) {
facts.style.display = "none";
}
}
});





// Carga inicial de la aplicación
initializeApp();
});
Loading