LBRYCommunity/spee.ch
1
0
Fork 0
Code Issues 95 Pull requests 2 Projects Releases 4 Packages Wiki Activity

Fix configs loading #470

Merged
bones7242 merged 15 commits from fix-configs-loading into master 2018-06-07 19:40:01 +02:00
Conversation 0 Commits 15 Files changed 38 +28 -11
2 changed files with 28 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 98ea4d226f - Show all commits

22
client/build/components/GAListener/index.js
View file

@ -36,12 +36,18 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.getPrototypeOf || functio
var googleId = null; var googleId = null;
if (!_siteConfig.default) { if (!_siteConfig.default) {
console.log('no site config found for GAListener'); console.log('WARNING: no site config found for GAListener');
} }
if (_siteConfig.default.analytics) { if (!_siteConfig.default.analytics) {
googleId = _siteConfig.default.analytics.googleId; console.log('WARNING: no analytics configs found in siteConfig.json');
}
if (_siteConfig.default && _siteConfig.default.analytics) {
googleId = _siteConfig.default.analytics.googleId;
}
if (googleId) {
_reactGa.default.initialize(googleId); _reactGa.default.initialize(googleId);
} }
@ -63,11 +69,13 @@ function (_React$Component) {
}, { }, {
key: "sendPageView", key: "sendPageView",
value: function sendPageView(location) { value: function sendPageView(location) {
_reactGa.default.set({ if (googleId) {
page: location.pathname _reactGa.default.set({
}); page: location.pathname
});
_reactGa.default.pageview(location.pathname); _reactGa.default.pageview(location.pathname);
}
} }
}, { }, {
key: "render", key: "render",

17
client/src/components/GAListener/index.jsx
View file

@ -7,11 +7,18 @@ import siteConfig from '@config/siteConfig.json';
let googleId = null; let googleId = null;
if (!siteConfig) { if (!siteConfig) {
console.log('no site config found for GAListener'); console.log('WARNING: no site config found for GAListener');
} }
if (siteConfig.analytics) { if (!siteConfig.analytics) {
console.log('WARNING: no analytics configs found in siteConfig.json');
}
if (siteConfig && siteConfig.analytics) {
({ googleId } = siteConfig.analytics); ({ googleId } = siteConfig.analytics);
}
if (googleId) {
GoogleAnalytics.initialize(googleId); GoogleAnalytics.initialize(googleId);
} }
@ -22,8 +29,10 @@ class GAListener extends React.Component {
} }
sendPageView (location) { sendPageView (location) {
GoogleAnalytics.set({ page: location.pathname }); if (googleId) {
GoogleAnalytics.pageview(location.pathname); GoogleAnalytics.set({ page: location.pathname });
GoogleAnalytics.pageview(location.pathname);
}
} }
render () { render () {