From 42fb57205235963784e59b7b23e3fe5bb786e0fe Mon Sep 17 00:00:00 2001 From: ks129 <45097959+ks129@users.noreply.github.com> Date: Tue, 22 Sep 2020 20:50:24 +0300 Subject: Create resources app URLs --- pydis_site/apps/resources/urls.py | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 pydis_site/apps/resources/urls.py (limited to 'pydis_site/apps/resources/urls.py') diff --git a/pydis_site/apps/resources/urls.py b/pydis_site/apps/resources/urls.py new file mode 100644 index 00000000..208d0c93 --- /dev/null +++ b/pydis_site/apps/resources/urls.py @@ -0,0 +1,8 @@ +from django.urls import path + +from pydis_site.apps.resources import views + +app_name = "resources" +urlpatterns = [ + path("", views.ResourcesView.as_view(), name="resources"), +] -- cgit v1.2.3 From 194e3720ad8cfac1c38d8ac1279688aa6dd65c6a Mon Sep 17 00:00:00 2001 From: ks129 <45097959+ks129@users.noreply.github.com> Date: Wed, 28 Oct 2020 20:07:25 +0200 Subject: Change resources home name from resources -> index --- pydis_site/apps/resources/tests/test_views.py | 2 +- pydis_site/apps/resources/urls.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'pydis_site/apps/resources/urls.py') diff --git a/pydis_site/apps/resources/tests/test_views.py b/pydis_site/apps/resources/tests/test_views.py index b131b2a6..497e9bfe 100644 --- a/pydis_site/apps/resources/tests/test_views.py +++ b/pydis_site/apps/resources/tests/test_views.py @@ -5,6 +5,6 @@ from django_hosts import reverse class TestResourcesView(TestCase): def test_resources_index_200(self): """Check does index of resources app return 200 HTTP response.""" - url = reverse("resources:resources") + url = reverse("resources:index") response = self.client.get(url) self.assertEqual(response.status_code, 200) diff --git a/pydis_site/apps/resources/urls.py b/pydis_site/apps/resources/urls.py index 208d0c93..c91e306e 100644 --- a/pydis_site/apps/resources/urls.py +++ b/pydis_site/apps/resources/urls.py @@ -4,5 +4,5 @@ from pydis_site.apps.resources import views app_name = "resources" urlpatterns = [ - path("", views.ResourcesView.as_view(), name="resources"), + path("", views.ResourcesView.as_view(), name="index"), ] -- cgit v1.2.3 From ae7ae17633213d719613d97478ec3a7e77e0f55b Mon Sep 17 00:00:00 2001 From: ks129 <45097959+ks129@users.noreply.github.com> Date: Sat, 14 Nov 2020 11:47:45 +0200 Subject: Add URLs for resources lists --- pydis_site/apps/home/urls.py | 2 +- pydis_site/apps/resources/urls.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'pydis_site/apps/resources/urls.py') diff --git a/pydis_site/apps/home/urls.py b/pydis_site/apps/home/urls.py index b2fa6004..1578e0ac 100644 --- a/pydis_site/apps/home/urls.py +++ b/pydis_site/apps/home/urls.py @@ -1,5 +1,5 @@ from django.contrib import admin -from django.urls import path +from django.urls import include, path from .views import HomeView diff --git a/pydis_site/apps/resources/urls.py b/pydis_site/apps/resources/urls.py index c91e306e..2f0bd5f5 100644 --- a/pydis_site/apps/resources/urls.py +++ b/pydis_site/apps/resources/urls.py @@ -5,4 +5,5 @@ from pydis_site.apps.resources import views app_name = "resources" urlpatterns = [ path("", views.ResourcesView.as_view(), name="index"), + path("/", views.ResourcesList.as_view(), name="resources") ] -- cgit v1.2.3 From 7726c61eb7823f7e761f76cfbffc6029e6792bc8 Mon Sep 17 00:00:00 2001 From: ks129 <45097959+ks129@users.noreply.github.com> Date: Tue, 30 Mar 2021 12:44:05 +0300 Subject: Rename ResourcesList -> ResourcesListView --- pydis_site/apps/resources/urls.py | 2 +- pydis_site/apps/resources/views/__init__.py | 4 ++-- pydis_site/apps/resources/views/resources_list.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'pydis_site/apps/resources/urls.py') diff --git a/pydis_site/apps/resources/urls.py b/pydis_site/apps/resources/urls.py index 2f0bd5f5..e5330215 100644 --- a/pydis_site/apps/resources/urls.py +++ b/pydis_site/apps/resources/urls.py @@ -5,5 +5,5 @@ from pydis_site.apps.resources import views app_name = "resources" urlpatterns = [ path("", views.ResourcesView.as_view(), name="index"), - path("/", views.ResourcesList.as_view(), name="resources") + path("/", views.ResourcesListView.as_view(), name="resources") ] diff --git a/pydis_site/apps/resources/views/__init__.py b/pydis_site/apps/resources/views/__init__.py index e670247e..8eb383b5 100644 --- a/pydis_site/apps/resources/views/__init__.py +++ b/pydis_site/apps/resources/views/__init__.py @@ -1,4 +1,4 @@ from .resources import ResourcesView -from .resources_list import ResourcesList +from .resources_list import ResourcesListView -__all__ = ["ResourcesView", "ResourcesList"] +__all__ = ["ResourcesView", "ResourcesListView"] diff --git a/pydis_site/apps/resources/views/resources_list.py b/pydis_site/apps/resources/views/resources_list.py index c15f84f2..947dae29 100644 --- a/pydis_site/apps/resources/views/resources_list.py +++ b/pydis_site/apps/resources/views/resources_list.py @@ -9,7 +9,7 @@ from django.views.generic import TemplateView RESOURCES_PATH = Path(settings.BASE_DIR, "pydis_site", "apps", "resources", "resources") -class ResourcesList(TemplateView): +class ResourcesListView(TemplateView): """Shows specific resources list.""" template_name = "resources/resources_list.html" -- cgit v1.2.3 From a95e03f56ce1e7627fdf2abb1c288b9aa0450682 Mon Sep 17 00:00:00 2001 From: ks129 <45097959+ks129@users.noreply.github.com> Date: Tue, 30 Mar 2021 13:12:05 +0300 Subject: Rename resource type -> resource category in route --- pydis_site/apps/resources/urls.py | 2 +- pydis_site/apps/resources/views/resources_list.py | 2 +- pydis_site/templates/resources/resources.html | 14 +++++++------- pydis_site/templates/resources/resources_list.html | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'pydis_site/apps/resources/urls.py') diff --git a/pydis_site/apps/resources/urls.py b/pydis_site/apps/resources/urls.py index e5330215..19142081 100644 --- a/pydis_site/apps/resources/urls.py +++ b/pydis_site/apps/resources/urls.py @@ -5,5 +5,5 @@ from pydis_site.apps.resources import views app_name = "resources" urlpatterns = [ path("", views.ResourcesView.as_view(), name="index"), - path("/", views.ResourcesListView.as_view(), name="resources") + path("/", views.ResourcesListView.as_view(), name="resources") ] diff --git a/pydis_site/apps/resources/views/resources_list.py b/pydis_site/apps/resources/views/resources_list.py index b09793d7..55f22993 100644 --- a/pydis_site/apps/resources/views/resources_list.py +++ b/pydis_site/apps/resources/views/resources_list.py @@ -20,7 +20,7 @@ class ResourcesListView(TemplateView): """Add resources and subcategories data into context.""" context = super().get_context_data(**kwargs) - resource_path = RESOURCES_PATH / self.kwargs["type"] + resource_path = RESOURCES_PATH / self.kwargs["category"] if ( not resource_path.is_dir() or not resource_path.joinpath("_category_info.yaml").exists() diff --git a/pydis_site/templates/resources/resources.html b/pydis_site/templates/resources/resources.html index 352a53dd..7b044f06 100644 --- a/pydis_site/templates/resources/resources.html +++ b/pydis_site/templates/resources/resources.html @@ -24,7 +24,7 @@