From bdff32e1889321925b10adf95b1fad9930601d8a Mon Sep 17 00:00:00 2001 From: quoije Date: Mon, 8 May 2023 00:38:44 -0400 Subject: [PATCH] yezzir --- app/controllers/auth.controller.js | 4 ++-- app/middlewares/verifySignUp.js | 6 +++--- public/assets/js/site.js | 24 ++++++++++++++++++------ 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/app/controllers/auth.controller.js b/app/controllers/auth.controller.js index 55f3410..7a5a2eb 100644 --- a/app/controllers/auth.controller.js +++ b/app/controllers/auth.controller.js @@ -37,7 +37,7 @@ exports.signup = (req, res) => { return; } - res.send({ message: "User was registered successfully!" }); + res.send({ message: "l'utilisateur à été créé avec succès" }); }); } ); @@ -55,7 +55,7 @@ exports.signup = (req, res) => { return; } - res.send({ message: "User was registered successfully!" }); + res.send({ message: "l'utilisateur à été créé avec succès" }); }); }); } diff --git a/app/middlewares/verifySignUp.js b/app/middlewares/verifySignUp.js index 69801db..3ffaaf7 100644 --- a/app/middlewares/verifySignUp.js +++ b/app/middlewares/verifySignUp.js @@ -13,7 +13,7 @@ checkDuplicateUsernameOrEmail = (req, res, next) => { } if (user) { - res.status(400).send({ message: "Failed! Username is already in use!" }); + res.status(400).send({ message: "oof! ce nom d'utilisateur est déjà utilisé" }); return; } @@ -27,7 +27,7 @@ checkDuplicateUsernameOrEmail = (req, res, next) => { } if (user) { - res.status(400).send({ message: "Failed! Email is already in use!" }); + res.status(400).send({ message: "oof! cette addresse courriel est déjà utilisé" }); return; } @@ -41,7 +41,7 @@ checkRolesExisted = (req, res, next) => { for (let i = 0; i < req.body.roles.length; i++) { if (!ROLES.includes(req.body.roles[i])) { res.status(400).send({ - message: `Failed! Role ${req.body.roles[i]} does not exist!` + message: `oof! ce role ${req.body.roles[i]} n'existe pas` }); return; } diff --git a/public/assets/js/site.js b/public/assets/js/site.js index 686d769..5ae3b64 100644 --- a/public/assets/js/site.js +++ b/public/assets/js/site.js @@ -285,11 +285,19 @@ jQuery(function($) { if (value) { let user = document.querySelector("#mainbj #user").value;; let pass = document.querySelector("#mainbj #pass").value; - let email = document.querySelector("#mainbj #email").value; - body ='{"username": "'+ user +'","password": "'+ pass +'","email": "'+ email +'"}'; + body ='{"username": "'+ user +'","password": "'+ pass +'"}'; - let req = require('request'); - req.post({ headers: {'content-type' : 'application/json'}, url: "", body: body }, function(error, response, body){console.log(body);console.log(response);console.log(error); }); + var url = "/api/auth/signin"; + var params = body; + var xhr = new XMLHttpRequest(); + xhr.open("POST", url, true); + xhr.setRequestHeader("Content-type", "application/json"); + xhr.send(params); + xhr.onload = () => { + const data = JSON.parse(xhr.responseText) + console.log(data.message) + document.querySelector("#mainbj #reg_status").innerHTML = data.message + } } else { @@ -310,7 +318,11 @@ jQuery(function($) { if (checkpass != false) { xhr.send(params); - console.log(xhr.responseText) + xhr.onload = () => { + const data = JSON.parse(xhr.responseText) + console.log(data.message) + document.querySelector("#mainbj #reg_status").innerHTML = data.message + } } else { @@ -374,7 +386,7 @@ jQuery(function($) { console.log("loginTab"); tab1bj.setAttribute("aria-selected", "true"); tab2bj.setAttribute("aria-selected", "false"); - mainbj.innerHTML = "
" + mainbj.innerHTML = "
" } function registerTab(){