From 590a9772063bd0774c6ad4c099447472294deecd Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Wed, 15 Aug 2018 12:58:05 +0200 Subject: consent modal stuff --- .../xcschemes/xcschememanagement.plist | 2 +- .../ios/Stone Island.xcarchive/Info.plist | 2 +- .../Applications/Stone Island.app/Assets.car | Bin 844136 -> 844136 bytes .../01J-lp-oVM-view-Ze5-6b-2t3.nib | Bin 2284 -> 2287 bytes .../UIViewController-01J-lp-oVM.nib | Bin 832 -> 832 bytes .../Stone Island.app/MainViewController.nib | Bin 943 -> 943 bytes .../Applications/Stone Island.app/Stone Island | Bin 2224192 -> 2224192 bytes .../Stone Island.app/_CodeSignature/CodeResources | 36 +++++++++--------- .../Stone Island.app/www/css/account.css | 15 +++++--- .../Applications/Stone Island.app/www/index.html | 4 +- .../xcschemes/xcschememanagement.plist | 2 +- .../UserInterfaceState.xcuserstate | Bin 26793 -> 26741 bytes StoneIsland/platforms/ios/www/css/account.css | 15 +++++--- StoneIsland/platforms/ios/www/index.html | 41 ++++++++++++++------- StoneIsland/platforms/ios/www/js/lib/_router.js | 15 +++++--- .../ios/www/js/lib/account/ConsentModal.js | 6 +++ 16 files changed, 83 insertions(+), 55 deletions(-) (limited to 'StoneIsland/platforms/ios') diff --git a/StoneIsland/platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist b/StoneIsland/platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist index daa4d171..4bc8d36e 100644 --- a/StoneIsland/platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/StoneIsland/platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist @@ -7,7 +7,7 @@ Cordova.xcscheme orderHint - 4 + 3 CordovaLib.xcscheme diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist b/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist index 9e51e528..3e59c464 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist @@ -18,7 +18,7 @@ ArchiveVersion 2 CreationDate - 2018-07-24T16:40:13Z + 2018-07-24T16:49:46Z Name Stone Island SchemeName diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Assets.car b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Assets.car index 95b307cc..53bcd571 100644 Binary files a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Assets.car and b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Assets.car differ diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib index 4274e954..5c45a642 100644 Binary files a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib and b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib differ diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib index 16b9047c..c30f4d2f 100644 Binary files a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib and b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib differ diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib index c68de5fc..aa2d93d3 100644 Binary files a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib and b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib differ diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Stone Island b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Stone Island index 056dc35a..8580cfe7 100755 Binary files a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Stone Island and b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Stone Island differ diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/_CodeSignature/CodeResources b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/_CodeSignature/CodeResources index adc6b3f1..2de0e8d4 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/_CodeSignature/CodeResources +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/_CodeSignature/CodeResources @@ -94,11 +94,11 @@ Assets.car - xn+CeQP96vJdvmiF9htbfA0/VYg= + wI0hzD71qNa/p1g+4iJVL+CnDPA= CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib - mUi5boBhihhP3U1OmkkYC2nl7tY= + 1HShhs3o+yABq/lv8bjYO0qQUNQ= CDVLaunchScreen.storyboardc/Info.plist @@ -106,7 +106,7 @@ CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib - IkjEhXcBeP+wuCA9zQmYBRTTMyk= + 2xAfbC/qzxc+dfdcVYAH9rmYMvU= CDVNotification.bundle/beep.wav @@ -118,7 +118,7 @@ MainViewController.nib - l+/U3zThNx6WTVr3Ud8r3BrrG30= + vt0gC+83+s5GbfVzkae+JzX2Zrs= PkgInfo @@ -158,7 +158,7 @@ www/css/account.css - JdTOqPyqqDcI711yc+o1kqMa/v8= + QleBinpy/MrHuJ0RNanvPLTucXY= www/css/blogs.css @@ -350,7 +350,7 @@ www/index.html - jZTkF4XZ3Jf1Qwos4pjH1lvh3o4= + TlBHJrobN7ufQtkOVpCa5+yCZQA= www/js/index.js @@ -945,22 +945,22 @@ hash - xn+CeQP96vJdvmiF9htbfA0/VYg= + wI0hzD71qNa/p1g+4iJVL+CnDPA= hash2 - 9C+3+Nqh5rDo83Kp6AS7mq+7WndxP1U47lGTaWt4G+k= + YtRFCxwXv2V6EO416DNdGBudAEHYDJYf7czfaZmsbME= CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib hash - mUi5boBhihhP3U1OmkkYC2nl7tY= + 1HShhs3o+yABq/lv8bjYO0qQUNQ= hash2 - cX2Boy6yFNDt/59BhTdp8Wpo+bnNQiLXRmTSHSSaeWE= + ACU5IgRYDubiy8shczjFlqoVM39k8S9rAVYVY5ySvmY= CDVLaunchScreen.storyboardc/Info.plist @@ -978,11 +978,11 @@ hash - IkjEhXcBeP+wuCA9zQmYBRTTMyk= + 2xAfbC/qzxc+dfdcVYAH9rmYMvU= hash2 - v7izQzsH9IHek60k7Q3h8A8KY8+6H+jiucBUjg/ryL0= + f5dDxPfEMdqhkNN1Nisy/Jnp6HHBBHKfXCfGendFlyQ= CDVNotification.bundle/beep.wav @@ -1000,11 +1000,11 @@ hash - l+/U3zThNx6WTVr3Ud8r3BrrG30= + vt0gC+83+s5GbfVzkae+JzX2Zrs= hash2 - 6gpGqBusucx1+tgxoywzLqm+IRypgL+rBwbMxKynVoc= + 61HZDI4+JByt7uf5gI+4JZO3bvzun8o/yrmvfY2Kf2g= config.xml @@ -1099,11 +1099,11 @@ hash - JdTOqPyqqDcI711yc+o1kqMa/v8= + QleBinpy/MrHuJ0RNanvPLTucXY= hash2 - EeSrSh/i7oUBg3Fef5XDVZ82LRd2OgUGGnUNLxp7GvA= + iG3ony/fJ708Vgul9dITTPufcs7dDxPfJxdQbTDV08w= www/css/blogs.css @@ -1627,11 +1627,11 @@ hash - jZTkF4XZ3Jf1Qwos4pjH1lvh3o4= + TlBHJrobN7ufQtkOVpCa5+yCZQA= hash2 - rw2YtxP1uiuBWBREJ4G2UZ6mAJXAl+pHCmkBGyX6qTU= + BfWtaGRuP0vLdEdbZZhMod9bljV9c1/MTzAZpkcaPvs= www/js/index.js diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/account.css b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/account.css index 973f3d2c..32c7df79 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/account.css +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/account.css @@ -442,12 +442,15 @@ input.switch:checked + label:after { } .privacy-msg { - left: 50%; - display: inline-block; - position: relative; - transform: translateX(-50%); - padding-top: 15px; - padding-bottom: 80px; + left: 50%; + display: inline-block; + position: relative; + transform: translateX(-50%); + padding-top: 15px; + padding-bottom: 80px; +} +.privacy-msg a { + color: black; } .select-wrapper { diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/index.html b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/index.html index 8837b9a3..ddd55c42 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/index.html +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/index.html @@ -454,7 +454,7 @@
- Consult our PRIVACY POLICY for further information. + Consult our PRIVACY POLICY for further information.
@@ -508,7 +508,7 @@
- Consult our PRIVACY POLICY for further information. + Consult our PRIVACY POLICY for further information.
diff --git a/StoneIsland/platforms/ios/Stone Island.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist b/StoneIsland/platforms/ios/Stone Island.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist index d744b66e..371cb20d 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/StoneIsland/platforms/ios/Stone Island.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist @@ -7,7 +7,7 @@ Stone Island.xcscheme orderHint - 3 + 2 diff --git a/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate b/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate index c47abc0b..863ea504 100644 Binary files a/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate and b/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/StoneIsland/platforms/ios/www/css/account.css b/StoneIsland/platforms/ios/www/css/account.css index 973f3d2c..32c7df79 100755 --- a/StoneIsland/platforms/ios/www/css/account.css +++ b/StoneIsland/platforms/ios/www/css/account.css @@ -442,12 +442,15 @@ input.switch:checked + label:after { } .privacy-msg { - left: 50%; - display: inline-block; - position: relative; - transform: translateX(-50%); - padding-top: 15px; - padding-bottom: 80px; + left: 50%; + display: inline-block; + position: relative; + transform: translateX(-50%); + padding-top: 15px; + padding-bottom: 80px; +} +.privacy-msg a { + color: black; } .select-wrapper { diff --git a/StoneIsland/platforms/ios/www/index.html b/StoneIsland/platforms/ios/www/index.html index 8837b9a3..e8816830 100755 --- a/StoneIsland/platforms/ios/www/index.html +++ b/StoneIsland/platforms/ios/www/index.html @@ -67,7 +67,7 @@
- + FAQ
@@ -77,7 +77,7 @@ MAIN MENU
- + LOGOUT MAIN MENU @@ -429,7 +429,7 @@
@@ -438,23 +438,25 @@
- +
- Consult our PRIVACY POLICY for further information. + Personal data will be electronically processed by SPORTSWEAR COMPANY and YOOX NET-A-PORTER GROUP in order to complete your request. Please note that you are responsible for third party data that you disclose to SPORTSWEAR COMPANY and YOOX NET-A-PORTER GROUP. +
+ Consult our PRIVACY POLICY for further information.
@@ -465,7 +467,7 @@
-

PROFILE

+

MY PROFILE

@@ -500,15 +502,26 @@
- + + +
+ +
+
+
+
- Consult our PRIVACY POLICY for further information. + Personal data will be electronically processed by SPORTSWEAR COMPANY and YOOX NET-A-PORTER GROUP in order to complete your request. Please note that you are responsible for third party data that you disclose to SPORTSWEAR COMPANY and YOOX NET-A-PORTER GROUP. +
+ Consult our PRIVACY POLICY for further information.
@@ -521,7 +534,7 @@
-

SHIPPING

+

ADDRESS BOOK

@@ -545,7 +558,7 @@
-

PAYMENT

+

MY CARD

@@ -600,7 +613,7 @@
-

ORDERS

+

MY ORDERS

You have no orders.
diff --git a/StoneIsland/platforms/ios/www/js/lib/_router.js b/StoneIsland/platforms/ios/www/js/lib/_router.js index 723bb944..bd13c126 100755 --- a/StoneIsland/platforms/ios/www/js/lib/_router.js +++ b/StoneIsland/platforms/ios/www/js/lib/_router.js @@ -42,12 +42,12 @@ var SiteRouter = Router.extend({ initialize: function(){ var fn - for (var route in this.routes) { - fn = this.routes[route] - if (! this[fn]) { - this[fn] = this.default_view(fn) - } - } + for (var route in this.routes) { + fn = this.routes[route] + if (! this[fn]) { + this[fn] = this.default_view(fn) + } + } }, initial_route: null, @@ -75,6 +75,9 @@ var SiteRouter = Router.extend({ default_view: function(name){ var fn = function(){ console.log(name) + if (app.demand_consent && app.consent.check()) { + return + } if (app.view != app.login && app.view != app.signin) { app.last_view = app.view } diff --git a/StoneIsland/platforms/ios/www/js/lib/account/ConsentModal.js b/StoneIsland/platforms/ios/www/js/lib/account/ConsentModal.js index c4fe0b53..22f63c53 100644 --- a/StoneIsland/platforms/ios/www/js/lib/account/ConsentModal.js +++ b/StoneIsland/platforms/ios/www/js/lib/account/ConsentModal.js @@ -19,12 +19,16 @@ var ConsentModal = View.extend({ var status = localStorage.getItem('account_terms.consent') if (status !== 'true') { this.show() + return true } else { this.hide() + app.demand_consent = false + return false } }, show: function(){ + app.demand_consent = true this.$el.show() setTimeout(function(){ this.$el.addClass('visible') @@ -63,11 +67,13 @@ var ConsentModal = View.extend({ if (!state) { return } + app.demand_consent = false this.hide() localStorage.setItem('account_terms.consent', 'true') }, logout: function(){ + app.demand_consent = false this.hide() localStorage.setItem('account_terms.consent', 'false') app.router.go("account/logout") -- cgit v1.2.3-70-g09d2