fix: removed htmx from form

Author: Yadu-M

backend/views/core/auth/login.py

@@ -46,39 +46,43 @@ def login_manual(request: HttpRequest):
     redirect_url = request.POST.get("next", "")
 
     if not email:
-        return render_error_toast_message(request, "Please enter an email")
+        messages.error(request, "Please enter an email")
+        return redirect_to_login(email, redirect_url)
 
     try:
         validate_email(email)
     except ValidationError:
-        return render_error_toast_message(request, "Please enter a valid email")
+        messages.error(request, "Please enter a valid email")
+        return redirect_to_login(email, redirect_url)
 
     if not password:
-        return render_error_toast_message(request, "Please enter a password")
+        messages.error(request, "Please enter a password")
+        return redirect_to_login(email, redirect_url)
 
     user = authenticate(request, username=email, password=password)
 
     if not user:
-        return render_error_toast_message(request, "Incorrect email or password")
+        messages.error(request, "Incorrect email or password")
+        return redirect_to_login(email, redirect_url)
 
     if user.awaiting_email_verification and ARE_EMAILS_ENABLED:  # type: ignore[attr-defined]
-        return render_error_toast_message(request, "You must verify your email before logging in.")
+        messages.error(request, "You must verify your email before logging in.")
+        return redirect_to_login(email, redirect_url)
 
     login(request, user)
 
-    response = HttpResponse(status=200)
-
     if user.require_change_password:  # type: ignore[attr-defined]
         messages.warning(request, "You have been requested by an administrator to change your account password.")
-        response["HX-Redirect"] = reverse("settings:change_password")
-    else:
-        try:
-            resolve(redirect_url)
-            response["HX-Redirect"] = redirect_url
-        except Resolver404:
-            response["HX-Redirect"] = "/dashboard/"
+        return redirect("settings:change_password")
+    
+    try:
+        resolve(redirect_url)
+        return redirect(redirect_url)
+    except Resolver404:
+        return redirect("dashboard")
 
-    return response
+def redirect_to_login(email: str, redirect_url: str):
+    return redirect(f"{reverse('auth:login')}?email={email}&next={redirect_url}")
 
 
 def render_error_toast_message(request: HttpRequest, message: str) -> HttpResponse:

frontend/templates/pages/auth/login_initial.html

@@ -70,13 +70,9 @@
         }
 
     </style>
-    <form method="post"
-          class="slide-transition"
-          hx-swap="none"
-          hx-post="{% url 'auth:login manual' %}"
-          action="{% url 'auth:login manual' %}"
-          hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
-          hx-indicator='button[data-hx-loading="save"]'>
+    <form id="login-form"
+          method="post"
+          action="{% url 'auth:login manual' %}">
         {% csrf_token %}
         <noscript>
             <div data-theme="dim"
@@ -105,7 +101,7 @@ <h2 class="text-2xl font-bold text-center">
                    pattern="[^@\s]+@[^@\s]+\.[^@\s]+"
                    placeholder="jsmith@example.com"
                    class="peer input input-bordered w-full"
-                   value="{{ attempted_email|default_if_none:'' }}">
+                   value="{{ request.GET.email|default_if_none:'' }}">
             <label class="label peer-[&amp;:not(:placeholder-shown):not(:focus):invalid]:block hidden">
                 <span class="label-text-alt text-error">Please enter a valid email.</span>
             </label>
@@ -122,10 +118,10 @@ <h2 class="text-2xl font-bold text-center">
                    placeholder="********"
                    class="input input-bordered w-full">
         </div>
-        <button class="btn btn-primary loading-htmx mt-5 w-full"
+        <button id="login-btn" class="btn btn-primary loading-htmx mt-5 w-full"
                 data-hx-loading="save"
                 type="submit">
-            Login
+            <span class="loading-htmx-text">Login</span>
             <span id="currency_save_loading"
                   class="loading loading-spinner loading-htmx-loader"></span>
         </button>
@@ -162,4 +158,14 @@ <h2 class="text-2xl font-bold text-center">
             </a>
         {% endif %}
     </form>
+    <script>
+        // Displays loader and disables button when form is submitted
+        const form = document.getElementById("login-form");
+        form.addEventListener("submit", (event) => {
+            const button = document.getElementById("login-btn");
+            const loader = document.getElementById("currency_save_loading");
+            button.setAttribute("disabled", "");
+            loader.style.display = "inline-block";
+        })
+    </script>
 {% endblock %}