profile shit and faq links

8 files changed, 75 insertions, 18 deletions

diff --git a/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate b/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate
index ecd31cc2..286788f6 100755
--- a/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/StoneIsland/www/index.html b/StoneIsland/www/index.html
index 73eed267..75a546d1 100755
--- a/StoneIsland/www/index.html
+++ b/StoneIsland/www/index.html
@@ -420,9 +420,34 @@
                 Receive Stone Island Newsletter
               </div>
               <div class="toggle">
-                <input type="checkbox" id="receive-newsletter" name="YooxLetter" class="switch" value="true">
-                <label for="receive-newsletter"></label>
-              </div>     
+                <input type="checkbox" id="receive-newsletter-profile" name="YooxLetter" class="switch" value="true">
+                <label for="receive-newsletter-profile"></label>
+              </div>
+            </div>
+            <div class="container-row">
+              <div class="checkbox-container">
+                <div class="checkbox-row">
+                  <div class="checkbox-toggle">
+                     <input id="checkbox-data-profiling-profile" type="checkbox" name="DataProfiling" value="true" required>
+                     <label for="checkbox-data-profiling-profile"></label>
+                  </div>
+                  <label class="checkbox-caption" for="checkbox-data-profiling-profile">
+                    I agree that YOOX and SPORTSWEAR COMPANY may collect my personal information for marketing purposes (newsletters, news and promotions).
+                  </label>
+                </div>
+                <div class="checkbox-row">
+                  <div class="checkbox-toggle">
+                     <input type="checkbox" id="checkbox-shopping-data-profiling-profile" name="DataProfiling2" value="true" required>
+                     <label for="checkbox-shopping-data-profiling-profile"></label>
+                  </div>
+                  <label class="checkbox-caption" for="checkbox-shopping-data-profiling-profile">
+                    I agree that YOOX NET-A-PORTER GROUP and SPORTSWEAR COMPANY may collect my personal information for creating a profile of my shopping habits.
+                  </label>
+                </div>
+                <div class="privacy-msg">
+                  Consult our <u>PRIVACY POLICY</u> for further information.
+                </div>
+              </div>
             </div>
           </div>
           <div class="container-fill">
diff --git a/StoneIsland/www/js/index.js b/StoneIsland/www/js/index.js
index 050a729c..73af443a 100755
--- a/StoneIsland/www/js/index.js
+++ b/StoneIsland/www/js/index.js
@@ -3,7 +3,7 @@ var app = (function(){
   
   app.init = function(){  
 
-    sdk.init({ env: "production" })
+    sdk.init({ env: "test" })
 
     app.bind()
     app.build()
diff --git a/StoneIsland/www/js/lib/account/AccountView.js b/StoneIsland/www/js/lib/account/AccountView.js
index 1c5c9f16..7d3b719a 100755
--- a/StoneIsland/www/js/lib/account/AccountView.js
+++ b/StoneIsland/www/js/lib/account/AccountView.js
@@ -99,12 +99,18 @@ var AccountView = View.extend({
     if ( ! auth.has_cart() ) {
       app.curtain.show("loading")
       auth.create_cart(function(){
-        auth.add_deferred_product_to_cart(function(){
-          app.router.go("cart")
-          setTimeout(function(){
-            app.curtain.hide("loading")
-          }, 500)
-        })
+        if (auth.deferred_product) {
+          auth.add_deferred_product_to_cart(function(){
+            app.router.go("cart")
+            setTimeout(function(){
+              app.curtain.hide("loading")
+            }, 500)
+          })
+        }
+        else {
+          app.router.go("account/profile")
+          app.curtain.hide("loading")
+        }
       })
     }
     else {
diff --git a/StoneIsland/www/js/lib/account/ProfileView.js b/StoneIsland/www/js/lib/account/ProfileView.js
index f370c055..2b608cb4 100755
--- a/StoneIsland/www/js/lib/account/ProfileView.js
+++ b/StoneIsland/www/js/lib/account/ProfileView.js
@@ -17,6 +17,20 @@ var ProfileView = FormView.extend({
     if (! auth.logged_in()) { return app.router.go("intro") }
     app.footer.show("SAVE")
     document.body.className = "profile"
+    auth.user.DataProfiling2 = auth.user.DataProfiling
+    if (auth.user.BirthDay.match(/T/)) {
+      auth.user.BirthDay = auth.user.BirthDay.split("T")[0]
+    }
+    if (auth.user.name && ! auth.user.Name) {
+      auth.user.Name = auth.user.name
+    }
+    if (auth.user.surname && ! auth.user.Surname) {
+      auth.user.Surname = auth.user.surname
+    }
+    if (auth.user.email && ! auth.user.Email) {
+      auth.user.Email = auth.user.email
+    }
+    console.log(auth.user)
     this.preload(auth.user)
     this.deferScrollToTop()
   },
@@ -63,8 +77,11 @@ var ProfileView = FormView.extend({
 //     submissible_data.FuriganaSurname = ""
 //     submissible_data.UserPromocode = ""
     submissible_data.BirthDay += "T00:00:00Z"
-    submissible_data.YooxLetter = data.YooxLetter || "false"
-    submissible_data.DataProfiling = "true"
+    submissible_data.YooxLetter = this.$("[name=YooxLetter]").prop("checked")
+    submissible_data.DataProfiling = this.$("[name=DataProfiling]").prop("checked")
+
+    console.log(data.DataProfiling, submissible_data.DataProfiling)
+    console.log(submissible_data)
     
     return submissible_data
   },
diff --git a/StoneIsland/www/js/lib/auth/LoginView.js b/StoneIsland/www/js/lib/auth/LoginView.js
index 8a002632..4ef2823f 100755
--- a/StoneIsland/www/js/lib/auth/LoginView.js
+++ b/StoneIsland/www/js/lib/auth/LoginView.js
@@ -37,8 +37,10 @@ var LoginView = FormView.extend({
   },
   
   success: function(data){
-    // console.log(data)
-    app.account.logged_in(function(){ app.router.go("store") })
+    console.log(data)
+    app.account.logged_in(function(){
+      app.router.go("store")
+    })
   },
   
   error: function(data){
diff --git a/StoneIsland/www/js/lib/blogs/ArchiveView.js b/StoneIsland/www/js/lib/blogs/ArchiveView.js
index a1863b67..5a036930 100755
--- a/StoneIsland/www/js/lib/blogs/ArchiveView.js
+++ b/StoneIsland/www/js/lib/blogs/ArchiveView.js
@@ -63,9 +63,8 @@ var ArchiveView = ScrollableView.extend({
     }.bind(this))
     
     this.back()
-    this.deferScrollToTop()
-
     this.populateDecade(0, 3)
+    this.deferScrollToTop()
   },
   
   populateDecade: function(index, count){
@@ -107,6 +106,8 @@ var ArchiveView = ScrollableView.extend({
         $t.removeClass('loading')
       }.bind(this))
     }.bind(this))
+    
+    this.deferRefresh()
   },
 
 //  ['transformProp'] = "translateZ(0) translateX(-50%) translateY(-50%) ";
@@ -175,13 +176,11 @@ var ArchiveView = ScrollableView.extend({
       gray = Math.round( (1-q) * 100 )
       opacity = lerp(q, 0.2, 1)
       text_opacity = lerp(q, 1, 0.3)
-//       console.log("<", gray, opacity)
     }
     else {
       gray = Math.round( q * 100 )
       opacity = lerp(q, 1, 0.2)
       text_opacity = lerp(q, 0.3, 1)
-//       console.log(">", gray, opacity)
     }
     aa.image.style.WebkitFilter = "grayscale(" + gray + "%)"
     aa.image.style.opacity = opacity
diff --git a/StoneIsland/www/js/lib/blogs/PageView.js b/StoneIsland/www/js/lib/blogs/PageView.js
index 4bf05430..fab3ff53 100755
--- a/StoneIsland/www/js/lib/blogs/PageView.js
+++ b/StoneIsland/www/js/lib/blogs/PageView.js
@@ -19,6 +19,14 @@ var PageView = ScrollableView.extend({
   
   populate: function(data){
     this.$content.html(data.body.replace(/\n/g, "<br>"))
+    this.$content.find("a").each(function(){
+      var href = $(this).attr("href") // .substr(1, "fuck".length-2)
+      if (href.indexOf("“")) {
+        href = href.substr(1, href.length-2)
+        $(this).attr("href", href)
+      }
+      $(this).attr("target", "_system")
+    })
   },
 
 })
\ No newline at end of file