From dcbe7c1d73e1256153c905d578913f368358416a Mon Sep 17 00:00:00 2001 From: pisouvigne Date: Tue, 23 Jun 2020 19:54:34 +0200 Subject: [PATCH] fix --- site/vue/css/style.css | 18 ++++++++++++++++++ site/vue/index.html | 24 +++++++++++++++++------- site/vue/js/func.js | 25 ++++++++++++------------- site/vue/js/main.js | 1 + 4 files changed, 48 insertions(+), 20 deletions(-) diff --git a/site/vue/css/style.css b/site/vue/css/style.css index b3e3979..9b6ca5e 100644 --- a/site/vue/css/style.css +++ b/site/vue/css/style.css @@ -94,6 +94,24 @@ html { margin-left: 25px; } + + +.listenerHover { + display: flex; + justify-content: center; + align-items: center; + height: 100px; + width: 300px; + font-size: x-large; + transition: .5s; + margin-top: 25px; + padding: 0 25px 0 25px; +} + +.listenerHover:hover { + cursor: pointer; +} + .fa-spinner { animation: loopiloop 2s infinite; margin-left: 25px; diff --git a/site/vue/index.html b/site/vue/index.html index 74f22ea..a6ee902 100644 --- a/site/vue/index.html +++ b/site/vue/index.html @@ -21,12 +21,22 @@
- - - - +
+ Tutoriel + +
+
+ Normal + +
+ +
+ Caméléon + +
@@ -71,7 +81,7 @@

-
+ diff --git a/site/vue/js/func.js b/site/vue/js/func.js index 303d308..86e7121 100644 --- a/site/vue/js/func.js +++ b/site/vue/js/func.js @@ -77,18 +77,16 @@ function setColor(color) { document.querySelector(".secret").style.color = "#fe8a71"; } -document.querySelector("#button_next_level").onmouseover = function () { mouseOver(document.querySelector("#button_next_level")) }; -document.querySelector("#button_next_level").onmouseout = function () { mouseOut(document.querySelector("#button_next_level")) }; -document.querySelector("#button_mode").onmouseover = function () { mouseOver(document.querySelector("#button_mode")) }; -document.querySelector("#button_mode").onmouseout = function () { mouseOut(document.querySelector("#button_mode")) }; -document.querySelector("#button_mode2").onmouseover = function () { mouseOver(document.querySelector("#button_mode2")) }; -document.querySelector("#button_mode2").onmouseout = function () { mouseOut(document.querySelector("#button_mode2")) }; -document.querySelector("#button_mode3").onmouseover = function () { mouseOver(document.querySelector("#button_mode3")) }; -document.querySelector("#button_mode3").onmouseout = function () { mouseOut(document.querySelector("#button_mode3")) }; -document.querySelector("#button_mode4").onmouseover = function () { mouseOver(document.querySelector("#button_mode4")) }; -document.querySelector("#button_mode4").onmouseout = function () { mouseOut(document.querySelector("#button_mode4")) }; -document.querySelector("#generate_button_perso").onmouseover = function () { mouseOver(document.querySelector("#generate_button_perso")) }; -document.querySelector("#generate_button_perso").onmouseout = function () { mouseOut(document.querySelector("#generate_button_perso")) }; +document.querySelectorAll(".listenerHover").forEach(function (element) { + element.addEventListener("mouseover", function (event) { + mouseOver(element); + }); +}); +document.querySelectorAll(".listenerHover").forEach(function (element) { + addEventListener("mouseout", function (event) { + mouseOut(element); + }); +}); function mouseOver(button) { button.style.backgroundColor = document.querySelector(".modal-body").style.borderColor; @@ -360,12 +358,13 @@ function isLineCollapsing() { switchsInfoCopy.forEach(function (element) { element.id3.forEach(function (line) { if (Math.abs(element.y - stage.findOne("#" + line).points()[7]) > distance) { + console.log(element.name); isCollapsing = true; } }) }); } - return isCollapsing; + return false; } function getRandomArbitrary(min, max) { diff --git a/site/vue/js/main.js b/site/vue/js/main.js index dd09382..ffcbf70 100644 --- a/site/vue/js/main.js +++ b/site/vue/js/main.js @@ -74,6 +74,7 @@ function gameOne() { click = 0; while (checkIfEnd() || isLineCollapsing()) { resetAllTabs(false); + console.log("arf"); createGameOne(niveauActuel); } //console.log(stage);