From d793f5f92da6973173452709473e4bdd46a4171f Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Sat, 23 Sep 2017 22:06:43 +0200 Subject: pushing everything to hub --- StoneIsland/config.xml | 25 ++-- StoneIsland/package.json | 40 +++--- .../ios/Stone Island.xcarchive/Info.plist | 6 +- .../01J-lp-oVM-view-Ze5-6b-2t3.nib | Bin 2286 -> 2284 bytes .../UIViewController-01J-lp-oVM.nib | Bin 832 -> 832 bytes .../Applications/Stone Island.app/Info.plist | Bin 2154 -> 2171 bytes .../Stone Island.app/MainViewController.nib | Bin 943 -> 943 bytes .../Applications/Stone Island.app/Stone Island | Bin 2192608 -> 3964448 bytes .../Stone Island.app/_CodeSignature/CodeResources | 92 ++++++++----- .../Applications/Stone Island.app/config.xml | 9 +- .../Stone Island.app/embedded.mobileprovision | Bin 11560 -> 11560 bytes .../Stone Island.app/www/cordova_plugins.js | 12 +- .../Applications/Stone Island.app/www/js/index.js | 2 +- .../Stone Island.app/www/js/lib/blogs/BlogView.js | 17 ++- .../Stone Island.app/www/js/lib/etc/push.js | 9 +- .../Stone Island.app/www/js/sdk/_sdk.js | 5 + .../UserInterfaceState.xcuserstate | Bin 41082 -> 59854 bytes .../ios/Stone Island/Stone Island-Info.plist | 142 ++++++++++----------- StoneIsland/platforms/ios/www/js/index.js | 2 +- .../platforms/ios/www/js/lib/blogs/BlogView.js | 4 +- StoneIsland/platforms/ios/www/js/lib/etc/push.js | 9 +- StoneIsland/platforms/ios/www/js/sdk/_sdk.js | 5 + StoneIsland/www/js/lib/blogs/BlogView.js | 2 +- StoneIsland/www/js/sdk/_sdk.js | 3 +- 24 files changed, 227 insertions(+), 157 deletions(-) (limited to 'StoneIsland') 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 @@ - + Stone Island Stone Island @@ -8,7 +8,6 @@ Jules Laplace - @@ -16,31 +15,31 @@ - - - - - + + + + - + - + - - + + - - + + + 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 @@ CFBundleIdentifier us.okfoc.stoneisland CFBundleShortVersionString - 0.8.8 + 0.9.0 CFBundleVersion - 0.8.8 + 0.9.0 SigningIdentity iPhone Developer: Francesca Agusani (3ECUPBTQ5W) ArchiveVersion 2 CreationDate - 2017-04-13T01:56:15Z + 2017-09-23T20:05:16Z Name Stone Island SchemeName 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 dff5b032..fb2e5e41 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 4d440af8..f50ef020 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/Info.plist b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Info.plist index 63583fed..20d8377d 100644 Binary files a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Info.plist and b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Info.plist 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 8039018f..611d7a09 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 fc8e2c02..7c3f5534 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 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 @@ X2Z6kGsoxHnLhCoBbeIhFHAScMs= + Assets.car + + HOROMFNIhR3lgrUWAA5A5SScBRQ= + CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib - ReWKhieaAKkUioWij3Ab9OlZusc= + D+EJEHXkJmaaWB/w08GWaja8q3s= CDVLaunchScreen.storyboardc/Info.plist @@ -94,7 +98,7 @@ CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib - GbdAWByVQ89a6oHmUi3LHgnoV8w= + bFSMoRveX2aBqeUdkf0uy4PuTfA= CDVNotification.bundle/beep.wav @@ -102,7 +106,7 @@ Info.plist - jnQ41T86R89T/NRLms6Altvs9N0= + esm7qidDkYZyVd9Yjm+EwUTPJmE= LaunchImage-568h@2x.png @@ -162,7 +166,7 @@ MainViewController.nib - qlYmtklXywDZZRkybMXgBPpSwpw= + PeG6ti4cP+KBD7UrAy+UNr7c2ag= PkgInfo @@ -174,11 +178,11 @@ config.xml - w9TJ33tpbyil1Wsk8LP5NWKuzOA= + 7YMtI91Z2wAAPOG+6xRBFdqcjxs= embedded.mobileprovision - 0t7sQABsmS5sfpNBdmq1A75IaTs= + 6a29fgIuenXjxvHTXPZvMubF7Mk= www/cordova-js-src/exec.js @@ -194,7 +198,7 @@ www/cordova_plugins.js - 4sl2HGQ2TAH4ggZ/Ev/5lpLNDaw= + GDPKC9IXQ7d+cXYCJDwfVM0bsK0= www/css/account.css @@ -390,7 +394,7 @@ www/js/index.js - mCIF9453gfj03wXHO4fPQ4oGz2w= + C8DUPKVibVPQVD9HXKKoIuRguHw= www/js/lib/_router.js @@ -438,7 +442,7 @@ www/js/lib/blogs/BlogView.js - qzZdPFzaPdQIVKXbo/9vdblKhu0= + XZ57l39rkb5nXmank50SQ81rtds= www/js/lib/blogs/HubView.js @@ -494,7 +498,7 @@ www/js/lib/etc/push.js - uVL3zeEF/obIl+PCVKK+IvHZ/V8= + od1QNWb1S5GRtgwku4lrpTT5z7s= www/js/lib/nav/AddressView.js @@ -578,7 +582,7 @@ www/js/sdk/_sdk.js - 4hz0+mnCDTNFXjFcq8n3IRBm/ck= + 5wWFV9L4tiBLhhGudMgI2jp3jmI= www/js/sdk/account.js @@ -692,6 +696,10 @@ DBMSf1DRKjXfKMDgaSJHjnx+wgI= + www/plugins/cordova-plugin-google-analytics/www/analytics.js + + 2UgVPRV4/ypublz8rMNhB+kLW8g= + www/plugins/cordova-plugin-inappbrowser/www/inappbrowser.js EfUzmAcUagDDJeG2yHQTy4FngxU= @@ -943,15 +951,26 @@ 15Cm7tc8cAJKkYbrN6RdRBQO5Bh9xFr7kecMvjgJR2s= + Assets.car + + hash + + HOROMFNIhR3lgrUWAA5A5SScBRQ= + + hash2 + + xyP1FpxqSk4ytWlKVyQBU2O2xdOHeepCzcY0cVsnV1o= + + CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib hash - ReWKhieaAKkUioWij3Ab9OlZusc= + D+EJEHXkJmaaWB/w08GWaja8q3s= hash2 - 4wROfz3T9uK+kP5pkG80e/F9PJKVbIcXvy0MANFL9hc= + RUdDZjLMYIChaInxaVTuyuXJjWaAFqR8xz4ZvQ3nhCE= CDVLaunchScreen.storyboardc/Info.plist @@ -969,11 +988,11 @@ hash - GbdAWByVQ89a6oHmUi3LHgnoV8w= + bFSMoRveX2aBqeUdkf0uy4PuTfA= hash2 - Y+q1HzeT/hXMA5fEd6xCBH82wVvTNtDo1IowYhQj380= + ay2HWexwhjN0zP60fqyWS7DTwYkAdh89o2eDaw700/c= CDVNotification.bundle/beep.wav @@ -1145,11 +1164,11 @@ hash - qlYmtklXywDZZRkybMXgBPpSwpw= + PeG6ti4cP+KBD7UrAy+UNr7c2ag= hash2 - j6k7SGDUQm/EoDDMgza8eWoMU9809kauyD8XdKHb87g= + 6XyM1ywOCW44jmLU3QOx9rKkYEIaAIdVlIjhJNdu9ZQ= archived-expanded-entitlements.xcent @@ -1167,22 +1186,22 @@ hash - w9TJ33tpbyil1Wsk8LP5NWKuzOA= + 7YMtI91Z2wAAPOG+6xRBFdqcjxs= hash2 - llSr3ohAhM3aZvp7kMShrHx5z8OJEuWSTZ1+VOkOvTo= + qsB4PNWHbi11YpRd12vksSqE6cd9wUUB+Li5yTqS3iE= embedded.mobileprovision hash - 0t7sQABsmS5sfpNBdmq1A75IaTs= + 6a29fgIuenXjxvHTXPZvMubF7Mk= hash2 - IyefHw++6L0b/5Vg7P0cdhekWU/YEnaOFycYNL/p7HQ= + bsbcK855Yy1AFdFbpZOEfNlwpqtrxpMeWJJkDULt+D8= www/cordova-js-src/exec.js @@ -1222,11 +1241,11 @@ hash - 4sl2HGQ2TAH4ggZ/Ev/5lpLNDaw= + GDPKC9IXQ7d+cXYCJDwfVM0bsK0= hash2 - Qb0tHMyGCXENxGtKM0B2DeRZTq2n3r1zz/bBEC/FTqo= + 7ZSaz29vr68YvDEfSkWNBWEcnjjw7rHfJ5Ym/Jx1r3o= www/css/account.css @@ -1761,11 +1780,11 @@ hash - mCIF9453gfj03wXHO4fPQ4oGz2w= + C8DUPKVibVPQVD9HXKKoIuRguHw= hash2 - Tt1X66Dcly53xIKSCYvZKeuvFV+nb+svD1f4ugse9H8= + 3UXGHe/2SlMai39hVs8y22F61zarqDgmUSe+bmKbS3w= www/js/lib/_router.js @@ -1893,11 +1912,11 @@ hash - qzZdPFzaPdQIVKXbo/9vdblKhu0= + XZ57l39rkb5nXmank50SQ81rtds= hash2 - LVqlKMd6ha14mJ3WbFBukHeCe8hhMgheq+tJI4uG14Q= + uDNYBYkepNo957b+bXnG0qorjTjFOskXi9r3zwnUEkY= www/js/lib/blogs/HubView.js @@ -2047,11 +2066,11 @@ hash - uVL3zeEF/obIl+PCVKK+IvHZ/V8= + od1QNWb1S5GRtgwku4lrpTT5z7s= hash2 - myKuZqI9kxrw+cyEdPX1T+GO3qEtXVddsGtc3BsiHbo= + 6V6mvf2UJ0zXesqTmLPv5RpR2gghv+saPePjoSIPAiI= www/js/lib/nav/AddressView.js @@ -2278,11 +2297,11 @@ hash - 4hz0+mnCDTNFXjFcq8n3IRBm/ck= + 5wWFV9L4tiBLhhGudMgI2jp3jmI= hash2 - nlwVzdPthiCwaIaxt8fE3E6WnslKiGmld5UUKa2XD+c= + Te+2SuuiEIFW14fl3t7LK5w8xmKQyHkA76SW4h4Yfm8= www/js/sdk/account.js @@ -2593,6 +2612,17 @@ c0FvNwJUoj6DTFiJbDJ//4pUO/Nc0Pmmq+lh9eVocuE= + www/plugins/cordova-plugin-google-analytics/www/analytics.js + + hash + + 2UgVPRV4/ypublz8rMNhB+kLW8g= + + hash2 + + 1g4SfpnqGa216VS6pZZwiQ0XY0/Zmp2e9U7JvIO9P+g= + + www/plugins/cordova-plugin-inappbrowser/www/inappbrowser.js hash 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 @@ - + @@ -47,12 +47,15 @@ + + + Stone Island Stone Island - - OKFocus + + Jules Laplace 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 index 275b8509..7ef37a30 100644 Binary files a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/embedded.mobileprovision and b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/embedded.mobileprovision differ 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 index a14115d2..c32d51dc 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/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 @@ - - CFBundleDevelopmentRegion - English - CFBundleDisplayName - ${PRODUCT_NAME} - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIcons - - CFBundleIcons~ipad - - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - APPL - CFBundleShortVersionString - 0.9.0 - CFBundleSignature - ???? - CFBundleURLTypes - - - CFBundleURLSchemes - - stoneisland - - - - CFBundleVersion - 0.9.0 - GCM_SENDER_ID - XXXXXXX - IS_GCM_ENABLED - - LSRequiresIPhoneOS - - NSAppTransportSecurity - - NSAllowsArbitraryLoads - - - NSLocationWhenInUseUsageDescription - - NSMainNibFile~ipad - - UIBackgroundModes - - remote-notification - - UIInterfaceOrientation - - UIInterfaceOrientationPortrait - - UIRequiresFullScreen - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - - - + + CFBundleDevelopmentRegion + English + CFBundleDisplayName + ${PRODUCT_NAME} + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIcons + + CFBundleIcons~ipad + + CFBundleIdentifier + us.okfoc.stoneisland + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + APPL + CFBundleShortVersionString + 0.9.0 + CFBundleSignature + ???? + CFBundleURLTypes + + + CFBundleURLSchemes + + stoneisland + + + + CFBundleVersion + 0.9.0 + GCM_SENDER_ID + XXXXXXX + IS_GCM_ENABLED + + LSRequiresIPhoneOS + + NSAppTransportSecurity + + NSAllowsArbitraryLoads + + + NSLocationWhenInUseUsageDescription + + NSMainNibFile~ipad + + UIBackgroundModes + + remote-notification + + UIInterfaceOrientation + + UIInterfaceOrientationPortrait + + UIRequiresFullScreen + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + + + \ 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({ -- cgit v1.2.3-70-g09d2