From 99f48fb12dced0f011b2be26cbed9d5c451ff0b5 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Mon, 26 Oct 2020 19:43:35 +0200
Subject: Create basic events app

---
 pydis_site/apps/events/urls.py | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 pydis_site/apps/events/urls.py

(limited to 'pydis_site/apps/events/urls.py')

diff --git a/pydis_site/apps/events/urls.py b/pydis_site/apps/events/urls.py
new file mode 100644
index 00000000..52e7cf47
--- /dev/null
+++ b/pydis_site/apps/events/urls.py
@@ -0,0 +1,9 @@
+from django.urls import path, re_path
+
+from pydis_site.apps.events.views import IndexView, PageView
+
+app_name = "events"
+urlpatterns = [
+    path("", IndexView.as_view(), name="events"),
+    re_path("(?P<path>.+)/$", PageView.as_view(), name="page"),
+]
-- 
cgit v1.2.3


From 7642d2137de0a0c230c89f33005509f349ad23b4 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Wed, 28 Oct 2020 20:21:30 +0200
Subject: Rename events index page from events -> index

---
 pydis_site/apps/events/tests/test_views.py | 2 +-
 pydis_site/apps/events/urls.py             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'pydis_site/apps/events/urls.py')

diff --git a/pydis_site/apps/events/tests/test_views.py b/pydis_site/apps/events/tests/test_views.py
index 81f67c08..9561255f 100644
--- a/pydis_site/apps/events/tests/test_views.py
+++ b/pydis_site/apps/events/tests/test_views.py
@@ -12,7 +12,7 @@ PAGES_PATH = Path(settings.BASE_DIR, "pydis_site", "apps", "events", "tests", "t
 class IndexTests(TestCase):
     def test_events_index_response_200(self):
         """Should return response code 200 when visiting index of events."""
-        url = reverse("events:events")
+        url = reverse("events:index")
         resp = self.client.get(url)
         self.assertEqual(resp.status_code, 200)
 
diff --git a/pydis_site/apps/events/urls.py b/pydis_site/apps/events/urls.py
index 52e7cf47..f55835a4 100644
--- a/pydis_site/apps/events/urls.py
+++ b/pydis_site/apps/events/urls.py
@@ -4,6 +4,6 @@ from pydis_site.apps.events.views import IndexView, PageView
 
 app_name = "events"
 urlpatterns = [
-    path("", IndexView.as_view(), name="events"),
+    path("", IndexView.as_view(), name="index"),
     re_path("(?P<path>.+)/$", PageView.as_view(), name="page"),
 ]
-- 
cgit v1.2.3


From 78c8a0a0afc479e681af13bd9bb2a1afed3489dc Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Wed, 28 Oct 2020 20:30:48 +0200
Subject: Use path converter for event page path argument

---
 pydis_site/apps/events/urls.py       | 4 ++--
 pydis_site/apps/events/views/page.py | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'pydis_site/apps/events/urls.py')

diff --git a/pydis_site/apps/events/urls.py b/pydis_site/apps/events/urls.py
index f55835a4..9a65cf1f 100644
--- a/pydis_site/apps/events/urls.py
+++ b/pydis_site/apps/events/urls.py
@@ -1,9 +1,9 @@
-from django.urls import path, re_path
+from django.urls import path
 
 from pydis_site.apps.events.views import IndexView, PageView
 
 app_name = "events"
 urlpatterns = [
     path("", IndexView.as_view(), name="index"),
-    re_path("(?P<path>.+)/$", PageView.as_view(), name="page"),
+    path("<path:path>/", PageView.as_view(), name="page"),
 ]
diff --git a/pydis_site/apps/events/views/page.py b/pydis_site/apps/events/views/page.py
index fe39a98c..8a99ce13 100644
--- a/pydis_site/apps/events/views/page.py
+++ b/pydis_site/apps/events/views/page.py
@@ -14,10 +14,6 @@ class PageView(View):
 
     def get(self, request: WSGIRequest, path: str) -> HttpResponse:
         """Render event page rendering based on path."""
-        # We need to get rid from trailing slash when path have this
-        if path.endswith("/"):
-            path = path[:-1]
-
         page_path = PAGES_PATH.joinpath(path)
         if page_path.exists() and page_path.is_dir():
             page_path = page_path.joinpath("_index.html")
-- 
cgit v1.2.3