Merge branch 'master' of https://codefirst.iut.uca.fr/git/nathan.boileau/Scripted

WEB/View/src/CSS/Admin2.css

@@ -1,240 +1,239 @@
 @font-face {
-    font-family: Fauna;
-    src: url("../../assets/fonts/Fauna.ttf");
-  }
-  
-  @font-face {
-    font-family: Equinox;
-    src: url("../../assets/fonts/Equinox.otf");
-  }
-  /* End Fonts CSS */
-  
-  body {
-    min-height: 100vh;
-    font-family: Verdana, Geneva, Tahoma, sans-serif;
-    color: white;
-    height: 100vh;
-    background-color: #111219;
-  }
-  
-  li {
-    display: inline;
-    width: 225px;
-  }
-  
-  a {
-    color: white;
-    text-decoration: none !important;
-  }
-  a:hover {
-    color: white;
-  }
-  
-  h1,
-  h2,
-  h3,
-  h4,
-  h5,
-  h6,
-  .font {
-    font-family: Equinox;
-  }
-  
-  button {
-    background: transparent;
-    color: white;
-    outline: none;
-  }
-  
-  .legend {
-    color: #898989;
-    font-weight: bolder;
-  }
-  
-  .current {
-    background: rgb(146, 254, 157);
-    background: -moz-linear-gradient(
-      50deg,
-      rgba(146, 254, 157, 1) 0%,
-      rgba(0, 201, 255, 1) 100%
-    );
-    background: -webkit-linear-gradient(
-      50deg,
-      rgba(146, 254, 157, 1) 0%,
-      rgba(0, 201, 255, 1) 100%
-    );
-    background: linear-gradient(
-      50deg,
-      rgba(146, 254, 157, 1) 0%,
-      rgba(0, 201, 255, 1) 100%
-    );
-    box-shadow: 0px 0px 50px -5px rgba(0, 201, 255, 0.3);
-    border-radius: 4px;
-    -webkit-border-radius: 4px;
-    -moz-border-radius: 4px;
-    -ms-border-radius: 4px;
-    -o-border-radius: 4px;
-  }
-  
-  .send {
-    background: rgb(146, 254, 157);
-    background: -moz-linear-gradient(
-      50deg,
-      rgba(146, 254, 157, 1) 0%,
-      rgba(0, 201, 255, 1) 100%
-    );
-    background: -webkit-linear-gradient(
-      50deg,
-      rgba(146, 254, 157, 1) 0%,
-      rgba(0, 201, 255, 1) 100%
-    );
-    background: linear-gradient(
-      50deg,
-      rgba(146, 254, 157, 1) 0%,
-      rgba(0, 201, 255, 1) 100%
-    );
-    box-shadow: 0px 0px 50px -5px rgba(0, 201, 255, 0.3);
-    border-radius: 4px;
-    -webkit-border-radius: 4px;
-    -moz-border-radius: 4px;
-    -ms-border-radius: 4px;
-    -o-border-radius: 4px;
-  
-    width: max-content;
-    height: min-content;
-  }
-  
-  .currentText {
-    color: black;
-  }
-  .currentText:hover {
-    color: black;
-  }
-  
-  .nav-button {
-    color: #898989;
-  }
-  
-  .nav-button:hover {
-    color: white;
-  }
-  
-  .dashboard-card {
-    background: rgb(0, 0, 0);
-    background: -moz-linear-gradient(
-      315deg,
-      rgba(0, 0, 0, 0.4) 0%,
-      rgb(0, 0, 0) 30%
-    );
-    background: -webkit-linear-gradient(
-      315deg,
-      rgba(0, 0, 0, 0.4) 0%,
-      rgb(0, 0, 0) 30%
-    );
-    background: linear-gradient(
-      315deg,
-      rgba(0, 0, 0, 0.4) 0%,
-      rgba(0, 0, 0, 1) 30%
-    );
-    border-radius: 15px;
-    -webkit-border-radius: 15px;
-    -moz-border-radius: 15px;
-    -ms-border-radius: 15px;
-    -o-border-radius: 15px;
-    min-height: 350px;
-    overflow-y: scroll;
-  }
-  
-  
-  .dashboard-card-reversed {
-    background: rgb(0, 0, 0);
-    background: -moz-linear-gradient(
-      45deg,
-      rgba(0, 0, 0, 0.4) 0%,
-      rgba(0, 0, 0, 1) 30%
-    );
-    background: -webkit-linear-gradient(
-      45deg,
-      rgba(0, 0, 0, 0.4) 0%,
-      rgba(0, 0, 0, 1) 30%
-    );
-    background: linear-gradient(
-      45deg,
-      rgba(0, 0, 0, 0.4) 0%,
-      rgba(0, 0, 0, 1) 30%
-    );
-  }
-  
-  .dashboard-card-mail {
-    background: rgb(0, 0, 0);
-    background: -moz-linear-gradient(
-      180deg,
-      rgba(0, 0, 0, 0.4) 0%,
-      rgba(0, 0, 0, 1) 30%
-    );
-    background: -webkit-linear-gradient(
-      180deg,
-      rgba(0, 0, 0, 0.4) 0%,
-      rgba(0, 0, 0, 1) 30%
-    );
-    background: linear-gradient(
-      180deg,
-      rgba(0, 0, 0, 0.4) 0%,
-      rgba(0, 0, 0, 1) 40%
-    );
-    border-radius: 15px;
-    -webkit-border-radius: 15px;
-    -moz-border-radius: 15px;
-    -ms-border-radius: 15px;
-    -o-border-radius: 15px;
-    min-height: 400px;
-  }
-  
-  .user-box input {
-    width: 100%;
-    font-family: Verdana, Geneva, Tahoma, sans-serif;
-    padding: 8px 0;
-    font-size: 12px;
-    color: #fff;
-    border: none;
-    border-bottom: 1px solid #fff;
-    outline: none;
-    background: transparent;
-  }
-  
-  .user-box label {
-    position: absolute;
-    top: 0;
-    left: 0;
-    font-size: 16px;
-    color: #fff;
-    pointer-events: none;
-    transition: 0.5s;
-    -webkit-transition: 0.5s;
-    -moz-transition: 0.5s;
-    -ms-transition: 0.5s;
-    -o-transition: 0.5s;
-  }
-  
-  .user-box input:focus ~ label,
-  .user-box input:valid ~ label {
-    top: -20px;
-    left: 0;
-    color: #be5631;
-    font-size: 12px;
-  }
-  
-  #message {
-    width: 100%;
-    height: 100%;
-    resize: none;
-    border: none;
-    background-color: transparent;
-    border: 1px solid #fff;
-    color: #fff;
-    border-radius: 4px;
-    -webkit-border-radius: 4px;
-    -moz-border-radius: 4px;
-    -ms-border-radius: 4px;
-    -o-border-radius: 4px;
-  }
+  font-family: Fauna;
+  src: url("../../assets/fonts/Fauna.ttf");
+}
+
+@font-face {
+  font-family: Equinox;
+  src: url("../../assets/fonts/Equinox.otf");
+}
+/* End Fonts CSS */
+
+body {
+  min-height: 100vh;
+  font-family: Verdana, Geneva, Tahoma, sans-serif;
+  color: white;
+  height: 100vh;
+  background-color: #111219;
+}
+
+li {
+  display: inline;
+  width: 225px;
+}
+
+a {
+  color: white;
+  text-decoration: none !important;
+}
+a:hover {
+  color: white;
+}
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+.font {
+  font-family: Equinox;
+}
+
+button {
+  background: transparent;
+  color: white;
+  outline: none;
+}
+
+.legend {
+  color: #898989;
+  font-weight: bolder;
+}
+
+.current {
+  background: rgb(146, 254, 157);
+  background: -moz-linear-gradient(
+    50deg,
+    rgba(146, 254, 157, 1) 0%,
+    rgba(0, 201, 255, 1) 100%
+  );
+  background: -webkit-linear-gradient(
+    50deg,
+    rgba(146, 254, 157, 1) 0%,
+    rgba(0, 201, 255, 1) 100%
+  );
+  background: linear-gradient(
+    50deg,
+    rgba(146, 254, 157, 1) 0%,
+    rgba(0, 201, 255, 1) 100%
+  );
+  box-shadow: 0px 0px 50px -5px rgba(0, 201, 255, 0.3);
+  border-radius: 4px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  -ms-border-radius: 4px;
+  -o-border-radius: 4px;
+}
+
+.send {
+  background: rgb(146, 254, 157);
+  background: -moz-linear-gradient(
+    50deg,
+    rgba(146, 254, 157, 1) 0%,
+    rgba(0, 201, 255, 1) 100%
+  );
+  background: -webkit-linear-gradient(
+    50deg,
+    rgba(146, 254, 157, 1) 0%,
+    rgba(0, 201, 255, 1) 100%
+  );
+  background: linear-gradient(
+    50deg,
+    rgba(146, 254, 157, 1) 0%,
+    rgba(0, 201, 255, 1) 100%
+  );
+  box-shadow: 0px 0px 50px -5px rgba(0, 201, 255, 0.3);
+  border-radius: 4px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  -ms-border-radius: 4px;
+  -o-border-radius: 4px;
+
+  width: max-content;
+  height: min-content;
+}
+
+.currentText {
+  color: black;
+}
+.currentText:hover {
+  color: black;
+}
+
+.nav-button {
+  color: #898989;
+}
+
+.nav-button:hover {
+  color: white;
+}
+
+.dashboard-card {
+  background: rgb(0, 0, 0);
+  background: -moz-linear-gradient(
+    315deg,
+    rgba(0, 0, 0, 0.4) 0%,
+    rgb(0, 0, 0) 30%
+  );
+  background: -webkit-linear-gradient(
+    315deg,
+    rgba(0, 0, 0, 0.4) 0%,
+    rgb(0, 0, 0) 30%
+  );
+  background: linear-gradient(
+    315deg,
+    rgba(0, 0, 0, 0.4) 0%,
+    rgba(0, 0, 0, 1) 30%
+  );
+  border-radius: 15px;
+  -webkit-border-radius: 15px;
+  -moz-border-radius: 15px;
+  -ms-border-radius: 15px;
+  -o-border-radius: 15px;
+  max-height: 350px;
+  overflow-y: scroll;
+}
+
+.dashboard-card-reversed {
+  background: rgb(0, 0, 0);
+  background: -moz-linear-gradient(
+    45deg,
+    rgba(0, 0, 0, 0.4) 0%,
+    rgba(0, 0, 0, 1) 30%
+  );
+  background: -webkit-linear-gradient(
+    45deg,
+    rgba(0, 0, 0, 0.4) 0%,
+    rgba(0, 0, 0, 1) 30%
+  );
+  background: linear-gradient(
+    45deg,
+    rgba(0, 0, 0, 0.4) 0%,
+    rgba(0, 0, 0, 1) 30%
+  );
+}
+
+.dashboard-card-mail {
+  background: rgb(0, 0, 0);
+  background: -moz-linear-gradient(
+    180deg,
+    rgba(0, 0, 0, 0.4) 0%,
+    rgba(0, 0, 0, 1) 30%
+  );
+  background: -webkit-linear-gradient(
+    180deg,
+    rgba(0, 0, 0, 0.4) 0%,
+    rgba(0, 0, 0, 1) 30%
+  );
+  background: linear-gradient(
+    180deg,
+    rgba(0, 0, 0, 0.4) 0%,
+    rgba(0, 0, 0, 1) 40%
+  );
+  border-radius: 15px;
+  -webkit-border-radius: 15px;
+  -moz-border-radius: 15px;
+  -ms-border-radius: 15px;
+  -o-border-radius: 15px;
+  height: 400px;
+}
+
+.user-box input {
+  width: 100%;
+  font-family: Verdana, Geneva, Tahoma, sans-serif;
+  padding: 8px 0;
+  font-size: 12px;
+  color: #fff;
+  border: none;
+  border-bottom: 1px solid #fff;
+  outline: none;
+  background: transparent;
+}
+
+.user-box label {
+  position: absolute;
+  top: 0;
+  left: 0;
+  font-size: 16px;
+  color: #fff;
+  pointer-events: none;
+  transition: 0.5s;
+  -webkit-transition: 0.5s;
+  -moz-transition: 0.5s;
+  -ms-transition: 0.5s;
+  -o-transition: 0.5s;
+}
+
+.user-box input:focus ~ label,
+.user-box input:valid ~ label {
+  top: -20px;
+  left: 0;
+  color: #be5631;
+  font-size: 12px;
+}
+
+#message {
+  width: 100%;
+  height: 100%;
+  resize: none;
+  border: none;
+  background-color: transparent;
+  border: 1px solid #fff;
+  color: #fff;
+  border-radius: 4px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  -ms-border-radius: 4px;
+  -o-border-radius: 4px;
+}

WEB/View/src/CSS/Enigme.css

@@ -79,7 +79,6 @@ h1, h2, h3, h4, h5, h6 {
   width: 120px;
   height: 60px;
   background: transparent;
-  font-family: "Equinox", sans-serif;
 }
 
 .btn:before, .btn:after{
@@ -120,4 +119,6 @@ h1, h2, h3, h4, h5, h6 {
   align-items: center;
   text-transform: uppercase;
   color: #fff;
+  font-family: "Equinox", sans-serif;
+  font-size: 1.2rem;
 }

WEB/View/src/pages/Admin/Admin.php

@@ -77,7 +77,7 @@
           <!-- ANCHOR Enigme Solo -->
           <div class="col-5 m-4 px-0 dashboard-card">
             <!-- Title + Extends  -->
-            <div class="row my-4 d-flex justify-content-center align-items-center">
+            <div class="row my-4 mx-0 d-flex justify-content-center align-items-center">
               <div class="col d-flex justify-content-center">
                 <h4>Énigmes Solo</h4>
               </div>
@@ -123,10 +123,10 @@
           <!-- End Enigme solo -->
 
           <!-- ANCHOR Enigme Multi -->
-          <div class="col-5 m-4 dashboard-card dashboard-card-reversed">
+          <div class="col-5 m-4 px-0 dashboard-card dashboard-card-reversed">
 
             <!-- Title -->
-            <div class="row my-4 m-0 d-flex justify-content-center align-items-center">
+            <div class="row my-4 mx-0 d-flex justify-content-center align-items-center">
               <div class="col d-flex justify-content-center">
                 <h4>Énigmes Multi</h4>
               </div>

WEB/View/src/pages/Admin/AdminExtendMulti.php

@@ -69,7 +69,7 @@
   
         <!-- Modify Part -->
         <div class="container-fluid mx-5 d-flex justify-content-between" style="height: 100vh">
-          <div class="col m-5 dashboard-card" style="height: auto;">
+          <div class="col m-5 dashboard-card" style="max-height: 100%;">
 
             <!-- Title -->
             <div class="row my-4 m-0 d-flex justify-content-center align-items-center">

WEB/View/src/pages/Admin/AdminExtendSolo.php

@@ -69,7 +69,7 @@
   
         <!-- Modify Part -->
         <div class="container-fluid mx-5 d-flex justify-content-between" style="height: 100vh">
-          <div class="col m-5 dashboard-card" style="height: auto;">
+          <div class="col m-5 dashboard-card" style="max-height: 100%;">
 
             <!-- Title -->
             <div class="row my-4 m-0 d-flex justify-content-center align-items-center">

WEB/View/src/pages/Multijoueur/Partie.html

@@ -0,0 +1,173 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <title>
+    <?php
+      echo $enigme->getNom();
+    ?>
+  </title>
+  <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/5.0.0-alpha1/css/bootstrap.min.css"
+    integrity="sha384-r4NyP46KrjDleawBgD5tp8Y7UzmLA05oM1iAEQ17CSuDqnUK2+k9luXQOfXJCJ4I" crossorigin="anonymous" />
+  <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js"
+    integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo"
+    crossorigin="anonymous"></script>
+  <script src="https://stackpath.bootstrapcdn.com/bootstrap/5.0.0-alpha1/js/bootstrap.min.js"
+    integrity="sha384-oesi62hOLfzrys4LxRF63OJCXdXDipiYWBnvTl9Y9/TRlw5xlKIEHpNyvvDShgf/"
+    crossorigin="anonymous"></script>
+  <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" />
+  <link rel="stylesheet" href="../../CSS/Enigme.css" />
+</head>
+
+<body>
+  <div class="container-fluid px-5">
+    <!-- First Row -->
+    <div class="row py-4 d-flex justify-content-between user-select-none">
+      <div class="col d-flex align-items-center px-0">
+        <a class="material-icons pl-0" id="home" href="index.php?action=goToHome"
+          style="font-size: 40px; color: white">home</a>
+      </div>
+      <div class="col-4 d-flex align-items-center justify-content-center px-0">
+        <button>Next</button>
+      </div>
+      <!-- <div class="col-1 d-flex align-items-center justify-content-end px-0">
+        <a class="material-icons pl-0" id="backArrow" 
+          href="index.php?action=goToEnigme&ordre=<?php 
+          if ($enigme->getOrdre() == 1) 
+            { 
+              echo $enigme->getOrdre(); 
+            } 
+          else 
+            { 
+              echo $enigme->getOrdre() - 1; 
+            }?>"
+          style="font-size: 40px; color: white">< &nbsp;</a>
+      </div>
+      <div class="col-1 d-flex align-items-center px-0">
+        <a class="material-icons pl-0" id="nextArrow" 
+          href="index.php?action=goToEnigme&ordre=<?php echo $enigme->getOrdre() + 1; ?>"
+          style="font-size: 40px; color: white">&nbsp; ></a>
+      </div> -->
+      <button style="background-color: transparent; border: none; outline: none;" onclick="displayHelp()"
+        class="col d-flex align-items-center">
+        <div class="col text-right px-2">
+          <p class="" style="font-size: 14px; color: white"><b>Besoin d'aide ?</b></p>
+        </div>
+        <div class="col-1 text-right">
+          <img src="View/assets/img/Foxy.png" alt="Logo" class="rounded-circle moving-fox"
+            style="border: 1px solid #44fff6; width: 60px; height: 60px" />
+        </div>
+      </button>
+    </div>
+    <!-- End First Row -->
+
+    <!-- Second Row -->
+    <div class="row">
+      <!-- First Column -->
+      <div class="col-3 rounded p-3" style="background-color: #222831; min-height: 80vh; height: auto">
+        <h2 class="text-left py-3" style="color: #44fff6; font-weight: 500">
+          <?php
+          echo $enigme->getNom();
+          ?>
+        </h2>
+        <p>
+          <?php
+          echo $enigme->getEnonce();
+          ?>
+        </p>
+        <h3 class="text-left pb-3 pt-5" style="color: #44fff6">Rappel</h3>
+        <p>
+          <?php
+          echo $enigme->getRappel();
+          ?>
+        </p>
+        <h3 class="text-left pb-3 pt-5" style="color: #44fff6">Exemple</h3>
+        <p>
+          <?php
+          echo $enigme->getExemple();
+          ?>
+        </p>
+        <h3 class="text-left pb-3 pt-5 help" style="color: #44fff6; display: none">Aide</h3>
+        <p style="display: none" class="help">
+          <?php
+          echo $enigme->getAide();
+          ?>
+        </p>
+      </div>
+      <!-- End First Column -->
+
+      <!-- Second Column -->
+      <div class="col-5 pr-0">
+        <div class="ace rounded" id="editor"><?php 
+        // echo $code;
+        if (! isset($code) || $code == ""){
+          echo $enigme->getPrompt();
+        }
+        else {
+          echo $code;}
+        ?></div>
+      </div>
+      <!-- End Second Column -->
+
+      <!-- Third Column -->
+      <div class="col-4">
+        <textarea id="console" readonly style="width: 100%; min-height: 65vh; height: auto"
+          class="p-3 rounded"></textarea>
+
+        <div class="row pt-5 text-center" style="cursor: pointer">
+          <div class="col-6">
+            <a onclick="run_init()" class="btn">
+              <span>Run</span>
+            </a>
+          </div>
+          <div class="col-6">
+            <button onclick="submit()" class="btn" data-toggle="modal" data-target="#modal">
+              <span>Submit</span>
+            </button>
+          </div>
+        </div>
+      </div>
+      <!-- End Third Column -->
+    </div>
+    <!-- End Second Row -->
+  </div>
+
+  <!-- Modal -->
+  <div class="modal fade" id="modal" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterTitle"
+    aria-hidden="true">
+    <div class="modal-dialog modal-dialog-centered" role="document">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h2 class="modal-title" id="exampleModalLongTitle" style="color: black">
+            Results
+          </h2>
+          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <span aria-hidden="true">&times;</span>
+          </button>
+        </div>
+        <div class="modal-body">
+          <h5 id="result" style="color: black"></h5>
+        </div>
+        <div class="modal-footer">
+          <a
+          href="index.php?action=enigmeMultiEnded&index=' . $index .'"
+          class="btn" style="display: none" id="next"
+          >
+            <span>NEXT</span>
+          </a>
+        </div>
+      </div>
+    </div>
+  </div>
+  <!-- End Modal -->
+
+  <script src="https://ajaxorg.github.io/ace-builds/src-noconflict/ace.js" type="text/javascript"
+    charset="utf-8"></script>
+  <script src="https://raw.githack.com/pythonpad/brython-runner/master/lib/brython-runner.bundle.js"
+    type="text/javascript" charset="utf-8"></script>
+  <script src="View/src/JS/baseMulti.js"></script>
+</body>
+
+</html>