Talk submit

common/models/speaker.json

@@ -39,12 +39,7 @@
     }
   },
   "acls": [
-    {
-      "accessType": "*",
-      "principalType": "ROLE",
-      "principalId": "$unauthenticated",
-      "permission": "DENY"
-    }
+
   ],
   "methods": {}
 }

common/models/talk.js

@@ -255,8 +255,8 @@ module.exports = function (Talk) {
 				const speakerEmail = response.speakerEmail;
 				const meetupTitle = response.meetupTitle;
 				const meetupDate = response.meetupDate;
-				sendEmailToSpeaker(process.env.MAIN_ADMIN_EMAIL, approved, pending, speakerEmail, speakerName, meetupTitle, meetupDate)
-					.then(() => next())
+				sendEmailToSpeaker(process.env.ADMIN_EMAIL, approved, pending, speakerEmail, speakerName, meetupTitle, meetupDate)
+				.then(() => next())
 					.catch(err => next(err));
 			})
 			.catch(err => next(err));
@@ -280,7 +280,7 @@ module.exports = function (Talk) {
 					const speakerEmail = response.speakerEmail;
 					const meetupTitle = response.meetupTitle;
 					const meetupDate = response.meetupDate;
-					sendEmailToSpeaker(process.env.MAIN_ADMIN_EMAIL, approved, pending, speakerEmail, speakerName, meetupTitle, meetupDate)
+					sendEmailToSpeaker(process.env.ADMIN_EMAIL, approved, pending, speakerEmail, speakerName, meetupTitle, meetupDate)
 						.then(() => next())
 						.catch(err => next(err));
 				})
@@ -314,3 +314,6 @@ module.exports = function (Talk) {
 
 	});
 };
+
+
+

server/boot/authentication.js

@@ -1,5 +1,6 @@
 'use strict';
 
 module.exports = function enableAuthentication(server) {
-  server.enableAuth();
+  //server.enableAuth();
+
 };

server/datasources.production.js

@@ -1,7 +1,8 @@
 'use strict';
 module.exports = {
     "sdjs": {
-      "url": process.env.MONGODB_URI,
+      "url": MONGODB_ATLAS_URI,
+      //"url": process.env.MONGODB_URI,
       "connector": "mongodb"
     }
   }

server/utils/formatTalkForEmail.js

@@ -14,7 +14,7 @@ function formatTalkForEmail(speakerId, eventId) {
             .then(speaker => {
                 const speakerName = speaker.speakerName;
                 const speakerEmail = speaker.speakerEmail
-                Event.findById(eventId)
+               return Event.findById(eventId)
                     .then(selectedEvent => {
                         const meetupTitle = selectedEvent.name;
                         const meetupDate = selectedEvent.date;

server/utils/getMeetups.js

@@ -4,20 +4,22 @@ function getMeetups() {
 	return new Promise((resolve, reject) => {
 		let currentDate = new Date();
 		currentDate.setMonth(currentDate.getMonth() + 3);
-		axios.get(`https://api.meetup.com/sandiegojs/events?no_later_than=${currentDate.getFullYear()}-${currentDate.getMonth()}-${currentDate.getDay()}`)
-			.then(response => {
-				resolve(response.data.map(event => ({
-					meetupId: event.id,
-					name: event.name,
-					date: event.local_date,
-					time: event.local_time,
-					venue: event.venue,
-					link: event.link,
-					description: event.description,
-				})));
-			})
-			.catch(err => reject(new Error('getMeetups failed to get SDJS meetups')))
+	const date = `${currentDate.getFullYear()}-${currentDate.getMonth()}-${currentDate.getDay()}`;
+		axios.get(`https://api.meetup.com/sandiegojs/events?no_later_than=${date}`)
+		.then( response => resolve(response.data.map(event => ({
+            meetupId: event.id,
+            name: event.name,
+            date: event.local_date,
+            time: event.local_time,
+            link: event.link,
+            description: event.description,
+        }))))
+        .catch(err => reject(new Error('getMeetups failed to get SDJS meetups')))
 	})
 }
 
 module.exports = { getMeetups };
+
+
+
+

server/utils/sendGridEmailer.js

@@ -9,6 +9,7 @@ sgMail.setApiKey(process.env.SENDGRID_API_KEY);
 
 function sendEmailToSpeaker(adminEmail, approved, pending, speakerEmail, speakerName, meetupTitle, meetupDate) {
     return new Promise((resolve, reject) => {
+        console.log('hello in sendEmailToSpeaker')
         if (speakerEmail == undefined) {
             return reject(new Error('speakerEmail is undefined'));
          }
@@ -38,7 +39,7 @@ function sendEmailToSpeaker(adminEmail, approved, pending, speakerEmail, speaker
             to: speakerEmail,
             from: adminEmail,
             subject: 'SDJS Meetup Speaker Request',
-            templateId: process.env.EMAIL_TEMPLATE,
+            templateId: process.env.ADMIN_SPEAKER_EMAIL_TEMPLATE,
             dynamic_template_data: {
                 emailContent: emailContent,
                 sdjsBtn: false,
@@ -82,7 +83,7 @@ function sendEmailToAdmin(adminEmail, meetupDate, meetupTitle, speakerEmail, spe
             to: adminEmail,
             from: adminEmail,
             subject: 'SDJS Meetup Speaker Request',
-            templateId: process.env.EMAIL_TEMPLATE,
+            templateId: process.env.ADMIN_SPEAKER_EMAIL_TEMPLATE,
             dynamic_template_data: {
                 emailContent: emailContent,
                 sdjsBtn: false,
@@ -126,10 +127,10 @@ function sendConfirmCancelToAdmin(confirm, meetupDate, meetupTitle, speakerName)
         }
 
         const email = {
-            to: process.env.MAIN_ADMIN_EMAIL,
-            from: process.env.MAIN_ADMIN_EMAIL,
+            to: process.env.ADMIN_EMAIL,
+            from: process.env.ADMIN_EMAIL,
             subject: 'SDJS Meetup Speaker Request',
-            templateId: process.env.EMAIL_TEMPLATE,
+            templateId: process.env.ADMIN_SPEAKER_EMAIL_TEMPLATE,
             dynamic_template_data: {
                 emailContent: emailContent,
                 sdjsBtn: false,
@@ -164,9 +165,9 @@ function sendEmailToNewAdmin(username, email) {
                 password go to the Organizers tab and click on the edit button.`;
         const newAdminEmail = {
             to: email,
-            from: process.env.MAIN_ADMIN_EMAIL,
+            from: process.env.ADMIN_EMAIL,
             subject: 'SDJS Meetup Admin Appointment',
-            templateId: process.env.EMAIL_TEMPLATE,
+            templateId: process.env.ADMIN_SPEAKER_EMAIL_TEMPLATE,
             dynamic_template_data: {
                 emailContent: emailContent,
                 sdjsBtn: false,
@@ -244,9 +245,9 @@ function sendEmailToNewAdmin(username, email) {
 //                                     const url = 'http://localhost:3000/#/ConfirmOrCancel/?t=';
 //                                     const reminder = {
 //                                         to: speaker.speakerEmail,
-//                                         from: process.env.MAIN_ADMIN_EMAIL,
+//                                         from: process.env.ADMIN_EMAIL,
 //                                         subject: 'SDJS Meetup Speaker Reminder',
-//                                         templateId: 'd-227d9b43edf14c92964db9bd00fdf002',
+//                                         templateId: process.env.SPEAKER_REMINDER_EMAIL_TEMPLATE,
 //                                         dynamic_template_data: {
 //                                             emailContent: emailContent,
 //                                             sdjsBtn: true,

server/utils/talkSubmit.js

@@ -2,32 +2,30 @@ const app = require('../server');
 const { getMeetups } = require('./getMeetups');
 
 function talkSubmit(speakerInfo, talkInfo, date) {
-	return new Promise((resolve, reject) => {
-		const { Talk, Speaker, Event } = app.models;
-		Speaker.create(speakerInfo)
-			.then(response => {
-				let speakerId = response.id
-				getMeetups()
-					.then(meetups => {
-						const index = meetups.findIndex((item) => item.date == date);
-						let name = meetups[index].name;
-						let details = meetups[index].description;
-						let meetupId = meetups[index].meetupId;
-						if (index === -1 )
-						return reject(new Error('NO meetup with that date found!'));
-						Event.findOrCreate({date, name, details, meetupId})
-							.then(event => {
-								let eventId = event[0].id
-								Talk.create( { ...talkInfo, speakerId, eventId})
-									.then(talk => resolve(talk))
-									.catch(err => console.log(err))
-							})
-							.catch(err => reject(err))
-					})
-					.catch(err => reject(err))
-			})
-			.catch(err => reject(err))
-	})
+    const { Talk, Speaker, Event } = app.models;
+    return getMeetups()
+        .then(meetups => {
+            const index = meetups.findIndex((item) => item.date == date);
+            let name = meetups[index].name;
+            let details = meetups[index].description;
+            let meetupId = meetups[index].meetupId;
+            if (index === -1)
+                return reject(new Error('NO meetup with that date found!'));
+            return Promise.all([
+                Event.findOrCreate({
+                    date, name, details,
+                    meetupId
+                }),
+                Speaker.create(speakerInfo)])
+        })
+        .then(([event, speaker]) => {
+            let eventId = event[0].id
+            let speakerId = speaker.id
+            return Talk.create({
+                ...talkInfo,
+                speakerId, eventId
+            })
+        })
 }
 
 module.exports = { talkSubmit };

src/components/Home/Home.jsx

@@ -46,8 +46,8 @@ class Home extends Component {
 					</p>
 					<h3>Want to do an extended talk?</h3>
 					<p>
-						We do accept extended talks but prefer presentors to have done a
-						lightning talk before. If you're unsure&nbsp;
+						We do accept extended talks, but prefer presenters to have done a
+						lightning talk before. If you're unsure,&nbsp;
 						<a
 							href="mailto:[email protected]?subject=Extended%20talk%20request"
 							className='inline-link'>

src/components/SignUp/SignUpActions.js

@@ -1,6 +1,7 @@
 import axios from 'axios';
 
 export const talkSubmit = (speakerInfo, talkInfo, date) => ({
+
 	type: 'TALK_SUBMIT',
 	payload: axios.post('api/talks/talkSubmit', {speakerInfo: speakerInfo, talkInfo: talkInfo, date: date})
 })