Merge pull request #384 from internet4000/remove-analytics

Remove Google analytics
internet4000 · Jul 30, 2019 · 7e26f84 · 7e26f84
2 parents 1feeb34 + 34bb9be
commit 7e26f84
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 78 deletions.
diff --git a/app/router.js b/app/router.js
@@ -1,71 +1,70 @@
 /* eslint array-callback-return:0 */
 import EmberRouter from '@ember/routing/router'
 import config from './config/environment'
-import googlePageview from './mixins/google-pageview'
 
-const Router = EmberRouter.extend(googlePageview, {
-  location: config.locationType,
-  rootURL: config.rootURL
+const Router = EmberRouter.extend({
+	location: config.locationType,
+	rootURL: config.rootURL
 })
 
 Router.map(function() {
-  this.route('channels', {path: '/'}, function() {
-    this.route('all')
-    this.route('history')
-    this.route('map')
-    this.route('new')
-    this.route('search')
-    this.route('explore')
-  })
-  this.route('channel', {path: '/:channel_slug'}, function() {
-    this.route('index', {path: '/'})
-    this.route('home')
-    this.route('deprecated-track', {path: ':track_id'})
-    this.route('tracks', function() {
-      this.route('track', {path: ':track_id'}, function() {
-        this.route('index', {path: '/'})
-      })
-    })
-    this.route('add')
-    this.route('edit')
-    this.route('delete')
-    this.route('favorites')
-    this.route('followers')
-    this.route('play', function() {
-      this.route('random')
-    })
-  })
-  this.authenticatedRoute('add')
-  this.authenticatedRoute('bookmarklet')
-  this.route('about', function() {
-    this.route('intro', {path: '/'})
-    this.route('contact')
-  })
-  this.route('feedback')
-  this.route('auth', function() {
-    this.route('signup')
-    this.route('login')
-    this.route('logout', {path: '/logout'})
-  })
-  this.route('styleguide', function() {
-    this.route('typography')
-    this.route('colors')
-    this.route('forms')
-    this.route('tabs')
-    this.route('buttons')
-  })
-  this.route('404')
-  this.authenticatedRoute('settings', function() {
-    this.route('channel', function() {
-      this.route('image')
-      this.route('backup')
-      this.route('delete')
-      this.route('map')
-    })
-    this.route('account')
-  })
-  this.authenticatedRoute('premium')
-  this.route('menu');
+	this.route('channels', {path: '/'}, function() {
+		this.route('all')
+		this.route('history')
+		this.route('map')
+		this.route('new')
+		this.route('search')
+		this.route('explore')
+	})
+	this.route('channel', {path: '/:channel_slug'}, function() {
+		this.route('index', {path: '/'})
+		this.route('home')
+		this.route('deprecated-track', {path: ':track_id'})
+		this.route('tracks', function() {
+			this.route('track', {path: ':track_id'}, function() {
+				this.route('index', {path: '/'})
+			})
+		})
+		this.route('add')
+		this.route('edit')
+		this.route('delete')
+		this.route('favorites')
+		this.route('followers')
+		this.route('play', function() {
+			this.route('random')
+		})
+	})
+	this.authenticatedRoute('add')
+	this.authenticatedRoute('bookmarklet')
+	this.route('about', function() {
+		this.route('intro', {path: '/'})
+		this.route('contact')
+	})
+	this.route('feedback')
+	this.route('auth', function() {
+		this.route('signup')
+		this.route('login')
+		this.route('logout', {path: '/logout'})
+	})
+	this.route('styleguide', function() {
+		this.route('typography')
+		this.route('colors')
+		this.route('forms')
+		this.route('tabs')
+		this.route('buttons')
+	})
+	this.route('404')
+	this.authenticatedRoute('settings', function() {
+		this.route('channel', function() {
+			this.route('image')
+			this.route('backup')
+			this.route('delete')
+			this.route('map')
+		})
+		this.route('account')
+	})
+	this.authenticatedRoute('premium')
+	this.route('menu');
 })
 
 export default Router
diff --git a/config/environment.js b/config/environment.js
@@ -77,12 +77,7 @@ module.exports = function(environment) {
 			apiKey: 'AIzaSyAyeuzsaD353IhPbffzvP8EE88HNTwSTY0',
 			authDomain: 'radio4000.firebaseapp.com',
 			databaseURL: 'https://radio4000.firebaseio.com'
-		};
-
-		// Enable google analytics
-		ENV.googleAnalytics = {
-			webPropertyId: 'UA-3906535-23'
-		};
+		}
 	}
 
 	return ENV;

diff --git a/package.json b/package.json
@@ -21,7 +21,6 @@
     "ember-cli-babel": "^6.9.0",
     "ember-cli-dependency-checker": "^2.0.0",
     "ember-cli-eslint": "^4.2.1",
-    "ember-cli-google-analytics": "^1.5.0",
     "ember-cli-htmlbars": "^2.0.1",
     "ember-cli-htmlbars-inline-precompile": "^1.0.0",
     "ember-cli-inject-live-reload": "^1.4.1",

diff --git a/yarn.lock b/yarn.lock
@@ -3977,12 +3977,6 @@ ember-cli-get-component-path-option@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/ember-cli-get-component-path-option/-/ember-cli-get-component-path-option-1.0.0.tgz#0d7b595559e2f9050abed804f1d8eff1b08bc771"
 
-ember-cli-google-analytics@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-google-analytics/-/ember-cli-google-analytics-1.5.0.tgz#e5574d15930925d05a238ced9fc4ec6d448e2a3c"
-  dependencies:
-    lodash-node "^2.4.1"
-
 ember-cli-head@^0.4.0:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/ember-cli-head/-/ember-cli-head-0.4.1.tgz#28b7ee86439746640834b232a3b34ab1329f3cf3"
@@ -6578,10 +6572,6 @@ locate-path@^2.0.0:
     p-locate "^2.0.0"
     path-exists "^3.0.0"
 
-lodash-node@^2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/lodash-node/-/lodash-node-2.4.1.tgz#ea82f7b100c733d1a42af76801e506105e2a80ec"
-
 lodash._baseassign@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e"