Merge pull request #160 from crossroads/master

#DecemberRelease1
crossroads · Dec 14, 2017 · 59978c2 · 59978c2
2 parents 8d9741b + d92fc14
commit 59978c2
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 9 deletions.
diff --git a/app/templates/faq.hbs b/app/templates/faq.hbs
@@ -106,6 +106,7 @@
         </div>
         {{go-to-top-button}}
       </section>
+      <a class="exit-off-canvas modify-off-canvas"></a>
     {{/faq-list}}
   </div>
 </div>
diff --git a/app/templates/feedback.hbs b/app/templates/feedback.hbs
@@ -21,6 +21,7 @@
         </div>
       </div>
     </section>
+    <a class="exit-off-canvas modify-off-canvas"></a>
 
   </div>
 </div>
diff --git a/app/templates/offers/index.hbs b/app/templates/offers/index.hbs
@@ -65,6 +65,7 @@
           </div>
         </div>
       </section>
+      <a class="exit-off-canvas modify-off-canvas"></a>
     {{/visit-page-start}}
 
   </div>

diff --git a/app/templates/support.hbs b/app/templates/support.hbs
@@ -55,6 +55,7 @@
         </div>
       </div>
     </section>
+    <a class="exit-off-canvas modify-off-canvas"></a>
 
   </div>
 </div>
diff --git 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/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;
diff --git a/config/environment.js b/config/environment.js
@@ -7,7 +7,8 @@ module.exports = function(environment) {
     baseURL: '/',
     defaultLocationType: 'auto',
 
-    rollbar: {
+    'emberRollbarClient': {
+      enabled: environment !== 'test' && environment !== 'development',
       accessToken: '9db40d21a058461081ac9b666f59cd8b',
       payload: {
         client: {
@@ -17,7 +18,7 @@ module.exports = function(environment) {
             // 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
           }
         }
       }
@@ -57,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
@@ -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');

diff --git 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",