Docker/planka
Docker/planka
1
0
Fork 0
mirror of https://github.com/plankanban/planka.git synced 2025-07-23 15:19:44 +02:00
Code Issues Releases Activity

Move from prettier-eslint to eslint-plugin-prettier, update dependencies

Browse source
This commit is contained in:
Maksim Eltyshev 2020-02-03 18:42:31 +05:00
parent f0e7fb8fd1
commit 9c7c96a780
254 changed files with 5539 additions and 5170 deletions
Download patch file Download diff file Expand all files Collapse all files

7
server/api/controllers/boards/show.js
View file

@ -64,9 +64,10 @@ module.exports = {
{},
);
cards.forEach((card) => {
card.isSubscribed = isSubscribedByCardId[card.id] || false;
});
cards.map(card => ({
...card,
isSubscribed: isSubscribedByCardId[card.id] || false,
}));
sails.sockets.join(this.req, `board:${board.id}`); // TODO: only when subscription needed

11
server/api/controllers/cards/create.js
View file

@ -28,14 +28,15 @@ module.exports = {
},
dueDate: {
type: 'string',
custom: (value) => moment(value, moment.ISO_8601, true).isValid(),
custom: value => moment(value, moment.ISO_8601, true).isValid(),
},
timer: {
type: 'json',
custom: (value) => _.isPlainObject(value)
&& _.size(value) === 2
&& (_.isNull(value.startedAt) || moment(value.startedAt, moment.ISO_8601, true).isValid())
&& _.isFinite(value.total),
custom: value =>
_.isPlainObject(value) &&
_.size(value) === 2 &&
(_.isNull(value.startedAt) || moment(value.startedAt, moment.ISO_8601, true).isValid()) &&
_.isFinite(value.total),
},
},

11
server/api/controllers/cards/update.js
View file

@ -34,15 +34,16 @@ module.exports = {
},
dueDate: {
type: 'string',
custom: (value) => moment(value, moment.ISO_8601, true).isValid(),
custom: value => moment(value, moment.ISO_8601, true).isValid(),
allowNull: true,
},
timer: {
type: 'json',
custom: (value) => _.isPlainObject(value)
&& _.size(value) === 2
&& (_.isNull(value.startedAt) || moment(value.startedAt, moment.ISO_8601, true).isValid())
&& _.isFinite(value.total),
custom: value =>
_.isPlainObject(value) &&
_.size(value) === 2 &&
(_.isNull(value.startedAt) || moment(value.startedAt, moment.ISO_8601, true).isValid()) &&
_.isFinite(value.total),
},
isSubscribed: {
type: 'boolean',

4
server/api/controllers/users/update-email.js
View file

@ -60,8 +60,8 @@ module.exports = {
}
if (
inputs.id === currentUser.id
&& !bcrypt.compareSync(inputs.currentPassword, user.password)
inputs.id === currentUser.id &&
!bcrypt.compareSync(inputs.currentPassword, user.password)
) {
throw Errors.CURRENT_PASSWORD_NOT_VALID;
}

4
server/api/controllers/users/update-password.js
View file

@ -53,8 +53,8 @@ module.exports = {
}
if (
inputs.id === currentUser.id
&& !bcrypt.compareSync(inputs.currentPassword, user.password)
inputs.id === currentUser.id &&
!bcrypt.compareSync(inputs.currentPassword, user.password)
) {
throw Errors.CURRENT_PASSWORD_NOT_VALID;
}

4
server/api/controllers/users/update.js
View file

@ -20,7 +20,7 @@ module.exports = {
},
avatar: {
type: 'json',
custom: (value) => _.isNull(value),
custom: value => _.isNull(value),
},
},
@ -38,7 +38,7 @@ module.exports = {
throw Errors.USER_NOT_FOUND; // Forbidden
}
delete inputs.isAdmin;
delete inputs.isAdmin; // eslint-disable-line no-param-reassign
}
let user = await sails.helpers.getUser(inputs.id);

2
server/api/controllers/users/upload-avatar.js
View file

@ -45,7 +45,7 @@ const createReceiver = () => {
try {
await pipeline(file, resize, transform);
file.fd = `${uuid()}.jpg`;
file.fd = `${uuid()}.jpg`; // eslint-disable-line no-param-reassign
await pipeline(
transform,