From b9aefc1dcde9d2aadcb90b9e310e8ad6a9131e9a Mon Sep 17 00:00:00 2001
From: Valentin CZERYBA <valcze80@gmail.com>
Date: Sun, 14 Aug 2022 19:32:40 +0200
Subject: [PATCH] remove data-bs-dismiss

---
 web/html/adduser.html | 20 +++++++++++++++-----
 web/html/user.html    | 18 +++++++++---------
 web/js/addUser.js     | 10 +++++++++-
 web/js/library.js     | 11 ++++++++---
 4 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/web/html/adduser.html b/web/html/adduser.html
index 4565e32..d38de6a 100644
--- a/web/html/adduser.html
+++ b/web/html/adduser.html
@@ -120,27 +120,37 @@
 
       <div class="alert alert-warning alert-dismissible hidden" id="notModifiedAlert" role="alert">
         <div>Utilisateur non modifié</div>
-         <button type="button"  class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+         <button type="button"  class="btn-close" aria-label="Close"></button>
+      </div>
+
+      <div class="alert alert-warning alert-dismissible hidden" id="pseudoExistAlert" role="alert">
+        <div>Pseudo déjà pris</div>
+         <button type="button"  class="btn-close" aria-label="Close"></button>
+      </div>
+
+      <div class="alert alert-warning alert-dismissible hidden" id="emailExistAlert" role="alert">
+        <div>Email déjà pris</div>
+         <button type="button"  class="btn-close"  aria-label="Close"></button>
       </div>
 
       <div class="alert alert-danger alert-dismissible hidden" id="notAuthorizedAlert" role="alert">
         <div>Action non autorisée</div>
-         <button type="button"  class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+         <button type="button"  class="btn-close"  aria-label="Close"></button>
       </div>
 
       <div class="alert alert-danger alert-dismissible hidden" id="forbiddenAlert" role="alert">
         <div>Action interdite</div>
-         <button type="button"  class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+         <button type="button"  class="btn-close"  aria-label="Close"></button>
       </div>
 
       <div class="alert alert-danger alert-dismissible hidden" id="internalServerAlert" role="alert">
         <div>Erreur interne du serveur</div>
-         <button type="button"  class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+         <button type="button"  class="btn-close" aria-label="Close"></button>
       </div>
 
       <div class="alert alert-danger alert-dismissible hidden" id="unknownAlert" role="alert">
         <div>Erreur inconnue</div>
-         <button type="button"  class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+         <button type="button"  class="btn-close"  aria-label="Close"></button>
       </div>
       
       
diff --git a/web/html/user.html b/web/html/user.html
index 3f98f81..4d3b390 100644
--- a/web/html/user.html
+++ b/web/html/user.html
@@ -125,49 +125,49 @@
 
       <div class="alert alert-danger alert-dismissible hidden" id="notAuthorizedAlert" role="alert">
         <div>Création d'utilisateur non autorisée avec ce compte</div>
-         <button type="button"  class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+         <button type="button"  class="btn-close"  aria-label="Close"></button>
       </div>
 
       <div class="alert alert-danger alert-dismissible hidden" id="forbiddenAlert" role="alert">
         <div>Action interdite</div>
-         <button type="button"  class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+         <button type="button"  class="btn-close" aria-label="Close"></button>
       </div>
 
       <div class="alert alert-danger alert-dismissible hidden" id="noContentAlert" role="alert">
         <div>Utilisateur non modifié</div>
-         <button type="button"  class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+         <button type="button"  class="btn-close"  aria-label="Close"></button>
       </div>
 
 
       <div class="alert alert-danger alert-dismissible hidden" id="internalServerAlert" role="alert">
         <div>Erreur interne du serveur</div>
-         <button type="button"  class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+         <button type="button"  class="btn-close" aria-label="Close"></button>
       </div>
 
       <div class="alert alert-danger alert-dismissible hidden" id="unknownAlert" role="alert">
         <div>Erreur inconnue</div>
-         <button type="button"  class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+         <button type="button"  class="btn-close"  aria-label="Close"></button>
       </div>
 
       
       <div class="alert alert-danger alert-dismissible hidden" id="pseudoAlert" role="alert">
         <div>Champ pseudo vide</div>
-         <button type="button"  class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+         <button type="button"  class="btn-close" aria-label="Close"></button>
       </div>
 
       <div class="alert alert-danger alert-dismissible hidden" id="emailAlert" role="alert">
         <div>Champ email vide</div>
-         <button type="button"  class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+         <button type="button"  class="btn-close" aria-label="Close"></button>
       </div>
 
       <div class="alert alert-danger alert-dismissible hidden" id="firstNameAlert" role="alert">
         <div>Champ prenom vide</div>
-         <button type="button"  class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+         <button type="button"  class="btn-close"  aria-label="Close"></button>
       </div>
 
       <div class="alert alert-danger alert-dismissible hidden" id="nameAlert" role="alert">
         <div>Champ nom vide</div>
-         <button type="button"  class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+         <button type="button"  class="btn-close"  aria-label="Close"></button>
       </div>
      
       <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
diff --git a/web/js/addUser.js b/web/js/addUser.js
index d22d242..671956a 100644
--- a/web/js/addUser.js
+++ b/web/js/addUser.js
@@ -1,5 +1,6 @@
 checkToken();
 signOut();
+closeButton();
 
 
 document.getElementById("addUser").addEventListener("click", function(){
@@ -60,8 +61,15 @@ document.getElementById("addUser").addEventListener("click", function(){
             }
             document.getElementById(idAlert+"Alert").classList.remove("hidden");
         }).catch(function(error){
-            switch(error.status){
+            console.log(error);
+            switch(error.response.status){
                 case 401:
+                    listExist = [ "pseudo", "email" ];
+                    for(var i=0; i<listExist.length; i++){
+                        if(error.response.data[listExist[i]]){
+                            document.getElementById(listExist[i]+"ExistAlert").classList.remove("hidden");
+                        }
+                    }
                     idAlert="notAuthorized";
                     break;
                 case 403:
diff --git a/web/js/library.js b/web/js/library.js
index d46f51f..ec96ccd 100644
--- a/web/js/library.js
+++ b/web/js/library.js
@@ -11,6 +11,11 @@ function checkToken(){
         if(location.pathname != "/"){
             location.href="/";
         }
+        if(error.response.status == 406){
+            instance.delete("token" , {withCredentials:true}).then(function(response){
+                location.reload();
+           });
+        }
     });
 
 }
@@ -20,11 +25,11 @@ function signOut(){
 
     document.getElementById("signout").addEventListener("click", function(){
         instance.delete("token" , {withCredentials:true}).then(function(response){
-             if(response.status == 200){
-              location.href="/"
+             if(response.status == 200) {
+                location.href="/";
              }
         });
-      });
+    });
 }
 
 function closeButton(){