gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat(lint): prefer spread over Object.assign call

Browse Source
This commit is contained in:
Berkeley Martinez
2016-12-29 16:51:51 -08:00
parent 31960fee90
commit 44a0aeceb7
5 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
server/boot/commit.js
View File

@ -106,22 +106,20 @@ export default function commit(app) {
req.flash('info', {
msg: dedent`
Looks like you already have a pledge to ${pledge.displayName}.
Clicking "Commit" here will replace your old commitment. If you
do change your commitment, please remember to cancel your
Clicking "Commit" here will replace your old commitment. If you
do change your commitment, please remember to cancel your
previous recurring donation directly with ${pledge.displayName}.
`
});
}
res.render(
'commit/',
Object.assign(
{
title: 'Commit to a nonprofit. Commit to your goal.',
pledge
},
commitGoals,
nonprofit
)
{
title: 'Commit to a nonprofit. Commit to your goal.',
pledge,
...commitGoals,
...nonprofit
}
);
},
next
@ -143,14 +141,12 @@ export default function commit(app) {
.flatMap(oldPledge => {
// create new pledge for user
const pledge = Pledge(
Object.assign(
{
amount,
goal,
userId: user.id
},
nonprofit
)
{
amount,
goal,
userId: user.id,
...nonprofit
}
);
if (oldPledge) {
@ -173,7 +169,7 @@ export default function commit(app) {
msg: dedent`
Congratulations, you have committed to giving
${displayName} $${amount} each month until you have completed
your ${goal}. Please remember to cancel your pledge directly
your ${goal}. Please remember to cancel your pledge directly
with ${displayName} once you finish.
`
});
@ -223,13 +219,13 @@ export default function commit(app) {
.subscribe(
pledge => {
let msg = dedent`
You have successfully stopped your pledge. Please
rememberto cancel your recurring donation directly
You have successfully stopped your pledge. Please
remember to cancel your recurring donation directly
with the nonprofit if you haven't already done so.
`;
if (!pledge) {
msg = dedent`
It doesn't look like you had an active pledge, so
It doesn't look like you had an active pledge, so
there's no pledge to stop.
`;
}