new changes updated
This commit is contained in:
Vendored
+15
-6
@@ -311,15 +311,16 @@ function initLogin() {
|
||||
|
||||
// function to validate user entered email
|
||||
function validateEmail(userEmail) {
|
||||
var pattern =
|
||||
/^([\w-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([\w-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$/;
|
||||
return $.trim(userEmail).match(pattern) ? true : false;
|
||||
var pattern = /^([\w-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([\w-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$/;
|
||||
// return $.trim(userEmail).test(pattern) ? true : false;
|
||||
return pattern.test(userEmail) ? true : false;
|
||||
}
|
||||
|
||||
// function to validate user entered password
|
||||
function validatepassword(userPassword) {
|
||||
var pattern = /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[^a-zA-Z0-9]).{11,}$/;
|
||||
return $.trim(userPassword).match(pattern) ? true : false;
|
||||
// return $.trim(userPassword).test(pattern) ? true : false;
|
||||
return pattern.test(userPassword) ? true : false;
|
||||
}
|
||||
|
||||
registerForm.find("#User_Email,#User_password").keypress(function (e) {
|
||||
@@ -351,15 +352,23 @@ function initLogin() {
|
||||
emailInput.find(".form-floating").removeClass("is-invalid");
|
||||
passwordInput.find("#User_password").removeClass("is-invalid");
|
||||
passwordInput.find(".form-floating").removeClass("is-invalid");
|
||||
if (validateEmail(userEmail) && validatepassword(userPassword)) {
|
||||
let Email_valid = validateEmail(userEmail);
|
||||
let Pwd_valid = validatepassword(userPassword);
|
||||
if (Email_valid === true && Pwd_valid === true) {
|
||||
userRegistration();
|
||||
$("#register_form .otp-input-group .otp-sent-email").text(userEmail);
|
||||
} else {
|
||||
} else if(Email_valid === false) {
|
||||
emailInput.find("#User_Email").addClass("is-invalid");
|
||||
emailInput.find(".form-floating").addClass("is-invalid");
|
||||
emailInput.find(".invalid-feedback").text("Please enter a valid email");
|
||||
registerForm.find(".loader-btn").hide();
|
||||
$(this).show();
|
||||
}else if(Pwd_valid === false){
|
||||
emailInput.find("#User_password").addClass("is-invalid");
|
||||
emailInput.find(".form-floating").addClass("is-invalid");
|
||||
emailInput.find(".invalid-feedback").text("Please check the password!");
|
||||
registerForm.find(".loader-btn").hide();
|
||||
$(this).show();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
Referens i nytt ärende
Block a user