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

2 years ago · 1864f91554
parent 446b41a97b 992ca1fe83
commit 1864f91554
4 changed files with 38 additions and 11 deletions
--- a/WEB/Config/Config.php
+++ b/WEB/Config/Config.php
@ -19,8 +19,8 @@ $vues['test'] = 'View/src/pages/FirstTests/FirstTest1.html';
 $vues['next'] = 'View/src/pages/FirstTests/FirstTest';
 $vues['admin'] = 'View/src/pages/Admin/Admin.php';
 // Enigme
-// $vues['enigme'] = 'View/src/pages/Enigme/Palindrome.html';
-$vues['enigme'] = 'View/src/pages/Enigme/EnigmePage.php';
+$vues['enigme'] = 'View/src/pages/Enigme/Palindrome.html';
+$vues['enigmePage'] = 'View/src/pages/Enigme/EnigmePage.php';
 $vues['chouette'] = 'View/src/pages/Enigme/Chouette.html';
 $vues['cesarEncrypt'] = 'View/src/pages/Enigme/CesarEncrypt.html';
 $vues['cesarDecrypt'] = 'View/src/pages/Enigme/CesarDecrypt.html';
--- a/WEB/Controller/AdminController.php
+++ b/WEB/Controller/AdminController.php
@ -57,6 +57,9 @@ class AdminController extends UserController
                case "logout":
                    $this->logout();
                    break;
+                case "addNewEnigme":
+                    $this->addNewEnigme();
+                    break;
                default:
                    $error = "Action non valide";
                    require($rep . $vues['erreur']);
@ -76,4 +79,9 @@ class AdminController extends UserController
        global $rep, $vues;
        require($rep . $vues['admin']);
    }
+
+    function addNewEnigme()
+    {
+
+    }
 }
--- a/WEB/Controller/UserController.php
+++ b/WEB/Controller/UserController.php
@ -2,14 +2,10 @@

 class UserController
 {
-    private UserModel $model;
-    private Nettoyage $nettoyage;
    function __construct()
    {
        try {
            global $dsn, $rep, $vues, $error;
-            $this->model = new UserModel();
-            $this->nettoyage = new Nettoyage();
            $action = $_REQUEST['action'];
            //register_event_handler('add_to_queue',array($this,"onAddToQueue"));
            switch ($action) {
@ -185,8 +181,9 @@ class UserController
    {
        try {
            global $rep, $vues, $error;
-            $num = $this->nettoyage->cleanInt($_REQUEST['num']);
-            require($rep . $vues['next'].$_REQUEST['num'].".html");
+            $nettoyage = new Nettoyage();
+            $num = $nettoyage->cleanInt($_REQUEST['num']);
+            require($rep . $vues['next'].$num.".html");
        } catch (Exception $e) {
            $error = "Erreur Inconnue";
            require($rep . $vues['erreur']);
@ -194,10 +191,11 @@ class UserController
    }
    public function goToQueue()
    {
-        try {
+        try {   
            global $rep, $vues, $error;
            //require($rep . $vues['Queue']);
-            $this->model->addToQueue();
+            $model = new UserModel();
+            $model->addToQueue();
        } catch (Exception $e) {
            $error = $e->getMessage();
            require($rep . $vues['erreur']);
--- a/WEB/View/src/pages/Admin/EnigmeMultiManager.php
+++ b/WEB/View/src/pages/Admin/EnigmeMultiManager.php
@ -1,4 +1,25 @@
-<form>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>Admin</title>
+    <!-- Required meta tags -->
+    <meta charset="utf-8" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, shrink-to-fit=no"
+    />
+
+    <!-- CSS -->
+    <link
+      href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/css/bootstrap.min.css"
+      rel="stylesheet"
+      integrity="sha384-F3w7mX95PdgyTmZZMECAngseQB83DfGTowi0iMjiWaeVhAn4FJkqJByhZMI3AhiU"
+      crossorigin="anonymous"
+    />
+</head>
+
+<body class="m-3">
+    <form action="index.php?action=addNewEnigme" method="POST">
        <div class="col">
            <div class="mb-3">
                <label for="" class="form-label">Enigme</label>