Add_separation_into_PR_and_issues_on_the_main_page #261

Tragoedie · 2023-04-01T09:04:40Z

Added split it into two tabs: PR and Issues.
Added buttons: "for the past week", "for the past month"
Added tabs: "PR" and "Issues"

It may be necessary to edit the "IssueInfo" model in order to remove duplication in the file:
contributors/views/home.py? If it needed, is it possible to open a new issue?

fey · 2023-04-01T11:35:07Z

Deploy please demonstration

Tragoedie · 2023-04-01T11:45:11Z

Deploy please demonstration

What format of demonstration do you need?

fey · 2023-04-01T18:00:39Z

@Tragoedie railway or render.com with your changes in this PR

fey · 2023-04-01T18:01:05Z

кароче суть в том, чтобы визуально увидеть код.
Но уже с ходу кажется, что что-то не так. Ведь бутстрап позволяет из коробки создавать табы.

emp7yhead · 2023-04-11T06:46:37Z

contributors/views/home.py


-LATEST_ISSUES_COUNT = 11
+LATEST_ISSUES_COUNT = 10


Давай переименуем эту константу и используем в get_top10 и в новой функции

emp7yhead · 2023-04-11T09:08:57Z

contributors/views/home.py

+        latest_month_issues = Contribution.objects.filter(
            repository__is_visible=True,
-            type__in=['pr', 'iss'],
-        ).order_by('-created_at')[:LATEST_ISSUES_COUNT]
+            type='iss',
+            created_at__gte=datetime_month_ago(),
+        ).distinct().order_by('-created_at')[:LATEST_ISSUES_COUNT]


Давай вынесем это в отдельную функцию по типу get_top10 и переиспользуем во всех остальных случаях? Будем передавать туда тип объекта - ишью или пр, и за какой период нужны данные.

emp7yhead · 2023-04-11T09:12:29Z

static/js/issues_and_pr.js

+function issues_and_pr_grouping(time_group) {
+  const tops = document.querySelector(`.${time_group}`);
+  const tabs = tops.querySelectorAll('.nav-link');
+  tabs.forEach((tab) => tab.addEventListener('click', (e) => {
+    e.preventDefault();
+    const activeTab = tops.querySelector('.nav-link.active');
+    const activeList = tops.querySelector(`.list-group.${activeTab.name}`);
+    activeTab.classList.remove('active');
+    activeList.classList.add('d-none');
+
+    const newActiveTab = e.target;
+    const newActiveList = tops.querySelector(`.list-group.${newActiveTab.name}`);
+    newActiveTab.classList.add('active');
+    newActiveList.classList.remove('d-none');
+  }));
+}


Эту функцию можно переиспользовать из top10Contributors.js. Ведь по сути в том файле выполняются те же действия, что и здесь. Зачем увеличивать кодовую базу, когда можно переиспользовать уже готовое решение?

emp7yhead · 2023-04-11T09:18:17Z

templates/components/issues_and_pr_for_month.html

+      {% include tab with latest_issues=latest_month_pr class='pull-requests' %}
+      {% include tab with latest_issues=latest_month_issues class='issues' %}
+    {% endwith %}
+</div>


Здесь надо добавить пустую строку в конце

emp7yhead · 2023-04-11T09:18:31Z

templates/components/issues_and_pr_for_week.html

+      {% include tab with latest_issues=latest_week_pr class='pull-requests' %}
+      {% include tab with latest_issues=latest_week_issues class='issues' %}
+    {% endwith %}
+</div>


И тут пустая строка нужна

emp7yhead · 2023-04-11T09:18:46Z

templates/components/time_note_for_issues_and_pr.html

+      {% trans "for the past month" %}
+    </a>
+  </li>
+</ul>


Еще одна пустая строка

emp7yhead · 2023-04-11T09:26:26Z

static/js/issues_and_pr.js

+function issues_time_note_executor() {
+  const tops = document.querySelector('.latest-issues');
+  const tabs = tops.querySelectorAll('.issues-and-pr-time-note');
+  tabs.forEach((tab) => tab.addEventListener('click', (e) => {
+    e.preventDefault();
+    const activeTab = tops.querySelector('.issues-and-pr-time-note.active');
+    const activeList = tops.querySelector(`.latest-issues-and-pr.${activeTab.name}`);
+    activeTab.classList.remove('active');
+    activeList.classList.add('d-none');
+
+    const newActiveTab = e.target;
+    const newActiveList = tops.querySelector(`.latest-issues-and-pr.${newActiveTab.name}`);
+    newActiveTab.classList.add('active');
+    newActiveList.classList.remove('d-none');
+    start(newActiveTab.name)
+  }));
+}


Давай модифицируем функцию time_note() в top10Contributors.js, чтобы она работала еще и с новой таблицей. Добавим параметр, который будет принимать тип фильтруемых данных и в зависимости от этого уже их отображать

emp7yhead · 2023-04-11T09:28:08Z

templates/components/top_issues.html

Тут наверное следует назвать файл не top_issues, а latest_issues_and_prs.

ssssank · 2023-04-20T11:30:08Z

@Tragoedie как успехи? Нужна ли какая-нибудь помощь?

ssssank · 2023-05-03T07:09:14Z

@emp7yhead доделаем?

Tragoedie · 2023-05-03T07:13:40Z

@emp7yhead, @ssssank Добрый день, я в данный момент меняю город проживания. Если срочно необходимо доделать, то можете кому-нибудь передать. Я смогу доделать в начале июня.

emp7yhead · 2023-05-03T07:50:17Z

Я подхвачу, раз такое дело

ssssank · 2023-05-12T12:15:55Z

Красиво. Сливаем?

fey · 2023-05-12T12:30:33Z

а как посмотреть результат? :)
@emp7yhead

emp7yhead · 2023-05-12T12:31:36Z

я еще не закончил 😉

ashikov · 2023-05-23T09:45:13Z

@emp7yhead чекаво тут? Сливаем?

ssssank · 2023-05-23T10:21:40Z

Я за =D

ashikov · 2023-05-25T04:35:39Z

Сливайте, у меня прав не хватает. :D

Add_separation_into_PR_and_issues_on_the_main_page

0056687

fey requested a review from emp7yhead April 5, 2023 10:34

emp7yhead suggested changes Apr 11, 2023

View reviewed changes

add trailing newlines

a95df7b

emp7yhead force-pushed the Add_separation_into_PR_and_issues_on_the_main_page branch from b91aaa3 to a95df7b Compare May 12, 2023 12:06

emp7yhead added 3 commits May 13, 2023 00:25

add tests for contribution model

254ae55

refactor contribution query set

1086e85

change time selector to work with issues and prs

761e2fe

emp7yhead force-pushed the Add_separation_into_PR_and_issues_on_the_main_page branch from bc85032 to 761e2fe Compare May 12, 2023 15:25

emp7yhead approved these changes May 12, 2023

View reviewed changes

fey merged commit e2f8751 into Hexlet:main May 25, 2023
1 check passed

emp7yhead mentioned this pull request Jun 6, 2023

Add separation into PR and issues on the main page #240

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add_separation_into_PR_and_issues_on_the_main_page #261

Add_separation_into_PR_and_issues_on_the_main_page #261

Tragoedie commented Apr 1, 2023

fey commented Apr 1, 2023

Tragoedie commented Apr 1, 2023

fey commented Apr 1, 2023

fey commented Apr 1, 2023

emp7yhead Apr 11, 2023

emp7yhead Apr 11, 2023

emp7yhead Apr 11, 2023

emp7yhead Apr 11, 2023

emp7yhead Apr 11, 2023

emp7yhead Apr 11, 2023

emp7yhead Apr 11, 2023

emp7yhead Apr 11, 2023

ssssank commented Apr 20, 2023

ssssank commented May 3, 2023

Tragoedie commented May 3, 2023

emp7yhead commented May 3, 2023

ssssank commented May 12, 2023

fey commented May 12, 2023

emp7yhead commented May 12, 2023

ashikov commented May 23, 2023

ssssank commented May 23, 2023

ashikov commented May 25, 2023


		LATEST_ISSUES_COUNT = 11
		LATEST_ISSUES_COUNT = 10

Add_separation_into_PR_and_issues_on_the_main_page #261

Add_separation_into_PR_and_issues_on_the_main_page #261

Conversation

Tragoedie commented Apr 1, 2023

fey commented Apr 1, 2023

Tragoedie commented Apr 1, 2023

fey commented Apr 1, 2023

fey commented Apr 1, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ssssank commented Apr 20, 2023

ssssank commented May 3, 2023

Tragoedie commented May 3, 2023

emp7yhead commented May 3, 2023

ssssank commented May 12, 2023

fey commented May 12, 2023

emp7yhead commented May 12, 2023

ashikov commented May 23, 2023

ssssank commented May 23, 2023

ashikov commented May 25, 2023