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

2 years ago · 895f550c2e
parent dcd777fa64 1f345b8d12
commit 895f550c2e
5 changed files with 6 additions and 9 deletions
--- a/WEB/Config/Config.php
+++ b/WEB/Config/Config.php
@ -25,7 +25,7 @@ $vues['main'] = 'View/src/pages/Main.php';
 $vues['presentation'] = 'View/src/pages/Presentation.html';
 $vues['login'] = '../View/src/pages/LogSign/Login.php';
 $vues['signUp'] = 'View/src/pages/LogSign/SignUp.php';
-$vues['enigme'] = 'View/src/pages/Enigme/palindrome.html';
+$vues['enigme'] = 'View/src/pages/Palindrome.html';

 //Error
 $vues['erreur'] = 'View/src/pages/Erreur.php';
--- a/WEB/Controller/EnigmeGateway.php
+++ b/WEB/Controller/EnigmeGateway.php
@ -1,5 +1,4 @@
 <?php
-include_once "../Factory/EnigmeFactory.php";
 class EnigmeGateway
 {
    private Connection $con;
--- a/WEB/Controller/PartieGateway.php
+++ b/WEB/Controller/PartieGateway.php
@ -1,6 +1,4 @@
 <?php
-
-include_once "../Factory/PartieFactory.php";
 class PartieGateway
 {
    private Connection $con;
--- a/WEB/Controller/UserController.php
+++ b/WEB/Controller/UserController.php
@ -71,7 +71,7 @@ class UserController
                throw(new Exception("Mot de passe non valide"));
            }
            $j = $gateway->getUtilisateurByEmail($_REQUEST['email']);
-            if ($j != null) {
+            if ($j->getEmail() != "null") {
                $error = "Email déjà utilisé.";
                throw (new Exception("Email déjà utilisé"));
            }
--- a/WEB/View/src/pages/Palindrome.html
+++ b/WEB/View/src/pages/Palindrome.html
@ -24,7 +24,7 @@
      rel="stylesheet"
      href="https://fonts.googleapis.com/icon?family=Material+Icons"
    />
-    <link rel="stylesheet" href="/WEB/View/src/CSS/Eni.css" />
+    <link rel="stylesheet" href="View/src/CSS/Eni.css" />
  </head>
  <body>
    <div class="container-fluid px-5">
@ -49,7 +49,7 @@
              onclick="displayHelp()"
            >
              <img
-                src="../../assets/img/Foxy.png"
+                src="View/assets/img/Foxy.png"
                alt="Logo"
                class="rounded-circle moving-fox"
                style="border: 1px solid #44fff6; width: 60px; height: 60px"
@ -147,7 +147,7 @@
      type="text/javascript"
      charset="utf-8"
    ></script>
-    <script src="../JS/base.js"></script>
-    <script src="../JS/palindrome.js"></script>
+    <script src="View/src/JS/base.js"></script>
+    <script src="View/src/JS/palindrome.js"></script>
  </body>
 </html>