Merge remote-tracking branch 'origin/master' into unread-refactor

public/src/forum/admin/index.js

@@ -5,7 +5,6 @@ define('forum/admin/index', ['semver'], function(semver) {
 	var	Admin = {};
 	var updateIntervalId = 0;
 	Admin.init = function() {
-
 		app.enterRoom('admin');
 		socket.emit('meta.rooms.getAll', Admin.updateRoomUsage);
 
@@ -99,6 +98,8 @@ define('forum/admin/index', ['semver'], function(semver) {
 				}
 			});
 		});
+
+		setupGraphs();
 	};
 
 	Admin.updateRoomUsage = function(err, data) {
@@ -114,5 +115,68 @@ define('forum/admin/index', ['semver'], function(semver) {
 		$('#active_users').html(html);
 	};
 
+	var graphs = {
+		traffic: null
+	};
+
+	function setupGraphs() {
+		var canvas = document.getElementById('analytics-traffic'),
+			ctx = canvas.getContext('2d');
+
+
+		var currentHour = new Date().getHours(),
+			labels = [];
+
+		for (var i = currentHour, ii = currentHour - 12; i > ii; i--) {
+			var hour = i < 0 ? 24 + i : i;
+			labels.push(hour + ':00 PM');
+		}
+
+		labels.reverse();
+
+		var data = {
+				labels: labels,
+				datasets: [
+					{
+						label: "Page Views",
+						fillColor: "rgba(220,220,220,0.2)",
+						strokeColor: "rgba(220,220,220,1)",
+						pointColor: "rgba(220,220,220,1)",
+						pointStrokeColor: "#fff",
+						pointHighlightFill: "#fff",
+						pointHighlightStroke: "rgba(220,220,220,1)",
+						data: [0,0,0,0,0,0,0,0,0,0,0,0]
+					},
+					{
+						label: "Unique Visitors",
+						fillColor: "rgba(151,187,205,0.2)",
+						strokeColor: "rgba(151,187,205,1)",
+						pointColor: "rgba(151,187,205,1)",
+						pointStrokeColor: "#fff",
+						pointHighlightFill: "#fff",
+						pointHighlightStroke: "rgba(151,187,205,1)",
+						data: [0,0,0,0,0,0,0,0,0,0,0,0]
+					}
+				]
+			};
+
+		canvas.width = $(canvas).parent().width();
+		graphs.traffic = new Chart(ctx).Line(data);
+
+		setInterval(updateTrafficGraph, 15000);
+		updateTrafficGraph();
+	}
+
+	function updateTrafficGraph() {
+		socket.emit('admin.analytics.get', {graph: "traffic"}, function (err, data) {
+			for (var i = 0, ii = data.pageviews.length; i < ii;  i++) {
+				graphs.traffic.datasets[0].points[i].value = data.pageviews[i];
+				graphs.traffic.datasets[1].points[i].value = data.uniqueVisitors[i];
+			}
+
+			graphs.traffic.update();
+		});
+	}
+
 	return Admin;
 });

src/controllers/admin.js

@@ -38,9 +38,6 @@ adminController.home = function(req, res, next) {
 		stats: function(next) {
 			getStats(next);
 		},
-		pageviews: function(next) {
-			getPageviews(next);
-		},
 		notices: function(next) {
 			var notices = [
 				{done: !meta.restartRequired, doneText: 'Restart not required', notDoneText:'Restart required'},
@@ -56,24 +53,11 @@ adminController.home = function(req, res, next) {
 		res.render('admin/index', {
 			version: pkg.version,
 			notices: results.notices,
-			stats: results.stats,
-			pageviews: results.pageviews
+			stats: results.stats
 		});
 	});
 };
 
-function getPageviews(callback) {
-	async.parallel({
-		monthly: function(next) {
-			db.get('pageviews:monthly', next);
-		},
-		daily: function(next) {
-			db.get('pageviews:daily', next);
-		}
-	}, function(err, results) {
-		callback(null, results);
-	});
-}
 function getStats(callback) {
 	async.parallel([
 		function(next) {
@@ -87,6 +71,9 @@ function getStats(callback) {
 		},
 		function(next) {
 			getStatsForSet('topics:tid', next);
+		},
+		function(next) {
+			getStatsForSet('analytics:pageviews', next);
 		}
 	], function(err, results) {
 		if (err) {
@@ -96,6 +83,7 @@ function getStats(callback) {
 		results[1].name = 'Users';
 		results[2].name = 'Posts';
 		results[3].name = 'Topics';
+		results[4].name = 'Page Views';
 
 		callback(null, results);
 	});

src/middleware/middleware.js

@@ -49,29 +49,10 @@ middleware.updateLastOnlineTime = function(req, res, next) {
 };
 
 middleware.incrementPageViews = function(req, res, next) {
-	var nextMonth = new Date(),
-		nextDay = new Date();
-
-	nextMonth.setMonth(nextMonth.getMonth() + 1, 1);
-	nextMonth.setHours(0, 0, 0, 0);
-
-	nextDay.setDate(nextDay.getDate() + 1);
-	nextDay.setHours(0, 0, 0, 0);
-
-	db.increment('pageviews:monthly', function(err) {
-		if (err) {
-			return;
-		}
-		db.pexpireAt('pageviews:monthly', nextMonth.getTime());
-	});
-
-	db.increment('pageviews:daily', function(err) {
-		if (err) {
-			return;
-		}
-		db.pexpireAt('pageviews:daily', nextDay.getTime());
-	});
-
+	var today = new Date();
+	today.setHours(today.getHours(), 0, 0, 0);
+	
+	db.sortedSetIncrBy('analytics:pageviews', 1, today.getTime());
 	next();
 };
 

src/socket.io/admin.js

@@ -26,7 +26,8 @@ var	groups = require('../groups'),
 		widgets: {},
 		config: {},
 		settings: {},
-		email: {}
+		email: {},
+		analytics: {}
 	};
 
 SocketAdmin.before = function(socket, method, next) {
@@ -149,4 +150,61 @@ SocketAdmin.email.test = function(socket, data, callback) {
 	}
 };
 
+SocketAdmin.analytics.get = function(socket, data, callback) {
+	data.units = 'hours'; // temp
+	data.amount = 12;
+
+	if (data && data.graph && data.units && data.amount) {
+		if (data.graph === 'traffic') {
+			async.parallel({
+				uniqueVisitors: function(next) {
+					getHourlyStatsForSet('ip:recent', data.amount, next);
+				},
+				pageviews: function(next) {
+					getHourlyStatsForSet('analytics:pageviews', data.amount, next);
+				}
+			}, callback);
+		}
+	} else {
+		callback(new Error('Invalid analytics call'));
+	}
+};
+
+function getHourlyStatsForSet(set, hours, callback) {
+	var hour = new Date(),
+		terms = {},
+		hoursArr = [];
+
+	hour.setHours(hour.getHours(), 0, 0, 0);
+
+	for (var i = 0, ii = hours; i < ii; i++) {
+		hoursArr.push(hour.getTime());
+		hour.setHours(hour.getHours() - 1, 0, 0, 0);
+	}
+
+	async.each(hoursArr, function(term, next) {
+		if (set.indexOf('analytics') !== -1) {
+			db.sortedSetScore(set, term, function(err, count) {
+				terms[term] = count || 0;
+				next(err);
+			});
+		} else {
+			db.sortedSetCount(set, term, Date.now(), function(err, count) {
+				terms[term] = count || 0;
+				next(err);
+			});
+		}
+		
+	}, function(err) {
+		var termsArr = [];
+
+		hoursArr.reverse();
+		hoursArr.forEach(function(hour, idx) {
+			termsArr.push(terms[hour]);
+		});
+
+		callback(err, termsArr);
+	});
+}
+
 module.exports = SocketAdmin;

src/views/admin/header.tpl

@@ -20,6 +20,7 @@
 	    <script>__lt_ie_9__ = 1;</script>
 	<![endif]-->
 
+	<script type="text/javascript" src="{relative_path}/vendor/chart.js/chart.min.js"></script>
 	<script type="text/javascript" src="{relative_path}/socket.io/socket.io.js"></script>
 	<script type="text/javascript" src="{relative_path}/nodebb.min.js"></script>
 	<script type="text/javascript" src="{relative_path}/vendor/colorpicker/colorpicker.js"></script>

src/views/admin/index.tpl

@@ -1,3 +1,14 @@
+<div class="row">
+	<div class="col-sm-12">
+		<div class="panel panel-default">
+			<div class="panel-heading">Forum Traffic</div>
+			<div class="panel-body">
+				<canvas id="analytics-traffic" width="100%" height="400"></canvas>
+			</div>
+		</div>
+	</div>
+</div>
+
 <div class="row">
 	<div class="col-sm-6">
 		<div class="panel panel-default">
@@ -23,18 +34,6 @@
 			</div>
 		</div>
 
-		<div class="panel panel-default">
-			<div class="panel-heading">Pageviews</div>
-			<div class="panel-body">
-				<div class="col-xs-6 text-center">
-					<h3>Monthly<br /><small>{pageviews.monthly}</small></h3>
-				</div>
-				<div class="col-xs-6 text-center">
-					<h3>Daily<br /><small>{pageviews.daily}</small></h3>
-				</div>
-			</div>
-		</div>
-
 		<!-- BEGIN stats -->
 		<div class="panel panel-default">
 			<div class="panel-heading">{stats.name}</div>