mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-11-08 23:15:48 +01:00
finally got admin header and footer working 👍
This commit is contained in:
@@ -3,8 +3,14 @@
|
|||||||
var app,
|
var app,
|
||||||
middleware = {},
|
middleware = {},
|
||||||
nconf = require('nconf'),
|
nconf = require('nconf'),
|
||||||
|
async = require('async'),
|
||||||
user = require('./../user'),
|
user = require('./../user'),
|
||||||
plugins = require('./../plugins');
|
meta = require('./../meta'),
|
||||||
|
plugins = require('./../plugins'),
|
||||||
|
|
||||||
|
controllers = {
|
||||||
|
api: require('./../controllers/api')
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
middleware.isAdmin = function (req, res, next) {
|
middleware.isAdmin = function (req, res, next) {
|
||||||
@@ -18,26 +24,49 @@ middleware.isAdmin = function (req, res, next) {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
middleware.buildHeader = function (req, res, callback) {
|
middleware.buildHeader = function(req, res, next) {
|
||||||
var custom_header = {
|
async.parallel([
|
||||||
'plugins': [],
|
function(next) {
|
||||||
'authentication': []
|
var custom_header = {
|
||||||
};
|
'plugins': [],
|
||||||
|
'authentication': []
|
||||||
|
};
|
||||||
|
|
||||||
user.getUserFields(req.user.uid, ['username', 'userslug', 'picture'], function(err, userData) {
|
user.getUserFields(req.user.uid, ['username', 'userslug', 'picture'], function(err, userData) {
|
||||||
plugins.fireHook('filter:admin.header.build', custom_header, function(err, custom_header) {
|
plugins.fireHook('filter:admin.header.build', custom_header, function(err, custom_header) {
|
||||||
callback(err, templates['admin/header'].parse({
|
var data = {
|
||||||
csrf: res.locals.csrf_token,
|
csrf: res.locals.csrf_token,
|
||||||
relative_path: nconf.get('relative_path'),
|
relative_path: nconf.get('relative_path'),
|
||||||
plugins: custom_header.plugins,
|
plugins: custom_header.plugins,
|
||||||
authentication: custom_header.authentication,
|
authentication: custom_header.authentication,
|
||||||
userpicture: userData.picture,
|
userpicture: userData.picture,
|
||||||
username: userData.username,
|
username: userData.username,
|
||||||
userslug: userData.userslug,
|
userslug: userData.userslug,
|
||||||
'cache-buster': meta.config['cache-buster'] ? 'v=' + meta.config['cache-buster'] : '',
|
'cache-buster': meta.config['cache-buster'] ? 'v=' + meta.config['cache-buster'] : '',
|
||||||
env: process.env.NODE_ENV ? true : false
|
env: process.env.NODE_ENV ? true : false
|
||||||
}));
|
};
|
||||||
});
|
|
||||||
|
app.render('admin/header', data, function(err, template) {
|
||||||
|
res.locals.adminHeader = template;
|
||||||
|
next(err);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
},
|
||||||
|
function(next) {
|
||||||
|
controllers.api.getConfig(req, res, function(err, config) {
|
||||||
|
res.locals.config = config;
|
||||||
|
next(err);
|
||||||
|
});
|
||||||
|
},
|
||||||
|
function(next) {
|
||||||
|
app.render('footer', {}, function(err, template) {
|
||||||
|
res.locals.adminFooter = template;
|
||||||
|
next(err);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
], function(err) {
|
||||||
|
next();
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -293,14 +293,9 @@ middleware.processRender = function(req, res, next) {
|
|||||||
fn(err, translated);
|
fn(err, translated);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
} else if (res.locals.renderAdminHeader) {
|
} else if (res.locals.adminHeader) {
|
||||||
middleware.admin.renderHeader({
|
str = res.locals.adminHeader + str;
|
||||||
req: req,
|
fn(err, str);
|
||||||
res: res
|
|
||||||
}, function(err, template) {
|
|
||||||
str = template + str;
|
|
||||||
fn(err, str);
|
|
||||||
});
|
|
||||||
} else {
|
} else {
|
||||||
fn(err, str);
|
fn(err, str);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -103,7 +103,7 @@ module.exports = function(app, middleware, controllers) {
|
|||||||
}());
|
}());
|
||||||
|
|
||||||
app.namespace('/admin', function () {
|
app.namespace('/admin', function () {
|
||||||
app.get('/', middleware.buildHeader, function(req, res, next) {
|
app.get('/', middleware.admin.buildHeader, function(req, res, next) {
|
||||||
res.render('admin/index', {});
|
res.render('admin/index', {});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user