diff --git a/events/models.py b/events/models.py index fc60e8ef5..ced7fa456 100644 --- a/events/models.py +++ b/events/models.py @@ -246,6 +246,8 @@ async def wp_events_api_create_event(self, event_json, api, host, categorize, lo else: if await self.filter(title=event.title, start_time=datetime.fromisoformat(event_json['start']).astimezone(timezone.get_current_timezone())).exclude(id=event.id).aexists(): event.hidden = True + elif 'chancentre.com' in event_json['link']: + event.host = 'Chan Centre for the Performing Arts' elif not '.ubc.ca' in event_json['link']: event.host = host diff --git a/ubyssey/static_src/src/js/components/Events/calendar.jsx b/ubyssey/static_src/src/js/components/Events/calendar.jsx index fe50ab518..f68850c5e 100644 --- a/ubyssey/static_src/src/js/components/Events/calendar.jsx +++ b/ubyssey/static_src/src/js/components/Events/calendar.jsx @@ -302,12 +302,12 @@ function EventsCalendar({events}) { var cur = new Date(event.start_time); cur.setHours(0,0,0,0); event.displayTime = displayTime(event.start_time); - if (event.end_time.getTime() - event.start_time.getTime() >= d-h) { + if (event.end_time.getTime() - event.start_time.getTime() >= d-h || event.end_time.getTime() == event.start_time.getTime()) { event.displayTime = ""; } - while(cur < new Date(event.end_time)) { + while(cur <= new Date(event.end_time)) { const delta = Math.floor((cur.getTime() - start.getTime()) / d); - if (delta > 0 && delta < (7*4)) { + if (delta >= 0 && delta < (7*4)) { calendar[Math.floor(delta/7)]['days'][delta % 7]['events'].push(event); } cur = new Date(cur.getTime() + d); diff --git a/ubyssey/static_src/src/styles/components/events/_base.scss b/ubyssey/static_src/src/styles/components/events/_base.scss index eca604168..4e321703b 100644 --- a/ubyssey/static_src/src/styles/components/events/_base.scss +++ b/ubyssey/static_src/src/styles/components/events/_base.scss @@ -447,6 +447,9 @@ header.events{ } div.day { padding: 1.5em; + ul { + filter: drop-shadow(0 1px 3px black); + } li { margin-right: 2em; b {