Skip to content

Commit b088810

Browse files
dangerwormdangerworm
committed
Add dropins, huddles, and workshops to events page in separate sections.
1 parent 03b2643 commit b088810

File tree

8 files changed

+69
-315
lines changed

8 files changed

+69
-315
lines changed

‎_includes/scripts.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
"Content-Type": "application/json"
3030
}
3131
}).done(function(data) {
32-
console.log(data.body);
33-
34-
$("#events-scheduled").html(data.content);
32+
$("#events-drop-ins").html(data.dropins);
33+
$("#events-huddles").html(data.huddles);
34+
$("#events-workshops").html(data.workshops);
3535
$("#eventBriteWidgets").append(data.widgets);
3636
$.globalEval(data.widgets);
3737
});

‎aws_lambda/eventBriteHelper.py‎

Lines changed: 42 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@ def getEventsAsHtml(event, lambda_context):
6060
ticketClasses = []
6161

6262
content = ""
63+
dropins = ""
64+
huddles = ""
65+
workshops = ""
66+
6367
widgets = widgetPrefix
6468

6569
eventData = getOrganisationEvents(organisationId)
@@ -103,28 +107,43 @@ def getEventsAsHtml(event, lambda_context):
103107
eventEnd -= 12
104108
eventEndAmPm = "pm"
105109

106-
if event['status'] == "live":
107-
content = content + eventTemplate \
108-
.replace("`eventClass`", eventClass) \
109-
.replace("`registerButtonClass`", registerButtonClass) \
110-
.replace("`registerButtonText`", registerButtonText) \
111-
.replace("`eventClass`", eventClass) \
112-
.replace("`month`", month) \
113-
.replace("`day`", str(day)) \
114-
.replace("`eventStart`", str(eventStart)) \
115-
.replace("`eventStartAmPm`", eventStartAmPm) \
116-
.replace("`eventEnd`", str(eventEnd)) \
117-
.replace("`eventEndAmPm`", eventEndAmPm) \
118-
.replace("`eventName`", eventName) \
119-
.replace("`eventDescription`", eventDescription) \
120-
.replace("`eventId`", eventId) \
121-
.replace("`eventbriteWidgetModalTriggerEventId`", "eventbrite-widget-modal-trigger-" + eventId)
122-
123-
widgets = widgets + "\r\n" + widgetTemplate \
124-
.replace("`eventName`", eventName) \
125-
.replace("`eventId`", eventId) \
126-
.replace("`eventbriteWidgetModalTriggerEventId`", "eventbrite-widget-modal-trigger-" + eventId)
127-
128-
return {'statusCode': 200, 'content': content, 'widgets': widgets}
110+
eventHtml = eventTemplate \
111+
.replace("`eventClass`", eventClass) \
112+
.replace("`registerButtonClass`", registerButtonClass) \
113+
.replace("`registerButtonText`", registerButtonText) \
114+
.replace("`eventClass`", eventClass) \
115+
.replace("`month`", month) \
116+
.replace("`day`", str(day)) \
117+
.replace("`eventStart`", str(eventStart)) \
118+
.replace("`eventStartAmPm`", eventStartAmPm) \
119+
.replace("`eventEnd`", str(eventEnd)) \
120+
.replace("`eventEndAmPm`", eventEndAmPm) \
121+
.replace("`eventName`", eventName) \
122+
.replace("`eventDescription`", eventDescription) \
123+
.replace("`eventId`", eventId) \
124+
.replace("`eventbriteWidgetModalTriggerEventId`", "eventbrite-widget-modal-trigger-" + eventId)
125+
126+
widgets += "\r\n" + widgetTemplate \
127+
.replace("`eventName`", eventName) \
128+
.replace("`eventId`", eventId) \
129+
.replace("`eventbriteWidgetModalTriggerEventId`", "eventbrite-widget-modal-trigger-" + eventId)
130+
131+
content += eventHtml
132+
133+
if 'drop' in eventName.lower() and 'in' in eventName.lower():
134+
dropins += eventHtml
135+
elif 'huddle' in eventName.lower():
136+
huddles += eventHtml
137+
else:
138+
scheduled += eventHtml
139+
140+
if dropins == "":
141+
dropins = "<p>We don't have any drop-ins scheduled at the moment. Ask on Slack if you'd like us to arrange one.</p>"
142+
143+
if huddles == "":
144+
huddles = "<p>We don't have any huddles scheduled at the moment. Ask on Slack if you'd like us to arrange one.</p>"
129145

146+
if workshops == "":
147+
workshops = "<p>We don't have any workshops planned at the moment. Ask on Slack if you'd like us to arrange one.</p>"
130148

149+
return {'statusCode': 200, 'content': content, 'dropins': dropins, 'workshops': workshops, 'widgets': widgets}

‎events.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ <h1>{{page.title}}</h1>
2626
<br />
2727
{% include_relative pages-events/events-huddles.html %}
2828
<br />
29-
{% include_relative pages-events/events-eventbrite-list.html %}
29+
{% include_relative pages-events/events-workshops.html %}

‎pages-events/events-drop-ins.html‎

Lines changed: 2 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -13,64 +13,6 @@ <h2>Drop-in sessions</h2>
1313
You can also click the 'Jitsi Link' buttons below.
1414
</p>
1515

16-
<h3>National Coding Week</h3>
1716
<section id="events-drop-ins">
18-
<div class="row card">
19-
<div class="col-12">
20-
<div class="row">
21-
<div class="col-sm-4 col-lg-2 event-date">
22-
<span class="event-date-month">SEP</span>
23-
<span class="event-date-day">16</span>
24-
<p>
25-
<span class="event-date-start-time">7pm - </span>
26-
27-
<span class="event-date-end-time">9pm</span>
28-
</p>
29-
</div>
30-
<div class="col-sm-8 col-lg-10 event-title">
31-
<span class="event-title">National Coding Week Drop-In</span>
32-
</div>
33-
</div>
34-
<div class="row">
35-
<div class="col-md-12 col-lg-9 event-description">
36-
<span class="event-description">
37-
An ad-hoc event for anyone who would like help with coding or coding-related stuff. This can be
38-
something related to one of our workshops, a question about how to get started, or anything else! </span>
39-
</div>
40-
<div class="col-md-12 col-lg-3 event-book-button">
41-
<a class="btn btn-primary float-right" type="button" href="https://join.codewith.org.uk">Jitsi Link
42-
<span class="fas fa-link"></span></a>
43-
</div>
44-
</div>
45-
</div>
46-
</div>
47-
<div class="row card">
48-
<div class="col-12">
49-
<div class="row">
50-
<div class="col-sm-4 col-lg-2 event-date">
51-
<span class="event-date-month">SEP</span>
52-
<span class="event-date-day">18</span>
53-
<p>
54-
<span class="event-date-start-time">7pm - </span>
55-
56-
<span class="event-date-end-time">9pm</span>
57-
</p>
58-
</div>
59-
<div class="col-sm-8 col-lg-10 event-title">
60-
<span class="event-title">National Coding Week Drop-In</span>
61-
</div>
62-
</div>
63-
<div class="row">
64-
<div class="col-md-12 col-lg-9 event-description">
65-
<span class="event-description">
66-
An ad-hoc event for anyone who would like help with coding or coding-related stuff. This can be
67-
something related to one of our workshops, a question about how to get started, or anything else! </span>
68-
</div>
69-
<div class="col-md-12 col-lg-3 event-book-button">
70-
<a class="btn btn-primary float-right" type="button" href="https://join.codewith.org.uk">Jitsi Link
71-
<span class="fas fa-link"></span></a>
72-
</div>
73-
</div>
74-
</div>
75-
</div>
76-
</section>
17+
<p><i class="fas fa-spinner fa-w-16 fa-spin fa-lg"></i> Loading...</p>
18+
</section>

‎pages-events/events-eventbrite-list.html‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎pages-events/events-eventbrite-list.html.backup‎

Lines changed: 0 additions & 221 deletions
This file was deleted.

0 commit comments

Comments
 (0)