fix(contributors): fix 'for the past month' filter on contributors page

Resolved issue #293 where the 'for the past month' filter on the contributors page was not working as expected.
Hexlet · Aug 15, 2023 · 7097d56 · 7097d56
1 parent d74651a
commit 7097d56
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 16 deletions.
diff --git a/contributors/views/contributors_for_period.py b/contributors/views/contributors_for_period.py
@@ -13,6 +13,7 @@ def get_context_data(self, **kwargs):
         """Add context."""
         context = super().get_context_data(**kwargs)
         context['dt_month_ago'] = misc.datetime_month_ago()
+        context['is_week'] = self.extra_context.get('period') == 'week'
         return context
 
     def get_queryset(self):  # noqa: WPS615

diff --git a/locale/ru/LC_MESSAGES/django.mo b/locale/ru/LC_MESSAGES/django.mo
diff --git a/locale/ru/LC_MESSAGES/django.po b/locale/ru/LC_MESSAGES/django.po
@@ -641,6 +641,10 @@ msgstr "Пул-реквесты по"
 msgid "Contributors for month"
 msgstr "Участники за месяц"
 
+#: templates/contributors_for_period.html
+msgid "Contributors for week"
+msgstr "Участники за неделю"
+
 #: templates/home.html
 msgid "Top 10 contributors"
 msgstr "Топ 10 участников"

diff --git a/templates/components/navbar.html b/templates/components/navbar.html
@@ -23,7 +23,7 @@
             {% trans "Contributors" %}
           </a>
           <div class="dropdown-menu">
-            <a class="dropdown-item" href="{% url 'contributors:contributors_for_month' %}">{% trans "For period" %}</a>
+            <a class="dropdown-item" href="{% url 'contributors:contributors_for_week' %}">{% trans "For period" %}</a>
             <a class="dropdown-item" href="{% url 'contributors:contributors_list' %}">{% trans "All-time" %}</a>
           </div>
         </li>

diff --git a/templates/components/time_note.html b/templates/components/time_note.html
@@ -2,19 +2,13 @@
 
 <ul class="nav nav-pills">
   <li class="nav-item">
-    <a class="nav-link time-note py-1 active" href="#"
-       name="top-week">
-      {% trans "for the past week" %}
-    </a>
+      <a class="nav-link time-note py-1 {% if is_week %}active{% endif %}" href="{% url 'contributors:contributors_for_week' %}" name="top-week">
+          {% trans "for the past week" %}
+      </a>
   </li>
   <li class="nav-item">
-    <a class="nav-link time-note py-1" href="#"
-       name="top-month">
-      {% trans "for the past month" %}
-    </a>
+      <a class="nav-link time-note py-1 {% if not is_week %}active{% endif %}" href="{% url 'contributors:contributors_for_month' %}" name="top-month">
+          {% trans "for the past month" %}
+      </a>
   </li>
 </ul>
-
-
-
-
diff --git a/templates/contributors_for_period.html b/templates/contributors_for_period.html
@@ -1,11 +1,32 @@
 {% extends 'base.html' %}
 {% load i18n %}
 
-{% block title %}{% trans "Contributors for month" %}{% endblock %}
+{% block title %}
+    {% if is_week %}
+        {% trans "Contributors for week" %}
+    {% else %}
+        {% trans "Contributors for month" %}
+    {% endif %}
+{% endblock %}
+
 <!-- Open Graph tags -->
-{% block og_title %}{% trans "Contributors for month" %}{% endblock og_title %}
+{% block og_title %}
+    {% if is_week %}
+        {% trans "Contributors for week" %}
+    {% else %}
+        {% trans "Contributors for month" %}
+    {% endif %}
+{% endblock og_title %}
 <!-- End Open Graph tags -->
-{% block header %}{% trans "Contributors" %}{% endblock %}
+
+{% block header %}
+    {% if is_week %}
+        {% trans "Contributors for week" %}
+    {% else %}
+        {% trans "Contributors for month" %}
+    {% endif %}
+{% endblock %}
+
 {% block additional %}
   {% include 'components/time_note.html' %}
 {% endblock %}