Merge remote-tracking branch 'origin/master' into development

ff6561ef · Andrew Hrdy · 8efd5d59 · 3d7f91d2 · ff6561ef · ff6561ef
Commit ff6561ef authored Aug 29, 2018 by Andrew Hrdy
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
 # Changelog

+## [2.1.4] - 2018-08-28
+
+### Added
+
+- Basic matomo analytics for tracking page views
+
+### Removed
+
+- Google analytics
+
 ## [2.1.3] - 2018-05-24

 ### Fixed
@@ -57,4 +67,5 @@
 [2.1.0]: https://git.gmu.edu/srct/whats-open-web/compare/v2.0.1...v2.1-Midnight-Cherry
 [2.1.1]: https://git.gmu.edu/srct/whats-open-web/compare/v2.1-Midnight-Cherry...v2.1.1
 [2.1.2]: https://git.gmu.edu/srct/whats-open-web/compare/v2.1.1...v2.1.2
-[2.1.3]: https://git.gmu.edu/srct/whats-open-web/compare/v2.1.2...v2.1.3
\ No newline at end of file
+[2.1.3]: https://git.gmu.edu/srct/whats-open-web/compare/v2.1.2...v2.1.3
+[2.1.4]: https://git.gmu.edu/srct/whats-open-web/compare/v2.1.3...v2.1.4
\ No newline at end of file
--- a/public/index.html
+++ b/public/index.html
@@ -32,13 +32,28 @@
    <link rel="shortcut icon" href="./favicon.png">
    <link href='https://api.tiles.mapbox.com/mapbox-gl-js/v0.40.1/mapbox-gl.css' rel='stylesheet' />
 </head>
-<!-- Global site tag (gtag.js) - Google Analytics -->
-<script async src="https://www.googletagmanager.com/gtag/js?id=UA-112607180-1"></script>

 <body>
+    <script type="text/javascript">
+        /*
+            The following code is generated by matomo to use for analytics.
+        */
+        var _paq = _paq || [];
+        _paq.push(['trackPageView']);
+        _paq.push(['enableLinkTracking']);
+        (function () {
+            var u = "//matomo.srct.gmu.edu/";
+            _paq.push(['setTrackerUrl', u + 'piwik.php']);
+            _paq.push(['setSiteId', '2']);
+            var d = document, g = d.createElement('script'), s = d.getElementsByTagName('script')[0];
+            g.type = 'text/javascript'; g.async = true; g.defer = true; g.src = u + 'piwik.js'; s.parentNode.insertBefore(g, s);
+        })();
+    </script>
+
    <noscript>
        You need to enable JavaScript to run this app.
    </noscript>
+
    <div id="root"></div>
 </body>


--- a/src/index.js
+++ b/src/index.js
@@ -29,15 +29,6 @@ if (isProduction || !extension) {
    enhance = compose(applyMiddleware(ReduxThunk, routerMiddleware(history)), extension);
 }

-if (isProduction) {
-    window.dataLayer = window.dataLayer || [];
-    const gtag = (args) => {
-        window.dataLayer.push(args);
-    };
-    gtag('js', new Date());
-    gtag('config', 'UA-112607180-1');
-}
-
 const store = createStore(reducers, enhance);

 ReactDOM.render(