From 903cffbb547a49d9d7d8555c75e390e0639f90fd Mon Sep 17 00:00:00 2001
From: souravirus <souravsahoo66@yahoo.com>
Date: Wed, 14 Feb 2018 12:59:46 +0530
Subject: [PATCH 1/3] Added initial check through jquery

---
 app/assets/javascripts/users.js | 24 ++++++++++++++++++++++++
 app/views/users/reset.html.erb  |  7 ++++---
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/users.js b/app/assets/javascripts/users.js
index 322750ea1c..66996ef6c7 100644
--- a/app/assets/javascripts/users.js
+++ b/app/assets/javascripts/users.js
@@ -89,3 +89,27 @@ var Profile = {
     });
   }
 }
+
+function validateEmail(sEmail) {
+	var filter = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+
+	if (filter.test(sEmail)) {
+		return true;
+	}
+
+	else {
+		return false;
+	}
+}
+
+$(document).ready(function() {
+    $('#validBtn').click(function(event){
+        var email = $('#validEmail').val();
+
+        if(!validateEmail(email)) {
+            $("#validPrint").attr("style", "display:block");
+            $("#validPrint").html("<p>Invalid email address</p>");
+            event.preventDefault();
+        }
+    });
+});
diff --git a/app/views/users/reset.html.erb b/app/views/users/reset.html.erb
index 9d06ebd280..1342b08780 100644
--- a/app/views/users/reset.html.erb
+++ b/app/views/users/reset.html.erb
@@ -20,14 +20,15 @@
 </form>
 
 <% else %>
-
 <p><%= t('users.reset.enter_email_reset_password') %>:</p>
 
 <form action="/reset/" class='form'>
 
-  <input class="form-control" name="email" placeholder="you@example.com" tabindex='2' type="text" /> <br />
+  <div class="alert alert-danger" id="validPrint" style="display:none"> </div>
+
+  <input class="form-control" name="email" id='validEmail' placeholder="you@example.com" tabindex='2' type="text" /> <br />
 
-  <button class="btn btn-lg btn-primary" type="submit" tabindex="3"><%= t('users.reset.reset') %></button>
+  <button class="btn btn-lg btn-primary" id="validBtn" type="submit" tabindex="3"><%= t('users.reset.reset') %></button>
 
 </form>
 

From 15a077cfb34be59df2eb687a95691afaf495573b Mon Sep 17 00:00:00 2001
From: souravirus <souravsahoo66@yahoo.com>
Date: Wed, 14 Feb 2018 15:07:36 +0530
Subject: [PATCH 2/3] Made the code more object oriented

---
 app/assets/javascripts/users.js | 29 ++++++++++++++---------------
 app/views/users/reset.html.erb  |  7 +++++++
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/app/assets/javascripts/users.js b/app/assets/javascripts/users.js
index 66996ef6c7..f832a8057d 100644
--- a/app/assets/javascripts/users.js
+++ b/app/assets/javascripts/users.js
@@ -90,26 +90,25 @@ var Profile = {
   }
 }
 
-function validateEmail(sEmail) {
-	var filter = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+var Reset = {
+    validateEmail: function(sEmail){
+        var filter = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
 
-	if (filter.test(sEmail)) {
-		return true;
-	}
-
-	else {
-		return false;
-	}
-}
+        if (filter.test(sEmail)) {
+            return true;
+        }
 
-$(document).ready(function() {
-    $('#validBtn').click(function(event){
+        else {
+            return false;
+        }
+    },
+    runValidation: function(event){ 
         var email = $('#validEmail').val();
 
-        if(!validateEmail(email)) {
+        if(!this.validateEmail(email)) {
             $("#validPrint").attr("style", "display:block");
             $("#validPrint").html("<p>Invalid email address</p>");
             event.preventDefault();
         }
-    });
-});
+    }
+}
diff --git a/app/views/users/reset.html.erb b/app/views/users/reset.html.erb
index 1342b08780..4410158abe 100644
--- a/app/views/users/reset.html.erb
+++ b/app/views/users/reset.html.erb
@@ -35,3 +35,10 @@
 <% end %>
 
 </div>
+
+<script type="text/javascript">
+    $("#validBtn").click(function(event) {
+        var reset = Object.create(Reset);
+        reset.runValidation(event);
+    });
+</script>

From bd25765ee515497832e87e23af6c3a2dfd21f072 Mon Sep 17 00:00:00 2001
From: souravirus <souravsahoo66@yahoo.com>
Date: Sun, 18 Feb 2018 02:00:21 +0530
Subject: [PATCH 3/3] Modified the code according to ES6 rules

---
 app/assets/javascripts/users.js | 20 +++++++-------------
 app/views/users/reset.html.erb  |  2 +-
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/app/assets/javascripts/users.js b/app/assets/javascripts/users.js
index f832a8057d..235f658825 100644
--- a/app/assets/javascripts/users.js
+++ b/app/assets/javascripts/users.js
@@ -90,20 +90,14 @@ var Profile = {
   }
 }
 
-var Reset = {
-    validateEmail: function(sEmail){
-        var filter = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
-
-        if (filter.test(sEmail)) {
-            return true;
-        }
+class Reset {
+    validateEmail(sEmail){
+        const filter = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+        return filter.test(sEmail); 
+    }
 
-        else {
-            return false;
-        }
-    },
-    runValidation: function(event){ 
-        var email = $('#validEmail').val();
+    runValidation(event){ 
+        const email = $('#validEmail').val();
 
         if(!this.validateEmail(email)) {
             $("#validPrint").attr("style", "display:block");
diff --git a/app/views/users/reset.html.erb b/app/views/users/reset.html.erb
index 4410158abe..49bc01cb99 100644
--- a/app/views/users/reset.html.erb
+++ b/app/views/users/reset.html.erb
@@ -38,7 +38,7 @@
 
 <script type="text/javascript">
     $("#validBtn").click(function(event) {
-        var reset = Object.create(Reset);
+        const reset = new Reset;
         reset.runValidation(event);
     });
 </script>