sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-13 15:38:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(env): small cleanup

Browse source
This commit is contained in:
Tyler Renelle 2014-12-12 11:57:55 -07:00 committed by Matteo Pagliazzi
parent 8935538b53
commit e98243e3d8
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/middleware.js
View file

@ -173,12 +173,9 @@ module.exports.locals = function(req, res, next) {
language.momentLang = ((!isStaticPage && i18n.momentLangs[language.code]) || undefined); language.momentLang = ((!isStaticPage && i18n.momentLangs[language.code]) || undefined);
var tavern = require('./models/group').tavern; var tavern = require('./models/group').tavern;
res.locals.habitrpg = { var envVars = _.pick(nconf.get(), 'NODE_ENV BASE_URL GA_ID STRIPE_PUB_KEY FACEBOOK_KEY'.split(' '));
NODE_ENV: nconf.get('NODE_ENV'), res.locals.habitrpg = _.merge(envVars, {
BASE_URL: nconf.get('BASE_URL'),
GA_ID: nconf.get("GA_ID"),
IS_MOBILE: /Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(req.header('User-Agent')), IS_MOBILE: /Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(req.header('User-Agent')),
STRIPE_PUB_KEY: nconf.get('STRIPE_PUB_KEY'),
getManifestFiles: getManifestFiles, getManifestFiles: getManifestFiles,
getBuildUrl: getBuildUrl, getBuildUrl: getBuildUrl,
avalaibleLanguages: i18n.avalaibleLanguages, avalaibleLanguages: i18n.avalaibleLanguages,
@ -193,11 +190,9 @@ module.exports.locals = function(req, res, next) {
siteVersion: siteVersion, siteVersion: siteVersion,
Content: shared.content, Content: shared.content,
mods: require('./models/user').mods, mods: require('./models/user').mods,
FACEBOOK_KEY: nconf.get('FACEBOOK_KEY'),
tavern: tavern, // for world boss tavern: tavern, // for world boss
worldDmg: (tavern && tavern.quest && tavern.quest.extra && tavern.quest.extra.worldDmg) || {} worldDmg: (tavern && tavern.quest && tavern.quest.extra && tavern.quest.extra.worldDmg) || {}
}; });
// Put query-string party invitations into session to be handled later // Put query-string party invitations into session to be handled later
try{ try{