refactor: merge Homepage with Page (#996)

Author: gardenerik

bullet/web/templates/web/homepage.html

@@ -14,7 +14,7 @@
         r"^(?P<b_country>[a-z]{2})/(?P<b_language>[a-z\-]+)/",
         include(
             [
-                path("", views.HomepageView.as_view(), name="homepage"),
+                path("", page.PageView.as_view(), name="homepage"),
                 path("", include("competitions.urls")),
                 path("", include("problems.urls")),
                 path("", include("gallery.urls")),

bullet/web/urls.py

@@ -1,53 +1,5 @@
-from competitions.models import Competition
 from django.shortcuts import render
-from django.utils import translation
-from django.views.generic import RedirectView, TemplateView
-
-from web.models import Page
-
-
-class BranchSpecificTemplateMixin:
-    def get_template_names(self):
-        previous = super().get_template_names()
-
-        if self.request.BRANCH is None:
-            return previous
-
-        templates = []
-        for template in previous:
-            templates.append(f"{self.request.BRANCH.identifier}/{template}")
-            templates.append(template)
-        return templates
-
-
-class HomepageView(BranchSpecificTemplateMixin, TemplateView):
-    template_name = "web/homepage.html"
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        self.branch = self.request.BRANCH
-
-        context["competition"] = (
-            competition
-        ) = Competition.objects.get_current_competition(self.branch)
-
-        page = Page.objects.filter(
-            branch=self.request.BRANCH,
-            language=translation.get_language(),
-            countries__contains=[self.request.COUNTRY_CODE.upper()],
-            slug="_homepage_",
-        ).first()
-        if page:
-            current_state = competition.state
-            get_state = self.request.GET.get("state", "")
-            if self.request.user.is_authenticated and get_state.isnumeric():
-                current_state = get_state
-
-            context["page_blocks"] = page.pageblock_set.filter(
-                states__contains=[current_state]
-            ).all()
-
-        return context
+from django.views.generic import RedirectView
 
 
 class AdminRedirectView(RedirectView):

bullet/web/views/__init__.py

@@ -12,7 +12,7 @@ class PageView(TemplateView):
     template_name = "web/page.html"
 
     def get(self, request, *args, **kwargs):
-        if kwargs["slug"] == "_homepage_":
+        if kwargs.get("slug") == "_homepage_":
             return HttpResponseRedirect(country_reverse("homepage"))
         return super().get(request, *args, **kwargs)
 
@@ -27,7 +27,7 @@ def get_context_data(self, **kwargs):
             branch=self.request.BRANCH,
             language=translation.get_language(),
             countries__contains=[self.request.COUNTRY_CODE.upper()],
-            slug=kwargs["slug"],
+            slug=kwargs.get("slug", "_homepage_"),
         )
         context["page"] = page