2 Commits
1.3.0 ... 1.3.2

Author SHA1 Message Date
11c833d644 Add car park information to ceremony page 2017-07-16 17:35:08 +01:00
07f606b5dc Fix emails not sending due to RSVP end date refactor 2017-04-17 20:44:38 +01:00
3 changed files with 21 additions and 7 deletions

View File

@@ -1,6 +1,6 @@
{ {
"name": "wedding", "name": "wedding",
"version": "1.3.0", "version": "1.3.2",
"private": true, "private": true,
"engines": { "engines": {
"node": ">=6.5", "node": ">=6.5",

View File

@@ -1,5 +1,5 @@
import Nodemailer from 'nodemailer'; import Nodemailer from 'nodemailer';
import { email, starters, mains, getRsvpEnd } from '../config'; import { email, starters, mains, prettifyDate } from '../config';
import Rollbar from './rollbar'; import Rollbar from './rollbar';
import Settings from '../data/models/Settings'; import Settings from '../data/models/Settings';
@@ -19,7 +19,7 @@ function getEmailText(person) {
Thanks for your RSVP, ${person.attending ? 'we\'re delighted to hear you will be attending' : 'we\'re sorry to hear you will not be attending'}.\n Thanks for your RSVP, ${person.attending ? 'we\'re delighted to hear you will be attending' : 'we\'re sorry to hear you will not be attending'}.\n
${person.attending ? `Your meal choices are ${starters[person.starter]} and ${mains[person.main]}.\n` : ''} ${person.attending ? `Your meal choices are ${starters[person.starter]} and ${mains[person.main]}.\n` : ''}
${person.attending && person.dietary && person.dietary.trim().length > 0 ? `Your dietary requirements are: ${person.dietary}.\n` : ''} ${person.attending && person.dietary && person.dietary.trim().length > 0 ? `Your dietary requirements are: ${person.dietary}.\n` : ''}
You can modify your RSVP up until ${getRsvpEnd()} here: https://danielandhana.com/${person.password}.\n You can modify your RSVP up until ${prettifyDate(person.enddate)} here: https://danielandhana.com/${person.password}.\n
${person.attending ? 'See you at our wedding,' : 'Hope to see you soon,'}\n ${person.attending ? 'See you at our wedding,' : 'Hope to see you soon,'}\n
Daniel and Hana Daniel and Hana
`; `;
@@ -30,7 +30,7 @@ function getEmailHTML(person) {
<p>Thanks for your RSVP, ${person.attending ? 'we\'re delighted to hear you will be attending' : 'we\'re sorry to hear you will not be attending'}.</p> <p>Thanks for your RSVP, ${person.attending ? 'we\'re delighted to hear you will be attending' : 'we\'re sorry to hear you will not be attending'}.</p>
${person.attending ? `<p>Your meal choices are <b>${starters[person.starter]}</b> and <b>${mains[person.main]}</b>.</p>` : ''} ${person.attending ? `<p>Your meal choices are <b>${starters[person.starter]}</b> and <b>${mains[person.main]}</b>.</p>` : ''}
${person.attending && person.dietary && person.dietary.trim().length > 0 ? `<p>Your dietary requirements are: <b>${person.dietary}</b>.</p>` : ''} ${person.attending && person.dietary && person.dietary.trim().length > 0 ? `<p>Your dietary requirements are: <b>${person.dietary}</b>.</p>` : ''}
<p>You can modify your RSVP up until <b>${getRsvpEnd()}</b> <a href="https://danielandhana.com/${person.password}">here</a>.</p> <p>You can modify your RSVP up until <b>${prettifyDate(person.enddate)}</b> <a href="https://danielandhana.com/${person.password}">here</a>.</p>
<p>${person.attending ? 'See you at our wedding,' : 'Hope to see you soon,'}</p> <p>${person.attending ? 'See you at our wedding,' : 'Hope to see you soon,'}</p>
<p>Daniel and Hana</p> <p>Daniel and Hana</p>
`; `;

View File

@@ -12,7 +12,21 @@ const church = {
showInfo: true, showInfo: true,
}; };
const carPark = {
title: 'Langley Hill Car Park',
position: {
lat: 51.7121,
lng: -0.4507,
},
showInfo: true,
};
class Ceremony extends React.Component { class Ceremony extends React.Component {
constructor(props) {
super(props);
this.markers = [church, carPark];
}
render() { render() {
return ( return (
<div className={s.root}> <div className={s.root}>
@@ -29,11 +43,11 @@ class Ceremony extends React.Component {
<p>The ceremony begins at 1pm</p> <p>The ceremony begins at 1pm</p>
<h3>Where</h3> <h3>Where</h3>
<p>The church is located at the southern end of Kings Langley high street. <p>The church is located at the southern end of Kings Langley high street.
Parking is available across the road at the Rose and Crown pub.</p> Free parking is available on Langley Hill.</p>
<Map <Map
defaultZoom={14} defaultZoom={15}
defaultCenter={church.position} defaultCenter={church.position}
markers={[church]} markers={this.markers}
/> />
<h3>About the church</h3> <h3>About the church</h3>
<p>All Saints Church is a medieval church with parts dating from the 13th century. <p>All Saints Church is a medieval church with parts dating from the 13th century.