krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

a bunch of small fixes

Browse Source
This commit is contained in:
Tyler Renelle
2012-10-12 07:11:06 -04:00
parent 80922c1047
commit 6a42b681e3
6 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/app/index.js
View File

@@ -26,7 +26,7 @@ _ = require('lodash');
get('/:uidParam?', function(page, model, _arg, next) { get('/:uidParam?', function(page, model, _arg, next) {
var sess, uidParam; var sess, uidParam;
uidParam = _arg.uidParam; uidParam = _arg.uidParam;
if (uidParam === 'privacy' || uidParam === 'terms' || uidParam === 'auth') { if ((uidParam === 'privacy' || uidParam === 'terms' || uidParam === 'auth')) {
return next(); return next();
} }
sess = model.session; sess = model.session;

2
lib/server/index.js
View File

@@ -36,7 +36,7 @@ server = http.createServer(expressApp);
module.exports = server; module.exports = server;
if (process.env.NODE_ENV !== 'production') { if (process.env.NODE_ENV === 'production') {
expressApp.all('*', function(req, res, next) { expressApp.all('*', function(req, res, next) {
if (req.headers['x-forwarded-proto'] !== 'https') { if (req.headers['x-forwarded-proto'] !== 'https') {
return res.redirect('https://' + req.headers.host + req.url); return res.redirect('https://' + req.headers.host + req.url);

6
lib/server/serverRoutes.js
View File

@@ -4,6 +4,8 @@ var scoring;
scoring = require('../app/scoring'); scoring = require('../app/scoring');
module.exports = function(expressApp, root, derby) { module.exports = function(expressApp, root, derby) {
var staticPages;
staticPages = derby.createStatic(root);
expressApp.get('/:uid/up/:score?', function(req, res) { expressApp.get('/:uid/up/:score?', function(req, res) {
var model, score; var model, score;
score = parseInt(req.params.score) || 1; score = parseInt(req.params.score) || 1;
@@ -35,13 +37,9 @@ module.exports = function(expressApp, root, derby) {
return res.send(200); return res.send(200);
}); });
expressApp.get('/privacy', function(req, res) { expressApp.get('/privacy', function(req, res) {
var staticPages;
staticPages = derby.createStatic(root);
return staticPages.render('privacy', res); return staticPages.render('privacy', res);
}); });
expressApp.get('/terms', function(req, res) { expressApp.get('/terms', function(req, res) {
var staticPages;
staticPages = derby.createStatic(root);
return staticPages.render('terms', res); return staticPages.render('terms', res);
}); });
expressApp.post('/', function(req) { expressApp.post('/', function(req) {

2
src/app/index.coffee
View File

@@ -17,7 +17,7 @@ _ = require 'lodash'
get '/:uidParam?', (page, model, {uidParam}, next) -> get '/:uidParam?', (page, model, {uidParam}, next) ->
#FIXME figure out a better way to do this #FIXME figure out a better way to do this
return next() if (uidParam == 'privacy' or uidParam == 'terms' or uidParam == 'auth') return next() if (uidParam in ['privacy','terms','auth'])
sess = model.session sess = model.session
if sess.habitRpgAuth && sess.habitRpgAuth.facebook if sess.habitRpgAuth && sess.habitRpgAuth.facebook

2
src/server/index.coffee
View File

@@ -25,7 +25,7 @@ module.exports = server
# Force SSL # Force SSL
# Set before other routes, as early as possible # Set before other routes, as early as possible
if process.env.NODE_ENV!='production' if process.env.NODE_ENV=='production'
expressApp.all '*', (req, res, next) -> expressApp.all '*', (req, res, next) ->
if req.headers['x-forwarded-proto']!='https' if req.headers['x-forwarded-proto']!='https'
res.redirect('https://'+req.headers.host+req.url) res.redirect('https://'+req.headers.host+req.url)

4
src/server/serverRoutes.coffee
View File

@@ -2,6 +2,8 @@ scoring = require('../app/scoring')
module.exports = (expressApp, root, derby) -> module.exports = (expressApp, root, derby) ->
staticPages = derby.createStatic root
expressApp.get '/:uid/up/:score?', (req, res) -> expressApp.get '/:uid/up/:score?', (req, res) ->
score = parseInt(req.params.score) || 1 score = parseInt(req.params.score) || 1
model = req.getModel() model = req.getModel()
@@ -21,11 +23,9 @@ module.exports = (expressApp, root, derby) ->
res.send(200) res.send(200)
expressApp.get '/privacy', (req, res) -> expressApp.get '/privacy', (req, res) ->
staticPages = derby.createStatic root
staticPages.render 'privacy', res staticPages.render 'privacy', res
expressApp.get '/terms', (req, res) -> expressApp.get '/terms', (req, res) ->
staticPages = derby.createStatic root
staticPages.render 'terms', res staticPages.render 'terms', res
expressApp.post '/', (req) -> expressApp.post '/', (req) ->