From 1ca92f09c426b706b66aa2324f8cc1f4b868c720 Mon Sep 17 00:00:00 2001
From: adplantade <adrien.plantade@etu.uca.fr>
Date: Wed, 5 Aug 2020 15:59:32 +0200
Subject: [PATCH] ajout du bouton "retour accueil" en jeu

---
 code/game.css             |  46 +++++---------------------------------
 code/game.html            |   3 +++
 code/ress/button_back.png | Bin 0 -> 3326 bytes
 code/vitraux.js           |  14 ++++++------
 4 files changed, 16 insertions(+), 47 deletions(-)
 create mode 100644 code/ress/button_back.png

diff --git a/code/game.css b/code/game.css
index 8323e35..ff0a560 100644
--- a/code/game.css
+++ b/code/game.css
@@ -5,12 +5,6 @@
 .all-container {
     display : flex; 
     justify-content: center;
-    /*
-    align-items: baseline;
-    width : min-content;
-    flex-direction: row;
-    flex-wrap: wrap;*/
-
 }
 
 .day   { background: #eee; color: black; }
@@ -18,57 +12,24 @@
 
 .lightButton {
   position: absolute;
-  right: 0px;
+  right: 5px;
 }
 
 .flex-container {
-    /* We first create a flex layout context */
     display : flex;
     align-items: baseline;
     width : min-content;
     
     margin: 20px;
-    /* Then we define the flow direction 
-       and if we allow the items to wrap 
-     * Remember this is the same as:
-     * flex-direction: row;
-     * flex-wrap: wrap;
-     */
-    
-    
-    /* Then we define how is distributed the remaining space */
 
     flex-direction: column;
   }
-  /*
-  
-  .flex-item {
-    padding: 5px;
-    width: 200px;
-    height: 150px;
-    margin-top: 10px;
-    line-height: 150px;
-    color: white;
-    font-weight: bold;
-    font-size: 3em;
-    text-align: center;
-  }*/
 
   .vitraux {
-    /* We first create a flex layout context */
     display : flex;
     align-items: baseline;
     width : min-content;
     margin: 20px;
-    /* Then we define the flow direction 
-       and if we allow the items to wrap 
-     * Remember this is the same as:
-     * flex-direction: row;
-     * flex-wrap: wrap;
-     */
-    
-    
-    /* Then we define how is distributed the remaining space */
 
     flex-direction: column;
   }
@@ -116,4 +77,9 @@
     font-size: large;
     font-weight: bold;
     font-family: 'Segoe print';
+  }
+
+  .back {
+    position: absolute;
+    bottom: 5px;
   }
\ No newline at end of file
diff --git a/code/game.html b/code/game.html
index 3ad4e83..a4f6231 100644
--- a/code/game.html
+++ b/code/game.html
@@ -47,6 +47,9 @@
         
     </ul>
     
+    <img id="btn_back" src="ress/button_back.png" class="back" onClick="index()"/>
+    
+
     <script src="selecteur.js"></script>
     <script src="bakery.js"></script>
     <script src="chrono.js"></script>
diff --git a/code/ress/button_back.png b/code/ress/button_back.png
new file mode 100644
index 0000000000000000000000000000000000000000..edde128ca9808a0b78cd889554de7a41011e94cc
GIT binary patch
literal 3326
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

literal 0
HcmV?d00001

diff --git a/code/vitraux.js b/code/vitraux.js
index 112ff17..0637da0 100644
--- a/code/vitraux.js
+++ b/code/vitraux.js
@@ -1,4 +1,3 @@
-//version 28/07
 
 var canvasT = document.getElementById('canvasTotal');
 var ctxT = canvasT.getContext('2d');
@@ -65,6 +64,8 @@ canvasO.width=size;
 canvasT.height=size;
 canvasO.height=size;
 
+document.getElementById("btn_back").width=size;
+
 for(var a=1;a<5;a++)
 {
     eval("var canvas"+ a +"= document.getElementById('canvas"+a+"')");
@@ -675,13 +676,12 @@ function mlManager(e) {
     document.getElementById(e.currentTarget.id).classList.remove('vitrail-hover');
 }        
 
+function index()
+{
+    window.location.replace("./");
+}
+
 genVitraux();
-/*
-tab1.push(true,[-3,-3,colors[0]],[-3,2,colors[1]],[1,2,colors[2]],[3,-3,colors[3]]);
-tab2.push(true,[-3,-3,colors[0]],[-3,2,colors[1]],[1,2,colors[2]],[3,-3,colors[3]]);
-tab3.push(true,[-3,-3,colors[0]],[-3,2,colors[1]],[1,2,colors[2]],[3,-3,colors[3]]);
-tab4.push(true,[-3,-3,colors[0]],[-3,2,colors[1]],[1,2,colors[2]],[3,-3,colors[3]]);
-*/
 
 toutDessiner(tab1,canvas1,ctx1);
 toutDessiner(tab2,canvas2,ctx2);