badblocks/pkmntrade.club
1
1
Fork 0
Code Issues 14 Pull requests Projects 1 Releases Packages Wiki Activity

Fix pagination controls, move mixin to common app, fix pagination invocation on all views, and other random bug fixes

Browse source
This commit is contained in:
badblocks 2025-04-01 23:01:05 -07:00
parent 7edefe23c3
commit 6a61b79bbe
425 changed files with 51656 additions and 243 deletions
Download patch file Download diff file Expand all files Collapse all files

2
theme/templates/trades/_trade_offer_list.html
View file

@ -18,4 +18,4 @@
<div>No trade offers available.</div>
{% endfor %}
</div>
{% render_pagination offers %}
{% render_pagination page_obj %}

22
theme/templates/trades/trade_acceptance_update.html
View file

@ -1,11 +1,11 @@
{% extends 'base.html' %}
{% load trade_offer_tags %}
{% block title %}Update Trade Acceptance{% endblock title %}
{% block title %}Update Trade{% endblock title %}
{% block content %}
<div class="container mx-auto max-w-xl mt-6">
<h2 class="text-2xl font-bold">Update Trade Acceptance</h2>
<h2 class="text-2xl font-bold">Update Trade</h2>
<div class="text-center py-8">
<ul class="steps">
{% if object.is_thanked %}
@ -25,20 +25,20 @@
<li class="step {% if object.get_step_number >= 2 %}step-primary{% endif %}">Card Sent</li>
<li class="step {% if object.get_step_number >= 3 %}step-primary{% endif %}">Card Received</li>
{% if object.state == 'THANKED_BY_INITIATOR' %}
<li class="step step-primary">Thanked by Initiator</li>
<li class="step">Thanked by Acceptor</li>
<li class="step step-primary">Thanks Sent</li>
<li class="step">Thanks Received</li>
<li class="step">Completed</li>
{% elif object.state == 'THANKED_BY_ACCEPTOR' %}
<li class="step step-primary">Thanked by Acceptor</li>
<li class="step">Thanked by Initiator</li>
<li class="step step-primary">Thanks Received</li>
<li class="step">Thanks Sent</li>
<li class="step">Completed</li>
{% elif object.state == 'THANKED_BY_BOTH' %}
<li class="step step-primary">Thanked by Initiator</li>
<li class="step step-primary">Thanked by Acceptor</li>
<li class="step step-primary">Thanks Sent</li>
<li class="step step-primary">Thanks Received</li>
<li class="step step-primary">Completed</li>
{% else %}
<li class="step">Thanked by Initiator</li>
<li class="step">Thanked by Acceptor</li>
<li class="step">Thanks Sent</li>
<li class="step">Thanks Received</li>
<li class="step">Completed</li>
{% endif %}
{% endif %}
@ -49,7 +49,7 @@
{% render_trade_acceptance object %}
</div>
<div class="mt-6">
<div class="mt-6 card card-border bg-base-100 shadow-lg mx-auto p-6 mb-4">
<h3 class="text-xl font-semibold mb-4">Select an action:</h3>
{% if form.fields.state.choices %}
<div class="flex flex-row gap-2">

4
theme/templates/trades/trade_offer_all_list.html
View file

@ -29,7 +29,7 @@
</div>
<div id="all-trade-offers"
x-data="{
page: {{ all_trade_offers_paginated.number|default:1 }},
page: {{ page_obj.number|default:1 }},
loadOffers() {
let url = new URL('{% url 'trade_offer_list' %}', window.location.origin);
let params = new URLSearchParams(window.location.search);
@ -42,7 +42,7 @@
}"
x-init="loadOffers()"
x-on:change-page.window="page = $event.detail.page; loadOffers()">
{% include "trades/_trade_offer_list.html" with offers=all_trade_offers_paginated %}
{% include "trades/_trade_offer_list.html" with offers=offers page_obj=page_obj %}
</div>
</section>
</div>