diff --git a/frontend/js/index.js b/frontend/js/index.js index e88692b31dd96401715ab6c91cb2e08cc6af1cd3..a24d0d8c758a8d134bbf14d17d0d30871b394ba2 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 d9051f2c336a9deacae6acd98ed0e68d05faf830..05d726471306a52cee14c5f2cd98e447741a8c4b 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 5abbad54c30891a8230600a64dfb3956cd2ffa09..342e4286afea73cf1f03a8abda8ce6a9fa4dce5f 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); + }