2 files changed, 18 insertions, 12 deletions
diff --git a/StoneIsland/www/js/lib/account/LoginView.js b/StoneIsland/www/js/lib/account/LoginView.js
index 334c58b2..f1ad3de8 100644
--- a/StoneIsland/www/js/lib/account/LoginView.js
+++ b/StoneIsland/www/js/lib/account/LoginView.js
@@ -2,6 +2,8 @@ var LoginView = SerializableView.extend({
   
   el: "#login",
   
+  action: sdk.account.login,
+  
   events: {
     "click .newuser": "newuser",
     "submit form": "save",
@@ -23,17 +25,9 @@ var LoginView = SerializableView.extend({
     app.router.go("account/signup")
   },
 
-  save: function(e){
-    e && e.preventDefault()
-    
-    var data = this.serialize()
-    
-    sdk.account.login({ data: data }).done(function(data){
-      console.log("LOGIN SUCCESS", data)
-    }).fail(function(data){
-      console.log("LOGIN FAIL", data)
-    })
-
+  validate_presence: {
+    "Email": "Please enter a valid email address.",
+    "Password": "Please enter your password.",
   },
-  
+
 })
diff --git a/StoneIsland/www/js/lib/account/SignupView.js b/StoneIsland/www/js/lib/account/SignupView.js
index d8459f9b..e695e26f 100644
--- a/StoneIsland/www/js/lib/account/SignupView.js
+++ b/StoneIsland/www/js/lib/account/SignupView.js
@@ -18,6 +18,18 @@ var SignupView = SerializableView.extend({
     document.body.className = "signup"
   },
 
+  validate: function(data){
+    var errors = []
+    if (! data.Name) { errors.push("Please enter your first name.") }
+    if (! data.Surname) { errors.push("Please enter your last name.") }
+    if (! data.Email) { errors.push("Please enter a valid email address.") }
+    if (! data.Password) { errors.push("Please enter your password.") }
+    if (! data.Password2) { errors.push("Please enter your password again.") }
+    if (data.Password !== data.Password2) { errors.push("Passwords don't match.") }
+    if (! data.DataProfiling) { errors.push("You must agree to share your data.") }
+    return errors
+  },
+
   save: function(e){
     e && e.preventDefault()
   },