diff options
28 files changed, 505 insertions, 77 deletions
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 4f3362e8..3038bdb4 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 @@ -22,7 +22,7 @@ <key>CordovaLib.xcscheme_^#shared#^_</key> <dict> <key>orderHint</key> - <integer>3</integer> + <integer>2</integer> </dict> </dict> </dict> diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist b/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist index b7bca5d8..20bf58a7 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist @@ -9,9 +9,9 @@ <key>CFBundleIdentifier</key> <string>us.okfoc.stoneisland</string> <key>CFBundleShortVersionString</key> - <string>1.3.1</string> + <string>1.3.3</string> <key>CFBundleVersion</key> - <string>1.3.1</string> + <string>1.3.3</string> <key>SigningIdentity</key> <string>iPhone Developer: Francesca Agusani (3ECUPBTQ5W)</string> <key>Team</key> @@ -20,7 +20,7 @@ <key>ArchiveVersion</key> <integer>2</integer> <key>CreationDate</key> - <date>2020-03-24T19:43:52Z</date> + <date>2020-05-07T15:09:07Z</date> <key>Name</key> <string>Stone Island</string> <key>SchemeName</key> 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 Binary files differindex fa0be41c..ec8243c8 100644 --- 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 diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib/objects-13.0+.nib b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib/objects-13.0+.nib Binary files differindex b11078f5..c0c6ce1a 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib/objects-13.0+.nib +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib/objects-13.0+.nib diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib/runtime.nib b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib/runtime.nib Binary files differindex 4e0ef4db..3f176e61 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib/runtime.nib +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib/runtime.nib diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib/objects-13.0+.nib b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib/objects-13.0+.nib Binary files differindex 5de432f5..f2642ba8 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib/objects-13.0+.nib +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib/objects-13.0+.nib diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib/runtime.nib b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib/runtime.nib Binary files differindex a38cdd57..4bfeea62 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib/runtime.nib +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib/runtime.nib diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Info.plist b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Info.plist Binary files differindex 4615ed35..f8927b34 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Info.plist +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Info.plist diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib/objects-13.0+.nib b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib/objects-13.0+.nib Binary files differindex bc7ac1d6..419955f7 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib/objects-13.0+.nib +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib/objects-13.0+.nib diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib/runtime.nib b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib/runtime.nib Binary files differindex 2ce7cc28..5655ae3e 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib/runtime.nib +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib/runtime.nib 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 Binary files differindex 30448412..2a486e25 100755 --- 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 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 3b2ca5d8..611e64b0 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,15 +94,15 @@ </data> <key>Assets.car</key> <data> - UzpkteYLyk6goZL/VblItaK+tuI= + IZfL8ABdOlx+eq+QujelZD7b2n8= </data> <key>CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib/objects-13.0+.nib</key> <data> - VFfP8G6YpQNCE9+YP8TshXoRsbM= + exDEi5FFlQ/QMGBZ6L/MVglQgPs= </data> <key>CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib/runtime.nib</key> <data> - nY4XgF1F9CQz2EzIWv1UnRILPJY= + IH4wNAgoxDWN/TvAxXNAaFuPkq4= </data> <key>CDVLaunchScreen.storyboardc/Info.plist</key> <data> @@ -110,11 +110,11 @@ </data> <key>CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib/objects-13.0+.nib</key> <data> - flKFZIdt4NGnXBy4VMQsFEIY6Ss= + VNixgP/K3K3BrU53hAxn6ZQMZPI= </data> <key>CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib/runtime.nib</key> <data> - xN5k2g+B+hbuRefGGwG1VIYXjGE= + jTqeZsXLJiImld/mEN3KnKm8EcU= </data> <key>CDVNotification.bundle/beep.wav</key> <data> @@ -122,15 +122,15 @@ </data> <key>Info.plist</key> <data> - BF4yEnRx3C0JCy4g51I2pcZHCCo= + oVPkhTw+R2uDgBV+UYrSuASIL+E= </data> <key>MainViewController.nib/objects-13.0+.nib</key> <data> - Vs2JX6XhI7Z46fXsbspAW/l5QOk= + MyFL8JTX5MgG94wnS01QnEsu3Zs= </data> <key>MainViewController.nib/runtime.nib</key> <data> - dAGDe2Cs/GAlO48LNC5//wE9WxU= + ddykiqHFYkxkEcS1eDJJAlodxes= </data> <key>PkgInfo</key> <data> @@ -138,7 +138,7 @@ </data> <key>config.xml</key> <data> - qHjCgw4SROklA7TNnMhgq1x9aqU= + Cq37HOUqZYIopWVCnebW2PE26Mw= </data> <key>embedded.mobileprovision</key> <data> @@ -238,7 +238,7 @@ </data> <key>www/css/nav.css</key> <data> - Tc5/Z3qa/5qShOCeukuP/tl5yos= + KalNpH/O+MD5y3/eTC2cOnPO8Ko= </data> <key>www/css/products.css</key> <data> @@ -362,7 +362,7 @@ </data> <key>www/index.html</key> <data> - mvnOdc6Ioj3CjkZxyRbZN8+mfNY= + l+KYfbtTxSWnsYANG6wzwagMLPA= </data> <key>www/js/index.js</key> <data> @@ -410,7 +410,7 @@ </data> <key>www/js/lib/auth/SignupView.js</key> <data> - G9BQAksv6lgg2OQASgzX3gNqfmU= + QOhDrYJb/4ruoEISKvUvpbsPOfo= </data> <key>www/js/lib/blogs/ArchiveView.js</key> <data> @@ -508,13 +508,17 @@ <data> Ui2nti/7MEoaanRA/U1QuO6cVSQ= </data> + <key>www/js/lib/nav/IntroModal.js</key> + <data> + aoT4Mm0+uJIyLr4VLYKz0fiyBtE= + </data> <key>www/js/lib/nav/IntroView.js</key> <data> - FSNPuiLwJs4MyLmkvAY6k3RPRF8= + 88GwWN1RCz7YTSDSFnRyyVYFINE= </data> <key>www/js/lib/nav/NavView.js</key> <data> - doSVdvRAK0s02oiRxBhrgBhg3IA= + ilwxr+ceQ7XJsUB0qsqNLC76MhI= </data> <key>www/js/lib/nav/SearchView.js</key> <data> @@ -977,33 +981,33 @@ <dict> <key>hash</key> <data> - UzpkteYLyk6goZL/VblItaK+tuI= + IZfL8ABdOlx+eq+QujelZD7b2n8= </data> <key>hash2</key> <data> - 2HywY+DZcj/aqJeTn5mYB1aiWIaBhlswdf7wYlPzgSA= + 9+07am1SdLtA/XyNjS7SDqgmZW5W0JBshcugS9QoKJ0= </data> </dict> <key>CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib/objects-13.0+.nib</key> <dict> <key>hash</key> <data> - VFfP8G6YpQNCE9+YP8TshXoRsbM= + exDEi5FFlQ/QMGBZ6L/MVglQgPs= </data> <key>hash2</key> <data> - uprszktF7eLPTgzY76Q2k+qzGyeO1PFNjTf5mzcaxNY= + CBPGqLGQ7L9Ps+vOwxnpI1lylcfwPPDmp0Phng5BRxY= </data> </dict> <key>CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib/runtime.nib</key> <dict> <key>hash</key> <data> - nY4XgF1F9CQz2EzIWv1UnRILPJY= + IH4wNAgoxDWN/TvAxXNAaFuPkq4= </data> <key>hash2</key> <data> - 3Jk4kgQR151ygCu1ljRwbumGNsyu8OjZNNrXvxQYlCw= + DIiZ1KnWUI6s07u9Vph7H5fe7xrWCiki0mHex0jd5is= </data> </dict> <key>CDVLaunchScreen.storyboardc/Info.plist</key> @@ -1021,22 +1025,22 @@ <dict> <key>hash</key> <data> - flKFZIdt4NGnXBy4VMQsFEIY6Ss= + VNixgP/K3K3BrU53hAxn6ZQMZPI= </data> <key>hash2</key> <data> - 4/jCvp8Wdg+bfnYjYZ3gQNvRsNPxbYJHejqoI26/I9g= + Pw3MbAV0c+5HvbWJagDwIzjh/FHA7+AxrM6HcwEkICA= </data> </dict> <key>CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib/runtime.nib</key> <dict> <key>hash</key> <data> - xN5k2g+B+hbuRefGGwG1VIYXjGE= + jTqeZsXLJiImld/mEN3KnKm8EcU= </data> <key>hash2</key> <data> - BwrgwpXeFzN3bFHfFNkRaa3bG++lFwRnPm1zeuxgzp0= + X5vrZ/ZgQu8lhN6RIcqv37DN7QssXwEUp+wTmyQKscA= </data> </dict> <key>CDVNotification.bundle/beep.wav</key> @@ -1054,33 +1058,33 @@ <dict> <key>hash</key> <data> - Vs2JX6XhI7Z46fXsbspAW/l5QOk= + MyFL8JTX5MgG94wnS01QnEsu3Zs= </data> <key>hash2</key> <data> - jjJ1Sj6SCCNMgL59AIYFfQ5YgscyZS/Aj8CrLbVEMPo= + 5WYlBxZwpurXSuJnO5hh3DaM4UplYvly4gHzLXvvdNw= </data> </dict> <key>MainViewController.nib/runtime.nib</key> <dict> <key>hash</key> <data> - dAGDe2Cs/GAlO48LNC5//wE9WxU= + ddykiqHFYkxkEcS1eDJJAlodxes= </data> <key>hash2</key> <data> - 8zAAT2/IYTgHABqGCN35RaODzLU4AETD3brpjJ+jaoI= + mA3Hu85334EBf4Ag15ZQx2/lym5ypGAFrFKrwnHVvLM= </data> </dict> <key>config.xml</key> <dict> <key>hash</key> <data> - qHjCgw4SROklA7TNnMhgq1x9aqU= + Cq37HOUqZYIopWVCnebW2PE26Mw= </data> <key>hash2</key> <data> - 12yQe3fH1LeQ0hVJ39eZk/MOnGlavXlk1S6I8EbYLDI= + natqMDmz9lyY5Guej5Il7cP3W21OyAcWGxGi6KeQvo8= </data> </dict> <key>embedded.mobileprovision</key> @@ -1351,11 +1355,11 @@ <dict> <key>hash</key> <data> - Tc5/Z3qa/5qShOCeukuP/tl5yos= + KalNpH/O+MD5y3/eTC2cOnPO8Ko= </data> <key>hash2</key> <data> - gSBWZpcTgrCdqTWTd5EeuJQnGD7VR5imVOXmEWBKRj0= + Sg5eAqeoaKilCtwQ7IDgmNzSGmMVYFQmEGtnIKWVbTg= </data> </dict> <key>www/css/products.css</key> @@ -1692,11 +1696,11 @@ <dict> <key>hash</key> <data> - mvnOdc6Ioj3CjkZxyRbZN8+mfNY= + l+KYfbtTxSWnsYANG6wzwagMLPA= </data> <key>hash2</key> <data> - DUY0p/YPCJ9QbJywWI5eHUGkOLDJmWvu3dPhXA/RG0M= + HTDYr7mo8ylb3yuURms91AZJaLwa0wBFfLs3sN7cc5g= </data> </dict> <key>www/js/index.js</key> @@ -1824,11 +1828,11 @@ <dict> <key>hash</key> <data> - G9BQAksv6lgg2OQASgzX3gNqfmU= + QOhDrYJb/4ruoEISKvUvpbsPOfo= </data> <key>hash2</key> <data> - li67nZkin+Pv+3rsTkT+nItuc3rqyBm1AX84JULsfVg= + yCb5Aftii+ex2DFth+7lijHr3yfcLBWpOifGGVG3Xpw= </data> </dict> <key>www/js/lib/blogs/ArchiveView.js</key> @@ -2095,26 +2099,37 @@ 6lCUODPVbVjct435xG/PZL/QEtmKxzMj702T2xVy5sU= </data> </dict> + <key>www/js/lib/nav/IntroModal.js</key> + <dict> + <key>hash</key> + <data> + aoT4Mm0+uJIyLr4VLYKz0fiyBtE= + </data> + <key>hash2</key> + <data> + RW7bgr42wX9e3439GfHjPaTPbMaiWX9kOYoebZJzwc4= + </data> + </dict> <key>www/js/lib/nav/IntroView.js</key> <dict> <key>hash</key> <data> - FSNPuiLwJs4MyLmkvAY6k3RPRF8= + 88GwWN1RCz7YTSDSFnRyyVYFINE= </data> <key>hash2</key> <data> - Ex044mlBP+DCpAFwCDbsYSIAPyFSB8owff1K4+5gNx4= + opeXGgLuAtyUUqnSd8iQeP0nLXk4GdxpcqXmWHCMo2Q= </data> </dict> <key>www/js/lib/nav/NavView.js</key> <dict> <key>hash</key> <data> - doSVdvRAK0s02oiRxBhrgBhg3IA= + ilwxr+ceQ7XJsUB0qsqNLC76MhI= </data> <key>hash2</key> <data> - lYbGNpLcOwLFihq6x55ZvvajrPNAUoIJp4hu9u7NMbw= + kBm3dCx2ea7gKRZAWxoVCyJhNHpGRw4h8e9ByjzJrlU= </data> </dict> <key>www/js/lib/nav/SearchView.js</key> diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/config.xml b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/config.xml index 203fbaa7..df7290fa 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/config.xml +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/config.xml @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<widget android-versionCode="6131" id="us.okfoc.stoneisland" version="1.3.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> +<widget android-versionCode="6133" id="us.okfoc.stoneisland" version="1.3.3" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <feature name="LocalStorage"> <param name="ios-package" value="CDVLocalStorage" /> </feature> diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/nav.css b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/nav.css index 03e3fb39..8ae57921 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/nav.css +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/nav.css @@ -413,6 +413,8 @@ padding-bottom:0px; /* MODAL */ .modal { + display: none; + z-index: 2; position: absolute; top: 50%; left: 50%; transform: translate3d(-50%, -50%, 0); @@ -424,22 +426,12 @@ padding-bottom:0px; opacity: 0; pointer-events: none; transition: all 0.2s; + font-size: 1rem; } .modal.visible { opacity: 1; pointer-events: auto; } - -/* CONSENT MODAL */ - -#consent_modal { - display: none; - z-index: 2; - font-size: 1rem; -} -#consent_modal a { - color: black; -} .modal button { font-family: pfd, sans-serif; font-size: 0.875rem; @@ -452,6 +444,12 @@ padding-bottom:0px; margin-top: 20px; width: 100px; } + +/* CONSENT MODAL */ + +#consent_modal a { + color: black; +} #consent_proceed { display: inline-block; background: black; @@ -466,6 +464,47 @@ padding-bottom:0px; #consent_error.visible { opacity: 1; } + +/* INTRO MODAL */ + +#intro_modal { + min-width: 360px; +} +#intro_modal .intro_title { + font-weight: bold; +} +#intro_modal .intro_title, +#intro_modal .intro_tagline, +#intro_modal .intro_content { + margin-bottom: 1rem; +} +#intro_modal .intro_content { + white-space: pre-line; +} +#intro_modal button { + display: block; +} +#intro_modal.black { + background-color: black; + color: white; +} +#intro_modal.white { + background-color: white; + color: black; +} +#intro_modal .intro_tagline.red { + color: #f00; +} +#intro_modal .intro_tagline.blue { + color: #11f; +} +#intro_modal .intro_tagline.white { + color: #fff; +} +#intro_modal .intro_tagline.black { + color: #000; +} + /* SELECTOR */ #selector { 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 17289033..2e4e50b6 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 @@ -62,6 +62,7 @@ <span role="menuitem" class="terms">TERMS AND CONDITIONS</span> <span role="menuitem" class="returns">RETURN POLICY</span> <span role="menuitem" class="care">CUSTOMER CARE</span> + <span role="menuitem" class="covid">COVID-19 FAQS</span> </div> </span> @@ -1094,6 +1095,16 @@ <button role="menuitem" id="consent_logout">LOG OUT</button> </div> + <div class="modal" id="intro_modal" role="modal" aria-label="Before you start using the app"> + <div class="intro_title"></div> + <div class="intro_tagline tagline_top"></div> + <div class="intro_content"></div> + <div class="intro_tagline tagline_bottom"></div> + <div> + <button role="menuitem" class="intro_proceed">CONTINUE</button> + </div> + </div> + <div id="selector"> <div class="options" role="select"> <script type="text/html" class="template"> @@ -1345,6 +1356,7 @@ <script src="js/lib/cart/CartError.js"></script> <script src="js/lib/nav/IntroView.js"></script> +<script src="js/lib/nav/IntroModal.js"></script> <script src="js/lib/nav/CurtainView.js"></script> <script src="js/lib/nav/HeaderView.js"></script> <script src="js/lib/nav/FooterView.js"></script> 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 18fecebb..8ae47728 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 @@ -49,7 +49,7 @@ var SignupView = FormView.extend({ "Surname": "Please enter your last name.", "Email": "Please enter a valid email address.", "ConfirmEmail": "Please enter a valid email address.", - "BirthDay": "Please enter your birthday. You must be 18 or older to use the Stone Island app.", + // "BirthDay": "Please enter your birthday. You must be 18 or older to use the Stone Island app.", "Password": "Please enter your password.", "Password2": "Please enter your password again.", "DataProfiling": "You must consent to data profiling to use the Stone Island app.", @@ -77,15 +77,18 @@ var SignupView = FormView.extend({ } var now = new Date () - var year = now.getFullYear() + var year = now.getFullYear() - 18 if (! data.BirthDay) { data.BirthDay = year + '-01-01' } // if (data.BirthDay.split('-')[0] || '2018') var birthday = new Date (data.BirthDay) - 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.']) + if (isNaN(birthday)) { + data['BirthDay'] = '1970-01-01' } + // 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.']) + // } data.YooxLetter = this.$("[name=YooxLetter]").prop("checked") if (!data.YooxLetter) { diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/nav/IntroModal.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/nav/IntroModal.js new file mode 100644 index 00000000..42cf5c5d --- /dev/null +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/nav/IntroModal.js @@ -0,0 +1,148 @@ +var IntroModal = View.extend({ + + el: "#intro_modal", + + events: { + "click .intro_proceed": "proceed", + "click .intro_tagline": "navigateToTagline", + "click a": "navigate", + }, + + alreadyShown: false, + curtainBackgroundColor: false, + + initialize: function(){ + this.$introTitle = this.$(".intro_title") + this.$introTaglineTop = this.$(".tagline_top") + this.$introTaglineBottom = this.$(".tagline_bottom") + this.$introContent = this.$(".intro_content") + this.$introProceed = this.$(".intro_proceed") + }, + + check: function(){ + if (this.alreadyShown) { + this.hide() + return false + } + var lastMessage = localStorage.getItem('app.intro_modal_last_message') + switch (app.store.showModal) { + case 'never': + this.hide() + return false + case 'once': + if (lastMessage === app.store.modalContent) { + this.hide() + return false + } + this.show() + return true + case 'always': + this.show() + return true + default: + this.hide() + return false + } + }, + + build: function(){ + var modalTitle = app.store.modalTitle.trim() + var modalTagline = app.store.modalTagline.trim() + var modalTaglineHref = app.store.modalTaglineLink.trim() + var modalContent = app.store.modalContent.trim() + var modalButton = app.store.modalButton.trim().toUpperCase() || "PROCEED" + if (app.store.modalBackgroundColor === 'black') { + this.curtainBackgroundColor = 'white' + } else { + this.curtainBackgroundColor = 'black' + } + this.$el.addClass(app.store.modalBackgroundColor) + if (modalTagline.length === 0) { + app.store.modalTaglinePosition = 'hidden' + } + switch (app.store.modalTaglinePosition) { + case 'hidden': + this.$introTaglineBottom.hide() + this.$introTaglineTop.hide() + break + case 'top': + this.$introTaglineBottom.hide() + this.$introTaglineTop.show() + this.$introTaglineTop.addClass(app.store.modalTaglineColor) + this.$introTaglineTop.text(app.store.modalTagline) + break + case 'bottom': + this.$introTaglineTop.hide() + this.$introTaglineBottom.show() + this.$introTaglineBottom.addClass(app.store.modalTaglineColor) + this.$introTaglineBottom.text(app.store.modalTagline) + break + } + if (modalTitle.length === 0) { + this.$introTitle.hide() + } else { + this.$introTitle.show() + this.$introTitle.text(modalTitle) + } + if (modalContent.length === 0) { + this.$introContent.hide() + } else { + this.$introContent.show() + this.$introContent.text(modalContent) + } + this.$introProceed.html(sanitize(modalButton)) + }, + + show: function(){ + this.alreadyShown = true + this.build() + this.$el.show() + setTimeout(function(){ + this.$el.addClass('visible') + }.bind(this), 20) + app.curtain.show('opaque') + setTimeout(function(){ + app.curtain.show('opaque') + }, 300) + }, + + hide: function(){ + this.alreadyShown = true + localStorage.setItem('app.intro_modal_last_message', app.store.modalContent) + app.curtain.hide() + this.$el.removeClass('visible') + setTimeout(function(){ + this.$el.hide() + app.curtain.$el.removeClass('opaque') + if (this.curtainBackgroundColor) { + app.curtain.$el.removeClass(this.curtainBackgroundColor) + } + }.bind(this), 300) + }, + + navigateToTagline: function(){ + var modalTaglineHref = app.store.modalTaglineLink.trim() + if (modalTaglineHref.length) { + this.hide() + console.log(modalTaglineHref) + if (modalTaglineHref.indexOf('http') === 0) { + window.open(modalTaglineHref, '_system') + } else { + app.router.go(modalTaglineHref) + } + } + }, + + navigate: function(e){ + var href = $(e.currentTarget).attr('href').replace('#', '') + console.log(href) + this.hide() + app.router.go(href) + }, + + proceed: function(){ + console.log('proceed') + this.hide() + }, + +})
\ No newline at end of file diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/nav/IntroView.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/nav/IntroView.js index c075619a..8cb92b53 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/nav/IntroView.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/nav/IntroView.js @@ -14,6 +14,7 @@ var IntroView = View.extend({ this.compass = this.$("#compass").get(0) this.orient = this.deviceorientation.bind(this) this.$alert.hide() + this.modal = new IntroModal() }, show: function(){ @@ -21,6 +22,7 @@ var IntroView = View.extend({ window.addEventListener("deviceorientation", this.orient) app.footer.hide() this.orient({ alpha: 0 }) + this.modal.check() }, hide: function(){ diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/nav/NavView.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/nav/NavView.js index a6a39633..bd068ce0 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/nav/NavView.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/nav/NavView.js @@ -34,6 +34,7 @@ var NavView = View.extend({ "click .returns": "returns", "click .terms": "terms", "click .care": "care", + "click .covid": "covid", "click .fb": "fb", "click .insta": "insta", @@ -158,7 +159,10 @@ var NavView = View.extend({ e.preventDefault() window.open("https://www.stoneisland.com/customercare?utm_source=AppMobile&utm_medium=referral&utm_campaign=CustomerCare", '_system') }, - + covid: function(e){ + e.preventDefault() + window.open("https://www.stoneisland.com/system/selfservice.controller?CONFIGURATION=1701&PARTITION_ID=1&CMD=BROWSE_TOPIC&LANGUAGE=en&COUNTRY=us&USERTYPE=1&TOPIC_ID=149680", '_system') + }, search: function(){ this.hide() 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 4dadab85..605e51b3 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 @@ -12,7 +12,7 @@ <key>Stone Island.xcscheme_^#shared#^_</key> <dict> <key>orderHint</key> - <integer>2</integer> + <integer>3</integer> </dict> </dict> </dict> 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 Binary files differindex 9ad1cbab..a3ad5d16 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate +++ b/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate diff --git a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist index ee5e12e6..16dea8bc 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 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>1.3.2</string> + <string>1.3.3</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleURLTypes</key> @@ -34,7 +34,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>1.3.2</string> + <string>1.3.3</string> <key>GCM_SENDER_ID</key> <string>85075801930</string> <key>IS_GCM_ENABLED</key> diff --git a/StoneIsland/platforms/ios/Stone Island/config.xml b/StoneIsland/platforms/ios/Stone Island/config.xml index c5b1062b..df7290fa 100755 --- a/StoneIsland/platforms/ios/Stone Island/config.xml +++ b/StoneIsland/platforms/ios/Stone Island/config.xml @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<widget android-versionCode="6132" id="us.okfoc.stoneisland" version="1.3.2" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> +<widget android-versionCode="6133" id="us.okfoc.stoneisland" version="1.3.3" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <feature name="LocalStorage"> <param name="ios-package" value="CDVLocalStorage" /> </feature> diff --git a/StoneIsland/platforms/ios/www/css/nav.css b/StoneIsland/platforms/ios/www/css/nav.css index 03e3fb39..8ae57921 100755 --- a/StoneIsland/platforms/ios/www/css/nav.css +++ b/StoneIsland/platforms/ios/www/css/nav.css @@ -413,6 +413,8 @@ padding-bottom:0px; /* MODAL */ .modal { + display: none; + z-index: 2; position: absolute; top: 50%; left: 50%; transform: translate3d(-50%, -50%, 0); @@ -424,22 +426,12 @@ padding-bottom:0px; opacity: 0; pointer-events: none; transition: all 0.2s; + font-size: 1rem; } .modal.visible { opacity: 1; pointer-events: auto; } - -/* CONSENT MODAL */ - -#consent_modal { - display: none; - z-index: 2; - font-size: 1rem; -} -#consent_modal a { - color: black; -} .modal button { font-family: pfd, sans-serif; font-size: 0.875rem; @@ -452,6 +444,12 @@ padding-bottom:0px; margin-top: 20px; width: 100px; } + +/* CONSENT MODAL */ + +#consent_modal a { + color: black; +} #consent_proceed { display: inline-block; background: black; @@ -466,6 +464,47 @@ padding-bottom:0px; #consent_error.visible { opacity: 1; } + +/* INTRO MODAL */ + +#intro_modal { + min-width: 360px; +} +#intro_modal .intro_title { + font-weight: bold; +} +#intro_modal .intro_title, +#intro_modal .intro_tagline, +#intro_modal .intro_content { + margin-bottom: 1rem; +} +#intro_modal .intro_content { + white-space: pre-line; +} +#intro_modal button { + display: block; +} +#intro_modal.black { + background-color: black; + color: white; +} +#intro_modal.white { + background-color: white; + color: black; +} +#intro_modal .intro_tagline.red { + color: #f00; +} +#intro_modal .intro_tagline.blue { + color: #11f; +} +#intro_modal .intro_tagline.white { + color: #fff; +} +#intro_modal .intro_tagline.black { + color: #000; +} + /* SELECTOR */ #selector { diff --git a/StoneIsland/platforms/ios/www/index.html b/StoneIsland/platforms/ios/www/index.html index 17289033..2e4e50b6 100755 --- a/StoneIsland/platforms/ios/www/index.html +++ b/StoneIsland/platforms/ios/www/index.html @@ -62,6 +62,7 @@ <span role="menuitem" class="terms">TERMS AND CONDITIONS</span> <span role="menuitem" class="returns">RETURN POLICY</span> <span role="menuitem" class="care">CUSTOMER CARE</span> + <span role="menuitem" class="covid">COVID-19 FAQS</span> </div> </span> @@ -1094,6 +1095,16 @@ <button role="menuitem" id="consent_logout">LOG OUT</button> </div> + <div class="modal" id="intro_modal" role="modal" aria-label="Before you start using the app"> + <div class="intro_title"></div> + <div class="intro_tagline tagline_top"></div> + <div class="intro_content"></div> + <div class="intro_tagline tagline_bottom"></div> + <div> + <button role="menuitem" class="intro_proceed">CONTINUE</button> + </div> + </div> + <div id="selector"> <div class="options" role="select"> <script type="text/html" class="template"> @@ -1345,6 +1356,7 @@ <script src="js/lib/cart/CartError.js"></script> <script src="js/lib/nav/IntroView.js"></script> +<script src="js/lib/nav/IntroModal.js"></script> <script src="js/lib/nav/CurtainView.js"></script> <script src="js/lib/nav/HeaderView.js"></script> <script src="js/lib/nav/FooterView.js"></script> diff --git a/StoneIsland/platforms/ios/www/js/lib/nav/IntroModal.js b/StoneIsland/platforms/ios/www/js/lib/nav/IntroModal.js new file mode 100644 index 00000000..42cf5c5d --- /dev/null +++ b/StoneIsland/platforms/ios/www/js/lib/nav/IntroModal.js @@ -0,0 +1,148 @@ +var IntroModal = View.extend({ + + el: "#intro_modal", + + events: { + "click .intro_proceed": "proceed", + "click .intro_tagline": "navigateToTagline", + "click a": "navigate", + }, + + alreadyShown: false, + curtainBackgroundColor: false, + + initialize: function(){ + this.$introTitle = this.$(".intro_title") + this.$introTaglineTop = this.$(".tagline_top") + this.$introTaglineBottom = this.$(".tagline_bottom") + this.$introContent = this.$(".intro_content") + this.$introProceed = this.$(".intro_proceed") + }, + + check: function(){ + if (this.alreadyShown) { + this.hide() + return false + } + var lastMessage = localStorage.getItem('app.intro_modal_last_message') + switch (app.store.showModal) { + case 'never': + this.hide() + return false + case 'once': + if (lastMessage === app.store.modalContent) { + this.hide() + return false + } + this.show() + return true + case 'always': + this.show() + return true + default: + this.hide() + return false + } + }, + + build: function(){ + var modalTitle = app.store.modalTitle.trim() + var modalTagline = app.store.modalTagline.trim() + var modalTaglineHref = app.store.modalTaglineLink.trim() + var modalContent = app.store.modalContent.trim() + var modalButton = app.store.modalButton.trim().toUpperCase() || "PROCEED" + if (app.store.modalBackgroundColor === 'black') { + this.curtainBackgroundColor = 'white' + } else { + this.curtainBackgroundColor = 'black' + } + this.$el.addClass(app.store.modalBackgroundColor) + if (modalTagline.length === 0) { + app.store.modalTaglinePosition = 'hidden' + } + switch (app.store.modalTaglinePosition) { + case 'hidden': + this.$introTaglineBottom.hide() + this.$introTaglineTop.hide() + break + case 'top': + this.$introTaglineBottom.hide() + this.$introTaglineTop.show() + this.$introTaglineTop.addClass(app.store.modalTaglineColor) + this.$introTaglineTop.text(app.store.modalTagline) + break + case 'bottom': + this.$introTaglineTop.hide() + this.$introTaglineBottom.show() + this.$introTaglineBottom.addClass(app.store.modalTaglineColor) + this.$introTaglineBottom.text(app.store.modalTagline) + break + } + if (modalTitle.length === 0) { + this.$introTitle.hide() + } else { + this.$introTitle.show() + this.$introTitle.text(modalTitle) + } + if (modalContent.length === 0) { + this.$introContent.hide() + } else { + this.$introContent.show() + this.$introContent.text(modalContent) + } + this.$introProceed.html(sanitize(modalButton)) + }, + + show: function(){ + this.alreadyShown = true + this.build() + this.$el.show() + setTimeout(function(){ + this.$el.addClass('visible') + }.bind(this), 20) + app.curtain.show('opaque') + setTimeout(function(){ + app.curtain.show('opaque') + }, 300) + }, + + hide: function(){ + this.alreadyShown = true + localStorage.setItem('app.intro_modal_last_message', app.store.modalContent) + app.curtain.hide() + this.$el.removeClass('visible') + setTimeout(function(){ + this.$el.hide() + app.curtain.$el.removeClass('opaque') + if (this.curtainBackgroundColor) { + app.curtain.$el.removeClass(this.curtainBackgroundColor) + } + }.bind(this), 300) + }, + + navigateToTagline: function(){ + var modalTaglineHref = app.store.modalTaglineLink.trim() + if (modalTaglineHref.length) { + this.hide() + console.log(modalTaglineHref) + if (modalTaglineHref.indexOf('http') === 0) { + window.open(modalTaglineHref, '_system') + } else { + app.router.go(modalTaglineHref) + } + } + }, + + navigate: function(e){ + var href = $(e.currentTarget).attr('href').replace('#', '') + console.log(href) + this.hide() + app.router.go(href) + }, + + proceed: function(){ + console.log('proceed') + this.hide() + }, + +})
\ No newline at end of file diff --git a/StoneIsland/platforms/ios/www/js/lib/nav/IntroView.js b/StoneIsland/platforms/ios/www/js/lib/nav/IntroView.js index c075619a..8cb92b53 100755 --- a/StoneIsland/platforms/ios/www/js/lib/nav/IntroView.js +++ b/StoneIsland/platforms/ios/www/js/lib/nav/IntroView.js @@ -14,6 +14,7 @@ var IntroView = View.extend({ this.compass = this.$("#compass").get(0) this.orient = this.deviceorientation.bind(this) this.$alert.hide() + this.modal = new IntroModal() }, show: function(){ @@ -21,6 +22,7 @@ var IntroView = View.extend({ window.addEventListener("deviceorientation", this.orient) app.footer.hide() this.orient({ alpha: 0 }) + this.modal.check() }, hide: function(){ diff --git a/StoneIsland/platforms/ios/www/js/lib/nav/NavView.js b/StoneIsland/platforms/ios/www/js/lib/nav/NavView.js index a6a39633..bd068ce0 100755 --- a/StoneIsland/platforms/ios/www/js/lib/nav/NavView.js +++ b/StoneIsland/platforms/ios/www/js/lib/nav/NavView.js @@ -34,6 +34,7 @@ var NavView = View.extend({ "click .returns": "returns", "click .terms": "terms", "click .care": "care", + "click .covid": "covid", "click .fb": "fb", "click .insta": "insta", @@ -158,7 +159,10 @@ var NavView = View.extend({ e.preventDefault() window.open("https://www.stoneisland.com/customercare?utm_source=AppMobile&utm_medium=referral&utm_campaign=CustomerCare", '_system') }, - + covid: function(e){ + e.preventDefault() + window.open("https://www.stoneisland.com/system/selfservice.controller?CONFIGURATION=1701&PARTITION_ID=1&CMD=BROWSE_TOPIC&LANGUAGE=en&COUNTRY=us&USERTYPE=1&TOPIC_ID=149680", '_system') + }, search: function(){ this.hide() |