diff --git a/dist/Js/auth/login.js b/dist/Js/auth/login.js index 2b2bfad..80747e8 100644 --- a/dist/Js/auth/login.js +++ b/dist/Js/auth/login.js @@ -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(); } } }); diff --git a/ramproducts.html b/ramproducts.html index 19b407f..9e8b95f 100644 --- a/ramproducts.html +++ b/ramproducts.html @@ -67,7 +67,7 @@
-
+

Discover the revolution of ORA

ORA Memory Series, harnessing cutting-edge
diff --git a/services/bulk-orders.html b/services/bulk-orders.html index de3aaa8..3090e28 100644 --- a/services/bulk-orders.html +++ b/services/bulk-orders.html @@ -94,8 +94,6 @@ - - diff --git a/storageproducts.html b/storageproducts.html index bed3e18..6856826 100644 --- a/storageproducts.html +++ b/storageproducts.html @@ -42,7 +42,7 @@ color:#ffff !important; } .card-title{ - font-size: 1.2rem; + font-size: 1.4rem; } @@ -68,7 +68,7 @@

-
+

Discover the revolution of ORA

ORA Memory Series, harnessing cutting-edge
@@ -90,26 +90,19 @@

-
- ORA3 M.2 NVMe 512GB Internal Solid State Drive with NMVe PCIe Gen 3 +
+ ORA3 512GB Solid State Drive with NMVe PCIe Gen 3
-