From 2c65f7ceb0b9778d65f9985ec885298fb2b3a278 Mon Sep 17 00:00:00 2001
From: Jeremy Childers <jeremy@cppalliance.org>
Date: Thu, 4 Jun 2026 16:49:57 -0400
Subject: [PATCH 01/10] Continue work

---
 core/mixins.py                    |  6 ++-
 docker-compose.yml                | 72 +++++++++++++++----------------
 templates/v3/accounts/signup.html | 11 +++--
 users/views.py                    | 19 +++++++-
 4 files changed, 66 insertions(+), 42 deletions(-)

diff --git a/core/mixins.py b/core/mixins.py
index ae0f9b246..fe4ce9f3b 100644
--- a/core/mixins.py
+++ b/core/mixins.py
@@ -21,7 +21,11 @@ class V3Mixin:
     v3_template_name = None
 
     def dispatch(self, request, *args, **kwargs):
-        if self.v3_template_name and flag_is_active(request, "v3"):
+        if (
+            self.v3_template_name
+            and flag_is_active(request, "v3")
+            and request.method == "GET"
+        ):
             self._v3_active = True
             return self.render_v3_response()
         self._v3_active = False
diff --git a/docker-compose.yml b/docker-compose.yml
index 3d294274d..8af215b21 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -49,43 +49,43 @@ services:
       - ../website2022/:/website
     stop_signal: SIGKILL
 
-  # mailman-core:
-  #   image: maxking/mailman-core
-  #   stop_grace_period: 5s
-  #   ports:
-  #     - "8001:8001" # API
-  #     - "8024:8024" # LMTP - incoming emails
-  #   volumes:
-  #     - ./mailman/core:/opt/mailman/
-  #   networks:
-  #     - backend
-  #   env_file:
-  #     - .env
-  #   depends_on:
-  #     - db
+  mailman-core:
+    image: maxking/mailman-core
+    stop_grace_period: 5s
+    ports:
+      - "8001:8001" # API
+      - "8024:8024" # LMTP - incoming emails
+    volumes:
+      - ./mailman/core:/opt/mailman/
+    networks:
+      - backend
+    env_file:
+      - .env
+    depends_on:
+      - db
 
-  # mailman-web:
-  #   image: maxking/mailman-web
-  #   entrypoint: /opt/mailman-docker/compose-start.sh
-  #   env_file:
-  #     - .env
-  #   environment:
-  #     - "DOCKER_DIR=/opt/mailman-docker"
-  #     - "PYTHON=python3"
-  #     - "WEB_PORT=8008"
-  #   depends_on:
-  #     - redis
-  #     - db
-  #   stop_signal: SIGKILL
-  #   ports:
-  #     - "8008:8008" # HTTP
-  #     - "8080:8080" # uwsgi
-  #   volumes:
-  #     - .:/code
-  #     - ./mailman/web:/opt/mailman-web-data
-  #     - ./docker:/opt/mailman-docker
-  #   networks:
-  #     - backend
+  mailman-web:
+    image: maxking/mailman-web
+    entrypoint: /opt/mailman-docker/compose-start.sh
+    env_file:
+      - .env
+    environment:
+      - "DOCKER_DIR=/opt/mailman-docker"
+      - "PYTHON=python3"
+      - "WEB_PORT=8008"
+    depends_on:
+      - redis
+      - db
+    stop_signal: SIGKILL
+    ports:
+      - "8008:8008" # HTTP
+      - "8080:8080" # uwsgi
+    volumes:
+      - .:/code
+      - ./mailman/web:/opt/mailman-web-data
+      - ./docker:/opt/mailman-docker
+    networks:
+      - backend
 
   celery-worker:
     build:
diff --git a/templates/v3/accounts/signup.html b/templates/v3/accounts/signup.html
index b174dd783..bf4379b77 100644
--- a/templates/v3/accounts/signup.html
+++ b/templates/v3/accounts/signup.html
@@ -18,15 +18,16 @@
     redirect_field_value  (string, optional, default unset) — URL to redirect to after signup; hidden input omitted when unset
     password_rules        (list, optional, default unset) — rule objects for password validation checklist
 {% endcomment %}
-{% load static %}
+{% load static socialaccount %}
 {% block auth_content %}
   <div class="auth-page__header">
     <h1 class="auth-page__title">Create an account</h1>
     <p class="auth-page__subtitle">Advance your career, learn from experts, and help shape the future of Boost and C++.</p>
   </div>
   <form class="auth-page__card"
+    id="signup_form"
     method="post"
-    action=""
+    action="/accounts/signup/"
     novalidate
     {# djlint:off #}
       x-data="{ hasErrors: false }"
@@ -62,8 +63,10 @@ <h1 class="auth-page__title">Create an account</h1>
   </form>
   <p class="auth-page__divider">OR</p>
   <div class="auth-page__social-card">
-    {% include "v3/includes/_button.html" with label="Continue with GitHub" url="#" icon_name="github" style="secondary" %}
-    {% include "v3/includes/_button.html" with label="Continue with Google" url="#" icon_name="google-colored" style="secondary" %}
+    {% provider_login_url "github" process="login" scope=scope auth_params=auth_params as github_oauth_url %}
+    {% provider_login_url "google" process="login" scope=scope auth_params=auth_params as google_oauth_url %}
+    {% include "v3/includes/_button.html" with label="Continue with GitHub" url=github_oauth_url icon_name="github" style="secondary" %}
+    {% include "v3/includes/_button.html" with label="Continue with Google" url=google_oauth_url icon_name="google-colored" style="secondary" %}
     {% include "v3/includes/_button.html" with label="Already have an account? Sign in →" url=login_url style="primary" %}
   </div>
 {% endblock auth_content %}
diff --git a/users/views.py b/users/views.py
index 3d03b8685..39744c392 100644
--- a/users/views.py
+++ b/users/views.py
@@ -547,7 +547,7 @@ def form_invalid(self, form):
         return res if res else super().form_invalid(form)
 
 
-class CustomSignupView(ClaimExistingAccountMixin, SignupView):
+class CustomSignupView(ClaimExistingAccountMixin, V3Mixin, SignupView):
     """
     Override the allauth SignupView to customize behavior:
 
@@ -556,6 +556,23 @@ class CustomSignupView(ClaimExistingAccountMixin, SignupView):
     with authors and maintainers.
     """
 
+    v3_template_name = "v3/accounts/signup.html"
+
+    def get_v3_context_data(self, **kwargs):
+        context = super().get_v3_context_data(**kwargs)
+        context["password_rules"] = build_password_rules()
+        context["page_title"] = getattr(self, "page_title", "Account")
+        context["foreground_image_url"] = large_static(
+            "img/v3/auth-page/auth-page-foreground.png"
+        )
+        context["background_image_url"] = large_static(
+            "img/v3/auth-page/auth-page-background.png"
+        )
+        context["login_url"] = reverse_lazy("v3-login")
+        context["signup_url"] = reverse_lazy("v3-signup")
+        context["password_reset_url"] = reverse_lazy("v3-password-reset")
+        return context
+
     def form_invalid(self, form):
         """
         Override this form to catch users who were created as part of the GitHub data

From 63fd56311ecd111dcdf0c12f53efc96fccb3f8dd Mon Sep 17 00:00:00 2001
From: Jeremy Childers <jeremy@cppalliance.org>
Date: Fri, 5 Jun 2026 14:00:22 -0400
Subject: [PATCH 02/10] Clean up commits

---
 core/mixins.py     | 29 +++++++++++++++++--
 docker-compose.yml | 72 +++++++++++++++++++++++-----------------------
 users/views.py     | 46 ++---------------------------
 3 files changed, 66 insertions(+), 81 deletions(-)

diff --git a/core/mixins.py b/core/mixins.py
index fe4ce9f3b..4dfa1c40b 100644
--- a/core/mixins.py
+++ b/core/mixins.py
@@ -1,7 +1,9 @@
-from django.http import Http404
-from django.urls import URLPattern, URLResolver, get_resolver
+from django.http import Http404, HttpResponseNotFound
+from django.urls import URLPattern, URLResolver, get_resolver, reverse_lazy
 from waffle import flag_is_active
 
+from core.templatetags.custom_static import large_static
+
 
 class V3Mixin:
     """Renders a v3 template when the 'v3' waffle flag is active.
@@ -67,3 +69,26 @@ def walk(patterns):
                     yield entry, view_class
 
     yield from walk(get_resolver().url_patterns)
+
+
+class V3AuthContextMixin(V3Mixin):
+    """Shared context for all V3 auth pages (signup, login, password reset, etc.)."""
+
+    def dispatch(self, request, *args, **kwargs):
+        if not flag_is_active(request, "v3"):
+            return HttpResponseNotFound()
+        return super().dispatch(request, *args, **kwargs)
+
+    def get_v3_context_data(self, **kwargs):
+        context = super().get_v3_context_data(**kwargs)
+        context["page_title"] = getattr(self, "page_title", "Account")
+        context["foreground_image_url"] = large_static(
+            "img/v3/auth-page/auth-page-foreground.png"
+        )
+        context["background_image_url"] = large_static(
+            "img/v3/auth-page/auth-page-background.png"
+        )
+        context["login_url"] = reverse_lazy("v3-login")
+        context["signup_url"] = reverse_lazy("v3-signup")
+        context["password_reset_url"] = reverse_lazy("v3-password-reset")
+        return context
diff --git a/docker-compose.yml b/docker-compose.yml
index 8af215b21..3d294274d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -49,43 +49,43 @@ services:
       - ../website2022/:/website
     stop_signal: SIGKILL
 
-  mailman-core:
-    image: maxking/mailman-core
-    stop_grace_period: 5s
-    ports:
-      - "8001:8001" # API
-      - "8024:8024" # LMTP - incoming emails
-    volumes:
-      - ./mailman/core:/opt/mailman/
-    networks:
-      - backend
-    env_file:
-      - .env
-    depends_on:
-      - db
+  # mailman-core:
+  #   image: maxking/mailman-core
+  #   stop_grace_period: 5s
+  #   ports:
+  #     - "8001:8001" # API
+  #     - "8024:8024" # LMTP - incoming emails
+  #   volumes:
+  #     - ./mailman/core:/opt/mailman/
+  #   networks:
+  #     - backend
+  #   env_file:
+  #     - .env
+  #   depends_on:
+  #     - db
 
-  mailman-web:
-    image: maxking/mailman-web
-    entrypoint: /opt/mailman-docker/compose-start.sh
-    env_file:
-      - .env
-    environment:
-      - "DOCKER_DIR=/opt/mailman-docker"
-      - "PYTHON=python3"
-      - "WEB_PORT=8008"
-    depends_on:
-      - redis
-      - db
-    stop_signal: SIGKILL
-    ports:
-      - "8008:8008" # HTTP
-      - "8080:8080" # uwsgi
-    volumes:
-      - .:/code
-      - ./mailman/web:/opt/mailman-web-data
-      - ./docker:/opt/mailman-docker
-    networks:
-      - backend
+  # mailman-web:
+  #   image: maxking/mailman-web
+  #   entrypoint: /opt/mailman-docker/compose-start.sh
+  #   env_file:
+  #     - .env
+  #   environment:
+  #     - "DOCKER_DIR=/opt/mailman-docker"
+  #     - "PYTHON=python3"
+  #     - "WEB_PORT=8008"
+  #   depends_on:
+  #     - redis
+  #     - db
+  #   stop_signal: SIGKILL
+  #   ports:
+  #     - "8008:8008" # HTTP
+  #     - "8080:8080" # uwsgi
+  #   volumes:
+  #     - .:/code
+  #     - ./mailman/web:/opt/mailman-web-data
+  #     - ./docker:/opt/mailman-docker
+  #   networks:
+  #     - backend
 
   celery-worker:
     build:
diff --git a/users/views.py b/users/views.py
index 39744c392..b5e06edff 100644
--- a/users/views.py
+++ b/users/views.py
@@ -6,7 +6,7 @@
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib import auth
 from django.contrib.messages.views import SuccessMessageMixin
-from django.http import HttpResponseNotFound, HttpResponseRedirect
+from django.http import HttpResponseRedirect
 from django.urls import reverse_lazy
 from django.views.generic import DetailView, FormView
 from django.views.generic.base import TemplateView
@@ -22,11 +22,9 @@
 from rest_framework import generics
 from rest_framework import viewsets
 from rest_framework.permissions import IsAuthenticated, AllowAny
-from waffle import flag_is_active
 
 from core.constants import BadgeToken
-from core.mixins import V3Mixin
-from core.templatetags.custom_static import large_static
+from core.mixins import V3Mixin, V3AuthContextMixin
 from libraries.models import CommitAuthorEmail
 from .forms import (
     PreferencesForm,
@@ -547,7 +545,7 @@ def form_invalid(self, form):
         return res if res else super().form_invalid(form)
 
 
-class CustomSignupView(ClaimExistingAccountMixin, V3Mixin, SignupView):
+class CustomSignupView(ClaimExistingAccountMixin, V3AuthContextMixin, SignupView):
     """
     Override the allauth SignupView to customize behavior:
 
@@ -558,21 +556,6 @@ class CustomSignupView(ClaimExistingAccountMixin, V3Mixin, SignupView):
 
     v3_template_name = "v3/accounts/signup.html"
 
-    def get_v3_context_data(self, **kwargs):
-        context = super().get_v3_context_data(**kwargs)
-        context["password_rules"] = build_password_rules()
-        context["page_title"] = getattr(self, "page_title", "Account")
-        context["foreground_image_url"] = large_static(
-            "img/v3/auth-page/auth-page-foreground.png"
-        )
-        context["background_image_url"] = large_static(
-            "img/v3/auth-page/auth-page-background.png"
-        )
-        context["login_url"] = reverse_lazy("v3-login")
-        context["signup_url"] = reverse_lazy("v3-signup")
-        context["password_reset_url"] = reverse_lazy("v3-password-reset")
-        return context
-
     def form_invalid(self, form):
         """
         Override this form to catch users who were created as part of the GitHub data
@@ -600,29 +583,6 @@ def get_context_data(self, **kwargs):
         return context
 
 
-class V3AuthContextMixin(V3Mixin):
-    """Shared context for all V3 auth pages (signup, login, password reset, etc.)."""
-
-    def dispatch(self, request, *args, **kwargs):
-        if not flag_is_active(request, "v3"):
-            return HttpResponseNotFound()
-        return super().dispatch(request, *args, **kwargs)
-
-    def get_v3_context_data(self, **kwargs):
-        context = super().get_v3_context_data(**kwargs)
-        context["page_title"] = getattr(self, "page_title", "Account")
-        context["foreground_image_url"] = large_static(
-            "img/v3/auth-page/auth-page-foreground.png"
-        )
-        context["background_image_url"] = large_static(
-            "img/v3/auth-page/auth-page-background.png"
-        )
-        context["login_url"] = reverse_lazy("v3-login")
-        context["signup_url"] = reverse_lazy("v3-signup")
-        context["password_reset_url"] = reverse_lazy("v3-password-reset")
-        return context
-
-
 class V3SignupView(V3AuthContextMixin, TemplateView):
     v3_template_name = "v3/accounts/signup.html"
     page_title = "Create An Account"

From ef5268afe4ab9c6508e63bd0a70a1663f7bc6aa8 Mon Sep 17 00:00:00 2001
From: Jeremy Childers <jeremy@cppalliance.org>
Date: Fri, 5 Jun 2026 14:16:34 -0400
Subject: [PATCH 03/10] Update oauth to only show available providers

---
 templates/v3/accounts/signup.html | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/templates/v3/accounts/signup.html b/templates/v3/accounts/signup.html
index bf4379b77..dbb93810b 100644
--- a/templates/v3/accounts/signup.html
+++ b/templates/v3/accounts/signup.html
@@ -63,10 +63,17 @@ <h1 class="auth-page__title">Create an account</h1>
   </form>
   <p class="auth-page__divider">OR</p>
   <div class="auth-page__social-card">
-    {% provider_login_url "github" process="login" scope=scope auth_params=auth_params as github_oauth_url %}
-    {% provider_login_url "google" process="login" scope=scope auth_params=auth_params as google_oauth_url %}
-    {% include "v3/includes/_button.html" with label="Continue with GitHub" url=github_oauth_url icon_name="github" style="secondary" %}
-    {% include "v3/includes/_button.html" with label="Continue with Google" url=google_oauth_url icon_name="google-colored" style="secondary" %}
+    {% get_providers as socialaccount_providers %}
+    {% if socialaccount_providers %}
+      {% for provider in socialaccount_providers %}
+        {% provider_login_url provider process="login" scope=scope auth_params=auth_params as href %}
+          {% if provider.name == "GitHub" %}
+            {% include "v3/includes/_button.html" with label="Continue with "|add:provider.name url=href icon_name="github" style="secondary" %}
+          {% elif provider.name == "Google" %}
+            {% include "v3/includes/_button.html" with label="Continue with "|add:provider.name url=href icon_name="google-colored" style="secondary" %}
+          {% endif %}
+      {% endfor %}
+    {% endif %}
     {% include "v3/includes/_button.html" with label="Already have an account? Sign in →" url=login_url style="primary" %}
   </div>
 {% endblock auth_content %}

From 4c57ebc6111f7e261f2a953d518f41ec66dc7af9 Mon Sep 17 00:00:00 2001
From: Jeremy Childers <jeremy@cppalliance.org>
Date: Fri, 5 Jun 2026 14:24:14 -0400
Subject: [PATCH 04/10] Remove V3 specific sign up view

---
 config/v3_urls.py |  6 ------
 users/views.py    | 15 +++++----------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/config/v3_urls.py b/config/v3_urls.py
index 545b93adc..7dceef146 100644
--- a/config/v3_urls.py
+++ b/config/v3_urls.py
@@ -55,7 +55,6 @@
     V3PasswordResetFromKeyDoneView,
     V3PasswordResetFromKeyView,
     V3PasswordResetView,
-    V3SignupView,
 )
 
 v3_urlpatterns = [
@@ -74,11 +73,6 @@
         V3AllTypesCreateView.as_view(),
         name="v3-news-create",
     ),
-    path(
-        "v3/accounts/signup/",
-        V3SignupView.as_view(),
-        name="v3-signup",
-    ),
     path(
         "v3/accounts/login/",
         V3LoginView.as_view(),
diff --git a/users/views.py b/users/views.py
index b5e06edff..eb1ad133c 100644
--- a/users/views.py
+++ b/users/views.py
@@ -556,6 +556,11 @@ class CustomSignupView(ClaimExistingAccountMixin, V3AuthContextMixin, SignupView
 
     v3_template_name = "v3/accounts/signup.html"
 
+    def get_v3_context_data(self, **kwargs):
+        context = super().get_v3_context_data(**kwargs)
+        context["password_rules"] = build_password_rules()
+        return context
+
     def form_invalid(self, form):
         """
         Override this form to catch users who were created as part of the GitHub data
@@ -583,16 +588,6 @@ def get_context_data(self, **kwargs):
         return context
 
 
-class V3SignupView(V3AuthContextMixin, TemplateView):
-    v3_template_name = "v3/accounts/signup.html"
-    page_title = "Create An Account"
-
-    def get_v3_context_data(self, **kwargs):
-        context = super().get_v3_context_data(**kwargs)
-        context["password_rules"] = build_password_rules()
-        return context
-
-
 class V3LoginView(V3AuthContextMixin, TemplateView):
     v3_template_name = "v3/accounts/login.html"
     page_title = "Login"

From aa2b1190c60373acaae7063c63986ff892c1b783 Mon Sep 17 00:00:00 2001
From: Jeremy Childers <jeremy@cppalliance.org>
Date: Tue, 9 Jun 2026 17:24:57 -0400
Subject: [PATCH 05/10] Add disabled style to buttons if TOU not accepted

---
 static/css/v3/auth-page.css       | 31 ++++++++++++++++++++--
 static/css/v3/forms.css           |  4 +++
 templates/v3/accounts/signup.html | 43 +++++++++++++++++++++----------
 users/forms.py                    |  5 ++++
 users/views.py                    |  8 ++++++
 5 files changed, 76 insertions(+), 15 deletions(-)

diff --git a/static/css/v3/auth-page.css b/static/css/v3/auth-page.css
index fce53cccc..36ac9e00b 100644
--- a/static/css/v3/auth-page.css
+++ b/static/css/v3/auth-page.css
@@ -70,7 +70,8 @@ body:has(.auth-page) .header {
 }
 
 .auth-page__illustration-foreground {
-  margin-top: 80px; /* This is the size of the header navbar, added so that the content will not be hidden behind it */
+  margin-top: 80px;
+  /* This is the size of the header navbar, added so that the content will not be hidden behind it */
   position: absolute;
   inset: 0;
   width: 100%;
@@ -85,7 +86,8 @@ body:has(.auth-page) .header {
   justify-content: center;
   align-items: center;
   padding: var(--space-xlarge);
-  margin-top: 80px; /* This is the size of the header navbar, added so that the content will not be hidden behind it */
+  margin-top: 80px;
+  /* This is the size of the header navbar, added so that the content will not be hidden behind it */
 }
 
 .auth-page__content-inner {
@@ -175,6 +177,31 @@ body:has(.auth-page) .header {
   background: var(--color-surface-weak);
 }
 
+/* ── Social Card Disable pending tou ────────────────────── */
+.auth-page__signup-form:not(:has(input[name="accept_terms_of_use"]:checked)) a.btn-secondary,
+.auth-page__signup-form:not(:has(input[name="accept_terms_of_use"]:checked)) button.btn {
+  opacity: 0.5;
+  pointer-events: none;
+  cursor: default;
+}
+
+.auth-page__signup-form:not(:has(input[name="accept_terms_of_use"]:checked)):has(input[name="checkbox-GitHub"]:checked) input[name="accept_terms_of_use"] {
+  background-color: var(--color-surface-error-weak, #fdf2f2);
+  border-color: var(--color-stroke-error, #d53f3f33);
+}
+
+.auth-page__invisible-check {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  clip: rect(0, 0, 0, 0);
+  white-space: nowrap;
+  border: 0;
+}
+
 /* ── Responsive (Tablet) ────────────────────────────── */
 @media (max-width: 1279px) {
   .auth-page__wrapper {
diff --git a/static/css/v3/forms.css b/static/css/v3/forms.css
index abe4fdbeb..53c95c8ca 100644
--- a/static/css/v3/forms.css
+++ b/static/css/v3/forms.css
@@ -641,6 +641,10 @@
   color: var(--color-text-primary, #050816);
 }
 
+.checkbox__label a {
+  text-decoration: underline;
+}
+
 .checkbox--disabled {
   opacity: 0.5;
   cursor: not-allowed;
diff --git a/templates/v3/accounts/signup.html b/templates/v3/accounts/signup.html
index dbb93810b..561d40c5f 100644
--- a/templates/v3/accounts/signup.html
+++ b/templates/v3/accounts/signup.html
@@ -24,7 +24,7 @@
     <h1 class="auth-page__title">Create an account</h1>
     <p class="auth-page__subtitle">Advance your career, learn from experts, and help shape the future of Boost and C++.</p>
   </div>
-  <form class="auth-page__card"
+  <form class="auth-page__card auth-page__signup-form"
     id="signup_form"
     method="post"
     action="/accounts/signup/"
@@ -54,26 +54,43 @@ <h1 class="auth-page__title">Create an account</h1>
       {% for error in form.non_field_errors %}<p class="field__error" role="alert">{{ error }}</p>{% endfor %}
     {% endif %}
     {% include "v3/includes/_field_checkbox.html" with name="mailing_list" label="Also join the Boost Developers Mailing List" %}
+    <label class="checkbox" for="checkbox-accept_terms_of_use">
+        <input
+          class="checkbox__input"
+          type="checkbox"
+          id="checkbox-accept_terms_of_use"
+          name="accept_terms_of_use"
+          value="on"
+          required
+        >
+          <span class="checkbox__box" aria-hidden="true">
+            {% include "includes/icon.html" with icon_name="check" icon_class="checkbox__check" %}
+          </span>
+          <span class="checkbox__label">I have read and accepted the <a href="{% url 'terms-of-use' %}">Term of Use</a> for this service</span>
+    </label>
     {% if redirect_field_value %}
       <input type="hidden"
              name="{{ redirect_field_name }}"
              value="{{ redirect_field_value }}">
     {% endif %}
     {% include "v3/includes/_button.html" with label="Create Account" type="submit" style="primary" alpine_disabled="hasErrors" %}
-  </form>
-  <p class="auth-page__divider">OR</p>
-  <div class="auth-page__social-card">
+    <p class="auth-page__divider">OR</p>
     {% get_providers as socialaccount_providers %}
     {% if socialaccount_providers %}
-      {% for provider in socialaccount_providers %}
-        {% provider_login_url provider process="login" scope=scope auth_params=auth_params as href %}
-          {% if provider.name == "GitHub" %}
-            {% include "v3/includes/_button.html" with label="Continue with "|add:provider.name url=href icon_name="github" style="secondary" %}
-          {% elif provider.name == "Google" %}
-            {% include "v3/includes/_button.html" with label="Continue with "|add:provider.name url=href icon_name="google-colored" style="secondary" %}
-          {% endif %}
-      {% endfor %}
+    {% for provider in socialaccount_providers %}
+    <label for="checkbox-{{provider.name}}">
+    {% provider_login_url provider process="login" scope=scope auth_params=auth_params as href %}
+    <input class="auth-page__invisible-check" id="checkbox-{{provider.name}}" type="checkbox">
+    <div>
+    {% if provider.name == "GitHub" %}
+    {% include "v3/includes/_button.html" with label="Continue with "|add:provider.name url=href icon_name="github" style="secondary" %}
+    {% elif provider.name == "Google" %}
+    {% include "v3/includes/_button.html" with label="Continue with "|add:provider.name url=href icon_name="google-colored" style="secondary" %}
+    {% endif %}
+    </div>
+    </label>
+    {% endfor %}
     {% endif %}
     {% include "v3/includes/_button.html" with label="Already have an account? Sign in →" url=login_url style="primary" %}
-  </div>
+  </form>
 {% endblock auth_content %}
diff --git a/users/forms.py b/users/forms.py
index 4e1d0df8b..385c41050 100644
--- a/users/forms.py
+++ b/users/forms.py
@@ -5,6 +5,7 @@
 from django import forms
 
 from allauth.account.forms import ResetPasswordKeyForm
+from allauth.account.forms import SignupForm
 
 from .models import Preferences
 from news.models import NEWS_MODELS
@@ -25,6 +26,10 @@ def save(self, **kwargs):
         return result
 
 
+class CustomSignUpForm(SignupForm):
+    accept_terms_of_use = forms.BooleanField(required=True)
+
+
 class PreferencesForm(forms.ModelForm):
     allow_notification_own_news_approved = forms.MultipleChoiceField(
         choices=NEWS_ENTRY_CHOICES,
diff --git a/users/views.py b/users/views.py
index eb1ad133c..0eb1beefe 100644
--- a/users/views.py
+++ b/users/views.py
@@ -23,6 +23,8 @@
 from rest_framework import viewsets
 from rest_framework.permissions import IsAuthenticated, AllowAny
 
+from waffle import flag_is_active
+
 from core.constants import BadgeToken
 from core.mixins import V3Mixin, V3AuthContextMixin
 from libraries.models import CommitAuthorEmail
@@ -31,6 +33,7 @@
     UserProfileForm,
     UserProfilePhotoForm,
     DeleteAccountForm,
+    CustomSignUpForm,
 )
 from .models import User
 from .password_rules import build_password_rules
@@ -556,6 +559,11 @@ class CustomSignupView(ClaimExistingAccountMixin, V3AuthContextMixin, SignupView
 
     v3_template_name = "v3/accounts/signup.html"
 
+    def get_form_class(self):
+        if flag_is_active(self.request, "v3"):
+            return CustomSignUpForm
+        return super().get_form_class()
+
     def get_v3_context_data(self, **kwargs):
         context = super().get_v3_context_data(**kwargs)
         context["password_rules"] = build_password_rules()

From 29dcc1b680b20a4be7d60feef309b0ab14fd232f Mon Sep 17 00:00:00 2001
From: Jeremy Childers <jeremy@cppalliance.org>
Date: Wed, 10 Jun 2026 15:09:12 -0400
Subject: [PATCH 06/10] Add css styling for error states

---
 static/css/v3/auth-page.css       | 26 +++++++++++++-------------
 templates/v3/accounts/signup.html | 12 +++++++-----
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/static/css/v3/auth-page.css b/static/css/v3/auth-page.css
index 36ac9e00b..fc45432de 100644
--- a/static/css/v3/auth-page.css
+++ b/static/css/v3/auth-page.css
@@ -185,21 +185,21 @@ body:has(.auth-page) .header {
   cursor: default;
 }
 
-.auth-page__signup-form:not(:has(input[name="accept_terms_of_use"]:checked)):has(input[name="checkbox-GitHub"]:checked) input[name="accept_terms_of_use"] {
-  background-color: var(--color-surface-error-weak, #fdf2f2);
-  border-color: var(--color-stroke-error, #d53f3f33);
+.auth-page__signup-form:has(input[name="invisible-check-protect"]:checked):not(:has(input[name="accept_terms_of_use"]:checked)) .auth-page_tou-checkbox .checkbox__box {
+  background-color: var(--color-surface-error-weak);
+  border-color: var(--color-stroke-error);
 }
 
-.auth-page__invisible-check {
-  position: absolute;
-  width: 1px;
-  height: 1px;
-  padding: 0;
-  margin: -1px;
-  overflow: hidden;
-  clip: rect(0, 0, 0, 0);
-  white-space: nowrap;
-  border: 0;
+.auth-page__signup-form:has(input[name="invisible-check-protect"]:checked):not(:has(input[name="accept_terms_of_use"]:checked)) .auth-page_tou-checkbox .checkbox__label {
+  color: var(--color-text-error);
+}
+
+.auth-page__signup-form:has(input[name="invisible-check-protect"]:checked):not(:has(input[name="accept_terms_of_use"]:checked)) .auth-page__invisible-check-label {
+  pointer-events: none;
+}
+
+.auth-page__invisible-check-label .btn {
+  width: 100%;
 }
 
 /* ── Responsive (Tablet) ────────────────────────────── */
diff --git a/templates/v3/accounts/signup.html b/templates/v3/accounts/signup.html
index 561d40c5f..b5c8308be 100644
--- a/templates/v3/accounts/signup.html
+++ b/templates/v3/accounts/signup.html
@@ -54,7 +54,7 @@ <h1 class="auth-page__title">Create an account</h1>
       {% for error in form.non_field_errors %}<p class="field__error" role="alert">{{ error }}</p>{% endfor %}
     {% endif %}
     {% include "v3/includes/_field_checkbox.html" with name="mailing_list" label="Also join the Boost Developers Mailing List" %}
-    <label class="checkbox" for="checkbox-accept_terms_of_use">
+    <label class="checkbox  auth-page_tou-checkbox" for="checkbox-accept_terms_of_use">
         <input
           class="checkbox__input"
           type="checkbox"
@@ -73,21 +73,23 @@ <h1 class="auth-page__title">Create an account</h1>
              name="{{ redirect_field_name }}"
              value="{{ redirect_field_value }}">
     {% endif %}
+
+    <label class="auth-page__invisible-check-label" for="checkbox-create">
+    <input name="invisible-check-protect" class="checkbox__input" id="checkbox-create" type="checkbox">
     {% include "v3/includes/_button.html" with label="Create Account" type="submit" style="primary" alpine_disabled="hasErrors" %}
+    </label>
     <p class="auth-page__divider">OR</p>
     {% get_providers as socialaccount_providers %}
     {% if socialaccount_providers %}
     {% for provider in socialaccount_providers %}
-    <label for="checkbox-{{provider.name}}">
+    <label class="auth-page__invisible-check-label" for="checkbox-{{provider.name}}">
     {% provider_login_url provider process="login" scope=scope auth_params=auth_params as href %}
-    <input class="auth-page__invisible-check" id="checkbox-{{provider.name}}" type="checkbox">
-    <div>
+    <input name="invisible-check-protect" class="checkbox__input" id="checkbox-{{provider.name}}" type="checkbox">
     {% if provider.name == "GitHub" %}
     {% include "v3/includes/_button.html" with label="Continue with "|add:provider.name url=href icon_name="github" style="secondary" %}
     {% elif provider.name == "Google" %}
     {% include "v3/includes/_button.html" with label="Continue with "|add:provider.name url=href icon_name="google-colored" style="secondary" %}
     {% endif %}
-    </div>
     </label>
     {% endfor %}
     {% endif %}

From 0d96767aa5e3bb74b07642c11fd4875d5b786c39 Mon Sep 17 00:00:00 2001
From: Jeremy Childers <jeremy@cppalliance.org>
Date: Wed, 10 Jun 2026 15:53:26 -0400
Subject: [PATCH 07/10] Correct mixin issue

---
 core/mixins.py                    |  7 +++---
 static/css/v3/auth-page.css       | 36 +++++++++++++++++++++++++++++++
 templates/v3/accounts/signup.html | 14 ++++++++----
 3 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/core/mixins.py b/core/mixins.py
index 4dfa1c40b..5c1ccbf7d 100644
--- a/core/mixins.py
+++ b/core/mixins.py
@@ -1,4 +1,4 @@
-from django.http import Http404, HttpResponseNotFound
+from django.http import Http404
 from django.urls import URLPattern, URLResolver, get_resolver, reverse_lazy
 from waffle import flag_is_active
 
@@ -76,7 +76,8 @@ class V3AuthContextMixin(V3Mixin):
 
     def dispatch(self, request, *args, **kwargs):
         if not flag_is_active(request, "v3"):
-            return HttpResponseNotFound()
+            if not getattr(self, "template_name", None):
+                raise Http404
         return super().dispatch(request, *args, **kwargs)
 
     def get_v3_context_data(self, **kwargs):
@@ -89,6 +90,6 @@ def get_v3_context_data(self, **kwargs):
             "img/v3/auth-page/auth-page-background.png"
         )
         context["login_url"] = reverse_lazy("v3-login")
-        context["signup_url"] = reverse_lazy("v3-signup")
+        context["signup_url"] = reverse_lazy("account_signup")
         context["password_reset_url"] = reverse_lazy("v3-password-reset")
         return context
diff --git a/static/css/v3/auth-page.css b/static/css/v3/auth-page.css
index fc45432de..8a5510467 100644
--- a/static/css/v3/auth-page.css
+++ b/static/css/v3/auth-page.css
@@ -154,6 +154,24 @@ body:has(.auth-page) .header {
   color: var(--color-text-link-accent);
 }
 
+/* ── Sign In Link ──────────────────────────── */
+.auth-page__sign-in-link {
+  width: 100%;
+  text-align: center;
+  color: var(--color-text-primary);
+  font-family: var(--font-sans);
+  font-size: var(--font-size-small);
+  font-weight: var(--font-weight-regular);
+  line-height: var(--line-height-tight);
+  letter-spacing: var(--letter-spaceing-tight);
+  margin-bottom: var(--space-large) !important;
+}
+
+.auth-page__sign-in-link a{
+  text-decoration: underline;
+  color: var(--color-text-link-accent);
+}
+
 /* ── Divider ───────────────────────────────── */
 .auth-page__divider {
   font-family: var(--font-display);
@@ -166,6 +184,24 @@ body:has(.auth-page) .header {
   margin: 0;
 }
 
+.auth-page__signup-divider {
+  color: var(--color-text-tertiary);
+  font-family: var(--font-sans);
+  font-size: var(--font-size-xs);
+  font-weight: var(--font-weight-regular);
+  line-height: var(--line-height-default);
+  letter-spacing: var(--letter-spaceing-tight);
+  margin: 0;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  gap: 10px;
+}
+
+.auth-page__signup-divider hr {
+  flex: 1 1 0;
+}
+
 /* ── Social Card ───────────────────────────── */
 .auth-page__social-card {
   display: flex;
diff --git a/templates/v3/accounts/signup.html b/templates/v3/accounts/signup.html
index b5c8308be..a6320fe73 100644
--- a/templates/v3/accounts/signup.html
+++ b/templates/v3/accounts/signup.html
@@ -27,7 +27,7 @@ <h1 class="auth-page__title">Create an account</h1>
   <form class="auth-page__card auth-page__signup-form"
     id="signup_form"
     method="post"
-    action="/accounts/signup/"
+    action=""
     novalidate
     {# djlint:off #}
       x-data="{ hasErrors: false }"
@@ -66,7 +66,7 @@ <h1 class="auth-page__title">Create an account</h1>
           <span class="checkbox__box" aria-hidden="true">
             {% include "includes/icon.html" with icon_name="check" icon_class="checkbox__check" %}
           </span>
-          <span class="checkbox__label">I have read and accepted the <a href="{% url 'terms-of-use' %}">Term of Use</a> for this service</span>
+          <span class="checkbox__label">I have read and accepted the <a href="{% url 'terms-of-use' %}">Terms of Use</a> for this service</span>
     </label>
     {% if redirect_field_value %}
       <input type="hidden"
@@ -78,7 +78,13 @@ <h1 class="auth-page__title">Create an account</h1>
     <input name="invisible-check-protect" class="checkbox__input" id="checkbox-create" type="checkbox">
     {% include "v3/includes/_button.html" with label="Create Account" type="submit" style="primary" alpine_disabled="hasErrors" %}
     </label>
-    <p class="auth-page__divider">OR</p>
+    <div class="auth-page__signup-divider">
+      <hr />
+      <span>
+      OR
+      </span>
+      <hr />
+    </div>
     {% get_providers as socialaccount_providers %}
     {% if socialaccount_providers %}
     {% for provider in socialaccount_providers %}
@@ -93,6 +99,6 @@ <h1 class="auth-page__title">Create an account</h1>
     </label>
     {% endfor %}
     {% endif %}
-    {% include "v3/includes/_button.html" with label="Already have an account? Sign in →" url=login_url style="primary" %}
   </form>
+  <p class="auth-page__sign-in-link">Already have an account? <a href="{{login_url}}">Sign in</a></p>
 {% endblock auth_content %}

From c6194c2471010a1516c4726f629d5a54e1b4bdc5 Mon Sep 17 00:00:00 2001
From: Jeremy Childers <jeremy@cppalliance.org>
Date: Wed, 10 Jun 2026 16:02:05 -0400
Subject: [PATCH 08/10] Correct typo

---
 static/css/v3/auth-page.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/static/css/v3/auth-page.css b/static/css/v3/auth-page.css
index 8a5510467..7375be9d1 100644
--- a/static/css/v3/auth-page.css
+++ b/static/css/v3/auth-page.css
@@ -163,7 +163,7 @@ body:has(.auth-page) .header {
   font-size: var(--font-size-small);
   font-weight: var(--font-weight-regular);
   line-height: var(--line-height-tight);
-  letter-spacing: var(--letter-spaceing-tight);
+  letter-spacing: var(--letter-spacing-tight);
   margin-bottom: var(--space-large) !important;
 }
 
@@ -190,7 +190,7 @@ body:has(.auth-page) .header {
   font-size: var(--font-size-xs);
   font-weight: var(--font-weight-regular);
   line-height: var(--line-height-default);
-  letter-spacing: var(--letter-spaceing-tight);
+  letter-spacing: var(--letter-spacing-tight);
   margin: 0;
   display: flex;
   flex-direction: row;

From 347d59e3bb8ff647834126e0b033b580900148cb Mon Sep 17 00:00:00 2001
From: Jeremy Childers <jeremy@cppalliance.org>
Date: Thu, 11 Jun 2026 15:16:55 -0400
Subject: [PATCH 09/10] Refactor v3mixin to allow for more seemless passthrough

---
 ak/views.py        |  2 +-
 core/mixins.py     | 25 ++++++++++++-------------
 core/views.py      |  5 ++---
 libraries/views.py | 19 +++++++------------
 news/views.py      |  6 +++++-
 users/views.py     |  2 +-
 versions/views.py  |  2 +-
 7 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/ak/views.py b/ak/views.py
index 64a26a320..58e4db7d0 100644
--- a/ak/views.py
+++ b/ak/views.py
@@ -74,7 +74,7 @@ def get_events(self):
         return dict(sorted_events)
 
     def get_v3_context_data(self, **kwargs):
-        ctx = super().get_context_data(**kwargs)
+        ctx = super().get_v3_context_data(**kwargs)
         ctx["install_card_pkg_managers"] = SharedResources.install_card_pkg_managers
         ctx["install_card_system_install"] = SharedResources.install_card_system_install
 
diff --git a/core/mixins.py b/core/mixins.py
index 5c1ccbf7d..3928fa9dc 100644
--- a/core/mixins.py
+++ b/core/mixins.py
@@ -1,11 +1,12 @@
 from django.http import Http404
 from django.urls import URLPattern, URLResolver, get_resolver, reverse_lazy
+from django.views.generic import TemplateView
 from waffle import flag_is_active
 
 from core.templatetags.custom_static import large_static
 
 
-class V3Mixin:
+class V3Mixin(TemplateView):
     """Renders a v3 template when the 'v3' waffle flag is active.
 
     Hooks into dispatch() to short-circuit the normal view flow (e.g.
@@ -23,26 +24,24 @@ class V3Mixin:
     v3_template_name = None
 
     def dispatch(self, request, *args, **kwargs):
-        if (
-            self.v3_template_name
-            and flag_is_active(request, "v3")
-            and request.method == "GET"
-        ):
+        if self.v3_template_name and flag_is_active(request, "v3"):
             self._v3_active = True
-            return self.render_v3_response()
+            return super().dispatch(request, *args, **kwargs)
         self._v3_active = False
         if not getattr(self, "template_name", None):
             raise Http404
         return super().dispatch(request, *args, **kwargs)
 
+    def get_context_data(self, **kwargs):
+        if getattr(self, "_v3_active", False):
+            context = super().get_context_data(**self.get_v3_context_data(**kwargs))
+        else:
+            context = super().get_context_data(**kwargs)
+        return context
+
     def get_v3_context_data(self, **kwargs):
         """Override in subclasses to provide v3-specific context."""
-        return {}
-
-    def render_v3_response(self):
-        """Render the v3 template through Django's standard TemplateView pipeline."""
-        context = self.get_context_data(**self.get_v3_context_data())
-        return self.render_to_response(context)
+        return {**kwargs}
 
     def get_template_names(self):
         if getattr(self, "_v3_active", False):
diff --git a/core/views.py b/core/views.py
index b17dd28e5..b764f1b3f 100644
--- a/core/views.py
+++ b/core/views.py
@@ -114,13 +114,12 @@ class CalendarView(V3Mixin, TemplateView):
     v3_template_name = "v3/calendar.html"
 
     def get_context_data(self, **kwargs):
-        ctx = super().get_context_data(**kwargs)
+        ctx = {}
         ctx["boost_calendar"] = settings.BOOST_CALENDAR
         return ctx
 
     def get_v3_context_data(self, **kwargs):
         ctx = super().get_v3_context_data(**kwargs)
-        print(self.request.headers)
         ctx["timezone"] = "America/Chicago"
         return ctx
 
@@ -502,7 +501,7 @@ class LearnPageView(V3Mixin, TemplateView):
     v3_template_name = "v3/learn_page.html"
 
     def get_v3_context_data(self, **kwargs):
-        ctx = self.get_context_data(**kwargs)
+        ctx = super().get_v3_context_data(**kwargs)
         ctx["learn_card_data"] = [
             {
                 "title": "I want to learn:",
diff --git a/libraries/views.py b/libraries/views.py
index 866ff6a1d..34097d9ec 100644
--- a/libraries/views.py
+++ b/libraries/views.py
@@ -125,7 +125,10 @@ class LibraryListBase(BoostVersionMixin, V3Mixin, VersionAlertMixin, ListView):
     v3_template_name = "v3/library_page.html"
 
     def get_v3_context_data(self, queryset=None, **kwargs):
-        context = {}
+        queryset = self.get_queryset()
+        context = super().get_v3_context_data(
+            **kwargs, object_list=queryset, queryset=queryset
+        )
         view_str = self.kwargs.get("library_view_str")
 
         cpp_options = [("all", "All")] + list(
@@ -258,16 +261,6 @@ def get_v3_context_data(self, queryset=None, **kwargs):
         context["library_search_query"] = self.request.GET.get("q", "")
         return context
 
-    def render_v3_response(self):
-        """Render the v3 template through Django's standard TemplateView pipeline."""
-        queryset = self.get_queryset()
-        # Resolve selected_version once so get_v3_context_data can reuse it.
-        self._selected_version = self._resolve_selected_version()
-        context = self.get_context_data(
-            **self.get_v3_context_data(queryset=queryset), object_list=queryset
-        )
-        return self.render_to_response(context)
-
     def _resolve_selected_version(self):
         version_slug = determine_selected_boost_version(
             self.kwargs.get("version_slug"), self.request
@@ -326,8 +319,10 @@ def get_categories(self, version=None):
         )
 
     def dispatch(self, request, *args, **kwargs):
-        """Set the selected version in the cookies."""
+        # Resolve selected_version once so get_v3_context_data can reuse it.
+        self._selected_version = self._resolve_selected_version()
         response = super().dispatch(request, *args, **kwargs)
+        """Set the selected version in the cookies."""
         set_selected_boost_version(self.kwargs.get("version_slug"), response)
         view = get_prioritized_library_view(request)
         if request.resolver_match.view_name == "libraries":
diff --git a/news/views.py b/news/views.py
index 05883abf2..c3cb3ef0a 100644
--- a/news/views.py
+++ b/news/views.py
@@ -154,6 +154,7 @@ def get_v3_context_data(self, **kwargs):
             "libraries": self.libary_values,
             "header_text": self.header_text,
             "filter_value": self.filter_value,
+            **kwargs,
         }
 
     def get_queryset(self):
@@ -176,7 +177,10 @@ def get_queryset(self):
         return result
 
     def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
+        object_list = self.get_queryset()
+        context = super().get_context_data(
+            queryset=object_list, object_list=object_list, **kwargs
+        )
         context["is_moderator"] = False
 
         if self.request.user.is_authenticated:
diff --git a/users/views.py b/users/views.py
index 0eb1beefe..de76fc3a7 100644
--- a/users/views.py
+++ b/users/views.py
@@ -102,7 +102,7 @@ class CurrentUserProfileView(
 
     def get_v3_context_data(self, **kwargs):
         user = self.request.user
-        ctx = {}
+        ctx = super().get_v3_context_data(**kwargs)
         ctx["user_info"] = {
             "user_name": user.display_name,
             "avatar_url": user.get_avatar_url(),
diff --git a/versions/views.py b/versions/views.py
index 43c57aee4..f9243ee3d 100755
--- a/versions/views.py
+++ b/versions/views.py
@@ -174,7 +174,7 @@ def get_version_heading(self, obj, is_current_release):
 
     def get_v3_context_data(self, **kwargs):
         obj = self.object
-        ctx = {}
+        ctx = super().get_v3_context_data(**kwargs)
         ctx["hero_title"] = f"Latest release ({obj.display_name})"
         ctx["whats_new_heading"] = f"What's new in {obj.display_name}"
         ctx["whats_new_items"] = [

From da6bb83ef3820f931b92c27d176435a080e04f54 Mon Sep 17 00:00:00 2001
From: Jeremy Childers <jeremy@cppalliance.org>
Date: Thu, 11 Jun 2026 15:59:43 -0400
Subject: [PATCH 10/10] Correct test errors

---
 core/mixins.py |  3 +--
 news/views.py  | 25 +------------------------
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/core/mixins.py b/core/mixins.py
index 3928fa9dc..f672b69e2 100644
--- a/core/mixins.py
+++ b/core/mixins.py
@@ -1,12 +1,11 @@
 from django.http import Http404
 from django.urls import URLPattern, URLResolver, get_resolver, reverse_lazy
-from django.views.generic import TemplateView
 from waffle import flag_is_active
 
 from core.templatetags.custom_static import large_static
 
 
-class V3Mixin(TemplateView):
+class V3Mixin:
     """Renders a v3 template when the 'v3' waffle flag is active.
 
     Hooks into dispatch() to short-circuit the normal view flow (e.g.
diff --git a/news/views.py b/news/views.py
index c3cb3ef0a..480bbde0d 100644
--- a/news/views.py
+++ b/news/views.py
@@ -95,26 +95,6 @@ class EntryListView(V3Mixin, ListView):
     def libary_values(self):
         return [(x.slug, x.name) for x in Library.objects.all().order_by("name")]
 
-    def render_v3_response(self):
-        """Render the v3 template through Django's standard TemplateView pipeline."""
-        if post_filter := self.request.GET.get("post-filter"):
-            match post_filter:
-                case "all":
-                    return HttpResponseRedirect(reverse_lazy("news"))
-                case "blogpost":
-                    return HttpResponseRedirect(reverse_lazy("news-blogpost-list"))
-                case "video":
-                    return HttpResponseRedirect(reverse_lazy("news-video-list"))
-                case "news":
-                    return HttpResponseRedirect(reverse_lazy("news-news-list"))
-                case "link":
-                    return HttpResponseRedirect(reverse_lazy("news-link-list"))
-
-        context = self.get_context_data(
-            **self.get_v3_context_data(), object_list=self.get_queryset()
-        )
-        return self.render_to_response(context)
-
     def get_v3_context_data(self, **kwargs):
         return {
             "filter_terms": [
@@ -177,10 +157,7 @@ def get_queryset(self):
         return result
 
     def get_context_data(self, **kwargs):
-        object_list = self.get_queryset()
-        context = super().get_context_data(
-            queryset=object_list, object_list=object_list, **kwargs
-        )
+        context = super().get_context_data(**kwargs)
         context["is_moderator"] = False
 
         if self.request.user.is_authenticated: