1 files changed, 40 insertions, 26 deletions

diff --git a/StoneIsland/www/js/lib/etc/analytics.js b/StoneIsland/www/js/lib/etc/analytics.js
index 0d026f2f..2df8a04c 100644
--- a/StoneIsland/www/js/lib/etc/analytics.js
+++ b/StoneIsland/www/js/lib/etc/analytics.js
@@ -2,47 +2,61 @@ var analytics = (function() {
   var analytics = {}
 
   analytics.fields = {
-    trackingId: 'UA-XXXXXXXX-Y',
+    trackingId: 'G-24XNLKH9Z6',
     clientId: localStorage.getItem('ga:clientId'),
     storage: 'none',
   }
 
   analytics.init = function() {
     console.log("Analytics init")
+    if (window.FirebasePlugin) {
+      window.FirebasePlugin.setAnalyticsCollectionEnabled(true)
+    }
     analytics.build()
-    analytics.send('/')
+    analytics.sendPageView('/')
   }
   
   analytics.build = function() {
-    ;( 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','https://www.google-analytics.com/analytics.js','ga' );
+    // ;( 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','https://www.google-analytics.com/analytics.js','ga' );
 
-    analytics.ga = window.ga
-    analytics.ga('create', analytics.fields)
-    // prevent tasks that would abort tracking
-    analytics.ga('set', {
-      // don't abort if the protocol is not http(s)
-      checkProtocolTask: null,
-      // don't expect cookies to be enabled
-      checkStorageTask: null,
-    })
-    // a callback function to get the clientId and store it ourselves
-    analytics.ga(function(tracker){
-      localStorage.setItem('ga:clientId', tracker.get('clientId'));
-    })
+    // analytics.ga = window.ga
+    // analytics.ga('create', analytics.fields)
+    // // prevent tasks that would abort tracking
+    // analytics.ga('set', {
+    //   // don't abort if the protocol is not http(s)
+    //   checkProtocolTask: null,
+    //   // don't expect cookies to be enabled
+    //   checkStorageTask: null,
+    // })
+    // // a callback function to get the clientId and store it ourselves
+    // analytics.ga(function(tracker){
+    //   localStorage.setItem('ga:clientId', tracker.get('clientId'));
+    // })
+
+    // window.dataLayer = window.dataLayer || [];
+    // analytics.dataLayer = window.dataLayer
+    // analytics.gtag = () => { analytics.dataLayer.push(arguments) }
+    // analytics.gtag('js', new Date())
+    // analytics.gtag('config', 'G-24XNLKH9Z6')
   }
 
-  analytics.send = function(path) {
+  analytics.sendPageView = function(path) {
     console.log("/a\\ send", path)
-    if (!analytics.ga) return
-    analytics.ga('send', {
-      // these are the three required properties, check GA's doc for the optional ones
-      hitType: 'screenview',
-      screenName: path,
-      appName: 'StoneIsland'
+    if (!analytics.gtag) return
+    FirebasePlugin.logEvent("select_content", {
+      content_type: "page_view",
+      item_id: path,
     })
+    // FirebasePlugin.setScreenName(path)
+    // analytics.gtag('send', {
+    //   // these are the three required properties, check GA's doc for the optional ones
+    //   hitType: 'screenview',
+    //   screenName: path,
+    //   appName: 'StoneIsland'
+    // })
   }
 
   return analytics