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

use router for relative path

Browse Source
This commit is contained in:
barisusakli
2014-07-02 15:44:09 -04:00
parent 38494a2af0
commit ec1196d288
4 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/controllers/accounts.js
View File

@@ -373,8 +373,6 @@ accountsController.accountSettings = function(req, res, next) {
}; };
accountsController.uploadPicture = function (req, res, next) { accountsController.uploadPicture = function (req, res, next) {
console.log(req.body, req.files);
var uploadSize = parseInt(meta.config.maximumProfileImageSize, 10) || 256; var uploadSize = parseInt(meta.config.maximumProfileImageSize, 10) || 256;
if (req.files.userPhoto.size > uploadSize * 1024) { if (req.files.userPhoto.size > uploadSize * 1024) {
fs.unlink(req.files.userPhoto.path); fs.unlink(req.files.userPhoto.path);

2
src/routes/api.js
View File

@@ -181,6 +181,7 @@ function getRecentPosts(req, res, next) {
module.exports = function(app, middleware, controllers) { module.exports = function(app, middleware, controllers) {
var router = express.Router(); var router = express.Router();
app.use('/api', router);
router.get('/config', controllers.api.getConfig); router.get('/config', controllers.api.getConfig);
@@ -193,5 +194,4 @@ module.exports = function(app, middleware, controllers) {
router.post('/topic/thumb/upload', uploadThumb); router.post('/topic/thumb/upload', uploadThumb);
router.post('/user/:userslug/uploadpicture', middleware.authenticate, middleware.checkGlobalPrivacySettings, middleware.checkAccountPermissions, controllers.accounts.uploadPicture); router.post('/user/:userslug/uploadpicture', middleware.authenticate, middleware.checkGlobalPrivacySettings, middleware.checkAccountPermissions, controllers.accounts.uploadPicture);
app.use('/api', router);
}; };

4
src/routes/debug.js
View File

@@ -8,7 +8,7 @@ var express = require('express'),
module.exports = function(app, middleware, controllers) { module.exports = function(app, middleware, controllers) {
var router = express.Router(); var router = express.Router();
app.use('/debug', router);
router.get('/uid/:uid', function (req, res) { router.get('/uid/:uid', function (req, res) {
if (!req.params.uid) { if (!req.params.uid) {
return res.redirect('/404'); return res.redirect('/404');
@@ -58,6 +58,4 @@ module.exports = function(app, middleware, controllers) {
router.get('/test', function(req, res) { router.get('/test', function(req, res) {
res.redirect('404'); res.redirect('404');
}); });
return router;
}; };

43
src/routes/index.js
View File

@@ -155,44 +155,45 @@ function groupRoutes(app, middleware, controllers) {
module.exports = function(app, middleware) { module.exports = function(app, middleware) {
var router = express.Router(); var router = express.Router();
app.use(nconf.get('relative_path'), router);
plugins.ready(function() { plugins.ready(function() {
app.all('/api/*', middleware.updateLastOnlineTime, middleware.prepareAPI); router.all('/api/*', middleware.updateLastOnlineTime, middleware.prepareAPI);
app.all('/api/admin/*', middleware.admin.isAdmin, middleware.prepareAPI); router.all('/api/admin/*', middleware.admin.isAdmin, middleware.prepareAPI);
app.all('/admin/*', middleware.admin.isAdmin); router.all('/admin/*', middleware.admin.isAdmin);
app.get('/admin', middleware.admin.isAdmin); router.get('/admin', middleware.admin.isAdmin);
plugins.fireHook('action:app.load', app, middleware, controllers); plugins.fireHook('action:app.load', router, middleware, controllers);
adminRoutes(app, middleware, controllers); adminRoutes(router, middleware, controllers);
metaRoutes(app, middleware, controllers); metaRoutes(router, middleware, controllers);
apiRoutes(app, middleware, controllers); apiRoutes(router, middleware, controllers);
feedRoutes(app, middleware, controllers); feedRoutes(router, middleware, controllers);
pluginRoutes(app, middleware, controllers); pluginRoutes(router, middleware, controllers);
authRoutes.createRoutes(app, middleware, controllers); authRoutes.createRoutes(router, middleware, controllers);
/** /**
* Every view has an associated API route. * Every view has an associated API route.
* *
*/ */
mainRoutes(app, middleware, controllers); mainRoutes(router, middleware, controllers);
staticRoutes(app, middleware, controllers); staticRoutes(router, middleware, controllers);
topicRoutes(app, middleware, controllers); topicRoutes(router, middleware, controllers);
tagRoutes(app, middleware, controllers); tagRoutes(router, middleware, controllers);
categoryRoutes(app, middleware, controllers); categoryRoutes(router, middleware, controllers);
accountRoutes(app, middleware, controllers); accountRoutes(router, middleware, controllers);
userRoutes(app, middleware, controllers); userRoutes(router, middleware, controllers);
groupRoutes(app, middleware, controllers); groupRoutes(router, middleware, controllers);
app.use(nconf.get('relative_path'), router);
app.use(catch404); app.use(catch404);
app.use(handleErrors); app.use(handleErrors);
}); });
if (process.env.NODE_ENV === 'development') { if (process.env.NODE_ENV === 'development') {
app.use('/debug', require('./debug')(middleware, controllers)); require('./debug')(app, middleware, controllers);
} }
}; };