fixed redirection when register form submission failed

billybillydev · Jul 17, 2024 · 0a0f9f8 · 0a0f9f8
1 parent 3aee606
commit 0a0f9f8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/src/components/auth.component.tsx b/src/components/auth.component.tsx
@@ -21,7 +21,6 @@ export function RegisterForm() {
       hx-target-500={`#${errorRegisterId}`}
       hx-target-4xx={`#${errorRegisterId}`}
       hx-target="main"
-      hx-push-url="/"
     >
       <p class="text-red-500 text-center text-lg" id={errorRegisterId} />
       <FormField fieldName="name" />

diff --git a/src/components/habits.component.tsx b/src/components/habits.component.tsx
@@ -5,7 +5,7 @@ import {
   SecondaryButton,
 } from "$components/buttons.component";
 import { FormField } from "$components/fields.component";
-import { Notification } from "$components/notifications.component";
+import { Notification, notificationListId } from "$components/notifications.component";
 import { LimitPaginationRadio } from "$components/pagination.component";
 import { Habit } from "$db/models";
 import { generateDatesByNumberOfDays } from "$lib";
@@ -189,7 +189,7 @@ export function HabitComponent({
           variant="solid"
           hx-delete={`/api/habits/${item._id}`}
           hx-swap="afterbegin"
-          hx-target="#notification-list"
+          hx-target={`#${notificationListId}`}
           hx-confirm="Are you sure ?"
         />
       </div>
@@ -374,7 +374,7 @@ export function HabitsBulkDeletion() {
         x-on:click={`
           items = Array.from($manage("#habit-list").itemIdsToDelete);
           if (window.confirm("Are you sure to delete these " + nbItemsToDelete + " items ?")) {
-            htmx.ajax("DELETE", "/api/habits/bulk?" + items.map((item) => "items=" + item).join("&"), { target: "#notification-list", swap: "afterbegin" });
+            htmx.ajax("DELETE", "/api/habits/bulk?" + items.map((item) => "items=" + item).join("&"), { target: "#${notificationListId}", swap: "afterbegin" });
           }
         `}
       >

diff --git a/src/controllers/api/auth.api.controller.tsx b/src/controllers/api/auth.api.controller.tsx
@@ -185,6 +185,8 @@ const registerApiController = new Hono<{ Variables: AppVariables }>().post(
       path: sessionCookie.attributes.path,
       maxAge: sessionCookie.attributes.maxAge,
     });
+
+    ctx.header("Hx-Push-Url", "/");
 
     return ctx.html(
       <HomePage

diff --git a/src/script/alpine/magic/notification.js b/src/script/alpine/magic/notification.js
@@ -17,7 +17,7 @@ export function notificationMagic() {
     const notificationListElement = document.getElementById(notificationListId);
     if (!notificationListElement) {
       const bodyElement = document.body;
-      if (!notificationListElement) {
+      if (!bodyElement) {
         console.error("Body was not found");
         return;
       }