recent posts in /users/ page

This commit is contained in:
Baris Soner Usakli
2013-06-26 23:04:49 -04:00
parent 99465f1ffd
commit c93f8c0530
4 changed files with 70 additions and 13 deletions

View File

@@ -1,5 +1,6 @@
var user = require('./../user.js'),
posts = require('./../posts.js'),
fs = require('fs'),
utils = require('./../../public/src/utils.js'),
path = require('path'),
@@ -41,13 +42,13 @@ var user = require('./../user.js'),
return;
}
user.getUserData(uid, function(data) {
if(data) {
res.send(app.build_header(res) + app.create_route('users/'+data.userslug, 'account') + templates['footer']);
}
else {
res.redirect('/404');
}
user.getUserData(uid, function(userdata) {
if(userdata) {
res.send(app.build_header(res) + app.create_route('users/'+userdata.userslug, 'account') + templates['footer']);
}
else {
res.redirect('/404');
}
});
});
});
@@ -274,11 +275,15 @@ var user = require('./../user.js'),
getUserDataByUserSlug(req.params.userslug, callerUID, function(userData) {
user.isFollowing(callerUID, userData.theirid, function(isFollowing) {
userData.isFollowing = isFollowing;
userData.signature = marked(userData.signature || '');
posts.getPostsByUid(userData.theirid, function(posts) {
userData.posts = posts;
userData.isFollowing = isFollowing;
res.json(userData);
userData.signature = marked(userData.signature || '');
res.json(userData);
});
});
});