From 60d99e4d35568b3fb76eb26f0284236b4cd602c3 Mon Sep 17 00:00:00 2001 From: lowercasename Date: Thu, 2 Jan 2020 20:24:55 +1100 Subject: Export as ICS functionality --- views/event.handlebars | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'views/event.handlebars') diff --git a/views/event.handlebars b/views/event.handlebars index 4d0cf28..70c4018 100755 --- a/views/event.handlebars +++ b/views/event.handlebars @@ -45,6 +45,9 @@ Add to Google Calendar + {{#if eventHasHost}}
  • @@ -375,6 +378,29 @@ }) $(document).ready(function() { + // From https://davidwalsh.name/javascript-download + function downloadFile(data, fileName, type="text/plain") { + // Create an invisible A element + const a = document.createElement("a"); + a.style.display = "none"; + document.body.appendChild(a); + + // Set the HREF to a Blob representation of the data to be downloaded + a.href = window.URL.createObjectURL( + new Blob([data], { type }) + ); + + // Use download attribute to set set desired file name + a.setAttribute("download", fileName); + + // Trigger the download by simulating click + a.click(); + + // Cleanup + window.URL.revokeObjectURL(a.href); + document.body.removeChild(a); + } + $.uploadPreview({ input_field: "#image-upload", preview_box: "#image-preview", @@ -394,6 +420,12 @@ {{/if}} new ClipboardJS('#copyEventLink'); autosize($('textarea')); + $("#exportICS").click(function(){ + let eventID = $(this).attr('data-event-id'); + $.get('/exportevent/' + eventID, function(response) { + downloadFile(response, eventID + '.ics'); + }) + }) $("#copyEventLink").click(function(){ $(this).html(' Copied!'); setTimeout(function(){ $("#copyEventLink").html(' Copy');}, 5000); -- cgit v1.2.3 From 80ab983d93ac079ac7fc5a7af631d08605a84377 Mon Sep 17 00:00:00 2001 From: lowercasename Date: Thu, 2 Jan 2020 21:53:23 +1100 Subject: Some style tweaks --- public/css/style.css | 16 ++++-- views/event.handlebars | 143 ++++++++++++++++++++++++++----------------------- 2 files changed, 87 insertions(+), 72 deletions(-) (limited to 'views/event.handlebars') diff --git a/public/css/style.css b/public/css/style.css index 4085875..e55f07a 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -115,6 +115,11 @@ body, html { text-transform:capitalize; } +#eventActions { + padding-left: 0; + margin-top: 1rem; +} + /* .location, .eventLink { display: flex; @@ -162,10 +167,6 @@ body, html { margin-left: 5px; } -.eventInformationAction:not(#copyEventLink) { - margin-top: 0.25rem; -} - .commentContainer { background: #fafafa; border-radius: 5px; @@ -308,6 +309,13 @@ body, html { } } +@media (min-width: 1120px) { + #eventActions { + margin-top: 0; + padding-left: 1rem; + } +} + @media (min-width: 577px) { #sidebar { border-right: 2px solid #e0e0e0; diff --git a/views/event.handlebars b/views/event.handlebars index 70c4018..7a57783 100755 --- a/views/event.handlebars +++ b/views/event.handlebars @@ -8,85 +8,92 @@

    {{eventData.name}}

    {{#if editingEnabled}} -
    +
    - - + +
    {{/if}}
    -
    -
    - + + Show on Google Maps + + + Show on OpenStreetMap + + +
    + {{#if eventHasConcluded}}
    -
    +
    • @@ -154,21 +154,26 @@
    -
    -
    - -
    - -
    +
    +
    + +
    +
    -
    - -
    - - We'll only use it to send you updates to the event. -
    +
    +
    + +

    If you provide your email, you will receive updates to the event.

    +
    +
    -
    +
    +
    + +

    You will need this password if you want to remove yourself from the list of event attendees. Write it down now because it will not be shown again.

    + +
    +
    @@ -189,12 +194,10 @@
    -
    - -
    - - Enter the email you used when signing up for this event. -
    +
    + +

    Lost your password? Get in touch with the event organiser.

    +
    @@ -337,6 +340,7 @@ {{#unless eventHasConcluded}} + {{/unless}} -- cgit v1.2.3 From 752382ee9f37ce5e3765f9931692020116ad81ff Mon Sep 17 00:00:00 2001 From: lowercasename Date: Sat, 4 Jan 2020 20:46:33 +1100 Subject: Event image deletion functionality --- routes.js | 37 +++++++++++++++++++++++++++++++- views/event.handlebars | 1 - views/partials/editeventmodal.handlebars | 17 ++++++++++++++- 3 files changed, 52 insertions(+), 3 deletions(-) (limited to 'views/event.handlebars') diff --git a/routes.js b/routes.js index 30a96f5..b1c9125 100755 --- a/routes.js +++ b/routes.js @@ -855,11 +855,46 @@ router.post('/editeventgroup/:eventGroupID/:editToken', (req, res) => { .catch((err) => { console.error(err); res.send('Sorry! Something went wrong!'); addToLog("editEventGroup", "error", "Attempt to edit event group " + req.params.eventGroupID + " failed with error: " + err);}); }); +router.post('/deleteimage/:eventID/:editToken', (req, res) => { + let submittedEditToken = req.params.editToken; + Event.findOne(({ + id: req.params.eventID, + })) + .then((event) => { + if (event.editToken === submittedEditToken) { + // Token matches + if (event.image){ + eventImage = event.image; + } else { + res.status(500).send('This event doesn\'t have a linked image. What are you even doing'); + } + fs.unlink(global.appRoot + '/public/events/' + eventImage, (err) => { + if (err) { + res.status(500).send(err); + addToLog("deleteEventImage", "error", "Attempt to delete event image for event " + req.params.eventID + " failed with error: " + err); + } + // Image removed + addToLog("deleteEventImage", "success", "Image for event " + req.params.eventID + " deleted"); + event.image = ""; + event.save() + .then(response => { + res.status(200).send('Success'); + }) + .catch(err => { + res.status(500).send(err); + addToLog("deleteEventImage", "error", "Attempt to delete event image for event " + req.params.eventID + " failed with error: " + err); + }) + }); + } + }); +}); + router.post('/deleteevent/:eventID/:editToken', (req, res) => { let submittedEditToken = req.params.editToken; + let eventImage; Event.findOne(({ id: req.params.eventID, - })) + })) .then((event) => { if (event.editToken === submittedEditToken) { // Token matches diff --git a/views/event.handlebars b/views/event.handlebars index aaa006e..842239f 100755 --- a/views/event.handlebars +++ b/views/event.handlebars @@ -376,7 +376,6 @@ dateTimeSeparator: ', ' }); $("#timezone").val('{{eventData.timezone}}').trigger('change'); - console.log('{{eventData.timezone}}') {{/unless}} {{/if}} $(".commentTimestamp").html(function(){ diff --git a/views/partials/editeventmodal.handlebars b/views/partials/editeventmodal.handlebars index ce3cdcd..2227473 100644 --- a/views/partials/editeventmodal.handlebars +++ b/views/partials/editeventmodal.handlebars @@ -62,6 +62,9 @@
    Recommended dimensions (w x h): 920px by 300px. + {{#if eventData.image}} + + {{/if}}
    Options
    @@ -138,4 +141,16 @@
    -
    \ No newline at end of file +
    + + \ No newline at end of file -- cgit v1.2.3