Fix emails not sending due to RSVP end date refactor

Add generic vegetarian option to mains
Add additional content about Offley Place

package.json

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

src/components/Navigation/Navigation.js

@@ -48,6 +48,7 @@ class Navigation extends React.Component {
           <Link className={[s.link, this.props.current === 'reception' ? s.active : null].join(' ')} to="/venue">Venue</Link>
           <Link className={[s.link, this.props.current === 'accomodation' ? s.active : null].join(' ')} to="/hotels">Hotels</Link>
           <Link className={[s.link, this.props.current === 'transport' ? s.active : null].join(' ')} to="/transport">Transport</Link>
+          <Link className={[s.link, this.props.current === 'giftlist' ? s.active : null].join(' ')} to="/giftlist">Gift list</Link>
         </div>
       </div>
     );

src/components/Navigation/package.json

@@ -1,6 +1,6 @@
 {
   "name": "Navigation",
-  "version": "1.0.0",
+  "version": "1.1.1",
   "private": true,
   "main": "./Navigation.js"
 }

src/core/emailer.js

@@ -1,5 +1,5 @@
 import Nodemailer from 'nodemailer';
-import { email, starters, mains, getRsvpEnd } from '../config';
+import { email, starters, mains, prettifyDate } from '../config';
 import Rollbar from './rollbar';
 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
 ${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` : ''}
-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
 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>
 ${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>` : ''}
-<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>Daniel and Hana</p>
 `;

src/data/models/Person.js

@@ -66,6 +66,10 @@ const Person = Model.define('Person', {
     defaultValue: -1,
   },
 
+  enddate: {
+    type: DataType.DATE,
+  },
+
 }, {
 
   indexes: [

src/data/types/PersonItemType.js

@@ -20,6 +20,7 @@ const PersonItemType = new ObjectType({
     dietary: { type: StringType },
     starter: { type: StringType },
     main: { type: StringType },
+    enddate: { type: StringType },
   },
 });
 

src/routes/adminPeople/AdminPeople.js

@@ -3,6 +3,7 @@ import withStyles from 'isomorphic-style-loader/lib/withStyles';
 import s from './AdminPeople.css';
 import Link from '../../components/Link';
 import Button from '../../components/Button';
+import { prettifyDate } from '../../config';
 
 class AdminPeople extends React.Component {
   static propTypes = {
@@ -16,6 +17,7 @@ class AdminPeople extends React.Component {
       email: PropTypes.string,
       password: PropTypes.string,
       attending: PropTypes.boolean,
+      enddate: PropTypes.string,
     })).isRequired,
   };
 
@@ -138,6 +140,22 @@ class AdminPeople extends React.Component {
                   >⬆</span>
                   <a href="#sortcolumn" onClick={event => this.sortPeople(event, 'ceremony')}>Ceremony</a>
                 </td>
+                <td>
+                  <span
+                    className={[
+                      s.sortIcon,
+                      this.state.sortedBy === 'enddate' && this.state.sortDirection ? s.showSortIcon : null,
+                    ].join(' ')}
+                  >⬇</span>
+                  <span
+                    className={[
+                      s.sortIcon,
+                      this.state.sortedBy === 'enddate' && !this.state.sortDirection ? s.showSortIcon : null,
+                    ].join(' ')}
+                  >⬆</span>
+                  <a href="#sortcolumn" onClick={event => this.sortPeople(event, 'enddate')}>End date</a>
+                </td>
+
                 <td>
                   <span
                     className={[
@@ -163,6 +181,7 @@ class AdminPeople extends React.Component {
                   <td>{person.email}</td>
                   <td><Link to={`/rsvp/${person.password}`}>{person.password}</Link></td>
                   <td>{person.ceremony ? 'Full day' : 'Evening only'}</td>
+                  <td>{prettifyDate(person.enddate)}</td>
                   <td>{person.completed ? 'Yes' : 'No'}</td>
                   <td>
                     <Button to={`/admin/person/${person.key}`}>Edit</Button>
@@ -239,6 +258,17 @@ class AdminPeople extends React.Component {
                 <option value="false">Evening only</option>
               </select>
             </div>
+            <div className={s.formGroup}>
+              <label className={s.label} htmlFor="enddate">
+                End date:
+              </label>
+              <input
+                className={s.input}
+                type="date"
+                id="enddate"
+                name="enddate"
+              />
+            </div>
             <div className={s.formGroup}>
               <label className={s.label} htmlFor="password">
                 Password (blank will autogenerate):

src/routes/adminPeople/index.js

@@ -9,7 +9,7 @@ export default {
   path: '/admin/people',
 
   async action() {
-    const resp = await fetchQL('{getAllPersons{key,firstname,lastname,email,ceremony,completed,password}}');
+    const resp = await fetchQL('{getAllPersons{key,firstname,lastname,email,ceremony,completed,password,enddate}}');
 
     let people = await resp.json();
     if (people.data && people.data.getAllPersons) {

src/routes/adminPerson/AdminPerson.js

@@ -15,6 +15,7 @@ class AdminPerson extends React.Component {
       password: PropTypes.string,
       attending: PropTypes.boolean,
       ceremony: PropTypes.boolean,
+      enddate: PropTypes.string,
     }).isRequired,
   };
 
@@ -23,6 +24,14 @@ class AdminPerson extends React.Component {
     lastname: this.props.person.lastname,
   };
 
+  getISODate = (date) => {
+    const d = new Date(date);
+    const year = d.getFullYear();
+    const month = d.getMonth() + 1 < 10 ? `0${d.getMonth() + 1}` : d.getMonth() + 1;
+    const day = d.getDate() < 10 ? `0${d.getDate()}` : d.getDate();
+    return `${year}-${month}-${day}`;
+  }
+
   handleFirstnameChange = (event) => {
     this.setState({ firstname: event.target.value });
   }
@@ -94,6 +103,18 @@ class AdminPerson extends React.Component {
                 <option value="false">Evening only</option>
               </select>
             </div>
+            <div className={s.formGroup}>
+              <label className={s.label} htmlFor="enddate">
+                End date:
+              </label>
+              <input
+                className={s.input}
+                type="date"
+                id="enddate"
+                name="enddate"
+                defaultValue={this.getISODate(this.props.person.enddate)}
+              />
+            </div>
             <div className={s.formGroup}>
               <label className={s.label} htmlFor="password">
                 Password:

src/routes/adminPerson/index.js

@@ -11,7 +11,7 @@ export default {
       return { redirect: '/admin' };
     }
 
-    const resp = await fetchQL('{getPersonByKey{key,firstname,lastname,email,completed,password,ceremony,starter,main,dietary}}', {
+    const resp = await fetchQL('{getPersonByKey{key,firstname,lastname,email,completed,password,ceremony,starter,main,dietary,enddate}}', {
       key: params.key,
     });
 

src/routes/giftlist/Giftlist.css

@@ -0,0 +1,75 @@
+@import '../../components/variables.css';
+
+.root {
+  width: 100vw;
+  height: 100vh;
+}
+
+.bgImage {
+  position: fixed;
+  width: 100vw;
+  height: 100vh;
+  background: url('/img/moors_2560.jpg');
+  background-size: cover;
+  background-position-x: 78%;
+  background-position-y: 66%;
+  background-color: #c1c1c1;
+  filter: grayscale(1) brightness(0.4);
+  z-index: -1;
+  transition: filter ease-in-out 0.5s;
+}
+
+.container {
+  padding-top: 50px;
+  margin: 0 20px;
+}
+
+.headings {
+  max-width: 640px;
+  margin: 0 auto 40px;
+  text-align: center;
+  color: #fff;
+  text-shadow: 3px 3px 8px var(--colour-nearblack);
+  font-size: 1.3em;
+}
+
+.headings h1 {
+  margin: 0 0 10px;
+}
+
+.sig {
+  font-family: var(--font-family-cursive);
+  font-size: 1.4em;
+}
+
+.content {
+  max-width: 960px;
+  margin: 0 auto;
+  color: #fff;
+  text-shadow: 1px 1px 4px var(--colour-nearblack);
+}
+
+.button {
+  display: inline-block;
+  box-sizing: border-box;
+  margin: 0;
+  padding: 10px 20px;
+  opacity: 0.75;
+  outline: 0;
+  border: 4px solid #fff;
+  border-radius: 14px;
+  background: var(--colour-nearblack);
+  color: #fff;
+  text-align: center;
+  text-decoration: none;
+  font-size: 18px;
+  line-height: 1.3333333;
+  cursor: pointer;
+  transition: opacity ease-in-out 0.25s, box-shadow ease-in-out 0.25s;
+}
+
+.button:hover,
+.button:focus {
+  opacity: 0.9;
+  box-shadow: 0 0 4px #fff;
+}

src/routes/giftlist/Giftlist.js

@@ -0,0 +1,44 @@
+import React from 'react';
+import withStyles from 'isomorphic-style-loader/lib/withStyles';
+import s from './Giftlist.css';
+
+class Giftlist extends React.Component {
+  render() {
+    return (
+      <div className={s.root}>
+        <div className={s.bgImage} />
+        <div className={s.container}>
+          <div className={s.headings}>
+            <h1>Gift list</h1>
+          </div>
+          <div className={s.content}>
+            <p>We&#8217;ve been asked what we&#8217;d like for a gift and the answer
+              is simple: you, at our wedding, having a great time.</p>
+            <p>However, if you insist then we&#8217;ll say what we&#8217;d also love
+              is the most amazing honeymoon possible. We have the basics covered but
+              we&#8217;re hoping for the holiday of a lifetime. We would like to see
+              and do everything we&#8217;ve dreamed about!</p>
+            <p>Here&#8217;s how our gift list works. Just pick the item you&#8217;d
+              most like to give us. You&#8217;ll then be asked to leave your name
+              and any message you have for us. There is the option to use the PayPal
+              system to send your gift (you can use a credit card &ndash; you
+              don&#8217;t need a PayPal account). Or, on the day, you could bring
+              the value of your gift in a card.</p>
+            <p>We&#8217;ll send you a link to our online photo gallery when we get
+              back and we&#8217;ll be sure to tell (bore) you all about it in great
+              detail.</p>
+            <p className={s.sig}>Dan and Hana</p>
+            <a
+              className={s.button}
+              href="https://www.our-wedding-list.co.uk/danielandhana/list"
+            >
+              View our list
+            </a>
+          </div>
+        </div>
+      </div>
+    );
+  }
+}
+
+export default withStyles(s)(Giftlist);

src/routes/giftlist/index.js

@@ -0,0 +1,15 @@
+import React from 'react';
+import Giftlist from './Giftlist';
+import Layout from '../../components/Layout';
+
+export default {
+
+  path: '/giftlist',
+
+  action() {
+    return {
+      title: 'Gift list',
+      component: <Layout current="giftlist"><Giftlist /></Layout>,
+    };
+  },
+};

src/routes/index.js

@@ -13,6 +13,7 @@ export default {
     require('./reception').default,
     require('./accomodation').default,
     require('./transport').default,
+    require('./giftlist').default,
     require('./login').default,
     require('./admin').default,
     require('./adminPeople').default,

src/routes/reception/Reception.js

@@ -39,6 +39,23 @@ class Reception extends React.Component {
               defaultCenter={offley.position}
               markers={[offley]}
             />
+            <h3>About Offley Place</h3>
+            <p>Legend has it that in the 8th century, King Offa discovered the bones of
+              Saint Alban and set about creating St Albans Abbey in a tribute to him.
+              While it was being completed he looked for a place to call home and
+              discovered the local area. After building a grand palace the village is
+              thought to have become known as Great Off Lee.</p>
+            <p>Great Offley Place was first built in the 17th century.  Rebuilt in 1810
+              but still retaining a Tudor porch and a 17th century wing, the grand house
+              has a long history which has seen the same family line keep ownership for
+              an impressive 350 years.</p>
+            <p>In 1929 the family ownership was brought to an end when the last owner,
+              Guy George, sold the estate to a director of WH Smith who was well liked
+              in the village and built a cricket pavilion and pitch.</p>
+            <p>When World War II broke out it was sold again, this time to become a
+              teacher training college, and then finally in 2003 it was taken over again
+              and transformed into the luxury hotel, wedding venue and restaurant it
+              is today.</p>
           </div>
         </div>
       </div>

src/routes/rsvp/Rsvp.js

@@ -14,6 +14,7 @@ class Rsvp extends React.Component {
       dietary: PropTypes.string,
       starter: PropTypes.string,
       main: PropTypes.string,
+      enddate: PropTypes.string,
     })).isRequired,
     rsvpEnd: PropTypes.string.isRequired,
     isEditable: PropTypes.bool.isRequired,

src/routes/rsvp/index.js

@@ -3,16 +3,15 @@ import Layout from '../../components/Layout';
 import fetchQL from '../../core/fetchQL';
 import Rsvp from './Rsvp';
 import NotFound from '../notFound/NotFound';
-import { rsvpEndDate, getRsvpEnd } from '../../config';
+import { prettifyDate } from '../../config';
 
 let title = 'RSVP';
-
 export default {
 
   path: '/rsvp/:password',
 
-  isEditable() {
-    return new Date() < rsvpEndDate;
+  isEditable(date) {
+    return new Date() < new Date(date);
   },
 
   async action({ params }) {
@@ -20,7 +19,7 @@ export default {
       return { redirect: '/' };
     }
 
-    const resp = await fetchQL('{getPersonsByPassword{key,firstname,lastname,attending,ceremony,dietary,starter,main}}', {
+    const resp = await fetchQL('{getPersonsByPassword{key,firstname,lastname,attending,ceremony,dietary,starter,main,enddate}}', {
       password: params.password,
     });
 
@@ -35,6 +34,9 @@ export default {
       };
     }
 
+    // Assuming all connected guests have the same invite
+    const firstDate = people[0].enddate;
+
     return {
       title,
       component: (
@@ -42,8 +44,8 @@ export default {
           <Rsvp
             title={title}
             people={people}
-            rsvpEnd={getRsvpEnd()}
-            isEditable={this.isEditable()}
+            rsvpEnd={prettifyDate(firstDate)}
+            isEditable={this.isEditable(firstDate)}
           />
         </Layout>
       ),

src/server.js

@@ -21,7 +21,7 @@ import models from './data/models';
 import schema from './data/schema';
 import routes from './routes';
 import assets from './assets'; // eslint-disable-line import/no-unresolved
-import { port, auth, starters, mains, rsvpEndDate, exportApiKey } from './config';
+import { port, auth, starters, mains, exportApiKey } from './config';
 import Person from './data/models/Person';
 import Settings from './data/models/Settings';
 import Rollbar from './core/rollbar';
@@ -149,32 +149,27 @@ 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 {
+    Person.findOne({
+      where: { key: req.body.key },
+    }).then(data => {
+      const endDate = new Date(data.enddate);
+      if (new Date() < endDate) {
         const update = {};
         update[req.body.prop] = req.body.value;
-      Person.update(update, {
+        return Person.update(update, {
           where: {
             key: req.body.key,
           },
         }).then(() => {
-        Person.findOne({
-          where: { key: req.body.key },
-        }).then(data => {
           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]}` : '';
             const dietary = (data.attending && data.dietary) ? `\nDietary requirements: ${data.dietary}` : '';
-
             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,
           });
@@ -185,6 +180,11 @@ app.post('/rsvp/save', (req, res) => {
             err,
           });
         });
+      }
+      return res.json({
+        success: false,
+        err: 'RSVP end date has elapsed',
+      });
     }).catch(err => {
       Rollbar.handleError(err);
       res.json({
@@ -192,7 +192,6 @@ app.post('/rsvp/save', (req, res) => {
         err,
       });
     });
-    }
   } catch (err) {
     Rollbar.handleError(err);
     res.json({
@@ -243,6 +242,7 @@ app.post('/admin/person', (req, res, next) => {
       lastname: req.body.lastname,
       email: req.body.email,
       ceremony: req.body.ceremony,
+      enddate: new Date(req.body.enddate),
     };
 
     if (req.body.password && req.body.password !== '') {

yarn.lock

@@ -4042,7 +4042,7 @@ lodash.toplainobject@^3.0.0:
     lodash._basecopy "^3.0.0"
     lodash.keysin "^3.0.0"
 
-lodash@4.12.0, lodash@^4.2.0:
+lodash@4.12.0:
   version "4.12.0"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.12.0.tgz#2bd6dc46a040f59e686c972ed21d93dc59053258"
 
@@ -4054,11 +4054,7 @@ lodash@^3.10.1:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
 
-lodash@^4.0.0, lodash@^4.15.0, lodash@^4.16.4, lodash@^4.17.2, lodash@^4.6.1:
-  version "4.17.2"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.2.tgz#34a3055babe04ce42467b607d700072c7ff6bf42"
-
-lodash@^4.1.0, lodash@^4.16.2, lodash@^4.17.4, lodash@^4.3.0:
+lodash@^4.0.0, lodash@^4.1.0, lodash@^4.15.0, lodash@^4.16.2, lodash@^4.16.4, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.6.1:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"