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

2 years ago · 7c5c4f49b4
parent 1446f9e113 636a37e40b
commit 7c5c4f49b4
4 changed files with 55 additions and 6 deletions
--- a/WEB/Config/Config.php
+++ b/WEB/Config/Config.php
@ -14,8 +14,8 @@ $rep = __DIR__ . '/../';
 // $password = 'p';

 // SQULITE3
-// $dsn = './scripted.db';
-$dsn = 'C:\\wamp64\\www\\scripted.db'; 
+$dsn = './scripted.db';
+//$dsn = 'C:\\wamp64\\www\\scripted.db'; 

 //Sel de hashage
 $sel = "JeSuisUnSeldeHashageEtJeSuisUniqueEtTresSecuriseEtJeSuisTresLong";
--- 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;
 }
--- 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>
--- a/WEB/index.php
+++ b/WEB/index.php
@ -3,7 +3,36 @@ require_once('./Config/Config.php');
 require_once('./Config/Autoload.php');
 Autoload::charger();

+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 = "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";

 //session_regenerate_id(true);
 // session_unset();