Refactor reward campaign list
All checks were successful
Deploy to Server / deploy (push) Successful in 26s
All checks were successful
Deploy to Server / deploy (push) Successful in 26s
This commit is contained in:
parent
b9d2852af7
commit
58d0ddeb43
Signed by:
Joakim Hellsén
Joakim Hellsén
SSH key fingerprint:
SHA256:/9h/CsExpFp+PRhsfA0xznFx2CGfTT5R/kpuFfUgEQk
3 changed files with 94 additions and 116 deletions
65
templates/twitch/includes/reward_campaign_card.html
Normal file
65
templates/twitch/includes/reward_campaign_card.html
Normal file
|
|
@ -0,0 +1,65 @@
|
|||
{% load image_tags %}
|
||||
<article id="reward-campaign-{{ campaign.twitch_id }}"
|
||||
style="display: flex;
|
||||
gap: 1rem;
|
||||
margin-bottom: 1rem;
|
||||
align-items: flex-start">
|
||||
<a href="{% url 'twitch:reward_campaign_detail' campaign.twitch_id %}"
|
||||
style="flex-shrink: 0;
|
||||
display: block;
|
||||
line-height: 0">{% picture campaign.image_best_url alt="Image for "|add:campaign.name width=120 %}</a>
|
||||
<div>
|
||||
<h3 style="margin: 0;">
|
||||
<a href="{% url 'twitch:reward_campaign_detail' campaign.twitch_id %}">
|
||||
{% if campaign.brand %}
|
||||
{{ campaign.brand }}: {{ campaign.name }}
|
||||
{% else %}
|
||||
{{ campaign.name }}
|
||||
{% endif %}
|
||||
</a>
|
||||
</h3>
|
||||
{% if campaign.starts_at <= now and campaign.ends_at >= now %}
|
||||
<p style="margin: 0.25rem 0;">
|
||||
<strong>Ends:</strong>
|
||||
<time datetime="{{ campaign.ends_at|date:'c' }}"
|
||||
title="{{ campaign.ends_at|date:'DATETIME_FORMAT' }}">
|
||||
{{ campaign.ends_at|date:"M d, Y H:i" }} ({{ campaign.ends_at|timeuntil }} left)
|
||||
</time>
|
||||
</p>
|
||||
{% elif campaign.starts_at > now %}
|
||||
<p style="margin: 0.25rem 0;">
|
||||
<strong>Starts:</strong>
|
||||
<time datetime="{{ campaign.starts_at|date:'c' }}"
|
||||
title="{{ campaign.starts_at|date:'DATETIME_FORMAT' }}">
|
||||
{{ campaign.starts_at|date:"M d, Y H:i" }} (in {{ campaign.starts_at|timeuntil }})
|
||||
</time>
|
||||
</p>
|
||||
{% else %}
|
||||
<p style="margin: 0.25rem 0;">
|
||||
<strong>Ended:</strong>
|
||||
<time datetime="{{ campaign.ends_at|date:'c' }}"
|
||||
title="{{ campaign.ends_at|date:'DATETIME_FORMAT' }}">
|
||||
{{ campaign.ends_at|date:"M d, Y H:i" }} ({{ campaign.ends_at|timesince }} ago)
|
||||
</time>
|
||||
</p>
|
||||
{% endif %}
|
||||
{% if campaign.game %}
|
||||
<p style="margin: 0.25rem 0;">
|
||||
<strong>Game:</strong>
|
||||
<a href="{% url 'twitch:game_detail' campaign.game.twitch_id %}">{{ campaign.game.display_name }}</a>
|
||||
</p>
|
||||
{% elif campaign.is_sitewide %}
|
||||
<p style="margin: 0.25rem 0;">
|
||||
<strong>Type:</strong> Site-wide reward campaign
|
||||
</p>
|
||||
{% else %}
|
||||
<p style="margin: 0.25rem 0;">
|
||||
<strong>Type:</strong>
|
||||
<a href="{% url 'twitch:game_less_rewards' %}">No game assigned</a>
|
||||
</p>
|
||||
{% endif %}
|
||||
{% if campaign.summary %}
|
||||
<p style="margin: 0.5rem 0 0 0;">{{ campaign.summary }}</p>
|
||||
{% endif %}
|
||||
</div>
|
||||
</article>
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
{% extends "base.html" %}
|
||||
{% load static %}
|
||||
{% load image_tags %}
|
||||
{% block title %}
|
||||
Reward Campaigns
|
||||
{% endblock title %}
|
||||
|
|
@ -18,17 +18,15 @@
|
|||
href="{% url 'core:reward_campaign_feed_discord' %}" />
|
||||
{% endblock extra_head %}
|
||||
{% block content %}
|
||||
<h1>List of Twitch Reward Campaigns</h1>
|
||||
<!-- Add breadcrumbs -->
|
||||
<h1>Twitch Reward Campaigns</h1>
|
||||
<div>
|
||||
<a href="{% url 'twitch:dashboard' %}">Twitch</a> > Reward Campaigns
|
||||
<a href="{% url 'twitch:dashboard' %}">Twitch</a> > Reward Campaigns
|
||||
</div>
|
||||
<p>
|
||||
Data is scraped from <a href="https://github.com/SunkwiBOT/twitch-drops-api"
|
||||
target="_blank"
|
||||
rel="noopener">SunkwiBOT/twitch-drops-api</a> every 15 minutes.
|
||||
</p>
|
||||
<!-- RSS Feeds -->
|
||||
<div>
|
||||
<div>
|
||||
<a href="{% url 'core:docs_rss' %}" title="RSS feed documentation">[explain]</a>
|
||||
|
|
@ -45,116 +43,29 @@
|
|||
</div>
|
||||
</div>
|
||||
{% if reward_campaigns %}
|
||||
{% with active_campaigns=reward_campaigns|dictsortreversed:"ends_at" %}
|
||||
<h5>Active Reward Campaigns</h5>
|
||||
<table>
|
||||
<tbody>
|
||||
{% for campaign in active_campaigns %}
|
||||
{% with sorted_campaigns=reward_campaigns|dictsortreversed:"ends_at" %}
|
||||
{# Active campaigns #}
|
||||
<h2>Active Reward Campaigns</h2>
|
||||
{% for campaign in sorted_campaigns %}
|
||||
{% if campaign.starts_at <= now and campaign.ends_at >= now %}
|
||||
<tr>
|
||||
<td>
|
||||
<a href="{% url 'twitch:reward_campaign_detail' campaign.twitch_id %}">
|
||||
{% if campaign.brand %}
|
||||
{{ campaign.brand }}: {{ campaign.name }}
|
||||
{% else %}
|
||||
{{ campaign.name }}
|
||||
{% endif %}
|
||||
</a>
|
||||
{% if campaign.summary %}
|
||||
<br />
|
||||
<small>{{ campaign.summary }}</small>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
{% if campaign.game %}
|
||||
<a href="{% url 'twitch:game_detail' campaign.game.twitch_id %}">{{ campaign.game.display_name }}</a>
|
||||
{% elif campaign.is_sitewide %}
|
||||
<a href="{% url 'twitch:sitewide_rewards' %}">Site-wide</a>
|
||||
{% else %}
|
||||
<a href="{% url 'twitch:game_less_rewards' %}">[no game]</a>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
<span title="{{ campaign.ends_at|date:'M d, Y H:i' }}">Ends in {{ campaign.ends_at|timeuntil }}</span>
|
||||
</td>
|
||||
</tr>
|
||||
{% include "twitch/includes/reward_campaign_card.html" with campaign=campaign %}
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
<h5>Upcoming Reward Campaigns</h5>
|
||||
<table>
|
||||
<tbody>
|
||||
{% for campaign in active_campaigns %}
|
||||
{# Upcoming campaigns #}
|
||||
<h2>Upcoming Reward Campaigns</h2>
|
||||
{% for campaign in sorted_campaigns %}
|
||||
{% if campaign.starts_at > now %}
|
||||
<tr>
|
||||
<td>
|
||||
<a href="{% url 'twitch:reward_campaign_detail' campaign.twitch_id %}">
|
||||
{% if campaign.brand %}
|
||||
{{ campaign.brand }}: {{ campaign.name }}
|
||||
{% else %}
|
||||
{{ campaign.name }}
|
||||
{% endif %}
|
||||
</a>
|
||||
{% if campaign.summary %}
|
||||
<br />
|
||||
<small>{{ campaign.summary }}</small>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
{% if campaign.game %}
|
||||
<a href="{% url 'twitch:game_detail' campaign.game.twitch_id %}">{{ campaign.game.display_name }}</a>
|
||||
{% elif campaign.is_sitewide %}
|
||||
<a href="{% url 'twitch:sitewide_rewards' %}">Site-wide</a>
|
||||
{% else %}
|
||||
<a href="{% url 'twitch:game_less_rewards' %}">[no game]</a>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
<span title="Starts on {{ campaign.starts_at|date:'M d, Y H:i' }}">Starts in {{ campaign.starts_at|timeuntil }}</span>
|
||||
</td>
|
||||
</tr>
|
||||
{% include "twitch/includes/reward_campaign_card.html" with campaign=campaign %}
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
{% endwith %}
|
||||
<h5>Past Reward Campaigns</h5>
|
||||
<table>
|
||||
<tbody>
|
||||
{% for campaign in reward_campaigns %}
|
||||
{# Past campaigns #}
|
||||
<h2>Past Reward Campaigns</h2>
|
||||
{% for campaign in sorted_campaigns %}
|
||||
{% if campaign.ends_at < now %}
|
||||
<tr>
|
||||
<td>
|
||||
<a href="{% url 'twitch:reward_campaign_detail' campaign.twitch_id %}">
|
||||
{% if campaign.brand %}
|
||||
{{ campaign.brand }}: {{ campaign.name }}
|
||||
{% else %}
|
||||
{{ campaign.name }}
|
||||
{% endif %}
|
||||
</a>
|
||||
{% if campaign.summary %}
|
||||
<br />
|
||||
<small>{{ campaign.summary }}</small>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
{% if campaign.game %}
|
||||
<a href="{% url 'twitch:game_detail' campaign.game.twitch_id %}">{{ campaign.game.display_name }}</a>
|
||||
{% elif campaign.is_sitewide %}
|
||||
<a href="{% url 'twitch:sitewide_rewards' %}">Site-wide</a>
|
||||
{% else %}
|
||||
<a href="{% url 'twitch:game_less_rewards' %}">[no game]</a>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
<span title="Ended on {{ campaign.ends_at|date:'M d, Y H:i' }}">{{ campaign.ends_at|timesince }} ago</span>
|
||||
</td>
|
||||
</tr>
|
||||
{% include "twitch/includes/reward_campaign_card.html" with campaign=campaign %}
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
{% endwith %}
|
||||
{% else %}
|
||||
<p>No reward campaigns found.</p>
|
||||
{% endif %}
|
||||
|
|
|
|||
|
|
@ -2164,7 +2164,8 @@ class SitewideRewardCampaignAtomFeed(TTVDropsAtomBaseFeed, SitewideRewardCampaig
|
|||
|
||||
|
||||
class SitewideRewardCampaignDiscordFeed(
|
||||
TTVDropsAtomBaseFeed, SitewideRewardCampaignFeed
|
||||
TTVDropsAtomBaseFeed,
|
||||
SitewideRewardCampaignFeed,
|
||||
):
|
||||
"""Discord feed for site-wide reward campaigns with Discord relative timestamps."""
|
||||
|
||||
|
|
@ -2409,7 +2410,8 @@ class GameLessRewardCampaignAtomFeed(TTVDropsAtomBaseFeed, GameLessRewardCampaig
|
|||
|
||||
|
||||
class GameLessRewardCampaignDiscordFeed(
|
||||
TTVDropsAtomBaseFeed, GameLessRewardCampaignFeed
|
||||
TTVDropsAtomBaseFeed,
|
||||
GameLessRewardCampaignFeed,
|
||||
):
|
||||
"""Discord feed for reward campaigns with no game linked, with Discord timestamps."""
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue