stitch together the login sequence better

1 files changed, 5 insertions, 1 deletions

diff --git a/core/views/signup.py b/core/views/signup.py
index 177b2b7..c0360f9 100644
--- a/core/views/signup.py
+++ b/core/views/signup.py
@@ -3,6 +3,7 @@ import re
 from pathlib import Path
 
 import django.forms as forms
+from django.contrib.auth.decorators import login_required
 from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import redirect, render
 from django.urls import reverse
@@ -19,13 +20,16 @@ from troggle.core.utils import (
 )
 from troggle.core.views.editor_helpers import HTMLarea
 
-from .auth import login_required_if_public
 
 """The new user signup form and expo user management system in 2025.
 """
 
 @ensure_csrf_cookie
+@login_required
 def signup(request):
+    if request.user.username in ["expo", "expoadmin"]:
+        return redirect("/accounts/newregister/")
+        # /accounts/login/?next=/signup
     if request.method == "POST":  # If the form has been submitted...
         pageform = ExpoSignupForm(request.POST)  # A form bound to the POST data
         if pageform.is_valid():