From 055469055cf54d5519be1f87d36002b72d964b60 Mon Sep 17 00:00:00 2001
From: vjrj <vjrj@ourproject.org>
Date: Wed, 29 Nov 2017 22:17:00 +0100
Subject: [PATCH] Added piwik

---
 .meteor/packages                      | 12 +++++++-----
 .meteor/versions                      |  1 +
 imports/startup/client/piwik-start.js |  8 ++++++++
 imports/ui/layouts/App/App.js         | 17 ++++++++++++-----
 packages/piwik                        |  1 +
 5 files changed, 29 insertions(+), 10 deletions(-)
 create mode 100644 imports/startup/client/piwik-start.js
 create mode 160000 packages/piwik

diff --git a/.meteor/packages b/.meteor/packages
index f3cba9b..25a2c43 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -33,8 +33,10 @@ ddp-rate-limiter@1.0.7
 dynamic-import@0.1.1
 static-html
 alexwine:bootstrap-4
-selaias:cookie-consent
-gadicc:blaze-react-component
-255kb:meteor-status
-mixmax:smart-disconnect
-flowkey:raven
+
+selaias:cookie-consent        # Cookie consent
+gadicc:blaze-react-component  # Add braze to react
+255kb:meteor-status           # Connect status
+mixmax:smart-disconnect       # Disconnect on lost focus
+flowkey:raven                 # js errors
+davidsichau:piwik             # Stats
diff --git a/.meteor/versions b/.meteor/versions
index 2620cd1..a407c72 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -22,6 +22,7 @@ caching-compiler@1.1.9
 caching-html-compiler@1.1.2
 callback-hook@1.0.10
 check@1.2.5
+davidsichau:piwik@0.2.1
 ddp@1.3.1
 ddp-client@2.1.3
 ddp-common@1.2.9
diff --git a/imports/startup/client/piwik-start.js b/imports/startup/client/piwik-start.js
new file mode 100644
index 0000000..0760ddc
--- /dev/null
+++ b/imports/startup/client/piwik-start.js
@@ -0,0 +1,8 @@
+Meteor.startup(function() {
+  return Tracker.autorun(function() {
+    var userId;
+    userId = Meteor.userId();
+    console.log(userId);
+    Meteor.Piwik.setUserInfo(userId);
+  });
+});
diff --git a/imports/ui/layouts/App/App.js b/imports/ui/layouts/App/App.js
index 6a6e3eb..06ccc2e 100644
--- a/imports/ui/layouts/App/App.js
+++ b/imports/ui/layouts/App/App.js
@@ -2,7 +2,7 @@
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import { BrowserRouter as Router, Switch, Route } from 'react-router-dom';
+import { Router, Switch, Route } from 'react-router-dom';
 import { Grid, Alert, Button } from 'react-bootstrap';
 import { Meteor } from 'meteor/meteor';
 import { createContainer } from 'meteor/react-meteor-data';
@@ -33,18 +33,25 @@ import Reconnect from '../../components/Reconnect/Reconnect';
 // i18n
 import { I18nextProvider } from 'react-i18next';
 import i18n from '/imports/startup/client/i18n';
+import '/imports/startup/client/piwik-start.js';
 import ravenLogger from '/imports/startup/client/ravenLogger';
 // https://github.com/gadicc/meteor-blaze-react-component/
 import Blaze from 'meteor/gadicc:blaze-react-component';
-
-//https://react.i18next.com/components/i18nextprovider.html
-
+import createHistory from 'history/createBrowserHistory';
+import { check } from 'meteor/check';
 
 import './App.scss';
 
+const history = createHistory()
+history.listen((location, action) => {
+  // console.log(location.pathname);
+  Meteor.Piwik.trackPage(location.pathname);
+});
+
 const App = props => (
+  /* https://react.i18next.com/components/i18nextprovider.html */
   <I18nextProvider i18n={i18n}>
-  <Router>
+  <Router history={history}>
     {!props.loading ? <div className="App">
     <Navigation {...props} />
       <ReSendEmail {...props} />
diff --git a/packages/piwik b/packages/piwik
new file mode 160000
index 0000000..3fc7946
--- /dev/null
+++ b/packages/piwik
@@ -0,0 +1 @@
+Subproject commit 3fc794651e241a7fba076330d8032f2f9b2e3d7c