From 3edad5db6314dec7668a98b967e4419dbd7e575f Mon Sep 17 00:00:00 2001
From: "Benjamin.sitbon" <benjamin.sitbon@etu.hesge.ch>
Date: Thu, 22 Apr 2021 15:59:23 +0200
Subject: [PATCH] =?UTF-8?q?chargement=20des=20pokemons=20plus=20adapt?=
=?UTF-8?q?=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
frontend/js/index.js | 9 +++------
frontend/js/product.js | 7 +++++--
frontend/select.css | 13 +++++++------
3 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/frontend/js/index.js b/frontend/js/index.js
index e88692b..a24d0d8 100644
--- a/frontend/js/index.js
+++ b/frontend/js/index.js
@@ -90,14 +90,11 @@
let pokemon = document.getElementById(i).children;
-
- let name = pokemon[0].innerHTML;
+ let name = pokemon[1].innerHTML;
+
let type = document.getElementById(i).parentNode.children[1].children;
-
- let data = [name,type[0].src,type[1].src,"https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/" + (i+1) + ".png"]
-
- console.log(data);
+ let data = [name,type[0].src,type[1].src,i+1]
localStorage.setItem("oui",data);
diff --git a/frontend/js/product.js b/frontend/js/product.js
index d9051f2..05d7264 100644
--- a/frontend/js/product.js
+++ b/frontend/js/product.js
@@ -269,8 +269,11 @@
/** Création de la box du pokemon */
let data = localStorage.getItem("oui").split(',');
- let pokemon = data[0].split(' ')[2];
- let number = data[0].split(' ')[0];
+ let pokemon = data[0];
+
+ let number = data[3];
+
+ console.log(data);
let main = document.getElementById("selected");
let selection = get("https://pokeapi.co/api/v2/pokemon/" + pokemon);
diff --git a/frontend/select.css b/frontend/select.css
index 5abbad5..342e428 100644
--- a/frontend/select.css
+++ b/frontend/select.css
@@ -151,8 +151,7 @@ button {
width: 15vw;
display: none;
overflow-y: hidden;
- box-shadow:inset 2px 2px 2px 0px rgba(255,255,255,.5), 7px 7px 20px 0px rgba(0,0,0,.1), 4px 4px 5px 0px rgba(0,0,0,.1);
- border-radius: 20px 20px;
+
}
@@ -161,9 +160,9 @@ button {
margin-right: 1%;
width: 35%;
height: 30vw;
- border-radius: 20px 20px 20px 20px;
+
background-color: white;
- box-shadow:inset 2px 2px 10px 0px rgba(255,255,255,.5), 2px 2px 10px 0px rgba(0,0,0,.1), 2px 2px 10px 0px rgba(0,0,0,.1);
+
margin-left: 2.5vw;
}
@@ -192,11 +191,13 @@ button {
text-align: center;
overflow-y: hidden;
cursor: pointer;
+
}
.ability:hover {
-
- background-color: rgb(231, 231, 231);
+ background-color: rgb(252, 219, 219);
+ box-shadow:inset 5px 5px 20px 0px rgba(255,255,255,.5), 5px 5px 20px 0px rgba(0,0,0,.1), 5px 5px 20px 0px rgba(0,0,0,.1);
+
}
--
GitLab