From 4ef3273f8bca7ad84140730cea9e7842ee5a0a79 Mon Sep 17 00:00:00 2001 From: Raphael Kabo Date: Mon, 17 Jan 2022 11:19:22 +0000 Subject: Make emails optional when creating events/groups --- routes.js | 10 ++++------ views/event.handlebars | 12 +++++------- views/newevent.handlebars | 6 +++--- views/partials/neweventform.handlebars | 4 ++-- views/partials/neweventgroupform.handlebars | 4 ++-- 5 files changed, 16 insertions(+), 20 deletions(-) diff --git a/routes.js b/routes.js index 115e8cd..9ec2b2a 100755 --- a/routes.js +++ b/routes.js @@ -691,7 +691,7 @@ router.post('/newevent', async (req, res) => { .then((event) => { addToLog("createEvent", "success", "Event " + eventID + "created"); // Send email with edit link - if (sendEmails) { + if (req.body.creatorEmail && sendEmails) { req.app.get('hbsInstance').renderView('./views/emails/createevent.handlebars', { eventID, editToken, siteName, siteLogo, domain, cache: true, layout: 'email.handlebars' }, function (err, html) { const msg = { to: req.body.creatorEmail, @@ -736,11 +736,9 @@ router.post('/importevent', (req, res) => { let creatorEmail; if (req.body.creatorEmail) { - creatorEmail = req.body.creatorEmail + creatorEmail = req.body.creatorEmail; } else if (importedEventData.organizer) { creatorEmail = importedEventData.organizer.val.replace("MAILTO:", ""); - } else { - res.status(500).send("Please supply an email address on the previous page."); } const event = new Event({ @@ -768,7 +766,7 @@ router.post('/importevent', (req, res) => { .then(() => { addToLog("createEvent", "success", "Event " + eventID + " created"); // Send email with edit link - if (sendEmails) { + if (creatorEmail && sendEmails) { req.app.get('hbsInstance').renderView('./views/emails/createevent.handlebars', { eventID, editToken, siteName, siteLogo, domain, cache: true, layout: 'email.handlebars' }, function (err, html) { const msg = { to: req.body.creatorEmail, @@ -839,7 +837,7 @@ router.post('/neweventgroup', (req, res) => { .then(() => { addToLog("createEventGroup", "success", "Event group " + eventGroupID + " created"); // Send email with edit link - if (sendEmails) { + if (req.body.creatorEmail && sendEmails) { req.app.get('hbsInstance').renderView('./views/emails/createeventgroup.handlebars', { eventGroupID, editToken, siteName, siteLogo, domain, cache: true, layout: 'email.handlebars' }, function (err, html) { const msg = { to: req.body.creatorEmail, diff --git a/views/event.handlebars b/views/event.handlebars index 5c7bce5..6f13c38 100755 --- a/views/event.handlebars +++ b/views/event.handlebars @@ -114,7 +114,9 @@ - Welcome to your event! We've just sent you an email with your secret editing link, which you can also see in the address bar above. Haven't got the email? Check your spam or junk folder. To share your event, use the link you can see just above this message - that way your attendees won't be able to edit or delete your event! +

Welcome to your event!

+

Your secret editing password for this event is: {{eventData.editToken}}. It's been saved in your browser storage, and if you supplied your email, it's also been sent to you. If you didn't supply your email, you must save it somewhere safe, because it won't be shown again!

+

To share your event, use the link you can see just above this message - that way your attendees won't be able to edit or delete your event!

{{/if}}
@@ -507,12 +509,8 @@ $("#image-preview").css("background-image", "url('/events/{{eventData.image}}')"); $("#image-preview").css("background-size", "cover"); $("#image-preview").css("background-position", "center center"); - {{#if editingEnabled}} - {{#unless eventHasConcluded}} - $('#eventStart').datepicker().data('datepicker').selectDate(moment('{{parsedStart}}', 'YYYYMMDD[T]HHmmss').toDate()); - $('#eventEnd').datepicker().data('datepicker').selectDate(moment('{{parsedEnd}}', 'YYYYMMDD[T]HHmmss').toDate()); - {{/unless}} - {{/if}} + $('#eventStart').datepicker().data('datepicker').selectDate(moment('{{parsedStart}}', 'YYYYMMDD[T]HHmmss').toDate()); + $('#eventEnd').datepicker().data('datepicker').selectDate(moment('{{parsedEnd}}', 'YYYYMMDD[T]HHmmss').toDate()); new ClipboardJS('#copyEventLink'); autosize($('textarea')); $("#exportICS").click(function(){ diff --git a/views/newevent.handlebars b/views/newevent.handlebars index 9d10f2d..5e7752f 100755 --- a/views/newevent.handlebars +++ b/views/newevent.handlebars @@ -12,13 +12,13 @@
- +
- +
- +
diff --git a/views/partials/neweventform.handlebars b/views/partials/neweventform.handlebars index 829ec42..ea13298 100755 --- a/views/partials/neweventform.handlebars +++ b/views/partials/neweventform.handlebars @@ -74,8 +74,8 @@
- - We will send your secret editing link to this email address. + + If you provide your email, we will send your secret editing password here, and use it to notify you of updates to the event.
diff --git a/views/partials/neweventgroupform.handlebars b/views/partials/neweventgroupform.handlebars index 8201c60..616b8ca 100755 --- a/views/partials/neweventgroupform.handlebars +++ b/views/partials/neweventgroupform.handlebars @@ -40,8 +40,8 @@
- - We will send your secret editing link to this email address. + + If you provide your email, we will send your secret editing password here, and use it to notify you of updates to the event.
-- cgit v1.2.3