Merge pull request #68 from Hojagulyyev/dev

Dev
Hojagulyyev · Nov 15, 2023 · 931daaa · 931daaa
2 parents 10f43d0 + 2ef7372
commit 931daaa
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 2 deletions.
diff --git a/apps/clans/views.py b/apps/clans/views.py
@@ -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)
 

diff --git a/templates/clans/overview.html b/templates/clans/overview.html
@@ -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 %}
 

diff --git a/templates/partials/expanded-left-sidebar.html b/templates/partials/expanded-left-sidebar.html
@@ -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 -->

diff --git a/templates/partials/mobile-left-sidebar.html b/templates/partials/mobile-left-sidebar.html
@@ -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 -->
 
@@ -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 -->