From b717a5b8190a01aa59524522d1f09024502dabe3 Mon Sep 17 00:00:00 2001 From: Valentin CZERYBA Date: Fri, 22 Jul 2022 23:36:03 +0200 Subject: [PATCH 01/46] Home dashboard wip --- web/html/home.html | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/web/html/home.html b/web/html/home.html index d4fb5b8..bf1aa58 100644 --- a/web/html/home.html +++ b/web/html/home.html @@ -82,9 +82,7 @@ - - +
Company name @@ -107,7 +105,7 @@
  • - Dashboard + Utilisateurs
  • @@ -177,9 +175,9 @@ -
    +
    -

    Dashboard

    +

    Utilisateurs

    @@ -192,8 +190,6 @@
    - -

    Section title

    From e208c558115dd8e8b015cc8594e01f75777ea683 Mon Sep 17 00:00:00 2001 From: Valentin CZERYBA Date: Mon, 25 Jul 2022 20:35:54 +0200 Subject: [PATCH 02/46] Creation bibliotheque js --- web/html/home.html | 54 +++++----------------------------------------- web/index.html | 1 + web/js/library.js | 9 ++++++++ web/js/login.js | 6 +----- 4 files changed, 16 insertions(+), 54 deletions(-) create mode 100644 web/js/library.js diff --git a/web/html/home.html b/web/html/home.html index bf1aa58..27f5a47 100644 --- a/web/html/home.html +++ b/web/html/home.html @@ -108,36 +108,9 @@ Utilisateurs -
  • - - - Orders - -
    • -
  • - - - Products - -
    • -
  • - - - Customers - -
    • -
  • - - - Reports - -
    • -
  • - - - Integrations - -
    • + + +
    @@ -153,24 +126,6 @@ Current month -
  • - - - Last quarter - -
    • -
  • - - - Social engagement - -
    • -
  • - - - Year-end sale - -
    • @@ -327,5 +282,6 @@ - + + \ No newline at end of file diff --git a/web/index.html b/web/index.html index 6d5a8e7..3276951 100644 --- a/web/index.html +++ b/web/index.html @@ -106,5 +106,6 @@ + diff --git a/web/js/library.js b/web/js/library.js new file mode 100644 index 0000000..1e3c951 --- /dev/null +++ b/web/js/library.js @@ -0,0 +1,9 @@ +function checkToken(){ + + instance.get("token", { withCredentials: true}) + .then(function(response) { location.href="html/home.html"; }) + .catch(function(error){ + location.href="/"; + }); + +} \ No newline at end of file diff --git a/web/js/login.js b/web/js/login.js index 5c33cc7..a82204b 100644 --- a/web/js/login.js +++ b/web/js/login.js @@ -1,8 +1,4 @@ -instance.get("token", { withCredentials: true}) - .then(function(response) { location.href="html/home.html"; }) - .catch(function(error){ - - }); +checkToken(); document.getElementById("signin").addEventListener("submit", function(evt){ evt.preventDefault(); From 950669bd0e444adfe2df63d6d9ef1783c1d0687b Mon Sep 17 00:00:00 2001 From: Valentin CZERYBA Date: Mon, 25 Jul 2022 23:46:32 +0200 Subject: [PATCH 03/46] add checktoken interceptors and remove loop refresh --- web/html/home.html | 8 +++++--- web/js/home.js | 6 ++++++ web/js/library.js | 7 ++++++- 3 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 web/js/home.js diff --git a/web/html/home.html b/web/html/home.html index 27f5a47..d02b88b 100644 --- a/web/html/home.html +++ b/web/html/home.html @@ -24,6 +24,7 @@ + + + + + + + + +
    + Company name + + +
    +
    + Sign out +
    +
    +
    + +
    +
    + + +
    +
    +

    Utilisateurs

    +
    + +

    Utilisateur

    +
    + ID + +
    + +
    + Pseudo + +
    + +
    + Nom + +
    + +
    + Prenom + +
    + +
    + Email + +
    + + +
    + + +
    + + + + +
    +
    +
    + + + + + + + + + + \ No newline at end of file diff --git a/web/js/home.js b/web/js/home.js index 10f3216..3a5cf9b 100644 --- a/web/js/home.js +++ b/web/js/home.js @@ -1,4 +1,5 @@ checkToken(); +signOut(); var nbPages = 20; @@ -32,6 +33,12 @@ instance.get("users", {withCredentials: true, params :{ page:0, nbPages: nbPages td[1].textContent = listData[i].pseudo td[2].textContent = listData[i].email td[3].textContent = listData[i].roles + var classTd = ".disableStatus"; + if(listData[i].status){ + classTd = ".activeStatus"; + } + td[4].querySelector(classTd).classList.remove("hidden"); + trAll[i].addEventListener("click", function(e){ console.log(e.currentTarget) }); @@ -40,11 +47,4 @@ instance.get("users", {withCredentials: true, params :{ page:0, nbPages: nbPages }); -document.getElementById("signout").addEventListener("click", function(){ - instance.delete("token" , {withCredentials:true}).then(function(response){ - if(response.status == 200){ - location.href="/" - } - }); -}); diff --git a/web/js/library.js b/web/js/library.js index 5291fae..b3e6cf7 100644 --- a/web/js/library.js +++ b/web/js/library.js @@ -13,4 +13,16 @@ function checkToken(){ } }); +} + + +function signOut(){ + + document.getElementById("signout").addEventListener("click", function(){ + instance.delete("token" , {withCredentials:true}).then(function(response){ + if(response.status == 200){ + location.href="/" + } + }); + }); } \ No newline at end of file diff --git a/web/js/users.js b/web/js/users.js new file mode 100644 index 0000000..9423a30 --- /dev/null +++ b/web/js/users.js @@ -0,0 +1,2 @@ +checkToken(); +signOut(); \ No newline at end of file From 9a86fad4074b844d0fc19babe7082355bbe85b2d Mon Sep 17 00:00:00 2001 From: Valentin CZERYBA Date: Thu, 4 Aug 2022 23:19:26 +0200 Subject: [PATCH 13/46] change status users --- web/html/home.html | 2 +- web/js/home.js | 22 ++++++++++++++++++---- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/web/html/home.html b/web/html/home.html index 852635a..f61c705 100644 --- a/web/html/home.html +++ b/web/html/home.html @@ -165,7 +165,7 @@
    - + diff --git a/web/js/home.js b/web/js/home.js index 3a5cf9b..ccab1d8 100644 --- a/web/js/home.js +++ b/web/js/home.js @@ -33,10 +33,24 @@ instance.get("users", {withCredentials: true, params :{ page:0, nbPages: nbPages td[1].textContent = listData[i].pseudo td[2].textContent = listData[i].email td[3].textContent = listData[i].roles - var classTd = ".disableStatus"; - if(listData[i].status){ - classTd = ".activeStatus"; - } + var classTd = ""; + switch(listData[i].status){ + case 1: + classTd = ".activeStatus"; + break; + case 0: + classTd = ".disableStatus"; + break; + case 2: + classTd = ".confirmStatus"; + break; + case -1: + classTd = ".removeStatus"; + break; + default: + classTd = ".unknownStatus" + break; + } td[4].querySelector(classTd).classList.remove("hidden"); trAll[i].addEventListener("click", function(e){ From cb3aedf394fdc6f3808d78727f4339a53fac8993 Mon Sep 17 00:00:00 2001 From: Valentin CZERYBA Date: Fri, 5 Aug 2022 21:10:39 +0200 Subject: [PATCH 14/46] Formulaire de modification --- web/html/users.html | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/web/html/users.html b/web/html/users.html index 4ccb001..c5fc3ee 100644 --- a/web/html/users.html +++ b/web/html/users.html @@ -165,14 +165,33 @@
    - -
    + + +
    + Date de naissance + +
    + +
    + Status + +
    + + From 18704d4dccebafa3567943bb2a6bab617612b13d Mon Sep 17 00:00:00 2001 From: Valentin CZERYBA Date: Fri, 5 Aug 2022 21:20:14 +0200 Subject: [PATCH 15/46] get user by admin WIP --- web/js/library.js | 13 +++++++++++++ web/js/users.js | 11 ++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/web/js/library.js b/web/js/library.js index b3e6cf7..c17ec20 100644 --- a/web/js/library.js +++ b/web/js/library.js @@ -25,4 +25,17 @@ function signOut(){ } }); }); +} + + +function getQuery(param){ + query = location.search.split("?")[1]; + var variables = query.split("&") + var result = ""; + for (var i=0; i Date: Fri, 5 Aug 2022 23:39:15 +0200 Subject: [PATCH 16/46] formulaire de modification en cours --- web/html/users.html | 16 ++++++++-------- web/js/home.js | 3 ++- web/js/library.js | 12 +++++++----- web/js/users.js | 21 ++++++++++++++------- 4 files changed, 31 insertions(+), 21 deletions(-) diff --git a/web/html/users.html b/web/html/users.html index c5fc3ee..5d3087c 100644 --- a/web/html/users.html +++ b/web/html/users.html @@ -140,27 +140,27 @@

    Utilisateur

    ID - +
    Pseudo - +
    Nom - +
    Prenom - +
    Email - +
    @@ -175,12 +175,12 @@
    Date de naissance - +
    - Status - diff --git a/web/js/home.js b/web/js/home.js index ccab1d8..43be496 100644 --- a/web/js/home.js +++ b/web/js/home.js @@ -54,7 +54,8 @@ instance.get("users", {withCredentials: true, params :{ page:0, nbPages: nbPages td[4].querySelector(classTd).classList.remove("hidden"); trAll[i].addEventListener("click", function(e){ - console.log(e.currentTarget) + var id = e.currentTarget.querySelector("td").textContent; + location.href="/html/users.html?id="+id; }); } diff --git a/web/js/library.js b/web/js/library.js index c17ec20..0484536 100644 --- a/web/js/library.js +++ b/web/js/library.js @@ -29,12 +29,14 @@ function signOut(){ function getQuery(param){ - query = location.search.split("?")[1]; - var variables = query.split("&") var result = ""; - for (var i=0; i0){ + query = location.search.split("?")[1]; + var variables = query.split("&") + for (var i=0; i 0){ + instance.get("users/"+id, {withCredentials: true}) + .then(function(response){ + var listValue = [ "id", "pseudo", "name", "firstName", "email"]; + for (var i=0; i Date: Fri, 5 Aug 2022 23:56:26 +0200 Subject: [PATCH 17/46] formulaire rempli --- web/html/users.html | 16 ++++++++-------- web/js/users.js | 13 ++++++++++++- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/web/html/users.html b/web/html/users.html index 5d3087c..b4f034b 100644 --- a/web/html/users.html +++ b/web/html/users.html @@ -165,22 +165,22 @@
    - - + +
    - Date de naissance - + Date de naissance +
    - - diff --git a/web/js/users.js b/web/js/users.js index 8269f9f..78daf72 100644 --- a/web/js/users.js +++ b/web/js/users.js @@ -5,10 +5,21 @@ var id = getQuery("id"); if(id.length > 0){ instance.get("users/"+id, {withCredentials: true}) .then(function(response){ - var listValue = [ "id", "pseudo", "name", "firstName", "email"]; + var listValue = [ "id", "pseudo", "name", "firstName", "email", "birth"]; for (var i=0; i Date: Sat, 6 Aug 2022 00:07:11 +0200 Subject: [PATCH 18/46] Modification page html users --- web/html/users.html | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/web/html/users.html b/web/html/users.html index b4f034b..b17ae9f 100644 --- a/web/html/users.html +++ b/web/html/users.html @@ -87,14 +87,13 @@
    - Company name + <- Retour à la liste -
    - Sign out + Deconnecté
    @@ -107,28 +106,13 @@
  • - Utilisateur + Utilisateurs
    • - - + -
    - Saved reports - - - -
    -
    From 106ff00ce3cdd64a67672f536e68714f4b475679 Mon Sep 17 00:00:00 2001 From: Valentin CZERYBA Date: Sat, 6 Aug 2022 21:48:41 +0200 Subject: [PATCH 19/46] rename file and remove console.log --- web/html/{home.html => user.html} | 116 +++++++++++++++--------------- web/html/users.html | 114 ++++++++++++++--------------- web/js/home.js | 65 ----------------- web/js/library.js | 2 +- web/js/login.js | 2 +- web/js/user.js | 29 ++++++++ web/js/users.js | 84 +++++++++++++++------- 7 files changed, 206 insertions(+), 206 deletions(-) rename web/html/{home.html => user.html} (56%) delete mode 100644 web/js/home.js create mode 100644 web/js/user.js diff --git a/web/html/home.html b/web/html/user.html similarity index 56% rename from web/html/home.html rename to web/html/user.html index f61c705..e7176f0 100644 --- a/web/html/home.html +++ b/web/html/user.html @@ -87,14 +87,13 @@
    - Company name + <- Retour à la liste -
    - Sign out + Deconnecté
    @@ -111,69 +110,74 @@ - - + -
    - Saved reports - - - -
    -

    Utilisateurs

    -
    -
    - - -
    - -
    -

    Liste d'utilisateur

    -
    -
    - - - - - - - - - - - - - - - - - - - -
    IDPseudoMailRôleStatut
    - +

    Utilisateur

    +
    + ID +
    + +
    + Pseudo + +
    + +
    + Nom + +
    + +
    + Prenom + +
    + +
    + Email + +
    + + +
    + + +
    + + +
    + Date de naissance + +
    + +
    + + +
    + + + + + +
    @@ -185,5 +189,5 @@ - + \ No newline at end of file diff --git a/web/html/users.html b/web/html/users.html index b17ae9f..7418523 100644 --- a/web/html/users.html +++ b/web/html/users.html @@ -87,13 +87,14 @@
    - <- Retour à la liste + Company name +
    - Deconnecté + Sign out
    @@ -110,74 +111,69 @@
    • - + + +
    + Saved reports + + + +
    +

    Utilisateurs

    +
    +
    + + +
    + +
    -

    Utilisateur

    -
    - ID - +

    Liste d'utilisateur

    +
    + + + + + + + + + + + + + + + + + + + + +
    IDPseudoMailRôleStatut
    +
    - -
    - Pseudo - -
    - -
    - Nom - -
    - -
    - Prenom - -
    - -
    - Email - -
    - - -
    - - -
    - - -
    - Date de naissance - -
    - -
    - - -
    - - - - - -
    diff --git a/web/js/home.js b/web/js/home.js deleted file mode 100644 index 43be496..0000000 --- a/web/js/home.js +++ /dev/null @@ -1,65 +0,0 @@ -checkToken(); -signOut(); - -var nbPages = 20; - -instance.get("users/count", { withCredentials: true }).then(function(response){ - - var count = response.data / nbPages; - var reste = response.data % nbPages; - var total = 0; - if(reste != 0){ - total = Number.parseInt(count) + 1; - } - - if(total > 1){ - - document.getElementById("page").classList.remove("hidden"); - - } - -}); - -instance.get("users", {withCredentials: true, params :{ page:0, nbPages: nbPages}}).then(function(response){ - var trTag = document.querySelector("#users tbody tr").cloneNode(true); - listData = response.data; - for (var i=0; i 0) || (pseudo.value.length > 0)){ instance.get("token", { auth : {username: pseudo.value, password: password.value}, withCredentials: true}) - .then(function(response) { location.href="html/home.html"; }) + .then(function(response) { location.href="html/users.html"; }) .catch(function(error){ switch (error.response.status){ diff --git a/web/js/user.js b/web/js/user.js new file mode 100644 index 0000000..78daf72 --- /dev/null +++ b/web/js/user.js @@ -0,0 +1,29 @@ +checkToken(); +signOut(); +var id = getQuery("id"); + +if(id.length > 0){ + instance.get("users/"+id, {withCredentials: true}) + .then(function(response){ + var listValue = [ "id", "pseudo", "name", "firstName", "email", "birth"]; + for (var i=0; i 0){ - instance.get("users/"+id, {withCredentials: true}) - .then(function(response){ - var listValue = [ "id", "pseudo", "name", "firstName", "email", "birth"]; - for (var i=0; i 1){ + + document.getElementById("page").classList.remove("hidden"); + + } + +}); + +instance.get("users", {withCredentials: true, params :{ page:0, nbPages: nbPages}}).then(function(response){ + var trTag = document.querySelector("#users tbody tr").cloneNode(true); + listData = response.data; + for (var i=0; i Date: Sat, 6 Aug 2022 21:49:47 +0200 Subject: [PATCH 20/46] rename user.html --- web/js/users.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/js/users.js b/web/js/users.js index 43be496..fbe384c 100644 --- a/web/js/users.js +++ b/web/js/users.js @@ -55,7 +55,7 @@ instance.get("users", {withCredentials: true, params :{ page:0, nbPages: nbPages trAll[i].addEventListener("click", function(e){ var id = e.currentTarget.querySelector("td").textContent; - location.href="/html/users.html?id="+id; + location.href="/html/user.html?id="+id; }); } From 39010a92f33e3bfe2714e2787b416c0df339622e Mon Sep 17 00:00:00 2001 From: Valentin CZERYBA Date: Sat, 6 Aug 2022 22:48:00 +0200 Subject: [PATCH 21/46] add modal --- web/html/user.html | 103 +++++++++++++++++++++++++++++++++++++++++--- web/html/users.html | 15 +------ web/js/login.js | 1 - web/js/user.js | 24 +++++++++++ 4 files changed, 121 insertions(+), 22 deletions(-) diff --git a/web/html/user.html b/web/html/user.html index e7176f0..5ae105b 100644 --- a/web/html/user.html +++ b/web/html/user.html @@ -87,7 +87,7 @@
    - <- Retour à la liste + <- Retour à la liste @@ -104,7 +104,7 @@
    • - + Utilisateurs @@ -118,10 +118,9 @@
      -

      Utilisateurs

      +

      Utilisateur

      -

      Utilisateur

      ID @@ -172,11 +171,101 @@
      + + + + + - - - + + + + + + + +
    diff --git a/web/html/users.html b/web/html/users.html index 7418523..6ab290b 100644 --- a/web/html/users.html +++ b/web/html/users.html @@ -115,20 +115,7 @@ -
    - Saved reports - - - -
    - + diff --git a/web/js/login.js b/web/js/login.js index 51bd52d..4a1cb2c 100644 --- a/web/js/login.js +++ b/web/js/login.js @@ -2,7 +2,6 @@ checkToken(); document.getElementById("signin").addEventListener("submit", function(evt){ evt.preventDefault(); - console.log("toto"); var pseudo = document.getElementById("floatingPseudo"); var password = document.getElementById("floatingPassword"); if((password.value.length > 0) || (pseudo.value.length > 0)){ diff --git a/web/js/user.js b/web/js/user.js index 78daf72..f49dadb 100644 --- a/web/js/user.js +++ b/web/js/user.js @@ -20,6 +20,30 @@ if(id.length > 0){ } } } + + var buttonUser = ""; + switch(response.data.status){ + case 1: + buttonUser = "disableUser"; + break; + case 2: + buttonUser = "enableUser"; + break; + case -1: + buttonUser = "cancelUser"; + document.getElementById("removeUser").classList.add("hidden"); + break; + case 0: + buttonUser = "enableUser"; + break; + default: + break; + + } + if(buttonUser.length > 0){ + console.log(disableUser); + document.getElementById(buttonUser).classList.remove("hidden"); + } }) .catch(function(error){ From d58f386aae833c06ba211d118eb5da2cd6237e01 Mon Sep 17 00:00:00 2001 From: Valentin CZERYBA Date: Sun, 7 Aug 2022 00:14:14 +0200 Subject: [PATCH 22/46] add function disable, cancel removing and remove user --- web/js/user.js | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/web/js/user.js b/web/js/user.js index f49dadb..80cbc7e 100644 --- a/web/js/user.js +++ b/web/js/user.js @@ -41,13 +41,55 @@ if(id.length > 0){ } if(buttonUser.length > 0){ - console.log(disableUser); document.getElementById(buttonUser).classList.remove("hidden"); } + + var listModalButton = ["disable", "enable", "cancel", "remove"]; + + for (var i=0; i Date: Sun, 7 Aug 2022 00:30:55 +0200 Subject: [PATCH 23/46] fix style display --- web/css/style.css | 2 +- web/html/user.html | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/web/css/style.css b/web/css/style.css index 6d8650a..67ad106 100644 --- a/web/css/style.css +++ b/web/css/style.css @@ -1,3 +1,3 @@ .hidden { - visibility: hidden; + display: none; } \ No newline at end of file diff --git a/web/html/user.html b/web/html/user.html index 5ae105b..219f15a 100644 --- a/web/html/user.html +++ b/web/html/user.html @@ -171,12 +171,13 @@ - - - - - - +
    + + + + + +
    +
    + Dernière connexion + +
    + +
    + Date de création + +
    + +
    + Date de mise à jour + +
    + +
    + Date de suppression + +
    +
    + +
    + +
    + Mot de passe +
    diff --git a/web/js/library.js b/web/js/library.js index 739aff5..d46f51f 100644 --- a/web/js/library.js +++ b/web/js/library.js @@ -27,6 +27,19 @@ function signOut(){ }); } +function closeButton(){ + var btnclose = document.getElementsByClassName("btn-close"); + for (var i = 0; i 0){ @@ -98,7 +99,58 @@ if(id.length > 0){ }); - + + document.getElementById("updateUserButton").addEventListener("click", function(){ + var updateProfil = ["id", "pseudo", "email", "firstName", "birth"]; + var updateOk = true; + for (var i=0; i Date: Thu, 11 Aug 2022 21:33:24 +0200 Subject: [PATCH 28/46] complete profil 100% --- web/html/user.html | 2 +- web/js/user.js | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/web/html/user.html b/web/html/user.html index a24d985..cabd929 100644 --- a/web/html/user.html +++ b/web/html/user.html @@ -155,7 +155,7 @@
    Mot de passe - +
    diff --git a/web/js/user.js b/web/js/user.js index caaa162..53929a5 100644 --- a/web/js/user.js +++ b/web/js/user.js @@ -139,12 +139,22 @@ if(id.length > 0){ } instance({ - method : "put", + method : "patch", url:"users/"+id, withCredentials: true, data: dataPut }).then(function(response){ - console.log(response); + switch(response.status){ + case 200: + location.reload(); + break; + case 304: + console.log("non modifie"); + break; + default: + console.log("error inconnue"); + break + } }).catch(function(error){ console.log(error); }); From 4f7502333d46d11617e6c543ae67a64f27cc3dcb Mon Sep 17 00:00:00 2001 From: Valentin CZERYBA Date: Thu, 11 Aug 2022 22:26:25 +0200 Subject: [PATCH 29/46] ajouter bouton ajouter utilisateur pas encore fonctionel --- web/html/adduser.html | 330 ++++++++++++++++++++++++++++++++++++++++++ web/html/users.html | 10 +- 2 files changed, 333 insertions(+), 7 deletions(-) create mode 100644 web/html/adduser.html diff --git a/web/html/adduser.html b/web/html/adduser.html new file mode 100644 index 0000000..cabd929 --- /dev/null +++ b/web/html/adduser.html @@ -0,0 +1,330 @@ + + + + + + + + + Dashboard Template · Bootstrap v5.2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + <- Retour à la liste + +
    +
    + Deconnecté +
    +
    +
    + +
    +
    + + +
    + + + + + + + + + + +
    +

    Utilisateur

    +
    + +
    + ID + +
    + +
    + Pseudo + +
    + +
    + Mot de passe + +
    + +
    + Nom + +
    + +
    + Prenom + +
    + +
    + Email + +
    + + +
    + + +
    + + +
    + Date de naissance + +
    + +
    + Dernière connexion + +
    + +
    + Date de création + +
    + +
    + Date de mise à jour + +
    + +
    + Date de suppression + +
    + +
    + + +
    +
    + + + + + +
    + + + + + + + + + + +
    +
    +
    + + + + + + + + + + \ No newline at end of file diff --git a/web/html/users.html b/web/html/users.html index cdf82a6..c7b262c 100644 --- a/web/html/users.html +++ b/web/html/users.html @@ -94,7 +94,7 @@
    - Sign out + Deconnecté
    @@ -124,13 +124,8 @@

    Utilisateurs

    - - +
    -
    @@ -164,6 +159,7 @@
  • Suivant
    • + From ecbc87a0618df595c1ee1ed62da497a2106a222f Mon Sep 17 00:00:00 2001 From: Valentin CZERYBA Date: Fri, 12 Aug 2022 21:40:29 +0200 Subject: [PATCH 30/46] ajout utilisateur en cours --- web/html/adduser.html | 165 ++---------------------------------------- web/html/user.html | 2 +- web/js/addUser.js | 2 + web/js/users.js | 5 ++ 4 files changed, 16 insertions(+), 158 deletions(-) create mode 100644 web/js/addUser.js diff --git a/web/html/adduser.html b/web/html/adduser.html index cabd929..6f1ef55 100644 --- a/web/html/adduser.html +++ b/web/html/adduser.html @@ -119,38 +119,14 @@
    - - - - - - - - +

    Utilisateur

    -
    - ID - -
    -
    Pseudo - +
    @@ -178,143 +154,18 @@
    - -
    - Date de naissance - -
    - -
    - Dernière connexion - -
    - -
    - Date de création - -
    - -
    - Date de mise à jour - -
    - -
    - Date de suppression - -
    - -
    - - -
    +
    - - - - - -
    - - + - - - - - -
    @@ -326,5 +177,5 @@ - + \ No newline at end of file diff --git a/web/html/user.html b/web/html/user.html index cabd929..6b95184 100644 --- a/web/html/user.html +++ b/web/html/user.html @@ -150,7 +150,7 @@
    Pseudo - +
    diff --git a/web/js/addUser.js b/web/js/addUser.js new file mode 100644 index 0000000..9423a30 --- /dev/null +++ b/web/js/addUser.js @@ -0,0 +1,2 @@ +checkToken(); +signOut(); \ No newline at end of file diff --git a/web/js/users.js b/web/js/users.js index eabcb01..e8d7308 100644 --- a/web/js/users.js +++ b/web/js/users.js @@ -93,4 +93,9 @@ instance.get("users", {withCredentials: true, params :{ page:page, nbPages: nbPa }); +document.getElementById("addUser").addEventListener("click", function(){ + location.href="/html/adduser.html"; +}) + + From c1248b036349212ab7d472d70ece22efc334baaa Mon Sep 17 00:00:00 2001 From: Valentin CZERYBA Date: Fri, 12 Aug 2022 22:17:39 +0200 Subject: [PATCH 31/46] add user fonctionnel --- web/html/adduser.html | 8 ++++- web/js/addUser.js | 75 ++++++++++++++++++++++++++++++++++++++++++- web/js/users.js | 5 ++- 3 files changed, 85 insertions(+), 3 deletions(-) diff --git a/web/html/adduser.html b/web/html/adduser.html index 6f1ef55..6c04320 100644 --- a/web/html/adduser.html +++ b/web/html/adduser.html @@ -148,6 +148,12 @@ Email
    + +
    + Date de naissance + +
    +
    @@ -160,7 +166,7 @@
    - +
    diff --git a/web/js/addUser.js b/web/js/addUser.js index 9423a30..3d6e55e 100644 --- a/web/js/addUser.js +++ b/web/js/addUser.js @@ -1,2 +1,75 @@ checkToken(); -signOut(); \ No newline at end of file +signOut(); + + +document.getElementById("addUser").addEventListener("click", function(){ + var updateProfil = ["pseudo", "email", "firstName", "birth", "password"]; + var updateOk = true; + for (var i=0; i 0){ } instance.get("users", {withCredentials: true, params :{ page:page, nbPages: nbPages}}).then(function(response){ - var trTag = document.querySelector("#users tbody tr").cloneNode(true); listData = response.data; for (var i=0; i Date: Fri, 12 Aug 2022 22:31:04 +0200 Subject: [PATCH 32/46] add error adduser --- web/html/adduser.html | 24 ++++++++++++++++++++++++ web/js/addUser.js | 33 ++++++++++++++++++++------------- 2 files changed, 44 insertions(+), 13 deletions(-) diff --git a/web/html/adduser.html b/web/html/adduser.html index 6c04320..36f63e5 100644 --- a/web/html/adduser.html +++ b/web/html/adduser.html @@ -118,6 +118,30 @@
    + + + + + + + + +
    diff --git a/web/js/addUser.js b/web/js/addUser.js index 3d6e55e..d22d242 100644 --- a/web/js/addUser.js +++ b/web/js/addUser.js @@ -46,28 +46,35 @@ document.getElementById("addUser").addEventListener("click", function(){ withCredentials: true, data: dataPut }).then(function(response){ + var idAlert = ""; switch(response.status){ - case 200: + case 201: location.reload(); break; case 204: - console.log("Aucun contenu"); - break; - case 401: - console.log("non autorisé"); - break; - case 403: - console.log("interdit"); - break; - case 500: - console.log("erreur interne"); + idAlert="notModified" break; default: - console.log("error inconnue"); + idAlert="unknown"; break } + document.getElementById(idAlert+"Alert").classList.remove("hidden"); }).catch(function(error){ - console.log(error); + switch(error.status){ + case 401: + idAlert="notAuthorized"; + break; + case 403: + idAlert="forbidden"; + break; + case 500: + idAlert="internalServer"; + break; + default: + idAlert="unknown"; + break; + } + document.getElementById(idAlert+"Alert").classList.remove("hidden"); }); } From 10180c917fa6b41db46185713cccf4145380bb61 Mon Sep 17 00:00:00 2001 From: Valentin CZERYBA Date: Sun, 14 Aug 2022 16:47:24 +0200 Subject: [PATCH 33/46] gestion des erreurs --- web/html/adduser.html | 2 +- web/html/user.html | 31 +++++++++++++++++++++++++++++++ web/html/users.html | 2 ++ web/js/user.js | 26 ++++++++++++++++++++++---- 4 files changed, 56 insertions(+), 5 deletions(-) diff --git a/web/html/adduser.html b/web/html/adduser.html index 36f63e5..4565e32 100644 --- a/web/html/adduser.html +++ b/web/html/adduser.html @@ -123,7 +123,7 @@
    - + +

    Liste d'utilisateur

    diff --git a/web/js/user.js b/web/js/user.js index 53929a5..842268e 100644 --- a/web/js/user.js +++ b/web/js/user.js @@ -144,19 +144,37 @@ if(id.length > 0){ withCredentials: true, data: dataPut }).then(function(response){ + var idAlert = ""; switch(response.status){ case 200: location.reload(); break; case 304: - console.log("non modifie"); + idAlert="noContent"; break; default: - console.log("error inconnue"); - break + idAlert="unknown"; + break; } + document.getElementById(idAlert+"Alert").classList.remove("hidden"); + }).catch(function(error){ - console.log(error); + var idAlert = ""; + switch(error.status){ + case 401: + idAlert="notAuthorized"; + break; + case 403: + idAlert="forbidden"; + break; + case 500: + idAlert="internalServer"; + break; + default: + idAlert="unknown"; + break; + } + document.getElementById(idAlert+"Alert").classList.remove("hidden"); }); } From b9aefc1dcde9d2aadcb90b9e310e8ad6a9131e9a Mon Sep 17 00:00:00 2001 From: Valentin CZERYBA Date: Sun, 14 Aug 2022 19:32:40 +0200 Subject: [PATCH 34/46] 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 @@ + + + + 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 @@
    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 Date: Sun, 14 Aug 2022 19:36:23 +0200 Subject: [PATCH 35/46] add user success --- web/html/adduser.html | 5 +++++ web/js/addUser.js | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/web/html/adduser.html b/web/html/adduser.html index d38de6a..99f2af0 100644 --- a/web/html/adduser.html +++ b/web/html/adduser.html @@ -123,6 +123,11 @@
    + + diff --git a/web/js/addUser.js b/web/js/addUser.js index dd84e31..766d6d7 100644 --- a/web/js/addUser.js +++ b/web/js/addUser.js @@ -51,6 +51,10 @@ document.getElementById("addUser").addEventListener("click", function(){ switch(response.status){ case 201: idAlert="createUser" + var user = document.getElementById("pseudoUpdateInput").value; + if(user.length > 0){ + document.getElementById("displayUser").textContent=user; + } break; case 204: idAlert="notModified" From cc3663f1a5b382556620f701779b8a3f96bee209 Mon Sep 17 00:00:00 2001 From: Valentin CZERYBA Date: Mon, 15 Aug 2022 18:24:15 +0200 Subject: [PATCH 37/46] search functionnality --- web/html/users.html | 2 +- web/js/users.js | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/web/html/users.html b/web/html/users.html index bfcc04c..62520df 100644 --- a/web/html/users.html +++ b/web/html/users.html @@ -91,7 +91,7 @@ - +
    Deconnecté diff --git a/web/js/users.js b/web/js/users.js index 6394e65..7122dc0 100644 --- a/web/js/users.js +++ b/web/js/users.js @@ -98,6 +98,15 @@ instance.get("users", {withCredentials: true, params :{ page:page, nbPages: nbPa document.getElementById("addUser").addEventListener("click", function(){ location.href="/html/adduser.html"; +}); + +document.getElementById("searchUser").addEventListener("keydown", function(ev){ + if(ev.key === "Enter"){ + var search = document.getElementById("searchUser").value; + if(/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/.test(search)){ + alert(search); + } + } }) From 658b5474a2206431c3d256b7bac9cbb5d4d811aa Mon Sep 17 00:00:00 2001 From: Valentin CZERYBA Date: Mon, 15 Aug 2022 23:41:10 +0200 Subject: [PATCH 38/46] add select menu --- web/html/users.html | 23 +++++++++++++++++++++++ web/js/users.js | 6 +++++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/web/html/users.html b/web/html/users.html index 62520df..20d5177 100644 --- a/web/html/users.html +++ b/web/html/users.html @@ -101,6 +101,8 @@
    + +
    diff --git a/web/js/users.js b/web/js/users.js index 7122dc0..04cab7d 100644 --- a/web/js/users.js +++ b/web/js/users.js @@ -104,7 +104,11 @@ document.getElementById("searchUser").addEventListener("keydown", function(ev){ if(ev.key === "Enter"){ var search = document.getElementById("searchUser").value; if(/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/.test(search)){ - alert(search); + alert("mail"); + } else if(/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/.test(search)){ + alert("uuid"); + } else { + alert("other"); } } }) From 81d3e97c1fb937ee589109fd32adc52193f8a2d6 Mon Sep 17 00:00:00 2001 From: Valentin CZERYBA Date: Tue, 16 Aug 2022 19:21:13 +0200 Subject: [PATCH 39/46] change event --- web/js/users.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/web/js/users.js b/web/js/users.js index 04cab7d..90ad018 100644 --- a/web/js/users.js +++ b/web/js/users.js @@ -111,7 +111,16 @@ document.getElementById("searchUser").addEventListener("keydown", function(ev){ alert("other"); } } +}); + +document.getElementById("inputStatus").addEventListener("change", function(e){ + alert(e.target.value); +}); + +document.getElementById("inputRoles").addEventListener("change", function(e){ + alert(e.target.value); }) + From 9fb1413f1409c1e4d419e5e832a8f2ef802c0701 Mon Sep 17 00:00:00 2001 From: Valentin CZERYBA Date: Tue, 23 Aug 2022 00:33:37 +0200 Subject: [PATCH 40/46] add change value --- web/js/users.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/web/js/users.js b/web/js/users.js index 90ad018..b92bd16 100644 --- a/web/js/users.js +++ b/web/js/users.js @@ -114,11 +114,17 @@ document.getElementById("searchUser").addEventListener("keydown", function(ev){ }); document.getElementById("inputStatus").addEventListener("change", function(e){ - alert(e.target.value); + var search = document.getElementById("searchUser").value; + var select = document.getElementById("inputRoles"); + var roles = select.options[select.selectedIndex].value; + alert(e.target.value+" "+roles+" "+search); }); document.getElementById("inputRoles").addEventListener("change", function(e){ - alert(e.target.value); + var search = document.getElementById("searchUser").value; + var select = document.getElementById("inputStatus"); + var status = select.options[select.selectedIndex].value; + alert(e.target.value+" "+status+" "+search); }) From f740138cbc4517e847b585c5e7d1ce48bb2cd1d0 Mon Sep 17 00:00:00 2001 From: Valentin CZERYBA Date: Thu, 25 Aug 2022 01:13:17 +0200 Subject: [PATCH 41/46] search --- web/js/users.js | 43 ++++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/web/js/users.js b/web/js/users.js index b92bd16..53d295e 100644 --- a/web/js/users.js +++ b/web/js/users.js @@ -1,7 +1,8 @@ checkToken(); signOut(); +var param = {} -var nbPages = 20; +param["nbPages"] = 20; instance.get("users/count", { withCredentials: true }).then(function(response){ @@ -42,22 +43,26 @@ instance.get("users/count", { withCredentials: true }).then(function(response){ }); - - -var page = 0; +param["page"] = 0; var pageCurrent = getQuery("page"); if (pageCurrent.length > 0){ - page = Number.parseInt(pageCurrent); - page = page - 1; + param["page"] = Number.parseInt(pageCurrent); + param["page"] = param["page"] - 1; } -instance.get("users", {withCredentials: true, params :{ page:page, nbPages: nbPages}}).then(function(response){ +var listQuery = ["search", "uuid", "roles", "status", "email"]; +for (var i=0; i 0){ + param[listQuery[i]]=query; + } +} + +instance.get("users", {withCredentials: true, params :param}).then(function(response){ listData = response.data; for (var i=0; i 0){ + location.href="/html/users.html?search="+search+"&status="+e.target.value+"&roles="+roles; + } else { + location.href="/html/users.html?status="+e.target.value+"&roles="+roles; + } }); document.getElementById("inputRoles").addEventListener("change", function(e){ var search = document.getElementById("searchUser").value; var select = document.getElementById("inputStatus"); var status = select.options[select.selectedIndex].value; - alert(e.target.value+" "+status+" "+search); -}) + if(search.length > 0){ + location.href="/html/users.html?search="+search+"&roles="+e.target.value+"&status="+status; + } else { + location.href="/html/users.html?roles="+e.target.value+"&status="+status; + } +}); From 840594725489c6f8d201686d528e84b296bcb152 Mon Sep 17 00:00:00 2001 From: Valentin CZERYBA Date: Thu, 25 Aug 2022 01:41:06 +0200 Subject: [PATCH 42/46] add select --- web/js/users.js | 57 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 46 insertions(+), 11 deletions(-) diff --git a/web/js/users.js b/web/js/users.js index 53d295e..a943c7a 100644 --- a/web/js/users.js +++ b/web/js/users.js @@ -6,8 +6,8 @@ param["nbPages"] = 20; instance.get("users/count", { withCredentials: true }).then(function(response){ - var count = response.data / nbPages; - var reste = response.data % nbPages; + var count = response.data / param["nbPages"]; + var reste = response.data % param["nbPages"]; var total = 0; if(reste != 0){ total = Number.parseInt(count) + 1; @@ -92,7 +92,7 @@ instance.get("users", {withCredentials: true, params :param}).then(function(resp td[4].querySelector(".activeStatus").classList.add("hidden"); td[4].querySelector(classTd).classList.remove("hidden"); - trAll[i].addEventListener("click", function(e){ + trAll[i].addEventListener("click", function(e){ var id = e.currentTarget.querySelector("td").textContent; location.href="/html/user.html?id="+id; }); @@ -122,22 +122,57 @@ document.getElementById("inputStatus").addEventListener("change", function(e){ var search = document.getElementById("searchUser").value; var select = document.getElementById("inputRoles"); var roles = select.options[select.selectedIndex].value; - if(search.length > 0){ - location.href="/html/users.html?search="+search+"&status="+e.target.value+"&roles="+roles; - } else { - location.href="/html/users.html?status="+e.target.value+"&roles="+roles; + var param = ""; + var page = getQuery("page"); + if(page.length > 0){ + param = param + "page="+page+"&"; } + var nbPages = getQuery("nbPages"); + if(nbPages.length > 0 ){ + param = param+ "nbPages="+nbPages+"&"; + } + if(search.length > 0){ + param = param + "search="+search+"&"; + } + var status = e.target.value; + if(status != "-2"){ + param = param + "status="+status+"&"; + } + if(roles != "All"){ + param = param + "roles="+roles; + } + + location.href="/html/users.html?"+param; }); document.getElementById("inputRoles").addEventListener("change", function(e){ var search = document.getElementById("searchUser").value; var select = document.getElementById("inputStatus"); var status = select.options[select.selectedIndex].value; - if(search.length > 0){ - location.href="/html/users.html?search="+search+"&roles="+e.target.value+"&status="+status; - } else { - location.href="/html/users.html?roles="+e.target.value+"&status="+status; + var param = ""; + var page = getQuery("page"); + if(page.length > 0){ + param = param + "page="+page+"&"; } + var nbPages = getQuery("nbPages"); + if(nbPages.length > 0 ){ + param = param + "nbPages="+nbPages+"&"; + } + if(search.length > 0){ + param = param + "search="+search+"&"; + } + + if(status != "-2"){ + param = param + "status="+status+"&"; + } + var roles = e.target.value; + if(roles != "All"){ + param = param + "roles="+roles; + } + + console.log(param); + + location.href="/html/users.html?"+param; }); From 4012655671552bb0c3a8533bc86e7945e74b0b67 Mon Sep 17 00:00:00 2001 From: Valentin CZERYBA Date: Thu, 25 Aug 2022 14:57:42 +0200 Subject: [PATCH 43/46] correction change select --- web/js/library.js | 51 +++++++++++++++++++++++++++++ web/js/users.js | 82 +++++++++++++++-------------------------------- 2 files changed, 76 insertions(+), 57 deletions(-) diff --git a/web/js/library.js b/web/js/library.js index ec96ccd..970812f 100644 --- a/web/js/library.js +++ b/web/js/library.js @@ -21,6 +21,57 @@ function checkToken(){ } +function buildParam(e, id){ + var search = document.getElementById("searchUser").value; + var param = ""; + var listParam = ["page", "nbPages"]; + if(id.length > 0){ + var select = document.getElementById(id); + var getId = select.options[select.selectedIndex].value; + if(id == "inputRoles"){ + var status = e.target.value; + if(status != "-2"){ + param = param + "status="+status+"&"; + } + if(getId != "All"){ + param = param + "roles="+getId; + } + } + if(id == "inputStatus"){ + var roles = e.target.value; + if(getId != "-2"){ + param = param + "status="+getId+"&"; + } + if(roles != "All"){ + param = param + "roles="+roles+"&"; + } + } + } else { + listParam.push("roles"); + listParam.push("status"); + } + + if(search.length > 0){ + if(/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/.test(search)){ + param = param + "email="+search+"&"; + } else if(/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/.test(search)){ + param = param + "uuid="+search+"&"; + } else { + param = param + "search="+search+"&"; + } + } else { + listParam.push("email"); listParam.push("uuid"); listParam.push("search"); + } + + for (var i=0; i 0){ + param = param + listParam[i]+"="+query+"&"; + } + } + return param; +} + function signOut(){ document.getElementById("signout").addEventListener("click", function(){ diff --git a/web/js/users.js b/web/js/users.js index a943c7a..0eec69f 100644 --- a/web/js/users.js +++ b/web/js/users.js @@ -4,6 +4,27 @@ var param = {} param["nbPages"] = 20; +var search = getQuery("search"); +if(search.length > 0){ + document.getElementById("searchUser").value=search; +} + +var listQuery = [{"query": "roles", "id":"inputRoles"}, {"query":"status", "id":"inputStatus"}] + +for (var i=0; i 0){ + + var listOption = document.querySelectorAll("#"+listQuery[i]["id"]+" option"); + for(var j=0; j 0){ - param = param + "page="+page+"&"; - } - var nbPages = getQuery("nbPages"); - if(nbPages.length > 0 ){ - param = param+ "nbPages="+nbPages+"&"; - } - if(search.length > 0){ - param = param + "search="+search+"&"; - } - var status = e.target.value; - if(status != "-2"){ - param = param + "status="+status+"&"; - } - if(roles != "All"){ - param = param + "roles="+roles; - } - + var param = buildParam(e, "inputRoles"); location.href="/html/users.html?"+param; }); document.getElementById("inputRoles").addEventListener("change", function(e){ - var search = document.getElementById("searchUser").value; - var select = document.getElementById("inputStatus"); - var status = select.options[select.selectedIndex].value; - var param = ""; - var page = getQuery("page"); - if(page.length > 0){ - param = param + "page="+page+"&"; - } - var nbPages = getQuery("nbPages"); - if(nbPages.length > 0 ){ - param = param + "nbPages="+nbPages+"&"; - } - if(search.length > 0){ - param = param + "search="+search+"&"; - } - - if(status != "-2"){ - param = param + "status="+status+"&"; - } - var roles = e.target.value; - if(roles != "All"){ - param = param + "roles="+roles; - } - - console.log(param); - + var param = buildParam(e, "inputStatus"); location.href="/html/users.html?"+param; }); From 8819e6124f4e53cdbbef06c9cf37bfa492a7912c Mon Sep 17 00:00:00 2001 From: Valentin CZERYBA Date: Thu, 25 Aug 2022 22:08:03 +0200 Subject: [PATCH 44/46] distint array and object --- web/js/users.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/web/js/users.js b/web/js/users.js index 0eec69f..5e2babb 100644 --- a/web/js/users.js +++ b/web/js/users.js @@ -80,7 +80,11 @@ for (var i=0; i Date: Thu, 25 Aug 2022 22:21:02 +0200 Subject: [PATCH 45/46] add updateParam --- web/js/library.js | 18 +++++++++++++++++- web/js/users.js | 6 +++--- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/web/js/library.js b/web/js/library.js index 970812f..83c5d7d 100644 --- a/web/js/library.js +++ b/web/js/library.js @@ -99,7 +99,7 @@ function closeButton(){ function getQuery(param){ var result = ""; - if(location.search.length >0){ + if(location.search.length > 0){ query = location.search.split("?")[1]; var variables = query.split("&") for (var i=0; i 0){ + query = location.search.split("?")[1]; + var variables = query.split("&"); + for (var i=0; i Date: Thu, 25 Aug 2022 22:50:59 +0200 Subject: [PATCH 46/46] add updateParam --- web/js/users.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/web/js/users.js b/web/js/users.js index b858901..7d530a9 100644 --- a/web/js/users.js +++ b/web/js/users.js @@ -4,9 +4,12 @@ var param = {} param["nbPages"] = 20; -var search = getQuery("search"); -if(search.length > 0){ - document.getElementById("searchUser").value=search; +var listSearch = [ "email", "uuid", "search"]; +for(var i=0; i 0){ + document.getElementById("searchUser").value=search; + } } var listQuery = [{"query": "roles", "id":"inputRoles"}, {"query":"status", "id":"inputStatus"}] @@ -50,7 +53,8 @@ instance.get("users/count", { withCredentials: true }).then(function(response){ var newPage = i + 2; var aPage = document.querySelectorAll(".page-item")[newPage].querySelector("a"); aPage.text=newPage; - aPage.href="/html/users.html?page="+newPage; + var newPage = updateParam("page", newpage); + aPage.href="/html/users.html?"+newPage; } document.querySelectorAll(".page-item")[page].classList.add("active"); if(page != 1){ @@ -132,7 +136,7 @@ document.getElementById("addUser").addEventListener("click", function(){ document.getElementById("searchUser").addEventListener("keydown", function(ev){ if(ev.key === "Enter"){ - var param = buildParam(e, ""); + var param = buildParam("", ""); location.href="/html/users.html?"+param; } });