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);
|
||||
|
||||
_ = require('lodash');
|
||||
_ = require('underscore');
|
||||
|
||||
get('/:uid?', function(page, model, _arg, next) {
|
||||
var req, sess, uid;
|
||||
|
||||
@@ -5,7 +5,7 @@ content = require('./content');
|
||||
|
||||
moment = require('moment');
|
||||
|
||||
_ = require('lodash');
|
||||
_ = require('underscore');
|
||||
|
||||
userSchema = {
|
||||
balance: 2,
|
||||
@@ -30,7 +30,7 @@ userSchema = {
|
||||
|
||||
module.exports.newUserObject = function() {
|
||||
var guid, newUser, task, _i, _len, _ref;
|
||||
newUser = _.clone(userSchema, true);
|
||||
newUser = require('clone')(userSchema, true);
|
||||
_ref = content.defaultTasks;
|
||||
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
|
||||
task = _ref[_i];
|
||||
|
||||
@@ -5,7 +5,7 @@ async = require('async');
|
||||
|
||||
moment = require('moment');
|
||||
|
||||
_ = require('lodash');
|
||||
_ = require('underscore');
|
||||
|
||||
content = require('./content');
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ schema = require('../app/schema');
|
||||
|
||||
content = require('../app/content');
|
||||
|
||||
_ = require('lodash');
|
||||
_ = require('underscore');
|
||||
|
||||
req = void 0;
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ var scoring, _;
|
||||
|
||||
scoring = require('../app/scoring');
|
||||
|
||||
_ = require('lodash');
|
||||
_ = require('underscore');
|
||||
|
||||
module.exports = function(expressApp, root, derby) {
|
||||
var deprecatedMessage, staticPages;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "habitrpg",
|
||||
"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",
|
||||
"dependencies": {
|
||||
"derby": "0.3.13",
|
||||
@@ -15,7 +15,8 @@
|
||||
"moment": "*",
|
||||
"stripe": "*",
|
||||
"async": "*",
|
||||
"lodash": "*"
|
||||
"underscore": "*",
|
||||
"clone": "*"
|
||||
},
|
||||
"private": true,
|
||||
"devDependencies": {
|
||||
@@ -31,6 +32,6 @@
|
||||
},
|
||||
"engines": {
|
||||
"node": "0.8.x",
|
||||
"npm": "1.1.x"
|
||||
"npm": "1.1.x"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -10,7 +10,7 @@ scoring = require './scoring'
|
||||
schema = require './schema'
|
||||
helpers = require './helpers'
|
||||
helpers.viewHelpers view
|
||||
_ = require 'lodash'
|
||||
_ = require 'underscore'
|
||||
|
||||
|
||||
# ========== ROUTES ==========
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
content = require './content'
|
||||
moment = require 'moment'
|
||||
_ = require 'lodash'
|
||||
_ = require 'underscore'
|
||||
|
||||
userSchema = {
|
||||
balance: 2
|
||||
@@ -16,7 +16,7 @@ userSchema = {
|
||||
|
||||
module.exports.newUserObject = ->
|
||||
# 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
|
||||
guid = task.id = require('derby/node_modules/racer').uuid()
|
||||
newUser.tasks[guid] = task
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
async = require 'async'
|
||||
moment = require 'moment'
|
||||
_ = require 'lodash'
|
||||
_ = require 'underscore'
|
||||
content = require './content'
|
||||
helpers = require './helpers'
|
||||
MODIFIER = .03 # each new level, armor, weapon add 3% modifier (this number may change)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
derby = require('derby')
|
||||
schema = require('../app/schema')
|
||||
content = require('../app/content')
|
||||
_ = require('lodash')
|
||||
_ = require('underscore')
|
||||
|
||||
# Need this for later use by EveryAuth in the MiddleWare
|
||||
req = undefined
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
scoring = require('../app/scoring')
|
||||
_ = require('lodash')
|
||||
_ = require('underscore')
|
||||
|
||||
module.exports = (expressApp, root, derby) ->
|
||||
|
||||
|
||||
Reference in New Issue
Block a user