Merge pull request #839 from sivakumar-kailasam/move-ga-to-addon

Turbo87 · web-flow · commit 9f9be0cb4bf3 · 2017-07-01T22:29:16.000+02:00
Use ember-metrics to handle Google Analytics
diff --git a/app/index.html b/app/index.html
@@ -1,22 +1,12 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
     {{content-for 'head'}}
 
-    <script>
-      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-      })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-      ga('create', 'UA-58390457-3', 'auto');
-      ga('send', 'pageview');
-    </script>
-
     <link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
     <link rel="stylesheet" href="{{rootURL}}assets/cargo.css">
 
diff --git a/app/mixins/google-pageview.js b/app/mixins/google-pageview.js
@@ -1,13 +1,14 @@
 import Ember from 'ember';
 
 export default Ember.Mixin.create({
+
+    metrics: Ember.inject.service(),
+
     notifyGoogleAnalytics: Ember.on('didTransition', function() {
-        if (!window.ga) {
-            return;
-        }
-        return window.ga('send', 'pageview', {
-            page: this.get('url'),
-            title: this.get('url')
+        Ember.run.scheduleOnce('afterRender', this, () => {
+            const page = this.get('url');
+            const title = this.get('url');
+            Ember.get(this, 'metrics').trackPage({ page, title });
         });
     })
 });
diff --git a/config/environment.js b/config/environment.js
@@ -23,7 +23,14 @@ module.exports = function(environment) {
         APP: {
             // Here you can pass flags/options to your application instance
             // when it is created
-        }
+        },
+        metricsAdapters: [{
+            name: 'GoogleAnalytics',
+            environments: ['production'],
+            config: {
+                id: 'UA-58390457-3'
+            }
+        }]
     };
 
     if (environment === 'development') {
diff --git a/package.json b/package.json
@@ -49,6 +49,7 @@
     "ember-export-application-global": "^2.0.0",
     "ember-load-initializers": "^1.0.0",
     "ember-maybe-import-regenerator": "^0.1.6",
+    "ember-metrics": "^0.10.0",
     "ember-moment": "^7.3.1",
     "ember-normalize": "^1.0.0",
     "ember-page-title": "^3.2.1",
diff --git a/yarn.lock b/yarn.lock
@@ -1,7 +1,5 @@
 # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
 # yarn lockfile v1
-# yarn v0.25.1
-# node v6.9.2
 
 
 "@glimmer/compiler@^0.22.3":
@@ -2329,12 +2327,6 @@ ember-cli-htmlbars@^2.0.1, ember-cli-htmlbars@^2.0.2:
     json-stable-stringify "^1.0.0"
     strip-bom "^3.0.0"
 
-ember-cli-ic-ajax@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-ic-ajax/-/ember-cli-ic-ajax-1.0.0.tgz#359e885316924e3db8bedf07d77803dd39b26491"
-  dependencies:
-    ic-ajax "~2.0.1"
-
 ember-cli-import-polyfill@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/ember-cli-import-polyfill/-/ember-cli-import-polyfill-0.2.0.tgz#c1a08a8affb45c97b675926272fe78cf4ca166f2"
@@ -2669,7 +2661,7 @@ ember-get-config@0.2.1:
     broccoli-file-creator "^1.1.1"
     ember-cli-babel "^5.1.6"
 
-ember-getowner-polyfill@^1.2.3:
+ember-getowner-polyfill@^1.0.0, ember-getowner-polyfill@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/ember-getowner-polyfill/-/ember-getowner-polyfill-1.2.3.tgz#ea70f4a48b1c05b91056371d1878bbafe018222e"
   dependencies:
@@ -2724,6 +2716,15 @@ ember-maybe-import-regenerator@^0.1.6:
     ember-cli-babel "^6.0.0-beta.4"
     regenerator-runtime "^0.9.5"
 
+ember-metrics@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/ember-metrics/-/ember-metrics-0.10.0.tgz#b3400aa8f001af5f39691266bea1d10b943c3cf6"
+  dependencies:
+    broccoli-funnel "^1.0.1"
+    ember-cli-babel "^5.1.6"
+    ember-getowner-polyfill "^1.0.0"
+    ember-runtime-enumerable-includes-polyfill "^1.0.1"
+
 ember-moment@^7.3.1:
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/ember-moment/-/ember-moment-7.3.1.tgz#20cf679f4a10abd839633afead1dd816963bf3d2"
@@ -2778,7 +2779,7 @@ ember-router-scroll@^0.2.0:
     ember-cli-babel "^5.2.4"
     ember-getowner-polyfill "^1.2.3"
 
-ember-runtime-enumerable-includes-polyfill@^1.0.0:
+ember-runtime-enumerable-includes-polyfill@^1.0.0, ember-runtime-enumerable-includes-polyfill@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/ember-runtime-enumerable-includes-polyfill/-/ember-runtime-enumerable-includes-polyfill-1.0.4.tgz#16a7612e347a2edf07da8b2f2f09dbfee70deba0"
   dependencies:
@@ -3795,10 +3796,6 @@ http-signature@~1.1.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
-ic-ajax@~2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/ic-ajax/-/ic-ajax-2.0.2.tgz#50c8ab1c494320fac66830ce1ee3990ab827f596"
-
 iconv-lite@^0.4.17, iconv-lite@^0.4.5, iconv-lite@~0.4.13:
   version "0.4.18"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.18.tgz#23d8656b16aae6742ac29732ea8f0336a4789cf2"
