Laboratoria · dalejac · Jun 27, 2020 · Jun 27, 2020 · Jun 27, 2020 · Jun 27, 2020
diff --git a/README.md b/README.md
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -22,5 +22,19 @@
     "jest": "^24.9.0",
     "opener": "^1.5.1",
     "serve": "^11.0.0"
-  }
+  },
+  "description": "Esto es una prueba ## Índice",
+  "directories": {
+    "test": "test"
+  },
+  "devDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/nathu-bot/BOG001-data-lovers.git"
+  },
+  "author": "",
+  "bugs": {
+    "url": "https://github.com/nathu-bot/BOG001-data-lovers/issues"
+  },
+  "homepage": "https://github.com/nathu-bot/BOG001-data-lovers#readme"
 }
diff --git a/src/Icons/facebook.png b/src/Icons/facebook.png
diff --git a/src/Icons/home.svg b/src/Icons/home.svg
diff --git a/src/Icons/instagram.png b/src/Icons/instagram.png
diff --git a/src/Icons/list.svg b/src/Icons/list.svg
diff --git a/src/Icons/pokedex.svg b/src/Icons/pokedex.svg
diff --git a/src/Icons/search.svg b/src/Icons/search.svg
diff --git a/src/Icons/settings.svg b/src/Icons/settings.svg
diff --git a/src/Icons/versus.svg b/src/Icons/versus.svg
diff --git a/src/Icons/youtube.png b/src/Icons/youtube.png
diff --git a/src/Images/AMB.png b/src/Images/AMB.png
diff --git a/src/Images/Pokemon-logo.png b/src/Images/Pokemon-logo.png
diff --git a/src/Images/background.jpg b/src/Images/background.jpg
diff --git a/src/data.js b/src/data.js
@@ -1,9 +1,59 @@
-// estas funciones son de ejemplo
+// ----OTRA FORMA DE ORDENAR----
 
-export const example = () => {
-  return 'example';
-};
+// export const orderSort = (setDat, sort) => { 
+//   console.log(sort);
+//   if(sort === "A-Z" || sort === "Z-A"){
+//     let sorting = setDat.sort((x,y) => {
+//       if(x.name > y.name ) {
+//         return 1;
+//       } else { return -1;}
+//     }); 
+//     if (sort === "Z-A"){
+//       sorting.reverse();
+//     }
+//       return sorting; 
+//   } else {
+//     let sorting = setDat.sort((x,y) => {
+//       if(x.id > y.id ) {
+//       return 1;
+//     } else { return -1; }
+//   }); 
+//     if (sort === "151-1"){
+//       sorting.reverse();
+//   } 
+//     return sorting; 
+// }}; 
+
+export const orderSort = (setData, order) => {
+  let sorting = setData.sort((a,z) => {
+    let result;
+    let x;
+    let y;
+    if(order === "A-Z" || order === "Z-A") {
+      x = a.name;
+      y = z.name;
+
+    } if(order === "1-151" || order === "151-1") {
+      x = a.id;
+      y = z.id;
+    }
+    if (x > y){ result = 1;}
+    if(x < y) { result = -1;}
+    return result; 
+  }) 
+  if (order === "Z-A" || order === "151-1") {
+    sorting.reverse()
+  } return sorting;
+  };
 
-export const anotherExample = () => {
-  return 'OMG';
+  export const pokemonTypes = (setData, orderType) => {
+	let filtering = setData.filter((pokemon) => {
+		const tiposArr = pokemon.type;
+		return tiposArr.includes(orderType);
+	});
+	return filtering;
 };
+
+
+
+
diff --git a/src/index.html b/src/index.html
@@ -1,12 +1,93 @@
 <!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>
+
+<head>
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0" />
+
+  <title>Data Lovers</title>
+  <link href="https://fonts.googleapis.com/css2?family=Share+Tech+Mono&family=VT323&display=swap" rel="stylesheet" />
+  <link rel="stylesheet" href="style.css">
+</head>
+
+<body>
+  <header>
+
+    <nav class="container">
+      <div class="burger">
+        <img src="Icons/list.svg" id="list">
+      </div>
+      <ul class="nav-links">
+        <li id="home"><a href="#"><img class="home" src="Icons/home.svg" alt="Home">Home</a></li>
+        <li id="pokedex"><a href="#"><img class="pokedex" src="Icons/pokedex.svg" alt="Pokedex">Pokedex</a></li>
+        <li id="versus"><a href="#"><img class="versus" src="Icons/versus.svg" alt="Versus">Versus</a></li>
+      </ul>
+    </nav>
+    <div class="container"><img src="Images/Pokemon-logo.png" alt="Pokemon-logo" id="Pokemon"></div>
+    <div class="searchContainer container">
+      <form class="barSearch" id="bar">
+        <input type="search" name="search" placeholder="Search">
+      </form>
+      <button class="search" id="search"><img src="Icons/search.svg" class="loupe" id="loupe"></button>
+    </div>
+  </header>
+
+  <main>
+    <div class="window-1" id="Home">
+      <h1>
+        Explore and browse the Pokémon universe to become a Master, so go on and...
+      </h1>
+      <img src="Images/AMB.png" class="AMB">
+      <button type="button" class="continue" id="continue">Catch 'em all!</button>
+    </div>
+
+    <div class="window-2" id="Pokedex">
+      <div class="btn-filter">
+        <!-- <button class="Filter Order" id="order"> -->
+
+                <select class="Filter" name="az" id="aZ">
+                <option value="order">Order</option>
+                <option value="A-Z">A-Z</option>
+                <option value="Z-A">Z-A</option>
+                <option value="1-151">1 to 151</option>
+                <option value="151-1">151 to 1</option>
+                </select>
+                </button>
+
+                <!-- <button class="Filter Type" id="type"> -->
+
+                <select class="Filter" name="element" id="element">
+                <option value="0">Type</option>
+                <option value="Normal">Grass</option>
+                <option value="Poison">Poison</option>
+                <option value="Fire">Fire</option>
+                <option value="Flying">Fliying</option>
+                <option value="Water">Water</option>
+                <option value="Bug">Bug</option>
+                <option value="Plant">Plant</option>
+                <option value="Electric">Electric</option>
+                <option value="Ice">Ice</option>
+                <option value="Psychic">Psychic</option>
+                <option value="Ground">Ground</option>
+                <option value="Rock">Rock</option>
+                <option value="Dragon">Dragon</option>
+                <option value="Ghost">Ghost</option>
+                </select>
+                </button>
+      </div>
+      <div class="window-container" id="window-container"></div>
+
+    </div>
+  </main>
+
+  <footer>
+    © All rights reserved
+    <br>
+    Made by 💛 Nati y Ale
+  </footer>
+
+  <div id="root"></div>
+  <script src="./main.js" type="module"></script>
+</body>
+
 </html>