Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add option to track accounts by username or email #12

Merged
merged 2 commits into from
Dec 8, 2017
Merged

Add option to track accounts by username or email #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
864d16d
Add option to track accounts by username or email
clarkwinkelmann Dec 6, 2017
91fc76a
Remove unnecessary check for type User
clarkwinkelmann Dec 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 19 additions & 3 deletions js/admin/dist/extension.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,15 @@ System.register('flagrow/analytics/components/AnalyticsPage', ['flarum/Component
});;
'use strict';

System.register('flagrow/analytics/components/AnalyticsSettingsModal', ['flarum/components/SettingsModal'], function (_export, _context) {
System.register('flagrow/analytics/components/AnalyticsSettingsModal', ['flarum/components/SettingsModal', 'flarum/components/Select'], function (_export, _context) {
"use strict";

var SettingsModal, AnalyticsSettingsModal;
var SettingsModal, Select, AnalyticsSettingsModal;
return {
setters: [function (_flarumComponentsSettingsModal) {
SettingsModal = _flarumComponentsSettingsModal.default;
}, function (_flarumComponentsSelect) {
Select = _flarumComponentsSelect.default;
}],
execute: function () {
AnalyticsSettingsModal = function (_SettingsModal) {
Expand Down Expand Up @@ -150,6 +152,12 @@ System.register('flagrow/analytics/components/AnalyticsSettingsModal', ['flarum/
return _this2.checkbox['label.' + key] = m('div', [app.translator.trans('flagrow-analytics.admin.popup.checkbox.label.' + key)]);
});

var piwikTrackAccountsSetting = this.setting(this.settingsPrefix + '.piwikTrackAccounts');

if (!piwikTrackAccountsSetting()) {
piwikTrackAccountsSetting('none');
}

return [m('div', { className: 'Form-group' }, [m('label', ['Google Analytics ', this.checkbox['statusGoogle']]), m('div', { style: { display: $('#statusGoogle').prop('checked') === true ? "block" : "none" } }, [this.inputs['googleTrackingCode']]), m('br'), m('label', ['Piwik ', this.checkbox['statusPiwik']]), m('div', {
className: 'piwik',
style: {
Expand All @@ -159,7 +167,15 @@ System.register('flagrow/analytics/components/AnalyticsSettingsModal', ['flarum/
style: {
display: $('#piwikHideAliasUrl').prop('checked') === true ? "block" : "none"
}
}, [this.inputs['piwikAliasUrl']])])])];
}, [this.inputs['piwikAliasUrl']]), Select.component({
options: {
none: app.translator.trans('flagrow-analytics.admin.popup.trackAccounts.none'),
username: app.translator.trans('flagrow-analytics.admin.popup.trackAccounts.username'),
email: app.translator.trans('flagrow-analytics.admin.popup.trackAccounts.email')
},
value: piwikTrackAccountsSetting(),
onchange: piwikTrackAccountsSetting
})])])];
}
}]);
return AnalyticsSettingsModal;
Expand Down
16 changes: 16 additions & 0 deletions js/admin/src/components/AnalyticsSettingsModal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import SettingsModal from 'flarum/components/SettingsModal';
import Select from 'flarum/components/Select';

export default class AnalyticsSettingsModal extends SettingsModal {

Expand Down Expand Up @@ -59,6 +60,12 @@ export default class AnalyticsSettingsModal extends SettingsModal {
])
);

const piwikTrackAccountsSetting = this.setting(this.settingsPrefix + '.piwikTrackAccounts');

if (!piwikTrackAccountsSetting()) {
piwikTrackAccountsSetting('none');
}

return [
m('div', {className: 'Form-group'}, [
m('label', [
Expand Down Expand Up @@ -100,6 +107,15 @@ export default class AnalyticsSettingsModal extends SettingsModal {
}, [
this.inputs['piwikAliasUrl'],
]),
Select.component({
options: {
none: app.translator.trans('flagrow-analytics.admin.popup.trackAccounts.none'),
username: app.translator.trans('flagrow-analytics.admin.popup.trackAccounts.username'),
email: app.translator.trans('flagrow-analytics.admin.popup.trackAccounts.email'),
},
value: piwikTrackAccountsSetting(),
onchange: piwikTrackAccountsSetting,
}),
]),
]),
];
Expand Down
5 changes: 5 additions & 0 deletions locale/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ flagrow-analytics:
piwikPrependDomain: Prepend the site domain to the page title when tracking
piwikHideAliasUrl: In the "Outlinks" report, hide clicks to known alias URLs

trackAccounts:
none: Do not track individual accounts
username: Track by username
email: Track by email

page:
nav:
title: Analytics
Expand Down
13 changes: 13 additions & 0 deletions src/Listeners/AddTrackingJs.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

namespace Flagrow\Analytics\Listeners;

use Flarum\Core\Guest;
use Flarum\Core\User;
use Flarum\Event\ConfigureClientView;
use Illuminate\Contracts\Events\Dispatcher;
use Flarum\Settings\SettingsRepositoryInterface;
Expand Down Expand Up @@ -58,6 +60,7 @@ public function addAssets(ConfigureClientView $event)
'piwikAliasUrl' => $this->settings->get('flagrow.analytics.piwikAliasUrl'),
'piwikTrackSubdomain' => $this->settings->get('flagrow.analytics.piwikTrackSubdomain'),
'piwikPrependDomain' => $this->settings->get('flagrow.analytics.piwikPrependDomain'),
'piwikTrackAccounts' => $this->settings->get('flagrow.analytics.piwikTrackAccounts'),
];

$rawJs = file_get_contents(realpath(__DIR__ . '/../../assets/js/piwik-analytics.js'));
Expand All @@ -78,6 +81,16 @@ public function addAssets(ConfigureClientView $event)
$options[] = "_paq.push(['setDomains', ['*." . $settings['piwikAliasUrl'] . "']]);";
}

if (in_array($settings['piwikTrackAccounts'], ['username', 'email'])) {
$user = $event->request->getAttribute('actor');

if (!($user instanceof Guest)) {
$userId = $user->{$settings['piwikTrackAccounts']};

$options[] = "_paq.push(['setUserId', " . json_encode($userId) . "]);";
}
}

// Sanity check, add empty string or the combined array.
if (count($options)) {
$options = implode("\n ", $options);
Expand Down