Finalisation, affinage du css et ajout d'un système de vérification pour les mdp pour qu'ils soient forts.

7 files changed, 95 insertions, 74 deletions

diff --git a/Template/Include/en/text.php b/Template/Include/en/text.php
index 7b8cfd1..b6f81e0 100644
--- a/Template/Include/en/text.php
+++ b/Template/Include/en/text.php
@@ -8,7 +8,7 @@
 
 $text = [
     "incl_form_admin" => [
-        "btManageJob"     => "Manage jobs categories",
+        "btManageJob"     => "Manage job categories",
         "btManageUser"    => "Manage users",
         "btManageMission" => "Manage missions",
         "formJobAddEn"    => "Name in English",
@@ -20,7 +20,7 @@ $text = [
         "submitDel"       => "Delete",
     ],
     "incl_global_footer" => [
-        "main" => "Made by Debulois Quentin for my professional folder.<br>December 2021, all rights reserved.",
+        "main" => "Made by Debulois Quentin for my professional folder.<br>Handmade from December 2021 to April 2022",
     ],
     "incl_form_userInfo" => [
         "h2"           => "Informations about the user.",
@@ -77,14 +77,19 @@ $text = [
         "btnLang"      => "Select"
     ],
     "incl_form_register" => [
-        "h2"       => "Form to sign-in",
-        "email"    => "Email",
-        "password" => "Password",
-        "notice"   => "Admin is here for the purpose of the exam only:",
-        "isAdmin"  => "Is admin?",
-        "isPro"    => "Is pro?",
-        "isClient" => "Is client?",
-        "submit"   => "Sign-up"
+        "h2"          => "Form to sign-up",
+        "email"       => "Email",
+        "password"    => "Password",
+        "passNotice"  => "The password must have at least:",
+        "passLength"  => "8 characters,",
+        "passUpper"   => "one uppercase,",
+        "passNumb"    => "one number,",
+        "passSpecial" => "one special character.",
+        "notice"      => "\"Admin\" is here for the purpose of the exam only:",
+        "isAdmin"     => "Admin",
+        "isPro"       => "Pro",
+        "isClient"    => "Client",
+        "submit"      => "Sign-up"
     ],
     "incl_index_search" => [
         "h2"            => "Search a professional",
diff --git a/Template/Include/fr/message.php b/Template/Include/fr/message.php
index d9dc98c..ef86420 100644
--- a/Template/Include/fr/message.php
+++ b/Template/Include/fr/message.php
@@ -83,7 +83,7 @@ $messageText  = [
         "notConnected" => [
             "success"  => false,
             "title"    => "Requête de mission.",
-            "info"     => "Erreur, Vous devez être connecté, et connecté en tant que client.",
+            "info"     => "Erreur, vous devez être connecté, et connecté en tant que client.",
             "timer"    => true,
             "toSrc"    => false
         ]
diff --git a/Template/Include/fr/text.php b/Template/Include/fr/text.php
index ed28f1f..bff6489 100644
--- a/Template/Include/fr/text.php
+++ b/Template/Include/fr/text.php
@@ -11,16 +11,16 @@ $text = [
         "btManageJob"     => "Gestion des emplois",
         "btManageUser"    => "Gestion des utilisateurs",
         "btManageMission" => "Gestion des missions",
-        "formJobAddEn"    => "Nom en Englais",
+        "formJobAddEn"    => "Nom en Anglais",
         "formJobAddFr"    => "Nom en Français",
         "submitJobAdd"    => "Ajouter",
-        "selJobDel"       => "Choisir une categorie à suppr.",
+        "selJobDel"       => "Choisir une catégorie à suppr.",
         "submitJobDel"    => "Suppr.",
         "formDel"         => "ID à supprimer",
         "submitDel"       => "Supprimer",
     ],
     "incl_global_footer" => [
-        "main" => "Réalisé par Debulois Quentin pour mon dossier professionel.<br>Decembre 2021, tous droits réservés.",
+        "main" => "Réalisé par Debulois Quentin pour mon dossier professionel.<br>Réalisé 100% à la main de Decembre 2021 à Avril 2022.",
     ],
     "incl_form_userInfo" => [
         "h2"           => "Informations sur l'utilisateur.",
@@ -77,14 +77,19 @@ $text = [
         "btnLang"      => "Sélectionner"
     ],
     "incl_form_register" => [
-        "h2"       => "Formulaire d'inscription",
-        "email"    => "Email",
-        "password" => "Mot de passe",
-        "notice"   => "Admin est présent pour les besoins de l'examen uniquement:",
-        "isClient" => "Est client?",
-        "isPro"    => "Est pro?",
-        "isAdmin"  => "Est admin?",
-        "submit"   => "S'inscrire"
+        "h2"          => "Formulaire d'inscription",
+        "email"       => "Email",
+        "password"    => "Mot de passe",
+        "passNotice"  => "Le mot de passe doit au moins avoir:",
+        "passLength"  => "8 caractères,",
+        "passUpper"   => "une majuscule,",
+        "passNumb"    => "un chiffre,",
+        "passSpecial" => "un caractère spécial.",
+        "notice"      => "\"Admin\" est présent pour les besoins de l'examen uniquement:",
+        "isClient"    => "Client",
+        "isPro"       => "Pro",
+        "isAdmin"     => "Admin",
+        "submit"      => "S'inscrire"
     ],
     "incl_index_search" => [
         "h2"            => "Rechercher un professionnel",
diff --git a/Template/Include/incl_form_register.php b/Template/Include/incl_form_register.php
index 0baeaf2..109c360 100644
--- a/Template/Include/incl_form_register.php
+++ b/Template/Include/incl_form_register.php
@@ -17,19 +17,32 @@ echo('<!-- Division principale -->
     <h2>'.$text[basename(__FILE__, ".php")]["h2"].'</h2>
     <!-- Formulaire d\'inscription -->
     <form action="/../Core/wrapper.php" method="post">
-        <label>
-            <i class="fas fa-envelope-square"></i>
-            <input type="email" name="email" id="email" maxlength="128" placeholder="'.$text[basename(__FILE__, ".php")]["email"].'" maxlength="128" required>
-        </label>
-        <label>
-            <i class="fas fa-lock"></i>
-            <input type="password" name="password" id="password" maxlength="128" placeholder="'.$text[basename(__FILE__, ".php")]["password"].'" maxlength="128" required>
-        </label>
-        <label class="info">'.$text[basename(__FILE__, ".php")]["notice"].'</label>
-        <label for="isAdmin"><input type="radio" id="isAdmin" name="userStatus" value="0">'.$text[basename(__FILE__, ".php")]["isAdmin"].'</label>
-        <label for="isPro"><input type="radio" id="isPro" name="userStatus" value="1">'.$text[basename(__FILE__, ".php")]["isPro"].'</label>
-        <label for="isClient"><input type="radio" id="isClient" name="userStatus" value="2">'.$text[basename(__FILE__, ".php")]["isClient"].'</label>
-        <input type="submit" value="'.$text[basename(__FILE__, ".php")]["submit"].'">
+        <div>
+            <label>
+                <i class="fas fa-envelope-square"></i>
+                <input type="email" name="email" id="email" maxlength="128" placeholder="'.$text[basename(__FILE__, ".php")]["email"].'" maxlength="128" required>
+            </label>
+            <label>
+                <i class="fas fa-lock"></i>
+                <input type="password" name="password" id="password" maxlength="128" onkeyup="check_pass()" placeholder="'.$text[basename(__FILE__, ".php")]["password"].'" maxlength="128" required>
+            </label>
+            <p>
+                '.$text[basename(__FILE__, ".php")]["passNotice"].'
+                <br>
+                <span id="passLength" class="invalid">'.$text[basename(__FILE__, ".php")]["passLength"].'</span>
+                <span id="passUpper" class="invalid">'.$text[basename(__FILE__, ".php")]["passUpper"].'</span>
+                <span id="passNumb" class="invalid">'.$text[basename(__FILE__, ".php")]["passNumb"].'</span>
+                <span id="passSpecial" class="invalid">'.$text[basename(__FILE__, ".php")]["passSpecial"].'</span>
+            </p>
+        </div>
+        <h3>User role</h3>
+        <div>
+            <label class="info">'.$text[basename(__FILE__, ".php")]["notice"].'</label>
+            <label for="isAdmin"><input type="radio" id="isAdmin" name="userStatus" value="0">'.$text[basename(__FILE__, ".php")]["isAdmin"].'</label>
+            <label for="isPro"><input type="radio" id="isPro" name="userStatus" value="1">'.$text[basename(__FILE__, ".php")]["isPro"].'</label>
+            <label for="isClient"><input type="radio" id="isClient" name="userStatus" value="2">'.$text[basename(__FILE__, ".php")]["isClient"].'</label>
+            <input id="submit" type="submit" class="deactivate" value="'.$text[basename(__FILE__, ".php")]["submit"].'">
+        </div>
     </form>
 </main>'.PHP_EOL);
 
diff --git a/Template/Include/incl_global_navbar.php b/Template/Include/incl_global_navbar.php
index 95ab8d8..cfb795f 100644
--- a/Template/Include/incl_global_navbar.php
+++ b/Template/Include/incl_global_navbar.php
@@ -45,10 +45,10 @@ echo('    <!-- Choix de la langue -->
 
 // Affichage du navbar et de ses elements en fonction de si l'utilisateur est connecté ou non.
 echo('<!-- navbar -->    
-<nav>
-<!-- Espace vide -->
-<div class="spacer"></div>
-<!-- Liste de lien pour la navigation -->');
+    <nav>
+        <!-- Espace vide -->
+        <div class="spacer"></div>
+        <!-- Liste de lien pour la navigation -->'.PHP_EOL);
 if (isset($_SESSION["loggedIn"], $_SESSION["userStatus"]) 
     && $_SESSION["loggedIn"] == "1"
 ) {
@@ -56,34 +56,36 @@ if (isset($_SESSION["loggedIn"], $_SESSION["userStatus"])
         case 0:
             $status = 'Admin';
             echo('        <p><span class="headerInfoAdmin">'.$status.'</span>'.$_SESSION["email"].'</p>'.PHP_EOL);
-            echo('        <a href="/index.php#separator2"><i class="fas fa-search"></i> '.$text[basename(__FILE__, ".php")]["btnSearch"].'</a>');
+            echo('        <a href="/index.php#separator2"><i class="fas fa-search"></i> '.$text[basename(__FILE__, ".php")]["btnSearch"].'</a>'.PHP_EOL);
             echo('        <a href="/Template/admin.php"><i class="fas fa-cog"></i> '.$text[basename(__FILE__, ".php")]["btnAdmin"].'</a>'.PHP_EOL);
             echo('        <a href="/Template/logout.php"><i class="fas fa-sign-out-alt"></i> '.$text[basename(__FILE__, ".php")]["btnLogout"].'</a>'.PHP_EOL);
             break;
         case 1:
             $status = 'Pro';
             echo('        <p><span class="headerInfoPro">'.$status.'</span>'.$_SESSION["email"].'</p>'.PHP_EOL);
-            echo('        <a href="/index.php#separator2"><i class="fas fa-search"></i> '.$text[basename(__FILE__, ".php")]["btnSearch"].'</a>');
+            echo('        <a href="/index.php#separator2"><i class="fas fa-search"></i> '.$text[basename(__FILE__, ".php")]["btnSearch"].'</a>'.PHP_EOL);
             echo('        <a href="/Template/myMission.php"><i class="fas fa-tasks"></i> '.$text[basename(__FILE__, ".php")]["btnMyMission"].'</a>'.PHP_EOL);
-            echo('        <a href="/Template/userInfo.php"><i class="fas fa-user"></i> '.$text[basename(__FILE__, ".php")]["btnInfos"].'</a>');
+            echo('        <a href="/Template/userInfo.php"><i class="fas fa-user"></i> '.$text[basename(__FILE__, ".php")]["btnInfos"].'</a>'.PHP_EOL);
             echo('        <a href="/Template/logout.php"><i class="fas fa-sign-out-alt"></i> '.$text[basename(__FILE__, ".php")]["btnLogout"].'</a>'.PHP_EOL);
             break;
         case 2:
             $status = 'Client';
             echo('        <p><span class="headerInfoClient">'.$status.'</span>'.$_SESSION["email"].'</p>'.PHP_EOL);
-            echo('        <a href="/index.php#separator2"><i class="fas fa-search"></i> '.$text[basename(__FILE__, ".php")]["btnSearch"].'</a>');
+            echo('        <a href="/index.php#separator2"><i class="fas fa-search"></i> '.$text[basename(__FILE__, ".php")]["btnSearch"].'</a>'.PHP_EOL);
             echo('        <a href="/Template/myMission.php"><i class="fas fa-tasks"></i> '.$text[basename(__FILE__, ".php")]["btnMyMission"].'</a>'.PHP_EOL);
-            echo('        <a href="/Template/userInfo.php"><i class="fas fa-user"></i> '.$text[basename(__FILE__, ".php")]["btnInfos"].'</a>');
+            echo('        <a href="/Template/userInfo.php"><i class="fas fa-user"></i> '.$text[basename(__FILE__, ".php")]["btnInfos"].'</a>'.PHP_EOL);
             echo('        <a href="/Template/logout.php"><i class="fas fa-sign-out-alt"></i> '.$text[basename(__FILE__, ".php")]["btnLogout"].'</a>'.PHP_EOL);
             break;
     }
     echo('        <!-- Espace vide -->
-        <div class="spacer"></div>');
+        <div class="spacer"></div>
+    </nav>'.PHP_EOL);
 } else {
     echo('        <a href="/Template/login.php"><i class="fas fa-sign-in-alt"></i> '.$text[basename(__FILE__, ".php")]["btnLogin"].'</a>
         <a href="/Template/register.php"><i class="fas fa-user-plus"></i> '.$text[basename(__FILE__, ".php")]["btnRegister"].'</a>
         <!-- Espace vide -->
-        <div class="spacer"></div>'.PHP_EOL);
+        <div class="spacer"></div>
+    </nav>'.PHP_EOL);
 }
-echo('</nav>');
+
 ?>
\ No newline at end of file
diff --git a/Template/Include/incl_index_search.php b/Template/Include/incl_index_search.php
index 13d581e..f285c2e 100644
--- a/Template/Include/incl_index_search.php
+++ b/Template/Include/incl_index_search.php
@@ -18,7 +18,7 @@ $dbsearch = new DbSearch;
 // SEPARATEUR
 // ****************************************************************************
 echo('<!-- Separateur -->
-<div id="separator2" class="separator"></div>');
+<div id="separator2" class="separator"></div>'.PHP_EOL);
 
 // ****************************************************************************
 // DIV PRINCIPALE
@@ -26,7 +26,7 @@ echo('<!-- Separateur -->
 echo('<!-- Division principale -->
 <main id="mainSearch">'.PHP_EOL);
 
-// Form pour la recherche par nom et envoi au wrappeur.
+// Form pour la recherche par nom ou type d'emploi et envoi au wrappeur.
 echo('<!-- Form de recherche -->
 <h2>'.$text[basename(__FILE__, ".php")]["h2"].'</h2>
 <div id="divSearch">
@@ -123,8 +123,8 @@ if (isset($_SESSION["search"])) {
                     </td>
                 </tr>');
             }
-            echo('</tbody>');
-            echo('</table>');
+            echo('</tbody>
+                </table>');
         } else {
             echo('<p>'.$text[basename(__FILE__, ".php")]["noResult"].'</p>');
         }
@@ -191,8 +191,7 @@ if (isset($_SESSION["search"])) {
         <form id="formMandate" action="/Core/wrapper.php" method="post">
             <input type="hidden" name="mandateProId" value="'.$_SESSION["search"]["result"][0]["userId"].'">
             <input type="submit" value="'.$text[basename(__FILE__, ".php")]["mandate"].'">
-        </form>
-        </table>');
+        </form>');
     }
 }
 
diff --git a/Template/Include/incl_table_myMission.php b/Template/Include/incl_table_myMission.php
index 504abac..d97e32d 100644
--- a/Template/Include/incl_table_myMission.php
+++ b/Template/Include/incl_table_myMission.php
@@ -74,9 +74,9 @@ echo('<div id="myMissionButtons">
 // ****************************************************************************
 // TABLEAU DES MISSIONS EN ATTENTE
 // ****************************************************************************
+echo('<section id="secCompleted">');
 if ($missionStatus["pending"]) {
-    echo('<section id="secPending">
-        <table>
+    echo('    <table>
             <!-- En-tête -->
             <tr>'.PHP_EOL);
     foreach($header["pendingMissions"] as $columnHeader) {
@@ -100,20 +100,18 @@ if ($missionStatus["pending"]) {
         }
         echo('            </tr>'.PHP_EOL);
     }
-    echo('    </table>
-    </section>');
+    echo('    </table>');
 } else {
-    echo('<section id="secPending">
-        <p>'.$text[basename(__FILE__, ".php")]["noPending"].'</p>
-    </section>');
+    echo('<p>'.$text[basename(__FILE__, ".php")]["noPending"].'</p>');
 }
+echo('</section>');
 
 // ****************************************************************************
 // TABLEAU DES MISSIONS EN COURS
 // ****************************************************************************
+echo('<section id="secCompleted">');
 if ($missionStatus["ongoing"]) {
-    echo('<section id="secOngoing">
-        <table>
+    echo('    <table>
             <!-- En-tête -->
             <tr>'.PHP_EOL);
     foreach($header["ongoingMissions"] as $columnHeader) {
@@ -141,20 +139,18 @@ if ($missionStatus["ongoing"]) {
         }
         echo('        </tr>'.PHP_EOL);
     }
-    echo('    </table>
-    </section>');
+    echo('    </table>');
 } else {
-    echo('<section id="secOngoing">
-        <p>'.$text[basename(__FILE__, ".php")]["noOngoing"].'</p>
-    </section>');
+    echo('<p>'.$text[basename(__FILE__, ".php")]["noOngoing"].'</p>');
 }
+echo('</section>');
 
 // ****************************************************************************
 // TABLEAU DES MISSIONS TERMINEES
 // ****************************************************************************
+echo('<section id="secCompleted">');
 if ($missionStatus["completed"]) {
-    echo('<section id="secCompleted">
-        <table>
+    echo('    <table>
             <!-- En-tête -->
             <tr>'.PHP_EOL);
     foreach($header["completedMissions"] as $columnHeader) {
@@ -183,14 +179,15 @@ if ($missionStatus["completed"]) {
         }
             echo('</tr>'.PHP_EOL);
     }
-    echo('    </table>
-    </section>');
+    echo('    </table>');
 } else {
-    echo('<section id="secCompleted">
-        <p>'.$text[basename(__FILE__, ".php")]["noCompleted"].'</p>
-    </section>');
+    echo('<p>'.$text[basename(__FILE__, ".php")]["noCompleted"].'</p>');
 }
+echo('</section>');
 
+// ****************************************************************************
+// DIV SPACER
+// ****************************************************************************
 echo('<!-- Espace vide si le tableau est petit -->
 <div class="spacer"></div>');