diff options
24 files changed, 227 insertions, 157 deletions
diff --git a/StoneIsland/config.xml b/StoneIsland/config.xml index eb1960f4..b64145b8 100755 --- a/StoneIsland/config.xml +++ b/StoneIsland/config.xml @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<widget id="us.okfoc.stoneisland" version="0.9.0" android-versionCode="6090" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> +<widget android-versionCode="6090" id="us.okfoc.stoneisland" version="0.9.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <name>Stone Island</name> <description> Stone Island @@ -8,7 +8,6 @@ Jules Laplace </author> <content src="index.html" /> - <plugin name="cordova-plugin-whitelist" version="1" /> <access origin="*" /> <allow-intent href="http://*/*" /> <allow-intent href="https://*/*" /> @@ -16,31 +15,31 @@ <allow-intent href="sms:*" /> <allow-intent href="mailto:*" /> <allow-intent href="geo:*" /> - <preference name="DisallowOverscroll" value="true" /> - <preference name="EnableViewportScale" value="true"/> - <preference name="BackupWebStorage" value="local"/> - <preference name="TopActivityIndicator" value="white"/> - <preference name="SuppressesIncrementalRendering" value="true"/> + <preference name="EnableViewportScale" value="true" /> + <preference name="BackupWebStorage" value="local" /> + <preference name="TopActivityIndicator" value="white" /> + <preference name="SuppressesIncrementalRendering" value="true" /> <preference name="DisallowOverscroll" value="true" /> <preference name="HideKeyboardFormAccessoryBar" value="false" /> <preference name="orientation" value="portrait" /> - <preference name="StatusBarOverlaysWebView" value="false" /> + <preference name="StatusBarOverlaysWebView" value="false" /> <preference name="StatusBarBackgroundColor" value="#000000" /> <preference name="StatusBarStyle" value="lightcontent" /> <preference name="SplashMaintainAspectRatio" value="true" /> - <preference name="ShowSplashScreenSpinner" value="false"/> + <preference name="ShowSplashScreenSpinner" value="false" /> <preference name="AutoHideSplashScreen" value="false" /> <preference name="AllowInlineMediaPlayback" value="true" /> - <platform name="android"> <allow-intent href="market:*" /> - <preference name="AndroidLaunchMode" value="singleTop"/> <preference name="android-minSdkVersion" value="21" /> + <preference name="AndroidLaunchMode" value="singleTop" /> + <preference name="android-minSdkVersion" value="21" /> </platform> <platform name="ios"> <allow-intent href="itms:*" /> <allow-intent href="itms-apps:*" /> - <preference name="BackupWebStorage" value="local"/> - <preference name="KeyboardDisplayRequiresUserAction" value="false"/> + <preference name="BackupWebStorage" value="local" /> + <preference name="KeyboardDisplayRequiresUserAction" value="false" /> </platform> + <plugin name="cordova-plugin-whitelist" spec="1" /> </widget> diff --git a/StoneIsland/package.json b/StoneIsland/package.json index 29c413d0..5775d82f 100644 --- a/StoneIsland/package.json +++ b/StoneIsland/package.json @@ -1,18 +1,24 @@ { - "name": "stone-island", - "version": "1.0.0", - "description": "", - "main": "index.js", - "dependencies": { - "cordova": "^6.4.0", - "cordova-ios": "^4.3.1", - "ios-deploy": "^1.9.0" - }, - "devDependencies": {}, - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1", - "start": "cordova emulate ios --target=\"iPhone-7, 10.2\"" - }, - "author": "", - "license": "UNLICENSED" -} + "name": "stone-island", + "version": "1.0.0", + "description": "", + "main": "index.js", + "dependencies": { + "cordova": "^6.4.0", + "cordova-ios": "^4.3.1", + "ios-deploy": "^1.9.0", + "cordova-plugin-whitelist": "1" + }, + "devDependencies": {}, + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1", + "start": "cordova emulate ios --target=\"iPhone-7, 10.2\"" + }, + "author": "", + "license": "UNLICENSED", + "cordova": { + "plugins": { + "cordova-plugin-whitelist": {} + } + } +}
\ No newline at end of file diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist b/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist index 97c945da..b466f8eb 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist @@ -9,16 +9,16 @@ <key>CFBundleIdentifier</key> <string>us.okfoc.stoneisland</string> <key>CFBundleShortVersionString</key> - <string>0.8.8</string> + <string>0.9.0</string> <key>CFBundleVersion</key> - <string>0.8.8</string> + <string>0.9.0</string> <key>SigningIdentity</key> <string>iPhone Developer: Francesca Agusani (3ECUPBTQ5W)</string> </dict> <key>ArchiveVersion</key> <integer>2</integer> <key>CreationDate</key> - <date>2017-04-13T01:56:15Z</date> + <date>2017-09-23T20:05:16Z</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/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 Binary files differindex dff5b032..fb2e5e41 100644 --- 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 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 Binary files differindex 4d440af8..f50ef020 100644 --- 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 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 63583fed..20d8377d 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 b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib Binary files differindex 8039018f..611d7a09 100644 --- 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 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 fc8e2c02..7c3f5534 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 2c7100d1..09bfb7a2 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 @@ -84,9 +84,13 @@ <data> X2Z6kGsoxHnLhCoBbeIhFHAScMs= </data> + <key>Assets.car</key> + <data> + HOROMFNIhR3lgrUWAA5A5SScBRQ= + </data> <key>CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key> <data> - ReWKhieaAKkUioWij3Ab9OlZusc= + D+EJEHXkJmaaWB/w08GWaja8q3s= </data> <key>CDVLaunchScreen.storyboardc/Info.plist</key> <data> @@ -94,7 +98,7 @@ </data> <key>CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib</key> <data> - GbdAWByVQ89a6oHmUi3LHgnoV8w= + bFSMoRveX2aBqeUdkf0uy4PuTfA= </data> <key>CDVNotification.bundle/beep.wav</key> <data> @@ -102,7 +106,7 @@ </data> <key>Info.plist</key> <data> - jnQ41T86R89T/NRLms6Altvs9N0= + esm7qidDkYZyVd9Yjm+EwUTPJmE= </data> <key>LaunchImage-568h@2x.png</key> <data> @@ -162,7 +166,7 @@ </data> <key>MainViewController.nib</key> <data> - qlYmtklXywDZZRkybMXgBPpSwpw= + PeG6ti4cP+KBD7UrAy+UNr7c2ag= </data> <key>PkgInfo</key> <data> @@ -174,11 +178,11 @@ </data> <key>config.xml</key> <data> - w9TJ33tpbyil1Wsk8LP5NWKuzOA= + 7YMtI91Z2wAAPOG+6xRBFdqcjxs= </data> <key>embedded.mobileprovision</key> <data> - 0t7sQABsmS5sfpNBdmq1A75IaTs= + 6a29fgIuenXjxvHTXPZvMubF7Mk= </data> <key>www/cordova-js-src/exec.js</key> <data> @@ -194,7 +198,7 @@ </data> <key>www/cordova_plugins.js</key> <data> - 4sl2HGQ2TAH4ggZ/Ev/5lpLNDaw= + GDPKC9IXQ7d+cXYCJDwfVM0bsK0= </data> <key>www/css/account.css</key> <data> @@ -390,7 +394,7 @@ </data> <key>www/js/index.js</key> <data> - mCIF9453gfj03wXHO4fPQ4oGz2w= + C8DUPKVibVPQVD9HXKKoIuRguHw= </data> <key>www/js/lib/_router.js</key> <data> @@ -438,7 +442,7 @@ </data> <key>www/js/lib/blogs/BlogView.js</key> <data> - qzZdPFzaPdQIVKXbo/9vdblKhu0= + XZ57l39rkb5nXmank50SQ81rtds= </data> <key>www/js/lib/blogs/HubView.js</key> <data> @@ -494,7 +498,7 @@ </data> <key>www/js/lib/etc/push.js</key> <data> - uVL3zeEF/obIl+PCVKK+IvHZ/V8= + od1QNWb1S5GRtgwku4lrpTT5z7s= </data> <key>www/js/lib/nav/AddressView.js</key> <data> @@ -578,7 +582,7 @@ </data> <key>www/js/sdk/_sdk.js</key> <data> - 4hz0+mnCDTNFXjFcq8n3IRBm/ck= + 5wWFV9L4tiBLhhGudMgI2jp3jmI= </data> <key>www/js/sdk/account.js</key> <data> @@ -692,6 +696,10 @@ <data> DBMSf1DRKjXfKMDgaSJHjnx+wgI= </data> + <key>www/plugins/cordova-plugin-google-analytics/www/analytics.js</key> + <data> + 2UgVPRV4/ypublz8rMNhB+kLW8g= + </data> <key>www/plugins/cordova-plugin-inappbrowser/www/inappbrowser.js</key> <data> EfUzmAcUagDDJeG2yHQTy4FngxU= @@ -943,15 +951,26 @@ 15Cm7tc8cAJKkYbrN6RdRBQO5Bh9xFr7kecMvjgJR2s= </data> </dict> + <key>Assets.car</key> + <dict> + <key>hash</key> + <data> + HOROMFNIhR3lgrUWAA5A5SScBRQ= + </data> + <key>hash2</key> + <data> + xyP1FpxqSk4ytWlKVyQBU2O2xdOHeepCzcY0cVsnV1o= + </data> + </dict> <key>CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key> <dict> <key>hash</key> <data> - ReWKhieaAKkUioWij3Ab9OlZusc= + D+EJEHXkJmaaWB/w08GWaja8q3s= </data> <key>hash2</key> <data> - 4wROfz3T9uK+kP5pkG80e/F9PJKVbIcXvy0MANFL9hc= + RUdDZjLMYIChaInxaVTuyuXJjWaAFqR8xz4ZvQ3nhCE= </data> </dict> <key>CDVLaunchScreen.storyboardc/Info.plist</key> @@ -969,11 +988,11 @@ <dict> <key>hash</key> <data> - GbdAWByVQ89a6oHmUi3LHgnoV8w= + bFSMoRveX2aBqeUdkf0uy4PuTfA= </data> <key>hash2</key> <data> - Y+q1HzeT/hXMA5fEd6xCBH82wVvTNtDo1IowYhQj380= + ay2HWexwhjN0zP60fqyWS7DTwYkAdh89o2eDaw700/c= </data> </dict> <key>CDVNotification.bundle/beep.wav</key> @@ -1145,11 +1164,11 @@ <dict> <key>hash</key> <data> - qlYmtklXywDZZRkybMXgBPpSwpw= + PeG6ti4cP+KBD7UrAy+UNr7c2ag= </data> <key>hash2</key> <data> - j6k7SGDUQm/EoDDMgza8eWoMU9809kauyD8XdKHb87g= + 6XyM1ywOCW44jmLU3QOx9rKkYEIaAIdVlIjhJNdu9ZQ= </data> </dict> <key>archived-expanded-entitlements.xcent</key> @@ -1167,22 +1186,22 @@ <dict> <key>hash</key> <data> - w9TJ33tpbyil1Wsk8LP5NWKuzOA= + 7YMtI91Z2wAAPOG+6xRBFdqcjxs= </data> <key>hash2</key> <data> - llSr3ohAhM3aZvp7kMShrHx5z8OJEuWSTZ1+VOkOvTo= + qsB4PNWHbi11YpRd12vksSqE6cd9wUUB+Li5yTqS3iE= </data> </dict> <key>embedded.mobileprovision</key> <dict> <key>hash</key> <data> - 0t7sQABsmS5sfpNBdmq1A75IaTs= + 6a29fgIuenXjxvHTXPZvMubF7Mk= </data> <key>hash2</key> <data> - IyefHw++6L0b/5Vg7P0cdhekWU/YEnaOFycYNL/p7HQ= + bsbcK855Yy1AFdFbpZOEfNlwpqtrxpMeWJJkDULt+D8= </data> </dict> <key>www/cordova-js-src/exec.js</key> @@ -1222,11 +1241,11 @@ <dict> <key>hash</key> <data> - 4sl2HGQ2TAH4ggZ/Ev/5lpLNDaw= + GDPKC9IXQ7d+cXYCJDwfVM0bsK0= </data> <key>hash2</key> <data> - Qb0tHMyGCXENxGtKM0B2DeRZTq2n3r1zz/bBEC/FTqo= + 7ZSaz29vr68YvDEfSkWNBWEcnjjw7rHfJ5Ym/Jx1r3o= </data> </dict> <key>www/css/account.css</key> @@ -1761,11 +1780,11 @@ <dict> <key>hash</key> <data> - mCIF9453gfj03wXHO4fPQ4oGz2w= + C8DUPKVibVPQVD9HXKKoIuRguHw= </data> <key>hash2</key> <data> - Tt1X66Dcly53xIKSCYvZKeuvFV+nb+svD1f4ugse9H8= + 3UXGHe/2SlMai39hVs8y22F61zarqDgmUSe+bmKbS3w= </data> </dict> <key>www/js/lib/_router.js</key> @@ -1893,11 +1912,11 @@ <dict> <key>hash</key> <data> - qzZdPFzaPdQIVKXbo/9vdblKhu0= + XZ57l39rkb5nXmank50SQ81rtds= </data> <key>hash2</key> <data> - LVqlKMd6ha14mJ3WbFBukHeCe8hhMgheq+tJI4uG14Q= + uDNYBYkepNo957b+bXnG0qorjTjFOskXi9r3zwnUEkY= </data> </dict> <key>www/js/lib/blogs/HubView.js</key> @@ -2047,11 +2066,11 @@ <dict> <key>hash</key> <data> - uVL3zeEF/obIl+PCVKK+IvHZ/V8= + od1QNWb1S5GRtgwku4lrpTT5z7s= </data> <key>hash2</key> <data> - myKuZqI9kxrw+cyEdPX1T+GO3qEtXVddsGtc3BsiHbo= + 6V6mvf2UJ0zXesqTmLPv5RpR2gghv+saPePjoSIPAiI= </data> </dict> <key>www/js/lib/nav/AddressView.js</key> @@ -2278,11 +2297,11 @@ <dict> <key>hash</key> <data> - 4hz0+mnCDTNFXjFcq8n3IRBm/ck= + 5wWFV9L4tiBLhhGudMgI2jp3jmI= </data> <key>hash2</key> <data> - nlwVzdPthiCwaIaxt8fE3E6WnslKiGmld5UUKa2XD+c= + Te+2SuuiEIFW14fl3t7LK5w8xmKQyHkA76SW4h4Yfm8= </data> </dict> <key>www/js/sdk/account.js</key> @@ -2593,6 +2612,17 @@ c0FvNwJUoj6DTFiJbDJ//4pUO/Nc0Pmmq+lh9eVocuE= </data> </dict> + <key>www/plugins/cordova-plugin-google-analytics/www/analytics.js</key> + <dict> + <key>hash</key> + <data> + 2UgVPRV4/ypublz8rMNhB+kLW8g= + </data> + <key>hash2</key> + <data> + 1g4SfpnqGa216VS6pZZwiQ0XY0/Zmp2e9U7JvIO9P+g= + </data> + </dict> <key>www/plugins/cordova-plugin-inappbrowser/www/inappbrowser.js</key> <dict> <key>hash</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 19f7b057..a224bc56 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="6088" id="us.okfoc.stoneisland" version="0.8.8" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> +<widget android-versionCode="6090" id="us.okfoc.stoneisland" version="0.9.0" 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> @@ -47,12 +47,15 @@ <feature name="PushNotification"> <param name="ios-package" value="PushPlugin" /> </feature> + <feature name="UniversalAnalytics"> + <param name="ios-package" value="UniversalAnalyticsPlugin" /> + </feature> <name>Stone Island</name> <description> Stone Island </description> - <author email="frontdesk@okfoc.us" href="http://okfoc.us/"> - OKFocus + <author email="julescarbon@gmail.com" href="http://asdf.us/"> + Jules Laplace </author> <content src="index.html" /> <access origin="*" /> diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/embedded.mobileprovision b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/embedded.mobileprovision Binary files differindex 275b8509..7ef37a30 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/embedded.mobileprovision +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/embedded.mobileprovision diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/cordova_plugins.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/cordova_plugins.js index 4c67a219..878291ea 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/cordova_plugins.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/cordova_plugins.js @@ -130,6 +130,15 @@ module.exports = [ "clobbers": [ "PushNotification" ] + }, + { + "id": "cordova-plugin-google-analytics.UniversalAnalytics", + "file": "plugins/cordova-plugin-google-analytics/www/analytics.js", + "pluginId": "cordova-plugin-google-analytics", + "clobbers": [ + "analytics", + "ga" + ] } ]; module.exports.metadata = @@ -147,7 +156,8 @@ module.exports.metadata = "cordova-plugin-whitelist": "1.3.0", "cordova-plugin-x-socialsharing": "5.1.3", "ionic-plugin-keyboard": "2.2.1", - "phonegap-plugin-push": "1.9.2" + "phonegap-plugin-push": "1.9.2", + "cordova-plugin-google-analytics": "1.8.3" }; // BOTTOM OF METADATA });
\ No newline at end of file diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/index.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/index.js index 43b55b04..a28faabf 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/index.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/index.js @@ -4,7 +4,7 @@ var app = (function(){ app.init = function(){ console.log("init") - if (window.location.hostname === 'lvh.me' || window.location.hostname === 'stone.giraffe.life') { + if (window.location.hostname === 'lvh.me' || window.location.hostname === 'stone.giraffe.life' || window.location.hostname === 'dev.stone.giraffe.life') { console.log('launching in test mode') sdk.init({ env: "test" }) } diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/blogs/BlogView.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/blogs/BlogView.js index a6ec75f2..fd7b5212 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/blogs/BlogView.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/blogs/BlogView.js @@ -9,8 +9,8 @@ var BlogView = View.extend({ fetch: function(fn){ $.ajax({ method: "GET", - url: sdk.env === 'test' ? '/db.json' : "https://stone.sup.land/db.json", - // url: "https://stone.sup.land/db.json", + url: sdk.env === 'test' ? '/db.json' : sdk.cms() + '/db.json', + // url: "https://stone.giraffe.life/db.json", success: function(data){ this.success(data) fn && fn() @@ -31,7 +31,14 @@ var BlogView = View.extend({ this.loaded = true this.data = data = typeof data == "string" ? JSON.parse(data) : data - app.store = data.store[0] + // sdk.env = 'test' + + if (sdk.env === 'test') { + app.store = data.store[1] + } + else { + app.store = data.store[0] + } switch (app.store.DepartmentStoreStatus) { case "open": @@ -44,8 +51,6 @@ var BlogView = View.extend({ break } - // sdk.env = 'test' - if (app.closed.storeIsClosed && sdk.env !== 'test') { app.closed.populate(app.store.ClosedStoreImages) } @@ -59,7 +64,7 @@ var BlogView = View.extend({ if (sdk.env === 'test') { app.department_id = window.location.search.substr(1) || app.department_id console.log('using test department id', app.department_id) - app.department_id = 'TSTSZS' + // app.department_id = 'TSTSZS' } app.collection.loaded = false app.collection.fetch() diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/etc/push.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/etc/push.js index 6a1dfa5b..1606199f 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/etc/push.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/etc/push.js @@ -70,7 +70,7 @@ var push = (function(){ }) $.ajax({ method: "POST", - url: "https://stone.sup.land/_services/push/add", + url: push.url('add'), data: data, contentType: 'application/x-www-form-urlencoded; charset=UTF-8', success: function(){ @@ -91,7 +91,7 @@ var push = (function(){ } $.ajax({ method: "POST", - url: "https://stone.sup.land/_services/push/remove", + url: push.url('remove'), data: data, contentType: 'application/x-www-form-urlencoded; charset=UTF-8', success: function(){ @@ -101,8 +101,11 @@ var push = (function(){ error: push.error, }) } + push.url = function(key){ + return sdk.cms() + '/_services/push/' + key + } push.got_push_notification = function(push_obj) { - // alert('We received this push notification: ' + JSON.stringify(push_obj)); + console.log('We received this push notification: ' + JSON.stringify(push_obj)); app.blog.refresh() try { diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/sdk/_sdk.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/sdk/_sdk.js index 705ca002..c251e364 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/sdk/_sdk.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/sdk/_sdk.js @@ -29,6 +29,11 @@ var sdk = (function(){ return "https://cdn.yoox.biz/" + code.substr(0,2) + "/" + code + "_" + size + ".jpg" } + sdk.cms = function(){ + return "http://staging.stone.giraffe.life" + // return "https://stone.giraffe.life" + } + $.ajaxSetup({ // possibly: application/json; charset=utf-8" contentType: "application/json", 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 a14115d2..c32d51dc 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 57cb0754..22781695 100644 --- a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist +++ b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist @@ -1,74 +1,74 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> -<dict> - <key>CFBundleDevelopmentRegion</key> - <string>English</string> - <key>CFBundleDisplayName</key> - <string>${PRODUCT_NAME}</string> - <key>CFBundleExecutable</key> - <string>${EXECUTABLE_NAME}</string> - <key>CFBundleIcons</key> - <dict/> - <key>CFBundleIcons~ipad</key> - <dict/> - <key>CFBundleIdentifier</key> - <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string> - <key>CFBundleInfoDictionaryVersion</key> - <string>6.0</string> - <key>CFBundleName</key> - <string>${PRODUCT_NAME}</string> - <key>CFBundlePackageType</key> - <string>APPL</string> - <key>CFBundleShortVersionString</key> - <string>0.9.0</string> - <key>CFBundleSignature</key> - <string>????</string> - <key>CFBundleURLTypes</key> - <array> - <dict> - <key>CFBundleURLSchemes</key> - <array> - <string>stoneisland</string> - </array> - </dict> - </array> - <key>CFBundleVersion</key> - <string>0.9.0</string> - <key>GCM_SENDER_ID</key> - <string>XXXXXXX</string> - <key>IS_GCM_ENABLED</key> - <true/> - <key>LSRequiresIPhoneOS</key> - <true/> - <key>NSAppTransportSecurity</key> - <dict> - <key>NSAllowsArbitraryLoads</key> - <true/> - </dict> - <key>NSLocationWhenInUseUsageDescription</key> - <string></string> - <key>NSMainNibFile~ipad</key> - <string></string> - <key>UIBackgroundModes</key> - <array> - <string>remote-notification</string> - </array> - <key>UIInterfaceOrientation</key> - <array> - <string>UIInterfaceOrientationPortrait</string> - </array> - <key>UIRequiresFullScreen</key> - <true/> - <key>UISupportedInterfaceOrientations</key> - <array> - <string>UIInterfaceOrientationPortrait</string> - <string>UIInterfaceOrientationPortraitUpsideDown</string> - </array> - <key>UISupportedInterfaceOrientations~ipad</key> - <array> - <string>UIInterfaceOrientationPortrait</string> - <string>UIInterfaceOrientationPortraitUpsideDown</string> - </array> -</dict> -</plist> + <dict> + <key>CFBundleDevelopmentRegion</key> + <string>English</string> + <key>CFBundleDisplayName</key> + <string>${PRODUCT_NAME}</string> + <key>CFBundleExecutable</key> + <string>${EXECUTABLE_NAME}</string> + <key>CFBundleIcons</key> + <dict/> + <key>CFBundleIcons~ipad</key> + <dict/> + <key>CFBundleIdentifier</key> + <string>us.okfoc.stoneisland</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundleName</key> + <string>${PRODUCT_NAME}</string> + <key>CFBundlePackageType</key> + <string>APPL</string> + <key>CFBundleShortVersionString</key> + <string>0.9.0</string> + <key>CFBundleSignature</key> + <string>????</string> + <key>CFBundleURLTypes</key> + <array> + <dict> + <key>CFBundleURLSchemes</key> + <array> + <string>stoneisland</string> + </array> + </dict> + </array> + <key>CFBundleVersion</key> + <string>0.9.0</string> + <key>GCM_SENDER_ID</key> + <string>XXXXXXX</string> + <key>IS_GCM_ENABLED</key> + <true/> + <key>LSRequiresIPhoneOS</key> + <true/> + <key>NSAppTransportSecurity</key> + <dict> + <key>NSAllowsArbitraryLoads</key> + <true/> + </dict> + <key>NSLocationWhenInUseUsageDescription</key> + <string/> + <key>NSMainNibFile~ipad</key> + <string/> + <key>UIBackgroundModes</key> + <array> + <string>remote-notification</string> + </array> + <key>UIInterfaceOrientation</key> + <array> + <string>UIInterfaceOrientationPortrait</string> + </array> + <key>UIRequiresFullScreen</key> + <true/> + <key>UISupportedInterfaceOrientations</key> + <array> + <string>UIInterfaceOrientationPortrait</string> + <string>UIInterfaceOrientationPortraitUpsideDown</string> + </array> + <key>UISupportedInterfaceOrientations~ipad</key> + <array> + <string>UIInterfaceOrientationPortrait</string> + <string>UIInterfaceOrientationPortraitUpsideDown</string> + </array> + </dict> +</plist>
\ No newline at end of file diff --git a/StoneIsland/platforms/ios/www/js/index.js b/StoneIsland/platforms/ios/www/js/index.js index 43b55b04..a28faabf 100755 --- a/StoneIsland/platforms/ios/www/js/index.js +++ b/StoneIsland/platforms/ios/www/js/index.js @@ -4,7 +4,7 @@ var app = (function(){ app.init = function(){ console.log("init") - if (window.location.hostname === 'lvh.me' || window.location.hostname === 'stone.giraffe.life') { + if (window.location.hostname === 'lvh.me' || window.location.hostname === 'stone.giraffe.life' || window.location.hostname === 'dev.stone.giraffe.life') { console.log('launching in test mode') sdk.init({ env: "test" }) } diff --git a/StoneIsland/platforms/ios/www/js/lib/blogs/BlogView.js b/StoneIsland/platforms/ios/www/js/lib/blogs/BlogView.js index 598a0241..fd7b5212 100755 --- a/StoneIsland/platforms/ios/www/js/lib/blogs/BlogView.js +++ b/StoneIsland/platforms/ios/www/js/lib/blogs/BlogView.js @@ -9,8 +9,8 @@ var BlogView = View.extend({ fetch: function(fn){ $.ajax({ method: "GET", - url: sdk.env === 'test' ? '/db.json' : "https://stone.sup.land/db.json", - // url: "https://stone.sup.land/db.json", + url: sdk.env === 'test' ? '/db.json' : sdk.cms() + '/db.json', + // url: "https://stone.giraffe.life/db.json", success: function(data){ this.success(data) fn && fn() diff --git a/StoneIsland/platforms/ios/www/js/lib/etc/push.js b/StoneIsland/platforms/ios/www/js/lib/etc/push.js index 6a1dfa5b..1606199f 100755 --- a/StoneIsland/platforms/ios/www/js/lib/etc/push.js +++ b/StoneIsland/platforms/ios/www/js/lib/etc/push.js @@ -70,7 +70,7 @@ var push = (function(){ }) $.ajax({ method: "POST", - url: "https://stone.sup.land/_services/push/add", + url: push.url('add'), data: data, contentType: 'application/x-www-form-urlencoded; charset=UTF-8', success: function(){ @@ -91,7 +91,7 @@ var push = (function(){ } $.ajax({ method: "POST", - url: "https://stone.sup.land/_services/push/remove", + url: push.url('remove'), data: data, contentType: 'application/x-www-form-urlencoded; charset=UTF-8', success: function(){ @@ -101,8 +101,11 @@ var push = (function(){ error: push.error, }) } + push.url = function(key){ + return sdk.cms() + '/_services/push/' + key + } push.got_push_notification = function(push_obj) { - // alert('We received this push notification: ' + JSON.stringify(push_obj)); + console.log('We received this push notification: ' + JSON.stringify(push_obj)); app.blog.refresh() try { diff --git a/StoneIsland/platforms/ios/www/js/sdk/_sdk.js b/StoneIsland/platforms/ios/www/js/sdk/_sdk.js index 705ca002..c251e364 100755 --- a/StoneIsland/platforms/ios/www/js/sdk/_sdk.js +++ b/StoneIsland/platforms/ios/www/js/sdk/_sdk.js @@ -29,6 +29,11 @@ var sdk = (function(){ return "https://cdn.yoox.biz/" + code.substr(0,2) + "/" + code + "_" + size + ".jpg" } + sdk.cms = function(){ + return "http://staging.stone.giraffe.life" + // return "https://stone.giraffe.life" + } + $.ajaxSetup({ // possibly: application/json; charset=utf-8" contentType: "application/json", diff --git a/StoneIsland/www/js/lib/blogs/BlogView.js b/StoneIsland/www/js/lib/blogs/BlogView.js index 9fe28132..fd7b5212 100755 --- a/StoneIsland/www/js/lib/blogs/BlogView.js +++ b/StoneIsland/www/js/lib/blogs/BlogView.js @@ -9,7 +9,7 @@ var BlogView = View.extend({ fetch: function(fn){ $.ajax({ method: "GET", - url: sdk.env === 'test' ? '/db.json' : "https://stone.giraffe.life/db.json", + url: sdk.env === 'test' ? '/db.json' : sdk.cms() + '/db.json', // url: "https://stone.giraffe.life/db.json", success: function(data){ this.success(data) diff --git a/StoneIsland/www/js/sdk/_sdk.js b/StoneIsland/www/js/sdk/_sdk.js index fbb35785..c251e364 100755 --- a/StoneIsland/www/js/sdk/_sdk.js +++ b/StoneIsland/www/js/sdk/_sdk.js @@ -30,7 +30,8 @@ var sdk = (function(){ } sdk.cms = function(){ - return "https://stone.giraffe.life" + return "http://staging.stone.giraffe.life" + // return "https://stone.giraffe.life" } $.ajaxSetup({ |