profile html, search api

4 files changed, 171 insertions, 99 deletions

diff --git a/StoneIsland/www/index.html b/StoneIsland/www/index.html
index 13710677..d55f6ef6 100644
--- a/StoneIsland/www/index.html
+++ b/StoneIsland/www/index.html
@@ -86,7 +86,10 @@
     <span class="checkout">CHECKOUT</span>
     <span class="checkout_proceed">PROCEED WITH CHECKOUT</span>
   </div>
-  
+
+
+  <!-- BLOGS ================================================ -->
+
   <div id="story">
     <div class="scroll">
       <h1>STORY</h1>
@@ -139,6 +142,16 @@
     </div>
   </div>
   
+  <div id="faq">
+    <div class="scroll">
+      <h1>FAQ</h1>
+      <div class="content"></div>
+    </div>
+  </div>
+
+
+  <!-- STORE ================================================ -->
+
   <div id="collection">
     <div class="scroll">
       <h1>COLLECTION NAME</h1>
@@ -152,20 +165,6 @@
       </div>
     </div>
   </div>
-  
-  <div id="faq">
-    <div class="scroll">
-      <h1>FAQ</h1>
-      <div class="content"></div>
-    </div>
-  </div>
-
-  <div id="settings">
-    <div class="scroll">
-      <h1>NOTIFICATIONS</h1>
-      <div class="content">TURN ON / OFF NOTIFICATIONS</div>
-    </div>
-  </div>
 
   <div id="search">
     <div class="scroll">
@@ -208,7 +207,8 @@
     </div>
   </div>
 
-  <div id="curtain"></div>
+
+  <!-- ACCOUNT ================================================ -->
 
   <div id="login">
     <h1>LOGIN</h1>
@@ -225,24 +225,64 @@
   <div id="signup">
     <h1>NEW USER</h1>
     <form>
-      <input type="text" name="FirstName" placeholder="FIRST NAME" required>
-      <input type="text" name="LastName" placeholder="LAST NAME" required>
+      <input type="text" name="Name" placeholder="FIRST NAME" required>
+      <input type="text" name="Surname" placeholder="LAST NAME" required>
       <input type="email" name="Email" placeholder="EMAIL ADDRESS" required>
-      <input type="number" name="Zip" placeholder="ZIP" required>
-      <input type="text" name="Country" placeholder="UNITED STATES" required>
+      <select name="Gender">
+        <option value="M">Male</option>
+        <option value="F">Female</option>
+      </select>
       <h2>PASSWORD</h2>
       <input type="password" name="Password" placeholder="PASSWORD (7 CHARACTERS OR MORE)" required>
       <input type="password" name="Password2" placeholder="CONFIRM PASSWORD" required>
+      <input type="checkbox" name="DataProfiling" value="true" required> I agree to share my personal information with Stone Island.
       <span class="msg"></span>
     </form>
   </div>
   
   <div id="profile">
+    <h1>PROFILE</h1>
+    <form>
+      <input type="text" name="Name" placeholder="FIRST NAME" required>
+      <input type="text" name="Surname" placeholder="LAST NAME" required>
+      <input type="email" name="Email" placeholder="EMAIL ADDRESS" required>
+      <select name="Gender">
+        <option value="M">Male</option>
+        <option value="F">Female</option>
+      </select>
+      <h2>CHANGE PASSWORD</h2>
+      <input type="password" name="CurrentPassword" placeholder="CURRENT PASSWORD" required>
+      <input type="password" name="NewPassword" placeholder="NEW PASSWORD (7 CHARACTERS OR MORE)" required>
+      <span class="msg"></span>
+    </form>
   </div>
+  
   <div id="shipping">
+    <h1>SHIPPING</h1>
+    <form>
+      <div class="address"></div>
+      <span class="msg"></span>
+    </form>
   </div>
+  
   <div id="payment">
+    <h1>PAYMENT</h1>
+    <form>
+      <div class="cc"></div>
+      <div class="address"></div>
+      <span class="msg"></span>
+    </form>
+  </div>
+
+  <div id="settings">
+    <div class="scroll">
+      <h1>NOTIFICATIONS</h1>
+      <div class="content">TURN ON / OFF NOTIFICATIONS</div>
+    </div>
   </div>
+  
+  
+  <!-- CART ================================================ -->
 
   <div id="cart">
     <h1>YOUR CART / <span class="itemcount">2 ITEMS</h1>
@@ -312,86 +352,93 @@
     </div>
 
   </div>
-  
+
+
+  <div id="curtain"></div>
+
 </div>
 
+<script type="text/html" id="billing_template">
+  <input type="text" name="CC" placeholder="CREDIT CARD NUMBER" required>
+  <input type="text" name="EXP" placeholder="EXPIRATION DATE" required>
+  <input type="text" name="CVV" placeholder="SECURITY CODE" required>
+</script>
+
 <script type="text/html" id="address_template">
-  <div class="address">
-    <div>
-      <label for="ship-name">Name</label>
-      <input type="text" name="name" id="ship-name">
-    </div>
-    <div>
-      <label for="ship-address1">Address</label>
-      <input type="text" name="address1" id="ship-address1">
-      <input type="text" name="address2" id="ship-address2">
-    </div>
-    <div>
-      <label for="ship-city">City</label>
-      <input type="text" name="city" id="ship-city">
-    </div>
-    <div>
-      <label for="ship-state">State</label>
-      <select id="state" name="state" required>
-        <option value="">Please select</option>
-        <option value="AL">Alabama</option>
-        <option value="AK">Alaska</option>
-        <option value="AZ">Arizona</option>
-        <option value="AR">Arkansas</option>
-        <option value="CA">California</option>
-        <option value="CO">Colorado</option>
-        <option value="CT">Connecticut</option>
-        <option value="DE">Delaware</option>
-        <option value="DC">District Of Columbia</option>
-        <option value="FL">Florida</option>
-        <option value="GA">Georgia</option>
-        <option value="HI">Hawaii</option>
-        <option value="ID">Idaho</option>
-        <option value="IL">Illinois</option>
-        <option value="IN">Indiana</option>
-        <option value="IA">Iowa</option>
-        <option value="KS">Kansas</option>
-        <option value="KY">Kentucky</option>
-        <option value="LA">Louisiana</option>
-        <option value="ME">Maine</option>
-        <option value="MD">Maryland</option>
-        <option value="MA">Massachusetts</option>
-        <option value="MI">Michigan</option>
-        <option value="MN">Minnesota</option>
-        <option value="MS">Mississippi</option>
-        <option value="MO">Missouri</option>
-        <option value="MT">Montana</option>
-        <option value="NE">Nebraska</option>
-        <option value="NV">Nevada</option>
-        <option value="NH">New Hampshire</option>
-        <option value="NJ">New Jersey</option>
-        <option value="NM">New Mexico</option>
-        <option value="NY">New York</option>
-        <option value="NC">North Carolina</option>
-        <option value="ND">North Dakota</option>
-        <option value="OH">Ohio</option>
-        <option value="OK">Oklahoma</option>
-        <option value="OR">Oregon</option>
-        <option value="PA">Pennsylvania</option>
-        <option value="RI">Rhode Island</option>
-        <option value="SC">South Carolina</option>
-        <option value="SD">South Dakota</option>
-        <option value="TN">Tennessee</option>
-        <option value="TX">Texas</option>
-        <option value="UT">Utah</option>
-        <option value="VT">Vermont</option>
-        <option value="VA">Virginia</option>
-        <option value="WA">Washington</option>
-        <option value="WV">West Virginia</option>
-        <option value="WI">Wisconsin</option>
-        <option value="WY">Wyoming</option>
-      </select>
-    </div>
-    <div>
-      <label for="ship-zip">Zip Code</label>
-      <input type="text" name="zip" id="ship-zip">
-    </div>
-  </form>
+  <div>
+    <label for="ship-name">Name</label>
+    <input type="text" name="name" id="ship-name">
+  </div>
+  <div>
+    <label for="ship-address1">Address</label>
+    <input type="text" name="address1" id="ship-address1">
+    <input type="text" name="address2" id="ship-address2">
+  </div>
+  <div>
+    <label for="ship-city">City</label>
+    <input type="text" name="city" id="ship-city">
+  </div>
+  <div>
+    <label for="ship-state">State</label>
+    <select id="state" name="state" required>
+      <option value="">Please select</option>
+      <option value="AL">Alabama</option>
+      <option value="AK">Alaska</option>
+      <option value="AZ">Arizona</option>
+      <option value="AR">Arkansas</option>
+      <option value="CA">California</option>
+      <option value="CO">Colorado</option>
+      <option value="CT">Connecticut</option>
+      <option value="DE">Delaware</option>
+      <option value="DC">District Of Columbia</option>
+      <option value="FL">Florida</option>
+      <option value="GA">Georgia</option>
+      <option value="HI">Hawaii</option>
+      <option value="ID">Idaho</option>
+      <option value="IL">Illinois</option>
+      <option value="IN">Indiana</option>
+      <option value="IA">Iowa</option>
+      <option value="KS">Kansas</option>
+      <option value="KY">Kentucky</option>
+      <option value="LA">Louisiana</option>
+      <option value="ME">Maine</option>
+      <option value="MD">Maryland</option>
+      <option value="MA">Massachusetts</option>
+      <option value="MI">Michigan</option>
+      <option value="MN">Minnesota</option>
+      <option value="MS">Mississippi</option>
+      <option value="MO">Missouri</option>
+      <option value="MT">Montana</option>
+      <option value="NE">Nebraska</option>
+      <option value="NV">Nevada</option>
+      <option value="NH">New Hampshire</option>
+      <option value="NJ">New Jersey</option>
+      <option value="NM">New Mexico</option>
+      <option value="NY">New York</option>
+      <option value="NC">North Carolina</option>
+      <option value="ND">North Dakota</option>
+      <option value="OH">Ohio</option>
+      <option value="OK">Oklahoma</option>
+      <option value="OR">Oregon</option>
+      <option value="PA">Pennsylvania</option>
+      <option value="RI">Rhode Island</option>
+      <option value="SC">South Carolina</option>
+      <option value="SD">South Dakota</option>
+      <option value="TN">Tennessee</option>
+      <option value="TX">Texas</option>
+      <option value="UT">Utah</option>
+      <option value="VT">Vermont</option>
+      <option value="VA">Virginia</option>
+      <option value="WA">Washington</option>
+      <option value="WV">West Virginia</option>
+      <option value="WI">Wisconsin</option>
+      <option value="WY">Wyoming</option>
+    </select>
+  </div>
+  <div>
+    <label for="ship-zip">Zip Code</label>
+    <input type="text" name="zip" id="ship-zip">
+  </div>
 </script>
 
 </body>
diff --git a/StoneIsland/www/js/sdk/product.js b/StoneIsland/www/js/sdk/product.js
index 2cf58452..55f1940a 100644
--- a/StoneIsland/www/js/sdk/product.js
+++ b/StoneIsland/www/js/sdk/product.js
@@ -1,11 +1,13 @@
 sdk.product = (function(){
   var product = {}
+  
+  var default_gallery = 31617
 
   product.collection = function(opt){
     return $.ajax({
       method: "GET",
       url: sdk.path("Search.API/1.2", "search.json"),
-      data: { format: "full", gallery: opt.gallery_id },
+      data: { format: "full", gallery: opt.gallery_id || default_gallery, productsPerPage: 100 },
       success: opt.success,
       error: opt.error,
     })
@@ -21,5 +23,15 @@ sdk.product = (function(){
     })
   }
   
+  product.search = function(opt){
+    return $.ajax({
+      method: "GET",
+      url: sdk.path("Search.API/1.2", "search.json"),
+      data: { format: "full", gallery: opt.gallery_id || default_gallery, textSearch: opt.query, productsPerPage: 100 },
+      success: opt.success,
+      error: opt.error,
+    })
+  }
+  
   return product
 })()
\ No newline at end of file
diff --git a/test/lib/promise.js b/test/lib/promise.js
index a3638de4..c239f306 100644
--- a/test/lib/promise.js
+++ b/test/lib/promise.js
@@ -1,5 +1,6 @@
 module.exports = function(fn, data){
   var my_cb, my_res, error_cb, my_error
+  data = data || {}
   data.success = function(res){
     my_res = res
     if (my_cb) {
diff --git a/test/test/01-product.js b/test/test/01-product.js
index 983532d7..365e1581 100644
--- a/test/test/01-product.js
+++ b/test/test/01-product.js
@@ -10,7 +10,7 @@ describe('product', function(){
 
   describe('#collection()', function(){
     it('returns a collection', function(done){
-      promise(sdk.product.collection, { gallery_id: 31617 }).then(function(data){
+      promise(sdk.product.collection).then(function(data){
         assert(data.Header.StatusCode == 200)
         assert(data.SearchResponseFull.Results.Items.length > 0)
         test_item = data.SearchResponseFull.Results.Items[0]
@@ -31,5 +31,17 @@ describe('product', function(){
     })
   })
 
+  describe('#search()', function(){
+    it('finds products', function(done){
+      promise(sdk.product.search, { query: "jacket" }).then(function(data){
+        assert(data.Header.StatusCode == 200)
+        assert(data.SearchResponseFull.Results.Items.length > 0)
+        done()
+      }).error(function(error){
+        done()
+      })
+    })
+  })
+
 })