From 927f5ede1939f6f17c55a6e662b4ca7800570016 Mon Sep 17 00:00:00 2001 From: viveksriram1 Date: Tue, 28 Nov 2017 17:15:37 +0530 Subject: [PATCH 01/12] add ember rollbar client --- config/environment.js | 2 +- package.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/config/environment.js b/config/environment.js index 2363b61d..1d070f41 100755 --- a/config/environment.js +++ b/config/environment.js @@ -7,7 +7,7 @@ module.exports = function(environment) { baseURL: '/', defaultLocationType: 'auto', - rollbar: { + emberRollbarClient: { accessToken: '9db40d21a058461081ac9b666f59cd8b', payload: { client: { diff --git a/package.json b/package.json index f8b57a9f..77f43b6f 100644 --- a/package.json +++ b/package.json @@ -45,6 +45,7 @@ "ember-cli-sass": "^6.1.1", "ember-cli-sri": "^2.1.0", "ember-cli-uglify": "^1.2.0", + "ember-rollbar-client": "0.2.2", "ember-data": "~2.9.0", "ember-data-factory-guy": "2.7.0-beta.8", "ember-disable-proxy-controllers": "^1.0.1", From adcbe3a8275940841054251d7d94c37ec34a17b3 Mon Sep 17 00:00:00 2001 From: viveksriram1 Date: Tue, 28 Nov 2017 19:54:50 +0530 Subject: [PATCH 02/12] add ember-rollbar-client --- config/environment.js | 7 +++++-- package.json | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/config/environment.js b/config/environment.js index 1d070f41..76b25d46 100755 --- a/config/environment.js +++ b/config/environment.js @@ -7,7 +7,7 @@ module.exports = function(environment) { baseURL: '/', defaultLocationType: 'auto', - emberRollbarClient: { + 'emberRollbarClient': { accessToken: '9db40d21a058461081ac9b666f59cd8b', payload: { client: { @@ -21,7 +21,10 @@ module.exports = function(environment) { } } } - }, + // By default Rollbar logging is enabled in every environment except test and development. + // Here is an example if you want to use it only in production + enabled: environment === 'production' + }; EmberENV: { FEATURES: { diff --git a/package.json b/package.json index 77f43b6f..0559ff2b 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "ember-cli-jshint": "^1.0.0", "ember-cli-qunit": "^2.0.0", "ember-cli-release": "^0.2.9", - "ember-cli-rollbar": "0.3.1 ", + "ember-rollbar-client": "0.2.2", "ember-cli-sass": "^6.1.1", "ember-cli-sri": "^2.1.0", "ember-cli-uglify": "^1.2.0", From 434d64372771d74b3ce999a8f66b393f766b39c1 Mon Sep 17 00:00:00 2001 From: viveksriram1 Date: Tue, 28 Nov 2017 20:07:38 +0530 Subject: [PATCH 03/12] fix cli build --- config/environment.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/config/environment.js b/config/environment.js index 76b25d46..c0117960 100755 --- a/config/environment.js +++ b/config/environment.js @@ -21,9 +21,6 @@ module.exports = function(environment) { } } } - // By default Rollbar logging is enabled in every environment except test and development. - // Here is an example if you want to use it only in production - enabled: environment === 'production' }; EmberENV: { From 41f013ef663afef2d49ccc08725f170bad7f07c7 Mon Sep 17 00:00:00 2001 From: viveksriram1 Date: Tue, 28 Nov 2017 20:38:39 +0530 Subject: [PATCH 04/12] fix cli build --- config/environment.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/environment.js b/config/environment.js index c0117960..3d0002c4 100755 --- a/config/environment.js +++ b/config/environment.js @@ -21,7 +21,7 @@ module.exports = function(environment) { } } } - }; + }, EmberENV: { FEATURES: { From 3d8dc18f5a290ff97b956d4904ab3b1ae699c09a Mon Sep 17 00:00:00 2001 From: viveksriram1 Date: Wed, 29 Nov 2017 10:03:18 +0530 Subject: [PATCH 05/12] remove ember-rollbar-client package duplication --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 0559ff2b..6c6165f3 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,6 @@ "ember-cli-sass": "^6.1.1", "ember-cli-sri": "^2.1.0", "ember-cli-uglify": "^1.2.0", - "ember-rollbar-client": "0.2.2", "ember-data": "~2.9.0", "ember-data-factory-guy": "2.7.0-beta.8", "ember-disable-proxy-controllers": "^1.0.1", From 948c2ce6ca81b68526af4b03cb40d8833e532ca5 Mon Sep 17 00:00:00 2001 From: viveksriram1 Date: Wed, 29 Nov 2017 23:09:25 +0530 Subject: [PATCH 06/12] fix source maps for rollbar --- circle.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/circle.yml b/circle.yml index 900490ea..95a18335 100755 --- a/circle.yml +++ b/circle.yml @@ -57,6 +57,7 @@ deployment: - bundle exec rake staging ios app:build - bundle exec fastlane ios staging - curl https://api.rollbar.com/api/1/sourcemap/download -F access_token=$ROLLBAR_KEY -F version=$APP_VERSION -F minified_url=https://app-staging.goodcity.hk/assets/goodcity.js; + - curl https://api.rollbar.com/api/1/sourcemap/download -F access_token=$ROLLBAR_KEY -F version=$APP_VERSION -F minified_url=https://app-staging.goodcity.hk/assets/vendor.js; production: branch: live commands: @@ -66,3 +67,4 @@ deployment: - bundle exec rake production ios app:build - fastlane ios beta - curl https://api.rollbar.com/api/1/sourcemap/download -F access_token=$ROLLBAR_KEY -F version=$APP_VERSION -F minified_url=https://app.goodcity.hk/assets/goodcity.js; + - curl https://api.rollbar.com/api/1/sourcemap/download -F access_token=$ROLLBAR_KEY -F version=$APP_VERSION -F minified_url=https://app.goodcity.hk/assets/vendor.js; From 35122e9fb5505628694941c71543b5d5caf8ceeb Mon Sep 17 00:00:00 2001 From: viveksriram1 Date: Wed, 29 Nov 2017 23:25:06 +0530 Subject: [PATCH 07/12] fix code_version for rollbar --- config/environment.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/environment.js b/config/environment.js index 3d0002c4..c0896846 100755 --- a/config/environment.js +++ b/config/environment.js @@ -13,7 +13,7 @@ module.exports = function(environment) { client: { javascript: { source_map_enabled: true, //this is now true by default - code_version: require('child_process').execSync('git rev-parse HEAD').toString().trim(), + code_version: process.env.SOURCE_VERSION, // Optionally have Rollbar guess which frames the error was thrown from // when the browser does not provide line and column numbers. environment: environment, From 8698d15a07dce14a5a950d25a336e08abf4ab3c8 Mon Sep 17 00:00:00 2001 From: viveksriram1 Date: Thu, 30 Nov 2017 12:58:49 +0530 Subject: [PATCH 08/12] menu exit on out side click --- app/templates/faq.hbs | 1 + app/templates/feedback.hbs | 1 + app/templates/offers/index.hbs | 1 + app/templates/support.hbs | 1 + 4 files changed, 4 insertions(+) diff --git a/app/templates/faq.hbs b/app/templates/faq.hbs index 1e8ee742..8ab60b38 100644 --- a/app/templates/faq.hbs +++ b/app/templates/faq.hbs @@ -106,6 +106,7 @@ {{go-to-top-button}} + {{/faq-list}} diff --git a/app/templates/feedback.hbs b/app/templates/feedback.hbs index 43607655..d488ec82 100644 --- a/app/templates/feedback.hbs +++ b/app/templates/feedback.hbs @@ -21,6 +21,7 @@ + diff --git a/app/templates/offers/index.hbs b/app/templates/offers/index.hbs index f860af10..4ab883ea 100644 --- a/app/templates/offers/index.hbs +++ b/app/templates/offers/index.hbs @@ -65,6 +65,7 @@ + {{/visit-page-start}} diff --git a/app/templates/support.hbs b/app/templates/support.hbs index 337a700f..8ad72e94 100644 --- a/app/templates/support.hbs +++ b/app/templates/support.hbs @@ -55,6 +55,7 @@ + From 6a029ab4f969602c1031a060fda7ed907afe72f3 Mon Sep 17 00:00:00 2001 From: Darshan-Chauhan Date: Thu, 30 Nov 2017 15:33:29 +0530 Subject: [PATCH 09/12] Rollbar changes --- config/environment.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/environment.js b/config/environment.js index c0896846..59e75e04 100755 --- a/config/environment.js +++ b/config/environment.js @@ -13,11 +13,11 @@ module.exports = function(environment) { client: { javascript: { source_map_enabled: true, //this is now true by default - code_version: process.env.SOURCE_VERSION, + code_version: require('child_process').execSync('git rev-parse HEAD').toString().trim(), // Optionally have Rollbar guess which frames the error was thrown from // when the browser does not provide line and column numbers. environment: environment, - guess_uncaught_frames: true + guess_uncaught_frames: false } } } From 1a2014efad89f099acce79cf1432021b76205762 Mon Sep 17 00:00:00 2001 From: viveksriram1 Date: Thu, 30 Nov 2017 15:42:54 +0530 Subject: [PATCH 10/12] exclude dev env from rollbar --- config/environment.js | 1 + 1 file changed, 1 insertion(+) diff --git a/config/environment.js b/config/environment.js index c0896846..4200ee6e 100755 --- a/config/environment.js +++ b/config/environment.js @@ -8,6 +8,7 @@ module.exports = function(environment) { defaultLocationType: 'auto', 'emberRollbarClient': { + enabled: environment !== 'test' && environment !== 'development', accessToken: '9db40d21a058461081ac9b666f59cd8b', payload: { client: { From 1e4361098fdb102fed8cb2af2a40fc54b3c797d6 Mon Sep 17 00:00:00 2001 From: Darshan-Chauhan Date: Tue, 12 Dec 2017 10:20:57 +0530 Subject: [PATCH 11/12] GCW-1765 errbit removed --- bower.json | 1 - config/environment.js | 4 ---- ember-cli-build.js | 1 - 3 files changed, 6 deletions(-) diff --git a/bower.json b/bower.json index ecdbf21d..477c9c01 100644 --- a/bower.json +++ b/bower.json @@ -14,7 +14,6 @@ "modernizr": "~2.8.3", "select2": "~3.5.2", "pickadate": "3.5.5", - "airbrake-js": "~0.5.2", "socket.io-client": "~1.4.5", "hammerjs": "~2.0.4", "lightgallery": "~1.1.4", diff --git a/config/environment.js b/config/environment.js index 8c5cc0da..cbd5a204 100755 --- a/config/environment.js +++ b/config/environment.js @@ -58,10 +58,6 @@ module.exports = function(environment) { SHA: process.env.APP_SHA || "00000000", SHARED_SHA: process.env.APP_SHARED_SHA || "00000000", VERSION: process.env.VERSION || "1.0.0", - - AIRBRAKE_HOST: "https://errbit.crossroads.org.hk", - AIRBRAKE_PROJECT_ID: 0, - AIRBRAKE_PROJECT_KEY: "010f0d73f56efb6150cb2744e814e46b", ANDROID_APP_ID: "hk.goodcity.app", IOS_APP_ID: "1012253845" }, diff --git a/ember-cli-build.js b/ember-cli-build.js index a7320b06..6a067399 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -36,7 +36,6 @@ module.exports = function(defaults) { app.import('bower_components/moment/moment.js'); app.import('bower_components/moment/locale/zh-tw.js'); - app.import('bower_components/airbrake-js/dist/client.js'); app.import('bower_components/pickadate/lib/picker.js'); app.import('bower_components/pickadate/lib/picker.date.js'); app.import('bower_components/pickadate/lib/picker.time.js'); From 4d8952dcf463c15b26512e83f750d44f93971fe1 Mon Sep 17 00:00:00 2001 From: viveksriram1 Date: Wed, 13 Dec 2017 12:51:41 +0530 Subject: [PATCH 12/12] change background dark when menu opens --- app/templates/faq.hbs | 2 +- app/templates/feedback.hbs | 2 +- app/templates/offers/index.hbs | 2 +- app/templates/support.hbs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/templates/faq.hbs b/app/templates/faq.hbs index 8ab60b38..8454ab18 100644 --- a/app/templates/faq.hbs +++ b/app/templates/faq.hbs @@ -106,7 +106,7 @@ {{go-to-top-button}} - + {{/faq-list}} diff --git a/app/templates/feedback.hbs b/app/templates/feedback.hbs index d488ec82..2fcd3882 100644 --- a/app/templates/feedback.hbs +++ b/app/templates/feedback.hbs @@ -21,7 +21,7 @@ - + diff --git a/app/templates/offers/index.hbs b/app/templates/offers/index.hbs index 4ab883ea..309d458f 100644 --- a/app/templates/offers/index.hbs +++ b/app/templates/offers/index.hbs @@ -65,7 +65,7 @@ - + {{/visit-page-start}} diff --git a/app/templates/support.hbs b/app/templates/support.hbs index 8ad72e94..9767c2f7 100644 --- a/app/templates/support.hbs +++ b/app/templates/support.hbs @@ -55,7 +55,7 @@ - +