Merge pull request #30 from bigcommerce/formfix

Added form validation models and swapped search remote api

src/api/search.js

@@ -1,8 +1,7 @@
-import _ from 'lodash';
-import Remote from './remote';
 import Hooks from '../hooks';
+import Base from './base';
 
-export default class extends Remote
+export default class extends Base
 {
     /**
      * @Constructor
@@ -12,25 +11,24 @@ export default class extends Remote
         super();
 
         // set up class variables
-        this.endpoint = '/search';
+        this.endpoint = '/search.php?search_query=';
     }
 
     /**
      * Get search results
      * @param {String} query
-     * @param {Object} options
+     * @param {Object} params
      * @param {Function} callback
      */
-    search(query, options, callback) {
-        let defaultOptions = {
-            params: {},
-            headers: {}
-        };
+    search(query, params, callback) {
+        let url = this.endpoint + encodeURIComponent(query);
 
-        options = _.assign({}, defaultOptions, options);
-        options.params.search_query = encodeURIComponent(query);
+        if (typeof params === 'function') {
+            callback = params;
+            params = {};
+        }
 
-        Hooks.emit('search-quick-remote', options);
-        this.makeRequest(this.endpoint, 'GET', options, callback);
+        Hooks.emit('search-quick-remote', query);
+        this.makeRequest(url, 'GET', params, false, callback);
     }
 }

src/forms.js

@@ -1,7 +1,11 @@
 import LoginForm from './forms/login';
 import CreateAccountForm from './forms/create_account';
+import EditAccountForm from './forms/edit_account';
+import AddressForm from './forms/address';
 
 export default {
     login: new LoginForm(),
-    create_account: new CreateAccountForm()
+    create_account: new CreateAccountForm(),
+    edit_account: new EditAccountForm(),
+    address: new AddressForm()
 };

src/forms/edit_account.js

@@ -0,0 +1,45 @@
+export default class {
+    /**
+     * @Constructor
+     */
+    constructor() {
+
+    }
+
+    firstName(value) {
+        return value.length;
+    }
+
+    lastName(value) {
+        return value.length;
+    }
+
+    email(value) {
+        let re = /^([\w-]+(?:\.[\w-]+)*)@((?:[\w-]+\.)*\w[\w-]{0,66})\.([a-z]{2,6}(?:\.[a-z]{2})?)$/i;
+
+        return re.test(value);
+    }
+
+    phone(value) {
+        value.length;
+    }
+
+    password(value) {
+        let r1 = /[A-Za-z]/,  // alphabetic
+            r2 = /[0-9]/;  // numeric
+
+        if (!r1.test(value)) {
+            return false;
+        }
+
+        if (!r2.test(value)) {
+            return false;
+        }
+
+        return value.length >= 7;
+    }
+
+    passwordMatch(password1, password2) {
+        return password1 === password2;
+    }
+}