Merge pull request #418 from AleksandrKosmylev/structure_views

Ordered templates
Hexlet · Jun 4, 2024 · dacf9a7 · dacf9a7
2 parents f55b2ac + 1fe6100
commit dacf9a7
Show file tree

Hide file tree

Showing 33 changed files with 16 additions and 16 deletions.
diff --git a/contributors/views/achievements.py b/contributors/views/achievements.py
@@ -6,7 +6,7 @@
 class AchievementListView(generic.ListView):
     """Achievement list."""
 
-    template_name = 'achievements_list.html'
+    template_name = 'contributor/achievements_list.html'
     model = Contributor
     contributors = Contributor.objects.with_contributions()
 

diff --git a/contributors/views/contributor.py b/contributors/views/contributor.py
@@ -15,7 +15,7 @@ class DetailView(
     """Contributor's details."""
 
     model = Contributor
-    template_name = 'contributor_details.html'
+    template_name = 'contributor/contributor_details.html'
     slug_field = 'login'
 
     def get_context_data(self, **kwargs):

diff --git a/contributors/views/contributor_compare.py b/contributors/views/contributor_compare.py
@@ -9,7 +9,7 @@ class CompareWithYourselfView(ListView):
     """View of comparing current user with another one."""
 
     model = Contribution
-    template_name = 'contributor_compare_with_yourself.html'
+    template_name = 'contributors_sections/contributors/contributor_compare_with_yourself.html'  # noqa: E501
     slug_field = 'contributor'
 
     def get_queryset(self):

diff --git a/contributors/views/contributor_issues.py b/contributors/views/contributor_issues.py
@@ -8,7 +8,7 @@
 class ListView(TableSortSearchAndPaginationMixin, generic.ListView):
     """A list of issues of a contributor."""
 
-    template_name = 'contributor_issues.html'
+    template_name = 'contributor/contributor_issues.html'
     sortable_fields = (
         'info__title',
         'repository__full_name',

diff --git a/contributors/views/contributor_prs.py b/contributors/views/contributor_prs.py
@@ -8,7 +8,7 @@
 class ListView(TableSortSearchAndPaginationMixin, generic.ListView):
     """A list of pull requests of a contributor."""
 
-    template_name = 'contributor_prs.html'
+    template_name = 'contributor/contributor_prs.html'
     sortable_fields = (
         'info__title',
         'repository__full_name',

diff --git a/contributors/views/contributors.py b/contributors/views/contributors.py
@@ -9,7 +9,7 @@ class ListView(TableSortSearchAndPaginationMixin, generic.ListView):
     """A list of contributors with contributions."""
 
     queryset = Contributor.objects.visible().with_contributions()
-    template_name = 'contributors_list.html'
+    template_name = 'contributors_sections/contributors/contributors_list.html'
     sortable_fields = (
         'login',
         'name',

diff --git a/contributors/views/contributors_for_period.py b/contributors/views/contributors_for_period.py
@@ -6,7 +6,7 @@
 class ListView(contributors.ListView):
     """A list of contributors with monthly contributions."""
 
-    template_name = 'contributors_for_period.html'
+    template_name = 'contributors_sections/contributors/contributors_for_period.html'  # noqa: E501
     context_object_name = 'contributors_list'
 
     def get_context_data(self, **kwargs):

diff --git a/contributors/views/issues.py b/contributors/views/issues.py
@@ -16,7 +16,7 @@ class ListView(
 ):
     """A list of issues."""
 
-    template_name = 'open_issues.html'
+    template_name = 'contributors_sections/issues/open_issues.html'
     filterset_class = IssuesFilter
     sortable_fields = (  # noqa: WPS317
         'info__title',

diff --git a/contributors/views/leaderboard_commits.py b/contributors/views/leaderboard_commits.py
@@ -15,7 +15,7 @@ class ListView(
     """List of leaders among contributors by commits."""
 
     queryset = Contributor.objects.visible().with_contributions()
-    template_name = 'leaderboard_commits.html'
+    template_name = 'contributors_sections/leaderboard/leaderboard_commits.html'  # noqa: E501
     sortable_fields = (
         '-commits',
     )

diff --git a/contributors/views/leaderboard_issues.py b/contributors/views/leaderboard_issues.py
@@ -15,7 +15,7 @@ class ListView(
     """List of leaders among contributors by issues."""
 
     queryset = Contributor.objects.visible().with_contributions()
-    template_name = 'leaderboard_issues.html'
+    template_name = 'contributors_sections/leaderboard/leaderboard_issues.html'
     sortable_fields = (
         '-issues',
     )

diff --git a/contributors/views/leaderboard_prs.py b/contributors/views/leaderboard_prs.py
@@ -15,7 +15,7 @@ class ListView(
     """List of leaders among contributors by pull requests."""
 
     queryset = Contributor.objects.visible().with_contributions()
-    template_name = 'leaderboard_prs.html'
+    template_name = 'contributors_sections/leaderboard/leaderboard_prs.html'
     sortable_fields = (
         '-pull_requests',
     )

diff --git a/contributors/views/organization.py b/contributors/views/organization.py
@@ -8,7 +8,7 @@
 class OrgRepositoryList(repositories.ListView):
     """An organization's details."""
 
-    template_name = 'organization_details.html'
+    template_name = 'contributors_sections/organizations/organization_details.html'  # noqa: E501
     sortable_fields = (  # noqa: WPS317
         'name',
         'project',

diff --git a/contributors/views/organizations.py b/contributors/views/organizations.py
@@ -12,7 +12,7 @@ class ListView(TableSortSearchAndPaginationMixin, generic.ListView):
     queryset = Organization.objects.filter(
         repository__is_visible=True,
     ).distinct().annotate(repository_count=Count('repository'))
-    template_name = 'organizations_list.html'
+    template_name = 'contributors_sections/organizations/organizations_list.html'  # noqa: E501
     sortable_fields = (
         'name',
         ('repository_count', _("Repositories")),

diff --git a/contributors/views/pull_requests.py b/contributors/views/pull_requests.py
@@ -23,7 +23,7 @@ class ListView(TableSortSearchAndPaginationMixin, generic.ListView):
     )
     ordering = sortable_fields[0]
 
-    template_name = 'pull_requests_list.html'
+    template_name = 'contributors_sections/pull_requests/pull_requests_list.html'  # noqa: E501
 
     def get_queryset(self):  # noqa: WPS615
         """Get pull requests.

diff --git a/contributors/views/repositories.py b/contributors/views/repositories.py
@@ -36,7 +36,7 @@ class ListView(
             ),
         )
     )
-    template_name = 'repositories_list.html'
+    template_name = 'contributors_sections/repositories/repositories_list.html'
     sortable_fields = (  # noqa: WPS317
         'name',
         'organization',

diff --git a/contributors/views/repository.py b/contributors/views/repository.py
@@ -7,7 +7,7 @@
 class RepoContributorList(contributors.ListView):
     """A repository's details."""
 
-    template_name = 'repository_details.html'
+    template_name = 'contributors_sections/repositories/repository_details.html'  # noqa: E501
 
     def get_queryset(self):  # noqa: WPS615
         """Get a dataset."""

diff --git a/templates/achievements_list.html → templates/contributor/achievements_list.html b/templates/achievements_list.html → templates/contributor/achievements_list.html
diff --git a/templates/contributor_details.html → ...ates/contributor/contributor_details.html b/templates/contributor_details.html → ...ates/contributor/contributor_details.html
diff --git a/templates/contributor_issues.html → ...lates/contributor/contributor_issues.html b/templates/contributor_issues.html → ...lates/contributor/contributor_issues.html
diff --git a/templates/contributor_prs.html → templates/contributor/contributor_prs.html b/templates/contributor_prs.html → templates/contributor/contributor_prs.html
diff --git a/templates/user_settings.html → templates/contributor/user_settings.html b/templates/user_settings.html → templates/contributor/user_settings.html
diff --git a/...es/contributor_compare_with_yourself.html → ...rs/contributor_compare_with_yourself.html b/...es/contributor_compare_with_yourself.html → ...rs/contributor_compare_with_yourself.html
diff --git a/templates/contributors_for_period.html → ...contributors/contributors_for_period.html b/templates/contributors_for_period.html → ...contributors/contributors_for_period.html
diff --git a/templates/contributors_list.html → ...tions/contributors/contributors_list.html b/templates/contributors_list.html → ...tions/contributors/contributors_list.html
diff --git a/templates/open_issues.html → ...ributors_sections/issues/open_issues.html b/templates/open_issues.html → ...ributors_sections/issues/open_issues.html
diff --git a/templates/leaderboard_commits.html → ...ions/leaderboard/leaderboard_commits.html b/templates/leaderboard_commits.html → ...ions/leaderboard/leaderboard_commits.html
diff --git a/templates/leaderboard_issues.html → ...tions/leaderboard/leaderboard_issues.html b/templates/leaderboard_issues.html → ...tions/leaderboard/leaderboard_issues.html
diff --git a/templates/leaderboard_prs.html → ...sections/leaderboard/leaderboard_prs.html b/templates/leaderboard_prs.html → ...sections/leaderboard/leaderboard_prs.html
diff --git a/templates/organization_details.html → ...s/organizations/organization_details.html b/templates/organization_details.html → ...s/organizations/organization_details.html
diff --git a/templates/organizations_list.html → ...ons/organizations/organizations_list.html b/templates/organizations_list.html → ...ons/organizations/organizations_list.html
diff --git a/templates/pull_requests_list.html → ...ons/pull_requests/pull_requests_list.html b/templates/pull_requests_list.html → ...ons/pull_requests/pull_requests_list.html
diff --git a/templates/repositories_list.html → ...tions/repositories/repositories_list.html b/templates/repositories_list.html → ...tions/repositories/repositories_list.html
diff --git a/templates/repository_details.html → ...ions/repositories/repository_details.html b/templates/repository_details.html → ...ions/repositories/repository_details.html