From fe5f0a21662426a2c01dc2467dc5247c74987e8a Mon Sep 17 00:00:00 2001
From: nathan boileau <boileaunathan42@gmail.com>
Date: Fri, 9 Dec 2022 17:39:56 +0100
Subject: [PATCH 01/20] supp la scripted.db

---
 WEB/Model/scripted.db         | Bin 53248 -> 0 bytes
 WEB/View/src/CSS/Main2.css    |  18 +++++++++++++++++-
 WEB/View/src/pages/Main2.html |  10 +++++++---
 3 files changed, 24 insertions(+), 4 deletions(-)
 delete mode 100644 WEB/Model/scripted.db

diff --git a/WEB/Model/scripted.db b/WEB/Model/scripted.db
deleted file mode 100644
index 5cfd9cb783163a4b794df4276d0454110f0d1a24..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 53248
zcmeI*-%i_B90zcl&;WtRAZ^OHKspFo5;cS*P$-(V5=<y5kU&UE(_Ju=9Ka;8jsHOD
z9jJSN-R&jz5WDOn>}C%zshcWo(k^#w$HakBv723luLaHVFZSX5KIdl>J1E`R-jGd7
z4phA<nPiq5=6If4B81~O%D%(w+gnns(d(_SN8Z=Itx37WvtPr)Kits37$-auehL2`
z{we%u@W-LQL#Kn^56%pXg)+D8j5q`!009U<00I#B-vutm2m2!9<NUj@DeX7tmZY0<
zRo1B9ZVidWY^IbYrOfh1mbBy1aEP!)vv;9HR!maNu4aqbyqMi_H=|Lx7K^)^S*F~O
z4auaIPEIAgdL-%5C&`$9pK^PXC~Zn|!`qjd?1h{C1H`qgxK5(ZdM;0*$#^QBj>Y0+
zdYU-FB>9F=C1aXYVK4cdP|693s-+ulAk6{?vLd_V+A8KYGsOy7&sL&tDskc)Yb+d!
z%?<@4&&PRAR%-N(anfL~Cif)ERGsy`HppJ8-40*O_xDA{#`w!;4y>rM0V%TXJq~oB
zdQnDt2Ts<{Ve^J~)`_;nouRoAqF7C;%T-d&=eEmPHXWZz+3nNLb|w^zh-0^9>y30T
z?X}no+&k@%@^%PaN<oL_hc6wPA~jU2rc>{+uY<;mG8*5s{HGGSgV!C@s}0F8Xp<F|
zzZ8AZZ<BVt`sIBk>kqpdnzX4ISCiAKY&Ym`K$T6aVajA*RU1@Nu1%Z|BhE_Ru84T+
zSafEw?{kylq3)%;R=@V3FETpHUwqv@54dLo8tj-4r^G3n4Y_7J&_k*dUqO*fxm3vI
z*)E&ee2I;@#t!)vx^J1pZjpSUMDpd04OVDdy}`)i$9%>4fvv;JpeGhps`T3GgN`9w
zdorp>EO)kN>~b;SB=K(3>C>%$_ut-*9^Ba7lc0*q26a_*Y5T<GWx{fl<XY#GET&7E
zMjIWwu&ALn*u<$yN8I0)Ne%NePqLC(aSoJLH{P-BFQ1ML+)~omxyrmzY^^BUgw4jq
zSA1V&VuHUobL`6PbFr`4)1l~lf>AnW?5m;MLcX$KscQzcYN~$&7HrnEYY~=zrq+}d
zuk6{-p7aDGxry7(NWM|*rF<&^_Pey-{(Wj+;0FYr6Mh!HV-Hv$009U<00Izz00bZa
z0SG_<0^KR_DiE9=y?D@Hvov-Wa_P{%wVJ4^O?Q1VeLk5=PNoX0<x*+>d4@g}tCsds
z+20p4i34jrFQtkLg~k2k+0Np*Xq4Bgi>1`TX}(gdT3bEAha;@#W3?_VIo%%U$7-v`
z^JVqubv{|I?AEpVwz8R6NhUT5r}B&Xj4@{>R^^pOVNQIzz9r{YPb>BM&WmJmcbgAR
zxji09%8f3I+sCu7WhpW9w6apl>DtWh;X=AV=iaQ%zb&7?I#FKg=7OkK&zjH8lXZRh
zye@7OLTpw8!h245FZ?O|)}2#~tRMgZ2tWV=5P$##AOHafKmY<=Bk)CFn!kPzBQP9z
z$op?U^b7~4298zV-2>+j{D-?n0f|5W0uX=z1Rwwb2tWV=5P$##An*wR`}&_3{^Hmd
z76?E90uX=z1Rwwb2tWV=5P$##x=0|z2S$1Kqbhpb>;I3O@Ue>$L@E$~00bZa0SG_<
z0uX=z1Rwx``z{dX1KfBznNClq($mR#{QduZF9_rh0SG_<0uX=z1Rwwb2tWV=_d&q^
z{6F@e{$YUt1Rwwb2tWV=5P$##AOHafK%k2S@cw@nPcBk}00bZa0SG_<0uX=z1Rwwb
z2($$7{y$0q0uX=z1Rwwb2tWV=5P$##Akh5+xc=|{IYx#MfB*y_009U<00Izz00bZa
z0r&I&KXAeaSU>;*5P$##AOHafKmY;|fB*y_&=mqBeDA<i|FL=`DN9XBZX^zL`~81j
n_=96#SReoa2tWV=5P$##AOHafKmY;|=n8=mcKtulasB@<4nn(p

diff --git a/WEB/View/src/CSS/Main2.css b/WEB/View/src/CSS/Main2.css
index 35128d6c..7108748c 100644
--- a/WEB/View/src/CSS/Main2.css
+++ b/WEB/View/src/CSS/Main2.css
@@ -14,7 +14,7 @@
 
 #imgMain {
   background-image: url("../../assets/img/SecondMainBack.jpg");
-  background-position: center center;
+  background-position: bottom center;
   background-attachment: fixed;
   background-repeat: no-repeat;
   background-size: cover;
@@ -26,4 +26,20 @@
   transform: translate(-50%, -50%);
   width: 85%;
   height: 70%;
+  border-radius: 10px;
+  -webkit-border-radius: 10px;
+  -moz-border-radius: 10px;
+  -ms-border-radius: 10px;
+  -o-border-radius: 10px;
+}
+
+#AllBg {
+  background-color: #511949;
+  opacity: 0.8;
+  background-size: 10px 10px;
+  border-radius: 5px;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  -ms-border-radius: 5px;
+  -o-border-radius: 5px;
 }
diff --git a/WEB/View/src/pages/Main2.html b/WEB/View/src/pages/Main2.html
index 90dd9b5d..15ee904c 100644
--- a/WEB/View/src/pages/Main2.html
+++ b/WEB/View/src/pages/Main2.html
@@ -20,12 +20,16 @@
       integrity="sha384-oesi62hOLfzrys4LxRF63OJCXdXDipiYWBnvTl9Y9/TRlw5xlKIEHpNyvvDShgf/"
       crossorigin="anonymous"
     ></script>
-    <link rel="stylesheet" href="../CSS/Main2.css">
+    <link
+      rel="stylesheet"
+      href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@48,400,0,0"
+    />
+    <link rel="stylesheet" href="../CSS/Main2.css" />
   </head>
   <body>
     <div>
-      <div class="container-fluid" id="imgMain">
-        <i class="bi bi-list-nested" style="color:white; height:100px; width: 100px;"></i>
+      <div id="imgMain">
+        <span class="material-symbols-outlined p-2" id="AllBg" style="font-size:40px; transform: rotate(90deg)"> clear_all </span>
       </div>
     </div>
   </body>

From 35ea1fadbf22329c448fd91adc4f9b10433fd767 Mon Sep 17 00:00:00 2001
From: Nathan BOILEAU <nathan.boileau@etu.uca.fr>
Date: Fri, 9 Dec 2022 17:41:17 +0100
Subject: [PATCH 02/20] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'WEB/Config/C?=
 =?UTF-8?q?onfig.php'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WEB/Config/Config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WEB/Config/Config.php b/WEB/Config/Config.php
index a31e1eb9..897006b8 100644
--- a/WEB/Config/Config.php
+++ b/WEB/Config/Config.php
@@ -14,7 +14,7 @@ $rep = __DIR__ . '/../';
 // $password = 'p';
 
 // SQULITE3
-$dsn = './Model/scripted.db'; 
+$dsn = './scripted.db'; 
 
 //Sel de hashage
 $sel = "JeSuisUnSeldeHashageEtJeSuisUniqueEtTresSecuriseEtJeSuisTresLong";

From d83e218f90ad9324102291496751c3c8c05f6d15 Mon Sep 17 00:00:00 2001
From: nathan boileau <boileaunathan42@gmail.com>
Date: Fri, 9 Dec 2022 17:48:35 +0100
Subject: [PATCH 03/20] =?UTF-8?q?test=20de=20d=C3=A9ploiment?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WEB/Config/Config.php                | 2 +-
 WEB/Controller/FrontController.php   | 1 +
 WEB/Controller/VisitorController.php | 1 +
 WEB/Model/UserModel.php              | 3 ---
 WEB/index.php                        | 2 ++
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/WEB/Config/Config.php b/WEB/Config/Config.php
index a31e1eb9..897006b8 100644
--- a/WEB/Config/Config.php
+++ b/WEB/Config/Config.php
@@ -14,7 +14,7 @@ $rep = __DIR__ . '/../';
 // $password = 'p';
 
 // SQULITE3
-$dsn = './Model/scripted.db'; 
+$dsn = './scripted.db'; 
 
 //Sel de hashage
 $sel = "JeSuisUnSeldeHashageEtJeSuisUniqueEtTresSecuriseEtJeSuisTresLong";
diff --git a/WEB/Controller/FrontController.php b/WEB/Controller/FrontController.php
index 6970090c..20386b49 100644
--- a/WEB/Controller/FrontController.php
+++ b/WEB/Controller/FrontController.php
@@ -6,6 +6,7 @@ class FrontController
         try { 
             global $error, $view, $rep;
             session_start();
+            echo "front controller";
             // Check role permissions
             if (isset($_SESSION['role'])) {
                 $role = $_SESSION['role'];
diff --git a/WEB/Controller/VisitorController.php b/WEB/Controller/VisitorController.php
index 34e5fe0e..594476fd 100644
--- a/WEB/Controller/VisitorController.php
+++ b/WEB/Controller/VisitorController.php
@@ -7,6 +7,7 @@ class VisitorController
     function __construct()
     {
         try {
+            echo "Visitor controller";
             global $dsn, $rep, $vues, $error;
             $model = new VisitorModel();
             $action = $_REQUEST['action'];
diff --git a/WEB/Model/UserModel.php b/WEB/Model/UserModel.php
index f28c8df9..1cb0f498 100644
--- a/WEB/Model/UserModel.php
+++ b/WEB/Model/UserModel.php
@@ -153,7 +153,6 @@ class UserModel
         //trigger_event('add_to_queue',$userGroup);
     }
 
-<<<<<<< HEAD
     public function AddUserToQueueEvent(){
         $userGroup=$this->utilisateur_gateway->findUsersInQueue();
         if($userGroup.count()>=4)
@@ -162,8 +161,6 @@ class UserModel
         }
     }
 
-=======
->>>>>>> 146a4b62fc5bc2340e9c08c07650a6efb799c3fb
     public function logout()
     {
         $_SESSION['role'] = 'visitor';
diff --git a/WEB/index.php b/WEB/index.php
index 1b8647e6..514358ad 100644
--- a/WEB/index.php
+++ b/WEB/index.php
@@ -3,7 +3,9 @@ require_once('./Config/Config.php');
 require_once('./Config/Autoload.php');
 Autoload::charger();
 
+echo "test1";
 $control = new FrontController();
+echo "test2";
 
 //session_regenerate_id(true);
 // session_unset();

From 2c2812b895c966760284a23e2efd7107896c5799 Mon Sep 17 00:00:00 2001
From: nathan boileau <boileaunathan42@gmail.com>
Date: Fri, 9 Dec 2022 17:50:47 +0100
Subject: [PATCH 04/20] test

---
 WEB/Controller/FrontController.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/WEB/Controller/FrontController.php b/WEB/Controller/FrontController.php
index 20386b49..cb6bbf8d 100644
--- a/WEB/Controller/FrontController.php
+++ b/WEB/Controller/FrontController.php
@@ -17,15 +17,18 @@ class FrontController
             $action = $_REQUEST['action'];
             if ($role == "user") {
                 if ($action == NULL) {
+                    echo "User controller1";
                     new UserController();
                 }
                 // else if (method_exists('UserModel', $action) == false) {
                 //     $error = "Action non valide " . $action;
                 //     require($rep . $view['erreur']);
                 else {
+                    echo "User controller1";
                     new UserController();
                 }
             } else {
+                echo "Visitortest controller1";
                 new VisitorController();
             }
         } catch (Exception $e) {

From 8a70bb627f35ae732bb47e69d30b71c2cc158ca8 Mon Sep 17 00:00:00 2001
From: nathan boileau <boileaunathan42@gmail.com>
Date: Fri, 9 Dec 2022 17:53:02 +0100
Subject: [PATCH 05/20] test

---
 WEB/Controller/FrontController.php   | 8 ++++----
 WEB/Controller/VisitorController.php | 2 +-
 WEB/index.php                        | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/WEB/Controller/FrontController.php b/WEB/Controller/FrontController.php
index cb6bbf8d..63cdb62d 100644
--- a/WEB/Controller/FrontController.php
+++ b/WEB/Controller/FrontController.php
@@ -6,7 +6,7 @@ class FrontController
         try { 
             global $error, $view, $rep;
             session_start();
-            echo "front controller";
+            echo "front controller\n";
             // Check role permissions
             if (isset($_SESSION['role'])) {
                 $role = $_SESSION['role'];
@@ -17,18 +17,18 @@ class FrontController
             $action = $_REQUEST['action'];
             if ($role == "user") {
                 if ($action == NULL) {
-                    echo "User controller1";
+                    echo "User controller1\n";
                     new UserController();
                 }
                 // else if (method_exists('UserModel', $action) == false) {
                 //     $error = "Action non valide " . $action;
                 //     require($rep . $view['erreur']);
                 else {
-                    echo "User controller1";
+                    echo "User controller1\n";
                     new UserController();
                 }
             } else {
-                echo "Visitortest controller1";
+                echo "Visitort controller1\n";
                 new VisitorController();
             }
         } catch (Exception $e) {
diff --git a/WEB/Controller/VisitorController.php b/WEB/Controller/VisitorController.php
index 594476fd..e1eeb11b 100644
--- a/WEB/Controller/VisitorController.php
+++ b/WEB/Controller/VisitorController.php
@@ -7,7 +7,7 @@ class VisitorController
     function __construct()
     {
         try {
-            echo "Visitor controller";
+            echo "Visitor controller\n";
             global $dsn, $rep, $vues, $error;
             $model = new VisitorModel();
             $action = $_REQUEST['action'];
diff --git a/WEB/index.php b/WEB/index.php
index 514358ad..d5190f4f 100644
--- a/WEB/index.php
+++ b/WEB/index.php
@@ -3,9 +3,9 @@ require_once('./Config/Config.php');
 require_once('./Config/Autoload.php');
 Autoload::charger();
 
-echo "test1";
+echo "test1\n";
 $control = new FrontController();
-echo "test2";
+echo "test2\n";
 
 //session_regenerate_id(true);
 // session_unset();

From d5aff6abfda546180803256cee74f1629c47076e Mon Sep 17 00:00:00 2001
From: nathan boileau <boileaunathan42@gmail.com>
Date: Fri, 9 Dec 2022 17:54:48 +0100
Subject: [PATCH 06/20] test

---
 WEB/Controller/VisitorController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WEB/Controller/VisitorController.php b/WEB/Controller/VisitorController.php
index e1eeb11b..96afd606 100644
--- a/WEB/Controller/VisitorController.php
+++ b/WEB/Controller/VisitorController.php
@@ -6,6 +6,7 @@ class VisitorController
 
     function __construct()
     {
+        echo "before Vistor\n";
         try {
             echo "Visitor controller\n";
             global $dsn, $rep, $vues, $error;

From 35bf66b4fe8f301b2bdb7f06550b7aec5a1c41f3 Mon Sep 17 00:00:00 2001
From: nathan boileau <boileaunathan42@gmail.com>
Date: Fri, 9 Dec 2022 18:04:59 +0100
Subject: [PATCH 07/20] test

---
 WEB/index.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/WEB/index.php b/WEB/index.php
index d5190f4f..8022b05c 100644
--- a/WEB/index.php
+++ b/WEB/index.php
@@ -4,6 +4,25 @@ require_once('./Config/Autoload.php');
 Autoload::charger();
 
 echo "test1\n";
+$con = new Connection($dsn);
+
+$query = "INSERT INTO Utilisateur VALUES (:email,:pseudo,:mdp,:estAdmin)";
+$con->executeQuery($query,	array(
+    ':email'	=>	array("mail",SQLITE3_TEXT),
+    ':pseudo'	=>	array("pseudo",SQLITE3_TEXT),
+    ':mdp'	=>	array("mdp",SQLITE3_TEXT),
+    ':estAdmin'	=>	array(0,SQLITE3_INTEGER)));
+
+$query = "SELECT * FROM Utilisateur";
+$con->executeQuery($query);
+$results=$this->con->getResults();
+    foreach ($results as $row) {
+        echo $row['email'] . '</br>';
+        echo $row['pseudo'] . '</br>';
+        echo $row['mdp'] . '</br>';
+        echo $row['estAdmin'] . '</br>';
+    }
+
 $control = new FrontController();
 echo "test2\n";
 

From 54a5d199c661fbaf5a18dcae6f6d1c7adf67594a Mon Sep 17 00:00:00 2001
From: nathan boileau <boileaunathan42@gmail.com>
Date: Fri, 9 Dec 2022 18:09:11 +0100
Subject: [PATCH 08/20] test

---
 WEB/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WEB/index.php b/WEB/index.php
index 8022b05c..bc2bb54f 100644
--- a/WEB/index.php
+++ b/WEB/index.php
@@ -15,7 +15,7 @@ $con->executeQuery($query,	array(
 
 $query = "SELECT * FROM Utilisateur";
 $con->executeQuery($query);
-$results=$this->con->getResults();
+$results=$con->getResults();
     foreach ($results as $row) {
         echo $row['email'] . '</br>';
         echo $row['pseudo'] . '</br>';

From a025abdbde2ad22f8283c19733678896bc74a46b Mon Sep 17 00:00:00 2001
From: nathan boileau <boileaunathan42@gmail.com>
Date: Fri, 9 Dec 2022 18:15:26 +0100
Subject: [PATCH 09/20] test

---
 WEB/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WEB/index.php b/WEB/index.php
index bc2bb54f..3c518532 100644
--- a/WEB/index.php
+++ b/WEB/index.php
@@ -4,7 +4,7 @@ require_once('./Config/Autoload.php');
 Autoload::charger();
 
 echo "test1\n";
-$con = new Connection($dsn);
+$con = new Connection("sqlite:./scripted.db");
 
 $query = "INSERT INTO Utilisateur VALUES (:email,:pseudo,:mdp,:estAdmin)";
 $con->executeQuery($query,	array(

From 8c20c4208eea9139cca4407cd1fc54f89f7d125f Mon Sep 17 00:00:00 2001
From: nathan boileau <boileaunathan42@gmail.com>
Date: Fri, 9 Dec 2022 18:17:01 +0100
Subject: [PATCH 10/20] test

---
 WEB/index.php | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/WEB/index.php b/WEB/index.php
index 3c518532..594f0437 100644
--- a/WEB/index.php
+++ b/WEB/index.php
@@ -4,25 +4,34 @@ require_once('./Config/Autoload.php');
 Autoload::charger();
 
 echo "test1\n";
-$con = new Connection("sqlite:./scripted.db");
+try {
+    $con = new Connection($dsn);
 
-$query = "INSERT INTO Utilisateur VALUES (:email,:pseudo,:mdp,:estAdmin)";
-$con->executeQuery($query,	array(
-    ':email'	=>	array("mail",SQLITE3_TEXT),
-    ':pseudo'	=>	array("pseudo",SQLITE3_TEXT),
-    ':mdp'	=>	array("mdp",SQLITE3_TEXT),
-    ':estAdmin'	=>	array(0,SQLITE3_INTEGER)));
+    $query = "INSERT INTO Utilisateur VALUES (:email,:pseudo,:mdp,:estAdmin)";
+    $con->executeQuery($query, array(
+        ':email' => array("mail", SQLITE3_TEXT),
+        ':pseudo' => array("pseudo", SQLITE3_TEXT),
+        ':mdp' => array("mdp", SQLITE3_TEXT),
+        ':estAdmin' => array(0, SQLITE3_INTEGER)
+    )
+    );
 
-$query = "SELECT * FROM Utilisateur";
-$con->executeQuery($query);
-$results=$con->getResults();
+    $query = "SELECT * FROM Utilisateur";
+    $con->executeQuery($query);
+    $results = $con->getResults();
     foreach ($results as $row) {
         echo $row['email'] . '</br>';
         echo $row['pseudo'] . '</br>';
         echo $row['mdp'] . '</br>';
         echo $row['estAdmin'] . '</br>';
     }
-
+}
+catch (PDOException $e) {
+    echo $e->getMessage();
+}
+catch (Exception $e2) {
+    echo $e2->getMessage();
+}
 $control = new FrontController();
 echo "test2\n";
 

From 940fa0a12ad986d31a8b75c674460081e23cc4c9 Mon Sep 17 00:00:00 2001
From: nathan boileau <boileaunathan42@gmail.com>
Date: Fri, 9 Dec 2022 18:21:08 +0100
Subject: [PATCH 11/20] test

---
 WEB/index.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/WEB/index.php b/WEB/index.php
index 594f0437..eb086d68 100644
--- a/WEB/index.php
+++ b/WEB/index.php
@@ -7,19 +7,20 @@ echo "test1\n";
 try {
     $con = new Connection($dsn);
 
-    $query = "INSERT INTO Utilisateur VALUES (:email,:pseudo,:mdp,:estAdmin)";
-    $con->executeQuery($query, array(
-        ':email' => array("mail", SQLITE3_TEXT),
-        ':pseudo' => array("pseudo", SQLITE3_TEXT),
-        ':mdp' => array("mdp", SQLITE3_TEXT),
-        ':estAdmin' => array(0, SQLITE3_INTEGER)
-    )
-    );
+    // $query = "INSERT INTO Utilisateur VALUES (:email,:pseudo,:mdp,:estAdmin)";
+    // $con->executeQuery($query, array(
+    //     ':email' => array("mail", SQLITE3_TEXT),
+    //     ':pseudo' => array("pseudo", SQLITE3_TEXT),
+    //     ':mdp' => array("mdp", SQLITE3_TEXT),   
+    //     ':estAdmin' => array(0, SQLITE3_INTEGER)
+    // )
+    // );
 
     $query = "SELECT * FROM Utilisateur";
     $con->executeQuery($query);
     $results = $con->getResults();
     foreach ($results as $row) {
+        echo "e";
         echo $row['email'] . '</br>';
         echo $row['pseudo'] . '</br>';
         echo $row['mdp'] . '</br>';

From 4b84079e34a86c0b3f649c7efaed61d808a7b23d Mon Sep 17 00:00:00 2001
From: nathan boileau <boileaunathan42@gmail.com>
Date: Fri, 9 Dec 2022 18:22:37 +0100
Subject: [PATCH 12/20] test

---
 WEB/index.php | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/WEB/index.php b/WEB/index.php
index eb086d68..31f38208 100644
--- a/WEB/index.php
+++ b/WEB/index.php
@@ -7,20 +7,18 @@ echo "test1\n";
 try {
     $con = new Connection($dsn);
 
-    // $query = "INSERT INTO Utilisateur VALUES (:email,:pseudo,:mdp,:estAdmin)";
-    // $con->executeQuery($query, array(
-    //     ':email' => array("mail", SQLITE3_TEXT),
-    //     ':pseudo' => array("pseudo", SQLITE3_TEXT),
-    //     ':mdp' => array("mdp", SQLITE3_TEXT),   
-    //     ':estAdmin' => array(0, SQLITE3_INTEGER)
-    // )
-    // );
+    $query = "INSERT INTO Utilisateur VALUES (:email,:pseudo,:mdp,:estAdmin)";
+    $con->executeQuery($query, array(
+        ':email' => array("SUPERsuper", SQLITE3_TEXT),
+        ':pseudo' => array("dragon", SQLITE3_TEXT),
+        ':mdp' => array("qsdfgyutfcvbghytrfcvgbtfcvgh", SQLITE3_TEXT),   
+        ':estAdmin' => array(0, SQLITE3_INTEGER)
+    ));
 
     $query = "SELECT * FROM Utilisateur";
     $con->executeQuery($query);
     $results = $con->getResults();
     foreach ($results as $row) {
-        echo "e";
         echo $row['email'] . '</br>';
         echo $row['pseudo'] . '</br>';
         echo $row['mdp'] . '</br>';

From e46be45cd4a542efb58d344a90d39b3eca03f4b3 Mon Sep 17 00:00:00 2001
From: nathan boileau <boileaunathan42@gmail.com>
Date: Fri, 9 Dec 2022 18:23:58 +0100
Subject: [PATCH 13/20] test

---
 WEB/Controller/FrontController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/WEB/Controller/FrontController.php b/WEB/Controller/FrontController.php
index 63cdb62d..fa39e102 100644
--- a/WEB/Controller/FrontController.php
+++ b/WEB/Controller/FrontController.php
@@ -33,7 +33,8 @@ class FrontController
             }
         } catch (Exception $e) {
             $error = $e->getMessage();
-            require($rep . $view['erreur']);
+            echo $error;
+            // require($rep . $view['erreur']);
         }
     }
 }
\ No newline at end of file

From 35f2b8a1fe8d9dfcf4cff20511b782e3deafcfb7 Mon Sep 17 00:00:00 2001
From: nathan boileau <boileaunathan42@gmail.com>
Date: Fri, 9 Dec 2022 18:24:39 +0100
Subject: [PATCH 14/20] test

---
 WEB/index.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/WEB/index.php b/WEB/index.php
index 31f38208..14e49e97 100644
--- a/WEB/index.php
+++ b/WEB/index.php
@@ -7,13 +7,13 @@ echo "test1\n";
 try {
     $con = new Connection($dsn);
 
-    $query = "INSERT INTO Utilisateur VALUES (:email,:pseudo,:mdp,:estAdmin)";
-    $con->executeQuery($query, array(
-        ':email' => array("SUPERsuper", SQLITE3_TEXT),
-        ':pseudo' => array("dragon", SQLITE3_TEXT),
-        ':mdp' => array("qsdfgyutfcvbghytrfcvgbtfcvgh", SQLITE3_TEXT),   
-        ':estAdmin' => array(0, SQLITE3_INTEGER)
-    ));
+    // $query = "INSERT INTO Utilisateur VALUES (:email,:pseudo,:mdp,:estAdmin)";
+    // $con->executeQuery($query, array(
+    //     ':email' => array("SUPERsuper", SQLITE3_TEXT),
+    //     ':pseudo' => array("dragon", SQLITE3_TEXT),
+    //     ':mdp' => array("qsdfgyutfcvbghytrfcvgbtfcvgh", SQLITE3_TEXT),   
+    //     ':estAdmin' => array(0, SQLITE3_INTEGER)
+    // ));
 
     $query = "SELECT * FROM Utilisateur";
     $con->executeQuery($query);

From 1bdf59a137d52751400573800163005e6d7ff6bb Mon Sep 17 00:00:00 2001
From: nathan boileau <boileaunathan42@gmail.com>
Date: Fri, 9 Dec 2022 18:28:33 +0100
Subject: [PATCH 15/20] test

---
 WEB/Controller/FrontController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB/Controller/FrontController.php b/WEB/Controller/FrontController.php
index fa39e102..92dc71f4 100644
--- a/WEB/Controller/FrontController.php
+++ b/WEB/Controller/FrontController.php
@@ -29,12 +29,12 @@ class FrontController
                 }
             } else {
                 echo "Visitort controller1\n";
+                require($rep . $view['erreur']);
                 new VisitorController();
             }
         } catch (Exception $e) {
             $error = $e->getMessage();
-            echo $error;
-            // require($rep . $view['erreur']);
+            require($rep . $view['erreur']);
         }
     }
 }
\ No newline at end of file

From e7172f55958966b390cf81b9634836bca1de4507 Mon Sep 17 00:00:00 2001
From: nathan boileau <boileaunathan42@gmail.com>
Date: Fri, 9 Dec 2022 18:31:42 +0100
Subject: [PATCH 16/20] test

---
 WEB/Controller/FrontController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/WEB/Controller/FrontController.php b/WEB/Controller/FrontController.php
index 92dc71f4..1cb3d032 100644
--- a/WEB/Controller/FrontController.php
+++ b/WEB/Controller/FrontController.php
@@ -30,7 +30,8 @@ class FrontController
             } else {
                 echo "Visitort controller1\n";
                 require($rep . $view['erreur']);
-                new VisitorController();
+                echo "Visitort controller1\n";
+                // new VisitorController();
             }
         } catch (Exception $e) {
             $error = $e->getMessage();

From 3710c4f8f623d96ebbd3060b0d72fde35cc35ed6 Mon Sep 17 00:00:00 2001
From: nathan boileau <boileaunathan42@gmail.com>
Date: Fri, 9 Dec 2022 18:33:37 +0100
Subject: [PATCH 17/20] test

---
 WEB/Controller/FrontController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WEB/Controller/FrontController.php b/WEB/Controller/FrontController.php
index 1cb3d032..b3b55628 100644
--- a/WEB/Controller/FrontController.php
+++ b/WEB/Controller/FrontController.php
@@ -29,7 +29,7 @@ class FrontController
                 }
             } else {
                 echo "Visitort controller1\n";
-                require($rep . $view['erreur']);
+                require("View/src/pages/Main.php");
                 echo "Visitort controller1\n";
                 // new VisitorController();
             }

From 26a66b6335d91a07d3c61803a2f48d352174cd1c Mon Sep 17 00:00:00 2001
From: nathan boileau <boileaunathan42@gmail.com>
Date: Fri, 9 Dec 2022 18:37:32 +0100
Subject: [PATCH 18/20] test

---
 WEB/Controller/FrontController.php   |  4 +--
 WEB/Controller/VisitorController.php |  6 ++--
 WEB/Model/VisitorModel.php           |  4 +--
 WEB/index.php                        | 50 ++++++++++++++--------------
 4 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/WEB/Controller/FrontController.php b/WEB/Controller/FrontController.php
index b3b55628..63cdb62d 100644
--- a/WEB/Controller/FrontController.php
+++ b/WEB/Controller/FrontController.php
@@ -29,9 +29,7 @@ class FrontController
                 }
             } else {
                 echo "Visitort controller1\n";
-                require("View/src/pages/Main.php");
-                echo "Visitort controller1\n";
-                // new VisitorController();
+                new VisitorController();
             }
         } catch (Exception $e) {
             $error = $e->getMessage();
diff --git a/WEB/Controller/VisitorController.php b/WEB/Controller/VisitorController.php
index 96afd606..09021b91 100644
--- a/WEB/Controller/VisitorController.php
+++ b/WEB/Controller/VisitorController.php
@@ -36,15 +36,15 @@ class VisitorController
                     break;
                 default:
                     $error = "Action non valide";
-                    require($rep . $vues['erreur']);
+                    // require($rep . $vues['erreur']);
                     break;
             }
         } catch (PDOException $e) {
             $error = $e->getMessage();
-            require($rep . $vues['erreur']);
+            // require($rep . $vues['erreur']);
         } catch (Exception $e2) {
             $error = $e2->getMessage();
-            require($rep . $vues['erreur']);
+            // require($rep . $vues['erreur']);
         }
     }
 }
\ No newline at end of file
diff --git a/WEB/Model/VisitorModel.php b/WEB/Model/VisitorModel.php
index 5fa7839f..3b9111ac 100644
--- a/WEB/Model/VisitorModel.php
+++ b/WEB/Model/VisitorModel.php
@@ -87,10 +87,10 @@ class VisitorModel
     {
         global $rep, $vues, $error;
         try {
-            require($rep . $vues['main']);
+            require("View/src/pages/Main.php");
         } catch (Exception $e) {
             $error = "404";
-            require($rep . $vues['erreur']);
+            // require($rep . $vues['erreur']);
         }
     }
 
diff --git a/WEB/index.php b/WEB/index.php
index 14e49e97..033ac343 100644
--- a/WEB/index.php
+++ b/WEB/index.php
@@ -4,33 +4,33 @@ require_once('./Config/Autoload.php');
 Autoload::charger();
 
 echo "test1\n";
-try {
-    $con = new Connection($dsn);
+// try {
+//     $con = new Connection($dsn);
 
-    // $query = "INSERT INTO Utilisateur VALUES (:email,:pseudo,:mdp,:estAdmin)";
-    // $con->executeQuery($query, array(
-    //     ':email' => array("SUPERsuper", SQLITE3_TEXT),
-    //     ':pseudo' => array("dragon", SQLITE3_TEXT),
-    //     ':mdp' => array("qsdfgyutfcvbghytrfcvgbtfcvgh", SQLITE3_TEXT),   
-    //     ':estAdmin' => array(0, SQLITE3_INTEGER)
-    // ));
+//     // $query = "INSERT INTO Utilisateur VALUES (:email,:pseudo,:mdp,:estAdmin)";
+//     // $con->executeQuery($query, array(
+//     //     ':email' => array("SUPERsuper", SQLITE3_TEXT),
+//     //     ':pseudo' => array("dragon", SQLITE3_TEXT),
+//     //     ':mdp' => array("qsdfgyutfcvbghytrfcvgbtfcvgh", SQLITE3_TEXT),   
+//     //     ':estAdmin' => array(0, SQLITE3_INTEGER)
+//     // ));
 
-    $query = "SELECT * FROM Utilisateur";
-    $con->executeQuery($query);
-    $results = $con->getResults();
-    foreach ($results as $row) {
-        echo $row['email'] . '</br>';
-        echo $row['pseudo'] . '</br>';
-        echo $row['mdp'] . '</br>';
-        echo $row['estAdmin'] . '</br>';
-    }
-}
-catch (PDOException $e) {
-    echo $e->getMessage();
-}
-catch (Exception $e2) {
-    echo $e2->getMessage();
-}
+//     $query = "SELECT * FROM Utilisateur";
+//     $con->executeQuery($query);
+//     $results = $con->getResults();
+//     foreach ($results as $row) {
+//         echo $row['email'] . '</br>';
+//         echo $row['pseudo'] . '</br>';
+//         echo $row['mdp'] . '</br>';
+//         echo $row['estAdmin'] . '</br>';
+//     }
+// }
+// catch (PDOException $e) {
+//     echo $e->getMessage();
+// }
+// catch (Exception $e2) {
+//     echo $e2->getMessage();
+// }
 $control = new FrontController();
 echo "test2\n";
 

From 1fb49950ef0e1041e6cb6b22658021fdd6fae440 Mon Sep 17 00:00:00 2001
From: nathan boileau <boileaunathan42@gmail.com>
Date: Fri, 9 Dec 2022 18:39:37 +0100
Subject: [PATCH 19/20] test

---
 WEB/Model/VisitorModel.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WEB/Model/VisitorModel.php b/WEB/Model/VisitorModel.php
index 3b9111ac..3b3a854b 100644
--- a/WEB/Model/VisitorModel.php
+++ b/WEB/Model/VisitorModel.php
@@ -15,7 +15,7 @@ class VisitorModel
             $this->utilisateur_gateway = new UtilisateurGateway();
         } catch (Exception $e) {
             $error = $e->getMessage();
-            require($rep . $view['erreur']);
+            // require($rep . $view['erreur']);
         }
     }
 

From 636a37e40b5de54b7070d02bcd80a8e089af1dad Mon Sep 17 00:00:00 2001
From: nathan boileau <boileaunathan42@gmail.com>
Date: Fri, 9 Dec 2022 18:42:28 +0100
Subject: [PATCH 20/20] remise comme avant

---
 WEB/Controller/FrontController.php   | 4 ----
 WEB/Controller/VisitorController.php | 8 +++-----
 WEB/Model/VisitorModel.php           | 6 +++---
 WEB/index.php                        | 2 +-
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/WEB/Controller/FrontController.php b/WEB/Controller/FrontController.php
index 63cdb62d..6970090c 100644
--- a/WEB/Controller/FrontController.php
+++ b/WEB/Controller/FrontController.php
@@ -6,7 +6,6 @@ class FrontController
         try { 
             global $error, $view, $rep;
             session_start();
-            echo "front controller\n";
             // Check role permissions
             if (isset($_SESSION['role'])) {
                 $role = $_SESSION['role'];
@@ -17,18 +16,15 @@ class FrontController
             $action = $_REQUEST['action'];
             if ($role == "user") {
                 if ($action == NULL) {
-                    echo "User controller1\n";
                     new UserController();
                 }
                 // else if (method_exists('UserModel', $action) == false) {
                 //     $error = "Action non valide " . $action;
                 //     require($rep . $view['erreur']);
                 else {
-                    echo "User controller1\n";
                     new UserController();
                 }
             } else {
-                echo "Visitort controller1\n";
                 new VisitorController();
             }
         } catch (Exception $e) {
diff --git a/WEB/Controller/VisitorController.php b/WEB/Controller/VisitorController.php
index 09021b91..34e5fe0e 100644
--- a/WEB/Controller/VisitorController.php
+++ b/WEB/Controller/VisitorController.php
@@ -6,9 +6,7 @@ class VisitorController
 
     function __construct()
     {
-        echo "before Vistor\n";
         try {
-            echo "Visitor controller\n";
             global $dsn, $rep, $vues, $error;
             $model = new VisitorModel();
             $action = $_REQUEST['action'];
@@ -36,15 +34,15 @@ class VisitorController
                     break;
                 default:
                     $error = "Action non valide";
-                    // require($rep . $vues['erreur']);
+                    require($rep . $vues['erreur']);
                     break;
             }
         } catch (PDOException $e) {
             $error = $e->getMessage();
-            // require($rep . $vues['erreur']);
+            require($rep . $vues['erreur']);
         } catch (Exception $e2) {
             $error = $e2->getMessage();
-            // require($rep . $vues['erreur']);
+            require($rep . $vues['erreur']);
         }
     }
 }
\ No newline at end of file
diff --git a/WEB/Model/VisitorModel.php b/WEB/Model/VisitorModel.php
index 3b3a854b..5fa7839f 100644
--- a/WEB/Model/VisitorModel.php
+++ b/WEB/Model/VisitorModel.php
@@ -15,7 +15,7 @@ class VisitorModel
             $this->utilisateur_gateway = new UtilisateurGateway();
         } catch (Exception $e) {
             $error = $e->getMessage();
-            // require($rep . $view['erreur']);
+            require($rep . $view['erreur']);
         }
     }
 
@@ -87,10 +87,10 @@ class VisitorModel
     {
         global $rep, $vues, $error;
         try {
-            require("View/src/pages/Main.php");
+            require($rep . $vues['main']);
         } catch (Exception $e) {
             $error = "404";
-            // require($rep . $vues['erreur']);
+            require($rep . $vues['erreur']);
         }
     }
 
diff --git a/WEB/index.php b/WEB/index.php
index 033ac343..b404917d 100644
--- a/WEB/index.php
+++ b/WEB/index.php
@@ -32,7 +32,7 @@ echo "test1\n";
 //     echo $e2->getMessage();
 // }
 $control = new FrontController();
-echo "test2\n";
+// echo "test2\n";
 
 //session_regenerate_id(true);
 // session_unset();