diff --git a/public/templates/users.tpl b/public/templates/users.tpl new file mode 100644 index 0000000000..d805aca37c --- /dev/null +++ b/public/templates/users.tpl @@ -0,0 +1,5 @@ + +

Users

+
+ +
\ No newline at end of file diff --git a/src/user.js b/src/user.js index 869a27bf34..d5638a4f9f 100644 --- a/src/user.js +++ b/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) { diff --git a/src/webserver.js b/src/webserver.js index 4afdaf1cd2..b1a38d1263 100644 --- a/src/webserver.js +++ b/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'] + '' + 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!");