diff --git a/public/assets/css/oof.css b/public/assets/css/oof.css index b3c5839..33c4e2a 100644 --- a/public/assets/css/oof.css +++ b/public/assets/css/oof.css @@ -115,6 +115,14 @@ body { text-align:center; } +#reg_status { + margin: 0 auto; + margin-left: auto; + margin-right: auto; + text-align:center; + padding-bottom: 5px; +} + #bjmenu { margin-bottom: -1px; } diff --git a/public/assets/js/site.js b/public/assets/js/site.js index 56e144d..686d769 100644 --- a/public/assets/js/site.js +++ b/public/assets/js/site.js @@ -1,3 +1,10 @@ +/*! le groupe tazor */ +if(location.hostname.match('groupetazor')){ + document.getElementById("logotxt").innerHTML = "groupe tazor
" + var clicked = false; + $(".star").click(function(){ if(!clicked){clicked=true; document.getElementById("star").src = "assets/img/gt2.png"}else if(clicked){clicked=false; document.getElementById("star").src = "assets/img/gt.png"}}) +} + /*! amazing animations bootstrap ayy */ $(document).ready((function(){$("[data-bss-hover-animate]").mouseenter((function(){var a=$(this);a.addClass("animated "+a.attr("data-bss-hover-animate"))})).mouseleave((function(){var a=$(this);a.removeClass("animated "+a.attr("data-bss-hover-animate"))}))})); @@ -263,42 +270,53 @@ jQuery(function($) { // connexion shizzle - function checkLogin(value){ - let user = document.getElementById("user"); - let pass = document.getElementById("pass"); - let email = document.getElementById("email"); - let reg_user = document.getElementById("reg_user"); - let reg_pass = document.getElementById("reg_pass"); - let conf_pass = document.getElementById("conf_pass"); - let reg_email = document.getElementById("reg_email"); - let checkpass = checkPass(reg_pass,conf_pass); - body ='{"username": "'+ user +'","password": "'+ pass +'","email": "'+ email +'"}'; - reg_body ='{"username": "'+ reg_user +'","password": "'+ checkpass +'","email": "'+ reg_email +'"}'; + function checkLogin(value){ function checkPass(s1,s2){ if (s1==s2){ return s1 } else { - return "error: pass don't match" + return false } } 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 +'"}'; + 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); }); } else { + let reg_user = document.querySelector("#mainbj #reg_user").value; + let reg_pass = document.querySelector("#mainbj #reg_pass").value; + let conf_pass = document.querySelector("#mainbj #reg_conf_pass").value; + let reg_email = document.querySelector("#mainbj #reg_email").value; + let checkpass = checkPass(reg_pass,conf_pass); + reg_body ='{"username": "'+ reg_user +'","password": "'+ checkpass +'","email": "'+ reg_email +'"}'; + var url = "/api/auth/signup"; var params = reg_body; var xhr = new XMLHttpRequest(); xhr.open("POST", url, true); xhr.setRequestHeader("Content-type", "application/json"); - xhr.send(params); - console.log(xhr.responseText) + + if (checkpass != false) + { + xhr.send(params); + console.log(xhr.responseText) + } + else + { + console.log("pass dont match"); + document.querySelector("#mainbj #reg_status").innerHTML = "les mots de passes ne correspondent pas" + } } } @@ -363,7 +381,7 @@ jQuery(function($) { console.log("registerTab"); tab1bj.setAttribute("aria-selected", "false"); tab2bj.setAttribute("aria-selected", "true"); - mainbj.innerHTML = "
" + mainbj.innerHTML = "
" } // other scripts diff --git a/public/index.html b/public/index.html index 2ab52d5..30e92a7 100644 --- a/public/index.html +++ b/public/index.html @@ -168,16 +168,16 @@