Refactor dashboard view to group active campaigns by organization and game
This commit is contained in:
parent
c4eedfd367
commit
c7c2d86ddb
2 changed files with 177 additions and 54 deletions
|
|
@ -3,60 +3,144 @@
|
||||||
{% block title %}Dashboard - Twitch Drops Tracker{% endblock %}
|
{% block title %}Dashboard - Twitch Drops Tracker{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<div class="row mb-3">
|
<div class="row mb-2">
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<h1 class="mb-2"><i class="fas fa-tachometer-alt me-2 twitch-color"></i>Dashboard</h1>
|
<h2 class="mb-1"><i class="fas fa-tachometer-alt me-2 twitch-color"></i>Dashboard</h2>
|
||||||
<p class="lead mb-3">Track your active Twitch drop campaigns and progress.</p>
|
<p class="small text-muted mb-2">Track your active Twitch drop campaigns and progress.</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="row mb-3">
|
<style>
|
||||||
|
.org-section {
|
||||||
|
border-left: 3px solid #9146FF;
|
||||||
|
padding-left: 10px;
|
||||||
|
margin-bottom: 15px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.game-section {
|
||||||
|
border-left: 2px solid #6441A4;
|
||||||
|
padding-left: 8px;
|
||||||
|
margin-left: 5px;
|
||||||
|
margin-bottom: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.org-section h5 {
|
||||||
|
color: #9146FF;
|
||||||
|
font-size: 1.1rem;
|
||||||
|
margin-bottom: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.game-section h6 {
|
||||||
|
font-size: 0.95rem;
|
||||||
|
margin-bottom: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.game-section h6 a {
|
||||||
|
color: #6441A4;
|
||||||
|
}
|
||||||
|
|
||||||
|
.game-section h6 a:hover {
|
||||||
|
color: #9146FF;
|
||||||
|
}
|
||||||
|
|
||||||
|
.campaign-card {
|
||||||
|
padding: 8px !important;
|
||||||
|
margin-bottom: 0;
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.campaign-image img,
|
||||||
|
.campaign-image div {
|
||||||
|
width: 50px !important;
|
||||||
|
height: 50px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.card-body {
|
||||||
|
padding: 0.75rem !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.title-wrapper {
|
||||||
|
min-height: 1.9rem !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.title-wrapper h6 {
|
||||||
|
font-size: 0.85rem !important;
|
||||||
|
line-height: 1.2;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mb-3 {
|
||||||
|
margin-bottom: 0.75rem !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mb-4 {
|
||||||
|
margin-bottom: 1rem !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.g-3 {
|
||||||
|
--bs-gutter-y: 0.5rem !important;
|
||||||
|
--bs-gutter-x: 0.5rem !important;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<div class="row mb-2">
|
||||||
<div class="col-12">
|
<div class="col-12">
|
||||||
<div class="card border-0 shadow-sm">
|
<div class="card border-0 shadow-sm">
|
||||||
<div class="card-header bg-twitch py-2">
|
<div class="card-header bg-twitch py-1">
|
||||||
<h5 class="mb-0"><i class="fas fa-fire me-2"></i>Active Campaigns</h5>
|
<h5 class="mb-0"><i class="fas fa-fire me-1"></i>Active Campaigns</h5>
|
||||||
</div>
|
</div>
|
||||||
<div class="card-body py-3">
|
<div class="card-body py-3">
|
||||||
{% if active_campaigns %}
|
{% if campaigns_by_org_game %}
|
||||||
<div class="row g-3">
|
{% for org_id, org_data in campaigns_by_org_game.items %}
|
||||||
{% for campaign in active_campaigns %}
|
<div class="org-section mb-4">
|
||||||
<div class="col-md-6 col-lg-4 col-xl-3">
|
<h5><i class="fas fa-building me-1"></i>{{ org_data.name }}</h5>
|
||||||
<div class="campaign-card campaign-active border rounded p-2">
|
|
||||||
<div class="d-flex">
|
{% for game_id, game_data in org_data.games.items %}
|
||||||
<div class="campaign-image flex-shrink-0 me-3">
|
<div class="game-section mb-3">
|
||||||
{% if campaign.image_url %}
|
<h6>
|
||||||
<img src="{{ campaign.image_url }}" width="70" height="70" class="rounded"
|
<a href="{% url 'twitch:game_detail' game_id %}" class="text-decoration-none">
|
||||||
alt="{{ campaign.name }}" style="object-fit: cover;">
|
<i class="fas fa-gamepad me-1"></i>{{ game_data.name }}
|
||||||
{% else %}
|
</a>
|
||||||
<div class="bg-light rounded"
|
</h6>
|
||||||
style="width: 70px; height: 70px; display: flex; align-items: center; justify-content: center;">
|
|
||||||
<i class="fas fa-image text-muted" style="font-size: 1.5rem;"></i>
|
<div class="row g-3">
|
||||||
|
{% for campaign in game_data.campaigns %}
|
||||||
|
<div class="col-md-4 col-lg-3 col-xl-2">
|
||||||
|
<div class="campaign-card campaign-active border rounded">
|
||||||
|
<div class="d-flex">
|
||||||
|
<div class="campaign-image flex-shrink-0 me-2">
|
||||||
|
{% if campaign.image_url %}
|
||||||
|
<img src="{{ campaign.image_url }}" class="rounded"
|
||||||
|
alt="{{ campaign.name }}" style="object-fit: cover;">
|
||||||
|
{% else %}
|
||||||
|
<div class="bg-light rounded"
|
||||||
|
style="display: flex; align-items: center; justify-content: center;">
|
||||||
|
<i class="fas fa-image text-muted" style="font-size: 1.2rem;"></i>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
<div class="campaign-details min-w-0">
|
||||||
|
<div class="title-wrapper">
|
||||||
|
<h6 class="mb-0" title="{{ campaign.name }}"
|
||||||
|
style="display: -webkit-box; display: box; -webkit-line-clamp: 2; line-clamp: 2; -webkit-box-orient: vertical; box-orient: vertical; overflow: hidden;">
|
||||||
|
{{ campaign.clean_name }}</h6>
|
||||||
|
</div>
|
||||||
|
<div class="d-flex align-items-center">
|
||||||
|
<span class="badge bg-success" style="font-size: 0.7rem;">Active</span>
|
||||||
|
<small class="text-muted ms-1" style="font-size: 0.7rem;">Ends
|
||||||
|
{{ campaign.end_at|date:"M d" }}</small>
|
||||||
|
</div>
|
||||||
|
<a href="{% url 'twitch:campaign_detail' campaign.id %}"
|
||||||
|
class="stretched-link"></a>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
<div class="campaign-details min-w-0">
|
|
||||||
<div class="title-wrapper" style="min-height: 2.4rem;">
|
|
||||||
<h6 class="mb-1" title="{{ campaign.name }}"
|
|
||||||
style="display: -webkit-box; display: box; -webkit-line-clamp: 2; line-clamp: 2; -webkit-box-orient: vertical; box-orient: vertical; overflow: hidden; font-size: 0.9rem;">
|
|
||||||
{{ campaign.clean_name }}</h6>
|
|
||||||
</div>
|
|
||||||
<p class="mb-1 small text-muted text-truncate">
|
|
||||||
<a href="{% url 'twitch:game_detail' campaign.game.id %}"
|
|
||||||
class="text-decoration-none" title="{{ campaign.game.display_name }}">
|
|
||||||
<i class="fas fa-gamepad me-1"></i>{{ campaign.game.display_name }}
|
|
||||||
</a>
|
|
||||||
</p>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="d-flex justify-content-between align-items-center mt-2">
|
{% endfor %}
|
||||||
<span class="badge bg-success">Active</span>
|
|
||||||
<a href="{% url 'twitch:campaign_detail' campaign.id %}"
|
|
||||||
class="btn btn-sm btn-outline-primary">Details</a>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</div>
|
</div>
|
||||||
|
{% endfor %}
|
||||||
{% else %}
|
{% else %}
|
||||||
<div class="alert alert-info py-2">
|
<div class="alert alert-info py-2">
|
||||||
<i class="fas fa-info-circle me-2"></i>No active campaigns at the moment.
|
<i class="fas fa-info-circle me-2"></i>No active campaigns at the moment.
|
||||||
|
|
@ -70,26 +154,32 @@
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-12">
|
<div class="col-12">
|
||||||
<div class="card border-0 shadow-sm">
|
<div class="card border-0 shadow-sm">
|
||||||
<div class="card-header bg-dark text-white py-2">
|
<div class="card-header bg-dark text-white py-1">
|
||||||
<h5 class="mb-0"><i class="fas fa-chart-bar me-2"></i>Quick Stats</h5>
|
<h5 class="mb-0"><i class="fas fa-chart-bar me-1"></i>Quick Stats</h5>
|
||||||
</div>
|
</div>
|
||||||
<div class="card-body py-3">
|
<div class="card-body py-2">
|
||||||
<div class="row text-center g-2">
|
<div class="row text-center g-2">
|
||||||
<div class="col-md-4 mb-2 mb-md-0">
|
<div class="col-md-3 mb-1 mb-md-0">
|
||||||
<div class="p-2 border rounded">
|
<div class="p-1 border rounded">
|
||||||
<h3 class="twitch-color mb-0">{{ active_campaigns.count }}</h3>
|
<h4 class="twitch-color mb-0">{{ active_campaigns.count }}</h4>
|
||||||
<p class="mb-0 small text-muted">Active Campaigns</p>
|
<p class="mb-0 small text-muted" style="font-size: 0.75rem;">Active Campaigns</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-4 mb-2 mb-md-0">
|
<div class="col-md-3 mb-1 mb-md-0">
|
||||||
<div class="p-2 border rounded">
|
<div class="p-1 border rounded">
|
||||||
<h3 class="text-primary mb-0">{{ now|date:"F j, Y" }}</h3>
|
<h4 class="text-primary mb-0">{{ campaigns_by_org_game|length }}</h4>
|
||||||
<p class="mb-0 small text-muted">Current Date</p>
|
<p class="mb-0 small text-muted" style="font-size: 0.75rem;">Organizations</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-4">
|
<div class="col-md-3 mb-1 mb-md-0">
|
||||||
<div class="p-2 border rounded">
|
<div class="p-1 border rounded">
|
||||||
<a href="{% url 'twitch:campaign_list' %}" class="btn btn-primary w-100">
|
<h4 class="text-primary mb-0">{{ now|date:"M j" }}</h4>
|
||||||
|
<p class="mb-0 small text-muted" style="font-size: 0.75rem;">Current Date</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-3">
|
||||||
|
<div class="p-1 border rounded">
|
||||||
|
<a href="{% url 'twitch:campaign_list' %}" class="btn btn-primary btn-sm w-100">
|
||||||
<i class="fas fa-list me-1"></i>All Campaigns
|
<i class="fas fa-list me-1"></i>All Campaigns
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -318,11 +318,44 @@ def dashboard(request: HttpRequest) -> HttpResponse:
|
||||||
.prefetch_related(Prefetch("time_based_drops", queryset=TimeBasedDrop.objects.prefetch_related("benefits")))
|
.prefetch_related(Prefetch("time_based_drops", queryset=TimeBasedDrop.objects.prefetch_related("benefits")))
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# Group active campaigns by organization and then by game
|
||||||
|
campaigns_by_org_game = {}
|
||||||
|
|
||||||
|
for campaign in active_campaigns:
|
||||||
|
org_id = campaign.owner.id
|
||||||
|
org_name = campaign.owner.name
|
||||||
|
game_id = campaign.game.id
|
||||||
|
game_name = campaign.game.display_name
|
||||||
|
|
||||||
|
# Initialize org dict if not exists
|
||||||
|
if org_id not in campaigns_by_org_game:
|
||||||
|
campaigns_by_org_game[org_id] = {"name": org_name, "games": {}}
|
||||||
|
|
||||||
|
# Initialize game list if not exists
|
||||||
|
if game_id not in campaigns_by_org_game[org_id]["games"]:
|
||||||
|
campaigns_by_org_game[org_id]["games"][game_id] = {"name": game_name, "campaigns": []}
|
||||||
|
|
||||||
|
# Add campaign to the game list
|
||||||
|
campaigns_by_org_game[org_id]["games"][game_id]["campaigns"].append(campaign)
|
||||||
|
|
||||||
|
# Sort organizations alphabetically
|
||||||
|
sorted_campaigns_by_org_game = {
|
||||||
|
org_id: campaigns_by_org_game[org_id]
|
||||||
|
for org_id in sorted(campaigns_by_org_game.keys(), key=lambda k: campaigns_by_org_game[k]["name"])
|
||||||
|
}
|
||||||
|
|
||||||
|
# Sort games alphabetically within each organization
|
||||||
|
for org_data in sorted_campaigns_by_org_game.values():
|
||||||
|
org_data["games"] = {
|
||||||
|
game_id: org_data["games"][game_id] for game_id in sorted(org_data["games"].keys(), key=lambda k: org_data["games"][k]["name"])
|
||||||
|
}
|
||||||
|
|
||||||
return render(
|
return render(
|
||||||
request,
|
request,
|
||||||
"twitch/dashboard.html",
|
"twitch/dashboard.html",
|
||||||
{
|
{
|
||||||
"active_campaigns": active_campaigns,
|
"active_campaigns": active_campaigns, # Keep the original list for backward compatibility
|
||||||
|
"campaigns_by_org_game": sorted_campaigns_by_org_game, # Add the new organized structure
|
||||||
"now": now,
|
"now": now,
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue