From 43ed1917e2d914229bd87e65e43be8f8d39885bf Mon Sep 17 00:00:00 2001
From: stephengrider <ste.grider@gmail.com>
Date: Mon, 17 Jul 2017 15:41:42 -0700
Subject: [PATCH 01/27] mailer

---
 server/services/Mailer.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/server/services/Mailer.js b/server/services/Mailer.js
index 60f5127..09ad996 100644
--- a/server/services/Mailer.js
+++ b/server/services/Mailer.js
@@ -2,6 +2,15 @@ const sendgrid = require('sendgrid');
 const helper = sendgrid.mail;
 const keys = require('../config/keys');
 
-class Mailer extends helper.Mail {}
+class Mailer extends helper.Mail {
+  constructor({ subject, recipients }, content) {
+    super();
+
+    this.from_email = new helper.Email('no-reply@emaily.com');
+    this.subject = subject;
+    this.body = new helper.Content('text/html', content);
+    this.recipients = this.formatAddresses(recipients);
+  }
+}
 
 module.exports = Mailer;

From 598ba5efa5e00603fa1d0e6209b93e8b16aeacb1 Mon Sep 17 00:00:00 2001
From: stephengrider <ste.grider@gmail.com>
Date: Mon, 17 Jul 2017 15:52:19 -0700
Subject: [PATCH 02/27] email boilerplate

---
 server/services/Mailer.js | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/server/services/Mailer.js b/server/services/Mailer.js
index 09ad996..17eab5c 100644
--- a/server/services/Mailer.js
+++ b/server/services/Mailer.js
@@ -10,6 +10,24 @@ class Mailer extends helper.Mail {
     this.subject = subject;
     this.body = new helper.Content('text/html', content);
     this.recipients = this.formatAddresses(recipients);
+
+    this.addContent(this.body);
+    this.addClickTracking();
+    this.addRecipients();
+  }
+
+  formatAddresses(recipients) {
+    return recipients.map(({ email }) => {
+      return new helper.Email(email);
+    });
+  }
+
+  addClickTracking() {
+    const trackingSettings = new helper.TrackingSettings();
+    const clickTracking = new helper.ClickTracking(true, true);
+
+    trackingSettings.setClickTracking(clickTracking);
+    this.addTrackingSettings(trackingSettings);
   }
 }
 

From fcfde28b005931d8d78f2d0d7cf397c08710857e Mon Sep 17 00:00:00 2001
From: stephengrider <ste.grider@gmail.com>
Date: Mon, 17 Jul 2017 16:14:18 -0700
Subject: [PATCH 03/27] send emails

---
 server/services/Mailer.js | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/server/services/Mailer.js b/server/services/Mailer.js
index 17eab5c..7b9b599 100644
--- a/server/services/Mailer.js
+++ b/server/services/Mailer.js
@@ -6,6 +6,7 @@ class Mailer extends helper.Mail {
   constructor({ subject, recipients }, content) {
     super();
 
+    this.sgApi = sendgrid(keys.sendGridKey);
     this.from_email = new helper.Email('no-reply@emaily.com');
     this.subject = subject;
     this.body = new helper.Content('text/html', content);
@@ -29,6 +30,26 @@ class Mailer extends helper.Mail {
     trackingSettings.setClickTracking(clickTracking);
     this.addTrackingSettings(trackingSettings);
   }
+
+  addRecipients() {
+    const personalize = new helper.Personalization();
+
+    this.recipients.forEach(recipient => {
+      personalize.addTo(recipient);
+    });
+    this.addPersonalization(personalize);
+  }
+
+  async send() {
+    const request = this.sgApi.emptyRequest({
+      method: 'POST',
+      path: '/v3/mail/send',
+      body: this.toJSON()
+    });
+
+    const response = this.sgApi.API(request);
+    return response;
+  }
 }
 
 module.exports = Mailer;

From 7faa7b6a83e8b9cf9fab2a7a3169351235cdbad0 Mon Sep 17 00:00:00 2001
From: stephengrider <ste.grider@gmail.com>
Date: Mon, 17 Jul 2017 16:30:30 -0700
Subject: [PATCH 04/27] test emails

---
 server/routes/surveyRoutes.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/routes/surveyRoutes.js b/server/routes/surveyRoutes.js
index bd1ed5c..5b0d9bc 100644
--- a/server/routes/surveyRoutes.js
+++ b/server/routes/surveyRoutes.js
@@ -21,5 +21,6 @@ module.exports = app => {
 
     // Great place to send an email!
     const mailer = new Mailer(survey, surveyTemplate(survey));
+    mailer.send();
   });
 };

From 454eeba56e3cf6fd24240b7f2fb5cc74cf48a410 Mon Sep 17 00:00:00 2001
From: stephengrider <ste.grider@gmail.com>
Date: Mon, 17 Jul 2017 16:49:44 -0700
Subject: [PATCH 05/27] improve template

---
 server/client/src/index.js                     |  4 ++++
 server/index.js                                |  1 +
 .../services/emailTemplates/surveyTemplate.js  | 18 +++++++++++++++++-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/server/client/src/index.js b/server/client/src/index.js
index b4fa33d..2c6c4f4 100644
--- a/server/client/src/index.js
+++ b/server/client/src/index.js
@@ -8,6 +8,10 @@ import reduxThunk from 'redux-thunk';
 import App from './components/App';
 import reducers from './reducers';
 
+// Development only axios helpers!
+import axios from 'axios';
+window.axios = axios;
+
 const store = createStore(reducers, {}, applyMiddleware(reduxThunk));
 
 ReactDOM.render(
diff --git a/server/index.js b/server/index.js
index 081dce7..d30d3aa 100644
--- a/server/index.js
+++ b/server/index.js
@@ -8,6 +8,7 @@ require('./models/User');
 require('./models/Survey');
 require('./services/passport');
 
+mongoose.Promise = global.Promise;
 mongoose.connect(keys.mongoURI);
 
 const app = express();
diff --git a/server/services/emailTemplates/surveyTemplate.js b/server/services/emailTemplates/surveyTemplate.js
index 4ddb6f3..696dee1 100644
--- a/server/services/emailTemplates/surveyTemplate.js
+++ b/server/services/emailTemplates/surveyTemplate.js
@@ -1,3 +1,19 @@
 module.exports = survey => {
-  return '<div>' + survey.body + '</div>';
+  return `
+    <html>
+      <body>
+        <div style="text-align: center;">
+          <h3>I'd like your input!</h3>
+          <p>Please answer the following question:</p>
+          <p>${survey.body}</p>
+          <div>
+            <a href="http://localhost:3000">Yes</a>
+          </div>
+          <div>
+            <a href="http://localhost:3000">No</a>
+          </div>
+        </div>
+      </body>
+    </html>
+  `;
 };

From c8e3cfd14b6036fe12a73a113c9ef577535d46ee Mon Sep 17 00:00:00 2001
From: stephengrider <ste.grider@gmail.com>
Date: Mon, 17 Jul 2017 17:17:47 -0700
Subject: [PATCH 06/27] added error checking

---
 server/routes/surveyRoutes.js | 14 ++++++++++++--
 server/services/Mailer.js     |  2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/server/routes/surveyRoutes.js b/server/routes/surveyRoutes.js
index 5b0d9bc..4b5e217 100644
--- a/server/routes/surveyRoutes.js
+++ b/server/routes/surveyRoutes.js
@@ -7,7 +7,7 @@ const surveyTemplate = require('../services/emailTemplates/surveyTemplate');
 const Survey = mongoose.model('surveys');
 
 module.exports = app => {
-  app.post('/api/surveys', requireLogin, requireCredits, (req, res) => {
+  app.post('/api/surveys', requireLogin, requireCredits, async (req, res) => {
     const { title, subject, body, recipients } = req.body;
 
     const survey = new Survey({
@@ -21,6 +21,16 @@ module.exports = app => {
 
     // Great place to send an email!
     const mailer = new Mailer(survey, surveyTemplate(survey));
-    mailer.send();
+
+    try {
+      await mailer.send();
+      await survey.save();
+      req.user.credits -= 1;
+      const user = await req.user.save();
+
+      res.send(user);
+    } catch (err) {
+      res.status(422).send(err);
+    }
   });
 };
diff --git a/server/services/Mailer.js b/server/services/Mailer.js
index 7b9b599..78a2358 100644
--- a/server/services/Mailer.js
+++ b/server/services/Mailer.js
@@ -47,7 +47,7 @@ class Mailer extends helper.Mail {
       body: this.toJSON()
     });
 
-    const response = this.sgApi.API(request);
+    const response = await this.sgApi.API(request);
     return response;
   }
 }

From 821bb80e265b9320b976d39cc2c234144db69fa7 Mon Sep 17 00:00:00 2001
From: stephengrider <ste.grider@gmail.com>
Date: Mon, 17 Jul 2017 17:38:24 -0700
Subject: [PATCH 07/27] feedback for feedback

---
 server/config/prod.js                            | 3 ++-
 server/routes/surveyRoutes.js                    | 4 ++++
 server/services/emailTemplates/surveyTemplate.js | 6 ++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/server/config/prod.js b/server/config/prod.js
index e043f6e..c053d56 100644
--- a/server/config/prod.js
+++ b/server/config/prod.js
@@ -6,5 +6,6 @@ module.exports = {
   cookieKey: process.env.COOKIE_KEY,
   stripePublishableKey: process.env.STRIPE_PUBLISHABLE_KEY,
   stripeSecretKey: process.env.STRIPE_SECRET_KEY,
-  sendGridKey: process.env.SEND_GRID_KEY
+  sendGridKey: process.env.SEND_GRID_KEY,
+  redirectDomain: process.env.REDIRECT_DOMAIN
 };
diff --git a/server/routes/surveyRoutes.js b/server/routes/surveyRoutes.js
index 4b5e217..54d410f 100644
--- a/server/routes/surveyRoutes.js
+++ b/server/routes/surveyRoutes.js
@@ -7,6 +7,10 @@ const surveyTemplate = require('../services/emailTemplates/surveyTemplate');
 const Survey = mongoose.model('surveys');
 
 module.exports = app => {
+  app.get('/api/surveys/thanks', (req, res) => {
+    res.send('Thanks for voting!');
+  });
+
   app.post('/api/surveys', requireLogin, requireCredits, async (req, res) => {
     const { title, subject, body, recipients } = req.body;
 
diff --git a/server/services/emailTemplates/surveyTemplate.js b/server/services/emailTemplates/surveyTemplate.js
index 696dee1..dd052bd 100644
--- a/server/services/emailTemplates/surveyTemplate.js
+++ b/server/services/emailTemplates/surveyTemplate.js
@@ -1,3 +1,5 @@
+const keys = require('../../config/keys');
+
 module.exports = survey => {
   return `
     <html>
@@ -7,10 +9,10 @@ module.exports = survey => {
           <p>Please answer the following question:</p>
           <p>${survey.body}</p>
           <div>
-            <a href="http://localhost:3000">Yes</a>
+            <a href="${keys.redirectDomain}/api/surveys/thanks">Yes</a>
           </div>
           <div>
-            <a href="http://localhost:3000">No</a>
+            <a href="${keys.redirectDomain}/api/surveys/thanks">No</a>
           </div>
         </div>
       </body>

From de5aaee4db688104b1d47b471293a3322ee8c913 Mon Sep 17 00:00:00 2001
From: stephengrider <ste.grider@gmail.com>
Date: Tue, 18 Jul 2017 13:13:04 -0700
Subject: [PATCH 08/27] dashboard

---
 server/client/src/components/App.js       |  2 +-
 server/client/src/components/Dashboard.js | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 server/client/src/components/Dashboard.js

diff --git a/server/client/src/components/App.js b/server/client/src/components/App.js
index def2c2d..2de6d6c 100644
--- a/server/client/src/components/App.js
+++ b/server/client/src/components/App.js
@@ -5,7 +5,7 @@ import * as actions from '../actions';
 
 import Header from './Header';
 import Landing from './Landing';
-const Dashboard = () => <h2>Dashboard</h2>;
+import Dashboard from './Dashboard';
 const SurveyNew = () => <h2>SurveyNew</h2>;
 
 class App extends Component {
diff --git a/server/client/src/components/Dashboard.js b/server/client/src/components/Dashboard.js
new file mode 100644
index 0000000..a804635
--- /dev/null
+++ b/server/client/src/components/Dashboard.js
@@ -0,0 +1,11 @@
+import React from 'react';
+
+const Dashboard = () => {
+  return (
+    <div>
+      Dashboard
+    </div>
+  );
+};
+
+export default Dashboard;

From c0b0080034e6631dbfe90499d78abbfe36acb589 Mon Sep 17 00:00:00 2001
From: stephengrider <ste.grider@gmail.com>
Date: Tue, 18 Jul 2017 13:25:45 -0700
Subject: [PATCH 09/27] material icons

---
 server/client/public/index.html           | 1 +
 server/client/src/components/Dashboard.js | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/server/client/public/index.html b/server/client/public/index.html
index 7bee027..1f3073d 100644
--- a/server/client/public/index.html
+++ b/server/client/public/index.html
@@ -10,6 +10,7 @@
     -->
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
     <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
+    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
     <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.
diff --git a/server/client/src/components/Dashboard.js b/server/client/src/components/Dashboard.js
index a804635..bb30b3f 100644
--- a/server/client/src/components/Dashboard.js
+++ b/server/client/src/components/Dashboard.js
@@ -4,6 +4,11 @@ const Dashboard = () => {
   return (
     <div>
       Dashboard
+      <div className="fixed-action-btn">
+        <a className="btn-floating btn-large red">
+          <i className="material-icons">add</i>
+        </a>
+      </div>
     </div>
   );
 };

From e4f3655b0fce7e3ed12053d1833bfb3cf85be83a Mon Sep 17 00:00:00 2001
From: stephengrider <ste.grider@gmail.com>
Date: Tue, 18 Jul 2017 13:34:13 -0700
Subject: [PATCH 10/27] nav with link

---
 server/client/src/components/Dashboard.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/server/client/src/components/Dashboard.js b/server/client/src/components/Dashboard.js
index bb30b3f..d22b25e 100644
--- a/server/client/src/components/Dashboard.js
+++ b/server/client/src/components/Dashboard.js
@@ -1,13 +1,14 @@
 import React from 'react';
+import { Link } from 'react-router-dom';
 
 const Dashboard = () => {
   return (
     <div>
       Dashboard
       <div className="fixed-action-btn">
-        <a className="btn-floating btn-large red">
+        <Link to="/surveys/new" className="btn-floating btn-large red">
           <i className="material-icons">add</i>
-        </a>
+        </Link>
       </div>
     </div>
   );

From ef649f5449e93a448404c9051c989c8fe01bf7fd Mon Sep 17 00:00:00 2001
From: stephengrider <ste.grider@gmail.com>
Date: Thu, 20 Jul 2017 10:33:59 -0700
Subject: [PATCH 11/27] finish redux form

---
 server/client/package-lock.json               | 17 ++++++
 server/client/package.json                    |  1 +
 server/client/src/components/App.js           |  2 +-
 .../src/components/surveys/SurveyField.js     | 15 +++++
 .../src/components/surveys/SurveyForm.js      | 61 +++++++++++++++++++
 .../components/surveys/SurveyFormReview.js    | 45 ++++++++++++++
 .../src/components/surveys/SurveyNew.js       | 37 +++++++++++
 .../src/components/surveys/formFields.js      |  6 ++
 server/client/src/reducers/index.js           |  4 +-
 server/client/src/utils/validateEmails.js     | 14 +++++
 10 files changed, 200 insertions(+), 2 deletions(-)
 create mode 100644 server/client/src/components/surveys/SurveyField.js
 create mode 100644 server/client/src/components/surveys/SurveyForm.js
 create mode 100644 server/client/src/components/surveys/SurveyFormReview.js
 create mode 100644 server/client/src/components/surveys/SurveyNew.js
 create mode 100644 server/client/src/components/surveys/formFields.js
 create mode 100644 server/client/src/utils/validateEmails.js

diff --git a/server/client/package-lock.json b/server/client/package-lock.json
index 4e803d4..b7b8715 100644
--- a/server/client/package-lock.json
+++ b/server/client/package-lock.json
@@ -1597,6 +1597,11 @@
       "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.24.tgz",
       "integrity": "sha1-pVh3yZJLwMjZvTwsvhdJWsFwmxQ="
     },
+    "es6-error": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.0.2.tgz",
+      "integrity": "sha1-7sXHJurO9Rt/a3PCDbbhsTsGnJg="
+    },
     "es6-iterator": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz",
@@ -5135,6 +5140,18 @@
       "resolved": "https://registry.npmjs.org/redux/-/redux-3.7.1.tgz",
       "integrity": "sha512-iEVTlORM5mv6xb3ZAOyrVehVUD+W87jdFAX6SYVgZh3/SQAWFSxTRJOqPWQdvo4VN4lJkNDvqKlBXBabsJTSkA=="
     },
+    "redux-form": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/redux-form/-/redux-form-7.0.1.tgz",
+      "integrity": "sha512-iQ8mLuqrMfdesaITxTk3qmgMPBfQ0qpvPD+QpeZAd6Tcn49H8jU3UJfW4ZndFsMiP6U6ZuFMz+TLDCSEeobBOg==",
+      "dependencies": {
+        "hoist-non-react-statics": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.2.0.tgz",
+          "integrity": "sha1-sJnKgvNkCxJEMJyKUmor1grZ19k="
+        }
+      }
+    },
     "redux-thunk": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.2.0.tgz",
diff --git a/server/client/package.json b/server/client/package.json
index d8b1bc7..727c9de 100644
--- a/server/client/package.json
+++ b/server/client/package.json
@@ -20,6 +20,7 @@
     "react-scripts": "1.0.10",
     "react-stripe-checkout": "^2.4.0",
     "redux": "^3.7.1",
+    "redux-form": "^7.0.1",
     "redux-thunk": "^2.2.0"
   },
   "scripts": {
diff --git a/server/client/src/components/App.js b/server/client/src/components/App.js
index 2de6d6c..601c313 100644
--- a/server/client/src/components/App.js
+++ b/server/client/src/components/App.js
@@ -6,7 +6,7 @@ import * as actions from '../actions';
 import Header from './Header';
 import Landing from './Landing';
 import Dashboard from './Dashboard';
-const SurveyNew = () => <h2>SurveyNew</h2>;
+import SurveyNew from './surveys/SurveyNew';
 
 class App extends Component {
   componentDidMount() {
diff --git a/server/client/src/components/surveys/SurveyField.js b/server/client/src/components/surveys/SurveyField.js
new file mode 100644
index 0000000..19f9b85
--- /dev/null
+++ b/server/client/src/components/surveys/SurveyField.js
@@ -0,0 +1,15 @@
+// SurveyField contains logic to render a single
+// label and text input
+import React from 'react';
+
+export default ({ input, label, meta: { error, touched } }) => {
+  return (
+    <div>
+      <label>{label}</label>
+      <input {...input} style={{ marginBottom: '5px' }} />
+      <div className="red-text" style={{ marginBottom: '20px' }}>
+        {touched && error}
+      </div>
+    </div>
+  );
+};
diff --git a/server/client/src/components/surveys/SurveyForm.js b/server/client/src/components/surveys/SurveyForm.js
new file mode 100644
index 0000000..79b23a3
--- /dev/null
+++ b/server/client/src/components/surveys/SurveyForm.js
@@ -0,0 +1,61 @@
+// SurveyForm shows a form for a user to add input
+import _ from 'lodash';
+import React, { Component } from 'react';
+import { reduxForm, Field } from 'redux-form';
+import { Link } from 'react-router-dom';
+import SurveyField from './SurveyField';
+import validateEmails from '../../utils/validateEmails';
+import formFields from './formFields';
+
+class SurveyForm extends Component {
+  renderFields() {
+    return _.map(formFields, ({ label, name }) => {
+      return (
+        <Field
+          key={name}
+          component={SurveyField}
+          type="text"
+          label={label}
+          name={name}
+        />
+      );
+    });
+  }
+
+  render() {
+    return (
+      <div>
+        <form onSubmit={this.props.handleSubmit(this.props.onSurveySubmit)}>
+          {this.renderFields()}
+          <Link to="/surveys" className="red btn-flat white-text">
+            Cancel
+          </Link>
+          <button type="submit" className="teal btn-flat right white-text">
+            Next
+            <i className="material-icons right">done</i>
+          </button>
+        </form>
+      </div>
+    );
+  }
+}
+
+function validate(values) {
+  const errors = {};
+
+  errors.emails = validateEmails(values.emails || '');
+
+  _.each(formFields, ({ name }) => {
+    if (!values[name]) {
+      errors[name] = 'You must provide a value';
+    }
+  });
+
+  return errors;
+}
+
+export default reduxForm({
+  validate,
+  form: 'surveyForm',
+  destroyOnUnmount: false
+})(SurveyForm);
diff --git a/server/client/src/components/surveys/SurveyFormReview.js b/server/client/src/components/surveys/SurveyFormReview.js
new file mode 100644
index 0000000..9804010
--- /dev/null
+++ b/server/client/src/components/surveys/SurveyFormReview.js
@@ -0,0 +1,45 @@
+// SurveyFormReview shows users their form inputs for review
+import _ from 'lodash';
+import React from 'react';
+import { connect } from 'react-redux';
+import formFields from './formFields';
+import * as actions from '../../actions';
+
+const SurveyFormReview = ({ onCancel, formValues, submitSurvey }) => {
+  const reviewFields = _.map(formFields, ({ name, label }) => {
+    return (
+      <div key={name}>
+        <label>{label}</label>
+        <div>
+          {formValues[name]}
+        </div>
+      </div>
+    );
+  });
+
+  return (
+    <div>
+      <h5>Please confirm your entries</h5>
+      {reviewFields}
+      <button
+        className="yellow darken-3 white-text btn-flat"
+        onClick={onCancel}
+      >
+        Back
+      </button>
+      <button
+        onClick={() => submitSurvey(formValues)}
+        className="green btn-flat right white-text"
+      >
+        Send Survey
+        <i className="material-icons right">email</i>
+      </button>
+    </div>
+  );
+};
+
+function mapStateToProps(state) {
+  return { formValues: state.form.surveyForm.values };
+}
+
+export default connect(mapStateToProps, actions)(SurveyFormReview);
diff --git a/server/client/src/components/surveys/SurveyNew.js b/server/client/src/components/surveys/SurveyNew.js
new file mode 100644
index 0000000..11724b2
--- /dev/null
+++ b/server/client/src/components/surveys/SurveyNew.js
@@ -0,0 +1,37 @@
+// SurveyNew shows SurveyForm and SurveyFormReview
+import React, { Component } from 'react';
+import { reduxForm } from 'redux-form';
+import SurveyForm from './SurveyForm';
+import SurveyFormReview from './SurveyFormReview';
+
+class SurveyNew extends Component {
+  state = { showFormReview: false };
+
+  renderContent() {
+    if (this.state.showFormReview) {
+      return (
+        <SurveyFormReview
+          onCancel={() => this.setState({ showFormReview: false })}
+        />
+      );
+    }
+
+    return (
+      <SurveyForm
+        onSurveySubmit={() => this.setState({ showFormReview: true })}
+      />
+    );
+  }
+
+  render() {
+    return (
+      <div>
+        {this.renderContent()}
+      </div>
+    );
+  }
+}
+
+export default reduxForm({
+  form: 'surveyForm'
+})(SurveyNew);
diff --git a/server/client/src/components/surveys/formFields.js b/server/client/src/components/surveys/formFields.js
new file mode 100644
index 0000000..c21933b
--- /dev/null
+++ b/server/client/src/components/surveys/formFields.js
@@ -0,0 +1,6 @@
+export default [
+  { label: 'Campaign Title', name: 'title' },
+  { label: 'Subject Line', name: 'subject' },
+  { label: 'Email Body', name: 'body' },
+  { label: 'Recipient List', name: 'emails' }
+];
diff --git a/server/client/src/reducers/index.js b/server/client/src/reducers/index.js
index b376587..7b5468a 100644
--- a/server/client/src/reducers/index.js
+++ b/server/client/src/reducers/index.js
@@ -1,6 +1,8 @@
 import { combineReducers } from 'redux';
+import { reducer as reduxForm } from 'redux-form';
 import authReducer from './authReducer';
 
 export default combineReducers({
-  auth: authReducer
+  auth: authReducer,
+  form: reduxForm
 });
diff --git a/server/client/src/utils/validateEmails.js b/server/client/src/utils/validateEmails.js
new file mode 100644
index 0000000..55b67ea
--- /dev/null
+++ b/server/client/src/utils/validateEmails.js
@@ -0,0 +1,14 @@
+const re = /^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/;
+
+export default emails => {
+  const invalidEmails = emails
+    .split(',')
+    .map(email => email.trim())
+    .filter(email => re.test(email) === false);
+
+  if (invalidEmails.length) {
+    return `These emails are invalid: ${invalidEmails}`;
+  }
+
+  return;
+};

From b348d354b7357d749e2be6fa69eae0fa780b5105 Mon Sep 17 00:00:00 2001
From: stephengrider <ste.grider@gmail.com>
Date: Thu, 20 Jul 2017 11:56:54 -0700
Subject: [PATCH 12/27] prop names

---
 server/client/src/actions/index.js                 | 6 ++++++
 server/client/src/components/surveys/SurveyForm.js | 2 +-
 server/client/src/components/surveys/formFields.js | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/server/client/src/actions/index.js b/server/client/src/actions/index.js
index af93c9b..149b70f 100644
--- a/server/client/src/actions/index.js
+++ b/server/client/src/actions/index.js
@@ -12,3 +12,9 @@ export const handleToken = token => async dispatch => {
 
   dispatch({ type: FETCH_USER, payload: res.data });
 };
+
+export const submitSurvey = values => async dispatch => {
+  const res = await axios.post('/api/surveys', values);
+
+  dispatch({ type: FETCH_USER, payload: res.data });
+};
diff --git a/server/client/src/components/surveys/SurveyForm.js b/server/client/src/components/surveys/SurveyForm.js
index 79b23a3..b883901 100644
--- a/server/client/src/components/surveys/SurveyForm.js
+++ b/server/client/src/components/surveys/SurveyForm.js
@@ -43,7 +43,7 @@ class SurveyForm extends Component {
 function validate(values) {
   const errors = {};
 
-  errors.emails = validateEmails(values.emails || '');
+  errors.recipients = validateEmails(values.recipients || '');
 
   _.each(formFields, ({ name }) => {
     if (!values[name]) {
diff --git a/server/client/src/components/surveys/formFields.js b/server/client/src/components/surveys/formFields.js
index c21933b..1e96f68 100644
--- a/server/client/src/components/surveys/formFields.js
+++ b/server/client/src/components/surveys/formFields.js
@@ -2,5 +2,5 @@ export default [
   { label: 'Campaign Title', name: 'title' },
   { label: 'Subject Line', name: 'subject' },
   { label: 'Email Body', name: 'body' },
-  { label: 'Recipient List', name: 'emails' }
+  { label: 'Recipient List', name: 'recipients' }
 ];

From 6ed860e823f35a1195b5954040253b5cae955aed Mon Sep 17 00:00:00 2001
From: stephengrider <ste.grider@gmail.com>
Date: Thu, 20 Jul 2017 12:12:52 -0700
Subject: [PATCH 13/27] redirect

---
 server/client/src/actions/index.js                       | 3 ++-
 server/client/src/components/surveys/SurveyFormReview.js | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/server/client/src/actions/index.js b/server/client/src/actions/index.js
index 149b70f..14c5679 100644
--- a/server/client/src/actions/index.js
+++ b/server/client/src/actions/index.js
@@ -13,8 +13,9 @@ export const handleToken = token => async dispatch => {
   dispatch({ type: FETCH_USER, payload: res.data });
 };
 
-export const submitSurvey = values => async dispatch => {
+export const submitSurvey = (values, history) => async dispatch => {
   const res = await axios.post('/api/surveys', values);
 
+  history.push('/surveys');
   dispatch({ type: FETCH_USER, payload: res.data });
 };
diff --git a/server/client/src/components/surveys/SurveyFormReview.js b/server/client/src/components/surveys/SurveyFormReview.js
index 9804010..51db9f8 100644
--- a/server/client/src/components/surveys/SurveyFormReview.js
+++ b/server/client/src/components/surveys/SurveyFormReview.js
@@ -3,9 +3,10 @@ import _ from 'lodash';
 import React from 'react';
 import { connect } from 'react-redux';
 import formFields from './formFields';
+import { withRouter } from 'react-router-dom';
 import * as actions from '../../actions';
 
-const SurveyFormReview = ({ onCancel, formValues, submitSurvey }) => {
+const SurveyFormReview = ({ onCancel, formValues, submitSurvey, history }) => {
   const reviewFields = _.map(formFields, ({ name, label }) => {
     return (
       <div key={name}>
@@ -28,7 +29,7 @@ const SurveyFormReview = ({ onCancel, formValues, submitSurvey }) => {
         Back
       </button>
       <button
-        onClick={() => submitSurvey(formValues)}
+        onClick={() => submitSurvey(formValues, history)}
         className="green btn-flat right white-text"
       >
         Send Survey
@@ -42,4 +43,4 @@ function mapStateToProps(state) {
   return { formValues: state.form.surveyForm.values };
 }
 
-export default connect(mapStateToProps, actions)(SurveyFormReview);
+export default connect(mapStateToProps, actions)(withRouter(SurveyFormReview));

From 11628df3a84edfc7f1ea473d747e125e33927fb7 Mon Sep 17 00:00:00 2001
From: stephengrider <ste.grider@gmail.com>
Date: Thu, 20 Jul 2017 12:54:08 -0700
Subject: [PATCH 14/27] added localtunnel

---
 server/package-lock.json | 336 +++++++++++++++++++++++++++++++++++++++
 server/package.json      |   6 +-
 2 files changed, 340 insertions(+), 2 deletions(-)

diff --git a/server/package-lock.json b/server/package-lock.json
index 231b478..36db0e6 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -18,6 +18,11 @@
       "resolved": "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz",
       "integrity": "sha1-R6++GiqSYhkdtoOOT9HTm0CCF0Y="
     },
+    "ajv": {
+      "version": "4.11.8",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
+      "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY="
+    },
     "ansi-regex": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
@@ -58,6 +63,16 @@
       "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
       "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0="
     },
+    "asn1": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
+      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
+    },
+    "assert-plus": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
+      "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ="
+    },
     "async": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/async/-/async-2.1.4.tgz",
@@ -123,11 +138,32 @@
       "resolved": "https://registry.npmjs.org/async.util.setimmediate/-/async.util.setimmediate-0.5.2.tgz",
       "integrity": "sha1-KBLrq/KlgCd1jUvHeT0cz68QJV8="
     },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+    },
+    "aws-sign2": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
+      "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8="
+    },
+    "aws4": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
+      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4="
+    },
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
       "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
     },
+    "bcrypt-pbkdf": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
+      "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
+      "optional": true
+    },
     "binary-extensions": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.8.0.tgz",
@@ -143,6 +179,11 @@
       "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.17.2.tgz",
       "integrity": "sha1-+IkqvI+eYn1Crtr7yma/WrmRBO4="
     },
+    "boom": {
+      "version": "2.10.1",
+      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
+      "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8="
+    },
     "bottleneck": {
       "version": "1.16.0",
       "resolved": "https://registry.npmjs.org/bottleneck/-/bottleneck-1.16.0.tgz",
@@ -173,6 +214,16 @@
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz",
       "integrity": "sha1-fZcZb51br39pNeJZhVSe3SpsIzk="
     },
+    "camelcase": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+      "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk="
+    },
+    "caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
+    },
     "chalk": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
@@ -183,6 +234,26 @@
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
       "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg="
     },
+    "cliui": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0="
+    },
+    "co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
+    },
+    "code-point-at": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
+    },
+    "combined-stream": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+      "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk="
+    },
     "commander": {
       "version": "2.6.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.6.0.tgz",
@@ -289,6 +360,23 @@
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
+    "cryptiles": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
+      "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g="
+    },
+    "dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+        }
+      }
+    },
     "date-fns": {
       "version": "1.28.5",
       "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.28.5.tgz",
@@ -299,11 +387,21 @@
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz",
       "integrity": "sha1-krrR9tBbu2u6Isyoi80OyJTChh4="
     },
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
+    },
     "deep-extend": {
       "version": "0.4.2",
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
       "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8="
     },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+    },
     "depd": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz",
@@ -324,6 +422,12 @@
       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.0.tgz",
       "integrity": "sha1-GqdzAC4VeEV+nZ1KULDMquvL1gQ="
     },
+    "ecc-jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
+      "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
+      "optional": true
+    },
     "ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
@@ -394,6 +498,11 @@
       "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
       "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE="
     },
+    "extsprintf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz",
+      "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA="
+    },
     "filename-regex": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
@@ -419,6 +528,16 @@
       "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
       "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4="
     },
+    "forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
+    },
+    "form-data": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
+      "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE="
+    },
     "forwarded": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz",
@@ -977,6 +1096,18 @@
         }
       }
     },
+    "getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+        }
+      }
+    },
     "glob-base": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
@@ -1004,6 +1135,16 @@
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
       "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
     },
+    "har-schema": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
+      "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4="
+    },
+    "har-validator": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
+      "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio="
+    },
     "has-ansi": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
@@ -1014,6 +1155,16 @@
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
       "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
     },
+    "hawk": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
+      "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ="
+    },
+    "hoek": {
+      "version": "2.16.3",
+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0="
+    },
     "hooks-fixed": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/hooks-fixed/-/hooks-fixed-2.0.0.tgz",
@@ -1024,6 +1175,11 @@
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.1.tgz",
       "integrity": "sha1-X4uO2YrKVFZWv1cplzh/kEpyIlc="
     },
+    "http-signature": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
+      "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8="
+    },
     "iconv-lite": {
       "version": "0.4.15",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz",
@@ -1054,6 +1210,11 @@
       "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
       "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4="
     },
+    "invert-kv": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
+    },
     "ipaddr.js": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.3.0.tgz",
@@ -1094,6 +1255,11 @@
       "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
       "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko="
     },
+    "is-fullwidth-code-point": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs="
+    },
     "is-glob": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
@@ -1129,6 +1295,11 @@
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
       "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
     },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+    },
     "isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -1139,6 +1310,49 @@
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
       "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk="
     },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+    },
+    "jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+      "optional": true
+    },
+    "json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+    },
+    "json-stable-stringify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
+      "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8="
+    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+    },
+    "jsonify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM="
+    },
+    "jsprim": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz",
+      "integrity": "sha1-o7h+QCmNjDgFUtjMdiigu5WiKRg=",
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+        }
+      }
+    },
     "kareem": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/kareem/-/kareem-1.4.1.tgz",
@@ -1159,6 +1373,23 @@
       "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-1.0.1.tgz",
       "integrity": "sha1-cs/Ebj6NG+ZR4eu1Tqn26pbzdLs="
     },
+    "lcid": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU="
+    },
+    "localtunnel": {
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/localtunnel/-/localtunnel-1.8.3.tgz",
+      "integrity": "sha1-3MWSL9hWUQN9S94k/ZMkjQsk6wU=",
+      "dependencies": {
+        "debug": {
+          "version": "2.6.8",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
+          "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw="
+        }
+      }
+    },
     "lodash": {
       "version": "4.17.4",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
@@ -1409,6 +1640,11 @@
       "resolved": "https://registry.npmjs.org/oauth/-/oauth-0.9.15.tgz",
       "integrity": "sha1-vR/vr2hslrdUda7VGWQS/2DPucE="
     },
+    "oauth-sign": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
+      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
+    },
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -1434,11 +1670,21 @@
       "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
       "integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA="
     },
+    "openurl": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/openurl/-/openurl-1.1.1.tgz",
+      "integrity": "sha1-OHW0sO96UsFW8NtB1GCduw+Us4c="
+    },
     "os-homedir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
       "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
     },
+    "os-locale": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk="
+    },
     "os-tmpdir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
@@ -1504,6 +1750,11 @@
       "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
       "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU="
     },
+    "performance-now": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
+      "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU="
+    },
     "pinkie": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
@@ -1539,6 +1790,11 @@
       "resolved": "https://registry.npmjs.org/ps-tree/-/ps-tree-1.1.0.tgz",
       "integrity": "sha1-tCGyQUDWID8e08dplrRCewjowBQ="
     },
+    "punycode": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
+    },
     "qs": {
       "version": "6.4.0",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
@@ -1640,6 +1896,18 @@
       "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz",
       "integrity": "sha1-PUEUIYh3U3SU+X93+Xhfq4EPpKw="
     },
+    "request": {
+      "version": "2.81.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
+      "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
+      "dependencies": {
+        "uuid": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
+          "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g=="
+        }
+      }
+    },
     "require_optional": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz",
@@ -1710,6 +1978,11 @@
       "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz",
       "integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc="
     },
+    "sntp": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
+      "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg="
+    },
     "spawn-command": {
       "version": "0.0.2-1",
       "resolved": "https://registry.npmjs.org/spawn-command/-/spawn-command-0.0.2-1.tgz",
@@ -1720,6 +1993,18 @@
       "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
       "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8="
     },
+    "sshpk": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
+      "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+        }
+      }
+    },
     "statuses": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
@@ -1745,6 +2030,16 @@
       "resolved": "https://registry.npmjs.org/string-length/-/string-length-1.0.1.tgz",
       "integrity": "sha1-VpcPscOFWOnnC3KL894mmsRa36w="
     },
+    "string-width": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M="
+    },
+    "stringstream": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
+      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg="
+    },
     "strip-ansi": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
@@ -1787,11 +2082,27 @@
       "resolved": "https://registry.npmjs.org/touch/-/touch-1.0.0.tgz",
       "integrity": "sha1-RJy+LbrlqMgDjjDXH6D/RklHxN4="
     },
+    "tough-cookie": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
+      "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo="
+    },
     "tree-kill": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.1.0.tgz",
       "integrity": "sha1-yWPc8DciiS7FnLpWnpQLcZVNFyk="
     },
+    "tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0="
+    },
+    "tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+      "optional": true
+    },
     "type-is": {
       "version": "1.6.15",
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz",
@@ -1842,6 +2153,21 @@
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.1.tgz",
       "integrity": "sha1-Z1Neu2lMHVIldFeYRmUyP1h+jTc="
     },
+    "verror": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz",
+      "integrity": "sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw="
+    },
+    "window-size": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz",
+      "integrity": "sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY="
+    },
+    "wrap-ansi": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU="
+    },
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -1856,6 +2182,16 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz",
       "integrity": "sha1-7byQPMOF/ARSPZZqM1UEtVBNG9I="
+    },
+    "y18n": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+      "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE="
+    },
+    "yargs": {
+      "version": "3.29.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.29.0.tgz",
+      "integrity": "sha1-GquWYOrnnYuPZ1vK7qtu40ws9pw="
     }
   }
 }
diff --git a/server/package.json b/server/package.json
index 23c7088..7fa30bf 100644
--- a/server/package.json
+++ b/server/package.json
@@ -11,8 +11,9 @@
     "start": "node index.js",
     "server": "nodemon index.js",
     "client": "npm run start --prefix client",
-    "dev": "concurrently \"npm run server\" \"npm run client\"",
-    "heroku-postbuild": "NPM_CONFIG_PRODUCTION=false npm install --prefix client && npm run build --prefix client"
+    "dev": "concurrently \"npm run server\" \"npm run client\" \"npm run webhook\"",
+    "heroku-postbuild": "NPM_CONFIG_PRODUCTION=false npm install --prefix client && npm run build --prefix client",
+    "webhook": "lt -p 5000 -s lairjgliargli"
   },
   "author": "",
   "license": "ISC",
@@ -21,6 +22,7 @@
     "concurrently": "^3.5.0",
     "cookie-session": "^2.0.0-beta.2",
     "express": "^4.15.3",
+    "localtunnel": "^1.8.3",
     "mongoose": "^4.11.1",
     "nodemon": "^1.11.0",
     "passport": "^0.3.2",

From 9e6ebae89ed9165ca98acc66204ff16d383ac08f Mon Sep 17 00:00:00 2001
From: stephengrider <ste.grider@gmail.com>
Date: Thu, 20 Jul 2017 13:05:29 -0700
Subject: [PATCH 15/27] test webhook

---
 server/package.json           |  2 +-
 server/routes/surveyRoutes.js |  5 +++++
 server/sendgrid_webhook.sh    | 14 ++++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100755 server/sendgrid_webhook.sh

diff --git a/server/package.json b/server/package.json
index 7fa30bf..5b2b216 100644
--- a/server/package.json
+++ b/server/package.json
@@ -13,7 +13,7 @@
     "client": "npm run start --prefix client",
     "dev": "concurrently \"npm run server\" \"npm run client\" \"npm run webhook\"",
     "heroku-postbuild": "NPM_CONFIG_PRODUCTION=false npm install --prefix client && npm run build --prefix client",
-    "webhook": "lt -p 5000 -s lairjgliargli"
+    "webhook": "./sendgrid_webhook.sh"
   },
   "author": "",
   "license": "ISC",
diff --git a/server/routes/surveyRoutes.js b/server/routes/surveyRoutes.js
index 54d410f..4edf754 100644
--- a/server/routes/surveyRoutes.js
+++ b/server/routes/surveyRoutes.js
@@ -11,6 +11,11 @@ module.exports = app => {
     res.send('Thanks for voting!');
   });
 
+  app.post('/api/surveys/webhooks', (req, res) => {
+    console.log(req.body);
+    res.send({});
+  });
+
   app.post('/api/surveys', requireLogin, requireCredits, async (req, res) => {
     const { title, subject, body, recipients } = req.body;
 
diff --git a/server/sendgrid_webhook.sh b/server/sendgrid_webhook.sh
new file mode 100755
index 0000000..7403949
--- /dev/null
+++ b/server/sendgrid_webhook.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+# make sure you have execute permissions:
+# cd /path/to/project
+# chmod +x ./sendgrid_webhook.sh
+# to run, type ./sendgrid_webhook.sh in the terminal
+
+function localtunnel {
+lt -s lairjgliargli --port 5000
+}
+
+until localtunnel; do
+echo "localtunnel server crashed"
+sleep 2
+done

From fa6e54d9b9702351ddd485dd393033b09c527d94 Mon Sep 17 00:00:00 2001
From: stephengrider <ste.grider@gmail.com>
Date: Thu, 20 Jul 2017 14:53:16 -0700
Subject: [PATCH 16/27] encode survey data

---
 server/package-lock.json                         | 10 ++++++++++
 server/package.json                              |  2 ++
 server/services/emailTemplates/surveyTemplate.js |  4 ++--
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/server/package-lock.json b/server/package-lock.json
index 36db0e6..388c7e0 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -1735,6 +1735,11 @@
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
     },
+    "path-parser": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/path-parser/-/path-parser-2.0.2.tgz",
+      "integrity": "sha1-q5DtEFO2gmgdESCmkgj29qanNMI="
+    },
     "path-to-regexp": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
@@ -1928,6 +1933,11 @@
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
       "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
     },
+    "search-params": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/search-params/-/search-params-1.3.0.tgz",
+      "integrity": "sha1-uh4cAdy9ii5BolI29gLyy/cQ1og="
+    },
     "semver": {
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
diff --git a/server/package.json b/server/package.json
index 5b2b216..73c09f6 100644
--- a/server/package.json
+++ b/server/package.json
@@ -23,10 +23,12 @@
     "cookie-session": "^2.0.0-beta.2",
     "express": "^4.15.3",
     "localtunnel": "^1.8.3",
+    "lodash": "^4.17.4",
     "mongoose": "^4.11.1",
     "nodemon": "^1.11.0",
     "passport": "^0.3.2",
     "passport-google-oauth20": "^1.0.0",
+    "path-parser": "^2.0.2",
     "sendgrid": "^5.1.2",
     "stripe": "^4.23.1"
   }
diff --git a/server/services/emailTemplates/surveyTemplate.js b/server/services/emailTemplates/surveyTemplate.js
index dd052bd..f70126b 100644
--- a/server/services/emailTemplates/surveyTemplate.js
+++ b/server/services/emailTemplates/surveyTemplate.js
@@ -9,10 +9,10 @@ module.exports = survey => {
           <p>Please answer the following question:</p>
           <p>${survey.body}</p>
           <div>
-            <a href="${keys.redirectDomain}/api/surveys/thanks">Yes</a>
+            <a href="${keys.redirectDomain}/api/surveys/${survey.id}/yes">Yes</a>
           </div>
           <div>
-            <a href="${keys.redirectDomain}/api/surveys/thanks">No</a>
+            <a href="${keys.redirectDomain}/api/surveys/${survey.id}/no">No</a>
           </div>
         </div>
       </body>

From 1f1d49a56de7f1627322d4c89ca782fa7bc285b8 Mon Sep 17 00:00:00 2001
From: stephengrider <ste.grider@gmail.com>
Date: Thu, 20 Jul 2017 15:37:20 -0700
Subject: [PATCH 17/27] parse route

---
 server/routes/surveyRoutes.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/server/routes/surveyRoutes.js b/server/routes/surveyRoutes.js
index 4edf754..cc461a1 100644
--- a/server/routes/surveyRoutes.js
+++ b/server/routes/surveyRoutes.js
@@ -1,3 +1,6 @@
+const _ = require('lodash');
+const Path = require('path-parser');
+const { URL } = require('url');
 const mongoose = require('mongoose');
 const requireLogin = require('../middlewares/requireLogin');
 const requireCredits = require('../middlewares/requireCredits');
@@ -12,8 +15,11 @@ module.exports = app => {
   });
 
   app.post('/api/surveys/webhooks', (req, res) => {
-    console.log(req.body);
-    res.send({});
+    const events = _.map(req.body, event => {
+      const pathname = new URL(event.url).pathname;
+      const p = new Path('/api/surveys/:surveyId/:choice');
+      console.log(p.test(pathname));
+    });
   });
 
   app.post('/api/surveys', requireLogin, requireCredits, async (req, res) => {

From 697c11ea481e74c3034dd9e4cbc45cddf25e871c Mon Sep 17 00:00:00 2001
From: stephengrider <ste.grider@gmail.com>
Date: Thu, 20 Jul 2017 15:51:13 -0700
Subject: [PATCH 18/27] uniqueness

---
 server/routes/surveyRoutes.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/server/routes/surveyRoutes.js b/server/routes/surveyRoutes.js
index cc461a1..64b86d4 100644
--- a/server/routes/surveyRoutes.js
+++ b/server/routes/surveyRoutes.js
@@ -15,11 +15,21 @@ module.exports = app => {
   });
 
   app.post('/api/surveys/webhooks', (req, res) => {
-    const events = _.map(req.body, event => {
-      const pathname = new URL(event.url).pathname;
+    const events = _.map(req.body, ({ email, url }) => {
+      const pathname = new URL(url).pathname;
       const p = new Path('/api/surveys/:surveyId/:choice');
-      console.log(p.test(pathname));
+      const match = p.test(pathname);
+      if (match) {
+        return { email, surveyId: match.surveyId, choice: match.choice };
+      }
     });
+
+    const compactEvents = _.compact(events);
+    const uniqueEvents = _.uniqBy(compactEvents, 'email', 'surveyId');
+
+    console.log(uniqueEvents);
+
+    res.send({});
   });
 
   app.post('/api/surveys', requireLogin, requireCredits, async (req, res) => {

From dcf011b9f575e395d3445f41b26b213dd3198d50 Mon Sep 17 00:00:00 2001
From: stephengrider <ste.grider@gmail.com>
Date: Thu, 20 Jul 2017 16:30:05 -0700
Subject: [PATCH 19/27] lodash chain

---
 server/routes/surveyRoutes.js | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/server/routes/surveyRoutes.js b/server/routes/surveyRoutes.js
index 64b86d4..d2d918f 100644
--- a/server/routes/surveyRoutes.js
+++ b/server/routes/surveyRoutes.js
@@ -15,19 +15,20 @@ module.exports = app => {
   });
 
   app.post('/api/surveys/webhooks', (req, res) => {
-    const events = _.map(req.body, ({ email, url }) => {
-      const pathname = new URL(url).pathname;
-      const p = new Path('/api/surveys/:surveyId/:choice');
-      const match = p.test(pathname);
-      if (match) {
-        return { email, surveyId: match.surveyId, choice: match.choice };
-      }
-    });
-
-    const compactEvents = _.compact(events);
-    const uniqueEvents = _.uniqBy(compactEvents, 'email', 'surveyId');
-
-    console.log(uniqueEvents);
+    const p = new Path('/api/surveys/:surveyId/:choice');
+
+    const events = _.chain(req.body)
+      .map(({ email, url }) => {
+        const match = p.test(new URL(url).pathname);
+        if (match) {
+          return { email, surveyId: match.surveyId, choice: match.choice };
+        }
+      })
+      .compact()
+      .uniqBy('email', 'surveyId')
+      .value();
+
+    console.log(events);
 
     res.send({});
   });

From f4c66f591894baaeb680cdd6e2d6ee56fe4b683f Mon Sep 17 00:00:00 2001
From: stephengrider <ste.grider@gmail.com>
Date: Fri, 21 Jul 2017 11:11:33 -0700
Subject: [PATCH 20/27] bad query

---
 server/routes/surveyRoutes.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/routes/surveyRoutes.js b/server/routes/surveyRoutes.js
index d2d918f..64cf62f 100644
--- a/server/routes/surveyRoutes.js
+++ b/server/routes/surveyRoutes.js
@@ -40,7 +40,7 @@ module.exports = app => {
       title,
       subject,
       body,
-      recipients: recipients.split(',').map(email => ({ email })),
+      recipients: recipients.split(',').map(email => ({ email: email.trim() })),
       _user: req.user.id,
       dateSent: Date.now()
     });

From 5bac251b36a2eb4d516519a7940da69853b4911f Mon Sep 17 00:00:00 2001
From: stephengrider <ste.grider@gmail.com>
Date: Fri, 21 Jul 2017 11:46:00 -0700
Subject: [PATCH 21/27] add query

---
 server/routes/surveyRoutes.js | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/server/routes/surveyRoutes.js b/server/routes/surveyRoutes.js
index 64cf62f..db210db 100644
--- a/server/routes/surveyRoutes.js
+++ b/server/routes/surveyRoutes.js
@@ -17,7 +17,7 @@ module.exports = app => {
   app.post('/api/surveys/webhooks', (req, res) => {
     const p = new Path('/api/surveys/:surveyId/:choice');
 
-    const events = _.chain(req.body)
+    _.chain(req.body)
       .map(({ email, url }) => {
         const match = p.test(new URL(url).pathname);
         if (match) {
@@ -26,9 +26,20 @@ module.exports = app => {
       })
       .compact()
       .uniqBy('email', 'surveyId')
-      .value();
-
-    console.log(events);
+      .each(({ email, choice, surveyId }) => {
+        Survey.updateOne(
+          {
+            id: surveyId,
+            recipients: {
+              $elemMatch: { email: email, responded: false }
+            }
+          },
+          {
+            $inc: { [choice]: 1 },
+            $set: { 'recipients.$.responded': true }
+          }
+        );
+      });
 
     res.send({});
   });

From 0b8c4970fa5ec5f1a3646b6fa975fe0414bd005e Mon Sep 17 00:00:00 2001
From: stephengrider <ste.grider@gmail.com>
Date: Fri, 21 Jul 2017 12:24:30 -0700
Subject: [PATCH 22/27] execute query

---
 server/routes/surveyRoutes.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/server/routes/surveyRoutes.js b/server/routes/surveyRoutes.js
index db210db..2de0ffc 100644
--- a/server/routes/surveyRoutes.js
+++ b/server/routes/surveyRoutes.js
@@ -26,10 +26,10 @@ module.exports = app => {
       })
       .compact()
       .uniqBy('email', 'surveyId')
-      .each(({ email, choice, surveyId }) => {
+      .each(({ surveyId, email, choice }) => {
         Survey.updateOne(
           {
-            id: surveyId,
+            _id: surveyId,
             recipients: {
               $elemMatch: { email: email, responded: false }
             }
@@ -38,8 +38,9 @@ module.exports = app => {
             $inc: { [choice]: 1 },
             $set: { 'recipients.$.responded': true }
           }
-        );
-      });
+        ).exec();
+      })
+      .value();
 
     res.send({});
   });

From 36caaaabf03d033f81f6f060ddffbd54da48718b Mon Sep 17 00:00:00 2001
From: stephengrider <ste.grider@gmail.com>
Date: Fri, 21 Jul 2017 12:37:38 -0700
Subject: [PATCH 23/27] added stuff

---
 server/routes/surveyRoutes.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/server/routes/surveyRoutes.js b/server/routes/surveyRoutes.js
index 2de0ffc..603305f 100644
--- a/server/routes/surveyRoutes.js
+++ b/server/routes/surveyRoutes.js
@@ -10,7 +10,7 @@ const surveyTemplate = require('../services/emailTemplates/surveyTemplate');
 const Survey = mongoose.model('surveys');
 
 module.exports = app => {
-  app.get('/api/surveys/thanks', (req, res) => {
+  app.get('/api/surveys/:surveyId/:choice', (req, res) => {
     res.send('Thanks for voting!');
   });
 
@@ -36,7 +36,8 @@ module.exports = app => {
           },
           {
             $inc: { [choice]: 1 },
-            $set: { 'recipients.$.responded': true }
+            $set: { 'recipients.$.responded': true },
+            lastResponded: new Date()
           }
         ).exec();
       })

From ee90b61b697a0dade3585fcac0aaa77f4eb25817 Mon Sep 17 00:00:00 2001
From: stephengrider <ste.grider@gmail.com>
Date: Fri, 21 Jul 2017 14:20:04 -0700
Subject: [PATCH 24/27] fetch list of surveys

---
 server/routes/surveyRoutes.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/server/routes/surveyRoutes.js b/server/routes/surveyRoutes.js
index 603305f..9dd63e9 100644
--- a/server/routes/surveyRoutes.js
+++ b/server/routes/surveyRoutes.js
@@ -10,6 +10,12 @@ const surveyTemplate = require('../services/emailTemplates/surveyTemplate');
 const Survey = mongoose.model('surveys');
 
 module.exports = app => {
+  app.get('/api/surveys', requireLogin, async (req, res) => {
+    const surveys = await Survey.find({ _user: req.user.id });
+
+    res.send(surveys);
+  });
+
   app.get('/api/surveys/:surveyId/:choice', (req, res) => {
     res.send('Thanks for voting!');
   });

From 5479139a813f897c593af2ce0466d86fd2d3ee71 Mon Sep 17 00:00:00 2001
From: stephengrider <ste.grider@gmail.com>
Date: Fri, 21 Jul 2017 14:30:45 -0700
Subject: [PATCH 25/27] whitelist fields

---
 server/routes/surveyRoutes.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/server/routes/surveyRoutes.js b/server/routes/surveyRoutes.js
index 9dd63e9..cee9171 100644
--- a/server/routes/surveyRoutes.js
+++ b/server/routes/surveyRoutes.js
@@ -11,7 +11,9 @@ const Survey = mongoose.model('surveys');
 
 module.exports = app => {
   app.get('/api/surveys', requireLogin, async (req, res) => {
-    const surveys = await Survey.find({ _user: req.user.id });
+    const surveys = await Survey.find({ _user: req.user.id }).select({
+      recipients: false
+    });
 
     res.send(surveys);
   });

From b57350083621ccdbe7900b316604616b592b128f Mon Sep 17 00:00:00 2001
From: stephengrider <ste.grider@gmail.com>
Date: Fri, 21 Jul 2017 14:40:10 -0700
Subject: [PATCH 26/27] wiring surveys

---
 server/client/src/actions/index.js           |  8 +++++++-
 server/client/src/actions/types.js           |  1 +
 server/client/src/reducers/index.js          |  4 +++-
 server/client/src/reducers/surveysReducer.js | 10 ++++++++++
 4 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 server/client/src/reducers/surveysReducer.js

diff --git a/server/client/src/actions/index.js b/server/client/src/actions/index.js
index 14c5679..8c93cbd 100644
--- a/server/client/src/actions/index.js
+++ b/server/client/src/actions/index.js
@@ -1,5 +1,5 @@
 import axios from 'axios';
-import { FETCH_USER } from './types';
+import { FETCH_USER, FETCH_SURVEYS } from './types';
 
 export const fetchUser = () => async dispatch => {
   const res = await axios.get('/api/current_user');
@@ -19,3 +19,9 @@ export const submitSurvey = (values, history) => async dispatch => {
   history.push('/surveys');
   dispatch({ type: FETCH_USER, payload: res.data });
 };
+
+export const fetchSurveys = () => async dispatch => {
+  const res = await axios.get('/api/surveys');
+
+  dispatch({ type: FETCH_SURVEYS, payload: res.data });
+};
diff --git a/server/client/src/actions/types.js b/server/client/src/actions/types.js
index aa6fe72..9ee45fe 100644
--- a/server/client/src/actions/types.js
+++ b/server/client/src/actions/types.js
@@ -1 +1,2 @@
 export const FETCH_USER = 'fetch_user';
+export const FETCH_SURVEYS = 'fetch_surveys';
diff --git a/server/client/src/reducers/index.js b/server/client/src/reducers/index.js
index 7b5468a..541cbd9 100644
--- a/server/client/src/reducers/index.js
+++ b/server/client/src/reducers/index.js
@@ -1,8 +1,10 @@
 import { combineReducers } from 'redux';
 import { reducer as reduxForm } from 'redux-form';
 import authReducer from './authReducer';
+import surveysReducer from './surveysReducer';
 
 export default combineReducers({
   auth: authReducer,
-  form: reduxForm
+  form: reduxForm,
+  surveys: surveysReducer
 });
diff --git a/server/client/src/reducers/surveysReducer.js b/server/client/src/reducers/surveysReducer.js
new file mode 100644
index 0000000..eb36fcc
--- /dev/null
+++ b/server/client/src/reducers/surveysReducer.js
@@ -0,0 +1,10 @@
+import { FETCH_SURVEYS } from '../actions/types';
+
+export default function(state = [], action) {
+  switch (action.type) {
+    case FETCH_SURVEYS:
+      return action.payload;
+    default:
+      return state;
+  }
+}

From 9e49251ef63aac465f0b00f82113b8c0a9da6d43 Mon Sep 17 00:00:00 2001
From: stephengrider <ste.grider@gmail.com>
Date: Fri, 21 Jul 2017 14:48:18 -0700
Subject: [PATCH 27/27] wire react to redux

---
 server/client/src/components/Dashboard.js     |  3 ++-
 .../src/components/surveys/SurveyList.js      | 23 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 server/client/src/components/surveys/SurveyList.js

diff --git a/server/client/src/components/Dashboard.js b/server/client/src/components/Dashboard.js
index d22b25e..dc8d4f7 100644
--- a/server/client/src/components/Dashboard.js
+++ b/server/client/src/components/Dashboard.js
@@ -1,10 +1,11 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
+import SurveyList from './surveys/SurveyList';
 
 const Dashboard = () => {
   return (
     <div>
-      Dashboard
+      <SurveyList />
       <div className="fixed-action-btn">
         <Link to="/surveys/new" className="btn-floating btn-large red">
           <i className="material-icons">add</i>
diff --git a/server/client/src/components/surveys/SurveyList.js b/server/client/src/components/surveys/SurveyList.js
new file mode 100644
index 0000000..8d24cc5
--- /dev/null
+++ b/server/client/src/components/surveys/SurveyList.js
@@ -0,0 +1,23 @@
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import { fetchSurveys } from '../../actions';
+
+class SurveyList extends Component {
+  componentDidMount() {
+    this.props.fetchSurveys();
+  }
+
+  render() {
+    return (
+      <div>
+        SurveyList
+      </div>
+    );
+  }
+}
+
+function mapStateToProps({ surveys }) {
+  return { surveys };
+}
+
+export default connect(mapStateToProps, { fetchSurveys })(SurveyList);