From 21b41e6c7cbde9d60e8e99dfce8331c218068052 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Wed, 3 Oct 2018 05:29:35 +0200 Subject: buildl --- StoneIsland/config.xml | 2 +- .../.gradle/3.3/taskArtifacts/fileHashes.bin | Bin 406323 -> 406323 bytes .../.gradle/3.3/taskArtifacts/fileSnapshots.bin | Bin 2074841 -> 2220968 bytes .../.gradle/3.3/taskArtifacts/taskArtifacts.bin | Bin 128032 -> 128032 bytes .../.gradle/3.3/taskArtifacts/taskArtifacts.lock | Bin 17 -> 17 bytes .../localClassSetAnalysis.lock | Bin 17 -> 17 bytes .../localJarClasspathSnapshot.lock | Bin 17 -> 17 bytes StoneIsland/platforms/android/AndroidManifest.xml | 2 +- .../platforms/android/assets/www/index.html | 18 +--- .../platforms/android/assets/www/js/lib/_router.js | 16 ++- .../assets/www/js/lib/account/AccountView.js | 4 +- .../assets/www/js/lib/account/ConsentModal.js | 9 +- .../android/assets/www/js/lib/auth/LoginView.js | 4 +- .../android/assets/www/js/lib/auth/LogoutView.js | 1 + .../android/assets/www/js/lib/auth/SignupView.js | 14 +-- StoneIsland/platforms/android/res/xml/config.xml | 2 +- .../xcschemes/xcschememanagement.plist | 2 +- .../ios/Stone Island.xcarchive/Info.plist | 8 +- .../Applications/Stone Island.app/Assets.car | Bin 844136 -> 1178536 bytes .../01J-lp-oVM-view-Ze5-6b-2t3.nib | Bin 2287 -> 2284 bytes .../UIViewController-01J-lp-oVM.nib | Bin 832 -> 832 bytes .../Applications/Stone Island.app/Info.plist | Bin 1761 -> 1763 bytes .../Stone Island.app/MainViewController.nib | Bin 943 -> 943 bytes .../Applications/Stone Island.app/Stone Island | Bin 2224192 -> 2252768 bytes .../Stone Island.app/_CodeSignature/CodeResources | 107 +++++++++------------ .../Applications/Stone Island.app/config.xml | 2 +- .../Stone Island.app/embedded.mobileprovision | Bin 11560 -> 7741 bytes .../Applications/Stone Island.app/www/css/nav.css | 9 +- .../Applications/Stone Island.app/www/index.html | 43 +++++---- .../Stone Island.app/www/js/lib/_router.js | 42 ++++++-- .../www/js/lib/account/AccountView.js | 4 +- .../www/js/lib/account/ConsentModal.js | 30 ++++-- .../Stone Island.app/www/js/lib/auth/LoginView.js | 4 +- .../Stone Island.app/www/js/lib/auth/LogoutView.js | 3 + .../Stone Island.app/www/js/lib/auth/SignupView.js | 14 +-- .../xcschemes/xcschememanagement.plist | 2 +- .../xcshareddata/WorkspaceSettings.xcsettings | 8 ++ .../UserInterfaceState.xcuserstate | Bin 29676 -> 29694 bytes .../user.xcuserdatad/WorkspaceSettings.xcsettings | 18 ++++ .../ios/Stone Island/Stone Island-Info.plist | 4 +- StoneIsland/platforms/ios/Stone Island/config.xml | 2 +- StoneIsland/platforms/ios/www/index.html | 18 +--- .../platforms/ios/www/js/lib/auth/SignupView.js | 4 +- StoneIsland/www/index.html | 18 +--- StoneIsland/www/js/lib/auth/SignupView.js | 4 +- 45 files changed, 235 insertions(+), 183 deletions(-) create mode 100644 StoneIsland/platforms/ios/Stone Island.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings create mode 100644 StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/WorkspaceSettings.xcsettings diff --git a/StoneIsland/config.xml b/StoneIsland/config.xml index 313fb75d..ed00b248 100755 --- a/StoneIsland/config.xml +++ b/StoneIsland/config.xml @@ -1,5 +1,5 @@ - + Stone Island Stone Island diff --git a/StoneIsland/platforms/android/.gradle/3.3/taskArtifacts/fileHashes.bin b/StoneIsland/platforms/android/.gradle/3.3/taskArtifacts/fileHashes.bin index 24748eea..68cf609b 100644 Binary files a/StoneIsland/platforms/android/.gradle/3.3/taskArtifacts/fileHashes.bin and b/StoneIsland/platforms/android/.gradle/3.3/taskArtifacts/fileHashes.bin differ diff --git a/StoneIsland/platforms/android/.gradle/3.3/taskArtifacts/fileSnapshots.bin b/StoneIsland/platforms/android/.gradle/3.3/taskArtifacts/fileSnapshots.bin index ece3d7d3..cdae22a7 100644 Binary files a/StoneIsland/platforms/android/.gradle/3.3/taskArtifacts/fileSnapshots.bin and b/StoneIsland/platforms/android/.gradle/3.3/taskArtifacts/fileSnapshots.bin differ diff --git a/StoneIsland/platforms/android/.gradle/3.3/taskArtifacts/taskArtifacts.bin b/StoneIsland/platforms/android/.gradle/3.3/taskArtifacts/taskArtifacts.bin index 514880d5..fcbedd1b 100644 Binary files a/StoneIsland/platforms/android/.gradle/3.3/taskArtifacts/taskArtifacts.bin and b/StoneIsland/platforms/android/.gradle/3.3/taskArtifacts/taskArtifacts.bin differ diff --git a/StoneIsland/platforms/android/.gradle/3.3/taskArtifacts/taskArtifacts.lock b/StoneIsland/platforms/android/.gradle/3.3/taskArtifacts/taskArtifacts.lock index 4593c450..8107e00d 100644 Binary files a/StoneIsland/platforms/android/.gradle/3.3/taskArtifacts/taskArtifacts.lock and b/StoneIsland/platforms/android/.gradle/3.3/taskArtifacts/taskArtifacts.lock differ diff --git a/StoneIsland/platforms/android/.gradle/3.3/tasks/_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/StoneIsland/platforms/android/.gradle/3.3/tasks/_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock index 7966c5fc..c25818cf 100644 Binary files a/StoneIsland/platforms/android/.gradle/3.3/tasks/_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock and b/StoneIsland/platforms/android/.gradle/3.3/tasks/_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock differ diff --git a/StoneIsland/platforms/android/.gradle/3.3/tasks/_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/StoneIsland/platforms/android/.gradle/3.3/tasks/_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock index 7aff4592..c0909e53 100644 Binary files a/StoneIsland/platforms/android/.gradle/3.3/tasks/_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock and b/StoneIsland/platforms/android/.gradle/3.3/tasks/_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock differ diff --git a/StoneIsland/platforms/android/AndroidManifest.xml b/StoneIsland/platforms/android/AndroidManifest.xml index d6229006..8ca9463a 100755 --- a/StoneIsland/platforms/android/AndroidManifest.xml +++ b/StoneIsland/platforms/android/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/StoneIsland/platforms/android/assets/www/index.html b/StoneIsland/platforms/android/assets/www/index.html index bdad67c8..b6fc8317 100755 --- a/StoneIsland/platforms/android/assets/www/index.html +++ b/StoneIsland/platforms/android/assets/www/index.html @@ -425,7 +425,7 @@
- +
- +
@@ -492,17 +492,7 @@
- - -
- -
-
-
- +
- + LOGOUT MAIN MENU @@ -425,11 +425,11 @@
- +
@@ -438,22 +438,24 @@
- +
+ 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

@@ -490,24 +492,25 @@
- - + +
-
- +
+ 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 +524,7 @@
-

SHIPPING

+

ADDRESS BOOK

@@ -545,7 +548,7 @@
-

PAYMENT

+

MY CARD

@@ -600,7 +603,7 @@
-

ORDERS

+

MY ORDERS

You have no orders.
@@ -1014,14 +1017,14 @@
- -

For more information, please consult our Privacy Policy or visit Customer Care.

To continue to My Account we invite you to click accept. Otherwise you can continue to navigate as an unregistered user.

+ +

diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/_router.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/_router.js index 723bb944..75f598e9 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/_router.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/_router.js @@ -39,15 +39,24 @@ var SiteRouter = Router.extend({ '/cart/thanks': 'cart.thanks', '/cart/error': 'cart.error', }, - + + terms_routes: [ + 'terms', + 'account_terms', + 'privacy', + 'returns', + 'care', + 'logout', + ], + 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 +84,7 @@ var SiteRouter = Router.extend({ default_view: function(name){ var fn = function(){ console.log(name) + var n = [name] if (app.view != app.login && app.view != app.signin) { app.last_view = app.view } @@ -82,7 +92,7 @@ var SiteRouter = Router.extend({ app.view.hide() } if (name.match(/\./)) { - var n = name.split(".") + n = name.split(".") console.log(name, n) app.view = app[n[0]][n[1]] } @@ -94,6 +104,22 @@ var SiteRouter = Router.extend({ console.log("view >>", app.view) app.header.set_back( !! app.view.back ) app.view.show() + + // var isTermsRoute = this.terms_routes.indexOf(name) !== -1 + // var isCartRoute = n[0] === 'cart' + // if ( (isCartRoute || app.demand_consent && !isTermsRoute) && app.account.consent.check()) { + // console.log('showed consent modal') + // return + // } + + var isNotTermsRoute = this.terms_routes.indexOf(name) === -1 + var isCartRoute = n[0] === 'cart' + var userMightActuallyViewCart = isCartRoute && auth.logged_in() + var demandingConsent = app.demand_consent && isNotTermsRoute + if ((userMightActuallyViewCart || demandingConsent) && app.account.consent.check()) { + console.log('showed consent modal') + return + } }.bind(this) return fn }, diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/account/AccountView.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/account/AccountView.js index 4605416c..8ac7c193 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/account/AccountView.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/account/AccountView.js @@ -105,6 +105,7 @@ var AccountView = View.extend({ cb && cb() } console.log('logged in') + app.account.consent.check() if ( ! auth.has_cart() ) { console.log('no cart') app.curtain.show("loading") @@ -132,9 +133,10 @@ var AccountView = View.extend({ console.log("navigating to deep link route from logged_in") app.router.go(initialLoginPath) } - else { + else if (!app.last_view) { app.router.go("account/profile") } + app.account.consent.check() app.curtain.hide("loading") } }, diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/account/ConsentModal.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/account/ConsentModal.js index c4fe0b53..c9235498 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/account/ConsentModal.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/account/ConsentModal.js @@ -13,24 +13,35 @@ var ConsentModal = View.extend({ this.$form = this.$(".form") this.$msg = this.$(".msg") this.$checkbox = this.$("[name=AccountTermsConsent]") + this.$consentError = this.$("#consent_error") }, check: function(){ var status = localStorage.getItem('account_terms.consent') + console.log('account_terms.consent', status) if (status !== 'true') { + console.log('we demand consent!') + app.demand_consent = true this.show() + return true } else { + console.log('already received consent!') this.hide() + app.demand_consent = false + return false } }, show: function(){ + app.demand_consent = true this.$el.show() setTimeout(function(){ this.$el.addClass('visible') }.bind(this), 20) - app.curtain.show() - app.curtain.classList.add('opaque') + app.curtain.show('opaque') + setTimeout(function(){ + app.curtain.show('opaque') + }, 300) }, hide: function(){ @@ -38,7 +49,7 @@ var ConsentModal = View.extend({ this.$el.removeClass('visible') setTimeout(function(){ this.$el.hide() - app.curtain.classList.remove('opaque') + app.curtain.$el.removeClass('opaque') }.bind(this), 300) }, @@ -51,23 +62,26 @@ var ConsentModal = View.extend({ changeConsent: function(){ var state = this.$checkbox.prop("checked") - // if (state) { - // this.$el.addClass('consent-yes').removeClass('consent-no') - // } else { - // this.$el.addClass('consent-no').removeClass('consent-yes') - // } + if (state) { + this.$consentError.removeClass('visible') + } else { + this.$consentError.addClass('visible') + } }, proceed: function(){ var state = this.$checkbox.prop("checked") if (!state) { + this.$consentError.addClass('visible') 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") diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/auth/LoginView.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/auth/LoginView.js index aeb15d1d..c3d839a5 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/auth/LoginView.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/auth/LoginView.js @@ -43,9 +43,7 @@ var LoginView = FormView.extend({ success: function(data){ console.log(data) - app.account.logged_in(function(){ - app.router.go("store") - }) + app.account.logged_in(null, "store") }, error: function(data){ diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/auth/LogoutView.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/auth/LogoutView.js index 481dcb8d..d3f76428 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/auth/LogoutView.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/auth/LogoutView.js @@ -10,6 +10,9 @@ var LogoutView = View.extend({ app.header.set_cart_count(0) app.footer.hide() auth.log_out() + localStorage.setItem('account_terms.consent', 'false') + app.demand_consent = false + app.account.consent.hide() app.account.logged_out() }, diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/auth/SignupView.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/auth/SignupView.js index 078f7c07..ef7dd6aa 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/auth/SignupView.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/auth/SignupView.js @@ -53,7 +53,7 @@ var SignupView = FormView.extend({ "Password": "Please enter your password.", "Password2": "Please enter your password again.", "DataProfiling": "You must consent to data profiling to use the Stone Island app.", - "AccountTerms": "You must agree to the Your My Account terms.", + "GdprTerms": "You must agree to the Your My Account terms.", }, validate_fields: function(data, errors){ @@ -64,14 +64,16 @@ var SignupView = FormView.extend({ if (data.Email.toLowerCase() !== data.ConfirmEmail.toLowerCase()) { errors.push([ "ConfirmEmail", "Email addresses don't match." ]) } // if (data.Gender === "NONE") { errors.push([ "Gender", "Please supply your gender." ]) } if (data.DataProfiling !== "true") { errors.push([ "DataProfiling", "You must consent to data profiling to use the Stone Island app." ]) } - if (data.AccountTerms !== "true") { errors.push([ "AccountTerms", "You must agree to the Your My Account terms to use the Stone Island app." ]) } + if (data.GdprTerms !== "true") { errors.push([ "GdprTerms", "You must agree to the Your My Account terms to use the Stone Island app." ]) } var now = new Date () var year = now.getFullYear() - if (! data.Birthday) data.BirthDay = year + '-01-01' - if (data.BirthDay.split('-')[0] || '2018') + if (! data.BirthDay) { + data.BirthDay = year + '-01-01' + } + // if (data.BirthDay.split('-')[0] || '2018') var birthday = new Date (data.BirthDay) - if (isNaN(birthday) || (now - birthday) / (365*24*60*60*1000) < 18) { + if (isNaN(birthday) || (new Date () - birthday) / (365*24*60*60*1000) < 18) { errors.push(['BirthDay', 'You must be 18 or older to use the Stone Island app.']) } @@ -108,7 +110,7 @@ var SignupView = FormView.extend({ auth.user.Email = this.last_data.Email auth.user.BirthDay = this.last_data.BirthDay localStorage.setItem('account_terms.consent', 'true') - app.account.logged_in(function(){ app.router.go("store") }) + app.account.logged_in(null, "store") }, error: function(data){ 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/xcshareddata/WorkspaceSettings.xcsettings b/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 00000000..949b6789 --- /dev/null +++ b/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + BuildSystemType + Original + + 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 5655a8d7..7c07bcce 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/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/WorkspaceSettings.xcsettings b/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/WorkspaceSettings.xcsettings new file mode 100644 index 00000000..f25782dd --- /dev/null +++ b/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/WorkspaceSettings.xcsettings @@ -0,0 +1,18 @@ + + + + + BuildLocationStyle + UseAppPreferences + CustomBuildLocationType + RelativeToDerivedData + DerivedDataLocationStyle + Default + EnabledFullIndexStoreVisibility + + IssueFilterStyle + ShowActiveSchemeOnly + LiveSourceIssuesEnabled + + + diff --git a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist index 0929c35f..1f9a3666 100644 --- a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist +++ b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist @@ -21,7 +21,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0.8 + 1.1.0 CFBundleSignature ???? CFBundleURLTypes @@ -34,7 +34,7 @@ CFBundleVersion - 1.0.8 + 1.1.0 GCM_SENDER_ID 85075801930 IS_GCM_ENABLED diff --git a/StoneIsland/platforms/ios/Stone Island/config.xml b/StoneIsland/platforms/ios/Stone Island/config.xml index 72311c70..d4267d95 100755 --- a/StoneIsland/platforms/ios/Stone Island/config.xml +++ b/StoneIsland/platforms/ios/Stone Island/config.xml @@ -1,5 +1,5 @@ - + diff --git a/StoneIsland/platforms/ios/www/index.html b/StoneIsland/platforms/ios/www/index.html index bdad67c8..b6fc8317 100755 --- a/StoneIsland/platforms/ios/www/index.html +++ b/StoneIsland/platforms/ios/www/index.html @@ -425,7 +425,7 @@
- +
- +
@@ -492,17 +492,7 @@
- - -
- -
-
-
- +