From d25cb2cc618c2d61c8ae8cb07ac47f4f455ca22e Mon Sep 17 00:00:00 2001
From: Keith Irwin <mail@keithirwin.us>
Date: Mon, 8 May 2017 17:12:49 -0400
Subject: [PATCH 1/5] Added contact page

---
 config/routes/index.js      |  8 ++++++++
 views/contact.html          | 10 ++++++++++
 views/templates/header.html |  1 +
 3 files changed, 19 insertions(+)
 create mode 100644 views/contact.html

diff --git a/config/routes/index.js b/config/routes/index.js
index 44fa002..13a0f42 100644
--- a/config/routes/index.js
+++ b/config/routes/index.js
@@ -18,6 +18,14 @@ module.exports = router
 		res.render('help');
 	})
 	
+	// Contact
+	.get('/contact', (req,res)=>{
+		res.render('contact');
+	})
+	.post('/contact', (req,res)=>{
+		//TODO: Get contact stuff
+	})
+	
 	// Terms of Service and Privacy Policy
 	.get('/terms', (req,res)=>{
 		res.render('terms');
diff --git a/views/contact.html b/views/contact.html
new file mode 100644
index 0000000..16186f7
--- /dev/null
+++ b/views/contact.html
@@ -0,0 +1,10 @@
+{% extends 'templates/base.html' %}
+{% block title %}{{super()}} | Contact{% endblock %}
+
+{% block main %}
+	<section class='container'>
+		
+		<h1>Contact</h1>
+
+	</section>
+{% endblock %}
\ No newline at end of file
diff --git a/views/templates/header.html b/views/templates/header.html
index 1164e80..d446915 100644
--- a/views/templates/header.html
+++ b/views/templates/header.html
@@ -13,6 +13,7 @@
 	<!-- Navigation -->
 	<nav id='navigation'><ul>
 			<li><a href="/">About</a></li>
+			<li><a href="/contact">Contact</a></li>
 		{% if user %}
 			<li><a href="/map">Map</a></li>
 			<li><a href="/settings">Settings</a></li>

From 6b8c288f2254563e7275b1497a2ff7ff7b4ad63f Mon Sep 17 00:00:00 2001
From: Keith Irwin <mail@keithirwin.us>
Date: Mon, 8 May 2017 17:27:45 -0400
Subject: [PATCH 2/5] #59 Added captcha

---
 config/env/sample.js   |  5 ++++-
 config/routes/index.js |  6 ++++--
 views/contact.html     | 24 +++++++++++++++++++++++-
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/config/env/sample.js b/config/env/sample.js
index 6b3f955..8074a8c 100644
--- a/config/env/sample.js
+++ b/config/env/sample.js
@@ -29,6 +29,9 @@ module.exports = {
 	googleClientSecret: 'XXXXXXXXX_XXXXXXXXXXXXXX',
 	
 	// Google maps API key
-	googleMapsAPI: 'XXXXXXXXXXXXXXX_XXXXXXXXXXXXXXXXXXXXXXX'
+	googleMapsAPI: 'XXXXXXXXXXXXXXX_XXXXXXXXXXXXXXXXXXXXXXX',
+	
+	// reCaptcha API key
+	recaptcha: 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'
 	
 };
diff --git a/config/routes/index.js b/config/routes/index.js
index 13a0f42..3a4050c 100644
--- a/config/routes/index.js
+++ b/config/routes/index.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const mw = require('../middleware.js'),
+const env = require('../env/env.js'),
 	router = require('express').Router(),
 	slug = require('slug'),
 	xss = require('xss'),
@@ -20,7 +20,9 @@ module.exports = router
 	
 	// Contact
 	.get('/contact', (req,res)=>{
-		res.render('contact');
+		res.render('contact',{
+			sitekey: env.recaptcha
+		});
 	})
 	.post('/contact', (req,res)=>{
 		//TODO: Get contact stuff
diff --git a/views/contact.html b/views/contact.html
index 16186f7..849a999 100644
--- a/views/contact.html
+++ b/views/contact.html
@@ -1,10 +1,32 @@
 {% extends 'templates/base.html' %}
 {% block title %}{{super()}} | Contact{% endblock %}
 
+{% block head %}
+{{super()}}
+ <script src='https://www.google.com/recaptcha/api.js'></script>
+{% endblock %}
+
 {% block main %}
 	<section class='container'>
 		
 		<h1>Contact</h1>
+		
+		<form id='contact-form'>
+			
+			
+			<button class='g-recaptcha' data-sitekey="{{sitekey}}" data-callback="onSubmit">Submit</button>
+
+		</form>
 
 	</section>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
+
+{% block javascript %}
+{{super()}}
+	<script type="application/javascript">
+	/* global $ */
+		function onSubmit() {
+			$('#contact-form').submit();
+		}
+	</script>
+{% endblock %}

From 212ccfec5b87f677a3b1a60415f0f57c31f034da Mon Sep 17 00:00:00 2001
From: Keith Irwin <mail@keithirwin.us>
Date: Mon, 8 May 2017 17:45:06 -0400
Subject: [PATCH 3/5] Renamed noReply in mail.js

---
 config/mail.js            | 2 +-
 config/routes/auth.js     | 4 ++--
 config/routes/settings.js | 4 ++--
 config/routes/test.js     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/mail.js b/config/mail.js
index fe4a578..9270a66 100644
--- a/config/mail.js
+++ b/config/mail.js
@@ -34,7 +34,7 @@ module.exports = {
 		return `<h1><a href="/" style="text-decoration:none;"><span style="color:#000;font-family:sans-serif;font-size:36px;font-weight:bold"><img src="${env.url}/static/img/icon/by/32.png" alt="+" style="margin-right:10px">Tracman</span></a></h1>${text}<p style="font-size:8px;">Do not reply to this email.  For information about why you recieved this email, see our <a href="${env.url}/privacy#email">privacy policy</a>. </p>`;
 	},
 	
-	from: `"Tracman" <NoReply@tracman.org>`,
+	noReply: `"Tracman" <NoReply@tracman.org>`,
 	
 	to: (user)=>{
 		return `"${user.name}" <${user.email}>`;
diff --git a/config/routes/auth.js b/config/routes/auth.js
index 2ccbe37..c7dffe0 100644
--- a/config/routes/auth.js
+++ b/config/routes/auth.js
@@ -80,7 +80,7 @@ module.exports = (app, passport) => {
 						
 						// Email the instructions to continue
 						mail.send({
-							from: mail.from,
+							from: mail.noReply,
 							to: `<${user.email}>`,
 							subject: 'Complete your Tracman registration',
 							text: mail.text(`Welcome to Tracman!  \n\nTo complete your registration, follow this link and set your password:\n${env.url}/settings/password/${token}\n\nThis link will expire at ${expirationTimeString}.  `),
@@ -238,7 +238,7 @@ module.exports = (app, passport) => {
 							
 							// Email reset link
 							mail.send({
-								from: mail.from,
+								from: mail.noReply,
 								to: mail.to(user),
 								subject: 'Reset your Tracman password',
 								text: mail.text(`Hi, \n\nDid you request to reset your Tracman password?  If so, follow this link to do so:\n${env.url}/settings/password/${token}\n\nIf you didn't initiate this request, just ignore this email. `),
diff --git a/config/routes/settings.js b/config/routes/settings.js
index 1ab18e0..ff9bdc5 100644
--- a/config/routes/settings.js
+++ b/config/routes/settings.js
@@ -71,7 +71,7 @@ router.route('/')
 							debug(`Mailing new email token to ${req.body.email}...`);
 							mail.send({
 								to: `"${req.user.name}" <${req.body.email}>`,
-								from: mail.from,
+								from: mail.noReply,
 								subject: 'Confirm your new email address for Tracman',
 								text: mail.text(`A request has been made to change your Tracman email address.  If you did not initiate this request, please disregard it.  \n\nTo confirm your email, follow this link:\n${env.url}/settings/email/${token}. `),
 								html: mail.html(`<p>A request has been made to change your Tracman email address.  If you did not initiate this request, please disregard it.  </p><p>To confirm your email, follow this link:<br><a href="${env.url}/settings/email/${token}">${env.url}/settings/email/${token}</a>. </p>`)
@@ -241,7 +241,7 @@ router.route('/password')
 				// Confirm password change request by email.
 				mail.send({
 					to: mail.to(req.user),
-					from: mail.from,
+					from: mail.noReply,
 					subject: 'Request to change your Tracman password',
 					text: mail.text(`A request has been made to change your tracman password.  If you did not initiate this request, please contact support at keith@tracman.org.  \n\nTo change your password, follow this link:\n${env.url}/settings/password/${token}. \n\nThis request will expire at ${expirationTimeString}. `),
 					html: mail.html(`<p>A request has been made to change your tracman password.  If you did not initiate this request, please contact support at <a href="mailto:keith@tracman.org">keith@tracman.org</a>.  </p><p>To change your password, follow this link:<br><a href="${env.url}/settings/password/${token}">${env.url}/settings/password/${token}</a>. </p><p>This request will expire at ${expirationTimeString}. </p>`)
diff --git a/config/routes/test.js b/config/routes/test.js
index bbb4d18..5f8066c 100644
--- a/config/routes/test.js
+++ b/config/routes/test.js
@@ -10,7 +10,7 @@ router
 	.get('/mail', (req,res,next)=>{
 		mail.send({
 		  to: `"Keith Irwin" <hypergeek14@gmail.com>`,
-		  from: mail.from,
+		  from: mail.noReply,
 		  subject: 'Test email',
 		  text: mail.text("Looks like everything's working! "),
 		  html: mail.html("<p>Looks like everything's working! </p>")

From bae3b10a1829a34db4ddcb0e3000c2ae1dd6fa99 Mon Sep 17 00:00:00 2001
From: Keith Irwin <mail@keithirwin.us>
Date: Mon, 8 May 2017 19:01:35 -0400
Subject: [PATCH 4/5] #59 Finished contact form

---
 config/env/sample.js   |  5 ++--
 config/routes/index.js | 65 ++++++++++++++++++++++++++++++++++++++----
 package.json           |  1 +
 static/css/contact.css | 31 ++++++++++++++++++++
 views/contact.html     | 14 ++++++---
 5 files changed, 105 insertions(+), 11 deletions(-)
 create mode 100644 static/css/contact.css

diff --git a/config/env/sample.js b/config/env/sample.js
index 8074a8c..f1bf2a7 100644
--- a/config/env/sample.js
+++ b/config/env/sample.js
@@ -29,9 +29,10 @@ module.exports = {
 	googleClientSecret: 'XXXXXXXXX_XXXXXXXXXXXXXX',
 	
 	// Google maps API key
-	googleMapsAPI: 'XXXXXXXXXXXXXXX_XXXXXXXXXXXXXXXXXXXXXXX',
+	googleMapsAPI: 'XXXXXXXXXXXXXXX_XXXXXXXXXXXXXXXXXXXXXXX'
 	
 	// reCaptcha API key
-	recaptcha: 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'
+	recaptchaSitekey: 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX',
+	recaptchaSecret: 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX',
 	
 };
diff --git a/config/routes/index.js b/config/routes/index.js
index 3a4050c..d3e81ac 100644
--- a/config/routes/index.js
+++ b/config/routes/index.js
@@ -1,10 +1,13 @@
 'use strict';
 
-const env = require('../env/env.js'),
+const mw = require('../middleware.js'),
+	env = require('../env/env.js'),
+	mail = require('../mail.js'),
 	router = require('express').Router(),
+	request = require('request'),
 	slug = require('slug'),
 	xss = require('xss'),
-  User = require('../models.js').user;
+	User = require('../models.js').user;
 
 module.exports = router
 	
@@ -21,11 +24,63 @@ module.exports = router
 	// Contact
 	.get('/contact', (req,res)=>{
 		res.render('contact',{
-			sitekey: env.recaptcha
+			sitekey: env.recaptchaSitekey
 		});
 	})
-	.post('/contact', (req,res)=>{
-		//TODO: Get contact stuff
+	.post('/contact', (req,res,next)=>{
+		
+		// Confirm captcha
+		request.post( 'https://www.google.com/recaptcha/api/siteverify', {form:{
+			secret: env.recaptchaSecret,
+			response: req.body['g-recaptcha-response'],
+			remoteip: req.ip
+		}}, (err, response, body)=>{
+			
+			// Check for errors
+			if (err){
+				mw.throwErr(err,req);
+				res.redirect('/contact');
+			}
+			if (response.statusCode!==200) {
+				let err = new Error('Bad response from reCaptcha service');
+				mw.throwErr(err,req);
+				res.redirect('/contact');
+			}
+			else {
+				
+				// Captcha succeeded
+				if (JSON.parse(body).success){
+					mail.send({
+						from: `${req.body.name} <${req.body.email}>`,
+						to: `Tracman Contact <contact@tracman.org>`,
+						subject: req.body.subject||'A message',
+						text: req.body.message
+					})
+					.then(()=>{
+						req.flash('success', `Your message has been sent. `);
+						res.redirect(req.session.next || '/');
+					})
+					.catch((err)=>{
+						mw.throwErr(err,req);
+						res.redirect('/contact');
+					});
+				}
+				
+				// Captcha failed
+				else {
+					let err = new Error('Failed reCaptcha');
+					mw.throwErr(err,req);
+					res.redirect('/contact');
+				}
+				
+			}
+		}
+);
+		
+		//TODO: Check req.body.g-recaptcha-response
+		
+		
+		
 	})
 	
 	// Terms of Service and Privacy Policy
diff --git a/package.json b/package.json
index b981674..99d7c84 100644
--- a/package.json
+++ b/package.json
@@ -29,6 +29,7 @@
     "passport-local": "^1.0.0",
     "passport-twitter": "^1.0.4",
     "passport-twitter-token": "^1.3.0",
+    "request": "^2.81.0",
     "slug": "^0.9.1",
     "socket.io": "^1.4.4",
     "xss": "^0.3.3"
diff --git a/static/css/contact.css b/static/css/contact.css
new file mode 100644
index 0000000..c37d518
--- /dev/null
+++ b/static/css/contact.css
@@ -0,0 +1,31 @@
+input, textarea {
+	margin-bottom: 3%;
+}
+
+#subject, #message {
+	width: 100%;
+}
+
+@media (max-width:250px) {
+	#name, #email {
+		width: 100%;
+	}
+}
+@media (min-width:250px) {
+	#name, #email {
+		min-width: 45%;
+	}
+	#name {
+		float: left;
+	}
+	#email {
+		float: right;
+	}
+}
+
+button.btn {
+	display: block;
+	margin: auto;
+	min-width: 60%;
+	min-height: 12vh;
+}
\ No newline at end of file
diff --git a/views/contact.html b/views/contact.html
index 849a999..5a69bf4 100644
--- a/views/contact.html
+++ b/views/contact.html
@@ -3,7 +3,9 @@
 
 {% block head %}
 {{super()}}
- <script src='https://www.google.com/recaptcha/api.js'></script>
+	<link rel="stylesheet" type="text/css" href="/static/css/.form.min.css">
+	<link rel="stylesheet" type="text/css" href="/static/css/.contact.min.css">
+	<script src='https://www.google.com/recaptcha/api.js'></script>
 {% endblock %}
 
 {% block main %}
@@ -11,11 +13,15 @@
 		
 		<h1>Contact</h1>
 		
-		<form id='contact-form'>
+		<form id='contact-form' role="form" method="POST">
 			
+			<input name="subject" id='subject' type="text" maxlength="160" value="{{subject}}" placeholder="Subject">
+			<textarea name="message" id='message' rows="10" maxlength="5000" placeholder="Message" required>{{message}}</textarea>
 			
-			<button class='g-recaptcha' data-sitekey="{{sitekey}}" data-callback="onSubmit">Submit</button>
-
+			<input name="name" id='name' type="text" maxlength="160" value="{{name}}" placeholder="Name">
+			<input name="email" id='email' type="email" maxlength="160" value="{{email}}" placeholder="Email" required>
+			
+			<button class='g-recaptcha main btn' data-sitekey="{{sitekey}}" data-callback="onSubmit">Submit</button>
 		</form>
 
 	</section>

From 9bac5a585fbba2bab14260c0d2cb2c1ea1f37d58 Mon Sep 17 00:00:00 2001
From: Keith Irwin <mail@keithirwin.us>
Date: Mon, 8 May 2017 19:06:06 -0400
Subject: [PATCH 5/5] #59 Fixed formatting

---
 static/css/contact.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/static/css/contact.css b/static/css/contact.css
index c37d518..6fcb4c8 100644
--- a/static/css/contact.css
+++ b/static/css/contact.css
@@ -6,12 +6,12 @@ input, textarea {
 	width: 100%;
 }
 
-@media (max-width:250px) {
+@media (max-width:600px) {
 	#name, #email {
 		width: 100%;
 	}
 }
-@media (min-width:250px) {
+@media (min-width:600px) {
 	#name, #email {
 		min-width: 45%;
 	}