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

removed duplicate build_header

Browse Source
This commit is contained in:
Baris Usakli
2013-06-20 16:04:58 -04:00
parent 99d8affa53
commit 9cf9e98b14
4 changed files with 29 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/routes/authentication.js
View File

@@ -81,18 +81,12 @@
} }
Auth.create_routes = function(app) { Auth.create_routes = function(app) {
var build_header = function() {
return templates['header'].parse({
cssSrc: global.config['theme:src'] || '/vendor/bootstrap/css/bootstrap.min.css',
title: global.config['title'] || 'NodeBB'
});
};
app.get('/logout', function(req, res) { app.get('/logout', function(req, res) {
console.log('info: [Auth] Session ' + req.sessionID + ' logout (uid: ' + global.uid + ')'); console.log('info: [Auth] Session ' + req.sessionID + ' logout (uid: ' + global.uid + ')');
user_module.logout(req.sessionID, function(logout) { user_module.logout(req.sessionID, function(logout) {
req.logout(); req.logout();
res.send(build_header() + templates['logout'] + templates['footer']); res.send(app.build_header() + templates['logout'] + templates['footer']);
}); });
}); });
@@ -126,11 +120,11 @@
app.get('/reset/:code', function(req, res) { app.get('/reset/:code', function(req, res) {
res.send(build_header() + templates['reset_code'].parse({ reset_code: req.params.code }) + templates['footer']); res.send(app.build_header() + templates['reset_code'].parse({ reset_code: req.params.code }) + templates['footer']);
}); });
app.get('/reset', function(req, res) { app.get('/reset', function(req, res) {
res.send(build_header() + templates['reset'] + templates['footer']); res.send(app.build_header() + templates['reset'] + templates['footer']);
}); });

19
src/routes/user.js
View File

@@ -7,12 +7,6 @@ var user = require('./../user.js'),
(function(User) { (function(User) {
User.create_routes = function(app) { User.create_routes = function(app) {
var build_header = function() {
return templates['header'].parse({
cssSrc: global.config['theme:src'] || '/vendor/bootstrap/css/bootstrap.min.css',
title: global.config['title'] || 'NodeBB'
});
};
app.get('/uid/:uid', function(req, res) { app.get('/uid/:uid', function(req, res) {
@@ -29,8 +23,9 @@ var user = require('./../user.js'),
}); });
app.get('/users', function(req, res) { app.get('/users', function(req, res) {
console.log('derp');
user.getUserList(function(data) { user.getUserList(function(data) {
res.send(build_header() + app.create_route("users", "users") + templates['footer']); res.send(app.build_header() + app.create_route("users", "users") + templates['footer']);
}); });
}); });
@@ -48,7 +43,7 @@ var user = require('./../user.js'),
user.getUserData(uid, function(data) { user.getUserData(uid, function(data) {
if(data) { if(data) {
res.send(build_header() + app.create_route('users/'+data.username, 'account') + templates['footer']); res.send(app.build_header() + app.create_route('users/'+data.username, 'account') + templates['footer']);
} }
else { else {
res.redirect('/404'); res.redirect('/404');
@@ -65,7 +60,7 @@ var user = require('./../user.js'),
user.getUserField(req.user.uid, 'username', function(username) { user.getUserField(req.user.uid, 'username', function(username) {
if(req.params.username && username === req.params.username) if(req.params.username && username === req.params.username)
res.send(build_header() + app.create_route('users/'+req.params.username+'/edit','accountedit') + templates['footer']); res.send(app.build_header() + app.create_route('users/'+req.params.username+'/edit','accountedit') + templates['footer']);
else else
return res.redirect('/404'); return res.redirect('/404');
}); });
@@ -228,7 +223,7 @@ var user = require('./../user.js'),
if(!req.user) if(!req.user)
return res.redirect('/403'); return res.redirect('/403');
res.send(build_header() + app.create_route('users/'+req.params.username+'/following','following') + templates['footer']); res.send(app.build_header() + app.create_route('users/'+req.params.username+'/following','following') + templates['footer']);
}); });
app.get('/users/:username/followers', function(req, res) { app.get('/users/:username/followers', function(req, res) {
@@ -236,11 +231,11 @@ var user = require('./../user.js'),
if(!req.user) if(!req.user)
return res.redirect('/403'); return res.redirect('/403');
res.send(build_header() + app.create_route('users/'+req.params.username+'/followers','followers') + templates['footer']); res.send(app.build_header() + app.create_route('users/'+req.params.username+'/followers','followers') + templates['footer']);
}); });
function api_method(req, res) { function api_method(req, res) {
console.log('derp');
var callerUID = req.user?req.user.uid : 0; var callerUID = req.user?req.user.uid : 0;
if (!req.params.section && !req.params.username) { if (!req.params.section && !req.params.username) {

6
src/user.js
View File

@@ -126,8 +126,14 @@ var utils = require('./../public/src/utils.js'),
userkeys.splice(anonUserIndex, 1); userkeys.splice(anonUserIndex, 1);
} }
// removes user:1:following and user:1:followers, - need to find a better way for this
userkeys = userkeys.filter(function(value, index, self){
return value.indexOf(':f') === -1;
});
for(var i=0,ii=userkeys.length; i<ii; ++i) { for(var i=0,ii=userkeys.length; i<ii; ++i) {
var uid = userkeys[i].substr(5); var uid = userkeys[i].substr(5);
User.getUserData(uid, function(userData) { User.getUserData(uid, function(userData) {
data.push(userData); data.push(userData);
if(data.length == userkeys.length) if(data.length == userkeys.length)

15
src/webserver.js
View File

@@ -21,8 +21,9 @@ var express = require('express'),
meta = require('./meta.js'); meta = require('./meta.js');
(function(app) { (function(app) {
var templates = null, var templates = null;
build_header = function() {
app.build_header = function() {
return templates['header'].parse({ return templates['header'].parse({
cssSrc: global.config['theme:src'] || '/vendor/bootstrap/css/bootstrap.min.css', cssSrc: global.config['theme:src'] || '/vendor/bootstrap/css/bootstrap.min.css',
title: global.config['title'] || 'NodeBB' title: global.config['title'] || 'NodeBB'
@@ -93,7 +94,7 @@ var express = require('express'),
return; return;
} }
res.send(build_header() + app.create_route(route) + templates['footer']); res.send(app.build_header() + app.create_route(route) + templates['footer']);
}); });
}(routes[i])); }(routes[i]));
} }
@@ -103,7 +104,7 @@ var express = require('express'),
app.get('/', function(req, res) { app.get('/', function(req, res) {
categories.getAllCategories(function(returnData) { categories.getAllCategories(function(returnData) {
res.send( res.send(
build_header() + app.build_header() +
'\n\t<noscript>\n' + templates['noscript/header'] + templates['noscript/home'].parse(returnData) + '\n\t</noscript>' + '\n\t<noscript>\n' + templates['noscript/header'] + templates['noscript/home'].parse(returnData) + '\n\t</noscript>' +
app.create_route('') + app.create_route('') +
templates['footer'] templates['footer']
@@ -131,7 +132,7 @@ var express = require('express'),
var topic_url = tid + (req.params.slug ? '/' + req.params.slug : ''); var topic_url = tid + (req.params.slug ? '/' + req.params.slug : '');
topics.getTopicById(tid, ((req.user) ? req.user.uid : 0), function(topic) { topics.getTopicById(tid, ((req.user) ? req.user.uid : 0), function(topic) {
res.send( res.send(
build_header() + app.build_header() +
'\n\t<noscript>\n' + templates['noscript/header'] + templates['noscript/topic'].parse(topic) + '\n\t</noscript>' + '\n\t<noscript>\n' + templates['noscript/header'] + templates['noscript/topic'].parse(topic) + '\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 + '");});</script>' +
templates['footer'] templates['footer']
@@ -159,7 +160,7 @@ var express = require('express'),
categories.getCategoryById(cid, 0, function(returnData) { categories.getCategoryById(cid, 0, function(returnData) {
console.log(returnData); console.log(returnData);
res.send( res.send(
build_header() + app.build_header() +
'\n\t<noscript>\n' + templates['noscript/header'] + templates['noscript/category'].parse(returnData) + '\n\t</noscript>' + '\n\t<noscript>\n' + templates['noscript/header'] + templates['noscript/category'].parse(returnData) + '\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 + '");});</script>' +
templates['footer'] templates['footer']
@@ -168,7 +169,7 @@ var express = require('express'),
}); });
app.get('/confirm/:code', function(req, res) { app.get('/confirm/:code', function(req, res) {
res.send(build_header() + '<script>templates.ready(function(){ajaxify.go("confirm/' + req.params.code + '");});</script>' + templates['footer']); res.send(app.build_header() + '<script>templates.ready(function(){ajaxify.go("confirm/' + req.params.code + '");});</script>' + templates['footer']);
}); });
// These functions are called via ajax once the initial page is loaded to populate templates with data // These functions are called via ajax once the initial page is loaded to populate templates with data