Laboratoria · analizanaya · Feb 16, 2023 · Feb 17, 2023 · Feb 17, 2023 · Feb 21, 2023
diff --git a/HI1.png b/HI1.png
diff --git a/README.md b/README.md
diff --git a/esquinero-02.png b/esquinero-02.png
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
   "scripts": {
     "htmlhint": "htmlhint src/*.html test/*.html",
     "eslint": "eslint --ext .js src/ test/",
-    "pretest": "npm run eslint && npm run htmlhint",
+    "pretest_": "npm run eslint && npm run htmlhint",
     "test": "jest --verbose --coverage",
     "open-coverage-report": "opener ./coverage/lcov-report/index.html",
     "start": "serve src/",
@@ -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"
   },
@@ -31,4 +31,4 @@
     "version": "5.5.0",
     "commit": "cfda4de1f41e0c3000c47f91ce20a1bfe5281b4a"
   }
-}
+}
diff --git a/prototipoAltaHU2.JPG b/prototipoAltaHU2.JPG
diff --git a/prototipoAltaHU3.JPG b/prototipoAltaHU3.JPG
diff --git a/prototipoAltaHU4.JPG b/prototipoAltaHU4.JPG
diff --git a/prototipobaja.png b/prototipobaja.png
diff --git a/src/data.js b/src/data.js
@@ -1,9 +1,51 @@
-// estas funciones son de ejemplo
+// filtrar, ordenar y calcular
 
-export const example = () => {
-  return 'example';
-};
+export function filtrarPokemon(arreglo, name) {
+  const resultado = arreglo.filter((elemento) => elemento.name.includes(name));
+  return resultado;
+}
+export function filtrarTipo(arreglo, type) {
+  const resultadotipo = arreglo.filter((elemento) =>
+    elemento.type.includes(type)
+  );
+  return resultadotipo;
+}
 
-export const anotherExample = () => {
-  return 'OMG';
-};
+export function filtrarResistencia(arreglo, resistant) {
+  const resultadoResistant = arreglo.filter((elemento) =>
+    elemento.resistant.includes(resistant)
+  );
+  return resultadoResistant;
+}
+
+export function filtrarDebilidad(arreglo, weaknesses) {
+  const resultadoWeaknesses = arreglo.filter((elemento) =>
+    elemento.weaknesses.includes(weaknesses)
+  );
+  return resultadoWeaknesses;
+}
+
+export function ordenarCp(arreglo, option) {
+  const ordenaCp = arreglo.sort((a, b) => {
+    if (option === 1) {
+      //console.log(a.size.height.substr(0, a.size.height.length-1))//
+      return a.stats["max-cp"] - b.stats["max-cp"];
+    } else {
+      return b.stats["max-cp"] - a.stats["max-cp"];
+    }
+  });
+
+  return ordenaCp;
+}
+export function calculando(arreglo, type) {
+  let contador = 0;
+  for (let i = 0; i < arreglo.length; i++) {
+    if (arreglo[i].type.includes(type)) {
+      contador++;
+    }
+  }
+  const calculando = (contador / arreglo.length) * 100;
+
+
+  return calculando;
+}
diff --git a/src/imagenes/ash.png b/src/imagenes/ash.png
diff --git a/src/imagenes/candy-02.png b/src/imagenes/candy-02.png
diff --git a/src/imagenes/egg-01.png b/src/imagenes/egg-01.png
diff --git a/src/imagenes/fondo.jpg b/src/imagenes/fondo.jpg
diff --git a/src/imagenes/logo.png b/src/imagenes/logo.png
diff --git a/src/imagenes/pokemones_Mesa de trabajo 1.png b/src/imagenes/pokemones_Mesa de trabajo 1.png
diff --git a/src/index.html b/src/index.html
@@ -1,12 +1,188 @@
+
 <!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>
+<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>Data Lovers</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=Jost:ital,wght@0,500;1,500&display=swap" rel="stylesheet">
+  <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=Inter:wght@400;500;600;700;800&family=Jost:ital,wght@0,500;1,500&display=swap" rel="stylesheet">
+</head>
+
+<body>
+  <header>
+    <article>
+      <section class="bienvenida">
+        <p class="palabra1">¿Qué % es el tipo de mis</p>
+        <p class="palabra3">FAVORITOS?</p>
+
+        <select id="calcular" class="calcular"> 
+          <option disabled selected>Calcula AQUÍ</option>
+          <option value="grass">Grass</option>
+          <option value="poison">Poison</option>
+          <option value="water">Water</option>
+          <option value="fire">Fire</option>
+          <option value="flying">Flying</option>
+          <option value="normal">Normal</option>
+          <option value="ice">Ice</option>
+          <option value="electric">Electric</option>
+          <option value="rock">Rock</option>
+          <option value="bug">Bug</option>
+          <option value="dark">Dark</option>
+          <option value="dragon">Dragon</option>
+          <option value="fairy">Fairy</option>
+          <option value="fighting">Fighting</option>
+          <option value="ghost">Ghost</option>
+          <option value="ground">Ground</option>
+          <option value="psychic">Psychic</option>
+          <option value="steel">Steel</option>
+          </select>
+
+      </section>
+      <div>
+        <img src="./imagenes/pokemones_Mesa de trabajo 1.png" class="palabra2"> 
+      </div>
+      <section>
+        <img src="./imagenes/logo.png" class="logo" alt="logo pokemon">
+      </section>
+      <section>
+        <img src="./imagenes/ash.png" class="ash" alt="Ash y Pikachu">
+
+        <section class="movil">
+          <p class="palabra1movil">¿Qué % es el tipo de mis</p>
+          <p class="palabra3movil">FAVORITOS?</p>
+          <div>
+            <img src="./imagenes/pokemones_Mesa de trabajo 1.png" class="palabra2movil"> 
+          </div>
+        </section>
+
+      </section>
+    </article>
+    <div class="bienvenida2"> </div>
+     <select id="calcular2" class="calcular2"> 
+
+          <option disabled selected>Calcula AQUÍ</option>
+          <option value="grass">Grass</option>
+          <option value="poison">Poison</option>
+          <option value="water">Water</option>
+          <option value="fire">Fire</option>
+          <option value="flying">Flying</option>
+          <option value="normal">Normal</option>
+          <option value="ice">Ice</option>
+          <option value="electric">Electric</option>
+          <option value="rock">Rock</option>
+          <option value="bug">Bug</option>
+          <option value="dark">Dark</option>
+          <option value="dragon">Dragon</option>
+          <option value="fairy">Fairy</option>
+          <option value="fighting">Fighting</option>
+          <option value="ghost">Ghost</option>
+          <option value="ground">Ground</option>
+          <option value="psychic">Psychic</option>
+          <option value="steel">Steel</option>
+          </select>
+
+  </header>
+<nav>
+  <input type="search" placeholder="Nombre Pokémon: " id="buscador">
+  <ul class="tipopokemon">
+
+<select id="tipos" class="tipos"> 
+<option disabled selected> TYPE</option>
+<option value="grass">Grass</option>
+<option value="poison">Poison</option>
+<option value="water">Water</option>
+<option value="fire">Fire</option>
+<option value="flying">Flying</option>
+<option value="normal">Normal</option>
+<option value="ice">Ice</option>
+<option value="electric">Electric</option>
+<option value="rock">Rock</option>
+<option value="bug">Bug</option>
+<option value="dark">Dark</option>
+<option value="dragon">Dragon</option>
+<option value="fairy">Fairy</option>
+<option value="fighting">Fighting</option>
+<option value="ghost">Ghost</option>
+<option value="ground">Ground</option>
+<option value="psychic">Psychic</option>
+<option value="steel">Steel</option>
+</select>
+
+<select id="resistant" class="resistant">
+<option disabled selected> RESISTANT</option>
+<option value="grass">Grass</option>
+<option value="poison">Poison</option>
+<option value="water">Water</option>
+<option value="fire">Fire</option>
+<option value="flying">Flying</option>
+<option value="normal">Normal</option>
+<option value="ice">Ice</option>
+<option value="electric">Electric</option>
+<option value="rock">Rock</option>
+<option value="bug">Bug</option>
+<option value="dark">Dark</option>
+<option value="dragon">Dragon</option>
+<option value="fairy">Fairy</option>
+<option value="fighting">Fighting</option>
+<option value="ghost">Ghost</option>
+<option value="ground">Ground</option>
+<option value="psychic">Psychic</option>
+<option value="steel">Steel</option>
+</select>
+
+
+  <select id="weaknesses" class="weaknesses">
+  <option disabled selected>WEAKNESSES</option>
+  <option value="grass">Grass</option>
+  <option value="poison">Poison</option>
+  <option value="water">Water</option>
+  <option value="fire">Fire</option>
+  <option value="flying">Flying</option>
+  <option value="normal">Normal</option>
+  <option value="ice">Ice</option>
+  <option value="electric">Electric</option>
+  <option value="rock">Rock</option>
+  <option value="bug">Bug</option>
+  <option value="dark">Dark</option>
+  <option value="dragon">Dragon</option>
+  <option value="fairy">Fairy</option>
+  <option value="fighting">Fighting</option>
+  <option value="ghost">Ghost</option>
+  <option value="ground">Ground</option>
+  <option value="psychic">Psychic</option>
+  <option value="steel">Steel</option>
+  </select>
+
+  </ul>
+
+    <select id="ordenar" class="ordenar">
+
+      <option disabled selected>ORDENAR</option>
+      <option  value="1">ASCENDING CP</option>
+      <option  value="2">DESCENDING CP</option>
+
+      </select>
+
+
+
+</nav>
+  <main id="contenedorPokemon">
+
+
+
+
+
+
+  </main>
+  <script src="main.js" type="module"></script>
+</body>
+
+</html>