krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade lodash to v4 and lint more files (#8495)

Browse Source 
* common: import lodash modules separately

* remove test/content from .eslintignore, fix with eslint --fix content/index

* lint test/content

* lint content/index except for lodash methods

* upgrade server/models

* upgrade server/middlewares and server/libs

* port server/controllers/top-level

* port server/controllers/api-v3

* port views and tests

* client old port lodash and _(, missing _.

* upgrade client-old

* port common/script (root level files only)

* port common/script/fns

* port common/libs

* port common/script/ops

* port common/script/content and common/script/libs/shops.js

* misc fixes

* misc fixes

* misc fixes

* more tests fixes

* fix payments test stubbing, down to 2 failing tests

* remove more instances of lodash wrapping

* fix bug where toObject does not clone object

* fix tests

* upgrade migration or add lodash 4 note

* update shrinkwrap

* fix linting

* upgrade eslint-config-habitrpg

* update shrinkwrap

* recompile shrinkwrap
This commit is contained in:
Matteo Pagliazzi
2017-03-01 17:10:48 +01:00
committed by GitHub
parent ef02e59590
commit 98c019a0b6
150 changed files with 4996 additions and 1533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
website/common/script/ops/purchase.js
View File

@@ -1,6 +1,7 @@
import content from '../content/index';
import i18n from '../i18n';
import _ from 'lodash';
import get from 'lodash/get';
import pick from 'lodash/pick';
import splitWhitespace from '../libs/splitWhitespace';
import planGemLimits from '../libs/planGemLimits';
import {
@@ -10,8 +11,8 @@ import {
} from '../libs/errors';
module.exports = function purchase (user, req = {}, analytics) {
let type = _.get(req.params, 'type');
let key = _.get(req.params, 'key');
let type = get(req.params, 'type');
let key = get(req.params, 'key');
let item;
let price;
@@ -56,7 +57,7 @@ module.exports = function purchase (user, req = {}, analytics) {
}
return [
_.pick(user, splitWhitespace('stats balance')),
pick(user, splitWhitespace('stats balance')),
i18n.t('plusOneGem', req.language),
];
}
@@ -120,6 +121,6 @@ module.exports = function purchase (user, req = {}, analytics) {
}
return [
_.pick(user, splitWhitespace('items balance')),
pick(user, splitWhitespace('items balance')),
];
};