Merge branch 'master' of https://github.com/psychobunny/NodeBB

public/templates/users.tpl

@@ -0,0 +1,5 @@
+
+<h1>Users</h1>
+<div>
+    
+</div>

src/user.js

@@ -73,6 +73,12 @@ var	config = require('../config.js'),
 		RDB.db.hset(String(uid),	field, value);				
 	}
 
+	User.getUserList = function(callback){
+		RDB.db.lrange('user:users', 0, -1, function(err, data) {
+			callback(data);
+		});
+	}
+
 	User.loginViaLocal = function(username, password, next) {
 
 		if (!username || !password) {

src/webserver.js

@@ -387,8 +387,12 @@ passport.deserializeUser(function(uid, done) {
 	});
 
 	app.get('/users', function(req, res) {
-		// Render user list
-		res.send('User list');
+		console.log("ARE U HERE");
+		user.getUserList(function(data){
+			//res.send(data);
+			res.send(templates['header'] + '<script>templates.ready(function(){ajaxify.go("users");});</script>' + templates['footer']);
+		});
+		
 	});
 
 	app.get('/users/:uid/edit', function(req, res){
@@ -408,6 +412,7 @@ passport.deserializeUser(function(uid, done) {
 	
 
 	function handleUserProfile(req, res) {
+		console.log("handleUserProfile");
 		
 		if(!req.params.username) {
 			res.send("User doesn't exist!");