Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-07 22:45:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed #393 - refactored basic route handling, moved some other routes to debug routes

Browse Source
This commit is contained in:
Julian Lam
2013-11-11 14:06:26 -05:00
parent 9bea23bbfe
commit 37497fc5a0
3 changed files with 57 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/src/app.js
View File

@@ -279,8 +279,8 @@ var socket,
app.process_page = function () {
app.populate_online_users();
var url = window.location.href,
parts = url.split('/'),
var path = window.location.pathname,
parts = path.split('/'),
active = parts[parts.length - 1];
jQuery('#main-nav li').removeClass('active');

30
src/routes/debug.js
View File

@@ -1,5 +1,35 @@
var DebugRoute = function(app) {
app.namespace('/debug', function() {
app.get('/cid/:cid', function (req, res) {
categories.getCategoryData(req.params.cid, function (err, data) {
if (data) {
res.send(data);
} else {
res.send(404, "Category doesn't exist!");
}
});
});
app.get('/tid/:tid', function (req, res) {
topics.getTopicData(req.params.tid, function (data) {
if (data) {
res.send(data);
} else {
res.send(404, "Topic doesn't exist!");
}
});
});
app.get('/pid/:pid', function (req, res) {
posts.getPostData(req.params.pid, function (data) {
if (data) {
res.send(data);
} else {
res.send(404, "Post doesn't exist!");
}
});
});
app.get('/prune', function(req, res) {
var Notifications = require('../notifications');

54
src/webserver.js
View File

@@ -318,7 +318,7 @@ var express = require('express'),
};
app.create_route = function (url, tpl) { // to remove
return '<script>templates.ready(function(){ajaxify.go("' + url + '", null, "' + tpl + '");});</script>';
return '<script>templates.ready(function(){ajaxify.go("' + url + '", null, "' + tpl + '", true);});</script>';
};
app.namespace(nconf.get('relative_path'), function () {
@@ -331,11 +331,10 @@ var express = require('express'),
// Basic Routes (entirely client-side parsed, goal is to move the rest of the crap in this file into this one section)
(function () {
var routes = ['login', 'register', 'account', 'recent', 'unread', 'notifications', '403', '404'];
for (var i = 0, ii = routes.length; i < ii; i++) {
(function (route) {
var routes = ['login', 'register', 'account', 'recent', '403', '404'],
loginRequired = ['unread', 'search', 'notifications'];
async.each(routes.concat(loginRequired), function(route, next) {
app.get('/' + route, function (req, res) {
if ((route === 'login' || route === 'register') && (req.user && req.user.uid > 0)) {
@@ -343,6 +342,8 @@ var express = require('express'),
res.redirect('/user/' + userslug);
});
return;
} else if (loginRequired.indexOf(route) !== -1 && !req.user) {
return res.redirect('/403');
}
app.build_header({
@@ -352,8 +353,7 @@ var express = require('express'),
res.send((isNaN(parseInt(route, 10)) ? 200 : parseInt(route, 10)), header + app.create_route(route) + templates.footer);
});
});
}(routes[i]));
}
});
}());
@@ -516,7 +516,7 @@ var express = require('express'),
res.send(
data.header +
'\n\t<noscript>\n' + templates['noscript/header'] + templates['noscript/topic'].parse(data.topics) + '\n\t</noscript>' +
'\n\t<script>templates.ready(function(){ajaxify.go("topic/' + topic_url + '");});</script>' +
'\n\t<script>templates.ready(function(){ajaxify.go("topic/' + topic_url + '", undefined, undefined, true);});</script>' +
templates.footer
);
});
@@ -609,7 +609,7 @@ var express = require('express'),
res.send(
data.header +
'\n\t<noscript>\n' + templates['noscript/header'] + templates['noscript/category'].parse(data.categories) + '\n\t</noscript>' +
'\n\t<script>templates.ready(function(){ajaxify.go("category/' + category_url + '");});</script>' +
'\n\t<script>templates.ready(function(){ajaxify.go("category/' + category_url + '", undefined, undefined, true);});</script>' +
templates.footer
);
});
@@ -620,7 +620,7 @@ var express = require('express'),
req: req,
res: res
}, function (err, header) {
res.send(header + '<script>templates.ready(function(){ajaxify.go("confirm/' + req.params.code + '");});</script>' + templates.footer);
res.send(header + '<script>templates.ready(function(){ajaxify.go("confirm/' + req.params.code + '", undefined, undefined, true);});</script>' + templates.footer);
});
});
@@ -639,26 +639,6 @@ var express = require('express'),
"Sitemap: " + nconf.get('url') + "sitemap.xml");
});
app.get('/cid/:cid', function (req, res) {
categories.getCategoryData(req.params.cid, function (err, data) {
if (data) {
res.send(data);
} else {
res.send(404, "Category doesn't exist!");
}
});
});
app.get('/tid/:tid', function (req, res) {
topics.getTopicData(req.params.tid, function (data) {
if (data) {
res.send(data);
} else {
res.send(404, "Topic doesn't exist!");
}
});
});
app.get('/recent/:term?', function (req, res) {
// TODO consolidate with /recent route as well -> that can be combined into this area. See "Basic Routes" near top.
app.build_header({
@@ -670,16 +650,6 @@ var express = require('express'),
});
app.get('/pid/:pid', function (req, res) {
posts.getPostData(req.params.pid, function (data) {
if (data) {
res.send(data);
} else {
res.send(404, "Post doesn't exist!");
}
});
});
app.get('/outgoing', function (req, res) {
if (!req.query.url) {
return res.redirect('/404');
@@ -697,7 +667,7 @@ var express = require('express'),
});
});
app.get('/search', function (req, res) {
/* app.get('/search', function (req, res) {
if (!req.user) {
return res.redirect('/403');
}
@@ -708,7 +678,7 @@ var express = require('express'),
}, function (err, header) {
res.send(header + app.create_route("search", null, "search") + templates.footer);
});
});
});*/
app.get('/search/:term', function (req, res) {
if (!req.user) {