mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-11-08 06:55:46 +01:00
query params will need a fix before we can send /users?sort=latest to templates
This commit is contained in:
@@ -1,10 +1,10 @@
|
|||||||
<div>
|
<div>
|
||||||
|
|
||||||
<ul class="nav nav-pills">
|
<ul class="nav nav-pills">
|
||||||
<li class='active'><a href='/users/latest'>Latest Users</a></li>
|
<li class='active'><a href='/users?sort=latest'>Latest Users</a></li>
|
||||||
<li class=''><a href='/users/sort-posts'>Top Posters</a></li>
|
<li class=''><a href='/users?sort=posts'>Top Posters</a></li>
|
||||||
<li class=''><a href='/users/sort-reputation'>Most Reputation</a></li>
|
<li class=''><a href='/users?sort=reputation'>Most Reputation</a></li>
|
||||||
<li class=''><a href='/users/search'>Search</a></li>
|
<li class=''><a href='/users?search'>Search</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -24,7 +24,15 @@ var user = require('./../user.js'),
|
|||||||
});
|
});
|
||||||
|
|
||||||
app.get('/users', function(req, res) {
|
app.get('/users', function(req, res) {
|
||||||
res.send(app.build_header(res) + app.create_route("users", "users") + templates['footer']);
|
|
||||||
|
if(req.query.sort === 'posts')
|
||||||
|
res.send(app.build_header(res) + app.create_route("users", "users") + templates['footer']);
|
||||||
|
else if(req.query.sort === 'reputation')
|
||||||
|
res.send(app.build_header(res) + app.create_route("users", "users") + templates['footer']);
|
||||||
|
else if(req.query.sort === 'latest')
|
||||||
|
res.send(app.build_header(res) + app.create_route("users", "users") + templates['footer']);
|
||||||
|
else
|
||||||
|
res.send(app.build_header(res) + app.create_route("users", "users") + templates['footer']);
|
||||||
});
|
});
|
||||||
|
|
||||||
app.get('/users/:userslug', function(req, res) {
|
app.get('/users/:userslug', function(req, res) {
|
||||||
@@ -33,13 +41,6 @@ var user = require('./../user.js'),
|
|||||||
res.send("User doesn't exist!");
|
res.send("User doesn't exist!");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
console.log('derp');
|
|
||||||
console.log(req.params.userslug);
|
|
||||||
|
|
||||||
if(req.params.userslug === "sort-posts" || req.params.userslug === "sort-reputation" || req.params.userslug === "latest" || req.params.userslug === "search") {
|
|
||||||
res.send(app.build_header(res) + app.create_route("users/"+req.params.userslug, "users") + templates['footer']);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
user.get_uid_by_userslug(req.params.userslug, function(uid) {
|
user.get_uid_by_userslug(req.params.userslug, function(uid) {
|
||||||
if(!uid) {
|
if(!uid) {
|
||||||
@@ -252,10 +253,10 @@ var user = require('./../user.js'),
|
|||||||
res.json({search_display: 'none', users:data});
|
res.json({search_display: 'none', users:data});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
else if (req.params.userslug == 'search') {
|
else if (req.query.search) {
|
||||||
res.json({search_display: 'block', users: []});
|
res.json({search_display: 'block', users: []});
|
||||||
}
|
}
|
||||||
else if(req.params.userslug === "sort-posts") {
|
else if(req.query.sort === "posts") {
|
||||||
user.getUserList(function(data) {
|
user.getUserList(function(data) {
|
||||||
data = data.sort(function(a, b) {
|
data = data.sort(function(a, b) {
|
||||||
return b.postcount - a.postcount;
|
return b.postcount - a.postcount;
|
||||||
@@ -263,7 +264,7 @@ var user = require('./../user.js'),
|
|||||||
res.json({search_display: 'none', users:data});
|
res.json({search_display: 'none', users:data});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
else if(req.params.userslug === "sort-reputation") {
|
else if(req.query.sort === "reputation") {
|
||||||
user.getUserList(function(data) {
|
user.getUserList(function(data) {
|
||||||
data = data.sort(function(a, b) {
|
data = data.sort(function(a, b) {
|
||||||
return b.reputation - a.reputation;
|
return b.reputation - a.reputation;
|
||||||
@@ -271,7 +272,7 @@ var user = require('./../user.js'),
|
|||||||
res.json({search_display: 'none', users:data});
|
res.json({search_display: 'none', users:data});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
else if(req.params.userslug === "latest") {
|
else if(req.query.sort === "latest") {
|
||||||
user.getUserList(function(data) {
|
user.getUserList(function(data) {
|
||||||
data = data.sort(function(a, b) {
|
data = data.sort(function(a, b) {
|
||||||
return b.joindate - a.joindate;
|
return b.joindate - a.joindate;
|
||||||
@@ -326,6 +327,7 @@ var user = require('./../user.js'),
|
|||||||
}
|
}
|
||||||
|
|
||||||
app.get('/api/users/:userslug?/:section?', api_method);
|
app.get('/api/users/:userslug?/:section?', api_method);
|
||||||
|
app.get('/api/users', api_method);
|
||||||
|
|
||||||
function getUserDataByUserSlug(userslug, callerUID, callback) {
|
function getUserDataByUserSlug(userslug, callerUID, callback) {
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user