Commit ff6561ef authored by Andrew Hrdy's avatar Andrew Hrdy

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

parents 8efd5d59 3d7f91d2
Pipeline #2792 passed with stages
in 1 minute and 49 seconds
# 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
......@@ -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>
......
......@@ -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(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment