hiro/Vulcan
1
0
Fork 0
mirror of https://github.com/vale981/Vulcan synced 2025-03-09 12:16:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

trackEvent > Events.track; add files to telescope:core

Browse source
This commit is contained in:
Sacha Greif 2015-04-22 11:49:42 +09:00
parent 0fae65e718
commit 93a3861265
24 changed files with 201 additions and 192 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client/views/comments/comment_edit.js
View file

@ -12,7 +12,7 @@ var editComment = function(instance) {
} }
}); });
trackEvent("edit comment", {'postId': comment.postId, 'commentId': comment._id}); Events.track("edit comment", {'postId': comment.postId, 'commentId': comment._id});
Router.go('post_page_comment', {_id: comment.postId, commentId: comment._id}); Router.go('post_page_comment', {_id: comment.postId, commentId: comment._id});
}; };

2
client/views/comments/comment_form.js
View file

@ -34,7 +34,7 @@ var submitComment = function(instance) {
console.log(error); console.log(error);
Messages.flash(error.reason, "error"); Messages.flash(error.reason, "error");
}else{ }else{
trackEvent("newComment", newComment); Events.track("newComment", newComment);
$commentForm.val(''); $commentForm.val('');
} }
}); });

2
client/views/comments/comment_item.js
View file

@ -112,7 +112,7 @@ var handleVoteClick = function (meteorMethodName, eventName, e, instance) {
Messages.flash(i18n.t('please_log_in_first'), 'info'); Messages.flash(i18n.t('please_log_in_first'), 'info');
} else { } else {
Meteor.call(meteorMethodName, this, function(error, result){ Meteor.call(meteorMethodName, this, function(error, result){
trackEvent(eventName, { Events.track(eventName, {
'commentId': instance.data._id, 'commentId': instance.data._id,
'postId': instance.data.post, 'postId': instance.data.post,
'authorId': instance.data.userId 'authorId': instance.data.userId

2
client/views/posts/modules/post_upvote.js
View file

@ -15,7 +15,7 @@ Template.postUpvote.events({
Messages.flash(i18n.t("please_log_in_first"), "info"); Messages.flash(i18n.t("please_log_in_first"), "info");
} }
Meteor.call('upvotePost', post, function(error, result){ Meteor.call('upvotePost', post, function(error, result){
trackEvent("post upvoted", {'_id': post._id}); Events.track("post upvoted", {'_id': post._id});
}); });
} }
}); });

2
client/views/posts/post_edit.js
View file

@ -26,7 +26,7 @@ AutoForm.hooks({
}, },
onSuccess: function(operation, post) { onSuccess: function(operation, post) {
trackEvent("edit post", {'postId': post._id}); Events.track("edit post", {'postId': post._id});
Router.go('post_page', {_id: post._id}); Router.go('post_page', {_id: post._id});
}, },

2
client/views/posts/post_submit.js
View file

@ -28,7 +28,7 @@ AutoForm.hooks({
onSuccess: function(operation, post) { onSuccess: function(operation, post) {
this.template.$('button[type=submit]').removeClass('loading'); this.template.$('button[type=submit]').removeClass('loading');
trackEvent("new post", {'postId': post._id}); Events.track("new post", {'postId': post._id});
Router.go('post_page', {_id: post._id}); Router.go('post_page', {_id: post._id});
if (post.status === Posts.config.STATUS_PENDING) { if (post.status === Posts.config.STATUS_PENDING) {
Messages.flash(i18n.t('thanks_your_post_is_awaiting_approval'), 'success'); Messages.flash(i18n.t('thanks_your_post_is_awaiting_approval'), 'success');

2
client/views/users/user_email.js
View file

@ -31,7 +31,7 @@ Template.user_email.events({
} else { } else {
Messages.flash(i18n.t('thanks_for_signing_up'), "success"); Messages.flash(i18n.t('thanks_for_signing_up'), "success");
// Meteor.call('addCurrentUserToMailChimpList'); // Meteor.call('addCurrentUserToMailChimpList');
trackEvent("new sign-up", {'userId': user._id, 'auth':'twitter'}); Events.track("new sign-up", {'userId': user._id, 'auth':'twitter'});
Router.go('/'); Router.go('/');
} }
}); });

1
lib/config/debug.js
View file

@ -1 +0,0 @@
// SimpleSchema.debug = true;

4
lib/debug.js
View file

@ -1,4 +0,0 @@
clog = function (s) {
if(Settings.get('debug', false))
console.log(s);
};

14
lib/events.js
View file

@ -1,14 +0,0 @@
trackEvent = function(event, properties){
// console.log('trackevent: ', event, properties);
var properties= (typeof properties === 'undefined') ? {} : properties;
//TODO
// add event to an Events collection for logging and buffering purposes
if(Meteor.isClient){
if(typeof mixpanel !== 'undefined' && typeof mixpanel.track !== 'undefined'){
mixpanel.track(event, properties);
}
if(typeof GoSquared !== 'undefined' && typeof GoSquared.DefaultTracker !== 'undefined'){
GoSquared.DefaultTracker.TrackEvent(event, JSON.stringify(properties));
}
}
};

304
lib/users.js
View file

@ -1,161 +1,161 @@
isAdminById = function (userId) { // isAdminById = function (userId) {
var user = Meteor.users.findOne(userId); // var user = Meteor.users.findOne(userId);
return !!(user && isAdmin(user)); // return !!(user && isAdmin(user));
}; // };
isAdmin = function (user) { // isAdmin = function (user) {
user = (typeof user === 'undefined') ? Meteor.user() : user; // user = (typeof user === 'undefined') ? Meteor.user() : user;
return !!user && !!user.isAdmin; // return !!user && !!user.isAdmin;
}; // };
updateAdmin = function (userId, admin) { // updateAdmin = function (userId, admin) {
Meteor.users.update(userId, {$set: {isAdmin: admin}}); // Meteor.users.update(userId, {$set: {isAdmin: admin}});
}; // };
isInvited = function (user) { // isInvited = function (user) {
if(!user || typeof user === 'undefined') // if(!user || typeof user === 'undefined')
return false; // return false;
return isAdmin(user) || !!user.isInvited; // return isAdmin(user) || !!user.isInvited;
}; // };
adminUsers = function(){ // adminUsers = function(){
return Meteor.users.find({isAdmin : true}).fetch(); // return Meteor.users.find({isAdmin : true}).fetch();
}; // };
adminMongoQuery = {isAdmin: true}; // adminMongoQuery = {isAdmin: true};
notAdminMongoQuery = {isAdmin: false}; // notAdminMongoQuery = {isAdmin: false};
getUserName = function (user) { // getUserName = function (user) {
try{ // try{
if (user.username) // if (user.username)
return user.username; // return user.username;
if (user && user.services && user.services.twitter && user.services.twitter.screenName) // if (user && user.services && user.services.twitter && user.services.twitter.screenName)
return user.services.twitter.screenName // return user.services.twitter.screenName
} // }
catch (error){ // catch (error){
console.log(error); // console.log(error);
return null; // return null;
} // }
}; // };
getDisplayName = function (user) { // getDisplayName = function (user) {
return (user.profile && user.profile.username) ? user.profile.username : getUserName(user); // return (user.profile && user.profile.username) ? user.profile.username : getUserName(user);
}; // };
getDisplayNameById = function (userId) { // getDisplayNameById = function (userId) {
return getDisplayName(Meteor.users.findOne(userId)); // return getDisplayName(Meteor.users.findOne(userId));
}; // };
getProfileUrl = function (user) { // getProfileUrl = function (user) {
return getProfileUrlBySlugOrId(user.slug); // return getProfileUrlBySlugOrId(user.slug);
}; // };
getProfileUrlBySlugOrId = function (slugOrId) { // getProfileUrlBySlugOrId = function (slugOrId) {
return Telescope.utils.getRouteUrl('user_profile', {_idOrSlug: slugOrId}); // return Telescope.utils.getRouteUrl('user_profile', {_idOrSlug: slugOrId});
}; // };
hasPassword = function (user) { // hasPassword = function (user) {
return !!user.services.password; // return !!user.services.password;
}; // };
getTwitterName = function (user) { // getTwitterName = function (user) {
// return twitter name provided by user, or else the one used for twitter login // // return twitter name provided by user, or else the one used for twitter login
if(checkNested(user, 'profile', 'twitter')){ // if(checkNested(user, 'profile', 'twitter')){
return user.profile.twitter; // return user.profile.twitter;
}else if(checkNested(user, 'services', 'twitter', 'screenName')){ // }else if(checkNested(user, 'services', 'twitter', 'screenName')){
return user.services.twitter.screenName; // return user.services.twitter.screenName;
} // }
return null; // return null;
}; // };
getGitHubName = function (user) { // getGitHubName = function (user) {
// return twitter name provided by user, or else the one used for twitter login // // return twitter name provided by user, or else the one used for twitter login
if(checkNested(user, 'profile', 'github')){ // if(checkNested(user, 'profile', 'github')){
return user.profile.github; // return user.profile.github;
}else if(checkNested(user, 'services', 'github', 'screenName')){ // TODO: double-check this with GitHub login // }else if(checkNested(user, 'services', 'github', 'screenName')){ // TODO: double-check this with GitHub login
return user.services.github.screenName; // return user.services.github.screenName;
} // }
return null; // return null;
}; // };
getTwitterNameById = function (userId) { // getTwitterNameById = function (userId) {
var user = Meteor.users.findOne(userId); // var user = Meteor.users.findOne(userId);
if (user) // if (user)
return getTwitterName(user); // return getTwitterName(user);
}; // };
getEmail = function (user) { // getEmail = function (user) {
if(user.profile && user.profile.email){ // if(user.profile && user.profile.email){
return user.profile.email; // return user.profile.email;
}else{ // }else{
return null; // return null;
} // }
}; // };
getEmailHash = function (user) { // getEmailHash = function (user) {
// has to be this way to work with Gravatar // // has to be this way to work with Gravatar
return Gravatar.hash(getEmail(user)); // return Gravatar.hash(getEmail(user));
}; // };
getAvatarUrl = function (user) { // getAvatarUrl = function (user) {
console.warn('FUNCTION getAvatarUrl() IS DEPRECATED -- package bengott:avatar is used instead.') // console.warn('FUNCTION getAvatarUrl() IS DEPRECATED -- package bengott:avatar is used instead.')
return Avatar.getUrl(user); // return Avatar.getUrl(user);
}; // };
getCurrentUserEmail = function () { // getCurrentUserEmail = function () {
return Meteor.user() ? getEmail(Meteor.user()) : ''; // return Meteor.user() ? getEmail(Meteor.user()) : '';
}; // };
userProfileComplete = function (user) { // userProfileComplete = function (user) {
for (var i = 0; i < userProfileCompleteChecks.length; i++) { // for (var i = 0; i < userProfileCompleteChecks.length; i++) {
if (!userProfileCompleteChecks[i](user)) { // if (!userProfileCompleteChecks[i](user)) {
return false; // return false;
} // }
} // }
return true; // return true;
}; // };
findLast = function(user, collection) { // findLast = function(user, collection) {
return collection.findOne({userId: user._id}, {sort: {createdAt: -1}}); // return collection.findOne({userId: user._id}, {sort: {createdAt: -1}});
}; // };
timeSinceLast = function(user, collection) { // timeSinceLast = function(user, collection) {
var now = new Date().getTime(); // var now = new Date().getTime();
var last = findLast(user, collection); // var last = findLast(user, collection);
if(!last) // if(!last)
return 999; // if this is the user's first post or comment ever, stop here // return 999; // if this is the user's first post or comment ever, stop here
return Math.abs(Math.floor((now-last.createdAt)/1000)); // return Math.abs(Math.floor((now-last.createdAt)/1000));
}; // };
numberOfItemsInPast24Hours = function (user, collection) { // numberOfItemsInPast24Hours = function (user, collection) {
var mNow = moment(); // var mNow = moment();
var items = collection.find({ // var items = collection.find({
userId: user._id, // userId: user._id,
createdAt: { // createdAt: {
$gte: mNow.subtract(24, 'hours').toDate() // $gte: mNow.subtract(24, 'hours').toDate()
} // }
}); // });
return items.count(); // return items.count();
}; // };
getUserSetting = function(setting, defaultValue, user){ // getUserSetting = function(setting, defaultValue, user){
var user = (typeof user == 'undefined') ? Meteor.user() : user; // var user = (typeof user == 'undefined') ? Meteor.user() : user;
var defaultValue = (typeof defaultValue == "undefined") ? null: defaultValue; // var defaultValue = (typeof defaultValue == "undefined") ? null: defaultValue;
var settingValue = getProperty(user.profile, setting); // var settingValue = getProperty(user.profile, setting);
return (settingValue == null) ? defaultValue : settingValue; // return (settingValue == null) ? defaultValue : settingValue;
}; // };
setUserSetting = function (setting, value, userArgument) { // setUserSetting = function (setting, value, userArgument) {
// note: for some very weird reason, doesn't work when called from Accounts.onCreateUser // // note: for some very weird reason, doesn't work when called from Accounts.onCreateUser
var user; // var user;
if(Meteor.isClient){ // if(Meteor.isClient){
user = Meteor.user(); // on client, default to current user // user = Meteor.user(); // on client, default to current user
}else if (Meteor.isServer){ // }else if (Meteor.isServer){
user = userArgument; // on server, use argument // user = userArgument; // on server, use argument
} // }
if(!user) // if(!user)
throw new Meteor.Error(500, 'User not defined'); // throw new Meteor.Error(500, 'User not defined');
console.log('Setting user setting "'+setting+'" to "'+value+'" for '+getUserName(user)); // console.log('Setting user setting "'+setting+'" to "'+value+'" for '+getUserName(user));
var find = {_id: user._id}; // var find = {_id: user._id};
var field = {}; // var field = {};
field['profile.'+setting] = value; // field['profile.'+setting] = value;
var options = {$set: field}; // var options = {$set: field};
var result = Meteor.users.update(find, options, {validate: false}); // var result = Meteor.users.update(find, options, {validate: false});
}; // };
getProperty = function(object, property){ // getProperty = function(object, property){
// recursive function to get nested properties // // recursive function to get nested properties
var array = property.split('.'); // var array = property.split('.');
if(array.length > 1){ // if(array.length > 1){
var parent = array.shift(); // var parent = array.shift();
// if our property is not at this level, call function again one level deeper if we can go deeper, else return null // // if our property is not at this level, call function again one level deeper if we can go deeper, else return null
return (typeof object[parent] == "undefined") ? null : getProperty(object[parent], array.join('.')); // return (typeof object[parent] == "undefined") ? null : getProperty(object[parent], array.join('.'));
}else{ // }else{
// else return property // // else return property
return object[array[0]]; // return object[array[0]];
} // }
}; // };

0
client/helpers/handlebars.js → packages/telescope-core/lib/client/handlebars.js
View file

0
lib/config/at_config.js → packages/telescope-core/lib/config.js
View file

4
packages/telescope-core/lib/router/filters.js
View file

@ -214,8 +214,8 @@ Meteor.startup( function (){
// After Hooks // After Hooks
// Router.onAfterAction(filters.resetScroll, {except:['posts_top', 'posts_new', 'posts_best', 'posts_pending', 'posts_category', 'all-users']}); // Router.onAfterAction(filters.resetScroll, {except:['posts_top', 'posts_new', 'posts_best', 'posts_pending', 'posts_category', 'all-users']});
Router.onAfterAction(analyticsInit); // will only run once thanks to _.once() Router.onAfterAction(Events.analyticsInit); // will only run once thanks to _.once()
Router.onAfterAction(analyticsRequest); // log this request with mixpanel, etc Router.onAfterAction(Events.analyticsRequest); // log this request with mixpanel, etc
Router.onAfterAction(filters.setSEOProperties); Router.onAfterAction(filters.setSEOProperties);
Router.onAfterAction(filters.setCanonical, {only: ["post_page", "post_page_with_slug"]}); Router.onAfterAction(filters.setCanonical, {only: ["post_page", "post_page_with_slug"]});

0
lib/vote.js → packages/telescope-core/lib/vote.js
View file

10
packages/telescope-core/package.js
View file

@ -24,18 +24,22 @@ Package.onUse(function(api) {
'meteorhacks:subs-manager@1.3.0', 'meteorhacks:subs-manager@1.3.0',
'telescope:events@0.1.0', 'telescope:events@0.1.0',
'telescope:settings@0.1.0', 'telescope:settings@0.1.0',
'percolatestudio:synced-cron@1.1.0' 'telescope:events@0.1.0',
'percolatestudio:synced-cron@1.1.0',
'useraccounts:unstyled@1.8.1'
]); ]);
api.addFiles([ api.addFiles([
'lib/router/config.js', 'lib/router/config.js',
'lib/router/filters.js', 'lib/router/filters.js',
'lib/router/admin.js', 'lib/router/admin.js',
'lib/router/server.js' 'lib/router/server.js',
'lib/vote.js',
'lib/config.js'
], ['client', 'server']); ], ['client', 'server']);
api.addFiles([ api.addFiles([
// 'lib/client/templates/page.html', 'lib/client/handlebars.js',
], 'client'); ], 'client');
api.addFiles([ api.addFiles([

4
lib/analytics.js → packages/telescope-events/lib/client/analytics.js
View file

@ -1,4 +1,4 @@
analyticsInit = _.once(function() { Events.analyticsInit = _.once(function() {
// Mixpanel // Mixpanel
if (mixpanelId=Settings.get("mixpanelId")){ if (mixpanelId=Settings.get("mixpanelId")){
@ -71,7 +71,7 @@ analyticsInit = _.once(function() {
}); });
analyticsRequest = function() { Events.analyticsRequest = function() {
// Google Analytics // Google Analytics
if (typeof window.ga !== 'undefined'){ if (typeof window.ga !== 'undefined'){

15
packages/telescope-events/lib/events.js
View file

@ -42,3 +42,18 @@ if (Meteor.isServer) {
} }
} }
Events.track = function(event, properties){
// console.log('trackevent: ', event, properties);
var properties= (typeof properties === 'undefined') ? {} : properties;
//TODO
// add event to an Events collection for logging and buffering purposes
if(Meteor.isClient){
if(typeof mixpanel !== 'undefined' && typeof mixpanel.track !== 'undefined'){
mixpanel.track(event, properties);
}
if(typeof GoSquared !== 'undefined' && typeof GoSquared.DefaultTracker !== 'undefined'){
GoSquared.DefaultTracker.TrackEvent(event, JSON.stringify(properties));
}
}
};

4
packages/telescope-events/package.js
View file

@ -19,6 +19,10 @@ Package.onUse(function(api) {
'lib/events.js' 'lib/events.js'
], ['client', 'server']); ], ['client', 'server']);
api.addFiles([
'lib/client/analytics.js'
], ['client']);
api.export([ api.export([
'Events' 'Events'
]); ]);

5
packages/telescope-lib/lib/utils.js
View file

@ -213,3 +213,8 @@ Telescope.utils.checkNested = function(obj /*, level1, level2, ... levelN*/) {
} }
return true; return true;
}; };
clog = function (s) {
if(Settings.get('debug', false))
console.log(s);
};

2
packages/telescope-notifications/lib/client/templates/unsubscribe.js
View file

@ -7,7 +7,7 @@ Template.unsubscribe.created = function(){
Session.set('unsubscribedMessage', __('user_not_found')); Session.set('unsubscribedMessage', __('user_not_found'));
} }
}); });
trackEvent('notificationsUnsubcribe', {hash: hash}); Events.track('notificationsUnsubcribe', {hash: hash});
}; };
Template.unsubscribe.helpers({ Template.unsubscribe.helpers({

4
packages/telescope-subscribe-to-posts/lib/client/templates/post_subscribe.js
View file

@ -26,7 +26,7 @@ Template.postSubscribe.events({
Meteor.call('subscribePost', post._id, function(error, result) { Meteor.call('subscribePost', post._id, function(error, result) {
if (result) if (result)
trackEvent("post subscribed", {'_id': post._id}); Events.track("post subscribed", {'_id': post._id});
}); });
}, },
@ -41,7 +41,7 @@ Template.postSubscribe.events({
Meteor.call('unsubscribePost', post._id, function(error, result) { Meteor.call('unsubscribePost', post._id, function(error, result) {
if (result) if (result)
trackEvent("post unsubscribed", {'_id': post._id}); Events.track("post unsubscribed", {'_id': post._id});
}); });
} }
}); });

4
packages/telescope-users/lib/helpers.js
View file

@ -41,7 +41,7 @@ Users.getUserName = function (user) {
}; };
Users.getDisplayName = function (user) { Users.getDisplayName = function (user) {
return (user.profile && user.profile.username) ? user.profile.username : getUserName(user); return (user.profile && user.profile.username) ? user.profile.username : Users.getUserName(user);
}; };
Users.getDisplayNameById = function (userId) { Users.getDisplayNameById = function (userId) {
@ -166,7 +166,7 @@ Users.setUserSetting = function (setting, value, userArgument) {
if(!user) if(!user)
throw new Meteor.Error(500, 'User not defined'); throw new Meteor.Error(500, 'User not defined');
console.log('Setting user setting "'+setting+'" to "'+value+'" for '+getUserName(user)); console.log('Setting user setting "' + setting + '" to "' + value + '" for ' + Users.getUserName(user));
var find = {_id: user._id}; var find = {_id: user._id};
var field = {}; var field = {};
field['profile.'+setting] = value; field['profile.'+setting] = value;

2
packages/telescope-users/lib/server/stuff.js
View file

@ -50,7 +50,7 @@ Accounts.onCreateUser(function(options, user){
// ------------------------------ Analytics ------------------------------ // // ------------------------------ Analytics ------------------------------ //
trackEvent('new user', {username: user.username, email: user.profile.email}); Events.track('new user', {username: user.username, email: user.profile.email});
return user; return user;
}); });