Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| cdc6614c63 |
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "wedding",
|
||||
"version": "1.1.0",
|
||||
"version": "1.2.0",
|
||||
"private": true,
|
||||
"engines": {
|
||||
"node": ">=6.5",
|
||||
|
||||
@@ -6,13 +6,13 @@ import NotFound from '../notFound/NotFound';
|
||||
import { rsvpEndDate, getRsvpEnd } from '../../config';
|
||||
|
||||
let title = 'RSVP';
|
||||
|
||||
let attending = 'day';
|
||||
export default {
|
||||
|
||||
path: '/rsvp/:password',
|
||||
|
||||
isEditable() {
|
||||
return new Date() < rsvpEndDate;
|
||||
return new Date() < rsvpEndDate[attending];
|
||||
},
|
||||
|
||||
async action({ params }) {
|
||||
@@ -35,6 +35,9 @@ export default {
|
||||
};
|
||||
}
|
||||
|
||||
// Assuming all connected guests have the same invite
|
||||
attending = people[0].ceremony ? 'day' : 'evening';
|
||||
|
||||
return {
|
||||
title,
|
||||
component: (
|
||||
@@ -42,7 +45,7 @@ export default {
|
||||
<Rsvp
|
||||
title={title}
|
||||
people={people}
|
||||
rsvpEnd={getRsvpEnd()}
|
||||
rsvpEnd={getRsvpEnd(attending)}
|
||||
isEditable={this.isEditable()}
|
||||
/>
|
||||
</Layout>
|
||||
|
||||
@@ -149,12 +149,6 @@ app.get('/rsvp/:code', bouncer.block, (req, res, next) => {
|
||||
|
||||
app.post('/rsvp/save', (req, res) => {
|
||||
try {
|
||||
if (new Date() > rsvpEndDate) {
|
||||
res.json({
|
||||
success: false,
|
||||
err: 'RSVP end date has elapsed',
|
||||
});
|
||||
} else {
|
||||
const update = {};
|
||||
update[req.body.prop] = req.body.value;
|
||||
Person.update(update, {
|
||||
@@ -165,7 +159,13 @@ app.post('/rsvp/save', (req, res) => {
|
||||
Person.findOne({
|
||||
where: { key: req.body.key },
|
||||
}).then(data => {
|
||||
if (data.completed) {
|
||||
const endDate = rsvpEndDate[(data.ceremony ? 'day' : 'evening')];
|
||||
if (new Date() > endDate) {
|
||||
return res.json({
|
||||
success: false,
|
||||
err: 'RSVP end date has elapsed',
|
||||
});
|
||||
} else if (data.completed) {
|
||||
const attending = `\nAttending: ${data.attending ? 'Yes' : 'No'}`;
|
||||
const starter = (data.attending && data.starter !== -1) ? `\nStarter: ${starters[data.starter]}` : '';
|
||||
const main = (data.attending && data.main !== -1) ? `\nMain: ${mains[data.main]}` : '';
|
||||
@@ -174,7 +174,7 @@ app.post('/rsvp/save', (req, res) => {
|
||||
sendSlackMsgWithDebounce(`${data.firstname} ${data.lastname} has saved their RSVP:${attending}${starter}${main}${dietary}`, '#wedding-rsvps', req.body.key);
|
||||
sendRSVPEmailWithDebounce(data);
|
||||
}
|
||||
res.json({
|
||||
return res.json({
|
||||
success: true,
|
||||
prop: req.body.prop,
|
||||
});
|
||||
@@ -192,7 +192,6 @@ app.post('/rsvp/save', (req, res) => {
|
||||
err,
|
||||
});
|
||||
});
|
||||
}
|
||||
} catch (err) {
|
||||
Rollbar.handleError(err);
|
||||
res.json({
|
||||
|
||||
Reference in New Issue
Block a user