mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-19 15:48:04 +01:00
try going back to underscore and node.clone, heroku doesn't like lodash
This commit is contained in:
@@ -21,7 +21,7 @@ helpers = require('./helpers');
|
|||||||
|
|
||||||
helpers.viewHelpers(view);
|
helpers.viewHelpers(view);
|
||||||
|
|
||||||
_ = require('lodash');
|
_ = require('underscore');
|
||||||
|
|
||||||
get('/:uid?', function(page, model, _arg, next) {
|
get('/:uid?', function(page, model, _arg, next) {
|
||||||
var req, sess, uid;
|
var req, sess, uid;
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ content = require('./content');
|
|||||||
|
|
||||||
moment = require('moment');
|
moment = require('moment');
|
||||||
|
|
||||||
_ = require('lodash');
|
_ = require('underscore');
|
||||||
|
|
||||||
userSchema = {
|
userSchema = {
|
||||||
balance: 2,
|
balance: 2,
|
||||||
@@ -30,7 +30,7 @@ userSchema = {
|
|||||||
|
|
||||||
module.exports.newUserObject = function() {
|
module.exports.newUserObject = function() {
|
||||||
var guid, newUser, task, _i, _len, _ref;
|
var guid, newUser, task, _i, _len, _ref;
|
||||||
newUser = _.clone(userSchema, true);
|
newUser = require('clone')(userSchema, true);
|
||||||
_ref = content.defaultTasks;
|
_ref = content.defaultTasks;
|
||||||
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
|
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
|
||||||
task = _ref[_i];
|
task = _ref[_i];
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ async = require('async');
|
|||||||
|
|
||||||
moment = require('moment');
|
moment = require('moment');
|
||||||
|
|
||||||
_ = require('lodash');
|
_ = require('underscore');
|
||||||
|
|
||||||
content = require('./content');
|
content = require('./content');
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ schema = require('../app/schema');
|
|||||||
|
|
||||||
content = require('../app/content');
|
content = require('../app/content');
|
||||||
|
|
||||||
_ = require('lodash');
|
_ = require('underscore');
|
||||||
|
|
||||||
req = void 0;
|
req = void 0;
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ var scoring, _;
|
|||||||
|
|
||||||
scoring = require('../app/scoring');
|
scoring = require('../app/scoring');
|
||||||
|
|
||||||
_ = require('lodash');
|
_ = require('underscore');
|
||||||
|
|
||||||
module.exports = function(expressApp, root, derby) {
|
module.exports = function(expressApp, root, derby) {
|
||||||
var deprecatedMessage, staticPages;
|
var deprecatedMessage, staticPages;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "habitrpg",
|
"name": "habitrpg",
|
||||||
"description": "A habit tracker app which treats your goals like a Role Playing Game.",
|
"description": "A habit tracker app which treats your goals like a Role Playing Game.",
|
||||||
"version": "0.0.0-106",
|
"version": "0.0.0-142",
|
||||||
"main": "./server.js",
|
"main": "./server.js",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"derby": "0.3.13",
|
"derby": "0.3.13",
|
||||||
@@ -15,7 +15,8 @@
|
|||||||
"moment": "*",
|
"moment": "*",
|
||||||
"stripe": "*",
|
"stripe": "*",
|
||||||
"async": "*",
|
"async": "*",
|
||||||
"lodash": "*"
|
"underscore": "*",
|
||||||
|
"clone": "*"
|
||||||
},
|
},
|
||||||
"private": true,
|
"private": true,
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
@@ -31,6 +32,6 @@
|
|||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": "0.8.x",
|
"node": "0.8.x",
|
||||||
"npm": "1.1.x"
|
"npm": "1.1.x"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -10,7 +10,7 @@ scoring = require './scoring'
|
|||||||
schema = require './schema'
|
schema = require './schema'
|
||||||
helpers = require './helpers'
|
helpers = require './helpers'
|
||||||
helpers.viewHelpers view
|
helpers.viewHelpers view
|
||||||
_ = require 'lodash'
|
_ = require 'underscore'
|
||||||
|
|
||||||
|
|
||||||
# ========== ROUTES ==========
|
# ========== ROUTES ==========
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
content = require './content'
|
content = require './content'
|
||||||
moment = require 'moment'
|
moment = require 'moment'
|
||||||
_ = require 'lodash'
|
_ = require 'underscore'
|
||||||
|
|
||||||
userSchema = {
|
userSchema = {
|
||||||
balance: 2
|
balance: 2
|
||||||
@@ -16,7 +16,7 @@ userSchema = {
|
|||||||
|
|
||||||
module.exports.newUserObject = ->
|
module.exports.newUserObject = ->
|
||||||
# deep clone, else further new users get duplicate objects
|
# deep clone, else further new users get duplicate objects
|
||||||
newUser = _.clone(userSchema, true) #deep
|
newUser = require('clone')(userSchema, true) #deep
|
||||||
for task in content.defaultTasks
|
for task in content.defaultTasks
|
||||||
guid = task.id = require('derby/node_modules/racer').uuid()
|
guid = task.id = require('derby/node_modules/racer').uuid()
|
||||||
newUser.tasks[guid] = task
|
newUser.tasks[guid] = task
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
async = require 'async'
|
async = require 'async'
|
||||||
moment = require 'moment'
|
moment = require 'moment'
|
||||||
_ = require 'lodash'
|
_ = require 'underscore'
|
||||||
content = require './content'
|
content = require './content'
|
||||||
helpers = require './helpers'
|
helpers = require './helpers'
|
||||||
MODIFIER = .03 # each new level, armor, weapon add 3% modifier (this number may change)
|
MODIFIER = .03 # each new level, armor, weapon add 3% modifier (this number may change)
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
derby = require('derby')
|
derby = require('derby')
|
||||||
schema = require('../app/schema')
|
schema = require('../app/schema')
|
||||||
content = require('../app/content')
|
content = require('../app/content')
|
||||||
_ = require('lodash')
|
_ = require('underscore')
|
||||||
|
|
||||||
# Need this for later use by EveryAuth in the MiddleWare
|
# Need this for later use by EveryAuth in the MiddleWare
|
||||||
req = undefined
|
req = undefined
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
scoring = require('../app/scoring')
|
scoring = require('../app/scoring')
|
||||||
_ = require('lodash')
|
_ = require('underscore')
|
||||||
|
|
||||||
module.exports = (expressApp, root, derby) ->
|
module.exports = (expressApp, root, derby) ->
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user