From 0639d24187e372d3a7b13cec9dfc65793ded679a Mon Sep 17 00:00:00 2001
From: matanatyusibova <yusibovamatanat@gmail.com>
Date: Mon, 20 Oct 2025 20:19:22 +0400
Subject: [PATCH 1/2] login validation.js

---
 client/assets/javascript/login.js      |  3 ++-
 client/assets/javascript/validation.js | 30 ++++++++++++++++++++++++++
 client/pages/login.html                |  1 +
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 client/assets/javascript/validation.js

diff --git a/client/assets/javascript/login.js b/client/assets/javascript/login.js
index d154528..b70ef80 100644
--- a/client/assets/javascript/login.js
+++ b/client/assets/javascript/login.js
@@ -16,7 +16,8 @@ function handlerLogin(){
     let emailEl = document.querySelector("#form-email");
     let passwordEl = document.querySelector("#form-password");
 
-    validate(emailEl, passwordEl);
+    // validate(emailEl, passwordEl);
+     if (!validate(emailEl, passwordEl)) return;
 
     fetch(LOGIN_URL, {
         method: "POST",
diff --git a/client/assets/javascript/validation.js b/client/assets/javascript/validation.js
new file mode 100644
index 0000000..97acbe3
--- /dev/null
+++ b/client/assets/javascript/validation.js
@@ -0,0 +1,30 @@
+
+
+function validate(emailEl, passwordEl) {
+  const email = emailEl.value.trim();
+  const password = passwordEl.value.trim();
+
+ 
+  if (!email) {
+    alert("Please enter your email");
+    return false;
+  }
+
+ 
+  const emailPattern = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+  if (!emailPattern.test(email)) {
+    alert("Please enter a valid email address");
+    return false;
+  }
+
+ 
+  if (!password) {
+    alert("Please enter your password");
+    return false;
+  }
+
+ 
+ 
+
+  return true;
+}
diff --git a/client/pages/login.html b/client/pages/login.html
index 6ca7712..a03a707 100644
--- a/client/pages/login.html
+++ b/client/pages/login.html
@@ -41,6 +41,7 @@ <h1 class="login-title">Login</h1>
 
     </div>
 </main>
+<script src="../assets/javascript/validation.js"></script>
 <script src="../assets/javascript/login.js"></script>
 </body>
 </html>
\ No newline at end of file

From 7903984851a5a5115afe50880f687079e7ea58ce Mon Sep 17 00:00:00 2001
From: matanatyusibova <yusibovamatanat@gmail.com>
Date: Mon, 20 Oct 2025 21:20:00 +0400
Subject: [PATCH 2/2] update register.js validation

---
 client/assets/javascript/register.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/client/assets/javascript/register.js b/client/assets/javascript/register.js
index d166c05..bd862f1 100644
--- a/client/assets/javascript/register.js
+++ b/client/assets/javascript/register.js
@@ -19,7 +19,8 @@ function handleRegisterUser(){
     let email = document.querySelector(".form-email");
     let password = document.querySelector(".form-password");
 
-    validate(fullName, email, password);
+    // validate(fullName, email, password);
+    if (!validate(fullName, email, password)) return; 
     const token = localStorage.getItem("token");
 
     fetch(REGISTER_URL, {
@@ -53,8 +54,14 @@ function validate(fullName, email, password) {
         alert("Please enter your email");
         return;
     }
+    const emailPattern = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+    if (!emailPattern.test(email.value)) {
+        alert("Please enter a valid email address");
+        return false;
+    }
     if(password.value.trim() === "") {
         alert("Please enter your password");
         return;
     }
+    return true;
 }
\ No newline at end of file