Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #68

Merged
merged 3 commits into from
Nov 15, 2023
Merged

Dev #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fcdd364
fix(ux): add clan overview page into mobile left sidebar
Hojagulyyev Nov 15, 2023
59e4fb6
fix(ui): add pagination into clans overview accounts
Hojagulyyev Nov 15, 2023
2ef7372
feat(clans): order accounts by commits count in overview page
Hojagulyyev Nov 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/clans/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def overview(request):
diaries_count=Count("diaries", distinct=True),
diary_commits_count=Count("diaries__commits", distinct=True),
)
.order_by("-level")
.order_by("-diary_commits_count")
)
paginated_account_queryset = paginate(account_queryset, page, page_size)

Expand Down
4 changes: 4 additions & 0 deletions templates/clans/overview.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,10 @@ <h2 class="section-title">Overview</h2>
</div>
<!-- /WIDGET BOX -->

<!-- SECTION PAGER BAR WRAP -->
{% include "includes/pager-bar.html" with objects=accounts %}
<!-- /SECTION PAGER BAR WRAP -->

</div>
{% endblock content %}

Expand Down
15 changes: 15 additions & 0 deletions templates/partials/expanded-left-sidebar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,21 @@
<!-- MENU -->
<ul class="menu">

<!-- MENU ITEM -->
<li class="menu-item {% if request.resolver_match.url_name == 'overview' %} active {% endif %}">
<!-- MENU ITEM LINK -->
<a class="menu-item-link" href="{% url 'clans:overview' %}">
<!-- MENU ITEM LINK ICON -->
<svg class="menu-item-link-icon icon-newsfeed">
<use xlink:href="#svg-overview"></use>
</svg>
<!-- /MENU ITEM LINK ICON -->
Overview
</a>
<!-- /MENU ITEM LINK -->
</li>
<!-- /MENU ITEM -->

<!-- MENU ITEM -->
<li class="menu-item {% if request.resolver_match.url_name == 'newsfeed_view' %} active {% endif %}">
<!-- MENU ITEM LINK -->
Expand Down
27 changes: 26 additions & 1 deletion templates/partials/mobile-left-sidebar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,17 @@
</p>
<!-- /NAVIGATION WIDGET INFO TITLE -->

<!-- NAVIGATION WIDGET INFO TEXT --><!-- /NAVIGATION WIDGET INFO TEXT -->
<!-- NAVIGATION WIDGET INFO TEXT -->
<p class="navigation-widget-info-text">
<a href="#">
{% if user.account.clan %}
{{ user.account.clan }}
{% else %}
No Clan
{% endif %}
</a>
</p>
<!-- /NAVIGATION WIDGET INFO TEXT -->
</div>
<!-- /NAVIGATION WIDGET INFO -->

Expand All @@ -87,6 +97,21 @@
<!-- MENU -->
<ul class="menu">

<!-- MENU ITEM -->
<li class="menu-item {% if request.resolver_match.url_name == 'overview' %} active {% endif %}">
<!-- MENU ITEM LINK -->
<a class="menu-item-link" href="{% url 'clans:overview' %}">
<!-- MENU ITEM LINK ICON -->
<svg class="menu-item-link-icon icon-newsfeed">
<use xlink:href="#svg-overview"></use>
</svg>
<!-- /MENU ITEM LINK ICON -->
Overview
</a>
<!-- /MENU ITEM LINK -->
</li>
<!-- /MENU ITEM -->

<!-- MENU ITEM -->
<li class="menu-item {% if request.resolver_match.url_name == 'newsfeed_view' %} active {% endif %}">
<!-- MENU ITEM LINK -->
Expand Down