mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-19 15:48:04 +01:00
setting up for syncing private & public branches
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
// Generated by CoffeeScript 1.3.3
|
||||
// Generated by CoffeeScript 1.4.0
|
||||
|
||||
module.exports = {
|
||||
defaultTasks: [
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Generated by CoffeeScript 1.3.3
|
||||
// Generated by CoffeeScript 1.4.0
|
||||
var dayMapping, moment;
|
||||
|
||||
moment = require('moment');
|
||||
|
||||
@@ -324,5 +324,6 @@ ready(function(model) {
|
||||
return model.set('_user.stats.lvl', 1);
|
||||
};
|
||||
setTimeout(scoring.cron, 1);
|
||||
return setInterval(scoring.cron, 3600000);
|
||||
setInterval(scoring.cron, 3600000);
|
||||
return require('../server/private').app(exports, model);
|
||||
});
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Generated by CoffeeScript 1.3.3
|
||||
var MongoStore, ONE_YEAR, app, auth, derby, everyauth, express, expressApp, gzippo, habitrpgMiddleware, http, path, publicPath, racer, root, server, serverError, store;
|
||||
// Generated by CoffeeScript 1.4.0
|
||||
var MongoStore, ONE_YEAR, app, auth, derby, everyauth, express, expressApp, gzippo, habitrpgMiddleware, http, path, priv, publicPath, racer, root, server, serverError, store;
|
||||
|
||||
http = require('http');
|
||||
|
||||
@@ -21,6 +21,8 @@ MongoStore = require('connect-mongo')(express);
|
||||
|
||||
auth = require('./auth');
|
||||
|
||||
priv = require('./private');
|
||||
|
||||
racer = require('derby/node_modules/racer');
|
||||
|
||||
racer.io.set('transports', ['xhr-polling']);
|
||||
@@ -77,6 +79,12 @@ expressApp.use(express.favicon()).use(gzippo.staticGzip(publicPath, {
|
||||
store: new MongoStore({
|
||||
url: process.env.NODE_DB_URI
|
||||
})
|
||||
})).use(store.modelMiddleware()).use(habitrpgMiddleware).use(everyauth.middleware()).use(app.router()).use(expressApp.router).use(serverError(root));
|
||||
})).use(store.modelMiddleware()).use(priv.middleware).use(habitrpgMiddleware).use(everyauth.middleware()).use(app.router()).use(expressApp.router).use(serverError(root));
|
||||
|
||||
priv.routes(expressApp);
|
||||
|
||||
require('./serverRoutes')(expressApp, root, derby);
|
||||
|
||||
expressApp.all('*', function(req) {
|
||||
throw "404: " + req.url;
|
||||
});
|
||||
|
||||
9
lib/server/private.js
Normal file
9
lib/server/private.js
Normal file
@@ -0,0 +1,9 @@
|
||||
// Generated by CoffeeScript 1.4.0
|
||||
|
||||
module.exports.middleware = function(req, res, next) {
|
||||
return next();
|
||||
};
|
||||
|
||||
module.exports.app = function(appExports, model) {};
|
||||
|
||||
module.exports.routes = function(expressApp) {};
|
||||
@@ -1,4 +1,4 @@
|
||||
// Generated by CoffeeScript 1.3.3
|
||||
// Generated by CoffeeScript 1.4.0
|
||||
var derby, isProduction;
|
||||
|
||||
derby = require('derby');
|
||||
|
||||
@@ -21,7 +21,7 @@ module.exports = function(expressApp, root, derby) {
|
||||
expressApp.get('/:uid/down/:score?', function(req, res) {
|
||||
return res.send(200, deprecatedMessage);
|
||||
});
|
||||
expressApp.post('/users/:uid/tasks/:taskId/:direction', function(req, res) {
|
||||
return expressApp.post('/users/:uid/tasks/:taskId/:direction', function(req, res) {
|
||||
var direction, icon, model, service, taskId, title, uid, _ref, _ref1;
|
||||
_ref = req.params, uid = _ref.uid, taskId = _ref.taskId, direction = _ref.direction;
|
||||
_ref1 = req.body, title = _ref1.title, service = _ref1.service, icon = _ref1.icon;
|
||||
@@ -69,10 +69,4 @@ module.exports = function(expressApp, root, derby) {
|
||||
return res.send(result);
|
||||
});
|
||||
});
|
||||
expressApp.post('/', function(req) {
|
||||
return require('../app/reroll').stripeResponse(req);
|
||||
});
|
||||
return expressApp.all('*', function(req) {
|
||||
throw "404: " + req.url;
|
||||
});
|
||||
};
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
module.exports = {
|
||||
module.exports =
|
||||
defaultTasks: [
|
||||
{type: 'habit', text: '1h Productive Work', notes: '<u>Habits: Constantly Track</u><br/>For some habits, it only makes sense to <b>gain</b> points (like this one).', value: 0, up: true, down: false }
|
||||
{type: 'habit', text: 'Eat Junk Food', notes: 'For others, it only makes sense to <b>lose</b> points', value: 0, up: false, down: true}
|
||||
@@ -54,7 +54,7 @@ module.exports = {
|
||||
}
|
||||
]
|
||||
|
||||
items: {
|
||||
items:
|
||||
unlockedMessage:
|
||||
title: "Item Store Unlocked"
|
||||
content: "Congradulations, you have unlocked the Item Store! You can now buy weapons, armor, potions, etc. Read each item's comment for more information."
|
||||
@@ -83,6 +83,3 @@ module.exports = {
|
||||
icon: 'favicon'
|
||||
notes: "Resets your tasks. When you're struggling and everything's red, use for a clean slate."
|
||||
value:0
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -280,3 +280,5 @@ ready (model) ->
|
||||
# Doesn't do anything otherwise. Don't know why... model not initialized enough yet?
|
||||
setTimeout scoring.cron, 1 # Run once on refresh
|
||||
setInterval scoring.cron, 3600000 # Then run once every hour
|
||||
|
||||
require('../server/private').app(exports, model)
|
||||
|
||||
@@ -8,6 +8,7 @@ everyauth = require('everyauth')
|
||||
serverError = require './serverError'
|
||||
MongoStore = require('connect-mongo')(express)
|
||||
auth = require('./auth')
|
||||
priv = require('./private')
|
||||
|
||||
## RACER CONFIGURATION ##
|
||||
|
||||
@@ -67,6 +68,7 @@ expressApp
|
||||
.use(store.modelMiddleware())
|
||||
# Middelware can be inserted after the modelMiddleware and before
|
||||
# the app router to pass server accessible data to a model
|
||||
.use(priv.middleware)
|
||||
.use(habitrpgMiddleware)
|
||||
.use(everyauth.middleware())
|
||||
# Creates an express middleware from the app's routes
|
||||
@@ -74,4 +76,9 @@ expressApp
|
||||
.use(expressApp.router)
|
||||
.use(serverError root)
|
||||
|
||||
priv.routes(expressApp)
|
||||
require('./serverRoutes')(expressApp, root, derby)
|
||||
|
||||
# Errors
|
||||
expressApp.all '*', (req) ->
|
||||
throw "404: #{req.url}"
|
||||
6
src/server/private.coffee
Normal file
6
src/server/private.coffee
Normal file
@@ -0,0 +1,6 @@
|
||||
module.exports.middleware = (req, res, next) ->
|
||||
return next()
|
||||
|
||||
module.exports.app= (appExports, model) ->
|
||||
|
||||
module.exports.routes = (expressApp) ->
|
||||
@@ -58,13 +58,3 @@ module.exports = (expressApp, root, derby) ->
|
||||
result = model.get ('_user.stats')
|
||||
result.delta = delta
|
||||
res.send(result)
|
||||
|
||||
# ---------- Stripe ------------
|
||||
|
||||
expressApp.post '/', (req) ->
|
||||
require('../app/reroll').stripeResponse(req)
|
||||
|
||||
# ---------- Errors ------------
|
||||
|
||||
expressApp.all '*', (req) ->
|
||||
throw "404: #{req.url}"
|
||||
|
||||
Reference in New Issue
Block a user