yes, I've finally started on the dreaded admin refactor (not much else left to do :/)

v1.18.x
psychobunny 11 years ago
parent 209bcaba8c
commit e588762aa0

@ -1,3 +1,5 @@
"use strict";
var nconf = require('nconf'),
fs = require('fs'),
path = require('path'),
@ -20,7 +22,8 @@ var nconf = require('nconf'),
utils = require('./../../public/src/utils'),
templates = require('./../../public/src/templates');
(function (Admin) {
var Admin = {};
Admin.isAdmin = function (req, res, next) {
user.isAdministrator((req.user && req.user.uid) ? req.user.uid : 0, function (err, isAdmin) {
if (!isAdmin) {
@ -30,7 +33,7 @@ var nconf = require('nconf'),
next();
}
});
}
};
Admin.buildHeader = function (req, res, callback) {
var custom_header = {
@ -53,9 +56,30 @@ var nconf = require('nconf'),
}));
});
});
};
function uploadImage(filename, req, res) {
function done(err, image) {
var er, rs;
fs.unlink(req.files.userPhoto.path);
if(err) {
er = {error: err.message};
return res.send(req.xhr ? er : JSON.stringify(er));
}
rs = {path: image.url};
res.send(req.xhr ? rs : JSON.stringify(rs));
}
Admin.createRoutes = function (app) {
if(plugins.hasListeners('filter:uploadImage')) {
plugins.fireHook('filter:uploadImage', req.files.userPhoto, done);
} else {
file.saveFileToLocal(filename, req.files.userPhoto.path, done);
}
}
module.exports = function(app, middleware, controllers) {
app.all('/api/admin/*', Admin.isAdmin);
app.all('/admin/*', Admin.isAdmin);
app.get('/admin', Admin.isAdmin);
@ -76,19 +100,6 @@ var nconf = require('nconf'),
});
}(routes[i]));
}
var unit_tests = ['categories'];
for (var i = 0, ii = unit_tests.length; i < ii; i++) {
(function (route) {
app.get('/admin/testing/' + route, function (req, res) {
Admin.buildHeader(req, res, function(err, header) {
res.send(header + app.create_route('admin/testing/' + route) + templates['admin/footer']);
});
});
}(unit_tests[i]));
}
}());
app.namespace('/admin', function () {
@ -189,27 +200,6 @@ var nconf = require('nconf'),
});
});
function uploadImage(filename, req, res) {
function done(err, image) {
var er, rs;
fs.unlink(req.files.userPhoto.path);
if(err) {
er = {error: err.message};
return res.send(req.xhr ? er : JSON.stringify(er));
}
rs = {path: image.url};
res.send(req.xhr ? rs : JSON.stringify(rs));
}
if(plugins.hasListeners('filter:uploadImage')) {
plugins.fireHook('filter:uploadImage', req.files.userPhoto, done);
} else {
file.saveFileToLocal(filename, req.files.userPhoto.path, done);
}
}
var custom_routes = {
'routes': [],
'api': []
@ -217,9 +207,9 @@ var nconf = require('nconf'),
plugins.ready(function() {
plugins.fireHook('filter:admin.create_routes', custom_routes, function(err, custom_routes) {
var routes = custom_routes.routes;
var route, routes = custom_routes.routes;
for (var route in routes) {
for (route in routes) {
if (routes.hasOwnProperty(route)) {
(function(route) {
app[routes[route].method || 'get']('/admin' + routes[route].route, function(req, res) {
@ -234,7 +224,7 @@ var nconf = require('nconf'),
}
var apiRoutes = custom_routes.api;
for (var route in apiRoutes) {
for (route in apiRoutes) {
if (apiRoutes.hasOwnProperty(route)) {
(function(route) {
app[apiRoutes[route].method || 'get']('/api/admin' + apiRoutes[route].route, function(req, res) {
@ -363,7 +353,9 @@ var nconf = require('nconf'),
app.get('/plugins', function (req, res) {
plugins.showInstalled(function (err, plugins) {
if (err || !Array.isArray(plugins)) plugins = [];
if (err || !Array.isArray(plugins)) {
plugins = [];
}
res.json(200, {
plugins: plugins
@ -420,10 +412,6 @@ var nconf = require('nconf'),
});
});
app.get('/testing/categories', function (req, res) {
res.json(200, {});
});
app.get('/groups', function (req, res) {
async.parallel([
function(next) {
@ -447,6 +435,3 @@ var nconf = require('nconf'),
});
});
};
}(exports));

@ -15,9 +15,9 @@ module.exports = function(app, middleware) {
app.namespace(nconf.get('relative_path'), function() {
//temp
metaRoute.createRoutes(app);
admin.createRoutes(app);
feedsRoute.createRoutes(app);
admin(app, middleware, controllers);
apiRoute(app, middleware, controllers);
/**

Loading…
Cancel
Save