Skip to content

Commit

Permalink
Fixed events page
Browse files Browse the repository at this point in the history
  • Loading branch information
TeddyGandon committed Dec 30, 2020
1 parent 5080468 commit 5ef5e25
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 0 deletions.
2 changes: 2 additions & 0 deletions api/controllers/EventsController.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ module.exports = {
...eventsFromCalendar.map(
(event) => {
event.type = `online:${event.type}`;
event.title = event[`title_${req.session.locale}`];
event.text = event[`text_${req.session.locale}`];
return event;
}
),
Expand Down
27 changes: 27 additions & 0 deletions views/elements/event-online-triple-shards.ejs
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<div class="card <%= event.datetimeFrom < Date.now() && event.datetimeTo > Date.now() ? 'active' : 'inactive' %>">
<div class="card-image">
<figure class="image is-3by1">
<img src="/images/event-target-header.png" />
</figure>
</div>
<div class="card-content">
<div class="media">
<div class="media-content">
<p class="title is-4"><%= event.title %></p>
<p class="subtitle is-7">
<i class="fas fa-wifi"></i> <%= __('events.online') %>
</p>
</div>
</div>
<div class="content">
<%- event.text %>
</div>
<div class="card-footer">
<p class="card-footer-item">
<date timestamp="<%= new Date(event.datetimeFrom).getTime() %>"></date>
&nbsp;-&nbsp;
<date timestamp="<%= new Date(event.datetimeTo).getTime() %>"></date>
</p>
</div>
</div>
</div>
1 change: 1 addition & 0 deletions views/pages/events.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
'online:tournament': 'event-online-tournament.ejs',
'online:tricks-celebration': 'event-online-tricks-celebration.ejs',
'online:scheduled-loot': 'event-online-scheduled-loot.ejs',
'online:triple-shards': 'event-online-triple-shards.ejs',
'offline:festival': 'event-offline-festival.ejs',
}[events[j].type],
{
Expand Down

0 comments on commit 5ef5e25

Please sign in to comment.