From 6a9186aea6b85beef28e3eb765fbf2322a1c7890 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 26 Sep 2017 00:47:11 +0200 Subject: wtf broken --- .../UserInterfaceState.xcuserstate | Bin 59744 -> 111565 bytes .../Resources/GoogleService-Info.plist | 34 ++++++++++++++++++ .../Resources/Resources/GoogleService-Info.plist | 40 +++++++++++++++++++++ .../ios/Stone Island/Stone Island-Info.plist | 4 +-- StoneIsland/platforms/ios/Stone Island/config.xml | 10 +++--- StoneIsland/platforms/ios/ios.json | 19 +++++++++- .../platforms/ios/platform_www/cordova_plugins.js | 3 +- StoneIsland/platforms/ios/www/cordova_plugins.js | 3 +- StoneIsland/platforms/ios/www/js/lib/_router.js | 3 ++ StoneIsland/platforms/ios/www/js/lib/etc/push.js | 8 ++--- .../ios/www/js/lib/products/ProductView.js | 2 ++ StoneIsland/platforms/ios/www/js/sdk/auth.js | 4 +++ 12 files changed, 116 insertions(+), 14 deletions(-) create mode 100644 StoneIsland/platforms/ios/Stone Island/Resources/Resources/GoogleService-Info.plist (limited to 'StoneIsland/platforms/ios') 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 06f45880..7d29ed0f 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/Resources/GoogleService-Info.plist b/StoneIsland/platforms/ios/Stone Island/Resources/GoogleService-Info.plist index 5516ebf3..0d23216d 100644 --- a/StoneIsland/platforms/ios/Stone Island/Resources/GoogleService-Info.plist +++ b/StoneIsland/platforms/ios/Stone Island/Resources/GoogleService-Info.plist @@ -2,5 +2,39 @@ + AD_UNIT_ID_FOR_BANNER_TEST + ca-app-pub-3940256099942544/2934735716 + AD_UNIT_ID_FOR_INTERSTITIAL_TEST + ca-app-pub-3940256099942544/4411468910 + CLIENT_ID + 426306878988-nuqlbd4k944sk5mm63vdubdptb3cpkmt.apps.googleusercontent.com + REVERSED_CLIENT_ID + com.googleusercontent.apps.426306878988-nuqlbd4k944sk5mm63vdubdptb3cpkmt + API_KEY + AIzaSyAp9tJ_gK45ZhRDiaKOCgvsztQMbhsD_Ms + GCM_SENDER_ID + 426306878988 + PLIST_VERSION + 1 + BUNDLE_ID + us.okfoc.stoneisland + PROJECT_ID + stone-island + STORAGE_BUCKET + stone-island.appspot.com + IS_ADS_ENABLED + + IS_ANALYTICS_ENABLED + + IS_APPINVITE_ENABLED + + IS_GCM_ENABLED + + IS_SIGNIN_ENABLED + + GOOGLE_APP_ID + 1:426306878988:ios:0efb92963073829a + DATABASE_URL + https://stone-island.firebaseio.com \ No newline at end of file diff --git a/StoneIsland/platforms/ios/Stone Island/Resources/Resources/GoogleService-Info.plist b/StoneIsland/platforms/ios/Stone Island/Resources/Resources/GoogleService-Info.plist new file mode 100644 index 00000000..0d23216d --- /dev/null +++ b/StoneIsland/platforms/ios/Stone Island/Resources/Resources/GoogleService-Info.plist @@ -0,0 +1,40 @@ + + + + + AD_UNIT_ID_FOR_BANNER_TEST + ca-app-pub-3940256099942544/2934735716 + AD_UNIT_ID_FOR_INTERSTITIAL_TEST + ca-app-pub-3940256099942544/4411468910 + CLIENT_ID + 426306878988-nuqlbd4k944sk5mm63vdubdptb3cpkmt.apps.googleusercontent.com + REVERSED_CLIENT_ID + com.googleusercontent.apps.426306878988-nuqlbd4k944sk5mm63vdubdptb3cpkmt + API_KEY + AIzaSyAp9tJ_gK45ZhRDiaKOCgvsztQMbhsD_Ms + GCM_SENDER_ID + 426306878988 + PLIST_VERSION + 1 + BUNDLE_ID + us.okfoc.stoneisland + PROJECT_ID + stone-island + STORAGE_BUCKET + stone-island.appspot.com + IS_ADS_ENABLED + + IS_ANALYTICS_ENABLED + + IS_APPINVITE_ENABLED + + IS_GCM_ENABLED + + IS_SIGNIN_ENABLED + + GOOGLE_APP_ID + 1:426306878988:ios:0efb92963073829a + DATABASE_URL + https://stone-island.firebaseio.com + + \ No newline at end of file diff --git a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist index 22781695..016faa32 100644 --- a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist +++ b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion English CFBundleDisplayName - ${PRODUCT_NAME} + Stone Island CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIcons @@ -17,7 +17,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - ${PRODUCT_NAME} + Stone Island CFBundlePackageType APPL CFBundleShortVersionString diff --git a/StoneIsland/platforms/ios/Stone Island/config.xml b/StoneIsland/platforms/ios/Stone Island/config.xml index d955ecf8..46a44916 100755 --- a/StoneIsland/platforms/ios/Stone Island/config.xml +++ b/StoneIsland/platforms/ios/Stone Island/config.xml @@ -51,7 +51,11 @@ - Stone Island + + + + + StoneIsland Stone Island @@ -90,8 +94,4 @@ - - - - diff --git a/StoneIsland/platforms/ios/ios.json b/StoneIsland/platforms/ios/ios.json index 9596fcd6..2db25e88 100644 --- a/StoneIsland/platforms/ios/ios.json +++ b/StoneIsland/platforms/ios/ios.json @@ -98,6 +98,18 @@ "xml": "", "count": 1 } + ], + "CFBundleName": [ + { + "xml": "Stone Island", + "count": 1 + } + ], + "CFBundleDisplayName": [ + { + "xml": "Stone Island", + "count": 1 + } ] } }, @@ -190,6 +202,10 @@ }, "cordova-plugin-firebase": { "PACKAGE_NAME": "us.okfoc.stoneisland" + }, + "cordova-plugin-app-name": { + "APP_NAME": "Stone Island", + "PACKAGE_NAME": "us.okfoc.stoneisland" } }, "dependent_plugins": {}, @@ -357,6 +373,7 @@ "ionic-plugin-keyboard": "2.2.1", "phonegap-plugin-push": "1.9.2", "cordova-plugin-statusbar": "2.2.3", - "cordova-plugin-firebase": "0.1.24" + "cordova-plugin-firebase": "0.1.24", + "cordova-plugin-app-name": "1.0.4" } } \ No newline at end of file diff --git a/StoneIsland/platforms/ios/platform_www/cordova_plugins.js b/StoneIsland/platforms/ios/platform_www/cordova_plugins.js index e39888f0..9005406d 100644 --- a/StoneIsland/platforms/ios/platform_www/cordova_plugins.js +++ b/StoneIsland/platforms/ios/platform_www/cordova_plugins.js @@ -165,7 +165,8 @@ module.exports.metadata = "ionic-plugin-keyboard": "2.2.1", "phonegap-plugin-push": "1.9.2", "cordova-plugin-statusbar": "2.2.3", - "cordova-plugin-firebase": "0.1.24" + "cordova-plugin-firebase": "0.1.24", + "cordova-plugin-app-name": "1.0.4" }; // BOTTOM OF METADATA }); \ No newline at end of file diff --git a/StoneIsland/platforms/ios/www/cordova_plugins.js b/StoneIsland/platforms/ios/www/cordova_plugins.js index e39888f0..9005406d 100644 --- a/StoneIsland/platforms/ios/www/cordova_plugins.js +++ b/StoneIsland/platforms/ios/www/cordova_plugins.js @@ -165,7 +165,8 @@ module.exports.metadata = "ionic-plugin-keyboard": "2.2.1", "phonegap-plugin-push": "1.9.2", "cordova-plugin-statusbar": "2.2.3", - "cordova-plugin-firebase": "0.1.24" + "cordova-plugin-firebase": "0.1.24", + "cordova-plugin-app-name": "1.0.4" }; // BOTTOM OF METADATA }); \ No newline at end of file diff --git a/StoneIsland/platforms/ios/www/js/lib/_router.js b/StoneIsland/platforms/ios/www/js/lib/_router.js index 9927712a..43438854 100755 --- a/StoneIsland/platforms/ios/www/js/lib/_router.js +++ b/StoneIsland/platforms/ios/www/js/lib/_router.js @@ -87,6 +87,9 @@ var SiteRouter = Router.extend({ else { app.view = app[name] } + + window.FirebasePlugin && window.FirebasePlugin.setScreenName(name) + app.header.set_back( !! app.view.back ) app.view.show() }.bind(this) diff --git a/StoneIsland/platforms/ios/www/js/lib/etc/push.js b/StoneIsland/platforms/ios/www/js/lib/etc/push.js index 14236728..00a2e839 100755 --- a/StoneIsland/platforms/ios/www/js/lib/etc/push.js +++ b/StoneIsland/platforms/ios/www/js/lib/etc/push.js @@ -105,8 +105,8 @@ var push = (function(){ return sdk.cms() + '/_services/push/' + key } push.got_push_notification = function(push_obj) { - console.log('We received this push notification: ' + JSON.stringify(push_obj)); - window.zsazsa = push_obj + // console.log('We received this push notification: ' + JSON.stringify(push_obj)); + app.blog.refresh() push_obj.additionalData = push_obj.additionalData || {} @@ -119,10 +119,10 @@ var push = (function(){ catch (e) { } - if (is_hub || push_obj.additionalData.url)) { + if (is_hub) { app.intro.$alert.show().html("[ HUB UPDATED ]") } - else { + else if (! push_obj.additionalData.url) { auth.clear_cart() app.intro.$alert.show().html("[ STORE UPDATED ]") } diff --git a/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js b/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js index 6a61be1b..2743946a 100755 --- a/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js +++ b/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js @@ -167,6 +167,8 @@ var ProductView = ScrollableView.extend({ this.$price.html(price) this.$body.html(body) + window.FirebasePlugin && window.FirebasePlugin.setScreenName('product:' + code) + this.$productHeader.toggleClass("wide", title.length > 48) var fits_large = !! this.fitLargeCodes[this.code] diff --git a/StoneIsland/platforms/ios/www/js/sdk/auth.js b/StoneIsland/platforms/ios/www/js/sdk/auth.js index fa8dd71c..bcfb2d3a 100755 --- a/StoneIsland/platforms/ios/www/js/sdk/auth.js +++ b/StoneIsland/platforms/ios/www/js/sdk/auth.js @@ -51,6 +51,9 @@ var auth = sdk.auth = (function(){ localStorage.setItem("yoox.access_token", access_token) localStorage.setItem("yoox.user_id", user_id) + + window.FirebasePlugin && window.FirebasePlugin.setUserId(user_id) + cb && cb() } auth.get_user = function(cb){ @@ -63,6 +66,7 @@ var auth = sdk.auth = (function(){ auth.user_id = -1 localStorage.removeItem("yoox.access_token") localStorage.removeItem("yoox.user_id") + cb && cb() } -- cgit v1.2.3-70-g09d2