From c1a6c2ab9a8b13e95d9ea6ca061d57528dbfb93e Mon Sep 17 00:00:00 2001
From: pisouvigne <pisouvigne>
Date: Tue, 30 Jun 2020 23:03:38 +0200
Subject: [PATCH] generateur et settings

---
 site/vue/index.html         | 6 +++++-
 site/vue/js/func.js         | 9 +++++++++
 site/vue/js/generateGame.js | 9 +++++++++
 site/vue/js/lang.js         | 1 +
 site/vue/js/timer.js        | 4 +++-
 5 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/site/vue/index.html b/site/vue/index.html
index 38095a3..44e0e20 100644
--- a/site/vue/index.html
+++ b/site/vue/index.html
@@ -265,6 +265,10 @@
                     <h1 class="txt dys" id="settingTitle"></h1>
                     <hr id="hr">
                     <br>
+                    <p>
+                        <a class="txt dys" id="timerSetting"></a>
+                        <input id="timercheck" type="checkbox" onclick="showBarTimer(this)" checked>
+                    </p>
                     <p>
                         <a class="txt dys" id="themeDark"></a>
                         <input id="darkcheck" type="checkbox" onclick="darkMode()" checked>
@@ -504,7 +508,7 @@
 <script src="js/db.js"></script>
 <script src="js/generateGame.js"></script>
 <script>
-    generateFromBottom();
+    generate2();
     initAll();
 
 
diff --git a/site/vue/js/func.js b/site/vue/js/func.js
index 66f2a84..6bdab73 100644
--- a/site/vue/js/func.js
+++ b/site/vue/js/func.js
@@ -10,6 +10,15 @@ function closeModal(modal) {
     modal.style.display = "none";
 }
 
+function showBarTimer(checkbox) {
+    if (checkbox.checked == true) {
+        document.getElementById("progress_bar").style.display = 'block';
+    }
+    else {
+        document.getElementById("progress_bar").style.display = 'none';
+    }
+}
+
 function darkMode() {
     var checkbox = document.getElementById("darkcheck");
     if (checkbox.checked == true) {
diff --git a/site/vue/js/generateGame.js b/site/vue/js/generateGame.js
index 2e538f5..85f7dc7 100644
--- a/site/vue/js/generateGame.js
+++ b/site/vue/js/generateGame.js
@@ -299,6 +299,15 @@ function createGameOne(niveau) {
     initEndGame();
 }
 
+
+function generate2() {
+    var matchs = [[3, 2][2, 2]];
+    var fork = [[2, 1][1, 1]];
+    console.log(fork);
+}
+
+
+//a l'epoque
 function generateFromBottom() {
     var NombrecolonneTest = 2;
     var numberPerColonneTest = [3, 2];
diff --git a/site/vue/js/lang.js b/site/vue/js/lang.js
index f1a139e..efb1797 100644
--- a/site/vue/js/lang.js
+++ b/site/vue/js/lang.js
@@ -33,6 +33,7 @@ const lang = {
         successTitle: "Niveau réussi !",
         successInfo: "Vous avez réussi en ",
         symbole: "Mode symboles",
+        timerSetting: "Activer la barre timer"
 
     },
     en: {
diff --git a/site/vue/js/timer.js b/site/vue/js/timer.js
index 54cd4da..282d000 100644
--- a/site/vue/js/timer.js
+++ b/site/vue/js/timer.js
@@ -1,5 +1,6 @@
 function initTimer() {
   document.querySelector(".timer_txt").innerHTML = timeEnd - timer.getTimeValues().seconds;
+  document.querySelector(".progress_bar").style.animationPlayState = 'paused';
 }
 
 function move() {
@@ -32,6 +33,7 @@ timer.addEventListener('secondsUpdated', function (e) {
   if (timer.getTimeValues().seconds <= timeEnd) {
     move();
   } else {
+
     timeTot = timeTot + timer.getTimeValues().seconds;
     endTime();
     timer.stop();
@@ -78,4 +80,4 @@ function resetStar() {
   document.querySelector("#star3").style.color = document.body.style.color;
   document.querySelector("#star4").style.color = document.body.style.color;
   document.querySelector("#star5").style.color = document.body.style.color;
-}
\ No newline at end of file
+}