From eddfe0389047ac1df5a8194d36c3bde1fcc05866 Mon Sep 17 00:00:00 2001 From: Raphael Kabo Date: Mon, 30 Sep 2019 13:29:32 +0100 Subject: Event group functionality --- views/partials/neweventgroupform.handlebars | 66 +++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100755 views/partials/neweventgroupform.handlebars (limited to 'views/partials/neweventgroupform.handlebars') diff --git a/views/partials/neweventgroupform.handlebars b/views/partials/neweventgroupform.handlebars new file mode 100755 index 0000000..b7524d4 --- /dev/null +++ b/views/partials/neweventgroupform.handlebars @@ -0,0 +1,66 @@ +

Create an event group

+

An event group is a holding area for a set of linked events, like a series of film nights, a festival, or a band tour. You can share a public link to your event group just like an individual event link, and people who know the secret editing code (sent in an email when you create the event group) will be able to add future events to the group.

+

Event groups do not get automatically removed like events do, but events which have been removed from Gathio will of course not show up in an event group.

+
+
+ +
+ +
+
+
+ +
+ + Markdown formatting supported. +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+ Recommended dimensions (w x h): 920px by 300px. +
+
+
+ +
+ +
+
+
+ +
+ + We will send your secret editing link to this email address. +
+
+
+
+ +
+
+
+ + -- cgit v1.2.3 From 40ade71e0019bbb59710a2e2e5d74197c47cb1b0 Mon Sep 17 00:00:00 2001 From: Raphael Kabo Date: Mon, 30 Sep 2019 13:57:28 +0100 Subject: Fixes to iCal parser --- public/js/generate-timezones.js | 3 ++- routes.js | 17 +++++++++++++---- views/partials/editeventgroupmodal.handlebars | 4 ++-- views/partials/editeventmodal.handlebars | 6 +++--- views/partials/importeventform.handlebars | 11 ++++++++++- views/partials/neweventform.handlebars | 4 ++-- views/partials/neweventgroupform.handlebars | 2 +- 7 files changed, 33 insertions(+), 14 deletions(-) (limited to 'views/partials/neweventgroupform.handlebars') diff --git a/public/js/generate-timezones.js b/public/js/generate-timezones.js index 2c7cbf9..01c9989 100644 --- a/public/js/generate-timezones.js +++ b/public/js/generate-timezones.js @@ -343,7 +343,8 @@ const timezones = [ "Pacific/Tarawa", "Pacific/Tongatapu", "Pacific/Wake", - "Pacific/Wallis" + "Pacific/Wallis", + "Etc/UTC" ]; const dateTimeUtc = moment().utc(); diff --git a/routes.js b/routes.js index 80014e5..ee723e2 100755 --- a/routes.js +++ b/routes.js @@ -505,9 +505,18 @@ router.post('/importevent', (req, res) => { if (req.files && Object.keys(req.files).length != 0) { importediCalObject = ical.parseICS(req.files.icsImportControl.data.toString('utf8')); for (var key in importediCalObject) { - importedEventData = importediCalObject[key]; + importedEventData = importediCalObject[key]; } - creatorEmail = importedEventData.organizer.val.replace("MAILTO:", "") + console.log(importedEventData) + let creatorEmail; + if (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({ id: eventID, type: 'public', @@ -515,12 +524,12 @@ router.post('/importevent', (req, res) => { location: importedEventData.location, start: importedEventData.start, end: importedEventData.end, - timezone: importedEventData.start.tz, + timezone: typeof importedEventData.start.tz != 'undefined' ? importedEventData.start.tz : "Etc/UTC", description: importedEventData.description, image: '', creatorEmail: creatorEmail, url: '', - hostName: importedEventData.organizer.params.CN, + hostName: importedEventData.organizer ? importedEventData.organizer.params.CN : "", viewPassword: '', editPassword: '', editToken: editToken, diff --git a/views/partials/editeventgroupmodal.handlebars b/views/partials/editeventgroupmodal.handlebars index 7ab1221..64fba9b 100644 --- a/views/partials/editeventgroupmodal.handlebars +++ b/views/partials/editeventgroupmodal.handlebars @@ -11,7 +11,7 @@
- +
@@ -24,7 +24,7 @@
- +
diff --git a/views/partials/editeventmodal.handlebars b/views/partials/editeventmodal.handlebars index 553d961..ce3cdcd 100644 --- a/views/partials/editeventmodal.handlebars +++ b/views/partials/editeventmodal.handlebars @@ -14,13 +14,13 @@ + data-validation-length="3-120">
+ data-validation-length="3-120">
@@ -53,7 +53,7 @@ + data-validation="length" data-validation-length="3-120" data-validation-optional="true">
diff --git a/views/partials/importeventform.handlebars b/views/partials/importeventform.handlebars index 7bf5b17..9ad038a 100644 --- a/views/partials/importeventform.handlebars +++ b/views/partials/importeventform.handlebars @@ -6,11 +6,20 @@ Image showing the location of the export option on Facebook
-
+
+
+
+
+ +
+ + We will send your secret editing link to this email address. +
+
diff --git a/views/partials/neweventform.handlebars b/views/partials/neweventform.handlebars index fff2f4d..82ecfd9 100755 --- a/views/partials/neweventform.handlebars +++ b/views/partials/neweventform.handlebars @@ -4,13 +4,13 @@
- +
- +
diff --git a/views/partials/neweventgroupform.handlebars b/views/partials/neweventgroupform.handlebars index b7524d4..20dd832 100755 --- a/views/partials/neweventgroupform.handlebars +++ b/views/partials/neweventgroupform.handlebars @@ -5,7 +5,7 @@
- +
-- cgit v1.2.3