diff --git a/.env.example b/.env.example
index f8670395a..e32b4224f 100644
--- a/.env.example
+++ b/.env.example
@@ -13,6 +13,7 @@ SUPABASE_ANON_PUBLIC="{ANON_PUBLIC}"
 SUPABASE_SERVICE_ROLE="{SERVICE_ROLE}"
 SUPABASE_URL="https://{YOUR_INSTANCE_NAME}.supabase.co"
 SERVER_URL="http://localhost:3000"
+APP_NAME="Shelf"
 
 
 # Set this to false to disable requirement of subscription for premium features. This will make premium features available for all users
@@ -36,6 +37,6 @@ INVITE_TOKEN_SECRET="secret-test-invite"
 GEOCODE_API_KEY="geocode-api-key"
 
 # Used for Sentry error logging
-SENTRY_DSN="sentry-dsn"
 SENTRY_ORG="sentry-org"
-SENTRY_PROJECT="sentry-project"
\ No newline at end of file
+SENTRY_PROJECT="sentry-project"
+SENTRY_DSN="sentry-dsn"
diff --git a/app/components/assets/asset-image.tsx b/app/components/assets/asset-image.tsx
index 118ef43fc..9033ef52e 100644
--- a/app/components/assets/asset-image.tsx
+++ b/app/components/assets/asset-image.tsx
@@ -24,7 +24,7 @@ export const AssetImage = ({
   const url =
     mainImage ||
     fetcher?.data?.asset?.mainImage ||
-    "/images/asset-placeholder.jpg";
+    "/static/images/asset-placeholder.jpg";
 
   useEffect(() => {
     if (mainImage && mainImageExpiration) {
diff --git a/app/components/assets/custom-fields-inputs.tsx b/app/components/assets/custom-fields-inputs.tsx
index 86fc31b34..022931e0a 100644
--- a/app/components/assets/custom-fields-inputs.tsx
+++ b/app/components/assets/custom-fields-inputs.tsx
@@ -23,7 +23,7 @@ import {
   SelectValue,
   SelectItem,
 } from "../forms";
-import { Calendar } from "../forms/calender-input";
+import { Calendar } from "../forms/calendar-input";
 import FormRow from "../forms/form-row";
 import Input from "../forms/input";
 import { Switch } from "../forms/switch";
diff --git a/app/components/assets/form.tsx b/app/components/assets/form.tsx
index 26fbe3655..bf11e548f 100644
--- a/app/components/assets/form.tsx
+++ b/app/components/assets/form.tsx
@@ -252,6 +252,7 @@ export const AssetForm = ({
             label={zo.fields.description()}
             name={zo.fields.description()}
             defaultValue={description || ""}
+            hideLabel
             placeholder="Add a description for your asset."
             disabled={disabled}
             data-test-id="assetDescription"
diff --git a/app/components/assets/notes/notes.tsx b/app/components/assets/notes/notes.tsx
index 695d4e1f1..6515ecedd 100644
--- a/app/components/assets/notes/notes.tsx
+++ b/app/components/assets/notes/notes.tsx
@@ -50,7 +50,7 @@ export const Notes = () => {
         <div className="flex h-[500px] items-center  justify-center">
           <div className="flex flex-col items-center justify-center p-[16px] text-center md:p-[50px]">
             <img
-              src="/images/no-notes.svg"
+              src="/static/images/no-notes.svg"
               alt="Graphic for no notes"
               className="mb-6 w-[172px]"
             />
diff --git a/app/components/custody/custodian-select.tsx b/app/components/custody/custodian-select.tsx
index d505a6be6..140a5bc43 100644
--- a/app/components/custody/custodian-select.tsx
+++ b/app/components/custody/custodian-select.tsx
@@ -88,7 +88,7 @@ export default function CustodianSelect(
                         <img
                           src={
                             member.user.profilePicture ||
-                            "/images/default_pfp.jpg"
+                            "/static/images/default_pfp.jpg"
                           }
                           className={"w-[20px] rounded-[4px]"}
                           alt={`${member.user.firstName} ${member.user.lastName}'s profile`}
diff --git a/app/components/dashboard/announcement-bar.tsx b/app/components/dashboard/announcement-bar.tsx
index 18bcb6ba4..886f30afb 100644
--- a/app/components/dashboard/announcement-bar.tsx
+++ b/app/components/dashboard/announcement-bar.tsx
@@ -7,7 +7,7 @@ import { Button } from "../shared/button";
 export default function AnnouncementBar() {
   const { announcement } = useLoaderData<typeof loader>();
   return announcement ? (
-    <div className="mb:gap-4 mb:p-4 mb-4 flex items-center gap-2 rounded border border-gray-200 px-2 py-3">
+    <div className="mb:gap-4 mb:p-4 mb-4 mt-3 flex items-center gap-2 rounded border border-gray-200 px-2 py-3">
       <div className="inline-flex items-center justify-center rounded-full border-[6px] border-solid border-primary-50 bg-primary-100 p-1.5 text-primary">
         <StarsIcon />
       </div>
diff --git a/app/components/dashboard/custodians.tsx b/app/components/dashboard/custodians.tsx
index 4d7e52cbc..f8142c518 100644
--- a/app/components/dashboard/custodians.tsx
+++ b/app/components/dashboard/custodians.tsx
@@ -76,7 +76,7 @@ function Row({
                 src={
                   custodian?.user?.profilePicture
                     ? custodian?.user?.profilePicture
-                    : "/images/default_pfp.jpg"
+                    : "/static/images/default_pfp.jpg"
                 }
                 className={"size-10 rounded-[4px]"}
                 alt={`${custodian.name}'s profile`}
diff --git a/app/components/dashboard/empty-state.tsx b/app/components/dashboard/empty-state.tsx
index c486995b8..9c8c68c4c 100644
--- a/app/components/dashboard/empty-state.tsx
+++ b/app/components/dashboard/empty-state.tsx
@@ -2,7 +2,7 @@ export function EmptyState({ text }: { text: string }) {
   return (
     <div className="flex size-full min-h-[200px] flex-col items-center justify-center">
       <img
-        src="/images/empty-state.svg"
+        src="/static/images/empty-state.svg"
         alt="Empty state"
         className="h-auto w-[45px]"
       />
diff --git a/app/components/errors/content.tsx b/app/components/errors/content.tsx
index 133f4de50..8085f762a 100644
--- a/app/components/errors/content.tsx
+++ b/app/components/errors/content.tsx
@@ -37,7 +37,7 @@ const InnerContent = ({ title, message, showReload }: ErrorContentProps) => {
   return (
     <div className="flex size-full items-center justify-center">
       <div className="flex flex-col items-center text-center">
-        <img src="/images/error-icon.svg" alt={title} className="mb-5" />
+        <img src="/static/images/error-icon.svg" alt={title} className="mb-5" />
         <h2 className="mb-2">{title}</h2>
         <p className="max-w-[550px]">
           {NODE_ENV === "production"
diff --git a/app/components/errors/index.tsx b/app/components/errors/index.tsx
index 85630f7da..e025dd83e 100644
--- a/app/components/errors/index.tsx
+++ b/app/components/errors/index.tsx
@@ -73,6 +73,7 @@ export const ErrorBoundryComponent = ({
           )
         }
       />
+
     );
   } else {
     return (
diff --git a/app/components/forms/calendar-input.tsx b/app/components/forms/calendar-input.tsx
new file mode 100644
index 000000000..f6b3e6440
--- /dev/null
+++ b/app/components/forms/calendar-input.tsx
@@ -0,0 +1,83 @@
+"use client";
+
+import { ChevronLeftIcon, ChevronRightIcon } from "@radix-ui/react-icons";
+import { DayPicker } from "react-day-picker";
+
+import { tw } from "~/utils";
+
+type CalendarProps = {
+  className?: any;
+  classNames?: any;
+  showOutsideDays?: boolean;
+  selected: any;
+  onSelect: any;
+  [x: string]: any;
+};
+
+const Calendar: React.ForwardRefRenderFunction<HTMLElement, CalendarProps> = (
+  {
+    className,
+    classNames,
+    showOutsideDays = true,
+    selected,
+    onSelect,
+    ...props
+  },
+  _ref // This is the forwarded ref
+) => (
+  <>
+    <DayPicker
+      onSelect={(_range: unknown, d: Date) => {
+        onSelect(d);
+      }}
+      selected={selected}
+      showOutsideDays={showOutsideDays}
+      className={tw(
+        "border-indigo z-100 z-50 border-4 bg-slate-200 p-3",
+        className
+      )}
+      classNames={{
+        months: "flex flex-col sm:flex-row space-y-4 sm:space-x-4 sm:space-y-0",
+        month: "space-y-4",
+        caption: "flex justify-center pt-1 relative items-center",
+        caption_label: "text-sm font-medium",
+        nav: "space-x-1 flex items-center",
+        nav_button: tw(
+          "size-7 bg-transparent p-0 opacity-50 hover:opacity-100"
+        ),
+        nav_button_previous: "absolute left-1",
+        nav_button_next: "absolute right-1",
+        table: "w-full border-collapse space-y-1",
+        head_row: "flex",
+        head_cell:
+          "text-muted-foreground rounded-md w-8 font-normal text-[0.8rem]",
+        row: "flex w-full mt-2",
+        cell: tw(
+          "[&:has([aria-selected])]:bg-accent relative p-0 text-center text-sm focus-within:relative focus-within:z-20",
+          props.mode === "range"
+            ? "[&:has(>.day-range-end)]:rounded-r-md [&:has(>.day-range-start)]:rounded-l-md first:[&:has([aria-selected])]:rounded-l-md last:[&:has([aria-selected])]:rounded-r-md"
+            : "[&:has([aria-selected])]:rounded-md"
+        ),
+        day: tw("size-8 p-0 font-normal aria-selected:opacity-100"),
+        day_range_start: "day-range-start",
+        day_range_end: "day-range-end",
+        day_selected:
+          "bg-primary text-primary-foreground hover:bg-primary hover:text-primary-foreground focus:bg-primary focus:text-primary-foreground",
+        day_today: "bg-accent text-accent-foreground",
+        day_outside: "text-muted-foreground opacity-50",
+        day_disabled: "text-muted-foreground opacity-50",
+        day_range_middle:
+          "aria-selected:bg-accent aria-selected:text-accent-foreground",
+        day_hidden: "invisible",
+        ...classNames,
+      }}
+      components={{
+        IconLeft: () => <ChevronLeftIcon className="size-4" />,
+        IconRight: () => <ChevronRightIcon className="size-4" />,
+      }}
+      {...props}
+    />
+  </>
+);
+
+export { Calendar };
diff --git a/app/components/forms/calender-input.tsx b/app/components/forms/calender-input.tsx
deleted file mode 100644
index ea4a73b7b..000000000
--- a/app/components/forms/calender-input.tsx
+++ /dev/null
@@ -1,85 +0,0 @@
-"use client";
-
-import { forwardRef } from "react";
-import { ChevronLeftIcon, ChevronRightIcon } from "@radix-ui/react-icons";
-import { DayPicker } from "react-day-picker";
-
-import { tw } from "~/utils";
-
-export type CalendarProps = React.ComponentProps<typeof DayPicker>;
-
-const Calendar = forwardRef<
-  React.ElementRef<any>,
-  React.ComponentPropsWithoutRef<any>
->(function Calendar(
-  {
-    className,
-    classNames,
-    showOutsideDays = true,
-    selected,
-    onSelect,
-    ...props
-  },
-  _ref
-) {
-  return (
-    <>
-      <DayPicker
-        onSelect={(_range: unknown, d: Date) => {
-          onSelect(d);
-        }}
-        selected={selected}
-        showOutsideDays={showOutsideDays}
-        className={tw(
-          "border-indigo z-100 z-50 border-4 bg-slate-200 p-3",
-          className
-        )}
-        classNames={{
-          months:
-            "flex flex-col sm:flex-row space-y-4 sm:space-x-4 sm:space-y-0",
-          month: "space-y-4",
-          caption: "flex justify-center pt-1 relative items-center",
-          caption_label: "text-sm font-medium",
-          nav: "space-x-1 flex items-center",
-          nav_button: tw(
-            "size-7 bg-transparent p-0 opacity-50 hover:opacity-100"
-          ),
-          nav_button_previous: "absolute left-1",
-          nav_button_next: "absolute right-1",
-          table: "w-full border-collapse space-y-1",
-          head_row: "flex",
-          head_cell:
-            "text-muted-foreground rounded-md w-8 font-normal text-[0.8rem]",
-          row: "flex w-full mt-2",
-          cell: tw(
-            "[&:has([aria-selected])]:bg-accent relative p-0 text-center text-sm focus-within:relative focus-within:z-20",
-            props.mode === "range"
-              ? "[&:has(>.day-range-end)]:rounded-r-md [&:has(>.day-range-start)]:rounded-l-md first:[&:has([aria-selected])]:rounded-l-md last:[&:has([aria-selected])]:rounded-r-md"
-              : "[&:has([aria-selected])]:rounded-md"
-          ),
-          day: tw("size-8 p-0 font-normal aria-selected:opacity-100"),
-          day_range_start: "day-range-start",
-          day_range_end: "day-range-end",
-          day_selected:
-            "bg-primary text-primary-foreground hover:bg-primary hover:text-primary-foreground focus:bg-primary focus:text-primary-foreground",
-          day_today: "bg-accent text-accent-foreground",
-          day_outside: "text-muted-foreground opacity-50",
-          day_disabled: "text-muted-foreground opacity-50",
-          day_range_middle:
-            "aria-selected:bg-accent aria-selected:text-accent-foreground",
-          day_hidden: "invisible",
-          ...classNames,
-        }}
-        components={{
-          IconLeft: () => <ChevronLeftIcon className="size-4" />,
-          IconRight: () => <ChevronRightIcon className="size-4" />,
-        }}
-        {...props}
-      />
-    </>
-  );
-});
-
-// Calendar.displayName = "Calendar"
-
-export { Calendar };
diff --git a/app/components/forms/input.tsx b/app/components/forms/input.tsx
index 9c1a4ffde..5413af3a2 100644
--- a/app/components/forms/input.tsx
+++ b/app/components/forms/input.tsx
@@ -1,3 +1,4 @@
+import type { RefObject } from "react";
 import { forwardRef } from "react";
 
 import { tw } from "~/utils";
@@ -95,18 +96,21 @@ const Input = forwardRef(function Input(
     ref,
     ...rest,
   };
-  // @TODO dont know how to fix that.
-  // @ts-ignore
-  let input = <input {...inputProps} />;
+
+  let input = (
+    <input
+      {...inputProps}
+      ref={ref as RefObject<HTMLInputElement> | undefined}
+    />
+  );
 
   if (inputType === "textarea") {
     input = (
-      // @TODO dont know how to fix that.
-      // @ts-ignore
       <textarea
         {...inputProps}
         maxLength={rest.maxLength || 250}
         rows={rest.rows || 8}
+        ref={ref as RefObject<HTMLTextAreaElement> | undefined}
       />
     );
   }
diff --git a/app/components/forms/select.tsx b/app/components/forms/select.tsx
index 295108318..64f632deb 100644
--- a/app/components/forms/select.tsx
+++ b/app/components/forms/select.tsx
@@ -75,7 +75,7 @@ const SelectItem = React.forwardRef<
     <SelectPrimitive.Item
       ref={ref}
       className={tw(
-        "relative flex cursor-default select-none items-center rounded p-1 text-sm font-medium outline-none focus:bg-gray-50 data-[disabled]:pointer-events-none data-[disabled]:opacity-50 ",
+        "relative flex cursor-default select-none items-center rounded p-1 text-sm font-medium outline-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 focus:bg-gray-50 ",
         className
       )}
       {...props}
diff --git a/app/components/forms/switch.tsx b/app/components/forms/switch.tsx
index a693d0257..86349cdc3 100644
--- a/app/components/forms/switch.tsx
+++ b/app/components/forms/switch.tsx
@@ -12,7 +12,7 @@ const Switch = React.forwardRef<
   return (
     <SwitchPrimitives.Root
       className={tw(
-        "switch focus-visible:ring-offset-background peer inline-flex h-[24px] w-[44px] shrink-0 cursor-pointer items-center rounded-full border-2 border-transparent  bg-gray-100 transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary-400",
+        "switch focus-visible:ring-offset-background peer inline-flex h-[24px] w-[44px] shrink-0 cursor-pointer items-center rounded-full border-2 border-transparent  bg-gray-100 transition-colors data-[state=checked]:bg-primary-400 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50",
         className
       )}
       {...props}
diff --git a/app/components/layout/maintenance-mode.tsx b/app/components/layout/maintenance-mode.tsx
index f29193db6..1fa3e0422 100644
--- a/app/components/layout/maintenance-mode.tsx
+++ b/app/components/layout/maintenance-mode.tsx
@@ -5,7 +5,7 @@ export default function MaintenanceMode() {
   return (
     <div className="size-screen relative px-4 py-16 md:p-16">
       <img
-        src="/images/bg-overlay1.png"
+        src="/static/images/bg-overlay1.png"
         alt="background"
         className="absolute left-0 top-0 -z-10 size-full object-cover"
       />
diff --git a/app/components/layout/sidebar/chat-with-an-expert.tsx b/app/components/layout/sidebar/chat-with-an-expert.tsx
index 70dbf4e92..68e588efc 100644
--- a/app/components/layout/sidebar/chat-with-an-expert.tsx
+++ b/app/components/layout/sidebar/chat-with-an-expert.tsx
@@ -32,7 +32,7 @@ export const ChatWithAnExpert = () => {
         turnaround, global shipping, various materials.
       </p>
       <img
-        src="/images/carlos-support.jpg"
+        src="/static/images/carlos-support.jpg"
         alt="Carlos support shelf.nu"
         className="my-4 rounded-lg"
       />
diff --git a/app/components/layout/sidebar/sidebar.tsx b/app/components/layout/sidebar/sidebar.tsx
index c5a55bf5a..3a57ef05f 100644
--- a/app/components/layout/sidebar/sidebar.tsx
+++ b/app/components/layout/sidebar/sidebar.tsx
@@ -56,7 +56,7 @@ export default function Sidebar() {
       >
         <Link to="." title="Home" className="block h-[32px]">
           <img
-            src="/images/logo-full-color(x2).png"
+            src="/static/images/logo-full-color(x2).png"
             alt="logo"
             className="h-full"
           />
@@ -95,7 +95,7 @@ export default function Sidebar() {
               onClick={toggleMobileNav}
             >
               <img
-                src="/images/shelf-symbol.png"
+                src="/static/images/shelf-symbol.png"
                 alt="Shelf Logo"
                 className="mx-1.5 inline h-[32px]"
               />
diff --git a/app/components/list/empty-state.tsx b/app/components/list/empty-state.tsx
index 1c886ecbb..39a3d763c 100644
--- a/app/components/list/empty-state.tsx
+++ b/app/components/list/empty-state.tsx
@@ -33,7 +33,7 @@ export const EmptyState = ({ customContent, modelName }: CustomEmptyState) => {
     <div className="flex h-full flex-col justify-center gap-[32px] px-4 py-[100px] text-center">
       <div className="flex flex-col items-center">
         <img
-          src="/images/empty-state.svg"
+          src="/static/images/empty-state.svg"
           alt="Empty state"
           className="h-auto w-[172px]"
         />
diff --git a/app/components/list/filters/category/category-checkbox-dropdown.tsx b/app/components/list/filters/category/category-checkbox-dropdown.tsx
index 4ddc42ca6..554696596 100644
--- a/app/components/list/filters/category/category-checkbox-dropdown.tsx
+++ b/app/components/list/filters/category/category-checkbox-dropdown.tsx
@@ -168,7 +168,7 @@ const CheckboxItem = ({
     <label
       key={category.id}
       htmlFor={category.name}
-      className="relative flex cursor-default select-none items-center rounded-lg px-2 py-1.5 text-sm font-medium outline-none focus:bg-gray-100 data-[disabled]:pointer-events-none data-[disabled]:opacity-50 hover:bg-gray-100 "
+      className="relative flex cursor-default select-none items-center rounded-lg px-2 py-1.5 text-sm font-medium outline-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 hover:bg-gray-100 focus:bg-gray-100 "
     >
       <Badge color={category.color} withDot={false} noBg>
         {category.name}
diff --git a/app/components/list/filters/tag/tag-checkbox-dropdown.tsx b/app/components/list/filters/tag/tag-checkbox-dropdown.tsx
index 4a72b39c9..8a4abbc15 100644
--- a/app/components/list/filters/tag/tag-checkbox-dropdown.tsx
+++ b/app/components/list/filters/tag/tag-checkbox-dropdown.tsx
@@ -158,7 +158,7 @@ const CheckboxItem = ({
     <label
       key={category.id}
       htmlFor={category.name}
-      className="relative flex cursor-default select-none items-center rounded-lg px-2 py-1.5 text-sm font-medium outline-none focus:bg-gray-100 data-[disabled]:pointer-events-none data-[disabled]:opacity-50 hover:bg-gray-100 "
+      className="relative flex cursor-default select-none items-center rounded-lg px-2 py-1.5 text-sm font-medium outline-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 hover:bg-gray-100 focus:bg-gray-100 "
     >
       <Badge color={category.color} noBg>
         {category.name}
diff --git a/app/components/location/map-placeholder.tsx b/app/components/location/map-placeholder.tsx
index dd536b907..044179549 100644
--- a/app/components/location/map-placeholder.tsx
+++ b/app/components/location/map-placeholder.tsx
@@ -10,7 +10,7 @@ export const MapPlaceholder = ({
 }) => (
   <div className="relative">
     <img
-      src="/images/no-location-image.jpg"
+      src="/static/images/no-location-image.jpg"
       alt="No scanned location"
       className="w-full rounded-none"
     />
diff --git a/app/components/location/map.tsx b/app/components/location/map.tsx
index 7285e3282..eb9e9f546 100644
--- a/app/components/location/map.tsx
+++ b/app/components/location/map.tsx
@@ -23,7 +23,7 @@ export const ShelfMap = ({
         mapStyle={`https://api.maptiler.com/maps/streets-v2/style.json?key=${window.env.MAPTILER_TOKEN}`}
       >
         <Marker longitude={longitude} latitude={latitude} anchor="bottom">
-          <img src="/images/map-marker.png" width={30} alt="img" />
+          <img src="/static/images/map-marker.png" width={30} alt="img" />
         </Marker>
         <ScaleControl />
       </Map>
diff --git a/app/components/shared/button.tsx b/app/components/shared/button.tsx
index 85b7b6616..6b04030b7 100644
--- a/app/components/shared/button.tsx
+++ b/app/components/shared/button.tsx
@@ -7,7 +7,7 @@ import iconsMap from "./icons-map";
 import type { ButtonVariant, ButtonWidth } from "../layout/header/types";
 
 export interface ButtonProps {
-  as?: React.ElementType;
+  as?: React.ComponentType<any> | string;
   className?: string;
   variant?: ButtonVariant;
   width?: ButtonWidth;
@@ -41,13 +41,12 @@ export const Button = React.forwardRef<HTMLElement, ButtonProps>(
     }: ButtonProps,
     ref
   ) {
-    const Component = props?.to ? Link : as;
-
+    const Component: React.ComponentType<any> | string = props?.to ? Link : as;
     const baseButtonClasses = `inline-flex items-center justify-center rounded font-semibold text-center  gap-2  max-w-xl border text-sm box-shadow-xs`;
 
     const variants = {
       primary: tw(
-        `border-primary-400 bg-primary-500 text-white focus:ring-2 hover:bg-primary-400`,
+        `border-primary-400 bg-primary-500 text-white hover:bg-primary-400 focus:ring-2`,
         disabled ? "border-primary-300 bg-primary-300" : ""
       ),
       secondary: tw(
diff --git a/app/components/shared/dropdown.tsx b/app/components/shared/dropdown.tsx
index 543de4306..4648a4ffd 100644
--- a/app/components/shared/dropdown.tsx
+++ b/app/components/shared/dropdown.tsx
@@ -32,7 +32,7 @@ const DropdownMenuSubTrigger = React.forwardRef<
     <DropdownMenuPrimitive.SubTrigger
       ref={ref}
       className={tw(
-        "flex cursor-default select-none items-center rounded p-2 text-sm font-medium outline-none focus:bg-gray-100 data-[state=open]:bg-gray-100 ",
+        "flex cursor-default select-none items-center rounded p-2 text-sm font-medium outline-none data-[state=open]:bg-gray-100 focus:bg-gray-100 ",
         inset && "pl-8",
         className
       )}
@@ -92,7 +92,7 @@ const DropdownMenuItem = React.forwardRef<
     <DropdownMenuPrimitive.Item
       ref={ref}
       className={tw(
-        "relative flex cursor-default select-none items-center px-2 py-1.5 text-sm font-medium outline-none focus:bg-slate-100 data-[disabled]:pointer-events-none data-[disabled]:opacity-50 ",
+        "relative flex cursor-default select-none items-center px-2 py-1.5 text-sm font-medium outline-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 focus:bg-slate-100 ",
         inset && "pl-8",
         disabled && "pointer-events-none cursor-not-allowed opacity-30",
         className
@@ -113,7 +113,7 @@ const DropdownMenuCheckboxItem = React.forwardRef<
     <DropdownMenuPrimitive.CheckboxItem
       ref={ref}
       className={tw(
-        "relative flex cursor-default select-none items-center rounded px-2 py-1.5 text-sm font-medium outline-none focus:bg-slate-100 data-[disabled]:pointer-events-none data-[disabled]:opacity-50 ",
+        "relative flex cursor-default select-none items-center rounded px-2 py-1.5 text-sm font-medium outline-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 focus:bg-slate-100 ",
         className
       )}
       checked={checked}
@@ -137,7 +137,7 @@ const DropdownMenuRadioItem = React.forwardRef<
     <DropdownMenuPrimitive.RadioItem
       ref={ref}
       className={tw(
-        "relative flex cursor-default select-none items-center rounded-[4px] py-1.5 pl-8 pr-2 text-sm font-medium outline-none focus:bg-slate-100 data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
+        "relative flex cursor-default select-none items-center rounded-[4px] py-1.5 pl-8 pr-2 text-sm font-medium outline-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 focus:bg-slate-100",
         className
       )}
       {...props}
diff --git a/app/components/shared/file-dropzone/asset-image-upload.tsx b/app/components/shared/file-dropzone/asset-image-upload.tsx
index bdb49638c..81cba40d7 100644
--- a/app/components/shared/file-dropzone/asset-image-upload.tsx
+++ b/app/components/shared/file-dropzone/asset-image-upload.tsx
@@ -37,7 +37,7 @@ export function AssetImageUpload() {
   //       <img
   //         className=" h-full object-contain"
   //         // @ts-ignore
-  //         src={!temp ? "/images/item-placeholder.png" : temp}
+  //         src={!temp ? "/static/images/item-placeholder.png" : temp}
   //         alt="Main "
   //       />
   //     </div>
diff --git a/app/components/shared/heading.tsx b/app/components/shared/heading.tsx
index acf5dd328..78f4e800c 100644
--- a/app/components/shared/heading.tsx
+++ b/app/components/shared/heading.tsx
@@ -2,7 +2,7 @@ interface Props {
   /** What type of heading element do you want to render?
    * Options are: "h1" | "h2" | "h3" | "h4" | "h5"
    */
-  as?: React.ElementType;
+  as?: React.ComponentType<any> | string;
 
   /** Content to be rendered inside the heading */
   children: React.ReactNode;
diff --git a/app/components/shared/image.tsx b/app/components/shared/image.tsx
index a3a29598b..1f0ab3882 100644
--- a/app/components/shared/image.tsx
+++ b/app/components/shared/image.tsx
@@ -22,7 +22,7 @@ export const Image = ({
       src={
         imageId
           ? `/api/image/${imageId}${forceReload ? `?t=${Date.now()}` : ""}`
-          : `/images/asset-placeholder.jpg`
+          : `/static/images/asset-placeholder.jpg`
       }
       alt={alt}
       className={tw(className)}
diff --git a/app/components/shared/tabs.tsx b/app/components/shared/tabs.tsx
index 77fb9ada8..059bdf980 100644
--- a/app/components/shared/tabs.tsx
+++ b/app/components/shared/tabs.tsx
@@ -29,7 +29,7 @@ const TabsTrigger = React.forwardRef<
   return (
     <TabsPrimitive.Trigger
       className={tw(
-        "inline-flex min-w-[100px] items-center justify-center rounded-[0.185rem] px-2.5 py-1  text-text-sm font-medium text-gray-700 transition-all  disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-white data-[state=active]:text-slate-900 data-[state=active]:shadow-sm ",
+        "inline-flex min-w-[100px] items-center justify-center rounded-[0.185rem] px-2.5 py-1  text-text-sm font-medium text-gray-700 transition-all  data-[state=active]:bg-white data-[state=active]:text-slate-900 data-[state=active]:shadow-sm disabled:pointer-events-none disabled:opacity-50 ",
         className
       )}
       {...props}
diff --git a/app/components/subscription/successful-subscription-modal.tsx b/app/components/subscription/successful-subscription-modal.tsx
index acabbfeb2..012c38103 100644
--- a/app/components/subscription/successful-subscription-modal.tsx
+++ b/app/components/subscription/successful-subscription-modal.tsx
@@ -37,7 +37,7 @@ export default function SuccessfulSubscriptionModal() {
                 muted
                 className="mb-6 rounded-lg"
               >
-                <source src="/videos/celebration.mp4" type="video/mp4" />
+                <source src="/static/videos/celebration.mp4" type="video/mp4" />
               </video>
               <div className="mb-8 text-center">
                 <h4 className="mb-1 text-[18px] font-semibold">
diff --git a/app/components/user/profile-picture.tsx b/app/components/user/profile-picture.tsx
index d81d42bd0..2fd13cbd5 100644
--- a/app/components/user/profile-picture.tsx
+++ b/app/components/user/profile-picture.tsx
@@ -20,7 +20,7 @@ export default function ProfilePicture({
 
   return user ? (
     <img
-      src={user.profilePicture || "/images/default_pfp.jpg"}
+      src={user.profilePicture || "/static/images/default_pfp.jpg"}
       alt={`${user.username}`}
       className={styles}
     />
diff --git a/app/components/welcome/carousel.tsx b/app/components/welcome/carousel.tsx
index e77a82a75..a7ba650a5 100644
--- a/app/components/welcome/carousel.tsx
+++ b/app/components/welcome/carousel.tsx
@@ -41,7 +41,7 @@ function Carousel() {
             <div>
               <figure className="mb-6">
                 <img
-                  src="/images/shelf-visual1.jpg"
+                  src="/static/images/shelf-visual1.jpg"
                   alt="img"
                   className=" object-cover"
                 />
@@ -59,7 +59,7 @@ function Carousel() {
             <div>
               <figure className="mb-6">
                 <img
-                  src="/images/shelf-visual2.jpg"
+                  src="/static/images/shelf-visual2.jpg"
                   alt="img"
                   className=" object-cover"
                 />
@@ -78,7 +78,7 @@ function Carousel() {
             <div>
               <figure className="mb-6">
                 <img
-                  src="/images/shelf-visual3.jpg"
+                  src="/static/images/shelf-visual3.jpg"
                   alt="img"
                   className=" object-cover"
                 />
diff --git a/app/components/workspace/users-actions-dropdown.tsx b/app/components/workspace/users-actions-dropdown.tsx
index ee764a39e..2130d4dbd 100644
--- a/app/components/workspace/users-actions-dropdown.tsx
+++ b/app/components/workspace/users-actions-dropdown.tsx
@@ -62,7 +62,7 @@ export function TeamUsersActionsDropdown({
                 <Button
                   type="submit"
                   variant="link"
-                  className="justify-start px-4 py-3  text-gray-700 focus:bg-slate-100 hover:bg-slate-100 hover:text-gray-700"
+                  className="justify-start px-4 py-3  text-gray-700 hover:bg-slate-100 hover:text-gray-700 focus:bg-slate-100"
                   width="full"
                   name="intent"
                   value="resend"
@@ -82,7 +82,7 @@ export function TeamUsersActionsDropdown({
                 <Button
                   type="submit"
                   variant="link"
-                  className="justify-start px-4 py-3  text-gray-700 focus:bg-slate-100 hover:bg-slate-100 hover:text-gray-700"
+                  className="justify-start px-4 py-3  text-gray-700 hover:bg-slate-100 hover:text-gray-700 focus:bg-slate-100"
                   width="full"
                   name="intent"
                   value="revoke"
diff --git a/app/components/workspace/users-table.tsx b/app/components/workspace/users-table.tsx
index 9a348d958..bd643df93 100644
--- a/app/components/workspace/users-table.tsx
+++ b/app/components/workspace/users-table.tsx
@@ -97,7 +97,7 @@ const UserRow = ({
     <Td className="w-full">
       <div className="flex items-center gap-3">
         <img
-          src={img || "/images/default_pfp.jpg"}
+          src={img || "/static/images/default_pfp.jpg"}
           className={"size-10 rounded-[4px]"}
           alt={`${name}'s profile`}
         />
diff --git a/app/entry.server.tsx b/app/entry.server.tsx
index d9cb63dcc..1cbc7816a 100644
--- a/app/entry.server.tsx
+++ b/app/entry.server.tsx
@@ -1,14 +1,16 @@
+/* eslint-disable no-console */
 import { PassThrough } from "stream";
 
 import { createReadableStreamFromReadable } from "@remix-run/node";
 import type {
   ActionFunctionArgs,
+  AppLoadContext,
   EntryContext,
   LoaderFunctionArgs,
 } from "@remix-run/node";
 import { RemixServer } from "@remix-run/react";
 import * as Sentry from "@sentry/remix";
-import isbot from "isbot";
+import { isbot } from "isbot";
 import { renderToPipeableStream } from "react-dom/server";
 import { registerBookingWorkers } from "./modules/booking";
 import { SENTRY_DSN } from "./utils";
@@ -45,45 +47,127 @@ export function handleError(
 
 const ABORT_DELAY = 5000;
 
-export default async function handleRequest(
+export default function handleRequest(
+  request: Request,
+  responseStatusCode: number,
+  responseHeaders: Headers,
+  remixContext: EntryContext,
+  // This is ignored so we can keep it in the template for visibility.  Feel
+  // free to delete this parameter in your app if you're not using it!
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  loadContext: AppLoadContext
+) {
+  return isbot(request.headers.get("user-agent") || "")
+    ? handleBotRequest(
+        request,
+        responseStatusCode,
+        responseHeaders,
+        remixContext
+      )
+    : handleBrowserRequest(
+        request,
+        responseStatusCode,
+        responseHeaders,
+        remixContext
+      );
+}
+
+function handleBotRequest(
   request: Request,
   responseStatusCode: number,
   responseHeaders: Headers,
   remixContext: EntryContext
 ) {
-  const callbackName = isbot(request.headers.get("user-agent"))
-    ? "onAllReady"
-    : "onShellReady";
+  return new Promise((resolve, reject) => {
+    let shellRendered = false;
+    const { pipe, abort } = renderToPipeableStream(
+      <RemixServer
+        context={remixContext}
+        url={request.url}
+        abortDelay={ABORT_DELAY}
+      />,
+      {
+        onAllReady() {
+          shellRendered = true;
+          const body = new PassThrough();
+          const stream = createReadableStreamFromReadable(body);
 
-  return new Promise(async (res, reject) => {
-    let didError = false;
+          responseHeaders.set("Content-Type", "text/html");
+
+          resolve(
+            new Response(stream, {
+              headers: responseHeaders,
+              status: responseStatusCode,
+            })
+          );
 
+          pipe(body);
+        },
+        onShellError(error: unknown) {
+          reject(error);
+        },
+        onError(error: unknown) {
+          responseStatusCode = 500;
+          // Log streaming rendering errors from inside the shell.  Don't log
+          // errors encountered during initial shell rendering since they'll
+          // reject and get logged in handleDocumentRequest.
+          if (shellRendered) {
+            console.error(error);
+          }
+        },
+      }
+    );
+
+    setTimeout(abort, ABORT_DELAY);
+  });
+}
+
+function handleBrowserRequest(
+  request: Request,
+  responseStatusCode: number,
+  responseHeaders: Headers,
+  remixContext: EntryContext
+) {
+  return new Promise((resolve, reject) => {
+    let shellRendered = false;
     const { pipe, abort } = renderToPipeableStream(
-      <RemixServer context={remixContext} url={request.url} />,
+      <RemixServer
+        context={remixContext}
+        url={request.url}
+        abortDelay={ABORT_DELAY}
+      />,
       {
-        [callbackName]() {
+        onShellReady() {
+          shellRendered = true;
           const body = new PassThrough();
+          const stream = createReadableStreamFromReadable(body);
 
           responseHeaders.set("Content-Type", "text/html");
 
-          res(
-            new Response(createReadableStreamFromReadable(body), {
-              status: didError ? 500 : responseStatusCode,
+          resolve(
+            new Response(stream, {
               headers: responseHeaders,
+              status: responseStatusCode,
             })
           );
+
           pipe(body);
         },
-        onShellError(err: unknown) {
-          reject(err);
+        onShellError(error: unknown) {
+          reject(error);
         },
         onError(error: unknown) {
-          didError = true;
-          // eslint-disable-next-line no-console
-          console.error(error);
+          responseStatusCode = 500;
+          // Log streaming rendering errors from inside the shell.  Don't log
+          // errors encountered during initial shell rendering since they'll
+          // reject and get logged in handleDocumentRequest.
+          if (shellRendered) {
+            console.error(error);
+          }
         },
       }
     );
+
     setTimeout(abort, ABORT_DELAY);
   });
 }
diff --git a/app/hooks/use-main-menu-items.tsx b/app/hooks/use-main-menu-items.tsx
index 4d13b47a2..bb75993ba 100644
--- a/app/hooks/use-main-menu-items.tsx
+++ b/app/hooks/use-main-menu-items.tsx
@@ -46,7 +46,7 @@ export function useMainMenuItems() {
   const menuItemsBottom = [
     {
       icon: <SettingsIcon />,
-      to: "settings/account",
+      to: "settings",
       label: "Settings",
       end: true,
     },
diff --git a/app/modules/auth/index.ts b/app/modules/auth/index.ts
index 4f45bab8e..2812533be 100644
--- a/app/modules/auth/index.ts
+++ b/app/modules/auth/index.ts
@@ -7,12 +7,4 @@ export {
   updateAccountPassword,
   sendResetPasswordLink,
 } from "./service.server";
-export {
-  commitAuthSession,
-  createAuthSession,
-  destroyAuthSession,
-  requireAuthSession,
-  getAuthSession,
-} from "./session.server";
-export * from "./types";
 export * from "./components";
diff --git a/app/modules/auth/mappers.server.ts b/app/modules/auth/mappers.server.ts
index 9c77f8779..83cdfc9ca 100644
--- a/app/modules/auth/mappers.server.ts
+++ b/app/modules/auth/mappers.server.ts
@@ -1,12 +1,16 @@
+import type { AuthSession } from "server/session";
 import type { SupabaseAuthSession } from "~/integrations/supabase";
 
 import { ShelfStackError } from "~/utils/error";
-import type { AuthSession } from "./types";
 
 export async function mapAuthSession(
   supabaseAuthSession: SupabaseAuthSession | null
-): Promise<AuthSession | null> {
-  if (!supabaseAuthSession) return null;
+): Promise<AuthSession> {
+  if (!supabaseAuthSession) {
+    throw new ShelfStackError({
+      message: "Supabase auth session is null",
+    });
+  }
 
   if (!supabaseAuthSession.refresh_token)
     throw new ShelfStackError({ message: "User should have a refresh token" });
diff --git a/app/modules/auth/service.server.ts b/app/modules/auth/service.server.ts
index eaa813444..7c26ff75d 100644
--- a/app/modules/auth/service.server.ts
+++ b/app/modules/auth/service.server.ts
@@ -1,8 +1,9 @@
+import type { AuthSession } from "server/session";
 import { getSupabaseAdmin } from "~/integrations/supabase";
 import { SERVER_URL } from "~/utils/env";
 
+import { ShelfStackError } from "~/utils/error";
 import { mapAuthSession } from "./mappers.server";
-import type { AuthSession } from "./types";
 
 export async function createEmailAuthAccount(email: string, password: string) {
   const { data, error } = await getSupabaseAdmin().auth.admin.createUser({
@@ -121,18 +122,37 @@ export async function getAuthUserByAccessToken(accessToken: string) {
 export async function getAuthResponseByAccessToken(accessToken: string) {
   return await getSupabaseAdmin().auth.getUser(accessToken);
 }
+
 export async function refreshAccessToken(
   refreshToken?: string
-): Promise<AuthSession | null> {
-  if (!refreshToken) return null;
-
-  const { data, error } = await getSupabaseAdmin().auth.refreshSession({
-    refresh_token: refreshToken,
-  });
-
-  if (!data.session || error) return null;
-
-  return await mapAuthSession(data.session);
+): Promise<AuthSession> {
+  try {
+    if (!refreshToken) {
+      throw new ShelfStackError({ message: "Refresh token is required" });
+    }
+
+    const { data, error } = await getSupabaseAdmin().auth.refreshSession({
+      refresh_token: refreshToken,
+    });
+
+    if (error) {
+      throw error;
+    }
+
+    const { session } = data;
+    if (!session) {
+      throw new ShelfStackError({
+        message: "Session returned by Supabase is null",
+      });
+    }
+
+    return await mapAuthSession(data.session);
+  } catch (cause) {
+    throw new ShelfStackError({
+      message: "Unable to refresh access token",
+      cause,
+    });
+  }
 }
 
 export async function verifyAuthSession(authSession: AuthSession) {
diff --git a/app/modules/auth/session.server.ts b/app/modules/auth/session.server.ts
deleted file mode 100644
index 422fe979b..000000000
--- a/app/modules/auth/session.server.ts
+++ /dev/null
@@ -1,219 +0,0 @@
-import { createCookieSessionStorage, redirect } from "@remix-run/node";
-
-import {
-  getCurrentPath,
-  isGet,
-  makeRedirectToFromHere,
-  mergeSearchParams,
-  NODE_ENV,
-  safeRedirect,
-  SESSION_SECRET,
-} from "~/utils";
-
-import { setCookie } from "~/utils/cookies.server";
-import { refreshAccessToken, verifyAuthSession } from "./service.server";
-import type { AuthSession } from "./types";
-import { destroySelectedOrganizationIdCookie } from "../organization/context.server";
-
-const SESSION_KEY = "authenticated";
-const SESSION_ERROR_KEY = "error";
-const SESSION_MAX_AGE = 60 * 60 * 24 * 7; // 7 days;
-const LOGIN_URL = "/";
-const REFRESH_ACCESS_TOKEN_THRESHOLD = 60 * 10; // 10 minutes left before token expires
-
-/**
- * Session storage CRUD
- */
-
-const sessionStorage = createCookieSessionStorage({
-  cookie: {
-    name: "__authSession",
-    httpOnly: true,
-    path: "/",
-    sameSite: "lax",
-    secrets: [SESSION_SECRET],
-    secure: NODE_ENV === "production",
-  },
-});
-
-/**
- *
- * @deprecated
- */
-export async function createAuthSession({
-  request,
-  authSession,
-  redirectTo,
-}: {
-  request: Request;
-  authSession: AuthSession;
-  redirectTo: string;
-}) {
-  return redirect(safeRedirect(redirectTo), {
-    headers: {
-      "Set-Cookie": await commitAuthSession(request, {
-        authSession,
-        flashErrorMessage: null,
-      }),
-    },
-  });
-}
-
-async function getSession(request: Request) {
-  const cookie = request.headers.get("Cookie");
-  return sessionStorage.getSession(cookie);
-}
-
-export async function getAuthSession(
-  request: Request
-): Promise<AuthSession | null> {
-  const session = await getSession(request);
-  return session.get(SESSION_KEY);
-}
-
-export async function commitAuthSession(
-  request: Request,
-  {
-    authSession,
-    flashErrorMessage,
-  }: {
-    authSession?: AuthSession | null;
-    flashErrorMessage?: string | null;
-  } = {}
-) {
-  const session = await getSession(request);
-
-  // allow user session to be null.
-  // useful you want to clear session and display a message explaining why
-  if (authSession !== undefined) {
-    session.set(SESSION_KEY, authSession);
-  }
-
-  session.flash(SESSION_ERROR_KEY, flashErrorMessage);
-
-  return sessionStorage.commitSession(session, { maxAge: SESSION_MAX_AGE });
-}
-
-export async function destroyAuthSession(request: Request) {
-  const session = await getSession(request);
-  return redirect("/", {
-    headers: [
-      setCookie(await destroySelectedOrganizationIdCookie()),
-      setCookie(await sessionStorage.destroySession(session)),
-    ],
-  });
-}
-
-async function assertAuthSession(
-  request: Request,
-  { onFailRedirectTo }: { onFailRedirectTo?: string } = {}
-) {
-  const authSession = await getAuthSession(request);
-  const existingSearchParams = new URLSearchParams(
-    onFailRedirectTo?.split("?")[1]
-  );
-
-  // If there is no user session, Fly, You Fools! 🧙‍♂️
-  if (!authSession?.accessToken || !authSession?.refreshToken) {
-    throw redirect(
-      `${onFailRedirectTo?.split("?")[0] || LOGIN_URL}${mergeSearchParams(
-        existingSearchParams,
-        { redirectTo: getCurrentPath(request) }
-      )}`,
-      {
-        headers: {
-          "Set-Cookie": await commitAuthSession(request, {
-            authSession: null,
-            flashErrorMessage: "no-user-session",
-          }),
-        },
-      }
-    );
-  }
-
-  return authSession;
-}
-
-/**
- * Assert auth session is present and verified from supabase auth api
- *
- * If used in loader (GET method)
- * - Refresh tokens if session is expired
- * - Return auth session if not expired
- * - Destroy session if refresh token is expired
- *
- * If used in action (POST method)
- * - Try to refresh session if expired and return this new session (it's your job to handle session commit)
- * - Return auth session if not expired
- * - Destroy session if refresh token is expired
- */
-export async function requireAuthSession(
-  request: Request,
-  {
-    onFailRedirectTo,
-    verify,
-  }: { onFailRedirectTo?: string; verify: boolean } = { verify: false }
-): Promise<AuthSession> {
-  // hello there
-  const authSession = await assertAuthSession(request, {
-    onFailRedirectTo,
-  });
-
-  // ok, let's challenge its access token.
-  // by default, we don't verify the access token from supabase auth api to save some time
-  const isValidSession = verify ? await verifyAuthSession(authSession) : true;
-
-  // damn, access token is not valid or expires soon
-  // let's try to refresh, in case of 🧐
-  if (!isValidSession || isExpiringSoon(authSession.expiresAt)) {
-    return refreshAuthSession(request);
-  }
-
-  // finally, we have a valid session, let's return it
-  return authSession;
-}
-
-function isExpiringSoon(expiresAt: number) {
-  return (expiresAt - REFRESH_ACCESS_TOKEN_THRESHOLD) * 1000 < Date.now();
-}
-
-async function refreshAuthSession(request: Request): Promise<AuthSession> {
-  const authSession = await getAuthSession(request);
-
-  const refreshedAuthSession = await refreshAccessToken(
-    authSession?.refreshToken
-  );
-
-  // 👾 game over, log in again
-  // yes, arbitrary, but it's a good way to don't let an illegal user here with an expired token
-  if (!refreshedAuthSession) {
-    const redirectUrl = `${LOGIN_URL}?${makeRedirectToFromHere(request)}`;
-
-    // here we throw instead of return because this function promise a AuthSession and not a response object
-    // https://remix.run/docs/en/v1/guides/constraints#higher-order-functions
-    throw redirect(redirectUrl, {
-      headers: {
-        "Set-Cookie": await commitAuthSession(request, {
-          authSession: null,
-          flashErrorMessage: "fail-refresh-auth-session",
-        }),
-      },
-    });
-  }
-
-  // refresh is ok and we can redirect
-  if (isGet(request)) {
-    // here we throw instead of return because this function promise a UserSession and not a response object
-    // https://remix.run/docs/en/v1/guides/constraints#higher-order-functions
-    throw redirect(getCurrentPath(request), {
-      headers: {
-        "Set-Cookie": await commitAuthSession(request, {
-          authSession: refreshedAuthSession,
-        }),
-      },
-    });
-  }
-
-  // we can't redirect because we are in an action, so, deal with it and don't forget to handle session commit 👮‍♀️
-  return refreshedAuthSession;
-}
diff --git a/app/modules/auth/types.ts b/app/modules/auth/types.ts
deleted file mode 100644
index 3b426b971..000000000
--- a/app/modules/auth/types.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export interface AuthSession {
-  accessToken: string;
-  refreshToken: string;
-  userId: string;
-  // organizationId: string;
-  email: string;
-  expiresIn: number;
-  expiresAt: number;
-}
diff --git a/app/modules/booking/service.server.ts b/app/modules/booking/service.server.ts
index 22de08ff5..08afeeb4f 100644
--- a/app/modules/booking/service.server.ts
+++ b/app/modules/booking/service.server.ts
@@ -465,7 +465,6 @@ export async function getBookings({
         },
       },
     };
-    // @TODO if status of the booking is ONGOING, the assets added should have their status updated to CHECKED_OUT
   }
 
   if (excludeBookingIds?.length) {
diff --git a/app/modules/organization/context.server.ts b/app/modules/organization/context.server.ts
index 3a2622d8b..3bed4c083 100644
--- a/app/modules/organization/context.server.ts
+++ b/app/modules/organization/context.server.ts
@@ -9,7 +9,6 @@ import {
 import { ShelfStackError } from "~/utils/error";
 
 import { getUserOrganizations } from "./service.server";
-import type { AuthSession } from "../auth/types";
 
 const selectedOrganizationIdCookie = createCookie("selected-organization-id", {
   httpOnly: true,
@@ -39,10 +38,13 @@ export function destroySelectedOrganizationIdCookie() {
   return destroyCookie(selectedOrganizationIdCookie);
 }
 
-export async function requireOrganisationId(
-  { userId }: AuthSession,
-  request: Request
-) {
+export async function requireOrganisationId({
+  userId,
+  request,
+}: {
+  userId: string;
+  request: Request;
+}) {
   const organizationId = await getSelectedOrganizationIdCookie(request);
 
   /** There could be a case when you get removed from an organization while browsing it.
diff --git a/app/modules/user/service.server.ts b/app/modules/user/service.server.ts
index 8f677f9da..8c5ad387b 100644
--- a/app/modules/user/service.server.ts
+++ b/app/modules/user/service.server.ts
@@ -5,11 +5,11 @@ import { PrismaClientKnownRequestError } from "@prisma/client/runtime/library";
 import { json, type LoaderFunctionArgs } from "@remix-run/node";
 import type { User as SupabaseUser } from "@supabase/supabase-js";
 import sharp from "sharp";
+import type { AuthSession } from "server/session";
 import { db } from "~/database";
 
 import {
   deleteAuthAccount,
-  type AuthSession,
   createEmailAuthAccount,
   signInWithEmail,
   updateAccountPassword,
diff --git a/app/root.tsx b/app/root.tsx
index 1a56a1da9..8f9a925ef 100644
--- a/app/root.tsx
+++ b/app/root.tsx
@@ -47,7 +47,9 @@ export const links: LinksFunction = () => [
   { rel: "stylesheet", href: styles },
   { rel: "stylesheet", href: fontsStylesheetUrl },
   { rel: "stylesheet", href: globalStylesheetUrl },
-  { rel: "manifest", href: "/manifest.json" },
+  { rel: "manifest", href: "/static/manifest.json" },
+  { rel: "apple-touch-icon", href: "/static/favicon.ico" },
+  { rel: "icon", href: "/static/favicon.ico" },
   ...splashScreenLinks,
 ];
 
diff --git a/app/routes/_auth+/_auth.tsx b/app/routes/_auth+/_auth.tsx
index d8b226bf6..ac9e4a217 100644
--- a/app/routes/_auth+/_auth.tsx
+++ b/app/routes/_auth+/_auth.tsx
@@ -1,21 +1,13 @@
 import type { LoaderFunctionArgs } from "@remix-run/node";
+import { redirect } from "@remix-run/node";
 import { Link, useMatches } from "@remix-run/react";
-import { Outlet, redirect } from "react-router";
+import { Outlet } from "react-router";
 import { ErrorBoundryComponent } from "~/components/errors";
 import SubHeading from "~/components/shared/sub-heading";
-import { getAuthSession } from "~/modules/auth";
-import { getUserByEmail } from "~/modules/user";
 
-export const loader = async ({ request }: LoaderFunctionArgs) => {
-  const authSession = await getAuthSession(request);
-
-  const user = authSession
-    ? await getUserByEmail(authSession?.email)
-    : undefined;
-
-  if (user && user.onboarded) {
-    return redirect("assets");
-  }
+export const loader = ({ context }: LoaderFunctionArgs) => {
+  /** WE do this on the layout so it runs for all child routes */
+  if (context.isAuthenticated) return redirect("/assets");
   return null;
 };
 
@@ -35,7 +27,7 @@ export default function App() {
           <div className=" mb-8 text-center">
             <Link to="/">
               <img
-                src="/images/shelf-symbol.png"
+                src="/static/images/shelf-symbol.png"
                 alt="Shelf symbol"
                 className=" mx-auto mb-2 size-12"
               />
@@ -60,7 +52,7 @@ export default function App() {
           </a>
           <img
             className="absolute inset-0 size-full max-w-none object-cover"
-            src="/images/auth-cover.jpg"
+            src="/static/images/auth-cover.jpg"
             alt="John Singer Sargent - A Corner of the Library in Venice, 1904/1907 "
           />
         </aside>
diff --git a/app/routes/_auth+/accept-invite.$inviteId.tsx b/app/routes/_auth+/accept-invite.$inviteId.tsx
index bd1da6d26..2815111a7 100644
--- a/app/routes/_auth+/accept-invite.$inviteId.tsx
+++ b/app/routes/_auth+/accept-invite.$inviteId.tsx
@@ -2,7 +2,7 @@ import { InviteStatuses } from "@prisma/client";
 import { json, redirect, type LoaderFunctionArgs } from "@remix-run/node";
 import jwt from "jsonwebtoken";
 import { Spinner } from "~/components/shared/spinner";
-import { commitAuthSession, signInWithEmail } from "~/modules/auth";
+import { signInWithEmail } from "~/modules/auth";
 import { updateInviteStatus } from "~/modules/invite";
 import { generateRandomCode } from "~/modules/invite/helpers";
 import { setSelectedOrganizationIdCookie } from "~/modules/organization/context.server";
@@ -14,7 +14,7 @@ import {
 import { setCookie } from "~/utils/cookies.server";
 import { ShelfStackError } from "~/utils/error";
 
-export const loader = async ({ request }: LoaderFunctionArgs) => {
+export const loader = async ({ context, request }: LoaderFunctionArgs) => {
   const searchParams = getCurrentSearchParams(request);
   const token = searchParams.get("token") as string;
 
@@ -56,7 +56,8 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {
   // Ensure that user property exists before proceeding
   if (signInResult.status === "success" && signInResult.authSession) {
     const { authSession } = signInResult;
-
+    // Commit the session
+    context.setSession({ ...authSession });
     return redirect(
       safeRedirect(
         `/onboarding?organizationId=${updatedInvite.organizationId}`
@@ -64,12 +65,6 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {
       {
         headers: [
           setCookie(await setSelectedOrganizationIdCookie(updatedInvite.id)),
-          setCookie(
-            await commitAuthSession(request, {
-              authSession,
-              flashErrorMessage: null,
-            })
-          ),
         ],
       }
     );
diff --git a/app/routes/_auth+/forgot-password.tsx b/app/routes/_auth+/forgot-password.tsx
index c2c77f62f..373c3dd71 100644
--- a/app/routes/_auth+/forgot-password.tsx
+++ b/app/routes/_auth+/forgot-password.tsx
@@ -1,9 +1,5 @@
-import type {
-  ActionFunctionArgs,
-  LoaderFunctionArgs,
-  MetaFunction,
-} from "@remix-run/node";
-import { json, redirect } from "@remix-run/node";
+import type { ActionFunctionArgs, MetaFunction } from "@remix-run/node";
+import { json } from "@remix-run/node";
 import { Form, useActionData, useNavigation } from "@remix-run/react";
 import { parseFormAny, useZorm } from "react-zorm";
 import { z } from "zod";
@@ -11,20 +7,10 @@ import Input from "~/components/forms/input";
 import { Button } from "~/components/shared/button";
 import { db } from "~/database";
 
-import { getAuthSession, sendResetPasswordLink } from "~/modules/auth";
+import { sendResetPasswordLink } from "~/modules/auth";
 import { assertIsPost, isFormProcessing, tw, validEmail } from "~/utils";
 import { appendToMetaTitle } from "~/utils/append-to-meta-title";
 
-export async function loader({ request }: LoaderFunctionArgs) {
-  const authSession = await getAuthSession(request);
-  const title = "Forgot password?";
-  const subHeading = "No worries, we’ll send you reset instructions.";
-
-  if (authSession) return redirect("/");
-
-  return json({ title, subHeading });
-}
-
 const ForgotPasswordSchema = z.object({
   email: z
     .string()
@@ -33,6 +19,12 @@ const ForgotPasswordSchema = z.object({
       message: "Please enter a valid email",
     })),
 });
+export async function loader() {
+  const title = "Forgot password?";
+  const subHeading = "No worries, we’ll send you reset instructions.";
+
+  return json({ title, subHeading });
+}
 
 export async function action({ request }: ActionFunctionArgs) {
   assertIsPost(request);
diff --git a/app/routes/_auth+/join.tsx b/app/routes/_auth+/join.tsx
index d678db16a..744a977bc 100644
--- a/app/routes/_auth+/join.tsx
+++ b/app/routes/_auth+/join.tsx
@@ -17,20 +17,17 @@ import { z } from "zod";
 import Input from "~/components/forms/input";
 import PasswordInput from "~/components/forms/password-input";
 import { Button } from "~/components/shared/button";
-import { getAuthSession, ContinueWithEmailForm } from "~/modules/auth";
+import { ContinueWithEmailForm } from "~/modules/auth";
 import { signUpWithEmailPass } from "~/modules/auth/service.server";
 import { getUserByEmail } from "~/modules/user";
 import { assertIsPost, isFormProcessing } from "~/utils";
 import { appendToMetaTitle } from "~/utils/append-to-meta-title";
 
-export async function loader({ request }: LoaderFunctionArgs) {
-  const authSession = await getAuthSession(request);
-
+export async function loader({ context }: LoaderFunctionArgs) {
   const title = "Create an account";
-
   const subHeading = "Start your journey with Shelf";
 
-  if (authSession) return redirect("/");
+  if (context.isAuthenticated) redirect("/assets");
 
   return json({ title, subHeading });
 }
diff --git a/app/routes/_auth+/login.tsx b/app/routes/_auth+/login.tsx
index dddb64b16..64ca1a284 100644
--- a/app/routes/_auth+/login.tsx
+++ b/app/routes/_auth+/login.tsx
@@ -1,10 +1,6 @@
 import * as React from "react";
 
-import type {
-  ActionFunctionArgs,
-  LoaderFunctionArgs,
-  MetaFunction,
-} from "@remix-run/node";
+import type { ActionFunctionArgs, MetaFunction } from "@remix-run/node";
 import { json, redirect } from "@remix-run/node";
 import {
   Form,
@@ -19,12 +15,7 @@ import Input from "~/components/forms/input";
 import PasswordInput from "~/components/forms/password-input";
 import { Button } from "~/components/shared/button";
 
-import {
-  getAuthSession,
-  signInWithEmail,
-  ContinueWithEmailForm,
-  commitAuthSession,
-} from "~/modules/auth";
+import { signInWithEmail, ContinueWithEmailForm } from "~/modules/auth";
 import { getOrganizationByUserId } from "~/modules/organization";
 import { setSelectedOrganizationIdCookie } from "~/modules/organization/context.server";
 import {
@@ -36,12 +27,10 @@ import {
 import { appendToMetaTitle } from "~/utils/append-to-meta-title";
 import { setCookie } from "~/utils/cookies.server";
 
-export async function loader({ request }: LoaderFunctionArgs) {
-  const authSession = await getAuthSession(request);
+export async function loader() {
   const title = "Log in";
   const subHeading = "Welcome back! Enter your details below to log in.";
 
-  if (authSession) return redirect(`/`);
   return json({ title, subHeading });
 }
 
@@ -56,7 +45,7 @@ const LoginFormSchema = z.object({
   redirectTo: z.string().optional(),
 });
 
-export async function action({ request }: ActionFunctionArgs) {
+export async function action({ context, request }: ActionFunctionArgs) {
   assertIsPost(request);
   const formData = await request.formData();
   /** Check the zo validations */
@@ -118,17 +107,14 @@ export async function action({ request }: ActionFunctionArgs) {
       orgType: "PERSONAL",
     });
 
-    return redirect(safeRedirect(redirectTo || "/"), {
+    // Set the auth session and redirect to the assets page
+    context.setSession({ ...authSession });
+
+    return redirect(safeRedirect(redirectTo || "/assets"), {
       headers: [
         setCookie(
           await setSelectedOrganizationIdCookie(personalOrganization.id)
         ),
-        setCookie(
-          await commitAuthSession(request, {
-            authSession,
-            flashErrorMessage: null,
-          })
-        ),
       ],
     });
   }
@@ -195,7 +181,6 @@ export default function IndexLoginForm() {
           inputClassName="w-full"
           error={zo.errors.password()?.message || data?.errors?.password}
         />
-
         <input type="hidden" name={zo.fields.redirectTo()} value={redirectTo} />
         <Button
           className="text-center"
diff --git a/app/routes/_auth+/logout.tsx b/app/routes/_auth+/logout.tsx
index 67a6ab5f9..bece758db 100644
--- a/app/routes/_auth+/logout.tsx
+++ b/app/routes/_auth+/logout.tsx
@@ -1,12 +1,12 @@
 import type { ActionFunctionArgs } from "@remix-run/node";
 import { redirect } from "@remix-run/node";
 
-import { destroyAuthSession } from "~/modules/auth";
 import { assertIsPost } from "~/utils";
 
-export async function action({ request }: ActionFunctionArgs) {
+export async function action({ context, request }: ActionFunctionArgs) {
   assertIsPost(request);
-  return destroyAuthSession(request);
+  context.destroySession();
+  return redirect("/login");
 }
 
 export async function loader() {
diff --git a/app/routes/_auth+/oauth.callback.tsx b/app/routes/_auth+/oauth.callback.tsx
index 0ffb0642b..fef03b202 100644
--- a/app/routes/_auth+/oauth.callback.tsx
+++ b/app/routes/_auth+/oauth.callback.tsx
@@ -1,7 +1,7 @@
 import { useEffect, useState } from "react";
 
 import { json, redirect } from "@remix-run/node";
-import type { LoaderFunctionArgs, ActionFunctionArgs } from "@remix-run/node";
+import type { ActionFunctionArgs } from "@remix-run/node";
 import { useActionData, useFetcher, useSearchParams } from "@remix-run/react";
 import { parseFormAny } from "react-zorm";
 import { z } from "zod";
@@ -9,11 +9,7 @@ import { z } from "zod";
 import { Button } from "~/components/shared";
 import { Spinner } from "~/components/shared/spinner";
 import { supabaseClient } from "~/integrations/supabase";
-import {
-  refreshAccessToken,
-  commitAuthSession,
-  getAuthSession,
-} from "~/modules/auth";
+import { refreshAccessToken } from "~/modules/auth";
 import { getOrganizationByUserId } from "~/modules/organization";
 import { setSelectedOrganizationIdCookie } from "~/modules/organization/context.server";
 import { tryCreateUser, getUserByEmail } from "~/modules/user";
@@ -22,15 +18,11 @@ import { setCookie } from "~/utils/cookies.server";
 
 // imagine a user go back after OAuth login success or type this URL
 // we don't want him to fall in a black hole 👽
-export async function loader({ request }: LoaderFunctionArgs) {
-  const authSession = await getAuthSession(request);
-
-  if (authSession) return redirect("/");
-
+export async function loader() {
   return json({});
 }
 
-export async function action({ request }: ActionFunctionArgs) {
+export async function action({ context, request }: ActionFunctionArgs) {
   assertIsPost(request);
 
   const formData = await request.formData();
@@ -73,16 +65,14 @@ export async function action({ request }: ActionFunctionArgs) {
       orgType: "PERSONAL",
     });
 
+    // Set the session
+    context.setSession(authSession);
+
     return redirect(safeRedirectTo, {
       headers: [
         setCookie(
           await setSelectedOrganizationIdCookie(personalOrganization.id)
         ),
-        setCookie(
-          await commitAuthSession(request, {
-            authSession,
-          })
-        ),
       ],
     });
   }
@@ -94,22 +84,19 @@ export async function action({ request }: ActionFunctionArgs) {
   if (!user) {
     return json(
       {
-        message: "create-user-error",
+        message: "We had trouble creating your account. Please try again.",
       },
       { status: 500 }
     );
   }
 
   const personalOrganization = user.organizations[0];
+  // Set the session
+  context.setSession(authSession);
 
   return redirect(safeRedirectTo, {
     headers: [
       setCookie(await setSelectedOrganizationIdCookie(personalOrganization.id)),
-      setCookie(
-        await commitAuthSession(request, {
-          authSession,
-        })
-      ),
     ],
   });
 }
diff --git a/app/routes/_auth+/reset-password.tsx b/app/routes/_auth+/reset-password.tsx
index 257ddef25..9d7946ba9 100644
--- a/app/routes/_auth+/reset-password.tsx
+++ b/app/routes/_auth+/reset-password.tsx
@@ -1,10 +1,6 @@
 import { useEffect, useState } from "react";
 
-import type {
-  ActionFunctionArgs,
-  LoaderFunctionArgs,
-  MetaFunction,
-} from "@remix-run/node";
+import type { ActionFunctionArgs, MetaFunction } from "@remix-run/node";
 import { json, redirect } from "@remix-run/node";
 import { Form, useActionData, useNavigation } from "@remix-run/react";
 import { parseFormAny, useZorm } from "react-zorm";
@@ -14,23 +10,15 @@ import PasswordInput from "~/components/forms/password-input";
 import { Button } from "~/components/shared/button";
 import { supabaseClient } from "~/integrations/supabase";
 
-import {
-  commitAuthSession,
-  getAuthSession,
-  refreshAccessToken,
-  updateAccountPassword,
-} from "~/modules/auth";
+import { refreshAccessToken, updateAccountPassword } from "~/modules/auth";
 import { assertIsPost, isFormProcessing, tw } from "~/utils";
 import { appendToMetaTitle } from "~/utils/append-to-meta-title";
 
-export async function loader({ request }: LoaderFunctionArgs) {
-  const authSession = await getAuthSession(request);
+export async function loader() {
   const title = "Set new password";
   const subHeading =
     "Your new password must be different to previously used passwords.";
 
-  if (authSession) return redirect("/");
-
   return json({ title, subHeading });
 }
 
@@ -54,7 +42,7 @@ const ResetPasswordSchema = z
     return { password, confirmPassword, refreshToken };
   });
 
-export async function action({ request }: ActionFunctionArgs) {
+export async function action({ context, request }: ActionFunctionArgs) {
   assertIsPost(request);
 
   const formData = await request.formData();
@@ -97,13 +85,9 @@ export async function action({ request }: ActionFunctionArgs) {
     );
   }
 
-  return redirect("/", {
-    headers: {
-      "Set-Cookie": await commitAuthSession(request, {
-        authSession,
-      }),
-    },
-  });
+  // Commit the session and redirect
+  context.setSession({ ...authSession });
+  return redirect("/", {});
 }
 
 export const meta: MetaFunction<typeof loader> = ({ data }) => [
diff --git a/app/routes/_auth+/verify-email.tsx b/app/routes/_auth+/verify-email.tsx
index aa22c3d09..79acf59b2 100644
--- a/app/routes/_auth+/verify-email.tsx
+++ b/app/routes/_auth+/verify-email.tsx
@@ -1,22 +1,22 @@
 import * as React from "react";
-import type { LoaderFunctionArgs, MetaFunction } from "@remix-run/node";
-import { json, redirect } from "@remix-run/node";
+import type { MetaFunction } from "@remix-run/node";
+import { json } from "@remix-run/node";
 import { Link, useSearchParams } from "@remix-run/react";
 import { GreenCheckMarkIcon } from "~/components/icons/library";
 import { Button } from "~/components/shared";
-import { getAuthSession } from "~/modules/auth/session.server";
 import { appendToMetaTitle } from "~/utils/append-to-meta-title";
 
-export async function loader({ request }: LoaderFunctionArgs) {
-  const authSession = await getAuthSession(request);
-
+export async function loader() {
   const title = "Check your email";
-  const subHeading = " ";
+  const subHeading = "";
 
-  if (authSession) return redirect("/");
   return json({ title, subHeading });
 }
 
+export const meta: MetaFunction<typeof loader> = ({ data }) => [
+  { title: data ? appendToMetaTitle(data.title) : "" },
+];
+
 export default function VerifyEmailPage() {
   const [searchParams] = useSearchParams();
   const email = searchParams.get("email") || "";
@@ -89,7 +89,3 @@ export default function VerifyEmailPage() {
     </div>
   );
 }
-
-export const meta: MetaFunction<typeof loader> = ({ data }) => [
-  { title: data ? appendToMetaTitle(data.title) : "" },
-];
diff --git a/app/routes/_index.tsx b/app/routes/_index.tsx
index d6795185f..012195bf5 100644
--- a/app/routes/_index.tsx
+++ b/app/routes/_index.tsx
@@ -1,25 +1,7 @@
-import type { LoaderFunctionArgs } from "@remix-run/node";
 import { redirect } from "@remix-run/node";
 
-import { destroyAuthSession, getAuthSession } from "~/modules/auth";
-import { getUserByEmail } from "~/modules/user";
+export const loader = async () => redirect("/assets");
 
-export const loader = async ({ request }: LoaderFunctionArgs) => {
-  const authSession = await getAuthSession(request);
-
-  if (!authSession) {
-    return redirect("login");
-  }
-
-  const user = authSession
-    ? await getUserByEmail(authSession?.email)
-    : undefined;
-
-  if (user) {
-    return redirect(user.onboarded ? "/assets" : "onboarding");
-  }
-  /** Not finding user for the current session is sus
-   * So we just destroy the session and redirect to /
-   */
-  return destroyAuthSession(request);
-};
+export default function Route() {
+  return null;
+}
diff --git a/app/routes/_layout+/_layout.tsx b/app/routes/_layout+/_layout.tsx
index 443db0759..c963f7875 100644
--- a/app/routes/_layout+/_layout.tsx
+++ b/app/routes/_layout+/_layout.tsx
@@ -12,7 +12,6 @@ import { Spinner } from "~/components/shared/spinner";
 import { Toaster } from "~/components/shared/toast";
 import { config } from "~/config/shelf.config";
 import { db } from "~/database";
-import { commitAuthSession, requireAuthSession } from "~/modules/auth";
 import { requireOrganisationId } from "~/modules/organization/context.server";
 import styles from "~/styles/layout/index.css";
 import {
@@ -31,8 +30,8 @@ import { canUseBookings } from "~/utils/subscription";
 
 export const links: LinksFunction = () => [{ rel: "stylesheet", href: styles }];
 
-export const loader = async ({ request }: LoaderFunctionArgs) => {
-  const authSession = await requireAuthSession(request);
+export const loader = async ({ context, request }: LoaderFunctionArgs) => {
+  const authSession = context.getSession();
   // @TODO - we need to look into doing a select as we dont want to expose all data always
   const user = authSession
     ? await db.user.findUnique({
@@ -84,7 +83,7 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {
    * In this case what we do is we set the current organization to the first one in the list
    */
   const { organizationId, organizations, currentOrganization } =
-    await requireOrganisationId(authSession, request);
+    await requireOrganisationId({ userId: authSession.userId, request });
 
   return json(
     {
@@ -102,14 +101,7 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {
       canUseBookings: canUseBookings(currentOrganization),
     },
     {
-      headers: [
-        setCookie(await userPrefs.serialize(cookie)),
-        setCookie(
-          await commitAuthSession(request, {
-            authSession,
-          })
-        ),
-      ],
+      headers: [setCookie(await userPrefs.serialize(cookie))],
     }
   );
 };
diff --git a/app/routes/_layout+/admin-dashboard+/$userId.tsx b/app/routes/_layout+/admin-dashboard+/$userId.tsx
index b5711d44c..5779d5428 100644
--- a/app/routes/_layout+/admin-dashboard+/$userId.tsx
+++ b/app/routes/_layout+/admin-dashboard+/$userId.tsx
@@ -5,7 +5,6 @@ import { useLoaderData, Link } from "@remix-run/react";
 import { Table, Td, Tr } from "~/components/table";
 import { DeleteUser } from "~/components/user/delete-user";
 import { db } from "~/database";
-import { requireAuthSession } from "~/modules/auth";
 import { deleteUser } from "~/modules/user";
 import { isDelete } from "~/utils";
 import { sendNotification } from "~/utils/emitter/send-notification.server";
@@ -21,8 +20,9 @@ export type UserWithQrCodes = User & {
   qrCodes: QrCodeWithAsset[];
 };
 
-export const loader = async ({ request, params }: LoaderFunctionArgs) => {
-  requireAdmin(request);
+export const loader = async ({ context, params }: LoaderFunctionArgs) => {
+  const authSession = context.getSession();
+  await requireAdmin(authSession.userId);
   const userId = params.userId as string;
   const user = (await db.user.findUnique({
     where: { id: userId },
@@ -55,9 +55,13 @@ export const handle = {
   breadcrumb: () => "User details",
 };
 
-export const action = async ({ request, params }: ActionFunctionArgs) => {
-  const authSession = await requireAuthSession(request);
-  await requireAdmin(request);
+export const action = async ({
+  context,
+  request,
+  params,
+}: ActionFunctionArgs) => {
+  const authSession = context.getSession();
+  await requireAdmin(authSession.userId);
   /** ID of the target user we are generating codes for */
   const userId = params.userId as string;
 
diff --git a/app/routes/_layout+/admin-dashboard+/_layout.tsx b/app/routes/_layout+/admin-dashboard+/_layout.tsx
index f59dde7d0..5f7f1e039 100644
--- a/app/routes/_layout+/admin-dashboard+/_layout.tsx
+++ b/app/routes/_layout+/admin-dashboard+/_layout.tsx
@@ -5,8 +5,9 @@ import HorizontalTabs from "~/components/layout/horizontal-tabs";
 
 import { requireAdmin } from "~/utils/roles.server";
 
-export async function loader({ request }: LoaderFunctionArgs) {
-  await requireAdmin(request);
+export async function loader({ context }: LoaderFunctionArgs) {
+  const authSession = context.getSession();
+  await requireAdmin(authSession.userId);
 
   return null;
 }
diff --git a/app/routes/_layout+/admin-dashboard+/announcements.new.tsx b/app/routes/_layout+/admin-dashboard+/announcements.new.tsx
index c44b31889..607119d2d 100644
--- a/app/routes/_layout+/admin-dashboard+/announcements.new.tsx
+++ b/app/routes/_layout+/admin-dashboard+/announcements.new.tsx
@@ -6,19 +6,18 @@ import { Switch } from "~/components/forms/switch";
 import { MarkdownEditor } from "~/components/markdown";
 import { Button } from "~/components/shared";
 import { db } from "~/database";
-import { requireAuthSession } from "~/modules/auth";
 import { requireAdmin } from "~/utils/roles.server";
 
-export const loader = async ({ request }: LoaderFunctionArgs) => {
-  await requireAuthSession(request);
-  await requireAdmin(request);
+export const loader = async ({ context }: LoaderFunctionArgs) => {
+  const authSession = context.getSession();
+  await requireAdmin(authSession.userId);
 
   return json({});
 };
 
-export const action = async ({ request }: ActionFunctionArgs) => {
-  await requireAuthSession(request);
-  await requireAdmin(request);
+export const action = async ({ context, request }: ActionFunctionArgs) => {
+  const authSession = context.getSession();
+  await requireAdmin(authSession.userId);
 
   const formData = await request.formData();
   const name = formData.get("name") as string;
diff --git a/app/routes/_layout+/admin-dashboard+/announcements.tsx b/app/routes/_layout+/admin-dashboard+/announcements.tsx
index d43ee1d5d..4c7b29ab0 100644
--- a/app/routes/_layout+/admin-dashboard+/announcements.tsx
+++ b/app/routes/_layout+/admin-dashboard+/announcements.tsx
@@ -6,13 +6,12 @@ import { MarkdownViewer } from "~/components/markdown";
 import { Button } from "~/components/shared";
 import { Table, Td, Th, Tr } from "~/components/table";
 import { db } from "~/database";
-import { requireAuthSession } from "~/modules/auth";
 import { parseMarkdownToReact } from "~/utils/md.server";
 import { requireAdmin } from "~/utils/roles.server";
 
-export const loader = async ({ request }: LoaderFunctionArgs) => {
-  await requireAuthSession(request);
-  await requireAdmin(request);
+export const loader = async ({ context }: LoaderFunctionArgs) => {
+  const authSession = context.getSession();
+  await requireAdmin(authSession.userId);
 
   const announcements = await db.announcement.findMany({
     orderBy: {
@@ -28,9 +27,9 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {
   });
 };
 
-export const action = async ({ request }: ActionFunctionArgs) => {
-  await requireAuthSession(request);
-  await requireAdmin(request);
+export const action = async ({ context, request }: ActionFunctionArgs) => {
+  const authSession = context.getSession();
+  await requireAdmin(authSession.userId);
   const formData = await request.formData();
   const published = formData.get("published") === "on";
   const announcementId = formData.get("id") as string;
diff --git a/app/routes/_layout+/admin-dashboard+/org.$organizationId.tsx b/app/routes/_layout+/admin-dashboard+/org.$organizationId.tsx
index 0d2debee5..e623c5b0e 100644
--- a/app/routes/_layout+/admin-dashboard+/org.$organizationId.tsx
+++ b/app/routes/_layout+/admin-dashboard+/org.$organizationId.tsx
@@ -8,13 +8,13 @@ import { FileForm } from "~/components/assets/import-content";
 import { Button } from "~/components/shared";
 import { Table, Td, Tr } from "~/components/table";
 import { db } from "~/database";
-import { requireAuthSession } from "~/modules/auth";
 import { generateOrphanedCodes } from "~/modules/qr";
 import { ShelfStackError } from "~/utils/error";
 import { requireAdmin } from "~/utils/roles.server";
 
-export const loader = async ({ request, params }: LoaderFunctionArgs) => {
-  requireAdmin(request);
+export const loader = async ({ context, params }: LoaderFunctionArgs) => {
+  const authSession = context.getSession();
+  await requireAdmin(authSession.userId);
 
   const organization = await db.organization.findUnique({
     where: { id: params.organizationId as string },
@@ -34,9 +34,13 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
   return json({ organization });
 };
 
-export const action = async ({ request, params }: ActionFunctionArgs) => {
-  await requireAuthSession(request);
-  await requireAdmin(request);
+export const action = async ({
+  context,
+  request,
+  params,
+}: ActionFunctionArgs) => {
+  const authSession = context.getSession();
+  await requireAdmin(authSession.userId);
   const organizationId = params.organizationId as string;
   const formData = await request.formData();
 
diff --git a/app/routes/_layout+/admin-dashboard+/users.tsx b/app/routes/_layout+/admin-dashboard+/users.tsx
index 76260878b..a70384d6e 100644
--- a/app/routes/_layout+/admin-dashboard+/users.tsx
+++ b/app/routes/_layout+/admin-dashboard+/users.tsx
@@ -9,8 +9,9 @@ import { Td } from "~/components/table";
 import { getPaginatedAndFilterableUsers } from "~/modules/user";
 import { requireAdmin } from "~/utils/roles.server";
 
-export const loader = async ({ request }: LoaderFunctionArgs) => {
-  await requireAdmin(request);
+export const loader = async ({ context, request }: LoaderFunctionArgs) => {
+  const authSession = context.getSession();
+  await requireAdmin(authSession.userId);
   const { search, totalUsers, perPage, page, prev, next, users, totalPages } =
     await getPaginatedAndFilterableUsers({
       request,
diff --git a/app/routes/_layout+/assets.$assetId.duplicate.tsx b/app/routes/_layout+/assets.$assetId.duplicate.tsx
index 4d5036f1e..48ed516c9 100644
--- a/app/routes/_layout+/assets.$assetId.duplicate.tsx
+++ b/app/routes/_layout+/assets.$assetId.duplicate.tsx
@@ -23,12 +23,20 @@ import { ShelfStackError } from "~/utils/error";
 import { PermissionAction, PermissionEntity } from "~/utils/permissions";
 import { requirePermision } from "~/utils/roles.server";
 
-export const loader = async ({ request, params }: LoaderFunctionArgs) => {
-  await requirePermision(
+export const loader = async ({
+  context,
+  request,
+  params,
+}: LoaderFunctionArgs) => {
+  const authSession = context.getSession();
+  const { userId } = authSession;
+  await requirePermision({
+    userId,
     request,
-    PermissionEntity.asset,
-    PermissionAction.create
-  );
+    entity: PermissionEntity.asset,
+    action: PermissionAction.create,
+  });
+
   const assetId = params.assetId as string;
   const asset = await db.asset.findUnique({ where: { id: assetId } });
   if (!asset) {
@@ -50,14 +58,19 @@ const DuplicateAssetSchema = z.object({
     }),
 });
 
-export const action = async ({ request, params }: ActionFunctionArgs) => {
-  const { authSession, organizationId } = await requirePermision(
-    request,
-    PermissionEntity.asset,
-    PermissionAction.create
-  );
-
+export const action = async ({
+  context,
+  request,
+  params,
+}: ActionFunctionArgs) => {
+  const authSession = context.getSession();
   const { userId } = authSession;
+  const { organizationId } = await requirePermision({
+    userId,
+    request,
+    entity: PermissionEntity.asset,
+    action: PermissionAction.create,
+  });
 
   const assetId = params.assetId as string;
   const asset = await db.asset.findUnique({
diff --git a/app/routes/_layout+/assets.$assetId.give-custody.tsx b/app/routes/_layout+/assets.$assetId.give-custody.tsx
index 7e2ed327b..a118cf501 100644
--- a/app/routes/_layout+/assets.$assetId.give-custody.tsx
+++ b/app/routes/_layout+/assets.$assetId.give-custody.tsx
@@ -23,12 +23,19 @@ import { PermissionAction, PermissionEntity } from "~/utils/permissions";
 import { requirePermision } from "~/utils/roles.server";
 import type { AssetWithBooking } from "./bookings.$bookingId.add-assets";
 
-export const loader = async ({ request, params }: LoaderFunctionArgs) => {
-  const { organizationId } = await requirePermision(
+export const loader = async ({
+  context,
+  request,
+  params,
+}: LoaderFunctionArgs) => {
+  const authSession = context.getSession();
+  const { userId } = authSession;
+  const { organizationId } = await requirePermision({
+    userId,
     request,
-    PermissionEntity.asset,
-    PermissionAction.update
-  );
+    entity: PermissionEntity.asset,
+    action: PermissionAction.update,
+  });
 
   const assetId = params.assetId as string;
   const asset = await db.asset.findUnique({
@@ -77,14 +84,20 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
   });
 };
 
-export const action = async ({ request, params }: ActionFunctionArgs) => {
-  const {
-    authSession: { userId },
-  } = await requirePermision(
+export const action = async ({
+  context,
+  request,
+  params,
+}: ActionFunctionArgs) => {
+  const authSession = context.getSession();
+  const { userId } = authSession;
+  await requirePermision({
+    userId,
     request,
-    PermissionEntity.asset,
-    PermissionAction.update
-  );
+    entity: PermissionEntity.asset,
+    action: PermissionAction.update,
+  });
+
   const formData = await request.formData();
   const assetId = params.assetId as string;
   const custodian = formData.get("custodian");
diff --git a/app/routes/_layout+/assets.$assetId.note.tsx b/app/routes/_layout+/assets.$assetId.note.tsx
index f43d58130..3289bbbff 100644
--- a/app/routes/_layout+/assets.$assetId.note.tsx
+++ b/app/routes/_layout+/assets.$assetId.note.tsx
@@ -3,7 +3,6 @@ import { json, redirect } from "@remix-run/node";
 import { parseFormAny } from "react-zorm";
 import { NewNoteSchema } from "~/components/assets/notes/new";
 import { createNote, deleteNote } from "~/modules/asset";
-import { commitAuthSession } from "~/modules/auth";
 import { assertIsDelete, assertIsPost, isDelete, isPost } from "~/utils";
 import { sendNotification } from "~/utils/emitter/send-notification.server";
 import { PermissionAction, PermissionEntity } from "~/utils/permissions";
@@ -13,12 +12,20 @@ export const loader = async ({ params }: LoaderFunctionArgs) =>
   /** makes sure that if the user navigates to that url, it redirects back to asset */
   redirect(`/assets/${params.assetId}`);
 
-export const action = async ({ request, params }: ActionFunctionArgs) => {
-  const { authSession } = await requirePermision(
+export const action = async ({
+  context,
+  request,
+  params,
+}: ActionFunctionArgs) => {
+  const authSession = context.getSession();
+  const { userId } = authSession;
+
+  await requirePermision({
+    userId,
     request,
-    PermissionEntity.asset,
-    PermissionAction.update
-  );
+    entity: PermissionEntity.asset,
+    action: PermissionAction.update,
+  });
   const formData = await request.formData();
 
   /* Create note */
@@ -33,9 +40,6 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
         },
         {
           status: 400,
-          headers: {
-            "Set-Cookie": await commitAuthSession(request, { authSession }),
-          },
         }
       );
     }
@@ -55,14 +59,7 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
       userId: authSession.userId,
     });
 
-    return json(
-      { note },
-      {
-        headers: {
-          "Set-Cookie": await commitAuthSession(request, { authSession }),
-        },
-      }
-    );
+    return json({ note });
   }
 
   /* Delete note */
@@ -82,13 +79,6 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
       id: noteId,
       userId: authSession.userId,
     });
-    return json(
-      { deleted },
-      {
-        headers: {
-          "Set-Cookie": await commitAuthSession(request, { authSession }),
-        },
-      }
-    );
+    return json({ deleted });
   }
 };
diff --git a/app/routes/_layout+/assets.$assetId.qr.tsx b/app/routes/_layout+/assets.$assetId.qr.tsx
index e3217b61c..100c2a711 100644
--- a/app/routes/_layout+/assets.$assetId.qr.tsx
+++ b/app/routes/_layout+/assets.$assetId.qr.tsx
@@ -15,15 +15,15 @@ import { PermissionAction, PermissionEntity } from "~/utils/permissions";
 import { requirePermision } from "~/utils/roles.server";
 type SizeKeys = "cable" | "small" | "medium" | "large";
 
-export async function loader({ request, params }: LoaderFunctionArgs) {
-  const { authSession, organizationId } = await requirePermision(
-    request,
-    PermissionEntity.qr,
-    PermissionAction.read
-  );
-
-  // Here we are reading the
+export async function loader({ context, request, params }: LoaderFunctionArgs) {
+  const authSession = context.getSession();
   const { userId } = authSession;
+  const { organizationId } = await requirePermision({
+    userId,
+    request,
+    entity: PermissionEntity.qr,
+    action: PermissionAction.read,
+  });
 
   const { assetId } = params as { assetId: string };
   const searchParams = getCurrentSearchParams(request);
diff --git a/app/routes/_layout+/assets.$assetId.release-custody.tsx b/app/routes/_layout+/assets.$assetId.release-custody.tsx
index d44b618ed..a0534d593 100644
--- a/app/routes/_layout+/assets.$assetId.release-custody.tsx
+++ b/app/routes/_layout+/assets.$assetId.release-custody.tsx
@@ -14,12 +14,19 @@ import { ShelfStackError } from "~/utils/error";
 import { PermissionAction, PermissionEntity } from "~/utils/permissions";
 import { requirePermision } from "~/utils/roles.server";
 
-export const loader = async ({ request, params }: LoaderFunctionArgs) => {
-  await requirePermision(
+export const loader = async ({
+  context,
+  request,
+  params,
+}: LoaderFunctionArgs) => {
+  const authSession = context.getSession();
+  const { userId } = authSession;
+  await requirePermision({
+    userId,
     request,
-    PermissionEntity.asset,
-    PermissionAction.update
-  );
+    entity: PermissionEntity.asset,
+    action: PermissionAction.update,
+  });
   const custody = await db.custody.findUnique({
     where: { assetId: params.assetId as string },
     select: {
@@ -46,14 +53,19 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
   });
 };
 
-export const action = async ({ request, params }: ActionFunctionArgs) => {
-  const {
-    authSession: { userId },
-  } = await requirePermision(
+export const action = async ({
+  context,
+  request,
+  params,
+}: ActionFunctionArgs) => {
+  const authSession = context.getSession();
+  const { userId } = authSession;
+  await requirePermision({
+    userId,
     request,
-    PermissionEntity.asset,
-    PermissionAction.update
-  );
+    entity: PermissionEntity.asset,
+    action: PermissionAction.update,
+  });
   const assetId = params.assetId as string;
   const user = await getUserByID(userId);
 
diff --git a/app/routes/_layout+/assets.$assetId.tsx b/app/routes/_layout+/assets.$assetId.tsx
index ff9208c8a..7d6430ec4 100644
--- a/app/routes/_layout+/assets.$assetId.tsx
+++ b/app/routes/_layout+/assets.$assetId.tsx
@@ -38,7 +38,6 @@ import {
   updateAssetBookingAvailability,
 } from "~/modules/asset";
 import type { ShelfAssetCustomFieldValueType } from "~/modules/asset/types";
-import { commitAuthSession } from "~/modules/auth";
 import { getScanByQrId } from "~/modules/scan";
 import { parseScanData } from "~/modules/scan/utils.server";
 import assetCss from "~/styles/asset.css";
@@ -46,7 +45,6 @@ import { getRequiredParam, tw, isLink, isFormProcessing } from "~/utils";
 
 import { appendToMetaTitle } from "~/utils/append-to-meta-title";
 import { getDateTimeFormat, getLocale } from "~/utils/client-hints";
-import { setCookie } from "~/utils/cookies.server";
 import { getCustomFieldDisplayValue } from "~/utils/custom-fields";
 import { sendNotification } from "~/utils/emitter/send-notification.server";
 import { ShelfStackError } from "~/utils/error";
@@ -59,14 +57,17 @@ export const AvailabilityForBookingFormSchema = z.object({
   availableToBook: z.string().transform((val) => val === "on"),
 });
 
-export async function loader({ request, params }: LoaderFunctionArgs) {
-  const { authSession, organizationId } = await requirePermision(
+export async function loader({ context, request, params }: LoaderFunctionArgs) {
+  const authSession = context.getSession();
+  const { userId } = authSession;
+
+  const { organizationId } = await requirePermision({
+    userId,
     request,
-    PermissionEntity.asset,
-    PermissionAction.read
-  );
+    entity: PermissionEntity.asset,
+    action: PermissionAction.read,
+  });
 
-  const { userId } = authSession;
   const locale = getLocale(request);
   const id = getRequiredParam(params, "assetId");
 
@@ -124,7 +125,10 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
   });
 }
 
-export async function action({ request, params }: ActionFunctionArgs) {
+export async function action({ context, request, params }: ActionFunctionArgs) {
+  const authSession = context.getSession();
+  const { userId } = authSession;
+
   const formData = await request.formData();
   const intent = formData.get("intent") as "delete" | "toggle";
   const intent2ActionMap: { [K in typeof intent]: PermissionAction } = {
@@ -132,11 +136,13 @@ export async function action({ request, params }: ActionFunctionArgs) {
     toggle: PermissionAction.update,
   };
 
-  const { authSession, organizationId } = await requirePermision(
+  const { organizationId } = await requirePermision({
+    userId,
     request,
-    PermissionEntity.asset,
-    intent2ActionMap[intent]
-  );
+    entity: PermissionEntity.asset,
+    action: intent2ActionMap[intent],
+  });
+
   const id = getRequiredParam(params, "assetId");
   switch (intent) {
     case "delete":
@@ -155,11 +161,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
         senderId: authSession.userId,
       });
 
-      return redirect(`/assets`, {
-        headers: {
-          "Set-Cookie": await commitAuthSession(request, { authSession }),
-        },
-      });
+      return redirect(`/assets`);
     case "toggle":
       const availableToBook = formData.get("availableToBook") === "on";
       const rsp = await updateAssetBookingAvailability(id, availableToBook);
@@ -172,9 +174,6 @@ export async function action({ request, params }: ActionFunctionArgs) {
           },
           {
             status: 400,
-            headers: [
-              setCookie(await commitAuthSession(request, { authSession })),
-            ],
           }
         );
       }
@@ -186,14 +185,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
         senderId: authSession.userId,
       });
 
-      return json(
-        { success: true },
-        {
-          headers: {
-            "Set-Cookie": await commitAuthSession(request, { authSession }),
-          },
-        }
-      );
+      return json({ success: true });
     default:
       return null;
   }
@@ -325,7 +317,7 @@ export default function AssetDetailsPage() {
             <Card>
               <div className="flex items-center gap-3">
                 <img
-                  src="/images/default_pfp.jpg"
+                  src="/static/images/default_pfp.jpg"
                   alt="custodian"
                   className="size-10 rounded"
                 />
diff --git a/app/routes/_layout+/assets.$assetId.update-location.tsx b/app/routes/_layout+/assets.$assetId.update-location.tsx
index 72e807296..e460ef376 100644
--- a/app/routes/_layout+/assets.$assetId.update-location.tsx
+++ b/app/routes/_layout+/assets.$assetId.update-location.tsx
@@ -5,20 +5,25 @@ import { LocationMarkerIcon } from "~/components/icons";
 import { LocationSelect } from "~/components/location";
 import { Button } from "~/components/shared/button";
 import { getAllRelatedEntries, getAsset, updateAsset } from "~/modules/asset";
-import { commitAuthSession } from "~/modules/auth";
 import styles from "~/styles/layout/custom-modal.css";
 import { assertIsPost, getRequiredParam, isFormProcessing } from "~/utils";
 import { sendNotification } from "~/utils/emitter/send-notification.server";
 import { PermissionAction, PermissionEntity } from "~/utils/permissions";
 import { requirePermision } from "~/utils/roles.server";
 
-export const loader = async ({ request, params }: LoaderFunctionArgs) => {
-  const { authSession, organizationId } = await requirePermision(
-    request,
-    PermissionEntity.asset,
-    PermissionAction.update
-  );
+export const loader = async ({
+  context,
+  request,
+  params,
+}: LoaderFunctionArgs) => {
+  const authSession = context.getSession();
   const { userId } = authSession;
+  const { organizationId } = await requirePermision({
+    userId,
+    request,
+    entity: PermissionEntity.asset,
+    action: PermissionAction.update,
+  });
 
   const { locations } = await getAllRelatedEntries({
     userId,
@@ -35,13 +40,16 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
   });
 };
 
-export async function action({ request, params }: ActionFunctionArgs) {
+export async function action({ context, request, params }: ActionFunctionArgs) {
   assertIsPost(request);
-  const { authSession } = await requirePermision(
+  const authSession = context.getSession();
+  const { userId } = authSession;
+  await requirePermision({
+    userId,
     request,
-    PermissionEntity.asset,
-    PermissionAction.update
-  );
+    entity: PermissionEntity.asset,
+    action: PermissionAction.update,
+  });
 
   const id = getRequiredParam(params, "assetId");
 
@@ -63,11 +71,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
     senderId: authSession.userId,
   });
 
-  return redirect(`/assets/${id}`, {
-    headers: {
-      "Set-Cookie": await commitAuthSession(request, { authSession }),
-    },
-  });
+  return redirect(`/assets/${id}`);
 }
 
 export function links() {
diff --git a/app/routes/_layout+/assets.$assetId_.edit.tsx b/app/routes/_layout+/assets.$assetId_.edit.tsx
index 161864213..33e23b976 100644
--- a/app/routes/_layout+/assets.$assetId_.edit.tsx
+++ b/app/routes/_layout+/assets.$assetId_.edit.tsx
@@ -21,13 +21,11 @@ import {
   updateAssetMainImage,
 } from "~/modules/asset";
 
-import { commitAuthSession } from "~/modules/auth";
 import { getActiveCustomFields } from "~/modules/custom-field";
 import { getOrganization } from "~/modules/organization";
 import { buildTagsSet } from "~/modules/tag";
 import { assertIsPost, getRequiredParam, slugify } from "~/utils";
 import { appendToMetaTitle } from "~/utils/append-to-meta-title";
-import { setCookie } from "~/utils/cookies.server";
 import {
   extractCustomFieldValuesFromResults,
   mergedSchema,
@@ -37,14 +35,16 @@ import { ShelfStackError } from "~/utils/error";
 import { PermissionAction, PermissionEntity } from "~/utils/permissions";
 import { requirePermision } from "~/utils/roles.server";
 
-export async function loader({ request, params }: LoaderFunctionArgs) {
-  const { authSession, organizationId } = await requirePermision(
+export async function loader({ context, request, params }: LoaderFunctionArgs) {
+  const authSession = context.getSession();
+  const { userId } = authSession;
+  const { organizationId } = await requirePermision({
+    userId,
     request,
-    PermissionEntity.asset,
-    PermissionAction.update
-  );
+    entity: PermissionEntity.asset,
+    action: PermissionAction.update,
+  });
   const organization = await getOrganization({ id: organizationId });
-  const { userId } = authSession;
 
   const { categories, tags, locations, customFields } =
     await getAllRelatedEntries({
@@ -83,13 +83,17 @@ export const handle = {
   breadcrumb: () => "single",
 };
 
-export async function action({ request, params }: ActionFunctionArgs) {
+export async function action({ context, request, params }: ActionFunctionArgs) {
   assertIsPost(request);
-  const { authSession, organizationId } = await requirePermision(
+  const authSession = context.getSession();
+  const { userId } = authSession;
+
+  const { organizationId } = await requirePermision({
+    userId,
     request,
-    PermissionEntity.asset,
-    PermissionAction.update
-  );
+    entity: PermissionEntity.asset,
+    action: PermissionAction.update,
+  });
 
   const id = getRequiredParam(params, "assetId");
   const clonedRequest = request.clone();
@@ -124,7 +128,6 @@ export async function action({ request, params }: ActionFunctionArgs) {
       },
       {
         status: 400,
-        headers: [setCookie(await commitAuthSession(request, { authSession }))],
       }
     );
   }
@@ -169,7 +172,6 @@ export async function action({ request, params }: ActionFunctionArgs) {
       },
       {
         status: 400,
-        headers: [setCookie(await commitAuthSession(request, { authSession }))],
       }
     );
   }
@@ -181,9 +183,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
     senderId: authSession.userId,
   });
 
-  return redirect(`/assets/${id}`, {
-    headers: [setCookie(await commitAuthSession(request, { authSession }))],
-  });
+  return redirect(`/assets/${id}`, {});
 }
 
 export default function AssetEditPage() {
diff --git a/app/routes/_layout+/assets._index.tsx b/app/routes/_layout+/assets._index.tsx
index d00519441..96990fa11 100644
--- a/app/routes/_layout+/assets._index.tsx
+++ b/app/routes/_layout+/assets._index.tsx
@@ -7,6 +7,7 @@ import {
 } from "@prisma/client";
 import type { LoaderFunctionArgs, MetaFunction } from "@remix-run/node";
 import { json } from "@remix-run/node";
+import type { ShouldRevalidateFunctionArgs } from "@remix-run/react";
 import { useLoaderData, useNavigate } from "@remix-run/react";
 import { useAtom, useAtomValue } from "jotai";
 import { redirect } from "react-router";
@@ -37,7 +38,6 @@ import {
   getPaginatedAndFilterableAssets,
   updateAssetsWithBookingCustodians,
 } from "~/modules/asset";
-import { commitAuthSession } from "~/modules/auth";
 import { getOrganizationTierLimit } from "~/modules/tier";
 import { appendToMetaTitle } from "~/utils/append-to-meta-title";
 import { userPrefs } from "~/utils/cookies.server";
@@ -81,21 +81,17 @@ export interface IndexResponse {
   };
 }
 
-export async function loader({ request }: LoaderFunctionArgs) {
-  const {
-    authSession,
-    organizationId,
-    organizations,
-    currentOrganization,
-    role,
-  } = await requirePermision(
-    request,
-    PermissionEntity.asset,
-    PermissionAction.read
-  );
-
+export async function loader({ context, request }: LoaderFunctionArgs) {
+  const authSession = context.getSession();
   const { userId } = authSession;
 
+  const { organizationId, organizations, currentOrganization, role } =
+    await requirePermision({
+      userId,
+      request,
+      entity: PermissionEntity.asset,
+      action: PermissionAction.read,
+    });
   // @TODO we shouldnt have to do this. We can combine it with the requirePermission
   const user = await db.user.findUnique({
     where: {
@@ -129,12 +125,10 @@ export async function loader({ request }: LoaderFunctionArgs) {
       },
     },
   });
-
   const tierLimit = await getOrganizationTierLimit({
     organizationId,
     organizations,
   });
-
   let {
     search,
     totalAssets,
@@ -151,11 +145,9 @@ export async function loader({ request }: LoaderFunctionArgs) {
     request,
     organizationId,
   });
-
   if (totalPages !== 0 && page > totalPages) {
     return redirect("/assets");
   }
-
   if (!assets) {
     throw new ShelfStackError({
       title: "Hey!",
@@ -163,16 +155,13 @@ export async function loader({ request }: LoaderFunctionArgs) {
       status: 404,
     });
   }
-
   if (role === OrganizationRoles.SELF_SERVICE) {
     /**
      * For self service users we dont return the assets that are not available to book
      */
     assets = assets.filter((a) => a.availableToBook);
   }
-
   assets = await updateAssetsWithBookingCustodians(assets);
-
   const header: HeaderData = {
     title: isPersonalOrg(currentOrganization)
       ? user?.firstName
@@ -182,12 +171,10 @@ export async function loader({ request }: LoaderFunctionArgs) {
       ? `${currentOrganization?.name}'s inventory`
       : "Your inventory",
   };
-
   const modelName = {
     singular: "asset",
     plural: "assets",
   };
-
   return json(
     {
       header,
@@ -210,19 +197,26 @@ export async function loader({ request }: LoaderFunctionArgs) {
       },
     },
     {
-      headers: [
-        ["Set-Cookie", await userPrefs.serialize(cookie)],
-        [
-          "Set-Cookie",
-          await commitAuthSession(request, {
-            authSession,
-          }),
-        ],
-      ],
+      headers: [["Set-Cookie", await userPrefs.serialize(cookie)]],
     }
   );
 }
 
+export function shouldRevalidate({
+  actionResult,
+  defaultShouldRevalidate,
+}: ShouldRevalidateFunctionArgs) {
+  /**
+   * If we are toggliong the sidebar, no need to revalidate this loader.
+   * Revalidation happens in _layout
+   */
+  if (actionResult?.isTogglingSidebar) {
+    return false;
+  }
+
+  return defaultShouldRevalidate;
+}
+
 export const meta: MetaFunction<typeof loader> = ({ data }) => [
   { title: appendToMetaTitle(data.header.title) },
 ];
@@ -389,7 +383,7 @@ const ListAssetContent = ({
                   <img
                     src={
                       custody.custodian?.user?.profilePicture ||
-                      "/images/default_pfp.jpg"
+                      "/static/images/default_pfp.jpg"
                     }
                     className="mr-1 size-4 rounded-full"
                     alt=""
diff --git a/app/routes/_layout+/assets.export.$fileName[.csv].tsx b/app/routes/_layout+/assets.export.$fileName[.csv].tsx
index 652d09ff3..96e41e94d 100644
--- a/app/routes/_layout+/assets.export.$fileName[.csv].tsx
+++ b/app/routes/_layout+/assets.export.$fileName[.csv].tsx
@@ -4,12 +4,15 @@ import { exportAssetsToCsv } from "~/utils/csv.server";
 import { PermissionAction, PermissionEntity } from "~/utils/permissions";
 import { requirePermision } from "~/utils/roles.server";
 
-export const loader = async ({ request }: LoaderFunctionArgs) => {
-  const { organizationId, organizations } = await requirePermision(
+export const loader = async ({ context, request }: LoaderFunctionArgs) => {
+  const authSession = context.getSession();
+
+  const { organizationId, organizations } = await requirePermision({
+    userId: authSession.userId,
     request,
-    PermissionEntity.asset,
-    PermissionAction.export
-  );
+    entity: PermissionEntity.asset,
+    action: PermissionAction.export,
+  });
   await assertUserCanExportAssets({ organizationId, organizations });
 
   /** Join the rows with a new line */
diff --git a/app/routes/_layout+/assets.import.tsx b/app/routes/_layout+/assets.import.tsx
index b36724dcc..2d4d3a0c8 100644
--- a/app/routes/_layout+/assets.import.tsx
+++ b/app/routes/_layout+/assets.import.tsx
@@ -17,24 +17,25 @@ import {
   TabsTrigger,
 } from "~/components/shared/tabs";
 import { createAssetsFromContentImport } from "~/modules/asset";
-import { commitAuthSession } from "~/modules/auth";
 import { assertUserCanImportAssets } from "~/modules/tier";
 import { appendToMetaTitle } from "~/utils/append-to-meta-title";
-import { setCookie } from "~/utils/cookies.server";
 import { csvDataFromRequest } from "~/utils/csv.server";
 import { ShelfStackError } from "~/utils/error";
 import { extractCSVDataFromContentImport } from "~/utils/import.server";
 import { PermissionAction, PermissionEntity } from "~/utils/permissions";
 import { requirePermision } from "~/utils/roles.server";
 
-export const action = async ({ request }: ActionFunctionArgs) => {
-  const { authSession, organizationId, organizations } = await requirePermision(
-    request,
-    PermissionEntity.asset,
-    PermissionAction.import
-  );
+export const action = async ({ context, request }: ActionFunctionArgs) => {
+  const authSession = context.getSession();
   const { userId } = authSession;
 
+  const { organizationId, organizations } = await requirePermision({
+    userId,
+    request,
+    entity: PermissionEntity.asset,
+    action: PermissionAction.import,
+  });
+
   const error = {
     message: "",
     details: {
@@ -81,25 +82,21 @@ export const action = async ({ request }: ActionFunctionArgs) => {
       },
       {
         status: 400,
-        headers: [
-          setCookie(
-            await commitAuthSession(request, {
-              authSession,
-              flashErrorMessage: null,
-            })
-          ),
-        ],
       }
     );
   }
 };
 
-export const loader = async ({ request }: LoaderFunctionArgs) => {
-  const { organizationId, organizations } = await requirePermision(
+export const loader = async ({ context, request }: LoaderFunctionArgs) => {
+  const authSession = context.getSession();
+  const { userId } = authSession;
+
+  const { organizationId, organizations } = await requirePermision({
+    userId,
     request,
-    PermissionEntity.asset,
-    PermissionAction.import
-  );
+    entity: PermissionEntity.asset,
+    action: PermissionAction.import,
+  });
   await assertUserCanImportAssets({ organizationId, organizations });
 
   return json({
diff --git a/app/routes/_layout+/assets.new.tsx b/app/routes/_layout+/assets.new.tsx
index 8e5926fc5..2f4cac317 100644
--- a/app/routes/_layout+/assets.new.tsx
+++ b/app/routes/_layout+/assets.new.tsx
@@ -14,14 +14,12 @@ import {
   getAllRelatedEntries,
   updateAssetMainImage,
 } from "~/modules/asset";
-import { commitAuthSession } from "~/modules/auth";
 import { getActiveCustomFields } from "~/modules/custom-field";
 import { getOrganization } from "~/modules/organization";
 import { assertWhetherQrBelongsToCurrentOrganization } from "~/modules/qr";
 import { buildTagsSet } from "~/modules/tag";
 import { assertIsPost, slugify } from "~/utils";
 import { appendToMetaTitle } from "~/utils/append-to-meta-title";
-import { setCookie } from "~/utils/cookies.server";
 import {
   extractCustomFieldValuesFromResults,
   mergedSchema,
@@ -32,13 +30,16 @@ import { requirePermision } from "~/utils/roles.server";
 
 const title = "New Asset";
 
-export async function loader({ request }: LoaderFunctionArgs) {
-  const { authSession, organizationId } = await requirePermision(
-    request,
-    PermissionEntity.asset,
-    PermissionAction.create
-  );
+export async function loader({ context, request }: LoaderFunctionArgs) {
+  const authSession = context.getSession();
   const { userId } = authSession;
+
+  const { organizationId } = await requirePermision({
+    userId,
+    request,
+    entity: PermissionEntity.asset,
+    action: PermissionAction.create,
+  });
   const organization = await getOrganization({ id: organizationId });
   /**
    * We need to check if the QR code passed in the URL belongs to the current org
@@ -77,12 +78,15 @@ export const handle = {
   breadcrumb: () => <span>{title}</span>,
 };
 
-export async function action({ request }: LoaderFunctionArgs) {
-  const { authSession, organizationId } = await requirePermision(
+export async function action({ context, request }: LoaderFunctionArgs) {
+  const authSession = context.getSession();
+  const { userId } = authSession;
+  const { organizationId } = await requirePermision({
+    userId,
     request,
-    PermissionEntity.asset,
-    PermissionAction.create
-  );
+    entity: PermissionEntity.asset,
+    action: PermissionAction.create,
+  });
   assertIsPost(request);
 
   /** Here we need to clone the request as we need 2 different streams:
@@ -119,7 +123,6 @@ export async function action({ request }: LoaderFunctionArgs) {
       },
       {
         status: 400,
-        headers: [setCookie(await commitAuthSession(request, { authSession }))],
       }
     );
   }
@@ -157,7 +160,6 @@ export async function action({ request }: LoaderFunctionArgs) {
       },
       {
         status: 400,
-        headers: [setCookie(await commitAuthSession(request, { authSession }))],
       }
     );
   }
@@ -186,9 +188,7 @@ export async function action({ request }: LoaderFunctionArgs) {
     });
   }
 
-  return redirect(`/assets`, {
-    headers: [setCookie(await commitAuthSession(request, { authSession }))],
-  });
+  return redirect(`/assets`);
 }
 
 export default function NewAssetPage() {
diff --git a/app/routes/_layout+/assets.tsx b/app/routes/_layout+/assets.tsx
index 5ad0b22f9..cca081ce2 100644
--- a/app/routes/_layout+/assets.tsx
+++ b/app/routes/_layout+/assets.tsx
@@ -1,31 +1,24 @@
-import { json, type LoaderFunctionArgs } from "@remix-run/node";
+import type { ShouldRevalidateFunctionArgs } from "@remix-run/react";
 import { Link, Outlet } from "@remix-run/react";
 import { ErrorBoundryComponent } from "~/components/errors";
 
-import { commitAuthSession } from "~/modules/auth";
-import { PermissionAction, PermissionEntity } from "~/utils/permissions";
-import { requirePermision } from "~/utils/roles.server";
+export async function loader() {
+  return null;
+}
 
-export async function loader({ request }: LoaderFunctionArgs) {
-  const { authSession } = await requirePermision(
-    request,
-    PermissionEntity.asset,
-    PermissionAction.read
-  );
+export function shouldRevalidate({
+  actionResult,
+  defaultShouldRevalidate,
+}: ShouldRevalidateFunctionArgs) {
+  /**
+   * If we are toggliong the sidebar, no need to revalidate this loader.
+   * Revalidation happens in _layout
+   */
+  if (actionResult?.isTogglingSidebar) {
+    return false;
+  }
 
-  return json(
-    {},
-    {
-      headers: [
-        [
-          "Set-Cookie",
-          await commitAuthSession(request, {
-            authSession,
-          }),
-        ],
-      ],
-    }
-  );
+  return defaultShouldRevalidate;
 }
 
 export const handle = {
diff --git a/app/routes/_layout+/bookings.$bookingId.add-assets.tsx b/app/routes/_layout+/bookings.$bookingId.add-assets.tsx
index 623cd586d..cb4b3a53b 100644
--- a/app/routes/_layout+/bookings.$bookingId.add-assets.tsx
+++ b/app/routes/_layout+/bookings.$bookingId.add-assets.tsx
@@ -36,12 +36,18 @@ import { requirePermision } from "~/utils/roles.server";
 
 export const links: LinksFunction = () => [{ rel: "stylesheet", href: styles }];
 
-export const loader = async ({ request, params }: LoaderFunctionArgs) => {
-  const { organizationId } = await requirePermision(
+export const loader = async ({
+  context,
+  request,
+  params,
+}: LoaderFunctionArgs) => {
+  const authSession = context.getSession();
+  const { organizationId } = await requirePermision({
+    userId: authSession?.userId,
     request,
-    PermissionEntity.booking,
-    PermissionAction.update
-  );
+    entity: PermissionEntity.booking,
+    action: PermissionAction.update,
+  });
 
   const id = getRequiredParam(params, "bookingId");
 
@@ -91,12 +97,18 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
   });
 };
 
-export const action = async ({ request, params }: ActionFunctionArgs) => {
-  await requirePermision(
+export const action = async ({
+  context,
+  request,
+  params,
+}: ActionFunctionArgs) => {
+  const authSession = context.getSession();
+  await requirePermision({
+    userId: authSession?.userId,
     request,
-    PermissionEntity.booking,
-    PermissionAction.update
-  );
+    entity: PermissionEntity.booking,
+    action: PermissionAction.update,
+  });
 
   const bookingId = getRequiredParam(params, "bookingId");
   const formData = await request.formData();
diff --git a/app/routes/_layout+/bookings.$bookingId.tsx b/app/routes/_layout+/bookings.$bookingId.tsx
index 12fec54ea..6a9185b69 100644
--- a/app/routes/_layout+/bookings.$bookingId.tsx
+++ b/app/routes/_layout+/bookings.$bookingId.tsx
@@ -18,7 +18,6 @@ import Header from "~/components/layout/header";
 import type { HeaderData } from "~/components/layout/header/types";
 import { Badge } from "~/components/shared";
 import { db } from "~/database";
-import { commitAuthSession } from "~/modules/auth";
 import {
   deleteBooking,
   getBooking,
@@ -47,12 +46,15 @@ import { PermissionAction, PermissionEntity } from "~/utils/permissions";
 import { requirePermision } from "~/utils/roles.server";
 import { bookingStatusColorMap } from "./bookings";
 
-export async function loader({ request, params }: LoaderFunctionArgs) {
-  const { authSession, organizationId, role } = await requirePermision(
+export async function loader({ context, request, params }: LoaderFunctionArgs) {
+  const authSession = context.getSession();
+  const { organizationId, role } = await requirePermision({
+    userId: authSession?.userId,
     request,
-    PermissionEntity.booking,
-    PermissionAction.read
-  );
+    entity: PermissionEntity.booking,
+    action: PermissionAction.create,
+  });
+
   const isSelfService = role === OrganizationRoles.SELF_SERVICE;
 
   const bookingId = getRequiredParam(params, "bookingId");
@@ -186,7 +188,9 @@ export const handle = {
   breadcrumb: () => <span>Edit</span>,
 };
 
-export async function action({ request, params }: ActionFunctionArgs) {
+export async function action({ context, request, params }: ActionFunctionArgs) {
+  const authSession = context.getSession();
+
   const formData = await request.formData();
   const intent = formData.get("intent") as
     | "save"
@@ -208,14 +212,21 @@ export async function action({ request, params }: ActionFunctionArgs) {
     archive: PermissionAction.update,
     cancel: PermissionAction.update,
   };
-  const { authSession, organizationId, role } = await requirePermision(
+
+  const { organizationId, role } = await requirePermision({
+    userId: authSession?.userId,
     request,
-    PermissionEntity.booking,
-    intent2ActionMap[intent]
-  );
+    entity: PermissionEntity.booking,
+    action: intent2ActionMap[intent],
+  });
   const id = getRequiredParam(params, "bookingId");
   const isSelfService = role === OrganizationRoles.SELF_SERVICE;
 
+
+  const headers = [
+    setCookie(await setSelectedOrganizationIdCookie(organizationId)),
+  ];
+
   switch (intent) {
     case "save":
       const result = await NewBookingFormSchema().safeParseAsync(
@@ -230,9 +241,6 @@ export async function action({ request, params }: ActionFunctionArgs) {
           },
           {
             status: 400,
-            headers: {
-              "Set-Cookie": await commitAuthSession(request, { authSession }),
-            },
           }
         );
       }
@@ -270,10 +278,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
         { booking },
         {
           status: 200,
-          headers: [
-            setCookie(await commitAuthSession(request, { authSession })),
-            setCookie(await setSelectedOrganizationIdCookie(organizationId)),
-          ],
+          headers,
         }
       );
     case "reserve":
@@ -291,10 +296,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
       return json(
         { success: true },
         {
-          headers: [
-            setCookie(await commitAuthSession(request, { authSession })),
-            setCookie(await setSelectedOrganizationIdCookie(organizationId)),
-          ],
+          headers,
         }
       );
     case "delete":
@@ -324,10 +326,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
         senderId: authSession.userId,
       });
       return redirect("/bookings", {
-        headers: [
-          setCookie(await commitAuthSession(request, { authSession })),
-          setCookie(await setSelectedOrganizationIdCookie(organizationId)),
-        ],
+        headers,
       });
     case "removeAsset":
       const assetId = formData.get("assetId");
@@ -343,10 +342,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
         { booking },
         {
           status: 200,
-          headers: [
-            setCookie(await commitAuthSession(request, { authSession })),
-            setCookie(await setSelectedOrganizationIdCookie(organizationId)),
-          ],
+          headers,
         }
       );
     case "checkOut":
@@ -363,10 +359,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
       return json(
         { success: true },
         {
-          headers: [
-            setCookie(await commitAuthSession(request, { authSession })),
-            setCookie(await setSelectedOrganizationIdCookie(organizationId)),
-          ],
+          headers,
         }
       );
     case "checkIn":
@@ -386,10 +379,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
       return json(
         { success: true },
         {
-          headers: [
-            setCookie(await commitAuthSession(request, { authSession })),
-            setCookie(await setSelectedOrganizationIdCookie(organizationId)),
-          ],
+          headers,
         }
       );
     case "archive":
@@ -406,10 +396,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
       return json(
         { success: true },
         {
-          headers: [
-            setCookie(await commitAuthSession(request, { authSession })),
-            setCookie(await setSelectedOrganizationIdCookie(organizationId)),
-          ],
+          headers,
         }
       );
     case "cancel":
@@ -426,10 +413,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
       return json(
         { success: true },
         {
-          headers: [
-            setCookie(await commitAuthSession(request, { authSession })),
-            setCookie(await setSelectedOrganizationIdCookie(organizationId)),
-          ],
+          headers,
         }
       );
     default:
diff --git a/app/routes/_layout+/bookings.new.tsx b/app/routes/_layout+/bookings.new.tsx
index 146ff08d3..cb7463f4b 100644
--- a/app/routes/_layout+/bookings.new.tsx
+++ b/app/routes/_layout+/bookings.new.tsx
@@ -12,7 +12,6 @@ import { BookingForm, NewBookingFormSchema } from "~/components/booking/form";
 import styles from "~/components/booking/styles.new.css";
 import { db } from "~/database";
 
-import { commitAuthSession } from "~/modules/auth";
 import { upsertBooking } from "~/modules/booking";
 import { setSelectedOrganizationIdCookie } from "~/modules/organization/context.server";
 import { getUserByID } from "~/modules/user";
@@ -29,12 +28,15 @@ import { requirePermision } from "~/utils/roles.server";
  * In the .new route we dont even return any html, we just create a draft booking and directly redirect to the .bookingId route.
  * This way all actions are available and its way easier to manage so in a way this works kind of like a resource route.
  */
-export async function loader({ request }: LoaderFunctionArgs) {
-  const { authSession, organizationId, role } = await requirePermision(
+export async function loader({ context, request }: LoaderFunctionArgs) {
+  const authSession = context.getSession();
+  const { organizationId, role } = await requirePermision({
+    userId: authSession?.userId,
     request,
-    PermissionEntity.booking,
-    PermissionAction.create
-  );
+    entity: PermissionEntity.booking,
+    action: PermissionAction.create,
+  });
+
   const isSelfService = role === OrganizationRoles.SELF_SERVICE;
   const user = await getUserByID(authSession.userId);
 
@@ -93,21 +95,22 @@ export async function loader({ request }: LoaderFunctionArgs) {
     },
     {
       headers: [
-        setCookie(await commitAuthSession(request, { authSession })),
         setCookie(await setSelectedOrganizationIdCookie(organizationId)),
       ],
     }
   );
 }
 
-export async function action({ request }: ActionFunctionArgs) {
+export async function action({ context, request }: ActionFunctionArgs) {
   const formData = await request.formData();
 
-  const { authSession, organizationId } = await requirePermision(
+  const authSession = context.getSession();
+  const { organizationId } = await requirePermision({
+    userId: authSession?.userId,
     request,
-    PermissionEntity.booking,
-    PermissionAction.update
-  );
+    entity: PermissionEntity.booking,
+    action: PermissionAction.create,
+  });
 
   const result = await NewBookingFormSchema().safeParseAsync(
     parseFormAny(formData)
@@ -121,9 +124,6 @@ export async function action({ request }: ActionFunctionArgs) {
       },
       {
         status: 400,
-        headers: {
-          "Set-Cookie": await commitAuthSession(request, { authSession }),
-        },
       }
     );
   }
diff --git a/app/routes/_layout+/bookings.tsx b/app/routes/_layout+/bookings.tsx
index c24a9086d..d6da84484 100644
--- a/app/routes/_layout+/bookings.tsx
+++ b/app/routes/_layout+/bookings.tsx
@@ -6,6 +6,7 @@ import type { ShouldRevalidateFunction } from "@remix-run/react";
 import { Link, Outlet, useMatches, useNavigate } from "@remix-run/react";
 import { AvailabilityBadge } from "~/components/booking/availability-label";
 import { StatusFilter } from "~/components/booking/status-filter";
+import { ErrorBoundryComponent } from "~/components/errors";
 
 import { ChevronRight } from "~/components/icons";
 import ContextualModal from "~/components/layout/contextual-modal";
@@ -15,7 +16,6 @@ import { Filters, List } from "~/components/list";
 import { ListContentWrapper } from "~/components/list/content-wrapper";
 import { Badge, Button } from "~/components/shared";
 import { Td, Th } from "~/components/table";
-import { commitAuthSession } from "~/modules/auth";
 import { getBookings } from "~/modules/booking";
 import { setSelectedOrganizationIdCookie } from "~/modules/organization/context.server";
 import {
@@ -33,12 +33,14 @@ import {
 import { PermissionAction, PermissionEntity } from "~/utils/permissions";
 import { requirePermision } from "~/utils/roles.server";
 
-export async function loader({ request }: LoaderFunctionArgs) {
-  const { authSession, organizationId, role } = await requirePermision(
+export async function loader({ context, request }: LoaderFunctionArgs) {
+  const authSession = context.getSession();
+  const { organizationId, role } = await requirePermision({
+    userId: authSession?.userId,
     request,
-    PermissionEntity.booking,
-    PermissionAction.read
-  );
+    entity: PermissionEntity.booking,
+    action: PermissionAction.read,
+  });
   const isSelfService = role === OrganizationRoles.SELF_SERVICE;
   const searchParams = getCurrentSearchParams(request);
   const { page, perPageParam, search, status } = getParamsValues(searchParams);
@@ -113,7 +115,6 @@ export async function loader({ request }: LoaderFunctionArgs) {
     {
       headers: [
         setCookie(await userPrefs.serialize(cookie)),
-        setCookie(await commitAuthSession(request, { authSession })),
         setCookie(await setSelectedOrganizationIdCookie(organizationId)),
       ],
     }
@@ -154,7 +155,7 @@ export default function BookingsIndexPage() {
   /**
    * We have 2 cases when we should render index:
    * 1. When we are on the index route
-   * 2. When we are on the .new route
+   * 2. When we are on the .new route - the reason we do this is because we want to have the .new modal overlaying the index.
    */
   const shouldRenderIndex =
     currentRoute?.handle?.name === ("bookings.index" as string) ||
@@ -315,7 +316,8 @@ const ListAssetContent = ({
         {item?.custodianUser ? (
           <UserBadge
             img={
-              item?.custodianUser?.profilePicture || "/images/default_pfp.jpg"
+              item?.custodianUser?.profilePicture ||
+              "/static/images/default_pfp.jpg"
             }
             name={`${item?.custodianUser?.firstName || ""} ${
               item?.custodianUser?.lastName || ""
@@ -329,7 +331,9 @@ const ListAssetContent = ({
       {/* Created by */}
       <Td className="hidden md:table-cell">
         <UserBadge
-          img={item?.creator?.profilePicture || "/images/default_pfp.jpg"}
+          img={
+            item?.creator?.profilePicture || "/static/images/default_pfp.jpg"
+          }
           name={`${item?.creator?.firstName || ""} ${
             item?.creator?.lastName || ""
           }`}
@@ -343,7 +347,7 @@ function UserBadge({ img, name }: { img?: string; name: string }) {
   return (
     <span className="inline-flex w-max items-center justify-center rounded-2xl bg-gray-100 px-2 py-[2px] text-center text-[12px] font-medium text-gray-700">
       <img
-        src={img || "/images/default_pfp.jpg"}
+        src={img || "/static/images/default_pfp.jpg"}
         className="mr-1 size-4 rounded-full"
         alt=""
       />
@@ -361,3 +365,5 @@ export type BookingWithCustodians = Prisma.BookingGetPayload<{
     custodianTeamMember: true;
   };
 }>;
+
+export const ErrorBoundary = () => <ErrorBoundryComponent />;
diff --git a/app/routes/_layout+/categories.$categoryId_.edit.tsx b/app/routes/_layout+/categories.$categoryId_.edit.tsx
index 48336bae5..dd04bc5ef 100644
--- a/app/routes/_layout+/categories.$categoryId_.edit.tsx
+++ b/app/routes/_layout+/categories.$categoryId_.edit.tsx
@@ -13,11 +13,9 @@ import Input from "~/components/forms/input";
 
 import { Button } from "~/components/shared/button";
 
-import { commitAuthSession } from "~/modules/auth";
 import { getCategory, updateCategory } from "~/modules/category";
 import { isFormProcessing, getRequiredParam } from "~/utils";
 import { appendToMetaTitle } from "~/utils/append-to-meta-title";
-import { setCookie } from "~/utils/cookies.server";
 import { sendNotification } from "~/utils/emitter/send-notification.server";
 import { PermissionAction, PermissionEntity } from "~/utils/permissions";
 import { requirePermision } from "~/utils/roles.server";
@@ -31,12 +29,14 @@ export const UpdateCategoryFormSchema = z.object({
 
 const title = "Edit category";
 
-export async function loader({ request, params }: LoaderFunctionArgs) {
-  await requirePermision(
+export async function loader({ context, request, params }: LoaderFunctionArgs) {
+  const authSession = context.getSession();
+  await requirePermision({
+    userId: authSession.userId,
     request,
-    PermissionEntity.category,
-    PermissionAction.update
-  );
+    entity: PermissionEntity.category,
+    action: PermissionAction.update,
+  });
 
   const id = getRequiredParam(params, "categoryId");
   const category = await getCategory({ id });
@@ -54,12 +54,15 @@ export const meta: MetaFunction<typeof loader> = ({ data }) => [
   { title: data ? appendToMetaTitle(data.header.title) : "" },
 ];
 
-export async function action({ request, params }: LoaderFunctionArgs) {
-  const { authSession } = await requirePermision(
+export async function action({ context, request, params }: LoaderFunctionArgs) {
+  const authSession = context.getSession();
+  await requirePermision({
+    userId: authSession.userId,
     request,
-    PermissionEntity.category,
-    PermissionAction.update
-  );
+    entity: PermissionEntity.category,
+    action: PermissionAction.update,
+  });
+
   const formData = await request.formData();
   const result = await UpdateCategoryFormSchema.safeParseAsync(
     parseFormAny(formData)
@@ -73,7 +76,6 @@ export async function action({ request, params }: LoaderFunctionArgs) {
       },
       {
         status: 400,
-        headers: [setCookie(await commitAuthSession(request, { authSession }))],
       }
     );
   }
@@ -91,7 +93,6 @@ export async function action({ request, params }: LoaderFunctionArgs) {
       },
       {
         status: 400,
-        headers: [setCookie(await commitAuthSession(request, { authSession }))],
       }
     );
   }
@@ -103,9 +104,7 @@ export async function action({ request, params }: LoaderFunctionArgs) {
     senderId: authSession.userId,
   });
 
-  return redirect(`/categories`, {
-    headers: [setCookie(await commitAuthSession(request, { authSession }))],
-  });
+  return redirect(`/categories`);
 }
 
 export default function EditCategory() {
diff --git a/app/routes/_layout+/categories.new.tsx b/app/routes/_layout+/categories.new.tsx
index 58d7cc9b2..6cc2e3307 100644
--- a/app/routes/_layout+/categories.new.tsx
+++ b/app/routes/_layout+/categories.new.tsx
@@ -13,11 +13,9 @@ import Input from "~/components/forms/input";
 
 import { Button } from "~/components/shared/button";
 
-import { commitAuthSession } from "~/modules/auth";
 import { createCategory } from "~/modules/category";
 import { getRandomColor, isFormProcessing } from "~/utils";
 import { appendToMetaTitle } from "~/utils/append-to-meta-title";
-import { setCookie } from "~/utils/cookies.server";
 import { sendNotification } from "~/utils/emitter/send-notification.server";
 import { PermissionAction, PermissionEntity } from "~/utils/permissions";
 import { requirePermision } from "~/utils/roles.server";
@@ -31,12 +29,14 @@ export const NewCategoryFormSchema = z.object({
 
 const title = "New category";
 
-export async function loader({ request }: LoaderFunctionArgs) {
-  await requirePermision(
+export async function loader({ context, request }: LoaderFunctionArgs) {
+  const authSession = context.getSession();
+  await requirePermision({
+    userId: authSession.userId,
     request,
-    PermissionEntity.category,
-    PermissionAction.create
-  );
+    entity: PermissionEntity.category,
+    action: PermissionAction.create,
+  });
 
   const colorFromServer = getRandomColor();
 
@@ -51,12 +51,14 @@ export const meta: MetaFunction<typeof loader> = ({ data }) => [
   { title: data ? appendToMetaTitle(data.header.title) : "" },
 ];
 
-export async function action({ request }: LoaderFunctionArgs) {
-  const { authSession, organizationId } = await requirePermision(
+export async function action({ context, request }: LoaderFunctionArgs) {
+  const authSession = context.getSession();
+  const { organizationId } = await requirePermision({
+    userId: authSession.userId,
     request,
-    PermissionEntity.category,
-    PermissionAction.create
-  );
+    entity: PermissionEntity.category,
+    action: PermissionAction.create,
+  });
   const formData = await request.formData();
   const result = await NewCategoryFormSchema.safeParseAsync(
     parseFormAny(formData)
@@ -69,7 +71,6 @@ export async function action({ request }: LoaderFunctionArgs) {
       },
       {
         status: 400,
-        headers: [setCookie(await commitAuthSession(request, { authSession }))],
       }
     );
   }
@@ -87,7 +88,6 @@ export async function action({ request }: LoaderFunctionArgs) {
       },
       {
         status: 400,
-        headers: [setCookie(await commitAuthSession(request, { authSession }))],
       }
     );
   }
@@ -99,9 +99,7 @@ export async function action({ request }: LoaderFunctionArgs) {
     senderId: authSession.userId,
   });
 
-  return redirect(`/categories`, {
-    headers: [setCookie(await commitAuthSession(request, { authSession }))],
-  });
+  return redirect(`/categories`);
 }
 
 export default function NewCategory() {
diff --git a/app/routes/_layout+/categories.tsx b/app/routes/_layout+/categories.tsx
index bc37b71b6..8767f4c92 100644
--- a/app/routes/_layout+/categories.tsx
+++ b/app/routes/_layout+/categories.tsx
@@ -27,12 +27,14 @@ import { sendNotification } from "~/utils/emitter/send-notification.server";
 import { PermissionAction, PermissionEntity } from "~/utils/permissions";
 import { requirePermision } from "~/utils/roles.server";
 
-export async function loader({ request }: LoaderFunctionArgs) {
-  const { organizationId } = await requirePermision(
+export async function loader({ context, request }: LoaderFunctionArgs) {
+  const authSession = context.getSession();
+  const { organizationId } = await requirePermision({
+    userId: authSession.userId,
     request,
-    PermissionEntity.category,
-    PermissionAction.read
-  );
+    entity: PermissionEntity.category,
+    action: PermissionAction.read,
+  });
 
   const searchParams = getCurrentSearchParams(request);
   const { page, perPageParam, search } = getParamsValues(searchParams);
@@ -81,14 +83,17 @@ export const meta: MetaFunction<typeof loader> = ({ data }) => [
   { title: data ? appendToMetaTitle(data.header.title) : "" },
 ];
 
-export async function action({ request }: ActionFunctionArgs) {
-  const { authSession, organizationId } = await requirePermision(
-    request,
-    PermissionEntity.category,
-    PermissionAction.delete
-  );
+export async function action({ context, request }: ActionFunctionArgs) {
+  const authSession = context.getSession();
   const { userId } = authSession;
 
+  const { organizationId } = await requirePermision({
+    userId: authSession.userId,
+    request,
+    entity: PermissionEntity.category,
+    action: PermissionAction.delete,
+  });
+
   const formData = await request.formData();
   const id = formData.get("id") as string;
 
diff --git a/app/routes/_layout+/dashboard.tsx b/app/routes/_layout+/dashboard.tsx
index b8911c3f8..106cf7e4b 100644
--- a/app/routes/_layout+/dashboard.tsx
+++ b/app/routes/_layout+/dashboard.tsx
@@ -37,12 +37,14 @@ import { parseMarkdownToReact } from "~/utils/md.server";
 import { PermissionAction, PermissionEntity } from "~/utils/permissions";
 import { requirePermision } from "~/utils/roles.server";
 
-export async function loader({ request }: LoaderFunctionArgs) {
-  const { organizationId, currentOrganization } = await requirePermision(
+export async function loader({ context, request }: LoaderFunctionArgs) {
+  const authSession = context.getSession();
+  const { organizationId, currentOrganization } = await requirePermision({
+    userId: authSession.userId,
     request,
-    PermissionEntity.dashboard,
-    PermissionAction.read
-  );
+    entity: PermissionEntity.dashboard,
+    action: PermissionAction.read,
+  });
 
   /** This should be updated to use select to only get the data we need */
   const assets = await db.asset.findMany({
diff --git a/app/routes/_layout+/locations.$locationId.add-assets.tsx b/app/routes/_layout+/locations.$locationId.add-assets.tsx
index fa5b28637..d8673cbae 100644
--- a/app/routes/_layout+/locations.$locationId.add-assets.tsx
+++ b/app/routes/_layout+/locations.$locationId.add-assets.tsx
@@ -17,12 +17,18 @@ import { ShelfStackError } from "~/utils/error";
 import { PermissionAction, PermissionEntity } from "~/utils/permissions";
 import { requirePermision } from "~/utils/roles.server";
 
-export const loader = async ({ request, params }: LoaderFunctionArgs) => {
-  const { organizationId } = await requirePermision(
+export const loader = async ({
+  context,
+  request,
+  params,
+}: LoaderFunctionArgs) => {
+  const authSession = context.getSession();
+  const { organizationId } = await requirePermision({
+    userId: authSession.userId,
     request,
-    PermissionEntity.location,
-    PermissionAction.update
-  );
+    entity: PermissionEntity.location,
+    action: PermissionAction.update,
+  });
   const locationId = params.locationId as string;
   const location = await db.location.findUnique({
     where: {
@@ -70,12 +76,18 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
   });
 };
 
-export const action = async ({ request, params }: ActionFunctionArgs) => {
-  await requirePermision(
+export const action = async ({
+  context,
+  request,
+  params,
+}: ActionFunctionArgs) => {
+  const authSession = context.getSession();
+  await requirePermision({
+    userId: authSession.userId,
     request,
-    PermissionEntity.location,
-    PermissionAction.update
-  );
+    entity: PermissionEntity.location,
+    action: PermissionAction.update,
+  });
   const { locationId } = params;
   const formData = await request.formData();
   const assetId = formData.get("assetId") as string;
diff --git a/app/routes/_layout+/locations.$locationId.tsx b/app/routes/_layout+/locations.$locationId.tsx
index 44169c7ff..305853bf0 100644
--- a/app/routes/_layout+/locations.$locationId.tsx
+++ b/app/routes/_layout+/locations.$locationId.tsx
@@ -24,7 +24,6 @@ import { Image } from "~/components/shared/image";
 import { Tag as TagBadge } from "~/components/shared/tag";
 import TextualDivider from "~/components/shared/textual-divider";
 import { Td, Th } from "~/components/table";
-import { commitAuthSession } from "~/modules/auth";
 import { deleteLocation, getLocation } from "~/modules/location";
 import assetCss from "~/styles/asset.css";
 import {
@@ -42,12 +41,18 @@ import { ShelfStackError } from "~/utils/error";
 import { PermissionAction, PermissionEntity } from "~/utils/permissions";
 import { requirePermision } from "~/utils/roles.server";
 
-export const loader = async ({ request, params }: LoaderFunctionArgs) => {
-  const { organizationId } = await requirePermision(
+export const loader = async ({
+  context,
+  request,
+  params,
+}: LoaderFunctionArgs) => {
+  const authSession = context.getSession();
+  const { organizationId } = await requirePermision({
+    userId: authSession.userId,
     request,
-    PermissionEntity.location,
-    PermissionAction.read
-  );
+    entity: PermissionEntity.location,
+    action: PermissionAction.read,
+  });
   const id = getRequiredParam(params, "locationId");
 
   const searchParams = getCurrentSearchParams(request);
@@ -117,12 +122,14 @@ export const links: LinksFunction = () => [
   { rel: "stylesheet", href: assetCss },
 ];
 
-export async function action({ request, params }: ActionFunctionArgs) {
-  const { authSession } = await requirePermision(
+export async function action({ context, request, params }: ActionFunctionArgs) {
+  const authSession = context.getSession();
+  await requirePermision({
+    userId: authSession.userId,
     request,
-    PermissionEntity.location,
-    PermissionAction.read
-  );
+    entity: PermissionEntity.location,
+    action: PermissionAction.delete,
+  });
   const id = getRequiredParam(params, "locationId");
 
   await deleteLocation({ id });
@@ -134,11 +141,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
     senderId: authSession.userId,
   });
 
-  return redirect(`/locations`, {
-    headers: {
-      "Set-Cookie": await commitAuthSession(request, { authSession }),
-    },
-  });
+  return redirect(`/locations`);
 }
 
 export default function LocationPage() {
diff --git a/app/routes/_layout+/locations.$locationId_.edit.tsx b/app/routes/_layout+/locations.$locationId_.edit.tsx
index 5e3d3c6e6..b2988ebde 100644
--- a/app/routes/_layout+/locations.$locationId_.edit.tsx
+++ b/app/routes/_layout+/locations.$locationId_.edit.tsx
@@ -16,23 +16,24 @@ import { dynamicTitleAtom } from "~/atoms/dynamic-title-atom";
 import Header from "~/components/layout/header";
 import type { HeaderData } from "~/components/layout/header/types";
 import { LocationForm, NewLocationFormSchema } from "~/components/location";
-import { commitAuthSession } from "~/modules/auth";
 import { getLocation, updateLocation } from "~/modules/location";
 import { getRequiredParam } from "~/utils";
 import { appendToMetaTitle } from "~/utils/append-to-meta-title";
-import { setCookie } from "~/utils/cookies.server";
 import { sendNotification } from "~/utils/emitter/send-notification.server";
 import { ShelfStackError } from "~/utils/error";
 import { PermissionAction, PermissionEntity } from "~/utils/permissions";
 import { requirePermision } from "~/utils/roles.server";
 import { MAX_SIZE } from "./locations.new";
 
-export async function loader({ request, params }: LoaderFunctionArgs) {
-  const { organizationId } = await requirePermision(
+export async function loader({ context, request, params }: LoaderFunctionArgs) {
+  const authSession = context.getSession();
+  const { organizationId } = await requirePermision({
+    userId: authSession.userId,
     request,
-    PermissionEntity.location,
-    PermissionAction.update
-  );
+    entity: PermissionEntity.location,
+    action: PermissionAction.update,
+  });
+
   const id = getRequiredParam(params, "locationId");
 
   const { location } = await getLocation({ organizationId, id });
@@ -58,12 +59,14 @@ export const handle = {
   breadcrumb: () => <span>Edit</span>,
 };
 
-export async function action({ request, params }: ActionFunctionArgs) {
-  const { authSession, organizationId } = await requirePermision(
+export async function action({ context, request, params }: ActionFunctionArgs) {
+  const authSession = context.getSession();
+  const { organizationId } = await requirePermision({
+    userId: authSession.userId,
     request,
-    PermissionEntity.location,
-    PermissionAction.update
-  );
+    entity: PermissionEntity.location,
+    action: PermissionAction.update,
+  });
   const clonedRequest = request.clone();
 
   const id = getRequiredParam(params, "locationId");
@@ -80,9 +83,6 @@ export async function action({ request, params }: ActionFunctionArgs) {
       },
       {
         status: 400,
-        headers: {
-          "Set-Cookie": await commitAuthSession(request, { authSession }),
-        },
       }
     );
   }
@@ -116,7 +116,6 @@ export async function action({ request, params }: ActionFunctionArgs) {
       },
       {
         status: 400,
-        headers: [setCookie(await commitAuthSession(request, { authSession }))],
       }
     );
   }
@@ -128,14 +127,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
     senderId: authSession.userId,
   });
 
-  return json(
-    { success: true },
-    {
-      headers: {
-        "Set-Cookie": await commitAuthSession(request, { authSession }),
-      },
-    }
-  );
+  return json({ success: true });
 }
 
 export default function LocationEditPage() {
diff --git a/app/routes/_layout+/locations._index.tsx b/app/routes/_layout+/locations._index.tsx
index 5e002cfbc..d75c00c25 100644
--- a/app/routes/_layout+/locations._index.tsx
+++ b/app/routes/_layout+/locations._index.tsx
@@ -22,12 +22,14 @@ import { updateCookieWithPerPage, userPrefs } from "~/utils/cookies.server";
 import { PermissionAction, PermissionEntity } from "~/utils/permissions";
 import { requirePermision } from "~/utils/roles.server";
 
-export async function loader({ request }: LoaderFunctionArgs) {
-  const { organizationId } = await requirePermision(
+export async function loader({ context, request }: LoaderFunctionArgs) {
+  const authSession = context.getSession();
+  const { organizationId } = await requirePermision({
+    userId: authSession.userId,
     request,
-    PermissionEntity.location,
-    PermissionAction.read
-  );
+    entity: PermissionEntity.location,
+    action: PermissionAction.read,
+  });
   const searchParams = getCurrentSearchParams(request);
   const { page, perPageParam, search } = getParamsValues(searchParams);
   const cookie = await updateCookieWithPerPage(request, perPageParam);
diff --git a/app/routes/_layout+/locations.new.tsx b/app/routes/_layout+/locations.new.tsx
index 03dd82ee5..f886d6b43 100644
--- a/app/routes/_layout+/locations.new.tsx
+++ b/app/routes/_layout+/locations.new.tsx
@@ -17,21 +17,21 @@ import { dynamicTitleAtom } from "~/atoms/dynamic-title-atom";
 import Header from "~/components/layout/header";
 import { LocationForm, NewLocationFormSchema } from "~/components/location";
 
-import { commitAuthSession } from "~/modules/auth";
 import { createLocation } from "~/modules/location";
 import { appendToMetaTitle } from "~/utils/append-to-meta-title";
-import { setCookie } from "~/utils/cookies.server";
 import { sendNotification } from "~/utils/emitter/send-notification.server";
 import { PermissionAction, PermissionEntity } from "~/utils/permissions";
 import { requirePermision } from "~/utils/roles.server";
 const title = "New Location";
 
-export async function loader({ request }: LoaderFunctionArgs) {
-  await requirePermision(
+export async function loader({ context, request }: LoaderFunctionArgs) {
+  const authSession = context.getSession();
+  await requirePermision({
+    userId: authSession.userId,
     request,
-    PermissionEntity.location,
-    PermissionAction.create
-  );
+    entity: PermissionEntity.location,
+    action: PermissionAction.create,
+  });
 
   const header = {
     title,
@@ -50,12 +50,14 @@ export const handle = {
 
 export const MAX_SIZE = 1024 * 1024 * 4; // 4MB
 
-export async function action({ request }: ActionFunctionArgs) {
-  const { authSession, organizationId } = await requirePermision(
+export async function action({ context, request }: ActionFunctionArgs) {
+  const authSession = context.getSession();
+  const { organizationId } = await requirePermision({
+    userId: authSession.userId,
     request,
-    PermissionEntity.location,
-    PermissionAction.create
-  );
+    entity: PermissionEntity.location,
+    action: PermissionAction.create,
+  });
 
   /** Here we need to clone the request as we need 2 different streams:
    * 1. Access form data for creating asset
@@ -78,9 +80,6 @@ export async function action({ request }: ActionFunctionArgs) {
       },
       {
         status: 400,
-        headers: {
-          "Set-Cookie": await commitAuthSession(request, { authSession }),
-        },
       }
     );
   }
@@ -115,7 +114,6 @@ export async function action({ request }: ActionFunctionArgs) {
       },
       {
         status: 400,
-        headers: [setCookie(await commitAuthSession(request, { authSession }))],
       }
     );
   }
@@ -128,11 +126,7 @@ export async function action({ request }: ActionFunctionArgs) {
     senderId: authSession.userId,
   });
 
-  return redirect(`/locations/${location.id}`, {
-    headers: {
-      "Set-Cookie": await commitAuthSession(request, { authSession }),
-    },
-  });
+  return redirect(`/locations/${location.id}`);
 }
 
 export default function NewLocationPage() {
diff --git a/app/routes/_layout+/locations.tsx b/app/routes/_layout+/locations.tsx
index bf89d3114..bffa969d7 100644
--- a/app/routes/_layout+/locations.tsx
+++ b/app/routes/_layout+/locations.tsx
@@ -4,12 +4,14 @@ import { ErrorBoundryComponent } from "~/components/errors";
 import { PermissionAction, PermissionEntity } from "~/utils/permissions";
 import { requirePermision } from "~/utils/roles.server";
 
-export async function loader({ request }: LoaderFunctionArgs) {
-  await requirePermision(
+export async function loader({ context, request }: LoaderFunctionArgs) {
+  const authSession = context.getSession();
+  await requirePermision({
+    userId: authSession.userId,
     request,
-    PermissionEntity.location,
-    PermissionAction.read
-  );
+    entity: PermissionEntity.location,
+    action: PermissionAction.read,
+  });
 
   return null;
 }
diff --git a/app/routes/_layout+/settings.account.tsx b/app/routes/_layout+/settings.account.tsx
index 3f9fab215..f8423b0a7 100644
--- a/app/routes/_layout+/settings.account.tsx
+++ b/app/routes/_layout+/settings.account.tsx
@@ -1,9 +1,5 @@
-import type {
-  ActionFunctionArgs,
-  LoaderFunctionArgs,
-  MetaFunction,
-} from "@remix-run/node";
-import { json } from "@remix-run/node";
+import type { ActionFunctionArgs, MetaFunction } from "@remix-run/node";
+import { json, redirect } from "@remix-run/node";
 
 import { Form, useActionData, useNavigation } from "@remix-run/react";
 import { useAtom, useAtomValue } from "jotai";
@@ -17,19 +13,14 @@ import PasswordResetForm from "~/components/user/password-reset-form";
 import ProfilePicture from "~/components/user/profile-picture";
 
 import { useUserData } from "~/hooks";
-import {
-  commitAuthSession,
-  destroyAuthSession,
-  requireAuthSession,
-  sendResetPasswordLink,
-} from "~/modules/auth";
+import { sendResetPasswordLink } from "~/modules/auth";
 import { updateProfilePicture, updateUser } from "~/modules/user";
 import type {
   UpdateUserPayload,
   UpdateUserResponse,
 } from "~/modules/user/types";
 
-import { assertIsPost, isFormProcessing } from "~/utils";
+import { isFormProcessing } from "~/utils";
 import { appendToMetaTitle } from "~/utils/append-to-meta-title";
 import { delay } from "~/utils/delay";
 import { sendNotification } from "~/utils/emitter/send-notification.server";
@@ -47,9 +38,8 @@ export const UpdateFormSchema = z.object({
   lastName: z.string().optional(),
 });
 
-export async function action({ request }: ActionFunctionArgs) {
-  const authSession = await requireAuthSession(request);
-  assertIsPost(request);
+export async function action({ context, request }: ActionFunctionArgs) {
+  const authSession = context.getSession();
 
   const clonedRequest = request.clone();
   const formData = await clonedRequest.formData();
@@ -72,7 +62,8 @@ export async function action({ request }: ActionFunctionArgs) {
 
     /** Logout user after 3 seconds */
     await delay(2000);
-    return destroyAuthSession(clonedRequest);
+    context.destroySession();
+    return redirect("/login");
   }
 
   /** Handle the use update */
@@ -115,20 +106,11 @@ export async function action({ request }: ActionFunctionArgs) {
       senderId: authSession.userId,
     });
 
-    return json(
-      { success: true },
-      {
-        headers: {
-          "Set-Cookie": await commitAuthSession(request, { authSession }),
-        },
-      }
-    );
+    return json({ success: true });
   }
 }
 
-export async function loader({ request }: LoaderFunctionArgs) {
-  await requireAuthSession(request);
-
+export async function loader() {
   const title = "Account Details";
 
   return json({ title });
@@ -150,7 +132,6 @@ export default function UserPage() {
   const errors = data?.errors as UpdateUserResponse["errors"];
   const user = useUserData();
   const usernameError = errors?.username || zo.errors.username()?.message;
-
   const fileError = useAtomValue(fileErrorAtom);
   const [, validateFile] = useAtom(validateFileAtom);
   return (
diff --git a/app/routes/_layout+/settings.custom-fields.$fieldId_.edit.tsx b/app/routes/_layout+/settings.custom-fields.$fieldId_.edit.tsx
index 4aa1b3879..36c4c091f 100644
--- a/app/routes/_layout+/settings.custom-fields.$fieldId_.edit.tsx
+++ b/app/routes/_layout+/settings.custom-fields.$fieldId_.edit.tsx
@@ -14,7 +14,6 @@ import {
 } from "~/components/custom-fields/form";
 import Header from "~/components/layout/header";
 import type { HeaderData } from "~/components/layout/header/types";
-import { commitAuthSession } from "~/modules/auth";
 import {
   countAcviteCustomFields,
   getCustomField,
@@ -28,12 +27,15 @@ import { PermissionAction, PermissionEntity } from "~/utils/permissions";
 import { requirePermision } from "~/utils/roles.server";
 import { canCreateMoreCustomFields } from "~/utils/subscription";
 
-export async function loader({ request, params }: LoaderFunctionArgs) {
-  const { organizationId } = await requirePermision(
+export async function loader({ context, request, params }: LoaderFunctionArgs) {
+  const authSession = context.getSession();
+
+  const { organizationId } = await requirePermision({
+    userId: authSession.userId,
     request,
-    PermissionEntity.customField,
-    PermissionAction.update
-  );
+    entity: PermissionEntity.customField,
+    action: PermissionAction.update,
+  });
 
   const id = getRequiredParam(params, "fieldId");
 
@@ -60,12 +62,15 @@ export const handle = {
   breadcrumb: () => <span>Edit</span>,
 };
 
-export async function action({ request, params }: ActionFunctionArgs) {
-  const { authSession, organizationId, organizations } = await requirePermision(
+export async function action({ context, request, params }: ActionFunctionArgs) {
+  const authSession = context.getSession();
+
+  const { organizationId, organizations } = await requirePermision({
+    userId: authSession.userId,
     request,
-    PermissionEntity.customField,
-    PermissionAction.update
-  );
+    entity: PermissionEntity.customField,
+    action: PermissionAction.update,
+  });
 
   const id = getRequiredParam(params, "fieldId");
   const formData = await request.formData();
@@ -81,9 +86,6 @@ export async function action({ request, params }: ActionFunctionArgs) {
       },
       {
         status: 400,
-        headers: {
-          "Set-Cookie": await commitAuthSession(request, { authSession }),
-        },
       }
     );
   }
@@ -118,9 +120,6 @@ export async function action({ request, params }: ActionFunctionArgs) {
         },
         {
           status: 400,
-          headers: {
-            "Set-Cookie": await commitAuthSession(request, { authSession }),
-          },
         }
       );
     }
@@ -143,9 +142,6 @@ export async function action({ request, params }: ActionFunctionArgs) {
       },
       {
         status: 400,
-        headers: {
-          "Set-Cookie": await commitAuthSession(request, { authSession }),
-        },
       }
     );
   }
@@ -157,14 +153,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
     senderId: authSession.userId,
   });
 
-  return json(
-    { success: true, errors: null },
-    {
-      headers: {
-        "Set-Cookie": await commitAuthSession(request, { authSession }),
-      },
-    }
-  );
+  return json({ success: true, errors: null });
 }
 
 export default function CustomFieldEditPage() {
diff --git a/app/routes/_layout+/settings.custom-fields.index.tsx b/app/routes/_layout+/settings.custom-fields.index.tsx
index 4237fa055..aae0ecc2a 100644
--- a/app/routes/_layout+/settings.custom-fields.index.tsx
+++ b/app/routes/_layout+/settings.custom-fields.index.tsx
@@ -33,12 +33,14 @@ export const meta: MetaFunction<typeof loader> = ({ data }) => [
 
 export const ErrorBoundary = () => <ErrorBoundryComponent />;
 
-export async function loader({ request }: LoaderFunctionArgs) {
-  const { organizationId, organizations } = await requirePermision(
+export async function loader({ context, request }: LoaderFunctionArgs) {
+  const authSession = context.getSession();
+  const { organizationId, organizations } = await requirePermision({
+    userId: authSession.userId,
     request,
-    PermissionEntity.customField,
-    PermissionAction.read
-  );
+    entity: PermissionEntity.customField,
+    action: PermissionAction.read,
+  });
 
   const searchParams = getCurrentSearchParams(request);
   const { page, perPageParam, search } = getParamsValues(searchParams);
@@ -154,10 +156,14 @@ function TeamMemberRow({ item }: { item: CustomField }) {
         </span>
       </Td>
       <Td>
-        {!item.active && (
+        {!item.active ? (
           <Badge color="#dc2626" withDot={false}>
             Inactive
           </Badge>
+        ) : (
+          <Badge color="#059669" withDot={false}>
+            Active
+          </Badge>
         )}
       </Td>
       <Td>
diff --git a/app/routes/_layout+/settings.custom-fields.new.tsx b/app/routes/_layout+/settings.custom-fields.new.tsx
index 7be06b328..095fc6263 100644
--- a/app/routes/_layout+/settings.custom-fields.new.tsx
+++ b/app/routes/_layout+/settings.custom-fields.new.tsx
@@ -10,24 +10,25 @@ import {
 } from "~/components/custom-fields/form";
 import Header from "~/components/layout/header";
 
-import { commitAuthSession } from "~/modules/auth";
 import { createCustomField } from "~/modules/custom-field";
 import { assertUserCanCreateMoreCustomFields } from "~/modules/tier";
 
 import { appendToMetaTitle } from "~/utils/append-to-meta-title";
-import { setCookie } from "~/utils/cookies.server";
 import { sendNotification } from "~/utils/emitter/send-notification.server";
 import { PermissionAction, PermissionEntity } from "~/utils/permissions";
 import { requirePermision } from "~/utils/roles.server";
 
 const title = "New Custom Field";
 
-export async function loader({ request }: LoaderFunctionArgs) {
-  const { organizationId, organizations } = await requirePermision(
+export async function loader({ context, request }: LoaderFunctionArgs) {
+  const authSession = context.getSession();
+
+  const { organizationId, organizations } = await requirePermision({
+    userId: authSession.userId,
     request,
-    PermissionEntity.customField,
-    PermissionAction.create
-  );
+    entity: PermissionEntity.customField,
+    action: PermissionAction.create,
+  });
 
   await assertUserCanCreateMoreCustomFields({ organizations, organizationId });
 
@@ -48,12 +49,15 @@ export const handle = {
   breadcrumb: () => <span>{title}</span>,
 };
 
-export async function action({ request }: LoaderFunctionArgs) {
-  const { authSession, organizationId, organizations } = await requirePermision(
+export async function action({ context, request }: LoaderFunctionArgs) {
+  const authSession = context.getSession();
+
+  const { organizationId, organizations } = await requirePermision({
+    userId: authSession.userId,
     request,
-    PermissionEntity.customField,
-    PermissionAction.create
-  );
+    entity: PermissionEntity.customField,
+    action: PermissionAction.create,
+  });
   await assertUserCanCreateMoreCustomFields({
     organizations,
     organizationId,
@@ -71,9 +75,6 @@ export async function action({ request }: LoaderFunctionArgs) {
       },
       {
         status: 400,
-        headers: {
-          "Set-Cookie": await commitAuthSession(request, { authSession }),
-        },
       }
     );
   }
@@ -98,7 +99,6 @@ export async function action({ request }: LoaderFunctionArgs) {
       },
       {
         status: 400,
-        headers: [setCookie(await commitAuthSession(request, { authSession }))],
       }
     );
   }
@@ -110,11 +110,7 @@ export async function action({ request }: LoaderFunctionArgs) {
     senderId: authSession.userId,
   });
 
-  return redirect(`/settings/custom-fields`, {
-    headers: {
-      "Set-Cookie": await commitAuthSession(request, { authSession }),
-    },
-  });
+  return redirect(`/settings/custom-fields`);
 }
 
 export default function NewCustomFieldPage() {
diff --git a/app/routes/_layout+/settings.custom-fields.tsx b/app/routes/_layout+/settings.custom-fields.tsx
index 170c6df47..1e6f9dbcd 100644
--- a/app/routes/_layout+/settings.custom-fields.tsx
+++ b/app/routes/_layout+/settings.custom-fields.tsx
@@ -5,12 +5,14 @@ import { ErrorBoundryComponent } from "~/components/errors";
 import { PermissionAction, PermissionEntity } from "~/utils/permissions";
 import { requirePermision } from "~/utils/roles.server";
 
-export async function loader({ request }: LoaderFunctionArgs) {
-  await requirePermision(
+export async function loader({ context, request }: LoaderFunctionArgs) {
+  const authSession = context.getSession();
+  await requirePermision({
+    userId: authSession.userId,
     request,
-    PermissionEntity.customField,
-    PermissionAction.read
-  );
+    entity: PermissionEntity.customField,
+    action: PermissionAction.read,
+  });
 
   return null;
 }
diff --git a/app/routes/_layout+/settings.general.tsx b/app/routes/_layout+/settings.general.tsx
index 496fd4a1a..e2a1940db 100644
--- a/app/routes/_layout+/settings.general.tsx
+++ b/app/routes/_layout+/settings.general.tsx
@@ -32,7 +32,6 @@ import { Button } from "~/components/shared";
 import { CustomTooltip } from "~/components/shared/custom-tooltip";
 import { Spinner } from "~/components/shared/spinner";
 import { db } from "~/database";
-import { commitAuthSession } from "~/modules/auth";
 import { updateOrganization } from "~/modules/organization";
 import { isFormProcessing } from "~/utils";
 import { appendToMetaTitle } from "~/utils/append-to-meta-title";
@@ -51,12 +50,14 @@ const EditWorkspaceFormSchema = z.object({
   name: z.string().min(2, "Name is required"),
 });
 
-export async function loader({ request }: LoaderFunctionArgs) {
-  const { authSession, organizationId } = await requirePermision(
+export async function loader({ context, request }: LoaderFunctionArgs) {
+  const authSession = context.getSession();
+  const { organizationId } = await requirePermision({
+    userId: authSession.userId,
     request,
-    PermissionEntity.generalSettings,
-    PermissionAction.read
-  );
+    entity: PermissionEntity.generalSettings,
+    action: PermissionAction.read,
+  });
   const { userId } = authSession;
 
   const user = await db.user.findUnique({
@@ -131,12 +132,15 @@ export const meta: MetaFunction<typeof loader> = ({ data }) => [
 
 export const ErrorBoundary = () => <ErrorBoundryComponent />;
 
-export async function action({ request }: ActionFunctionArgs) {
-  const { authSession } = await requirePermision(
+export async function action({ context, request }: ActionFunctionArgs) {
+  const authSession = context.getSession();
+
+  await requirePermision({
+    userId: authSession.userId,
     request,
-    PermissionEntity.generalSettings,
-    PermissionAction.update
-  );
+    entity: PermissionEntity.generalSettings,
+    action: PermissionAction.update,
+  });
 
   const clonedRequest = request.clone();
   const formData = await clonedRequest.formData();
@@ -152,9 +156,6 @@ export async function action({ request }: ActionFunctionArgs) {
       },
       {
         status: 400,
-        headers: {
-          "Set-Cookie": await commitAuthSession(request, { authSession }),
-        },
       }
     );
   }
@@ -182,11 +183,7 @@ export async function action({ request }: ActionFunctionArgs) {
     senderId: authSession.userId,
   });
 
-  return redirect("/settings/general", {
-    headers: {
-      "Set-Cookie": await commitAuthSession(request, { authSession }),
-    },
-  });
+  return redirect("/settings/general");
 }
 
 export default function GeneralPage() {
diff --git a/app/routes/_layout+/settings.index.tsx b/app/routes/_layout+/settings.index.tsx
index 44a6b5bda..93085cc66 100644
--- a/app/routes/_layout+/settings.index.tsx
+++ b/app/routes/_layout+/settings.index.tsx
@@ -1,13 +1,9 @@
-import type { LoaderFunctionArgs } from "@remix-run/server-runtime";
 import { redirect } from "react-router";
-import { requireAuthSession } from "~/modules/auth";
 
 /** We dont render anything on /settings
  * We just redirect to default subroute which is user
  */
-export async function loader({ request }: LoaderFunctionArgs) {
-  await requireAuthSession(request);
-
+export async function loader() {
   return redirect("account");
 }
 
diff --git a/app/routes/_layout+/settings.subscription.customer-portal.tsx b/app/routes/_layout+/settings.subscription.customer-portal.tsx
index 798359c4a..a48de62e6 100644
--- a/app/routes/_layout+/settings.subscription.customer-portal.tsx
+++ b/app/routes/_layout+/settings.subscription.customer-portal.tsx
@@ -4,12 +4,14 @@ import { PermissionAction, PermissionEntity } from "~/utils/permissions";
 import { requirePermision } from "~/utils/roles.server";
 import { createBillingPortalSession } from "~/utils/stripe.server";
 
-export async function action({ request }: ActionFunctionArgs) {
-  const { authSession } = await requirePermision(
+export async function action({ context, request }: ActionFunctionArgs) {
+  const authSession = context.getSession();
+  await requirePermision({
+    userId: authSession.userId,
     request,
-    PermissionEntity.subscription,
-    PermissionAction.update
-  );
+    entity: PermissionEntity.subscription,
+    action: PermissionAction.update,
+  });
   const user = await db.user.findUnique({
     where: { id: authSession.userId },
     select: { customerId: true },
diff --git a/app/routes/_layout+/settings.subscription.tsx b/app/routes/_layout+/settings.subscription.tsx
index fa11e837e..cfaba97f5 100644
--- a/app/routes/_layout+/settings.subscription.tsx
+++ b/app/routes/_layout+/settings.subscription.tsx
@@ -37,12 +37,15 @@ import {
   getCustomerTrialSubscription,
 } from "~/utils/stripe.server";
 
-export async function loader({ request }: LoaderFunctionArgs) {
-  const { authSession } = await requirePermision(
+export async function loader({ context, request }: LoaderFunctionArgs) {
+  const authSession = context.getSession();
+
+  await requirePermision({
+    userId: authSession.userId,
     request,
-    PermissionEntity.subscription,
-    PermissionAction.read
-  );
+    entity: PermissionEntity.subscription,
+    action: PermissionAction.read,
+  });
 
   const { userId } = authSession;
   const user = await getUserByID(userId);
@@ -93,12 +96,15 @@ export async function loader({ request }: LoaderFunctionArgs) {
   });
 }
 
-export const action = async ({ request }: ActionFunctionArgs) => {
-  const { authSession } = await requirePermision(
+export const action = async ({ context, request }: ActionFunctionArgs) => {
+  const authSession = context.getSession();
+
+  await requirePermision({
+    userId: authSession.userId,
     request,
-    PermissionEntity.subscription,
-    PermissionAction.update
-  );
+    entity: PermissionEntity.subscription,
+    action: PermissionAction.update,
+  });
 
   const { userId, email } = authSession;
   const formData = await request.formData();
diff --git a/app/routes/_layout+/settings.team.add-member.tsx b/app/routes/_layout+/settings.team.add-member.tsx
index 42d82316a..c446076bf 100644
--- a/app/routes/_layout+/settings.team.add-member.tsx
+++ b/app/routes/_layout+/settings.team.add-member.tsx
@@ -12,25 +12,31 @@ import { handleUniqueConstraintError } from "~/utils/error";
 import { PermissionAction, PermissionEntity } from "~/utils/permissions";
 import { requirePermision } from "~/utils/roles.server";
 
-export const loader = async ({ request }: LoaderFunctionArgs) => {
-  await requirePermision(
+export const loader = async ({ context, request }: LoaderFunctionArgs) => {
+  const authSession = context.getSession();
+
+  await requirePermision({
+    userId: authSession.userId,
     request,
-    PermissionEntity.teamMember,
-    PermissionAction.create
-  );
+    entity: PermissionEntity.teamMember,
+    action: PermissionAction.create,
+  });
 
   return json({
     showModal: true,
   });
 };
 
-export const action = async ({ request }: ActionFunctionArgs) => {
-  const { authSession, organizationId } = await requirePermision(
-    request,
-    PermissionEntity.teamMember,
-    PermissionAction.create
-  );
+export const action = async ({ context, request }: ActionFunctionArgs) => {
+  const authSession = context.getSession();
   const { userId } = authSession;
+
+  const { organizationId } = await requirePermision({
+    userId,
+    request,
+    entity: PermissionEntity.teamMember,
+    action: PermissionAction.create,
+  });
   const formData = await request.formData();
 
   try {
diff --git a/app/routes/_layout+/settings.team.invite-user.tsx b/app/routes/_layout+/settings.team.invite-user.tsx
index 5e42df381..9a16214ea 100644
--- a/app/routes/_layout+/settings.team.invite-user.tsx
+++ b/app/routes/_layout+/settings.team.invite-user.tsx
@@ -24,7 +24,6 @@ import { Button } from "~/components/shared";
 import { Image } from "~/components/shared/image";
 import { db } from "~/database";
 import { useCurrentOrganization } from "~/hooks/use-current-organization-id";
-import { commitAuthSession } from "~/modules/auth";
 import { createInvite } from "~/modules/invite";
 import { assertUserCanInviteUsersToWorkspace } from "~/modules/tier";
 import styles from "~/styles/layout/custom-modal.css";
@@ -45,25 +44,33 @@ const InviteUserFormSchema = z.object({
   role: z.nativeEnum(OrganizationRoles),
 });
 
-export const loader = async ({ request }: LoaderFunctionArgs) => {
-  const { organizationId } = await requirePermision(
+export const loader = async ({ context, request }: LoaderFunctionArgs) => {
+  const authSession = context.getSession();
+  const { userId } = authSession;
+
+  const { organizationId } = await requirePermision({
+    userId,
     request,
-    PermissionEntity.teamMember,
-    PermissionAction.create
-  );
+    entity: PermissionEntity.teamMember,
+    action: PermissionAction.create,
+  });
   await assertUserCanInviteUsersToWorkspace({ organizationId });
   return json({
     showModal: true,
   });
 };
 
-export const action = async ({ request }: ActionFunctionArgs) => {
-  const { authSession, organizationId } = await requirePermision(
-    request,
-    PermissionEntity.teamMember,
-    PermissionAction.create
-  );
+export const action = async ({ context, request }: ActionFunctionArgs) => {
+  const authSession = context.getSession();
   const { userId } = authSession;
+
+  const { organizationId } = await requirePermision({
+    userId,
+    request,
+    entity: PermissionEntity.teamMember,
+    action: PermissionAction.create,
+  });
+
   const formData = await request.formData();
   const result = await InviteUserFormSchema.safeParseAsync(
     parseFormAny(formData)
@@ -108,11 +115,7 @@ export const action = async ({ request }: ActionFunctionArgs) => {
       icon: { name: "success", variant: "success" },
       senderId: userId,
     });
-    return redirect("/settings/team", {
-      headers: {
-        "Set-Cookie": await commitAuthSession(request, { authSession }),
-      },
-    });
+    return redirect("/settings/team", {});
   }
   return null;
 };
diff --git a/app/routes/_layout+/settings.team.tsx b/app/routes/_layout+/settings.team.tsx
index 73ee155c5..f498d38d7 100644
--- a/app/routes/_layout+/settings.team.tsx
+++ b/app/routes/_layout+/settings.team.tsx
@@ -19,7 +19,6 @@ import type { HeaderData } from "~/components/layout/header/types";
 import { TeamMembersTable } from "~/components/workspace/team-members-table";
 import { UsersTable } from "~/components/workspace/users-table";
 import { db } from "~/database";
-import { requireAuthSession } from "~/modules/auth";
 import { createInvite } from "~/modules/invite";
 import { revokeAccessEmailText } from "~/modules/invite/helpers";
 import { requireOrganisationId } from "~/modules/organization/context.server";
@@ -57,14 +56,19 @@ type InviteWithTeamMember = Pick<
   };
 };
 
-export async function loader({ request }: LoaderFunctionArgs) {
-  const { authSession } = await requirePermision(
+export async function loader({ context, request }: LoaderFunctionArgs) {
+  const authSession = context.getSession();
+  await requirePermision({
+    userId: authSession.userId,
     request,
-    PermissionEntity.teamMember,
-    PermissionAction.read
-  );
+    entity: PermissionEntity.teamMember,
+    action: PermissionAction.read,
+  });
 
-  const { organizationId } = await requireOrganisationId(authSession, request);
+  const { organizationId } = await requireOrganisationId({
+    userId: authSession.userId,
+    request,
+  });
   const [organization, userMembers, invites, teamMembers] =
     await db.$transaction([
       /** Get the org */
@@ -152,7 +156,7 @@ export async function loader({ request }: LoaderFunctionArgs) {
       name: `${um.user.firstName ? um.user.firstName : ""} ${
         um.user.lastName ? um.user.lastName : ""
       }`,
-      img: um.user.profilePicture || "/images/default_pfp.jpg",
+      img: um.user.profilePicture || "/static/images/default_pfp.jpg",
       email: um.user.email,
       status: "ACCEPTED",
       role: organizationRolesMap[um.roles[0]],
@@ -163,7 +167,7 @@ export async function loader({ request }: LoaderFunctionArgs) {
   for (const invite of invites as InviteWithTeamMember[]) {
     teamMembersWithUserOrInvite.push({
       name: invite.inviteeTeamMember.name,
-      img: "/images/default_pfp.jpg",
+      img: "/static/images/default_pfp.jpg",
       email: invite.inviteeEmail,
       status: invite.status,
       role: organizationRolesMap[invite?.roles[0]],
@@ -181,11 +185,17 @@ export async function loader({ request }: LoaderFunctionArgs) {
   });
 }
 
-export const action = async ({ request }: ActionFunctionArgs) => {
-  const authSession = await requireAuthSession(request);
-  const { organizationId } = await requireOrganisationId(authSession, request);
+export const action = async ({ context, request }: ActionFunctionArgs) => {
+  const authSession = context.getSession();
   const { userId } = authSession;
 
+  const { organizationId } = await requirePermision({
+    userId,
+    request,
+    entity: PermissionEntity.teamMember,
+    action: PermissionAction.update,
+  });
+
   const formData = await request.formData();
   const intent = formData.get("intent") as ActionIntent;
   const teamMemberId = formData.get("teamMemberId") as string;
diff --git a/app/routes/_layout+/settings.tsx b/app/routes/_layout+/settings.tsx
index 7c5e04f05..50f05a368 100644
--- a/app/routes/_layout+/settings.tsx
+++ b/app/routes/_layout+/settings.tsx
@@ -1,11 +1,10 @@
-import type { LoaderFunctionArgs, MetaFunction } from "@remix-run/node";
+import type { MetaFunction } from "@remix-run/node";
 import { json } from "@remix-run/node";
 import { Link, Outlet } from "@remix-run/react";
 import Header from "~/components/layout/header";
 import HorizontalTabs from "~/components/layout/horizontal-tabs";
 import { useMatchesData } from "~/hooks";
 import { useUserIsSelfService } from "~/hooks/user-user-is-self-service";
-import { requireAuthSession } from "~/modules/auth";
 
 import { appendToMetaTitle } from "~/utils/append-to-meta-title";
 
@@ -13,8 +12,7 @@ export const handle = {
   breadcrumb: () => <Link to="/settings">Settings</Link>,
 };
 
-export async function loader({ request }: LoaderFunctionArgs) {
-  await requireAuthSession(request);
+export async function loader() {
   const title = "Settings";
   const subHeading = "Manage your preferences here.";
   const header = {
diff --git a/app/routes/_layout+/settings.workspace.$workspaceId.edit.tsx b/app/routes/_layout+/settings.workspace.$workspaceId.edit.tsx
index fad369438..199017f64 100644
--- a/app/routes/_layout+/settings.workspace.$workspaceId.edit.tsx
+++ b/app/routes/_layout+/settings.workspace.$workspaceId.edit.tsx
@@ -21,7 +21,6 @@ import {
   WorkspaceForm,
 } from "~/components/workspace/form";
 
-import { commitAuthSession } from "~/modules/auth";
 import { getOrganization, updateOrganization } from "~/modules/organization";
 import { assertIsPost, getRequiredParam } from "~/utils";
 import { appendToMetaTitle } from "~/utils/append-to-meta-title";
@@ -30,12 +29,15 @@ import { PermissionAction, PermissionEntity } from "~/utils/permissions";
 import { requirePermision } from "~/utils/roles.server";
 import { MAX_SIZE } from "./settings.workspace.new";
 
-export async function loader({ request, params }: LoaderFunctionArgs) {
-  await requirePermision(
+export async function loader({ context, request, params }: LoaderFunctionArgs) {
+  const authSession = context.getSession();
+
+  await requirePermision({
+    userId: authSession.userId,
     request,
-    PermissionEntity.workspace,
-    PermissionAction.update
-  );
+    entity: PermissionEntity.workspace,
+    action: PermissionAction.update,
+  });
   const id = getRequiredParam(params, "workspaceId");
 
   const organization = await getOrganization({ id });
@@ -61,13 +63,16 @@ export const handle = {
   breadcrumb: () => <span>Edit</span>,
 };
 
-export async function action({ request, params }: ActionFunctionArgs) {
+export async function action({ context, request, params }: ActionFunctionArgs) {
   assertIsPost(request);
-  const { authSession } = await requirePermision(
+  const authSession = context.getSession();
+
+  await requirePermision({
+    userId: authSession.userId,
     request,
-    PermissionEntity.workspace,
-    PermissionAction.update
-  );
+    entity: PermissionEntity.workspace,
+    action: PermissionAction.update,
+  });
 
   const id = getRequiredParam(params, "workspaceId");
   const clonedRequest = request.clone();
@@ -84,9 +89,6 @@ export async function action({ request, params }: ActionFunctionArgs) {
       },
       {
         status: 400,
-        headers: {
-          "Set-Cookie": await commitAuthSession(request, { authSession }),
-        },
       }
     );
   }
@@ -115,11 +117,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
     senderId: authSession.userId,
   });
 
-  return redirect("/settings/workspace", {
-    headers: {
-      "Set-Cookie": await commitAuthSession(request, { authSession }),
-    },
-  });
+  return redirect("/settings/workspace");
 }
 
 export default function WorkspaceEditPage() {
diff --git a/app/routes/_layout+/settings.workspace.index.tsx b/app/routes/_layout+/settings.workspace.index.tsx
index 750ad26b5..54a1ba5d7 100644
--- a/app/routes/_layout+/settings.workspace.index.tsx
+++ b/app/routes/_layout+/settings.workspace.index.tsx
@@ -14,7 +14,6 @@ import { Table, Td, Th } from "~/components/table";
 import { WorkspaceActionsDropdown } from "~/components/workspace/workspace-actions-dropdown";
 import { db } from "~/database";
 import { useUserData } from "~/hooks";
-import { requireAuthSession } from "~/modules/auth";
 import { requireOrganisationId } from "~/modules/organization/context.server";
 import { tw } from "~/utils";
 import { appendToMetaTitle } from "~/utils/append-to-meta-title";
@@ -22,9 +21,14 @@ import { ShelfStackError } from "~/utils/error";
 import { isPersonalOrg } from "~/utils/organization";
 import { canCreateMoreOrganizations } from "~/utils/subscription";
 
-export const loader = async ({ request }: LoaderFunctionArgs) => {
-  const authSession = await requireAuthSession(request);
-  const { organizationId } = await requireOrganisationId(authSession, request);
+export const loader = async ({ context, request }: LoaderFunctionArgs) => {
+  const authSession = context.getSession();
+  // permissions here?
+  // Every user can see this view for themseleves, so we dont have to manage any permissions here
+  const { organizationId } = await requireOrganisationId({
+    userId: authSession.userId,
+    request,
+  });
   const { userId } = authSession;
 
   const user = await db.user.findUnique({
@@ -154,7 +158,8 @@ export default function WorkspacePage() {
                           : org.name,
                       image:
                         org.type === "PERSONAL"
-                          ? user?.profilePicture || "/images/default_pfp.jpg"
+                          ? user?.profilePicture ||
+                            "/static/images/default_pfp.jpg"
                           : org?.imageId || undefined,
                       _count: org._count,
                       type: org.type,
@@ -201,7 +206,7 @@ const OrganizationRow = ({
             <div className="flex size-12 items-center justify-center">
               {isPersonalOrg(item) ? (
                 <img
-                  src={item?.image || "/images/default_pfp.jpg"}
+                  src={item?.image || "/static/images/default_pfp.jpg"}
                   alt={`${item.name}`}
                   className="size-12 rounded-[4px] object-cover"
                 />
diff --git a/app/routes/_layout+/settings.workspace.new.tsx b/app/routes/_layout+/settings.workspace.new.tsx
index fce72d7ed..d1f5be586 100644
--- a/app/routes/_layout+/settings.workspace.new.tsx
+++ b/app/routes/_layout+/settings.workspace.new.tsx
@@ -16,16 +16,18 @@ import {
   WorkspaceForm,
 } from "~/components/workspace/form";
 
-import { commitAuthSession, requireAuthSession } from "~/modules/auth";
 import { createOrganization } from "~/modules/organization";
 import { requireOrganisationId } from "~/modules/organization/context.server";
 import { assertUserCanCreateMoreOrganizations } from "~/modules/tier";
 import { assertIsPost } from "~/utils";
 import { sendNotification } from "~/utils/emitter/send-notification.server";
 
-export async function loader({ request }: LoaderFunctionArgs) {
-  const authSession = await requireAuthSession(request);
-  const { organizationId } = await requireOrganisationId(authSession, request);
+export async function loader({ context, request }: LoaderFunctionArgs) {
+  const authSession = context.getSession();
+  const { organizationId } = await requireOrganisationId({
+    userId: authSession.userId,
+    request,
+  });
   const { userId } = authSession;
   assertUserCanCreateMoreOrganizations(userId);
 
@@ -38,8 +40,8 @@ export async function loader({ request }: LoaderFunctionArgs) {
 
 export const MAX_SIZE = 1024 * 1024 * 4; // 4MB
 
-export async function action({ request }: ActionFunctionArgs) {
-  const authSession = await requireAuthSession(request);
+export async function action({ context, request }: ActionFunctionArgs) {
+  const authSession = context.getSession();
   assertIsPost(request);
   assertUserCanCreateMoreOrganizations(authSession.userId);
 
@@ -64,9 +66,6 @@ export async function action({ request }: ActionFunctionArgs) {
       },
       {
         status: 400,
-        headers: {
-          "Set-Cookie": await commitAuthSession(request, { authSession }),
-        },
       }
     );
   }
@@ -96,11 +95,7 @@ export async function action({ request }: ActionFunctionArgs) {
     senderId: authSession.userId,
   });
 
-  return redirect(`/settings/workspace/`, {
-    headers: {
-      "Set-Cookie": await commitAuthSession(request, { authSession }),
-    },
-  });
+  return redirect(`/settings/workspace/`);
 }
 
 export const handle = {
diff --git a/app/routes/_layout+/settings.workspace.tsx b/app/routes/_layout+/settings.workspace.tsx
index 24ba91b7c..c92397079 100644
--- a/app/routes/_layout+/settings.workspace.tsx
+++ b/app/routes/_layout+/settings.workspace.tsx
@@ -1,12 +1,7 @@
-import type { LoaderFunctionArgs } from "@remix-run/node";
 import { Link, Outlet } from "@remix-run/react";
 import { ErrorBoundryComponent } from "~/components/errors";
 
-import { requireAuthSession } from "~/modules/auth";
-
-export async function loader({ request }: LoaderFunctionArgs) {
-  await requireAuthSession(request);
-
+export async function loader() {
   return null;
 }
 
diff --git a/app/routes/_layout+/tags.$tagId_.edit.tsx b/app/routes/_layout+/tags.$tagId_.edit.tsx
index f55789714..8e7ba857f 100644
--- a/app/routes/_layout+/tags.$tagId_.edit.tsx
+++ b/app/routes/_layout+/tags.$tagId_.edit.tsx
@@ -12,11 +12,10 @@ import Input from "~/components/forms/input";
 
 import { Button } from "~/components/shared/button";
 
-import { commitAuthSession } from "~/modules/auth";
 import { getTag, updateTag } from "~/modules/tag";
 import { getRequiredParam, isFormProcessing } from "~/utils";
 import { appendToMetaTitle } from "~/utils/append-to-meta-title";
-import { setCookie } from "~/utils/cookies.server";
+
 import { sendNotification } from "~/utils/emitter/send-notification.server";
 import { PermissionAction, PermissionEntity } from "~/utils/permissions";
 import { requirePermision } from "~/utils/roles.server";
@@ -29,12 +28,14 @@ export const UpdateTagFormSchema = z.object({
 
 const title = "Edit Tag";
 
-export async function loader({ request, params }: LoaderFunctionArgs) {
-  await requirePermision(
+export async function loader({ context, request, params }: LoaderFunctionArgs) {
+  const authSession = context.getSession();
+  await requirePermision({
+    userId: authSession.userId,
     request,
-    PermissionEntity.tag,
-    PermissionAction.update
-  );
+    entity: PermissionEntity.tag,
+    action: PermissionAction.update,
+  });
 
   const id = getRequiredParam(params, "tagId");
   const tag = await getTag({ id });
@@ -50,12 +51,14 @@ export const meta: MetaFunction<typeof loader> = ({ data }) => [
   { title: data ? appendToMetaTitle(data.header.title) : "" },
 ];
 
-export async function action({ request, params }: LoaderFunctionArgs) {
-  const { authSession } = await requirePermision(
+export async function action({ context, request, params }: LoaderFunctionArgs) {
+  const authSession = context.getSession();
+  await requirePermision({
+    userId: authSession.userId,
     request,
-    PermissionEntity.tag,
-    PermissionAction.update
-  );
+    entity: PermissionEntity.tag,
+    action: PermissionAction.update,
+  });
   const formData = await request.formData();
   const result = await UpdateTagFormSchema.safeParseAsync(
     parseFormAny(formData)
@@ -70,7 +73,6 @@ export async function action({ request, params }: LoaderFunctionArgs) {
       },
       {
         status: 400,
-        headers: [setCookie(await commitAuthSession(request, { authSession }))],
       }
     );
   }
@@ -87,7 +89,6 @@ export async function action({ request, params }: LoaderFunctionArgs) {
       },
       {
         status: 400,
-        headers: [setCookie(await commitAuthSession(request, { authSession }))],
       }
     );
   }
@@ -99,9 +100,7 @@ export async function action({ request, params }: LoaderFunctionArgs) {
     senderId: authSession.userId,
   });
 
-  return redirect(`/tags`, {
-    headers: [setCookie(await commitAuthSession(request, { authSession }))],
-  });
+  return redirect(`/tags`, {});
 }
 
 export default function EditTag() {
diff --git a/app/routes/_layout+/tags.new.tsx b/app/routes/_layout+/tags.new.tsx
index 9ce6dbfa9..c3ce95008 100644
--- a/app/routes/_layout+/tags.new.tsx
+++ b/app/routes/_layout+/tags.new.tsx
@@ -7,11 +7,9 @@ import Input from "~/components/forms/input";
 
 import { Button } from "~/components/shared/button";
 
-import { commitAuthSession } from "~/modules/auth";
 import { createTag } from "~/modules/tag";
 import { assertIsPost, isFormProcessing } from "~/utils";
 import { appendToMetaTitle } from "~/utils/append-to-meta-title";
-import { setCookie } from "~/utils/cookies.server";
 import { sendNotification } from "~/utils/emitter/send-notification.server";
 import { PermissionAction, PermissionEntity } from "~/utils/permissions";
 import { requirePermision } from "~/utils/roles.server";
@@ -24,12 +22,14 @@ export const NewTagFormSchema = z.object({
 
 const title = "New Tag";
 
-export async function loader({ request }: LoaderFunctionArgs) {
-  await requirePermision(
+export async function loader({ context, request }: LoaderFunctionArgs) {
+  const authSession = context.getSession();
+  await requirePermision({
+    userId: authSession.userId,
     request,
-    PermissionEntity.tag,
-    PermissionAction.create
-  );
+    entity: PermissionEntity.tag,
+    action: PermissionAction.create,
+  });
 
   const header = {
     title,
@@ -42,12 +42,14 @@ export const meta: MetaFunction<typeof loader> = ({ data }) => [
   { title: data ? appendToMetaTitle(data.header.title) : "" },
 ];
 
-export async function action({ request }: LoaderFunctionArgs) {
-  const { authSession, organizationId } = await requirePermision(
+export async function action({ context, request }: LoaderFunctionArgs) {
+  const authSession = context.getSession();
+  const { organizationId } = await requirePermision({
+    userId: authSession.userId,
     request,
-    PermissionEntity.tag,
-    PermissionAction.create
-  );
+    entity: PermissionEntity.tag,
+    action: PermissionAction.create,
+  });
   assertIsPost(request);
   const formData = await request.formData();
   const result = await NewTagFormSchema.safeParseAsync(parseFormAny(formData));
@@ -74,7 +76,6 @@ export async function action({ request }: LoaderFunctionArgs) {
       },
       {
         status: 400,
-        headers: [setCookie(await commitAuthSession(request, { authSession }))],
       }
     );
   }
@@ -86,9 +87,7 @@ export async function action({ request }: LoaderFunctionArgs) {
     senderId: authSession.userId,
   });
 
-  return redirect(`/tags`, {
-    headers: [setCookie(await commitAuthSession(request, { authSession }))],
-  });
+  return redirect(`/tags`, {});
 }
 
 export default function NewTag() {
diff --git a/app/routes/_layout+/tags.tsx b/app/routes/_layout+/tags.tsx
index 6c14f3a29..589cdb4ef 100644
--- a/app/routes/_layout+/tags.tsx
+++ b/app/routes/_layout+/tags.tsx
@@ -29,12 +29,14 @@ import { sendNotification } from "~/utils/emitter/send-notification.server";
 import { PermissionAction, PermissionEntity } from "~/utils/permissions";
 import { requirePermision } from "~/utils/roles.server";
 
-export async function loader({ request }: LoaderFunctionArgs) {
-  const { organizationId } = await requirePermision(
+export async function loader({ context, request }: LoaderFunctionArgs) {
+  const authSession = context.getSession();
+  const { organizationId } = await requirePermision({
+    userId: authSession.userId,
     request,
-    PermissionEntity.tag,
-    PermissionAction.read
-  );
+    entity: PermissionEntity.tag,
+    action: PermissionAction.read,
+  });
 
   const searchParams = getCurrentSearchParams(request);
   const { page, perPageParam, search } = getParamsValues(searchParams);
@@ -81,14 +83,17 @@ export const meta: MetaFunction<typeof loader> = ({ data }) => [
   { title: data ? appendToMetaTitle(data.header.title) : "" },
 ];
 
-export async function action({ request }: ActionFunctionArgs) {
-  const { authSession, organizationId } = await requirePermision(
-    request,
-    PermissionEntity.tag,
-    PermissionAction.delete
-  );
+export async function action({ context, request }: ActionFunctionArgs) {
+  const authSession = context.getSession();
   const { userId } = authSession;
 
+  const { organizationId } = await requirePermision({
+    userId,
+    request,
+    entity: PermissionEntity.tag,
+    action: PermissionAction.delete,
+  });
+
   assertIsDelete(request);
   const formData = await request.formData();
   const id = formData.get("id") as string;
diff --git a/app/routes/_welcome+/_layout.tsx b/app/routes/_welcome+/_layout.tsx
index 4166a5add..e0b50f768 100644
--- a/app/routes/_welcome+/_layout.tsx
+++ b/app/routes/_welcome+/_layout.tsx
@@ -10,7 +10,7 @@ export default function OnboardingLayout() {
           </div>
         </div>
         <img
-          src="/images/bg-overlay1.png"
+          src="/static/images/bg-overlay1.png"
           alt="bg-overlay"
           className="absolute right-0 top-0 -z-10 size-full object-cover"
         />
diff --git a/app/routes/_welcome+/onboarding.tsx b/app/routes/_welcome+/onboarding.tsx
index 99e1651e5..8daae0547 100644
--- a/app/routes/_welcome+/onboarding.tsx
+++ b/app/routes/_welcome+/onboarding.tsx
@@ -18,7 +18,6 @@ import PasswordInput from "~/components/forms/password-input";
 import { Button } from "~/components/shared";
 import { config } from "~/config/shelf.config";
 import { onboardingEmailText } from "~/emails/onboarding-email";
-import { commitAuthSession, requireAuthSession } from "~/modules/auth";
 import { getAuthUserByAccessToken } from "~/modules/auth/service.server";
 import { setSelectedOrganizationIdCookie } from "~/modules/organization/context.server";
 import { getUserByID, updateUser } from "~/modules/user";
@@ -58,8 +57,8 @@ function createOnboardingSchema(userSignedUpWithPassword: boolean) {
     );
 }
 
-export async function loader({ request }: LoaderFunctionArgs) {
-  const authSession = await requireAuthSession(request);
+export async function loader({ context }: LoaderFunctionArgs) {
+  const authSession = context.getSession();
   const user = await getUserByID(authSession?.userId);
 
   /** If the user is already onboarded, we assume they finished the process so we send them to the index */
@@ -90,10 +89,10 @@ export const meta: MetaFunction<typeof loader> = ({ data }) => [
   { title: data ? appendToMetaTitle(data.title) : "" },
 ];
 
-export async function action({ request }: ActionFunctionArgs) {
+export async function action({ context, request }: ActionFunctionArgs) {
   assertIsPost(request);
 
-  const authSession = await requireAuthSession(request);
+  const authSession = context.getSession();
   const formData = await request.formData();
 
   const userSignedUpWithPassword =
@@ -154,14 +153,7 @@ export async function action({ request }: ActionFunctionArgs) {
   const organizationIdFromForm =
     (formData.get("organizationId") as string) || null;
 
-  const headers = [
-    setCookie(
-      await commitAuthSession(request, {
-        authSession,
-        flashErrorMessage: null,
-      })
-    ),
-  ];
+  const headers = [];
 
   if (organizationIdFromForm) {
     headers.push(
diff --git a/app/routes/_welcome+/welcome.tsx b/app/routes/_welcome+/welcome.tsx
index 1e185f646..eedb0d869 100644
--- a/app/routes/_welcome+/welcome.tsx
+++ b/app/routes/_welcome+/welcome.tsx
@@ -1,6 +1,5 @@
-import type { LoaderFunctionArgs, LinksFunction } from "@remix-run/node";
+import type { LinksFunction } from "@remix-run/node";
 import WelcomeCarousel from "~/components/welcome/carousel";
-import { requireAuthSession } from "~/modules/auth";
 import carouselStyles from "~/styles/layout/carousel.css";
 
 export const links: LinksFunction = () => [
@@ -14,11 +13,6 @@ export const links: LinksFunction = () => [
   },
 ];
 
-export const loader = async ({ request }: LoaderFunctionArgs) => {
-  await requireAuthSession(request);
-  return null;
-};
-
 export default function Welcome() {
   return (
     <div>
diff --git a/app/routes/api+/$organizationId.qr-codes[.zip].ts b/app/routes/api+/$organizationId.qr-codes[.zip].ts
index db31c686f..ec2fa0658 100644
--- a/app/routes/api+/$organizationId.qr-codes[.zip].ts
+++ b/app/routes/api+/$organizationId.qr-codes[.zip].ts
@@ -5,8 +5,14 @@ import QRCode from "qrcode-generator";
 import { db } from "~/database";
 import { requireAdmin } from "~/utils/roles.server";
 
-export const loader = async ({ request, params }: LoaderFunctionArgs) => {
-  requireAdmin(request);
+export const loader = async ({
+  context,
+  request,
+  params,
+}: LoaderFunctionArgs) => {
+  const authSession = context.getSession();
+
+  requireAdmin(authSession.userId);
   const { organizationId } = params;
   const url = new URL(request.url);
   const onlyOrphaned = url.searchParams.get("orphaned");
diff --git a/app/routes/api+/admin.export-org-assets.$organizationId.$fileName[.csv].tsx b/app/routes/api+/admin.export-org-assets.$organizationId.$fileName[.csv].tsx
index 062d46304..65c5ef37c 100644
--- a/app/routes/api+/admin.export-org-assets.$organizationId.$fileName[.csv].tsx
+++ b/app/routes/api+/admin.export-org-assets.$organizationId.$fileName[.csv].tsx
@@ -1,17 +1,12 @@
 import type { LoaderFunctionArgs } from "@remix-run/node";
-import { requireAuthSession } from "~/modules/auth";
 import { getRequiredParam } from "~/utils";
 import { exportAssetsToCsv } from "~/utils/csv.server";
 import { requireAdmin } from "~/utils/roles.server";
 
-export const loader = async ({ request, params }: LoaderFunctionArgs) => {
-  await requireAuthSession(request);
-  await requireAdmin(request);
+export const loader = async ({ context, params }: LoaderFunctionArgs) => {
+  const authSession = context.getSession();
+  await requireAdmin(authSession.userId);
   const organizationId = getRequiredParam(params, "organizationId");
-  // const { organizations } = await requireOrganisationId(authSession, request);
-
-  /** We dont need to do this anymore, because this is only for admin */
-  // await assertUserCanExportAssets({ organizationId, organizations });
 
   /** Join the rows with a new line */
   const csvString = await exportAssetsToCsv({ organizationId });
diff --git a/app/routes/api+/admin.import-org-assets.$organizationId.tsx b/app/routes/api+/admin.import-org-assets.$organizationId.tsx
index 4638d1cfa..1cb02a9f1 100644
--- a/app/routes/api+/admin.import-org-assets.$organizationId.tsx
+++ b/app/routes/api+/admin.import-org-assets.$organizationId.tsx
@@ -1,17 +1,20 @@
 import { json, type ActionFunctionArgs } from "@remix-run/node";
 import { db } from "~/database";
 import { createAssetsFromBackupImport } from "~/modules/asset";
-import { requireAuthSession } from "~/modules/auth";
 import { getRequiredParam } from "~/utils";
 import { csvDataFromRequest } from "~/utils/csv.server";
 import { ShelfStackError } from "~/utils/error";
 import { extractCSVDataFromBackupImport } from "~/utils/import.server";
 import { requireAdmin } from "~/utils/roles.server";
 
-export const action = async ({ request, params }: ActionFunctionArgs) => {
+export const action = async ({
+  context,
+  request,
+  params,
+}: ActionFunctionArgs) => {
+  const authSession = context.getSession();
   try {
-    await requireAuthSession(request);
-    await requireAdmin(request);
+    await requireAdmin(authSession.userId);
     const organizationId = getRequiredParam(params, "organizationId");
     const organization = await db.organization.findUnique({
       where: { id: organizationId },
diff --git a/app/routes/api+/asset.refresh-main-image.ts b/app/routes/api+/asset.refresh-main-image.ts
index 4c4cfd77e..1da0bb7e6 100644
--- a/app/routes/api+/asset.refresh-main-image.ts
+++ b/app/routes/api+/asset.refresh-main-image.ts
@@ -1,11 +1,10 @@
 import { json, type ActionFunctionArgs } from "@remix-run/node";
 import { updateAsset } from "~/modules/asset";
-import { requireAuthSession } from "~/modules/auth";
 import { oneDayFromNow } from "~/utils";
 import { createSignedUrl } from "~/utils/storage.server";
 
-export const action = async ({ request }: ActionFunctionArgs) => {
-  const authSession = await requireAuthSession(request);
+export const action = async ({ context, request }: ActionFunctionArgs) => {
+  const authSession = context.getSession();
 
   const { userId } = authSession;
   const formData = await request.formData();
diff --git a/app/routes/api+/client-notification.ts b/app/routes/api+/client-notification.ts
index ce9f09ccd..beea8f3cc 100644
--- a/app/routes/api+/client-notification.ts
+++ b/app/routes/api+/client-notification.ts
@@ -2,7 +2,6 @@ import { json, type LoaderFunctionArgs } from "@remix-run/node";
 import { parseFormAny } from "react-zorm";
 import { z } from "zod";
 import type { NotificationIcon } from "~/atoms/notifications";
-import { requireAuthSession } from "~/modules/auth";
 import { sendNotification } from "~/utils/emitter/send-notification.server";
 
 export const ClientNotificationSchema = z.object({
@@ -11,8 +10,8 @@ export const ClientNotificationSchema = z.object({
   icon: z.custom<NotificationIcon>(),
 });
 
-export async function action({ request }: LoaderFunctionArgs) {
-  const authSession = await requireAuthSession(request);
+export async function action({ context, request }: LoaderFunctionArgs) {
+  const authSession = context.getSession();
 
   const formData = await request.formData();
   const result = await ClientNotificationSchema.safeParseAsync(
diff --git a/app/routes/api+/image.$imageId.ts b/app/routes/api+/image.$imageId.ts
index d789ee9f5..3375094ce 100644
--- a/app/routes/api+/image.$imageId.ts
+++ b/app/routes/api+/image.$imageId.ts
@@ -1,12 +1,11 @@
 import type { LoaderFunctionArgs } from "@remix-run/node";
 import { db } from "~/database";
-import { getAuthSession } from "~/modules/auth";
 import { ShelfStackError } from "~/utils/error";
 
-export async function loader({ request, params }: LoaderFunctionArgs) {
-  const session = await getAuthSession(request);
+export async function loader({ context, params }: LoaderFunctionArgs) {
+  const authSession = context.getSession();
 
-  if (!session)
+  if (!authSession)
     throw new ShelfStackError({
       message: "Unauthorized. You are not allowed to view this resource",
       status: 403,
@@ -18,7 +17,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
   if (!image) throw new ShelfStackError({ message: "Not found", status: 404 });
 
   const userOrganizations = await db.userOrganization.findMany({
-    where: { userId: session.userId },
+    where: { userId: authSession.userId },
     select: {
       organization: {
         select: { id: true },
diff --git a/app/routes/api+/sse.notification.ts b/app/routes/api+/sse.notification.ts
index b2bd63b22..4c25546e8 100644
--- a/app/routes/api+/sse.notification.ts
+++ b/app/routes/api+/sse.notification.ts
@@ -1,11 +1,9 @@
 import type { LoaderFunctionArgs } from "@remix-run/node";
-
 import { eventStream } from "remix-utils/sse/server";
-import { requireAuthSession } from "~/modules/auth";
 import { emitter } from "~/utils/emitter/emitter.server";
 
-export async function loader({ request }: LoaderFunctionArgs) {
-  const authSession = await requireAuthSession(request);
+export async function loader({ context, request }: LoaderFunctionArgs) {
+  const authSession = context.getSession();
 
   return eventStream(request.signal, function setup(send) {
     /** Notification is a strigified json object with the shape {@link Notification} */
@@ -14,7 +12,23 @@ export async function loader({ request }: LoaderFunctionArgs) {
        * We do this to prevent other users receiving notifications
        */
       if (authSession.userId !== JSON.parse(notification).senderId) return;
-      send({ event: "new-notification", data: notification });
+
+      try {
+        send({ event: "new-notification", data: notification });
+      } catch (cause) {
+        /**
+         * node:92658) UnsupportedWarning: The provided connection header is not valid, the value will be dropped from the header and will never be in use.
+         * This is 'expected'
+         * sse wants 0 headers lol (they are removed in Remix Express). Can't do that for Hono since reading response consume the ReadableStream :/
+         */
+        if (
+          cause instanceof Error &&
+          cause.message.match(/Controller is already closed/)
+        ) {
+          // eslint-disable-next-line no-console
+          console.error("ERROR: Failed to send SSE notification");
+        }
+      }
     }
     emitter.on("notification", handle);
 
diff --git a/app/routes/api+/user.change-current-organization.ts b/app/routes/api+/user.change-current-organization.ts
index df2b18f2c..cc887d585 100644
--- a/app/routes/api+/user.change-current-organization.ts
+++ b/app/routes/api+/user.change-current-organization.ts
@@ -1,11 +1,9 @@
 import { type ActionFunctionArgs, redirect } from "@remix-run/node";
-import { commitAuthSession, requireAuthSession } from "~/modules/auth";
 import { setSelectedOrganizationIdCookie } from "~/modules/organization/context.server";
 import { setCookie } from "~/utils/cookies.server";
 import { ShelfStackError } from "~/utils/error";
 
 export const action = async ({ request }: ActionFunctionArgs) => {
-  const authSession = await requireAuthSession(request);
   const formData = await request.formData();
   const organizationId = formData.get("organizationId");
   if (!organizationId)
@@ -16,11 +14,6 @@ export const action = async ({ request }: ActionFunctionArgs) => {
       setCookie(
         await setSelectedOrganizationIdCookie(organizationId as string)
       ),
-      setCookie(
-        await commitAuthSession(request, {
-          authSession,
-        })
-      ),
     ],
   });
 };
diff --git a/app/routes/api+/user.prefs.minimized-sidebar.ts b/app/routes/api+/user.prefs.minimized-sidebar.ts
index 88ae7dd7c..8c53ce716 100644
--- a/app/routes/api+/user.prefs.minimized-sidebar.ts
+++ b/app/routes/api+/user.prefs.minimized-sidebar.ts
@@ -8,7 +8,7 @@ export async function action({ request }: ActionFunctionArgs) {
   cookie.minimizedSidebar = bodyParams.get("minimizeSidebar") === "open";
 
   return json(
-    { success: true },
+    { success: true, isTogglingSidebar: true },
     {
       headers: {
         "Set-Cookie": await userPrefs.serialize(cookie),
diff --git a/app/routes/api+/user.prefs.upload-user-photo.ts b/app/routes/api+/user.prefs.upload-user-photo.ts
index 8af25e638..7cf0af410 100644
--- a/app/routes/api+/user.prefs.upload-user-photo.ts
+++ b/app/routes/api+/user.prefs.upload-user-photo.ts
@@ -1,7 +1,6 @@
 import type { ActionFunctionArgs } from "@remix-run/node";
 import { json } from "react-router";
 import sharp from "sharp";
-import { requireAuthSession } from "~/modules/auth";
 import { getUserByID, updateUser } from "~/modules/user";
 
 import { assertIsPost, dateTimeInUnix } from "~/utils";
@@ -11,9 +10,10 @@ import {
   parseFileFormData,
 } from "~/utils/storage.server";
 
-export const action = async ({ request }: ActionFunctionArgs) => {
+export const action = async ({ context, request }: ActionFunctionArgs) => {
   assertIsPost(request);
-  const { userId } = await requireAuthSession(request);
+  const authSession = context.getSession();
+  const { userId } = authSession;
 
   const user = await getUserByID(userId);
 
diff --git a/app/routes/api+/utils.parse-markdown.ts b/app/routes/api+/utils.parse-markdown.ts
index bf5ec48a5..e2b14ba4f 100644
--- a/app/routes/api+/utils.parse-markdown.ts
+++ b/app/routes/api+/utils.parse-markdown.ts
@@ -1,11 +1,9 @@
 import { json, type ActionFunctionArgs } from "@remix-run/node";
-import { requireAuthSession } from "~/modules/auth";
 import { assertIsPost } from "~/utils";
 import { parseMarkdownToReact } from "~/utils/md.server";
 
 export async function action({ request }: ActionFunctionArgs) {
   assertIsPost(request);
-  await requireAuthSession(request);
 
   const formData = await request.formData();
   const markdown = formData.get("content") as string;
diff --git a/app/routes/qr+/$qrId.tsx b/app/routes/qr+/$qrId.tsx
index 4839299fd..c383237f3 100644
--- a/app/routes/qr+/$qrId.tsx
+++ b/app/routes/qr+/$qrId.tsx
@@ -3,7 +3,6 @@ import { redirect, json } from "@remix-run/node";
 import type { ActionFunctionArgs, LoaderFunctionArgs } from "@remix-run/node";
 import { isRouteErrorResponse, useRouteError } from "@remix-run/react";
 import { QrNotFound } from "~/components/qr/not-found";
-import { commitAuthSession, requireAuthSession } from "~/modules/auth";
 import { getUserOrganizations } from "~/modules/organization";
 import { setSelectedOrganizationIdCookie } from "~/modules/organization/context.server";
 import { getQr } from "~/modules/qr";
@@ -12,10 +11,13 @@ import { assertIsPost } from "~/utils";
 import { setCookie } from "~/utils/cookies.server";
 import { ShelfStackError } from "~/utils/error";
 
-export const loader = async ({ request, params }: LoaderFunctionArgs) => {
+export const loader = async ({
+  context,
+  request,
+  params,
+}: LoaderFunctionArgs) => {
   /* Get the ID of the QR from the params */
   const id = params.qrId as string;
-
   /* Find the QR in the database */
   const qr = await getQr(id);
 
@@ -46,10 +48,10 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
    *  - If not, redirect to the login page, which will automatically then redirect back to here so all checks are performed again
    *  - If so, continue
    */
-  const authSession = await requireAuthSession(request, {
-    onFailRedirectTo: `not-logged-in?scanId=${scan.id}`,
-    verify: false,
-  });
+  if (!context.isAuthenticated) {
+    return redirect(`not-logged-in?scanId=${scan.id}&redirectTo=/qr/${id}`);
+  }
+  const authSession = context.getSession();
 
   if (authSession) {
     updateScan({
@@ -82,6 +84,7 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
   const personalOrganization = userOrganizations.find(
     (org) => org.type === "PERSONAL"
   ) as Organization;
+
   if (!userOrganizationIds.includes(qr.organizationId)) {
     return redirect(`contact-owner?scanId=${scan.id}`);
   }
@@ -93,22 +96,17 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
           personalOrganization.id
       )
     ),
-    setCookie(
-      await commitAuthSession(request, {
-        authSession,
-        flashErrorMessage: null,
-      })
-    ),
   ];
 
   /**
    * When there is no assetId that means that the asset was deleted so the QR code is orphaned.
    * Here we redirect to a page where the user has the option to link to existing asset or create a new one.
    */
-  if (!qr.assetId)
+  if (!qr.assetId) {
     return redirect(`link?scanId=${scan.id}`, {
       headers,
     });
+  }
 
   return redirect(
     `/assets/${qr.assetId}?ref=qr&scanId=${scan.id}&qrId=${qr.id}`,
diff --git a/app/routes/qr+/$qrId_.link.tsx b/app/routes/qr+/$qrId_.link.tsx
index fa74cc972..ae139d259 100644
--- a/app/routes/qr+/$qrId_.link.tsx
+++ b/app/routes/qr+/$qrId_.link.tsx
@@ -6,8 +6,18 @@ import { Button } from "~/components/shared";
 import { PermissionAction, PermissionEntity } from "~/utils/permissions";
 import { requirePermision } from "~/utils/roles.server";
 
-export const loader = async ({ request, params }: LoaderFunctionArgs) => {
-  await requirePermision(request, PermissionEntity.qr, PermissionAction.update);
+export const loader = async ({
+  context,
+  request,
+  params,
+}: LoaderFunctionArgs) => {
+  const authSession = context.getSession();
+  await requirePermision({
+    userId: authSession.userId,
+    request,
+    entity: PermissionEntity.qr,
+    action: PermissionAction.update,
+  });
   const { qrId } = params;
   return json({ qrId });
 };
diff --git a/app/routes/qr+/route.tsx b/app/routes/qr+/route.tsx
index 19d900726..6dcaae256 100644
--- a/app/routes/qr+/route.tsx
+++ b/app/routes/qr+/route.tsx
@@ -7,9 +7,13 @@ export default function QR() {
   return (
     <div className="container h-full min-h-screen px-4 py-12">
       <div className="flex h-full flex-col justify-center text-center">
-        <Link to="./../" title="Home" className="mx-auto inline-block h-[32px]">
+        <Link
+          to="/assets"
+          title="Home"
+          className="mx-auto inline-block h-[32px]"
+        >
           <img
-            src="/images/logo-full-color(x2).png"
+            src="/static/images/logo-full-color(x2).png"
             alt="logo"
             className="h-full"
           />
diff --git a/app/styles/fonts.css b/app/styles/fonts.css
index 5d27cddef..870083de9 100644
--- a/app/styles/fonts.css
+++ b/app/styles/fonts.css
@@ -1,8 +1,8 @@
 @font-face {
   font-family: "Inter";
   src:
-    url("/fonts/inter/Inter.var.woff2") format("woff2-variations"),
-    url("/fonts/inter/Inter.var.woff2") format("woff2");
+    url("/static/fonts/inter/Inter.var.woff2") format("woff2-variations"),
+    url("/static/fonts/inter/Inter.var.woff2") format("woff2");
   font-weight: 100 900;
   font-style: normal;
   font-display: swap;
diff --git a/app/utils/emitter/send-notification.server.ts b/app/utils/emitter/send-notification.server.ts
index bbdebf33b..48ad6b7d3 100644
--- a/app/utils/emitter/send-notification.server.ts
+++ b/app/utils/emitter/send-notification.server.ts
@@ -1,6 +1,5 @@
 import type { NotificationType } from "~/atoms/notifications";
 import { emitter } from "./emitter.server";
-// import { useUserData } from "~/hooks";
 
 export function sendNotification(
   notification: Omit<NotificationType, "open">
diff --git a/app/utils/env.ts b/app/utils/env.ts
index 1e6a2e911..ba5f02aec 100644
--- a/app/utils/env.ts
+++ b/app/utils/env.ts
@@ -1,3 +1,4 @@
+import { z } from "zod";
 import { ShelfStackError } from "./error";
 import { isBrowser } from "./is-browser";
 
@@ -65,6 +66,25 @@ function getEnv(
   return value;
 }
 
+export const EnvSchema = z.object({
+  SESSION_SECRET: z.string().min(1),
+  NODE_ENV: z.enum(["development", "production", "test"]),
+});
+
+type Env = z.infer<typeof EnvSchema>;
+
+const PublicEnvSchema = EnvSchema.pick({
+  NODE_ENV: true,
+});
+
+export const env = (
+  isBrowser ? PublicEnvSchema.parse(window.env) : EnvSchema.parse(process.env)
+) as Env;
+
+export function initEnv() {
+  return env;
+}
+
 /**
  * Server env
  */
diff --git a/app/utils/mail.server.ts b/app/utils/mail.server.ts
index f6bd7232f..8070d04c8 100644
--- a/app/utils/mail.server.ts
+++ b/app/utils/mail.server.ts
@@ -1,7 +1,7 @@
 import nodemailer from "nodemailer";
 import type { Attachment } from "nodemailer/lib/mailer";
 import { NODE_ENV, SMTP_HOST, SMTP_PWD, SMTP_USER } from ".";
-import logoImg from "../../public/images/shelf-symbol.png";
+import logoImg from "../../public/static/images/shelf-symbol.png";
 
 export const sendEmail = async ({
   to,
diff --git a/app/utils/roles.server.ts b/app/utils/roles.server.ts
index b01fee654..9238a6a8b 100644
--- a/app/utils/roles.server.ts
+++ b/app/utils/roles.server.ts
@@ -1,14 +1,11 @@
 import { Roles } from "@prisma/client";
 import { json } from "@remix-run/node";
 import { db } from "~/database";
-import { requireAuthSession } from "~/modules/auth";
 import { requireOrganisationId } from "~/modules/organization/context.server";
 import type { PermissionAction, PermissionEntity } from "./permissions";
 import { validatePermission } from "./permissions";
 
-export async function requireUserWithPermission(name: Roles, request: Request) {
-  const { userId } = await requireAuthSession(request);
-
+export async function requireUserWithPermission(name: Roles, userId: string) {
   const user = await db.user.findFirst({
     where: { id: userId, roles: { some: { name } } },
   });
@@ -19,36 +16,48 @@ export async function requireUserWithPermission(name: Roles, request: Request) {
   return user;
 }
 
-export async function requireAdmin(request: Request) {
-  return requireUserWithPermission(Roles["ADMIN"], request);
-}
-
-export async function requireDealer(request: Request) {
-  return requireUserWithPermission(Roles["USER"], request);
+export async function requireAdmin(userId: string) {
+  return requireUserWithPermission(Roles["ADMIN"], userId);
 }
 
-export async function isAdmin(request: Request) {
-  const { userId } = await requireAuthSession(request);
+export async function isAdmin(context: Record<string, any>) {
+  const authSession = context.getSession();
 
   const user = await db.user.findFirst({
-    where: { id: userId, roles: { some: { name: Roles["ADMIN"] } } },
+    where: {
+      id: authSession.userId,
+      roles: { some: { name: Roles["ADMIN"] } },
+    },
   });
 
   return !!user;
 }
 
-export async function requirePermision(
-  request: Request,
-  entity: PermissionEntity,
-  action: PermissionAction
-) {
-  const authSession = await requireAuthSession(request);
+export async function requirePermision({
+  userId,
+  request,
+  entity,
+  action,
+}: {
+  userId: string;
+  request: Request;
+  entity: PermissionEntity;
+  action: PermissionAction;
+}) {
+  /**
+   * This can be very slow and consuming as there are a few queries with a few joins and this running on every loader/action makes it slow
+   * We need to find a  strategy to make it more performant. Idea:
+   * 1. Have a very light weight query that fetches the lastUpdated in relation to userOrganizationRoles. THis can be done both for roles and organizations
+   * 2. Store it in a cookie
+   * 3. If they mismatch, make the big query to check the actual data
+   */
+
   const {
     organizationId,
     userOrganizations,
     organizations,
     currentOrganization,
-  } = await requireOrganisationId(authSession, request);
+  } = await requireOrganisationId({ userId, request });
 
   const roles = userOrganizations.find(
     (o) => o.organization.id === organizationId
@@ -59,11 +68,10 @@ export async function requirePermision(
     action,
     entity,
     organizationId,
-    userId: authSession.userId,
+    userId,
   });
 
   return {
-    authSession,
     organizations,
     organizationId,
     currentOrganization,
diff --git a/app/utils/splash-screen-links.ts b/app/utils/splash-screen-links.ts
index 3b2309a7b..5bdd558d1 100644
--- a/app/utils/splash-screen-links.ts
+++ b/app/utils/splash-screen-links.ts
@@ -3,204 +3,204 @@ export const splashScreenLinks = [
     rel: "apple-touch-startup-image",
     media:
       "screen and (device-width: 320px) and (device-height: 568px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)",
-    href: "splash_screens/4__iPhone_SE__iPod_touch_5th_generation_and_later_portrait.png",
+    href: "/static/splash_screens/4__iPhone_SE__iPod_touch_5th_generation_and_later_portrait.png",
   },
   {
     rel: "apple-touch-startup-image",
     media:
       "screen and (device-width: 834px) and (device-height: 1112px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)",
-    href: "splash_screens/10.5__iPad_Air_portrait.png",
+    href: "/static/splash_screens/10.5__iPad_Air_portrait.png",
   },
   {
     rel: "apple-touch-startup-image",
     media:
       "screen and (device-width: 768px) and (device-height: 1024px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)",
-    href: "splash_screens/9.7__iPad_Pro__7.9__iPad_mini__9.7__iPad_Air__9.7__iPad_portrait.png",
+    href: "/static/splash_screens/9.7__iPad_Pro__7.9__iPad_mini__9.7__iPad_Air__9.7__iPad_portrait.png",
   },
   {
     rel: "apple-touch-startup-image",
     media:
       "screen and (device-width: 320px) and (device-height: 568px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)",
-    href: "splash_screens/4__iPhone_SE__iPod_touch_5th_generation_and_later_landscape.png",
+    href: "/static/splash_screens/4__iPhone_SE__iPod_touch_5th_generation_and_later_landscape.png",
   },
   {
     rel: "apple-touch-startup-image",
     media:
       "screen and (device-width: 834px) and (device-height: 1194px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)",
-    href: "splash_screens/11__iPad_Pro__10.5__iPad_Pro_landscape.png",
+    href: "/static/splash_screens/11__iPad_Pro__10.5__iPad_Pro_landscape.png",
   },
   {
     rel: "apple-touch-startup-image",
     media:
       "screen and (device-width: 430px) and (device-height: 932px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)",
-    href: "splash_screens/iPhone_15_Pro_Max__iPhone_15_Plus__iPhone_14_Pro_Max_landscape.png",
+    href: "/static/splash_screens/iPhone_15_Pro_Max__iPhone_15_Plus__iPhone_14_Pro_Max_landscape.png",
   },
   {
     rel: "apple-touch-startup-image",
     media:
       "screen and (device-width: 375px) and (device-height: 667px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)",
-    href: "splash_screens/iPhone_8__iPhone_7__iPhone_6s__iPhone_6__4.7__iPhone_SE_portrait.png",
+    href: "/static/splash_screens/iPhone_8__iPhone_7__iPhone_6s__iPhone_6__4.7__iPhone_SE_portrait.png",
   },
   {
     rel: "apple-touch-startup-image",
     media:
       "screen and (device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)",
-    href: "splash_screens/iPhone_11__iPhone_XR_portrait.png",
+    href: "/static/splash_screens/iPhone_11__iPhone_XR_portrait.png",
   },
   {
     rel: "apple-touch-startup-image",
     media:
       "screen and (device-width: 390px) and (device-height: 844px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)",
-    href: "splash_screens/iPhone_14__iPhone_13_Pro__iPhone_13__iPhone_12_Pro__iPhone_12_portrait.png",
+    href: "/static/splash_screens/iPhone_14__iPhone_13_Pro__iPhone_13__iPhone_12_Pro__iPhone_12_portrait.png",
   },
   {
     rel: "apple-touch-startup-image",
     media:
       "screen and (device-width: 393px) and (device-height: 852px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)",
-    href: "splash_screens/iPhone_15_Pro__iPhone_15__iPhone_14_Pro_landscape.png",
+    href: "/static/splash_screens/iPhone_15_Pro__iPhone_15__iPhone_14_Pro_landscape.png",
   },
   {
     rel: "apple-touch-startup-image",
     media:
       "screen and (device-width: 820px) and (device-height: 1180px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)",
-    href: "splash_screens/10.9__iPad_Air_landscape.png",
+    href: "/static/splash_screens/10.9__iPad_Air_landscape.png",
   },
   {
     rel: "apple-touch-startup-image",
     media:
       "screen and (device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)",
-    href: "splash_screens/iPhone_11_Pro_Max__iPhone_XS_Max_portrait.png",
+    href: "/static/splash_screens/iPhone_11_Pro_Max__iPhone_XS_Max_portrait.png",
   },
   {
     rel: "apple-touch-startup-image",
     media:
       "screen and (device-width: 834px) and (device-height: 1112px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)",
-    href: "splash_screens/10.5__iPad_Air_landscape.png",
+    href: "/static/splash_screens/10.5__iPad_Air_landscape.png",
   },
   {
     rel: "apple-touch-startup-image",
     media:
       "screen and (device-width: 768px) and (device-height: 1024px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)",
-    href: "splash_screens/9.7__iPad_Pro__7.9__iPad_mini__9.7__iPad_Air__9.7__iPad_landscape.png",
+    href: "/static/splash_screens/9.7__iPad_Pro__7.9__iPad_mini__9.7__iPad_Air__9.7__iPad_landscape.png",
   },
   {
     rel: "apple-touch-startup-image",
     media:
       "screen and (device-width: 430px) and (device-height: 932px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)",
-    href: "splash_screens/iPhone_15_Pro_Max__iPhone_15_Plus__iPhone_14_Pro_Max_portrait.png",
+    href: "/static/splash_screens/iPhone_15_Pro_Max__iPhone_15_Plus__iPhone_14_Pro_Max_portrait.png",
   },
   {
     rel: "apple-touch-startup-image",
     media:
       "screen and (device-width: 428px) and (device-height: 926px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)",
-    href: "splash_screens/iPhone_14_Plus__iPhone_13_Pro_Max__iPhone_12_Pro_Max_portrait.png",
+    href: "/static/splash_screens/iPhone_14_Plus__iPhone_13_Pro_Max__iPhone_12_Pro_Max_portrait.png",
   },
   {
     rel: "apple-touch-startup-image",
     media:
       "screen and (device-width: 375px) and (device-height: 812px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)",
-    href: "splash_screens/iPhone_13_mini__iPhone_12_mini__iPhone_11_Pro__iPhone_XS__iPhone_X_portrait.png",
+    href: "/static/splash_screens/iPhone_13_mini__iPhone_12_mini__iPhone_11_Pro__iPhone_XS__iPhone_X_portrait.png",
   },
   {
     rel: "apple-touch-startup-image",
     media:
       "screen and (device-width: 428px) and (device-height: 926px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)",
-    href: "splash_screens/iPhone_14_Plus__iPhone_13_Pro_Max__iPhone_12_Pro_Max_landscape.png",
+    href: "/static/splash_screens/iPhone_14_Plus__iPhone_13_Pro_Max__iPhone_12_Pro_Max_landscape.png",
   },
   {
     rel: "apple-touch-startup-image",
     media:
       "screen and (device-width: 375px) and (device-height: 812px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)",
-    href: "splash_screens/iPhone_13_mini__iPhone_12_mini__iPhone_11_Pro__iPhone_XS__iPhone_X_landscape.png",
+    href: "/static/splash_screens/iPhone_13_mini__iPhone_12_mini__iPhone_11_Pro__iPhone_XS__iPhone_X_landscape.png",
   },
   {
     rel: "apple-touch-startup-image",
     media:
       "screen and (device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)",
-    href: "splash_screens/iPhone_11__iPhone_XR_landscape.png",
+    href: "/static/splash_screens/iPhone_11__iPhone_XR_landscape.png",
   },
   {
     rel: "apple-touch-startup-image",
     media:
       "screen and (device-width: 1024px) and (device-height: 1366px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)",
-    href: "splash_screens/12.9__iPad_Pro_portrait.png",
+    href: "/static/splash_screens/12.9__iPad_Pro_portrait.png",
   },
   {
     rel: "apple-touch-startup-image",
     media:
       "screen and (device-width: 820px) and (device-height: 1180px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)",
-    href: "splash_screens/10.9__iPad_Air_portrait.png",
+    href: "/static/splash_screens/10.9__iPad_Air_portrait.png",
   },
   {
     rel: "apple-touch-startup-image",
     media:
       "screen and (device-width: 810px) and (device-height: 1080px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)",
-    href: "splash_screens/10.2__iPad_portrait.png",
+    href: "/static/splash_screens/10.2__iPad_portrait.png",
   },
   {
     rel: "apple-touch-startup-image",
     media:
       "screen and (device-width: 744px) and (device-height: 1133px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)",
-    href: "splash_screens/8.3__iPad_Mini_portrait.png",
+    href: "/static/splash_screens/8.3__iPad_Mini_portrait.png",
   },
   {
     rel: "apple-touch-startup-image",
     media:
       "screen and (device-width: 375px) and (device-height: 667px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)",
-    href: "splash_screens/iPhone_8__iPhone_7__iPhone_6s__iPhone_6__4.7__iPhone_SE_landscape.png",
+    href: "/static/splash_screens/iPhone_8__iPhone_7__iPhone_6s__iPhone_6__4.7__iPhone_SE_landscape.png",
   },
   {
     rel: "apple-touch-startup-image",
     media:
       "screen and (device-width: 1024px) and (device-height: 1366px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape,)",
-    href: "splash_screens/12.9__iPad_Pro_landscape.png",
+    href: "/static/splash_screens/12.9__iPad_Pro_landscape.png",
   },
   {
     rel: "apple-touch-startup-image",
     media:
       "screen and (device-width: 810px) and (device-height: 1080px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)",
-    href: "splash_screens/10.2__iPad_landscape.png",
+    href: "/static/splash_screens/10.2__iPad_landscape.png",
   },
   {
     rel: "apple-touch-startup-image",
     media:
       "screen and (device-width: 744px) and (device-height: 1133px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)",
-    href: "splash_screens/8.3__iPad_Mini_landscape.png",
+    href: "/static/splash_screens/8.3__iPad_Mini_landscape.png",
   },
   {
     rel: "apple-touch-startup-image",
     media:
       "screen and (device-width: 393px) and (device-height: 852px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)",
-    href: "splash_screens/iPhone_15_Pro__iPhone_15__iPhone_14_Pro_portrait.png",
+    href: "/static/splash_screens/iPhone_15_Pro__iPhone_15__iPhone_14_Pro_portrait.png",
   },
   {
     rel: "apple-touch-startup-image",
     media:
       "screen and (device-width: 390px) and (device-height: 844px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)",
-    href: "splash_screens/iPhone_14__iPhone_13_Pro__iPhone_13__iPhone_12_Pro__iPhone_12_landscape.png",
+    href: "/static/splash_screens/iPhone_14__iPhone_13_Pro__iPhone_13__iPhone_12_Pro__iPhone_12_landscape.png",
   },
   {
     rel: "apple-touch-startup-image",
     media:
       "screen and (device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)",
-    href: "splash_screens/iPhone_11_Pro_Max__iPhone_XS_Max_landscape.png",
+    href: "/static/splash_screens/iPhone_11_Pro_Max__iPhone_XS_Max_landscape.png",
   },
   {
     rel: "apple-touch-startup-image",
     media:
       "screen and (device-width: 414px) and (device-height: 736px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)",
-    href: "splash_screens/iPhone_8_Plus__iPhone_7_Plus__iPhone_6s_Plus__iPhone_6_Plus_landscape.png",
+    href: "/static/splash_screens/iPhone_8_Plus__iPhone_7_Plus__iPhone_6s_Plus__iPhone_6_Plus_landscape.png",
   },
   {
     rel: "apple-touch-startup-image",
     media:
       "screen and (device-width: 834px) and (device-height: 1194px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)",
-    href: "splash_screens/11__iPad_Pro__10.5__iPad_Pro_portrait.png",
+    href: "/static/splash_screens/11__iPad_Pro__10.5__iPad_Pro_portrait.png",
   },
   {
     rel: "apple-touch-startup-image",
     media:
       "screen and (device-width: 414px) and (device-height: 736px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)",
-    href: "splash_screens/iPhone_8_Plus__iPhone_7_Plus__iPhone_6s_Plus__iPhone_6_Plus_portrait.png",
+    href: "/static/splash_screens/iPhone_8_Plus__iPhone_7_Plus__iPhone_6s_Plus__iPhone_6_Plus_portrait.png",
   },
 ];
diff --git a/app/utils/storage.server.ts b/app/utils/storage.server.ts
index 66177650d..41c408e5c 100644
--- a/app/utils/storage.server.ts
+++ b/app/utils/storage.server.ts
@@ -6,7 +6,6 @@ import {
 import type { ResizeOptions } from "sharp";
 
 import { getSupabaseAdmin } from "~/integrations/supabase";
-import { requireAuthSession } from "~/modules/auth";
 import { cropImage, extractImageNameFromSupabaseUrl } from ".";
 import { SUPABASE_URL } from "./env";
 import { ShelfStackError } from "./error";
@@ -93,8 +92,6 @@ export async function parseFileFormData({
   bucketName?: string;
   resizeOptions?: ResizeOptions;
 }) {
-  await requireAuthSession(request);
-
   const uploadHandler = unstable_composeUploadHandlers(
     async ({ contentType, data, filename }) => {
       if (!contentType?.includes("image")) return undefined;
diff --git a/app/utils/stripe.server.ts b/app/utils/stripe.server.ts
index db821a174..236457455 100644
--- a/app/utils/stripe.server.ts
+++ b/app/utils/stripe.server.ts
@@ -24,7 +24,7 @@ function getStripeServerClient() {
   ) {
     // Reference : https://github.com/stripe/stripe-node#usage-with-typescript
     _stripe = new Stripe(STRIPE_SECRET_KEY, {
-      apiVersion: "2022-11-15",
+      apiVersion: "2023-10-16",
     });
   }
   return _stripe;
diff --git a/package-lock.json b/package-lock.json
index f577edc62..7f8935647 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,110 +6,116 @@
     "": {
       "name": "shelf-webapp",
       "dependencies": {
-        "@markdoc/markdoc": "^0.2.2",
-        "@prisma/client": "^5.4.2",
-        "@radix-ui/react-alert-dialog": "^1.0.4",
+        "@hono/node-server": "^1.7.0",
+        "@markdoc/markdoc": "^0.4.0",
+        "@prisma/client": "^5.9.1",
+        "@radix-ui/react-alert-dialog": "^1.0.5",
         "@radix-ui/react-dropdown-menu": "2.0.4",
-        "@radix-ui/react-hover-card": "^1.0.6",
+        "@radix-ui/react-hover-card": "^1.0.7",
         "@radix-ui/react-icons": "^1.3.0",
-        "@radix-ui/react-popover": "^1.0.6",
+        "@radix-ui/react-popover": "^1.0.7",
         "@radix-ui/react-select": "1.2.1",
         "@radix-ui/react-switch": "^1.0.3",
         "@radix-ui/react-tabs": "1.0.3",
         "@radix-ui/react-toast": "1.1.3",
-        "@radix-ui/react-tooltip": "^1.0.6",
+        "@radix-ui/react-tooltip": "^1.0.7",
         "@react-email/components": "0.0.14",
-        "@remix-run/css-bundle": "2.1.0",
-        "@remix-run/node": "2.1.0",
-        "@remix-run/react": "2.1.0",
-        "@remix-run/serve": "2.1.0",
-        "@sentry/remix": "^7.98.0",
-        "@stripe/react-stripe-js": "^2.1.1",
-        "@stripe/stripe-js": "^1.54.2",
-        "@supabase/supabase-js": "^2.26.0",
-        "@tremor/react": "^3.10.0",
+        "@remix-run/css-bundle": "2.5.1",
+        "@remix-run/node": "2.5.1",
+        "@remix-run/react": "2.5.1",
+        "@remix-run/serve": "2.5.1",
+        "@sentry/remix": "^7.101.0",
+        "@stripe/react-stripe-js": "^2.5.0",
+        "@stripe/stripe-js": "^3.0.2",
+        "@supabase/supabase-js": "^2.39.6",
+        "@tremor/react": "^3.14.0",
         "@zxing/library": "^0.20.0",
         "changedpi": "^1.0.4",
-        "cookie": "^0.5.0",
-        "crisp-sdk-web": "^1.0.19",
-        "csv-parse": "^5.4.0",
+        "cookie": "^0.6.0",
+        "crisp-sdk-web": "^1.0.21",
+        "csv-parse": "^5.5.3",
+        "date-fns": "^3.3.1",
         "detectrtc": "^1.4.1",
         "dom-to-image": "^2.6.0",
-        "framer-motion": "^9.1.7",
+        "framer-motion": "^11.0.5",
+        "hono": "^4.0.2",
         "intl-parse-accept-language": "^1.0.0",
-        "isbot": "^3.6.12",
-        "jotai": "^2.2.1",
+        "isbot": "^4.4.0",
+        "jotai": "^2.6.4",
         "jsonwebtoken": "^9.0.2",
         "jszip": "^3.10.1",
         "luxon": "^3.4.4",
-        "mapbox-gl": "^2.15.0",
-        "maplibre-gl": "^3.1.0",
-        "nodemailer": "^6.9.3",
+        "mapbox-gl": "^3.1.2",
+        "maplibre-gl": "^4.0.0",
+        "nodemailer": "^6.9.9",
+        "path-to-regexp": "^6.2.1",
         "pg-boss": "^9.0.3",
+        "pino-pretty": "^10.3.1",
         "qrcode-generator": "^1.4.4",
         "react": "^18.2.0",
-        "react-day-picker": "^8.8.2",
+        "react-day-picker": "^8.10.0",
         "react-dom": "^18.2.0",
         "react-dropzone": "^14.2.3",
-        "react-map-gl": "^7.1.0",
+        "react-map-gl": "^7.1.7",
         "react-microsoft-clarity": "^1.2.0",
-        "react-tag-autocomplete": "^7.0.0-rc.8",
-        "react-to-print": "^2.14.13",
-        "react-zorm": "^0.6.2",
-        "remix-utils": "^7.0.2",
-        "sharp": "^0.32.1",
-        "stripe": "^12.16.0",
-        "swiper": "^10.3.1",
-        "tailwind-merge": "^1.13.2",
-        "tailwindcss-animate": "^1.0.6",
+        "react-tag-autocomplete": "^7.1.0",
+        "react-to-print": "^2.15.1",
+        "react-zorm": "^0.9.0",
+        "remix-hono": "^0.0.15",
+        "remix-utils": "^7.5.0",
+        "sharp": "^0.33.2",
+        "stripe": "^14.16.0",
+        "swiper": "^11.0.6",
+        "tailwind-merge": "^2.2.1",
+        "tailwindcss-animate": "^1.0.7",
         "tiny-invariant": "^1.3.1",
-        "ua-parser-js": "^1.0.35",
-        "zod": "^3.21.4"
+        "ua-parser-js": "^1.0.37",
+        "zod": "^3.22.4"
       },
       "devDependencies": {
-        "@faker-js/faker": "^7.6.0",
-        "@playwright/test": "^1.34.3",
-        "@remix-run/dev": "2.1.0",
-        "@remix-run/eslint-config": "2.1.0",
+        "@faker-js/faker": "^8.4.1",
+        "@playwright/test": "^1.41.2",
+        "@remix-run/dev": "2.5.1",
+        "@remix-run/eslint-config": "2.5.1",
         "@tailwindcss/aspect-ratio": "^0.4.2",
-        "@tailwindcss/forms": "^0.5.3",
-        "@tailwindcss/typography": "^0.5.9",
-        "@testing-library/jest-dom": "^5.16.5",
-        "@testing-library/react": "^13.4.0",
-        "@testing-library/user-event": "^14.4.3",
-        "@types/dom-to-image": "^2.6.4",
-        "@types/jsonwebtoken": "^9.0.3",
-        "@types/luxon": "^3.3.7",
-        "@types/nodemailer": "^6.4.8",
-        "@types/react": "^18.2.14",
-        "@types/react-dom": "^18.2.6",
-        "@vitejs/plugin-react": "^2.2.0",
-        "@vitest/coverage-c8": "^0.24.5",
+        "@tailwindcss/forms": "^0.5.7",
+        "@tailwindcss/typography": "^0.5.10",
+        "@testing-library/jest-dom": "^6.4.2",
+        "@testing-library/react": "^14.2.1",
+        "@testing-library/user-event": "^14.5.2",
+        "@types/dom-to-image": "^2.6.7",
+        "@types/jsonwebtoken": "^9.0.5",
+        "@types/luxon": "^3.4.2",
+        "@types/nodemailer": "^6.4.14",
+        "@types/react": "^18.2.55",
+        "@types/react-dom": "^18.2.19",
+        "@vitejs/plugin-react": "^4.2.1",
+        "@vitest/coverage-v8": "^1.2.2",
         "cross-env": "^7.0.3",
-        "dotenv-cli": "^6.0.0",
-        "eslint": "^8.44.0",
-        "eslint-config-prettier": "^8.8.0",
-        "eslint-plugin-tailwindcss": "^3.13.0",
-        "happy-dom": "^10.0.3",
-        "husky": "^8.0.0",
-        "msw": "^1.2.2",
-        "nodemailer-mock": "^2.0.1",
+        "dotenv-cli": "^7.3.0",
+        "eslint": "^8.56.0",
+        "eslint-config-prettier": "^9.1.0",
+        "eslint-plugin-tailwindcss": "^3.14.2",
+        "happy-dom": "^13.3.8",
+        "husky": "^9.0.11",
+        "msw": "^1.2.0",
+        "nodemailer-mock": "^2.0.4",
         "npm-run-all": "^4.1.5",
         "prettier": "3.0.3",
-        "prettier-plugin-tailwindcss": "^0.5.4",
-        "prisma": "^5.4.2",
-        "remix-flat-routes": "^0.5.10",
+        "prettier-plugin-tailwindcss": "^0.5.11",
+        "prisma": "^5.9.1",
+        "remix-flat-routes": "^0.6.4",
         "start-server-and-test": "^2.0.3",
-        "tailwind-scrollbar": "^2.1.0",
-        "tailwindcss": "^3.3.2",
+        "tailwind-scrollbar": "^3.1.0",
+        "tailwindcss": "^3.4.1",
         "tsconfig-paths": "^4.2.0",
-        "tsx": "^3.13.0",
+        "tsx": "^4.7.1",
         "typescript": "^5.1.0",
-        "vite-tsconfig-paths": "^3.6.0",
-        "vitest": "^0.24.5"
+        "vite-tsconfig-paths": "^4.3.1",
+        "vitest": "^1.2.2"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=20"
       }
     },
     "node_modules/@aashutoshrathi/word-wrap": {
@@ -975,6 +981,22 @@
       "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
       "dev": true
     },
+    "node_modules/@cloudflare/kv-asset-handler": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@cloudflare/kv-asset-handler/-/kv-asset-handler-0.1.3.tgz",
+      "integrity": "sha512-FNcunDuTmEfQTLRLtA6zz+buIXUHj1soPvSWzzQFBC+n2lsy+CGf/NIrR3SEPCmsVNQj70/Jx2lViCpq+09YpQ==",
+      "optional": true,
+      "dependencies": {
+        "mime": "^2.5.2"
+      }
+    },
+    "node_modules/@cloudflare/workers-types": {
+      "version": "4.20240208.0",
+      "resolved": "https://registry.npmjs.org/@cloudflare/workers-types/-/workers-types-4.20240208.0.tgz",
+      "integrity": "sha512-MVGTTjZpJu4kJONvai5SdJzWIhOJbuweVZ3goI7FNyG+JdoQH41OoB+nMhLsX626vPLZVWGPIWsiSo/WZHzgQw==",
+      "optional": true,
+      "peer": true
+    },
     "node_modules/@colors/colors": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
@@ -985,11 +1007,14 @@
         "node": ">=0.1.90"
       }
     },
-    "node_modules/@cush/relative": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@cush/relative/-/relative-1.0.0.tgz",
-      "integrity": "sha512-RpfLEtTlyIxeNPGKcokS+p3BZII/Q3bYxryFRglh5H3A3T8q9fsLYm72VYAMEOOIBLEa8o93kFLiBDUWKrwXZA==",
-      "dev": true
+    "node_modules/@emnapi/runtime": {
+      "version": "0.45.0",
+      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-0.45.0.tgz",
+      "integrity": "sha512-Txumi3td7J4A/xTTwlssKieHKTGl3j4A1tglBx72auZ49YK7ePY6XZricgIg9mnZT4xPfA+UPCUdnhRuEFDL+w==",
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.4.0"
+      }
     },
     "node_modules/@emotion/hash": {
       "version": "0.9.1",
@@ -1498,13 +1523,19 @@
       }
     },
     "node_modules/@faker-js/faker": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-7.6.0.tgz",
-      "integrity": "sha512-XK6BTq1NDMo9Xqw/YkYyGjSsg44fbNwYRx7QK2CuoQgyy+f1rrTDHoExVM5PsyXCtfl2vs2vVJ0MN0yN6LppRw==",
+      "version": "8.4.1",
+      "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-8.4.1.tgz",
+      "integrity": "sha512-XQ3cU+Q8Uqmrbf2e0cIC/QN43sTBSC8KF12u29Mb47tWrt2hAgBXSgpZMj4Ao8Uk0iJcU99QsOCaIL8934obCg==",
       "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fakerjs"
+        }
+      ],
       "engines": {
-        "node": ">=14.0.0",
-        "npm": ">=6.0.0"
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0",
+        "npm": ">=6.14.13"
       }
     },
     "node_modules/@floating-ui/core": {
@@ -1516,12 +1547,12 @@
       }
     },
     "node_modules/@floating-ui/dom": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.1.tgz",
-      "integrity": "sha512-iA8qE43/H5iGozC3W0YSnVSW42Vh522yyM1gj+BqRwVsTNOyr231PsXDaV04yT39PsO0QL2QpbI/M0ZaLUQgRQ==",
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.3.tgz",
+      "integrity": "sha512-RnDthu3mzPlQ31Ss/BTwQ1zjzIhr3lk1gZB1OC56h/1vEtaXkESrOqL5fQVMfXpwGtRwX+YsZBdyHtJMQnkArw==",
       "dependencies": {
-        "@floating-ui/core": "^1.6.0",
-        "@floating-ui/utils": "^0.2.1"
+        "@floating-ui/core": "^1.0.0",
+        "@floating-ui/utils": "^0.2.0"
       }
     },
     "node_modules/@floating-ui/react": {
@@ -1615,6 +1646,14 @@
         "tailwindcss": "^3.0"
       }
     },
+    "node_modules/@hono/node-server": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/@hono/node-server/-/node-server-1.7.0.tgz",
+      "integrity": "sha512-W+Gy16xWZMgB8hYU4XInCwE746y8V3VDTH1J3+EhUBqbCzk4zEXo1p6dv3BiCD5O6Z4aHuoCW+mRKoJgUn3ZCA==",
+      "engines": {
+        "node": ">=18.14.1"
+      }
+    },
     "node_modules/@humanwhocodes/config-array": {
       "version": "0.11.14",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
@@ -1670,169 +1709,571 @@
       "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==",
       "dev": true
     },
-    "node_modules/@isaacs/cliui": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
-      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
-      "dependencies": {
-        "string-width": "^5.1.2",
-        "string-width-cjs": "npm:string-width@^4.2.0",
-        "strip-ansi": "^7.0.1",
-        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
-        "wrap-ansi": "^8.1.0",
-        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
-      },
+    "node_modules/@img/sharp-darwin-arm64": {
+      "version": "0.33.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.33.2.tgz",
+      "integrity": "sha512-itHBs1rPmsmGF9p4qRe++CzCgd+kFYktnsoR1sbIAfsRMrJZau0Tt1AH9KVnufc2/tU02Gf6Ibujx+15qRE03w==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
       "engines": {
-        "node": ">=12"
+        "glibc": ">=2.26",
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
+        "npm": ">=9.6.5",
+        "pnpm": ">=7.1.0",
+        "yarn": ">=3.2.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-libvips-darwin-arm64": "1.0.1"
       }
     },
-    "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+    "node_modules/@img/sharp-darwin-x64": {
+      "version": "0.33.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.33.2.tgz",
+      "integrity": "sha512-/rK/69Rrp9x5kaWBjVN07KixZanRr+W1OiyKdXcbjQD6KbW+obaTeBBtLUAtbBsnlTTmWthw99xqoOS7SsySDg==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
       "engines": {
-        "node": ">=12"
+        "glibc": ">=2.26",
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
+        "npm": ">=9.6.5",
+        "pnpm": ">=7.1.0",
+        "yarn": ">=3.2.0"
       },
       "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-libvips-darwin-x64": "1.0.1"
       }
     },
-    "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
-      "dependencies": {
-        "ansi-regex": "^6.0.1"
-      },
+    "node_modules/@img/sharp-libvips-darwin-arm64": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.0.1.tgz",
+      "integrity": "sha512-kQyrSNd6lmBV7O0BUiyu/OEw9yeNGFbQhbxswS1i6rMDwBBSX+e+rPzu3S+MwAiGU3HdLze3PanQ4Xkfemgzcw==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
       "engines": {
-        "node": ">=12"
+        "macos": ">=11",
+        "npm": ">=9.6.5",
+        "pnpm": ">=7.1.0",
+        "yarn": ">=3.2.0"
       },
       "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+        "url": "https://opencollective.com/libvips"
       }
     },
-    "node_modules/@istanbuljs/schema": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
-      "dev": true,
+    "node_modules/@img/sharp-libvips-darwin-x64": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.0.1.tgz",
+      "integrity": "sha512-eVU/JYLPVjhhrd8Tk6gosl5pVlvsqiFlt50wotCvdkFGf+mDNBJxMh+bvav+Wt3EBnNZWq8Sp2I7XfSjm8siog==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/expect-utils": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz",
-      "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==",
-      "dev": true,
-      "dependencies": {
-        "jest-get-type": "^29.6.3"
+        "macos": ">=10.13",
+        "npm": ">=9.6.5",
+        "pnpm": ">=7.1.0",
+        "yarn": ">=3.2.0"
       },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      "funding": {
+        "url": "https://opencollective.com/libvips"
       }
     },
-    "node_modules/@jest/schemas": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
-      "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
-      "dev": true,
-      "dependencies": {
-        "@sinclair/typebox": "^0.27.8"
-      },
+    "node_modules/@img/sharp-libvips-linux-arm": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.0.1.tgz",
+      "integrity": "sha512-FtdMvR4R99FTsD53IA3LxYGghQ82t3yt0ZQ93WMZ2xV3dqrb0E8zq4VHaTOuLEAuA83oDawHV3fd+BsAPadHIQ==",
+      "cpu": [
+        "arm"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/types": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
-      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
-      "dev": true,
-      "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^17.0.8",
-        "chalk": "^4.0.0"
+        "glibc": ">=2.28",
+        "npm": ">=9.6.5",
+        "pnpm": ">=7.1.0",
+        "yarn": ">=3.2.0"
       },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      "funding": {
+        "url": "https://opencollective.com/libvips"
       }
     },
-    "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
-      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
-      "dependencies": {
-        "@jridgewell/set-array": "^1.0.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      },
+    "node_modules/@img/sharp-libvips-linux-arm64": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.0.1.tgz",
+      "integrity": "sha512-bnGG+MJjdX70mAQcSLxgeJco11G+MxTz+ebxlz8Y3dxyeb3Nkl7LgLI0mXupoO+u1wRNx/iRj5yHtzA4sde1yA==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": ">=6.0.0"
+        "glibc": ">=2.26",
+        "npm": ">=9.6.5",
+        "pnpm": ">=7.1.0",
+        "yarn": ">=3.2.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
       }
     },
-    "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
-      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
+    "node_modules/@img/sharp-libvips-linux-s390x": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.0.1.tgz",
+      "integrity": "sha512-3+rzfAR1YpMOeA2zZNp+aYEzGNWK4zF3+sdMxuCS3ey9HhDbJ66w6hDSHDMoap32DueFwhhs3vwooAB2MaK4XQ==",
+      "cpu": [
+        "s390x"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": ">=6.0.0"
+        "glibc": ">=2.28",
+        "npm": ">=9.6.5",
+        "pnpm": ">=7.1.0",
+        "yarn": ">=3.2.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
       }
     },
-    "node_modules/@jridgewell/set-array": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+    "node_modules/@img/sharp-libvips-linux-x64": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.0.1.tgz",
+      "integrity": "sha512-3NR1mxFsaSgMMzz1bAnnKbSAI+lHXVTqAHgc1bgzjHuXjo4hlscpUxc0vFSAPKI3yuzdzcZOkq7nDPrP2F8Jgw==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": ">=6.0.0"
+        "glibc": ">=2.26",
+        "npm": ">=9.6.5",
+        "pnpm": ">=7.1.0",
+        "yarn": ">=3.2.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
       }
     },
-    "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.15",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
-    },
-    "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.22",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.22.tgz",
-      "integrity": "sha512-Wf963MzWtA2sjrNt+g18IAln9lKnlRp+K2eH4jjIoF1wYeq3aMREpG09xhlhdzS0EjwU7qmUJYangWa+151vZw==",
-      "dependencies": {
-        "@jridgewell/resolve-uri": "^3.1.0",
-        "@jridgewell/sourcemap-codec": "^1.4.14"
+    "node_modules/@img/sharp-libvips-linuxmusl-arm64": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.0.1.tgz",
+      "integrity": "sha512-5aBRcjHDG/T6jwC3Edl3lP8nl9U2Yo8+oTl5drd1dh9Z1EBfzUKAJFUDTDisDjUwc7N4AjnPGfCA3jl3hY8uDg==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "musl": ">=1.2.2",
+        "npm": ">=9.6.5",
+        "pnpm": ">=7.1.0",
+        "yarn": ">=3.2.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
       }
     },
-    "node_modules/@jspm/core": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@jspm/core/-/core-2.0.1.tgz",
-      "integrity": "sha512-Lg3PnLp0QXpxwLIAuuJboLeRaIhrgJjeuh797QADg3xz8wGLugQOS5DpsE8A6i6Adgzf+bacllkKZG3J0tGfDw==",
-      "dev": true
-    },
-    "node_modules/@mapbox/geojson-rewind": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/@mapbox/geojson-rewind/-/geojson-rewind-0.5.2.tgz",
-      "integrity": "sha512-tJaT+RbYGJYStt7wI3cq4Nl4SXxG8W7JDG5DMJu97V25RnbNg3QtQtf+KD+VLjNpWKYsRvXDNmNrBgEETr1ifA==",
-      "dependencies": {
-        "get-stream": "^6.0.1",
-        "minimist": "^1.2.6"
+    "node_modules/@img/sharp-libvips-linuxmusl-x64": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.0.1.tgz",
+      "integrity": "sha512-dcT7inI9DBFK6ovfeWRe3hG30h51cBAP5JXlZfx6pzc/Mnf9HFCQDLtYf4MCBjxaaTfjCCjkBxcy3XzOAo5txw==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "musl": ">=1.2.2",
+        "npm": ">=9.6.5",
+        "pnpm": ">=7.1.0",
+        "yarn": ">=3.2.0"
       },
-      "bin": {
-        "geojson-rewind": "geojson-rewind"
+      "funding": {
+        "url": "https://opencollective.com/libvips"
       }
     },
-    "node_modules/@mapbox/jsonlint-lines-primitives": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz",
-      "integrity": "sha512-rY0o9A5ECsTQRVhv7tL/OyDpGAoUB4tTvLiW1DSzQGq4bvTPhNw1VpSNjDJc5GFZ2XuyOtSWSVN05qOtcD71qQ==",
+    "node_modules/@img/sharp-linux-arm": {
+      "version": "0.33.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.33.2.tgz",
+      "integrity": "sha512-Fndk/4Zq3vAc4G/qyfXASbS3HBZbKrlnKZLEJzPLrXoJuipFNNwTes71+Ki1hwYW5lch26niRYoZFAtZVf3EGA==",
+      "cpu": [
+        "arm"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": ">= 0.6"
+        "glibc": ">=2.28",
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
+        "npm": ">=9.6.5",
+        "pnpm": ">=7.1.0",
+        "yarn": ">=3.2.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-libvips-linux-arm": "1.0.1"
       }
     },
-    "node_modules/@mapbox/mapbox-gl-supported": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-supported/-/mapbox-gl-supported-2.0.1.tgz",
+    "node_modules/@img/sharp-linux-arm64": {
+      "version": "0.33.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.33.2.tgz",
+      "integrity": "sha512-pz0NNo882vVfqJ0yNInuG9YH71smP4gRSdeL09ukC2YLE6ZyZePAlWKEHgAzJGTiOh8Qkaov6mMIMlEhmLdKew==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "glibc": ">=2.26",
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
+        "npm": ">=9.6.5",
+        "pnpm": ">=7.1.0",
+        "yarn": ">=3.2.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-libvips-linux-arm64": "1.0.1"
+      }
+    },
+    "node_modules/@img/sharp-linux-s390x": {
+      "version": "0.33.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.33.2.tgz",
+      "integrity": "sha512-MBoInDXDppMfhSzbMmOQtGfloVAflS2rP1qPcUIiITMi36Mm5YR7r0ASND99razjQUpHTzjrU1flO76hKvP5RA==",
+      "cpu": [
+        "s390x"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "glibc": ">=2.28",
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
+        "npm": ">=9.6.5",
+        "pnpm": ">=7.1.0",
+        "yarn": ">=3.2.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-libvips-linux-s390x": "1.0.1"
+      }
+    },
+    "node_modules/@img/sharp-linux-x64": {
+      "version": "0.33.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.33.2.tgz",
+      "integrity": "sha512-xUT82H5IbXewKkeF5aiooajoO1tQV4PnKfS/OZtb5DDdxS/FCI/uXTVZ35GQ97RZXsycojz/AJ0asoz6p2/H/A==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "glibc": ">=2.26",
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
+        "npm": ">=9.6.5",
+        "pnpm": ">=7.1.0",
+        "yarn": ">=3.2.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-libvips-linux-x64": "1.0.1"
+      }
+    },
+    "node_modules/@img/sharp-linuxmusl-arm64": {
+      "version": "0.33.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.33.2.tgz",
+      "integrity": "sha512-F+0z8JCu/UnMzg8IYW1TMeiViIWBVg7IWP6nE0p5S5EPQxlLd76c8jYemG21X99UzFwgkRo5yz2DS+zbrnxZeA==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "musl": ">=1.2.2",
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
+        "npm": ">=9.6.5",
+        "pnpm": ">=7.1.0",
+        "yarn": ">=3.2.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-libvips-linuxmusl-arm64": "1.0.1"
+      }
+    },
+    "node_modules/@img/sharp-linuxmusl-x64": {
+      "version": "0.33.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.33.2.tgz",
+      "integrity": "sha512-+ZLE3SQmSL+Fn1gmSaM8uFusW5Y3J9VOf+wMGNnTtJUMUxFhv+P4UPaYEYT8tqnyYVaOVGgMN/zsOxn9pSsO2A==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "musl": ">=1.2.2",
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
+        "npm": ">=9.6.5",
+        "pnpm": ">=7.1.0",
+        "yarn": ">=3.2.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-libvips-linuxmusl-x64": "1.0.1"
+      }
+    },
+    "node_modules/@img/sharp-wasm32": {
+      "version": "0.33.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.33.2.tgz",
+      "integrity": "sha512-fLbTaESVKuQcpm8ffgBD7jLb/CQLcATju/jxtTXR1XCLwbOQt+OL5zPHSDMmp2JZIeq82e18yE0Vv7zh6+6BfQ==",
+      "cpu": [
+        "wasm32"
+      ],
+      "optional": true,
+      "dependencies": {
+        "@emnapi/runtime": "^0.45.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
+        "npm": ">=9.6.5",
+        "pnpm": ">=7.1.0",
+        "yarn": ">=3.2.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
+    "node_modules/@img/sharp-win32-ia32": {
+      "version": "0.33.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.33.2.tgz",
+      "integrity": "sha512-okBpql96hIGuZ4lN3+nsAjGeggxKm7hIRu9zyec0lnfB8E7Z6p95BuRZzDDXZOl2e8UmR4RhYt631i7mfmKU8g==",
+      "cpu": [
+        "ia32"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
+        "npm": ">=9.6.5",
+        "pnpm": ">=7.1.0",
+        "yarn": ">=3.2.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
+    "node_modules/@img/sharp-win32-x64": {
+      "version": "0.33.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.33.2.tgz",
+      "integrity": "sha512-E4magOks77DK47FwHUIGH0RYWSgRBfGdK56kIHSVeB9uIS4pPFr4N2kIVsXdQQo4LzOsENKV5KAhRlRL7eMAdg==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
+        "npm": ">=9.6.5",
+        "pnpm": ">=7.1.0",
+        "yarn": ">=3.2.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
+    "node_modules/@isaacs/cliui": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+      "dependencies": {
+        "string-width": "^5.1.2",
+        "string-width-cjs": "npm:string-width@^4.2.0",
+        "strip-ansi": "^7.0.1",
+        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+        "wrap-ansi": "^8.1.0",
+        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@istanbuljs/schema": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jest/schemas": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
+      "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
+      "dev": true,
+      "dependencies": {
+        "@sinclair/typebox": "^0.27.8"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
+      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
+      "dependencies": {
+        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/set-array": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.4.15",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.22",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.22.tgz",
+      "integrity": "sha512-Wf963MzWtA2sjrNt+g18IAln9lKnlRp+K2eH4jjIoF1wYeq3aMREpG09xhlhdzS0EjwU7qmUJYangWa+151vZw==",
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
+    },
+    "node_modules/@jspm/core": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@jspm/core/-/core-2.0.1.tgz",
+      "integrity": "sha512-Lg3PnLp0QXpxwLIAuuJboLeRaIhrgJjeuh797QADg3xz8wGLugQOS5DpsE8A6i6Adgzf+bacllkKZG3J0tGfDw==",
+      "dev": true
+    },
+    "node_modules/@mapbox/geojson-rewind": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/@mapbox/geojson-rewind/-/geojson-rewind-0.5.2.tgz",
+      "integrity": "sha512-tJaT+RbYGJYStt7wI3cq4Nl4SXxG8W7JDG5DMJu97V25RnbNg3QtQtf+KD+VLjNpWKYsRvXDNmNrBgEETr1ifA==",
+      "dependencies": {
+        "get-stream": "^6.0.1",
+        "minimist": "^1.2.6"
+      },
+      "bin": {
+        "geojson-rewind": "geojson-rewind"
+      }
+    },
+    "node_modules/@mapbox/jsonlint-lines-primitives": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz",
+      "integrity": "sha512-rY0o9A5ECsTQRVhv7tL/OyDpGAoUB4tTvLiW1DSzQGq4bvTPhNw1VpSNjDJc5GFZ2XuyOtSWSVN05qOtcD71qQ==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/@mapbox/mapbox-gl-supported": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-supported/-/mapbox-gl-supported-2.0.1.tgz",
       "integrity": "sha512-HP6XvfNIzfoMVfyGjBckjiAOQK9WfX0ywdLubuPMPv+Vqf5fj0uCbgBQYpiqcWZT6cbyyRnTSXDheT1ugvF6UQ=="
     },
     "node_modules/@mapbox/point-geometry": {
@@ -1867,13 +2308,13 @@
       }
     },
     "node_modules/@maplibre/maplibre-gl-style-spec": {
-      "version": "19.3.3",
-      "resolved": "https://registry.npmjs.org/@maplibre/maplibre-gl-style-spec/-/maplibre-gl-style-spec-19.3.3.tgz",
-      "integrity": "sha512-cOZZOVhDSulgK0meTsTkmNXb1ahVvmTmWmfx9gRBwc6hq98wS9JP35ESIoNq3xqEan+UN+gn8187Z6E4NKhLsw==",
+      "version": "20.1.1",
+      "resolved": "https://registry.npmjs.org/@maplibre/maplibre-gl-style-spec/-/maplibre-gl-style-spec-20.1.1.tgz",
+      "integrity": "sha512-z85ARNPCBI2Cs5cPOS3DSbraTN+ue8zrcYVoSWBuNrD/mA+2SKAJ+hIzI22uN7gac6jBMnCdpPKRxS/V0KSZVQ==",
       "dependencies": {
         "@mapbox/jsonlint-lines-primitives": "~2.0.2",
         "@mapbox/unitbezier": "^0.0.1",
-        "json-stringify-pretty-compact": "^3.0.0",
+        "json-stringify-pretty-compact": "^4.0.0",
         "minimist": "^1.2.8",
         "rw": "^1.3.3",
         "sort-object": "^3.0.3"
@@ -1885,9 +2326,9 @@
       }
     },
     "node_modules/@markdoc/markdoc": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/@markdoc/markdoc/-/markdoc-0.2.2.tgz",
-      "integrity": "sha512-0TiD9jmA5h5znN4lxo7HECAu3WieU5g5vUsfByeucrdR/x88hEilpt16EydFyJwJddQ/3w5HQgW7Ovy62r4cyw==",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@markdoc/markdoc/-/markdoc-0.4.0.tgz",
+      "integrity": "sha512-fSh4P3Y4E7oaKYc2oNzSIJVPDto7SMzAuQN1Iyx53UxzleA6QzRdNWRxmiPqtVDaDi5dELd2yICoG91csrGrAw==",
       "engines": {
         "node": ">=14.7.0"
       },
@@ -2164,12 +2605,12 @@
       }
     },
     "node_modules/@playwright/test": {
-      "version": "1.41.1",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.41.1.tgz",
-      "integrity": "sha512-9g8EWTjiQ9yFBXc6HjCWe41msLpxEX0KhmfmPl9RPLJdfzL4F0lg2BdJ91O9azFdl11y1pmpwdjBiSxvqc+btw==",
+      "version": "1.41.2",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.41.2.tgz",
+      "integrity": "sha512-qQB9h7KbibJzrDpkXkYvsmiDJK14FULCCZgEcoe2AvFAS64oCirWTwzTlAYEbKaRxWs5TFesE1Na6izMv3HfGg==",
       "dev": true,
       "dependencies": {
-        "playwright": "1.41.1"
+        "playwright": "1.41.2"
       },
       "bin": {
         "playwright": "cli.js"
@@ -4434,18 +4875,40 @@
         "react": "18.2.0"
       }
     },
-    "node_modules/@remix-run/css-bundle": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@remix-run/css-bundle/-/css-bundle-2.1.0.tgz",
-      "integrity": "sha512-HkLQzfJFbg0yLUPvczSsdOHuK1dfTYl+egOSsJ0WYY0PNSKxjlFAI4v1ZKyPrgllVdVeqUWVtmPCjwdcYdlxjw==",
+    "node_modules/@remix-run/cloudflare": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@remix-run/cloudflare/-/cloudflare-2.6.0.tgz",
+      "integrity": "sha512-wL6d9oaaSNherRQZI11q+qedqGDkQdu85BZYgeg6MLoMvyX2ogHe004ZIZAsAfk0LYET1YR0gY1jIGTfXaHYdg==",
+      "optional": true,
+      "dependencies": {
+        "@cloudflare/kv-asset-handler": "^0.1.3",
+        "@remix-run/server-runtime": "2.6.0"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "peerDependencies": {
+        "@cloudflare/workers-types": "^4.0.0",
+        "typescript": "^5.1.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@remix-run/css-bundle": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@remix-run/css-bundle/-/css-bundle-2.5.1.tgz",
+      "integrity": "sha512-QPeNvgD7fj4NmXB9CuGM5Mp0ZtM43dMeda8Ik3AUoQOMgMWb0d4jK4Cye6eoTGwJOron6XISKh0mq8MorucWEQ==",
       "engines": {
         "node": ">=18.0.0"
       }
     },
     "node_modules/@remix-run/dev": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@remix-run/dev/-/dev-2.1.0.tgz",
-      "integrity": "sha512-Hn5lw46F+a48dp5uHKe68ckaHgdStW4+PmLod+LMFEqrMbkF0j4XD1ousebxlv989o0Uy/OLgfRMgMy4cBOvHg==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@remix-run/dev/-/dev-2.5.1.tgz",
+      "integrity": "sha512-IrYhWANubH+WM62Wz55n8NWT5kBqfbyytXDFlP0VoZLrr1IpJf2GtaT4IA+CODMaNoeXeMACOD5Tw5/Y2bO5lA==",
       "dev": true,
       "dependencies": {
         "@babel/core": "^7.21.8",
@@ -4454,17 +4917,22 @@
         "@babel/plugin-syntax-decorators": "^7.22.10",
         "@babel/plugin-syntax-jsx": "^7.21.4",
         "@babel/preset-typescript": "^7.21.5",
-        "@babel/traverse": "^7.21.5",
+        "@babel/traverse": "^7.23.2",
+        "@babel/types": "^7.22.5",
         "@mdx-js/mdx": "^2.3.0",
         "@npmcli/package-json": "^4.0.1",
-        "@remix-run/server-runtime": "2.1.0",
+        "@remix-run/node": "2.5.1",
+        "@remix-run/router": "1.14.2",
+        "@remix-run/server-runtime": "2.5.1",
         "@types/mdx": "^2.0.5",
         "@vanilla-extract/integration": "^6.2.0",
         "arg": "^5.0.1",
         "cacache": "^17.1.3",
         "chalk": "^4.1.2",
         "chokidar": "^3.5.1",
+        "cross-spawn": "^7.0.3",
         "dotenv": "^16.0.0",
+        "es-module-lexer": "^1.3.1",
         "esbuild": "0.17.6",
         "esbuild-plugins-node-modules-polyfill": "^1.6.0",
         "execa": "5.1.1",
@@ -4478,7 +4946,6 @@
         "lodash": "^4.17.21",
         "lodash.debounce": "^4.0.8",
         "minimatch": "^9.0.0",
-        "node-fetch": "^2.6.9",
         "ora": "^5.4.1",
         "picocolors": "^1.0.0",
         "picomatch": "^2.3.1",
@@ -4493,6 +4960,7 @@
         "remark-frontmatter": "4.0.1",
         "remark-mdx-frontmatter": "^1.0.1",
         "semver": "^7.3.7",
+        "set-cookie-parser": "^2.6.0",
         "tar-fs": "^2.1.1",
         "tsconfig-paths": "^4.0.0",
         "ws": "^7.4.5"
@@ -4504,13 +4972,51 @@
         "node": ">=18.0.0"
       },
       "peerDependencies": {
-        "@remix-run/serve": "^2.1.0",
-        "typescript": "^5.1.0"
+        "@remix-run/serve": "^2.5.1",
+        "typescript": "^5.1.0",
+        "vite": "^5.0.0"
       },
       "peerDependenciesMeta": {
         "@remix-run/serve": {
           "optional": true
         },
+        "typescript": {
+          "optional": true
+        },
+        "vite": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@remix-run/dev/node_modules/@remix-run/router": {
+      "version": "1.14.2",
+      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.14.2.tgz",
+      "integrity": "sha512-ACXpdMM9hmKZww21yEqWwiLws/UPLhNKvimN8RrYSqPSvB3ov7sLvAcfvaxePeLvccTQKGdkDIhLYApZVDFuKg==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@remix-run/dev/node_modules/@remix-run/server-runtime": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@remix-run/server-runtime/-/server-runtime-2.5.1.tgz",
+      "integrity": "sha512-bP31jrVbYTJ2eP5sxZfDgT1YyXzDlzsfMxGYVzpaoLCYDJAekq1QpHLLXKGOXhmyb46O9rdhlQKfwD6WpAxr3A==",
+      "dev": true,
+      "dependencies": {
+        "@remix-run/router": "1.14.2",
+        "@types/cookie": "^0.6.0",
+        "@web3-storage/multipart-parser": "^1.0.0",
+        "cookie": "^0.6.0",
+        "set-cookie-parser": "^2.4.8",
+        "source-map": "^0.7.3"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "peerDependencies": {
+        "typescript": "^5.1.0"
+      },
+      "peerDependenciesMeta": {
         "typescript": {
           "optional": true
         }
@@ -4532,9 +5038,9 @@
       }
     },
     "node_modules/@remix-run/eslint-config": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@remix-run/eslint-config/-/eslint-config-2.1.0.tgz",
-      "integrity": "sha512-yfeUnHpUG+XveujMi6QODKMGhs5CvKWCKzASU397BPXiPWbMv6r2acfODSWK64ZdBMu9hcLbOb42GBFydVQeHA==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@remix-run/eslint-config/-/eslint-config-2.5.1.tgz",
+      "integrity": "sha512-PpLj0QSd2NZ12KdTA2QYPd/FK3Szu9Np7kTmx26VxDZJTzQYSgGb5i2O9uby+j2sD68zR/+EAYaIcOlq66ekJw==",
       "dev": true,
       "dependencies": {
         "@babel/core": "^7.21.8",
@@ -4569,11 +5075,11 @@
       }
     },
     "node_modules/@remix-run/express": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@remix-run/express/-/express-2.1.0.tgz",
-      "integrity": "sha512-R5myPowQx6LYWY3+EqP42q19MOCT3+ZGwb2f0UKNs9a34R8U3nFpGWL7saXryC+To+EasujEScc8rTQw5Pftog==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@remix-run/express/-/express-2.5.1.tgz",
+      "integrity": "sha512-ISaf2hzHxDTS1hNsOovRoSfIQC29m4ogzXvBC6xp2BuJj0K8R0yQ4RFD4+qUFEUnS2n6MyWyjFQRhOC6PhQhRw==",
       "dependencies": {
-        "@remix-run/node": "2.1.0"
+        "@remix-run/node": "2.5.1"
       },
       "engines": {
         "node": ">=18.0.0"
@@ -4589,12 +5095,12 @@
       }
     },
     "node_modules/@remix-run/node": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@remix-run/node/-/node-2.1.0.tgz",
-      "integrity": "sha512-TeSgjXnZUUlmw5FVpBVnXY7MLpracjdnwFNwoJE5NQkiUEFnGD/Yhvk4F2fOCkszqc2Z25KRclc5noweyiFu6Q==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@remix-run/node/-/node-2.5.1.tgz",
+      "integrity": "sha512-UI442xzHAiokmsfrYOabMQB024+IizmRhZBGcNa42QjJWsNqogy1bNwYhzEpB6oQEB1wF3vwOKK1AD1/iYA/9A==",
       "dependencies": {
-        "@remix-run/server-runtime": "2.1.0",
-        "@remix-run/web-fetch": "^4.4.1",
+        "@remix-run/server-runtime": "2.5.1",
+        "@remix-run/web-fetch": "^4.4.2",
         "@remix-run/web-file": "^3.1.0",
         "@remix-run/web-stream": "^1.1.0",
         "@web3-storage/multipart-parser": "^1.0.0",
@@ -4614,14 +5120,47 @@
         }
       }
     },
+    "node_modules/@remix-run/node/node_modules/@remix-run/router": {
+      "version": "1.14.2",
+      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.14.2.tgz",
+      "integrity": "sha512-ACXpdMM9hmKZww21yEqWwiLws/UPLhNKvimN8RrYSqPSvB3ov7sLvAcfvaxePeLvccTQKGdkDIhLYApZVDFuKg==",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@remix-run/node/node_modules/@remix-run/server-runtime": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@remix-run/server-runtime/-/server-runtime-2.5.1.tgz",
+      "integrity": "sha512-bP31jrVbYTJ2eP5sxZfDgT1YyXzDlzsfMxGYVzpaoLCYDJAekq1QpHLLXKGOXhmyb46O9rdhlQKfwD6WpAxr3A==",
+      "dependencies": {
+        "@remix-run/router": "1.14.2",
+        "@types/cookie": "^0.6.0",
+        "@web3-storage/multipart-parser": "^1.0.0",
+        "cookie": "^0.6.0",
+        "set-cookie-parser": "^2.4.8",
+        "source-map": "^0.7.3"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "peerDependencies": {
+        "typescript": "^5.1.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@remix-run/react": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@remix-run/react/-/react-2.1.0.tgz",
-      "integrity": "sha512-DeYgfsvNxHqNn29sGA3XsZCciMKo2EFTQ9hHkuVPTsJXC4ipHr6Dja1j6UzZYPe/ZuKppiuTjueWCQlE2jOe1w==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@remix-run/react/-/react-2.5.1.tgz",
+      "integrity": "sha512-MNXHLj4Iu9Iyi+3uY61JZJ1Rtx2nM/z11j9AtwQdEADkh1/t9GruhtT/8VLplToOl0qWZKItboWScKf6uRQsrw==",
       "dependencies": {
-        "@remix-run/router": "1.10.0",
-        "@remix-run/server-runtime": "2.1.0",
-        "react-router-dom": "6.17.0"
+        "@remix-run/router": "1.14.2",
+        "@remix-run/server-runtime": "2.5.1",
+        "react-router": "6.21.3",
+        "react-router-dom": "6.21.3"
       },
       "engines": {
         "node": ">=18.0.0"
@@ -4637,21 +5176,53 @@
         }
       }
     },
+    "node_modules/@remix-run/react/node_modules/@remix-run/router": {
+      "version": "1.14.2",
+      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.14.2.tgz",
+      "integrity": "sha512-ACXpdMM9hmKZww21yEqWwiLws/UPLhNKvimN8RrYSqPSvB3ov7sLvAcfvaxePeLvccTQKGdkDIhLYApZVDFuKg==",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@remix-run/react/node_modules/@remix-run/server-runtime": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@remix-run/server-runtime/-/server-runtime-2.5.1.tgz",
+      "integrity": "sha512-bP31jrVbYTJ2eP5sxZfDgT1YyXzDlzsfMxGYVzpaoLCYDJAekq1QpHLLXKGOXhmyb46O9rdhlQKfwD6WpAxr3A==",
+      "dependencies": {
+        "@remix-run/router": "1.14.2",
+        "@types/cookie": "^0.6.0",
+        "@web3-storage/multipart-parser": "^1.0.0",
+        "cookie": "^0.6.0",
+        "set-cookie-parser": "^2.4.8",
+        "source-map": "^0.7.3"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "peerDependencies": {
+        "typescript": "^5.1.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@remix-run/router": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.10.0.tgz",
-      "integrity": "sha512-Lm+fYpMfZoEucJ7cMxgt4dYt8jLfbpwRCzAjm9UgSLOkmlqo9gupxt6YX3DY0Fk155NT9l17d/ydi+964uS9Lw==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.15.0.tgz",
+      "integrity": "sha512-HOil5aFtme37dVQTB6M34G95kPM3MMuqSmIRVCC52eKV+Y/tGSqw9P3rWhlAx6A+mz+MoX+XxsGsNJbaI5qCgQ==",
       "engines": {
         "node": ">=14.0.0"
       }
     },
     "node_modules/@remix-run/serve": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@remix-run/serve/-/serve-2.1.0.tgz",
-      "integrity": "sha512-XHI+vPYz217qrg1QcV38TTPlEBTzMJzAt0SImPutyF0S2IBrZGZIFMEsspI0i0wNvdcdQz1IqmSx+mTghzW8eQ==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@remix-run/serve/-/serve-2.5.1.tgz",
+      "integrity": "sha512-r1IWfirwkLrxADd8uFUIpLR1wMU8VeRI4ED4SpbhrKwqODLrYtv5irzjei+r/w0y0Oob8DMHnYxg03UY4T7ejg==",
       "dependencies": {
-        "@remix-run/express": "2.1.0",
-        "@remix-run/node": "2.1.0",
+        "@remix-run/express": "2.5.1",
+        "@remix-run/node": "2.5.1",
         "chokidar": "^3.5.3",
         "compression": "^1.7.4",
         "express": "^4.17.1",
@@ -4667,14 +5238,14 @@
       }
     },
     "node_modules/@remix-run/server-runtime": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@remix-run/server-runtime/-/server-runtime-2.1.0.tgz",
-      "integrity": "sha512-Uz69yF4Gu6F3VYQub3JgDo9godN8eDMeZclkadBTAWN7bYLonu0ChR/GlFxS35OLeF7BDgudxOSZob0nE1WHNg==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@remix-run/server-runtime/-/server-runtime-2.6.0.tgz",
+      "integrity": "sha512-qFXDl4pK55njBLuvyRn5AkI/hu8fEU3t1XFKv0Syivx0nmUVpWMW25Uzi1pkX/chF1VIxCVrZ8KuQ1rcrKj+DQ==",
       "dependencies": {
-        "@remix-run/router": "1.10.0",
-        "@types/cookie": "^0.4.1",
+        "@remix-run/router": "1.15.0",
+        "@types/cookie": "^0.6.0",
         "@web3-storage/multipart-parser": "^1.0.0",
-        "cookie": "^0.4.1",
+        "cookie": "^0.6.0",
         "set-cookie-parser": "^2.4.8",
         "source-map": "^0.7.3"
       },
@@ -4690,14 +5261,6 @@
         }
       }
     },
-    "node_modules/@remix-run/server-runtime/node_modules/cookie": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
-      "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
     "node_modules/@remix-run/v1-route-convention": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/@remix-run/v1-route-convention/-/v1-route-convention-0.1.4.tgz",
@@ -4777,9 +5340,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.9.6",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.9.6.tgz",
-      "integrity": "sha512-MVNXSSYN6QXOulbHpLMKYi60ppyO13W9my1qogeiAqtjb2yR4LSmfU2+POvDkLzhjYLXz9Rf9+9a3zFHW1Lecg==",
+      "version": "4.11.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.11.0.tgz",
+      "integrity": "sha512-BV+u2QSfK3i1o6FucqJh5IK9cjAU6icjFFhvknzFgu472jzl0bBojfDAkJLBEsHFMo+YZg6rthBvBBt8z12IBQ==",
       "cpu": [
         "arm"
       ],
@@ -4790,9 +5353,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.9.6",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.9.6.tgz",
-      "integrity": "sha512-T14aNLpqJ5wzKNf5jEDpv5zgyIqcpn1MlwCrUXLrwoADr2RkWA0vOWP4XxbO9aiO3dvMCQICZdKeDrFl7UMClw==",
+      "version": "4.11.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.11.0.tgz",
+      "integrity": "sha512-0ij3iw7sT5jbcdXofWO2NqDNjSVVsf6itcAkV2I6Xsq4+6wjW1A8rViVB67TfBEan7PV2kbLzT8rhOVWLI2YXw==",
       "cpu": [
         "arm64"
       ],
@@ -4803,9 +5366,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.9.6",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.9.6.tgz",
-      "integrity": "sha512-CqNNAyhRkTbo8VVZ5R85X73H3R5NX9ONnKbXuHisGWC0qRbTTxnF1U4V9NafzJbgGM0sHZpdO83pLPzq8uOZFw==",
+      "version": "4.11.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.11.0.tgz",
+      "integrity": "sha512-yPLs6RbbBMupArf6qv1UDk6dzZvlH66z6NLYEwqTU0VHtss1wkI4UYeeMS7TVj5QRVvaNAWYKP0TD/MOeZ76Zg==",
       "cpu": [
         "arm64"
       ],
@@ -4816,9 +5379,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.9.6",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.9.6.tgz",
-      "integrity": "sha512-zRDtdJuRvA1dc9Mp6BWYqAsU5oeLixdfUvkTHuiYOHwqYuQ4YgSmi6+/lPvSsqc/I0Omw3DdICx4Tfacdzmhog==",
+      "version": "4.11.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.11.0.tgz",
+      "integrity": "sha512-OvqIgwaGAwnASzXaZEeoJY3RltOFg+WUbdkdfoluh2iqatd090UeOG3A/h0wNZmE93dDew9tAtXgm3/+U/B6bw==",
       "cpu": [
         "x64"
       ],
@@ -4829,9 +5392,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.9.6",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.9.6.tgz",
-      "integrity": "sha512-oNk8YXDDnNyG4qlNb6is1ojTOGL/tRhbbKeE/YuccItzerEZT68Z9gHrY3ROh7axDc974+zYAPxK5SH0j/G+QQ==",
+      "version": "4.11.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.11.0.tgz",
+      "integrity": "sha512-X17s4hZK3QbRmdAuLd2EE+qwwxL8JxyVupEqAkxKPa/IgX49ZO+vf0ka69gIKsaYeo6c1CuwY3k8trfDtZ9dFg==",
       "cpu": [
         "arm"
       ],
@@ -4842,9 +5405,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.9.6",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.9.6.tgz",
-      "integrity": "sha512-Z3O60yxPtuCYobrtzjo0wlmvDdx2qZfeAWTyfOjEDqd08kthDKexLpV97KfAeUXPosENKd8uyJMRDfFMxcYkDQ==",
+      "version": "4.11.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.11.0.tgz",
+      "integrity": "sha512-673Lu9EJwxVB9NfYeA4AdNu0FOHz7g9t6N1DmT7bZPn1u6bTF+oZjj+fuxUcrfxWXE0r2jxl5QYMa9cUOj9NFg==",
       "cpu": [
         "arm64"
       ],
@@ -4855,9 +5418,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.9.6",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.9.6.tgz",
-      "integrity": "sha512-gpiG0qQJNdYEVad+1iAsGAbgAnZ8j07FapmnIAQgODKcOTjLEWM9sRb+MbQyVsYCnA0Im6M6QIq6ax7liws6eQ==",
+      "version": "4.11.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.11.0.tgz",
+      "integrity": "sha512-yFW2msTAQNpPJaMmh2NpRalr1KXI7ZUjlN6dY/FhWlOclMrZezm5GIhy3cP4Ts2rIAC+IPLAjNibjp1BsxCVGg==",
       "cpu": [
         "arm64"
       ],
@@ -4868,9 +5431,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.9.6",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.9.6.tgz",
-      "integrity": "sha512-+uCOcvVmFUYvVDr27aiyun9WgZk0tXe7ThuzoUTAukZJOwS5MrGbmSlNOhx1j80GdpqbOty05XqSl5w4dQvcOA==",
+      "version": "4.11.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.11.0.tgz",
+      "integrity": "sha512-kKT9XIuhbvYgiA3cPAGntvrBgzhWkGpBMzuk1V12Xuoqg7CI41chye4HU0vLJnGf9MiZzfNh4I7StPeOzOWJfA==",
       "cpu": [
         "riscv64"
       ],
@@ -4881,9 +5444,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.9.6",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.9.6.tgz",
-      "integrity": "sha512-HUNqM32dGzfBKuaDUBqFB7tP6VMN74eLZ33Q9Y1TBqRDn+qDonkAUyKWwF9BR9unV7QUzffLnz9GrnKvMqC/fw==",
+      "version": "4.11.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.11.0.tgz",
+      "integrity": "sha512-6q4ESWlyTO+erp1PSCmASac+ixaDv11dBk1fqyIuvIUc/CmRAX2Zk+2qK1FGo5q7kyDcjHCFVwgGFCGIZGVwCA==",
       "cpu": [
         "x64"
       ],
@@ -4894,9 +5457,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.9.6",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.9.6.tgz",
-      "integrity": "sha512-ch7M+9Tr5R4FK40FHQk8VnML0Szi2KRujUgHXd/HjuH9ifH72GUmw6lStZBo3c3GB82vHa0ZoUfjfcM7JiiMrQ==",
+      "version": "4.11.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.11.0.tgz",
+      "integrity": "sha512-vIAQUmXeMLmaDN78HSE4Kh6xqof2e3TJUKr+LPqXWU4NYNON0MDN9h2+t4KHrPAQNmU3w1GxBQ/n01PaWFwa5w==",
       "cpu": [
         "x64"
       ],
@@ -4907,9 +5470,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.9.6",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.9.6.tgz",
-      "integrity": "sha512-VD6qnR99dhmTQ1mJhIzXsRcTBvTjbfbGGwKAHcu+52cVl15AC/kplkhxzW/uT0Xl62Y/meBKDZvoJSJN+vTeGA==",
+      "version": "4.11.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.11.0.tgz",
+      "integrity": "sha512-LVXo9dDTGPr0nezMdqa1hK4JeoMZ02nstUxGYY/sMIDtTYlli1ZxTXBYAz3vzuuvKO4X6NBETciIh7N9+abT1g==",
       "cpu": [
         "arm64"
       ],
@@ -4920,9 +5483,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.9.6",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.9.6.tgz",
-      "integrity": "sha512-J9AFDq/xiRI58eR2NIDfyVmTYGyIZmRcvcAoJ48oDld/NTR8wyiPUu2X/v1navJ+N/FGg68LEbX3Ejd6l8B7MQ==",
+      "version": "4.11.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.11.0.tgz",
+      "integrity": "sha512-xZVt6K70Gr3I7nUhug2dN6VRR1ibot3rXqXS3wo+8JP64t7djc3lBFyqO4GiVrhNaAIhUCJtwQ/20dr0h0thmQ==",
       "cpu": [
         "ia32"
       ],
@@ -4933,9 +5496,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.9.6",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.9.6.tgz",
-      "integrity": "sha512-jqzNLhNDvIZOrt69Ce4UjGRpXJBzhUBzawMwnaDAwyHriki3XollsewxWzOzz+4yOFDkuJHtTsZFwMxhYJWmLQ==",
+      "version": "4.11.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.11.0.tgz",
+      "integrity": "sha512-f3I7h9oTg79UitEco9/2bzwdciYkWr8pITs3meSDSlr1TdvQ7IxkQaaYN2YqZXX5uZhiYL+VuYDmHwNzhx+HOg==",
       "cpu": [
         "x64"
       ],
@@ -4964,66 +5527,66 @@
       }
     },
     "node_modules/@sentry-internal/feedback": {
-      "version": "7.99.0",
-      "resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-7.99.0.tgz",
-      "integrity": "sha512-exIO1o+bE0MW4z30FxC0cYzJ4ZHSMlDPMHCBDPzU+MWGQc/fb8s58QUrx5Dnm6HTh9G3H+YlroCxIo9u0GSwGQ==",
+      "version": "7.101.0",
+      "resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-7.101.0.tgz",
+      "integrity": "sha512-uQBMYhZp/qkBEA/GXRMm1OfSkRkZojxBrCrFmzkWhJzXT+YbL57/M1uCcwkKmorKlg393Soh7MLULInwmcwWkA==",
       "dependencies": {
-        "@sentry/core": "7.99.0",
-        "@sentry/types": "7.99.0",
-        "@sentry/utils": "7.99.0"
+        "@sentry/core": "7.101.0",
+        "@sentry/types": "7.101.0",
+        "@sentry/utils": "7.101.0"
       },
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/@sentry-internal/replay-canvas": {
-      "version": "7.99.0",
-      "resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-7.99.0.tgz",
-      "integrity": "sha512-PoIkfusToDq0snfl2M6HJx/1KJYtXxYhQplrn11kYadO04SdG0XGXf4h7wBTMEQ7LDEAtQyvsOu4nEQtTO3YjQ==",
+      "version": "7.101.0",
+      "resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-7.101.0.tgz",
+      "integrity": "sha512-fiz4kPpz/j6ZaD+vOcUXuO1HqD49djs4QwyTsRwCCi77EKZOGAaijpqWckDWyZs0dOOnbGGGC5x3o+CfTJcjKA==",
       "dependencies": {
-        "@sentry/core": "7.99.0",
-        "@sentry/replay": "7.99.0",
-        "@sentry/types": "7.99.0",
-        "@sentry/utils": "7.99.0"
+        "@sentry/core": "7.101.0",
+        "@sentry/replay": "7.101.0",
+        "@sentry/types": "7.101.0",
+        "@sentry/utils": "7.101.0"
       },
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/@sentry-internal/tracing": {
-      "version": "7.99.0",
-      "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.99.0.tgz",
-      "integrity": "sha512-z3JQhHjoM1KdM20qrHwRClKJrNLr2CcKtCluq7xevLtXHJWNAQQbafnWD+Aoj85EWXBzKt9yJMv2ltcXJ+at+w==",
+      "version": "7.101.0",
+      "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.101.0.tgz",
+      "integrity": "sha512-rp9oOLQs6vMuzvAnAHRRCNu5Z0o/ZVRI3WPYedxpdMWKD1Z3G9o+0joP+ZIUqHsamWWYiIgPqXgL9AK6AWjFRg==",
       "dependencies": {
-        "@sentry/core": "7.99.0",
-        "@sentry/types": "7.99.0",
-        "@sentry/utils": "7.99.0"
+        "@sentry/core": "7.101.0",
+        "@sentry/types": "7.101.0",
+        "@sentry/utils": "7.101.0"
       },
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@sentry/browser": {
-      "version": "7.99.0",
-      "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-7.99.0.tgz",
-      "integrity": "sha512-bgfoUv3wkwwLgN5YUOe0ibB3y268ZCnamZh6nLFqnY/UBKC1+FXWFdvzVON/XKUm62LF8wlpCybOf08ebNj2yg==",
+      "version": "7.101.0",
+      "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-7.101.0.tgz",
+      "integrity": "sha512-wj9YLfS/caR20Yq0hdEjsZHuhnYLU7Ht0SlcJx5MNMnArtmW1k2CWZz3PCqcW/rTZe53npVTe6eMqMccB4aPrQ==",
       "dependencies": {
-        "@sentry-internal/feedback": "7.99.0",
-        "@sentry-internal/replay-canvas": "7.99.0",
-        "@sentry-internal/tracing": "7.99.0",
-        "@sentry/core": "7.99.0",
-        "@sentry/replay": "7.99.0",
-        "@sentry/types": "7.99.0",
-        "@sentry/utils": "7.99.0"
+        "@sentry-internal/feedback": "7.101.0",
+        "@sentry-internal/replay-canvas": "7.101.0",
+        "@sentry-internal/tracing": "7.101.0",
+        "@sentry/core": "7.101.0",
+        "@sentry/replay": "7.101.0",
+        "@sentry/types": "7.101.0",
+        "@sentry/utils": "7.101.0"
       },
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@sentry/cli": {
-      "version": "2.27.0",
-      "resolved": "https://registry.npmjs.org/@sentry/cli/-/cli-2.27.0.tgz",
-      "integrity": "sha512-pc0opd71W8lGhYvmB1keQtJkarxzCS9f9ErKYv6TfXOOX6drvwkyA6vD/6xEnpzyvqGAuGRU4T4sEeLD3irwUQ==",
+      "version": "2.28.6",
+      "resolved": "https://registry.npmjs.org/@sentry/cli/-/cli-2.28.6.tgz",
+      "integrity": "sha512-o2Ngz7xXuhwHxMi+4BFgZ4qjkX0tdZeOSIZkFAGnTbRhQe5T8bxq6CcQRLdPhqMgqvDn7XuJ3YlFtD3ZjHvD7g==",
       "hasInstallScript": true,
       "dependencies": {
         "https-proxy-agent": "^5.0.0",
@@ -5039,19 +5602,19 @@
         "node": ">= 10"
       },
       "optionalDependencies": {
-        "@sentry/cli-darwin": "2.27.0",
-        "@sentry/cli-linux-arm": "2.27.0",
-        "@sentry/cli-linux-arm64": "2.27.0",
-        "@sentry/cli-linux-i686": "2.27.0",
-        "@sentry/cli-linux-x64": "2.27.0",
-        "@sentry/cli-win32-i686": "2.27.0",
-        "@sentry/cli-win32-x64": "2.27.0"
+        "@sentry/cli-darwin": "2.28.6",
+        "@sentry/cli-linux-arm": "2.28.6",
+        "@sentry/cli-linux-arm64": "2.28.6",
+        "@sentry/cli-linux-i686": "2.28.6",
+        "@sentry/cli-linux-x64": "2.28.6",
+        "@sentry/cli-win32-i686": "2.28.6",
+        "@sentry/cli-win32-x64": "2.28.6"
       }
     },
     "node_modules/@sentry/cli-darwin": {
-      "version": "2.27.0",
-      "resolved": "https://registry.npmjs.org/@sentry/cli-darwin/-/cli-darwin-2.27.0.tgz",
-      "integrity": "sha512-/DOZlN5rK19g7YP2OaVNauQhUrRfJ88RDr6qURFiqdxYHDc3isPFGHZJmeZBTwOnDDepyZb4XLaOyfwvAOxHig==",
+      "version": "2.28.6",
+      "resolved": "https://registry.npmjs.org/@sentry/cli-darwin/-/cli-darwin-2.28.6.tgz",
+      "integrity": "sha512-KRf0VvTltHQ5gA7CdbUkaIp222LAk/f1+KqpDzO6nB/jC/tL4sfiy6YyM4uiH6IbVEudB8WpHCECiatmyAqMBA==",
       "optional": true,
       "os": [
         "darwin"
@@ -5061,9 +5624,9 @@
       }
     },
     "node_modules/@sentry/cli-linux-arm": {
-      "version": "2.27.0",
-      "resolved": "https://registry.npmjs.org/@sentry/cli-linux-arm/-/cli-linux-arm-2.27.0.tgz",
-      "integrity": "sha512-JmMQ9zgFhkZUEN5WIYuJisu4Jif/ThRHDjbsbXBRbUkkgRn88hgUfg299djMvlZZxjpl3K9AEua+1TIUeQd0Sg==",
+      "version": "2.28.6",
+      "resolved": "https://registry.npmjs.org/@sentry/cli-linux-arm/-/cli-linux-arm-2.28.6.tgz",
+      "integrity": "sha512-ANG7U47yEHD1g3JrfhpT4/MclEvmDZhctWgSP5gVw5X4AlcI87E6dTqccnLgvZjiIAQTaJJAZuSHVVF3Jk403w==",
       "cpu": [
         "arm"
       ],
@@ -5077,9 +5640,9 @@
       }
     },
     "node_modules/@sentry/cli-linux-arm64": {
-      "version": "2.27.0",
-      "resolved": "https://registry.npmjs.org/@sentry/cli-linux-arm64/-/cli-linux-arm64-2.27.0.tgz",
-      "integrity": "sha512-f+zuB9XGfB8pNamNgSDhqsavuLuzi6saZxbr3uQf30bA5AESI5hspOd1zPcidOORCVZxiPzQe3+T7avBI1XLuw==",
+      "version": "2.28.6",
+      "resolved": "https://registry.npmjs.org/@sentry/cli-linux-arm64/-/cli-linux-arm64-2.28.6.tgz",
+      "integrity": "sha512-caMDt37FI752n4/3pVltDjlrRlPFCOxK4PHvoZGQ3KFMsai0ZhE/0CLBUMQqfZf0M0r8KB2x7wqLm7xSELjefQ==",
       "cpu": [
         "arm64"
       ],
@@ -5093,9 +5656,9 @@
       }
     },
     "node_modules/@sentry/cli-linux-i686": {
-      "version": "2.27.0",
-      "resolved": "https://registry.npmjs.org/@sentry/cli-linux-i686/-/cli-linux-i686-2.27.0.tgz",
-      "integrity": "sha512-/4eyz7jnYp20mZqNtpvCEBkxFW0nEjEZRo2BiASQ5/7K8CmoJRe1vhpDA0WOfzi1zTFIfpdE1/RZm2CjHS6DHQ==",
+      "version": "2.28.6",
+      "resolved": "https://registry.npmjs.org/@sentry/cli-linux-i686/-/cli-linux-i686-2.28.6.tgz",
+      "integrity": "sha512-Tj1+GMc6lFsDRquOqaGKXFpW9QbmNK4TSfynkWKiJxdTEn5jSMlXXfr0r9OQrxu3dCCqEHkhEyU63NYVpgxIPw==",
       "cpu": [
         "x86",
         "ia32"
@@ -5110,9 +5673,9 @@
       }
     },
     "node_modules/@sentry/cli-linux-x64": {
-      "version": "2.27.0",
-      "resolved": "https://registry.npmjs.org/@sentry/cli-linux-x64/-/cli-linux-x64-2.27.0.tgz",
-      "integrity": "sha512-ptu7wXecnYssihzHlxEOaqbFHWmNEfbepBKGXTdWK2kC+D51+7yHsR9xRdThwVID1bisFgjAveKmBQjmKuXjHQ==",
+      "version": "2.28.6",
+      "resolved": "https://registry.npmjs.org/@sentry/cli-linux-x64/-/cli-linux-x64-2.28.6.tgz",
+      "integrity": "sha512-Dt/Xz784w/z3tEObfyJEMmRIzn0D5qoK53H9kZ6e0yNvJOSKNCSOq5cQk4n1/qeG0K/6SU9dirmvHwFUiVNyYg==",
       "cpu": [
         "x64"
       ],
@@ -5126,9 +5689,9 @@
       }
     },
     "node_modules/@sentry/cli-win32-i686": {
-      "version": "2.27.0",
-      "resolved": "https://registry.npmjs.org/@sentry/cli-win32-i686/-/cli-win32-i686-2.27.0.tgz",
-      "integrity": "sha512-Db4/xmdE5qV4Aq7Yc8vRw22Y46JJdGMdsMsl5jIf0GVSQPgO23O/2uTiDGpPOdeq91K9EtvpH1zQfDLIfLMaXw==",
+      "version": "2.28.6",
+      "resolved": "https://registry.npmjs.org/@sentry/cli-win32-i686/-/cli-win32-i686-2.28.6.tgz",
+      "integrity": "sha512-zkpWtvY3kt+ogVaAbfFr2MEkgMMHJNJUnNMO8Ixce9gh38sybIkDkZNFnVPBXMClJV0APa4QH0EwumYBFZUMuQ==",
       "cpu": [
         "x86",
         "ia32"
@@ -5142,9 +5705,9 @@
       }
     },
     "node_modules/@sentry/cli-win32-x64": {
-      "version": "2.27.0",
-      "resolved": "https://registry.npmjs.org/@sentry/cli-win32-x64/-/cli-win32-x64-2.27.0.tgz",
-      "integrity": "sha512-q7y/BH4iGfs0TD5PXh2Q8oqnTbOIufoT1NWJcKqvZcOiqCLK3PNUiq7xUeX1PMTrFYAh3Bm6EekOnMavqvbGmg==",
+      "version": "2.28.6",
+      "resolved": "https://registry.npmjs.org/@sentry/cli-win32-x64/-/cli-win32-x64-2.28.6.tgz",
+      "integrity": "sha512-TG2YzZ9JMeNFzbicdr5fbtsusVGACbrEfHmPgzWGDeLUP90mZxiMTjkXsE1X/5jQEQjB2+fyfXloba/Ugo51hA==",
       "cpu": [
         "x64"
       ],
@@ -5171,40 +5734,40 @@
       }
     },
     "node_modules/@sentry/core": {
-      "version": "7.99.0",
-      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.99.0.tgz",
-      "integrity": "sha512-vOAtzcAXEUtS/oW7wi3wMkZ3hsb5Ch96gKyrrj/mXdOp2zrcwdNV6N9/pawq2E9P/7Pw8AXw4CeDZztZrjQLuA==",
+      "version": "7.101.0",
+      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.101.0.tgz",
+      "integrity": "sha512-dRNrNV5OLGARkOGgxJsVDhA98Pev5G1LVJcud5E83cRg49BCUx2riqEtDP6iIS1nvem6cApkSnLC1kvl/T5/Cw==",
       "dependencies": {
-        "@sentry/types": "7.99.0",
-        "@sentry/utils": "7.99.0"
+        "@sentry/types": "7.101.0",
+        "@sentry/utils": "7.101.0"
       },
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@sentry/node": {
-      "version": "7.99.0",
-      "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.99.0.tgz",
-      "integrity": "sha512-34wYtLddnPcQ8qvKq62AfxowaMFw+GMUZGv7fIs9FxeBqqqn6Ckl0gFCTADudIIBQ3rSbmN7sHJIXdyiQv+pcw==",
+      "version": "7.101.0",
+      "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.101.0.tgz",
+      "integrity": "sha512-4z01VAFjRYk7XcajbWPJlhkPN6PBG4nVX8n1dl+OH2OeqTxFxcnmY5zR5v+AtEbNJgg5PMwy8mnnGZRG/wLZgA==",
       "dependencies": {
-        "@sentry-internal/tracing": "7.99.0",
-        "@sentry/core": "7.99.0",
-        "@sentry/types": "7.99.0",
-        "@sentry/utils": "7.99.0"
+        "@sentry-internal/tracing": "7.101.0",
+        "@sentry/core": "7.101.0",
+        "@sentry/types": "7.101.0",
+        "@sentry/utils": "7.101.0"
       },
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@sentry/react": {
-      "version": "7.99.0",
-      "resolved": "https://registry.npmjs.org/@sentry/react/-/react-7.99.0.tgz",
-      "integrity": "sha512-RtHwgzMHJhzJfSQpVG0SDPQYMTGDX3Q37/YWI59S4ALMbSW4/F6n/eQAvGVYZKbh2UCSqgFuRWaXOYkSZT17wA==",
-      "dependencies": {
-        "@sentry/browser": "7.99.0",
-        "@sentry/core": "7.99.0",
-        "@sentry/types": "7.99.0",
-        "@sentry/utils": "7.99.0",
+      "version": "7.101.0",
+      "resolved": "https://registry.npmjs.org/@sentry/react/-/react-7.101.0.tgz",
+      "integrity": "sha512-EjzkuUzLhE1glUsLPcLhmc8Wg7D5qfKQ08Vbcw+GsE7aLnhWrPTHexkf2NPNeTkgUxbWToJn6PWCodICo5YYbw==",
+      "dependencies": {
+        "@sentry/browser": "7.101.0",
+        "@sentry/core": "7.101.0",
+        "@sentry/types": "7.101.0",
+        "@sentry/utils": "7.101.0",
         "hoist-non-react-statics": "^3.3.2"
       },
       "engines": {
@@ -5215,16 +5778,16 @@
       }
     },
     "node_modules/@sentry/remix": {
-      "version": "7.99.0",
-      "resolved": "https://registry.npmjs.org/@sentry/remix/-/remix-7.99.0.tgz",
-      "integrity": "sha512-at3FtMacLyvzGB6Z0ljwGGGPGV2NU2L5Jqpv83eVXHtVZHGfbTw6vxSYj+T3t53hw4T6454SSkfY8HrUxBH6MQ==",
-      "dependencies": {
-        "@sentry/cli": "^2.23.0",
-        "@sentry/core": "7.99.0",
-        "@sentry/node": "7.99.0",
-        "@sentry/react": "7.99.0",
-        "@sentry/types": "7.99.0",
-        "@sentry/utils": "7.99.0",
+      "version": "7.101.0",
+      "resolved": "https://registry.npmjs.org/@sentry/remix/-/remix-7.101.0.tgz",
+      "integrity": "sha512-l5X7d3SeK1p9omYSWApd7GUTfHf+ZSIRW3N97YsftK1ezmQmEsddUidcKKdzsAAzAEsBKgUFqeaaubWodfBqQA==",
+      "dependencies": {
+        "@sentry/cli": "^2.28.0",
+        "@sentry/core": "7.101.0",
+        "@sentry/node": "7.101.0",
+        "@sentry/react": "7.101.0",
+        "@sentry/types": "7.101.0",
+        "@sentry/utils": "7.101.0",
         "glob": "^10.3.4",
         "yargs": "^17.6.0"
       },
@@ -5241,33 +5804,33 @@
       }
     },
     "node_modules/@sentry/replay": {
-      "version": "7.99.0",
-      "resolved": "https://registry.npmjs.org/@sentry/replay/-/replay-7.99.0.tgz",
-      "integrity": "sha512-gyN/I2WpQrLAZDT+rScB/0jnFL2knEVBo8U8/OVt8gNP20Pq8T/rDZKO/TG0cBfvULDUbJj2P4CJryn2p/O2rA==",
+      "version": "7.101.0",
+      "resolved": "https://registry.npmjs.org/@sentry/replay/-/replay-7.101.0.tgz",
+      "integrity": "sha512-DSWkGKI/QhCAY+qm4mBnPob3/YsewisskVTak7KMDotJ75H85WFJhVwOMtvaEWIzVezCOItPv7ql51jTwhR3wA==",
       "dependencies": {
-        "@sentry-internal/tracing": "7.99.0",
-        "@sentry/core": "7.99.0",
-        "@sentry/types": "7.99.0",
-        "@sentry/utils": "7.99.0"
+        "@sentry-internal/tracing": "7.101.0",
+        "@sentry/core": "7.101.0",
+        "@sentry/types": "7.101.0",
+        "@sentry/utils": "7.101.0"
       },
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/@sentry/types": {
-      "version": "7.99.0",
-      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.99.0.tgz",
-      "integrity": "sha512-94qwOw4w40sAs5mCmzcGyj8ZUu/KhnWnuMZARRq96k+SjRW/tHFAOlIdnFSrt3BLPvSOK7R3bVAskZQ0N4FTmA==",
+      "version": "7.101.0",
+      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.101.0.tgz",
+      "integrity": "sha512-YC+ltO/AlbEyJHjCUYQ4is1HcDT2zSMuLkIAcyQmK7fUdlGT4iR5sfENriY9ZopYHgjPdJKfhI8ohScam7zp/A==",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@sentry/utils": {
-      "version": "7.99.0",
-      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.99.0.tgz",
-      "integrity": "sha512-cYZy5WNTkWs5GgggGnjfGqC44CWir0pAv4GVVSx0fsup4D4pMKBJPrtub15f9uC+QkUf3vVkqwpBqeFxtmJQTQ==",
+      "version": "7.101.0",
+      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.101.0.tgz",
+      "integrity": "sha512-px1NUkCLsD9UKLE4W4DghpyzmAVHgYhskrjRt30ubyUKqlggtHkOXRvS8MjuWowR/i0wF0GuTCbU9StBd7JMrw==",
       "dependencies": {
-        "@sentry/types": "7.99.0"
+        "@sentry/types": "7.101.0"
       },
       "engines": {
         "node": ">=8"
@@ -5361,27 +5924,30 @@
       }
     },
     "node_modules/@stripe/react-stripe-js": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@stripe/react-stripe-js/-/react-stripe-js-2.4.0.tgz",
-      "integrity": "sha512-1jVQEL3OuhuzNlf4OdfqovHt+MkWh8Uh8xpLxx/xUFUDdF+7/kDOrGKy+xJO3WLCfZUL7NAy+/ypwXbbYZi0tg==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@stripe/react-stripe-js/-/react-stripe-js-2.5.0.tgz",
+      "integrity": "sha512-ys5bnrufNoBlUPRblWkiN7dUCX3s2noBZS0Lf5GkHYO9x3SXJMZccif53IdP4X6tZyNLn7aSMgZBUZqsdzrvhg==",
       "dependencies": {
         "prop-types": "^15.7.2"
       },
       "peerDependencies": {
-        "@stripe/stripe-js": "^1.44.1 || ^2.0.0",
+        "@stripe/stripe-js": "^1.44.1 || ^2.0.0 || ^3.0.0",
         "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
         "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
       }
     },
     "node_modules/@stripe/stripe-js": {
-      "version": "1.54.2",
-      "resolved": "https://registry.npmjs.org/@stripe/stripe-js/-/stripe-js-1.54.2.tgz",
-      "integrity": "sha512-R1PwtDvUfs99cAjfuQ/WpwJ3c92+DAMy9xGApjqlWQMj0FKQabUAys2swfTRNzuYAYJh7NqK2dzcYVNkKLEKUg=="
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@stripe/stripe-js/-/stripe-js-3.0.2.tgz",
+      "integrity": "sha512-Ykr5mtTwbG+wleKQhtKOKyOfZ/0lRmwf49IBLi1vUxS/Mp9A0usiNFEkOh+kUGxEyD/lht+VgPTxPHbgUlqI+Q==",
+      "engines": {
+        "node": ">=12.16"
+      }
     },
     "node_modules/@supabase/functions-js": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@supabase/functions-js/-/functions-js-2.2.0.tgz",
-      "integrity": "sha512-lAmxD/mZ8vk2mg1CmXQWzK5mOHk7kDxAnxoyqUj2BVPvacEZ52P8nFkInEuSMqx6P6FKy64selW1Vyhui9racA==",
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@supabase/functions-js/-/functions-js-2.1.5.tgz",
+      "integrity": "sha512-BNzC5XhCzzCaggJ8s53DP+WeHHGT/NfTsx2wUSSGKR2/ikLFQTBCDzMvGz/PxYMqRko/LwncQtKXGOYp1PkPaw==",
       "dependencies": {
         "@supabase/node-fetch": "^2.6.14"
       }
@@ -5453,16 +6019,16 @@
       }
     },
     "node_modules/@supabase/supabase-js": {
-      "version": "2.39.3",
-      "resolved": "https://registry.npmjs.org/@supabase/supabase-js/-/supabase-js-2.39.3.tgz",
-      "integrity": "sha512-NoltJSaJNKDJNutO5sJPAAi5RIWrn1z2XH+ig1+cHDojT6BTN7TvZPNa3Kq3gFQWfO5H1N9El/bCTZJ3iFW2kQ==",
+      "version": "2.39.6",
+      "resolved": "https://registry.npmjs.org/@supabase/supabase-js/-/supabase-js-2.39.6.tgz",
+      "integrity": "sha512-HlflDzem0+l3KYYTqHV0UsqkDooV9my5UcBCV2zvvTrl77UtW97uKTZWn9lSWMuiy+ZvRLsiuG+WTiBuKMQl0Q==",
       "dependencies": {
-        "@supabase/functions-js": "^2.1.5",
-        "@supabase/gotrue-js": "^2.60.0",
-        "@supabase/node-fetch": "^2.6.14",
-        "@supabase/postgrest-js": "^1.9.0",
-        "@supabase/realtime-js": "^2.9.3",
-        "@supabase/storage-js": "^2.5.4"
+        "@supabase/functions-js": "2.1.5",
+        "@supabase/gotrue-js": "2.62.2",
+        "@supabase/node-fetch": "2.6.15",
+        "@supabase/postgrest-js": "1.9.2",
+        "@supabase/realtime-js": "2.9.3",
+        "@supabase/storage-js": "2.5.5"
       }
     },
     "node_modules/@szmarczak/http-timer": {
@@ -5514,9 +6080,9 @@
       }
     },
     "node_modules/@tanstack/react-virtual": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@tanstack/react-virtual/-/react-virtual-3.0.2.tgz",
-      "integrity": "sha512-9XbRLPKgnhMwwmuQMnJMv+5a9sitGNCSEtf/AZXzmJdesYk7XsjYHaEDny+IrJzvPNwZliIIDwCRiaUqR3zzCA==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-virtual/-/react-virtual-3.0.4.tgz",
+      "integrity": "sha512-tiqKW/e2MJVCr7/pRUXulpkyxllaOclkHNfhKTo4pmHjJIqnhMfwIjc1Q1R0Un3PI3kQywywu/791c8z9u0qeA==",
       "dependencies": {
         "@tanstack/virtual-core": "3.0.0"
       },
@@ -5543,7 +6109,6 @@
       "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-9.3.4.tgz",
       "integrity": "sha512-FlS4ZWlp97iiNWig0Muq8p+3rVDjRiYE+YKGbAqXOu9nwJFFOdL00kFpz42M+4huzYi86vAK1sOOfyOG45muIQ==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.10.4",
         "@babel/runtime": "^7.12.5",
@@ -5559,25 +6124,48 @@
       }
     },
     "node_modules/@testing-library/jest-dom": {
-      "version": "5.17.0",
-      "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.17.0.tgz",
-      "integrity": "sha512-ynmNeT7asXyH3aSVv4vvX4Rb+0qjOhdNHnO/3vuZNqPmhDpV/+rCSGwQ7bLcmU2cJ4dvoheIO85LQj0IbJHEtg==",
+      "version": "6.4.2",
+      "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-6.4.2.tgz",
+      "integrity": "sha512-CzqH0AFymEMG48CpzXFriYYkOjk6ZGPCLMhW9e9jg3KMCn5OfJecF8GtGW7yGfR/IgCe3SX8BSwjdzI6BBbZLw==",
       "dev": true,
       "dependencies": {
-        "@adobe/css-tools": "^4.0.1",
+        "@adobe/css-tools": "^4.3.2",
         "@babel/runtime": "^7.9.2",
-        "@types/testing-library__jest-dom": "^5.9.1",
         "aria-query": "^5.0.0",
         "chalk": "^3.0.0",
         "css.escape": "^1.5.1",
-        "dom-accessibility-api": "^0.5.6",
+        "dom-accessibility-api": "^0.6.3",
         "lodash": "^4.17.15",
         "redent": "^3.0.0"
       },
       "engines": {
-        "node": ">=8",
+        "node": ">=14",
         "npm": ">=6",
         "yarn": ">=1"
+      },
+      "peerDependencies": {
+        "@jest/globals": ">= 28",
+        "@types/bun": "latest",
+        "@types/jest": ">= 28",
+        "jest": ">= 28",
+        "vitest": ">= 0.32"
+      },
+      "peerDependenciesMeta": {
+        "@jest/globals": {
+          "optional": true
+        },
+        "@types/bun": {
+          "optional": true
+        },
+        "@types/jest": {
+          "optional": true
+        },
+        "jest": {
+          "optional": true
+        },
+        "vitest": {
+          "optional": true
+        }
       }
     },
     "node_modules/@testing-library/jest-dom/node_modules/chalk": {
@@ -5593,43 +6181,30 @@
         "node": ">=8"
       }
     },
+    "node_modules/@testing-library/jest-dom/node_modules/dom-accessibility-api": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.6.3.tgz",
+      "integrity": "sha512-7ZgogeTnjuHbo+ct10G9Ffp0mif17idi0IyWNVA/wcwcm7NPOD/WEHVP3n7n3MhXqxoIYm8d6MuZohYWIZ4T3w==",
+      "dev": true
+    },
     "node_modules/@testing-library/react": {
-      "version": "13.4.0",
-      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-13.4.0.tgz",
-      "integrity": "sha512-sXOGON+WNTh3MLE9rve97ftaZukN3oNf2KjDy7YTx6hcTO2uuLHuCGynMDhFwGw/jYf4OJ2Qk0i4i79qMNNkyw==",
+      "version": "14.2.1",
+      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-14.2.1.tgz",
+      "integrity": "sha512-sGdjws32ai5TLerhvzThYFbpnF9XtL65Cjf+gB0Dhr29BGqK+mAeN7SURSdu+eqgET4ANcWoC7FQpkaiGvBr+A==",
       "dev": true,
       "dependencies": {
         "@babel/runtime": "^7.12.5",
-        "@testing-library/dom": "^8.5.0",
+        "@testing-library/dom": "^9.0.0",
         "@types/react-dom": "^18.0.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=14"
       },
       "peerDependencies": {
         "react": "^18.0.0",
         "react-dom": "^18.0.0"
       }
     },
-    "node_modules/@testing-library/react/node_modules/@testing-library/dom": {
-      "version": "8.20.1",
-      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-8.20.1.tgz",
-      "integrity": "sha512-/DiOQ5xBxgdYRC8LNk7U+RWat0S3qRLeIw3ZIkMQ9kkVlRmwD/Eg8k8CqIpD6GW7u20JIUOfMKbxtiLutpjQ4g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/runtime": "^7.12.5",
-        "@types/aria-query": "^5.0.1",
-        "aria-query": "5.1.3",
-        "chalk": "^4.1.0",
-        "dom-accessibility-api": "^0.5.9",
-        "lz-string": "^1.5.0",
-        "pretty-format": "^27.0.2"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/@testing-library/user-event": {
       "version": "14.5.2",
       "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-14.5.2.tgz",
@@ -5653,9 +6228,9 @@
       }
     },
     "node_modules/@tremor/react": {
-      "version": "3.13.4",
-      "resolved": "https://registry.npmjs.org/@tremor/react/-/react-3.13.4.tgz",
-      "integrity": "sha512-T5RZDuNNsZqQui7KEbSlZzUJnP01Vq2L8eW83iXqdi4DGG9X+CJf5JoJcNWcF2IR3NOr+HEzcgUOFzzMSymWmg==",
+      "version": "3.14.0",
+      "resolved": "https://registry.npmjs.org/@tremor/react/-/react-3.14.0.tgz",
+      "integrity": "sha512-bDIaId3js6S0LMhSypLN31l98t13XwPmhF6B1NIZUId/zZwnuE25z95VbKUL8NzHuCETIXSAp+Mm+OyA9EeAFw==",
       "dependencies": {
         "@floating-ui/react": "^0.19.2",
         "@headlessui/react": "^1.7.18",
@@ -5686,6 +6261,15 @@
         "url": "https://opencollective.com/date-fns"
       }
     },
+    "node_modules/@tremor/react/node_modules/tailwind-merge": {
+      "version": "1.14.0",
+      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-1.14.0.tgz",
+      "integrity": "sha512-3mFKyCo/MBcgyOTlrY8T7odzZFx+w+qKSMAmdFzRvqBfLlSigU6TZnlFHK0lkMwj9Bj8OYU+9yW9lmGuS0QEnQ==",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/dcastil"
+      }
+    },
     "node_modules/@tufjs/canonical-json": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-1.0.0.tgz",
@@ -5723,25 +6307,51 @@
       "integrity": "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==",
       "dev": true
     },
-    "node_modules/@types/chai": {
-      "version": "4.3.11",
-      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.11.tgz",
-      "integrity": "sha512-qQR1dr2rGIHYlJulmr8Ioq3De0Le9E4MJ5AiaeAETJJpndT1uUNHsGFK3L/UIu+rbkQSdj8J/w2bCsBZc/Y5fQ==",
-      "dev": true
+    "node_modules/@types/babel__core": {
+      "version": "7.20.5",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
+      "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/parser": "^7.20.7",
+        "@babel/types": "^7.20.7",
+        "@types/babel__generator": "*",
+        "@types/babel__template": "*",
+        "@types/babel__traverse": "*"
+      }
+    },
+    "node_modules/@types/babel__generator": {
+      "version": "7.6.8",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz",
+      "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "node_modules/@types/babel__template": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
+      "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
     },
-    "node_modules/@types/chai-subset": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/@types/chai-subset/-/chai-subset-1.3.5.tgz",
-      "integrity": "sha512-c2mPnw+xHtXDoHmdtcCXGwyLMiauiAyxWMzhGpqHC4nqI/Y5G2XhTampslK2rb59kpcuHon03UH8W6iYUzw88A==",
+    "node_modules/@types/babel__traverse": {
+      "version": "7.20.5",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.5.tgz",
+      "integrity": "sha512-WXCyOcRtH37HAUkpXhUduaxdm82b4GSlyTqajXviN4EfiuPgNYR109xMCKvpl6zPIpua0DGlMEDCq+g8EdoheQ==",
       "dev": true,
       "dependencies": {
-        "@types/chai": "*"
+        "@babel/types": "^7.20.7"
       }
     },
     "node_modules/@types/cookie": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz",
-      "integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q=="
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz",
+      "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA=="
     },
     "node_modules/@types/d3-array": {
       "version": "3.2.1",
@@ -5767,9 +6377,9 @@
       }
     },
     "node_modules/@types/d3-path": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.0.2.tgz",
-      "integrity": "sha512-WAIEVlOCdd/NKRYTsqCpOMHQHemKBEINf8YXMYOtXH0GA7SY0dqMB78P3Uhgfy+4X+/Mlw2wDtlETkN6kQUCMA=="
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.1.0.tgz",
+      "integrity": "sha512-P2dlU/q51fkOc/Gfl3Ul9kicV7l+ra934qBFXCFhrZMOL6du1TM0pm1ThYvENukyOn5h9v+yMJ9Fn5JK4QozrQ=="
     },
     "node_modules/@types/d3-scale": {
       "version": "4.0.8",
@@ -5832,6 +6442,14 @@
       "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.14.tgz",
       "integrity": "sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg=="
     },
+    "node_modules/@types/geojson-vt": {
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/@types/geojson-vt/-/geojson-vt-3.2.5.tgz",
+      "integrity": "sha512-qDO7wqtprzlpe8FfQ//ClPV9xiuoh2nkIgiouIptON9w5jvD/fA4szvP9GBlDVdJ5dldAl0kX/sy3URbWwLx0g==",
+      "dependencies": {
+        "@types/geojson": "*"
+      }
+    },
     "node_modules/@types/hast": {
       "version": "2.3.10",
       "resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.10.tgz",
@@ -5853,66 +6471,6 @@
       "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==",
       "dev": true
     },
-    "node_modules/@types/istanbul-lib-report": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
-      "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
-      "dev": true,
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "*"
-      }
-    },
-    "node_modules/@types/istanbul-reports": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
-      "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/istanbul-lib-report": "*"
-      }
-    },
-    "node_modules/@types/jest": {
-      "version": "29.5.11",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.11.tgz",
-      "integrity": "sha512-S2mHmYIVe13vrm6q4kN6fLYYAka15ALQki/vgDC3mIukEOx8WJlv0kQPM+d4w8Gp6u0uSdKND04IlTXBv0rwnQ==",
-      "dev": true,
-      "dependencies": {
-        "expect": "^29.0.0",
-        "pretty-format": "^29.0.0"
-      }
-    },
-    "node_modules/@types/jest/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@types/jest/node_modules/pretty-format": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
-      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-      "dev": true,
-      "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@types/jest/node_modules/react-is": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
-      "dev": true
-    },
     "node_modules/@types/js-levenshtein": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/@types/js-levenshtein/-/js-levenshtein-1.1.3.tgz",
@@ -5968,9 +6526,9 @@
       }
     },
     "node_modules/@types/mapbox-gl": {
-      "version": "2.7.20",
-      "resolved": "https://registry.npmjs.org/@types/mapbox-gl/-/mapbox-gl-2.7.20.tgz",
-      "integrity": "sha512-vuczqb42fXjqGa3Pe4ahYv80We/eM//4pelVYxRXV/DYBVGsD+XhmZNUD2aIdH6mcEV601/k6Z5dn6QFtULFCQ==",
+      "version": "2.7.21",
+      "resolved": "https://registry.npmjs.org/@types/mapbox-gl/-/mapbox-gl-2.7.21.tgz",
+      "integrity": "sha512-Dx9MuF2kKgT/N22LsMUB4b3acFZh9clVqz9zv1fomoiPoBrJolwYxpWA/9LPO/2N0xWbKi4V+pkjTaFkkx/4wA==",
       "dependencies": {
         "@types/geojson": "*"
       }
@@ -6013,9 +6571,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "20.11.15",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.15.tgz",
-      "integrity": "sha512-gscmuADZfvNULx1eyirVbr3kVOVZtpQtzKMCZpeSZcN6MfbkRXAR4s9/gsQ4CzxLHw6EStDtKLNtSDL3vbq05A==",
+      "version": "20.11.18",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.18.tgz",
+      "integrity": "sha512-ABT5VWnnYneSBcNWYSCuR05M826RoMyMSGiFivXGx6ZUIsXb9vn4643IEwkg2zbEOSgAiSogtapN2fgc4mAPlw==",
       "dependencies": {
         "undici-types": "~5.26.4"
       }
@@ -6046,9 +6604,9 @@
       "devOptional": true
     },
     "node_modules/@types/react": {
-      "version": "18.2.51",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.51.tgz",
-      "integrity": "sha512-XeoMaU4CzyjdRr3c4IQQtiH7Rpo18V07rYZUucEZQwOUEtGgTXv7e6igQiQ+xnV6MbMe1qjEmKdgMNnfppnXfg==",
+      "version": "18.2.55",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.55.tgz",
+      "integrity": "sha512-Y2Tz5P4yz23brwm2d7jNon39qoAtMMmalOQv6+fEFt1mT+FcM3D841wDpoUvFXhaYenuROCy3FZYqdTjM7qVyA==",
       "devOptional": true,
       "dependencies": {
         "@types/prop-types": "*",
@@ -6057,9 +6615,9 @@
       }
     },
     "node_modules/@types/react-dom": {
-      "version": "18.2.18",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.18.tgz",
-      "integrity": "sha512-TJxDm6OfAX2KJWJdMEVTwWke5Sc/E/RlnPGvGfS0W7+6ocy2xhDVQVh/KvC2Uf7kACs+gDytdusDSdWfWkaNzw==",
+      "version": "18.2.19",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.19.tgz",
+      "integrity": "sha512-aZvQL6uUbIJpjZk4U8JZGbau9KDeAwMfmhyWorxgBkqDIEf6ROjRozcmPIicqsUwPUjbkDfHKgGee1Lq65APcA==",
       "devOptional": true,
       "dependencies": {
         "@types/react": "*"
@@ -6072,9 +6630,9 @@
       "devOptional": true
     },
     "node_modules/@types/semver": {
-      "version": "7.5.6",
-      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.6.tgz",
-      "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==",
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.7.tgz",
+      "integrity": "sha512-/wdoPq1QqkSj9/QOeKkFquEuPzQbHTWAMPH/PaUMB+JuR31lXhlWXRZ52IpfDYVlDOUBvX09uBrPwxGT1hjNBg==",
       "dev": true
     },
     "node_modules/@types/set-cookie-parser": {
@@ -6086,12 +6644,6 @@
         "@types/node": "*"
       }
     },
-    "node_modules/@types/stack-utils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
-      "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==",
-      "dev": true
-    },
     "node_modules/@types/supercluster": {
       "version": "7.1.3",
       "resolved": "https://registry.npmjs.org/@types/supercluster/-/supercluster-7.1.3.tgz",
@@ -6100,15 +6652,6 @@
         "@types/geojson": "*"
       }
     },
-    "node_modules/@types/testing-library__jest-dom": {
-      "version": "5.14.9",
-      "resolved": "https://registry.npmjs.org/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.9.tgz",
-      "integrity": "sha512-FSYhIjFlfOpGSRyVoMBMuS3ws5ehFQODymf3vlI7U1K8c7PHwWwFY7VREfmsuzHSOnoKs/9/Y983ayOs7eRzqw==",
-      "dev": true,
-      "dependencies": {
-        "@types/jest": "*"
-      }
-    },
     "node_modules/@types/unist": {
       "version": "2.0.10",
       "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.10.tgz",
@@ -6123,21 +6666,6 @@
         "@types/node": "*"
       }
     },
-    "node_modules/@types/yargs": {
-      "version": "17.0.32",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
-      "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
-      "dev": true,
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/@types/yargs-parser": {
-      "version": "21.0.3",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
-      "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
-      "dev": true
-    },
     "node_modules/@typescript-eslint/eslint-plugin": {
       "version": "5.62.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz",
@@ -6373,9 +6901,9 @@
       }
     },
     "node_modules/@vanilla-extract/integration": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/@vanilla-extract/integration/-/integration-6.4.0.tgz",
-      "integrity": "sha512-yl2iKArGUCsIxtfOeOu3ki+YyIZ6c+uKy/AJv3e+oqmZatzSNv0EPVLk6lUUZcHKJyZNdcPXV3GDYWd/3OE7xg==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@vanilla-extract/integration/-/integration-6.5.0.tgz",
+      "integrity": "sha512-E2YcfO8vA+vs+ua+gpvy1HRqvgWbI+MTlUpxA8FvatOvybuNcWAY0CKwQ/Gpj7rswYKtC6C7+xw33emM6/ImdQ==",
       "dev": true,
       "dependencies": {
         "@babel/core": "^7.20.7",
@@ -6393,524 +6921,218 @@
         "vite-node": "^1.2.0"
       }
     },
-    "node_modules/@vanilla-extract/integration/node_modules/@esbuild/android-arm": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.12.tgz",
-      "integrity": "sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@vanilla-extract/integration/node_modules/@esbuild/android-arm64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz",
-      "integrity": "sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@vanilla-extract/integration/node_modules/@esbuild/android-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.12.tgz",
-      "integrity": "sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@vanilla-extract/integration/node_modules/@esbuild/darwin-arm64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz",
-      "integrity": "sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@vanilla-extract/integration/node_modules/@esbuild/darwin-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz",
-      "integrity": "sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@vanilla-extract/integration/node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz",
-      "integrity": "sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@vanilla-extract/integration/node_modules/@esbuild/freebsd-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz",
-      "integrity": "sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@vanilla-extract/integration/node_modules/@esbuild/linux-arm": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz",
-      "integrity": "sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@vanilla-extract/integration/node_modules/@esbuild/linux-arm64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz",
-      "integrity": "sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@vanilla-extract/integration/node_modules/@esbuild/linux-ia32": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz",
-      "integrity": "sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@vanilla-extract/integration/node_modules/@esbuild/linux-loong64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz",
-      "integrity": "sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@vanilla-extract/integration/node_modules/@esbuild/linux-mips64el": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz",
-      "integrity": "sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==",
-      "cpu": [
-        "mips64el"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@vanilla-extract/integration/node_modules/@esbuild/linux-ppc64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz",
-      "integrity": "sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@vanilla-extract/integration/node_modules/@esbuild/linux-riscv64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz",
-      "integrity": "sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@vanilla-extract/integration/node_modules/@esbuild/linux-s390x": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz",
-      "integrity": "sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
+    "node_modules/@vanilla-extract/private": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@vanilla-extract/private/-/private-1.0.3.tgz",
+      "integrity": "sha512-17kVyLq3ePTKOkveHxXuIJZtGYs+cSoev7BlP+Lf4916qfDhk/HBjvlYDe8egrea7LNPHKwSZJK/bzZC+Q6AwQ==",
+      "dev": true
     },
-    "node_modules/@vanilla-extract/integration/node_modules/@esbuild/linux-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz",
-      "integrity": "sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@vitejs/plugin-react": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.2.1.tgz",
+      "integrity": "sha512-oojO9IDc4nCUUi8qIR11KoQm0XFFLIwsRBwHRR4d/88IWghn1y6ckz/bJ8GHDCsYEJee8mDzqtJxh15/cisJNQ==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
+      "dependencies": {
+        "@babel/core": "^7.23.5",
+        "@babel/plugin-transform-react-jsx-self": "^7.23.3",
+        "@babel/plugin-transform-react-jsx-source": "^7.23.3",
+        "@types/babel__core": "^7.20.5",
+        "react-refresh": "^0.14.0"
+      },
       "engines": {
-        "node": ">=12"
+        "node": "^14.18.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "vite": "^4.2.0 || ^5.0.0"
       }
     },
-    "node_modules/@vanilla-extract/integration/node_modules/@esbuild/netbsd-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz",
-      "integrity": "sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@vitest/coverage-v8": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-1.2.2.tgz",
+      "integrity": "sha512-IHyKnDz18SFclIEEAHb9Y4Uxx0sPKC2VO1kdDCs1BF6Ip4S8rQprs971zIsooLUn7Afs71GRxWMWpkCGZpRMhw==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=12"
+      "dependencies": {
+        "@ampproject/remapping": "^2.2.1",
+        "@bcoe/v8-coverage": "^0.2.3",
+        "debug": "^4.3.4",
+        "istanbul-lib-coverage": "^3.2.2",
+        "istanbul-lib-report": "^3.0.1",
+        "istanbul-lib-source-maps": "^4.0.1",
+        "istanbul-reports": "^3.1.6",
+        "magic-string": "^0.30.5",
+        "magicast": "^0.3.3",
+        "picocolors": "^1.0.0",
+        "std-env": "^3.5.0",
+        "test-exclude": "^6.0.0",
+        "v8-to-istanbul": "^9.2.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      },
+      "peerDependencies": {
+        "vitest": "^1.0.0"
       }
     },
-    "node_modules/@vanilla-extract/integration/node_modules/@esbuild/openbsd-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz",
-      "integrity": "sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@vitest/expect": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-1.2.2.tgz",
+      "integrity": "sha512-3jpcdPAD7LwHUUiT2pZTj2U82I2Tcgg2oVPvKxhn6mDI2On6tfvPQTjAI4628GUGDZrCm4Zna9iQHm5cEexOAg==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=12"
+      "dependencies": {
+        "@vitest/spy": "1.2.2",
+        "@vitest/utils": "1.2.2",
+        "chai": "^4.3.10"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
       }
     },
-    "node_modules/@vanilla-extract/integration/node_modules/@esbuild/sunos-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz",
-      "integrity": "sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@vitest/runner": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-1.2.2.tgz",
+      "integrity": "sha512-JctG7QZ4LSDXr5CsUweFgcpEvrcxOV1Gft7uHrvkQ+fsAVylmWQvnaAr/HDp3LAH1fztGMQZugIheTWjaGzYIg==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=12"
+      "dependencies": {
+        "@vitest/utils": "1.2.2",
+        "p-limit": "^5.0.0",
+        "pathe": "^1.1.1"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
       }
     },
-    "node_modules/@vanilla-extract/integration/node_modules/@esbuild/win32-arm64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz",
-      "integrity": "sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@vitest/runner/node_modules/p-limit": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-5.0.0.tgz",
+      "integrity": "sha512-/Eaoq+QyLSiXQ4lyYV23f14mZRQcXnxfHrN0vCai+ak9G0pp9iEQukIIZq5NccEvwRB8PUnZT0KsOoDCINS1qQ==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
+      "dependencies": {
+        "yocto-queue": "^1.0.0"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@vanilla-extract/integration/node_modules/@esbuild/win32-ia32": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz",
-      "integrity": "sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==",
-      "cpu": [
-        "ia32"
-      ],
+    "node_modules/@vitest/runner/node_modules/yocto-queue": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
+      "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
       "engines": {
-        "node": ">=12"
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@vanilla-extract/integration/node_modules/@esbuild/win32-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz",
-      "integrity": "sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@vitest/snapshot": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-1.2.2.tgz",
+      "integrity": "sha512-SmGY4saEw1+bwE1th6S/cZmPxz/Q4JWsl7LvbQIky2tKE35US4gd0Mjzqfr84/4OD0tikGWaWdMja/nWL5NIPA==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
+      "dependencies": {
+        "magic-string": "^0.30.5",
+        "pathe": "^1.1.1",
+        "pretty-format": "^29.7.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
       }
     },
-    "node_modules/@vanilla-extract/integration/node_modules/esbuild": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.12.tgz",
-      "integrity": "sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==",
+    "node_modules/@vitest/snapshot/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
       "dev": true,
-      "hasInstallScript": true,
-      "bin": {
-        "esbuild": "bin/esbuild"
-      },
       "engines": {
-        "node": ">=12"
+        "node": ">=10"
       },
-      "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.19.12",
-        "@esbuild/android-arm": "0.19.12",
-        "@esbuild/android-arm64": "0.19.12",
-        "@esbuild/android-x64": "0.19.12",
-        "@esbuild/darwin-arm64": "0.19.12",
-        "@esbuild/darwin-x64": "0.19.12",
-        "@esbuild/freebsd-arm64": "0.19.12",
-        "@esbuild/freebsd-x64": "0.19.12",
-        "@esbuild/linux-arm": "0.19.12",
-        "@esbuild/linux-arm64": "0.19.12",
-        "@esbuild/linux-ia32": "0.19.12",
-        "@esbuild/linux-loong64": "0.19.12",
-        "@esbuild/linux-mips64el": "0.19.12",
-        "@esbuild/linux-ppc64": "0.19.12",
-        "@esbuild/linux-riscv64": "0.19.12",
-        "@esbuild/linux-s390x": "0.19.12",
-        "@esbuild/linux-x64": "0.19.12",
-        "@esbuild/netbsd-x64": "0.19.12",
-        "@esbuild/openbsd-x64": "0.19.12",
-        "@esbuild/sunos-x64": "0.19.12",
-        "@esbuild/win32-arm64": "0.19.12",
-        "@esbuild/win32-ia32": "0.19.12",
-        "@esbuild/win32-x64": "0.19.12"
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/@vanilla-extract/integration/node_modules/rollup": {
-      "version": "4.9.6",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.9.6.tgz",
-      "integrity": "sha512-05lzkCS2uASX0CiLFybYfVkwNbKZG5NFQ6Go0VWyogFTXXbR039UVsegViTntkk4OglHBdF54ccApXRRuXRbsg==",
+    "node_modules/@vitest/snapshot/node_modules/pretty-format": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
+      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
       "dev": true,
       "dependencies": {
-        "@types/estree": "1.0.5"
-      },
-      "bin": {
-        "rollup": "dist/bin/rollup"
+        "@jest/schemas": "^29.6.3",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
       },
       "engines": {
-        "node": ">=18.0.0",
-        "npm": ">=8.0.0"
-      },
-      "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.9.6",
-        "@rollup/rollup-android-arm64": "4.9.6",
-        "@rollup/rollup-darwin-arm64": "4.9.6",
-        "@rollup/rollup-darwin-x64": "4.9.6",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.9.6",
-        "@rollup/rollup-linux-arm64-gnu": "4.9.6",
-        "@rollup/rollup-linux-arm64-musl": "4.9.6",
-        "@rollup/rollup-linux-riscv64-gnu": "4.9.6",
-        "@rollup/rollup-linux-x64-gnu": "4.9.6",
-        "@rollup/rollup-linux-x64-musl": "4.9.6",
-        "@rollup/rollup-win32-arm64-msvc": "4.9.6",
-        "@rollup/rollup-win32-ia32-msvc": "4.9.6",
-        "@rollup/rollup-win32-x64-msvc": "4.9.6",
-        "fsevents": "~2.3.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@vanilla-extract/integration/node_modules/vite": {
-      "version": "5.0.12",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.12.tgz",
-      "integrity": "sha512-4hsnEkG3q0N4Tzf1+t6NdN9dg/L3BM+q8SWgbSPnJvrgH2kgdyzfVJwbR1ic69/4uMJJ/3dqDZZE5/WwqW8U1w==",
+    "node_modules/@vitest/snapshot/node_modules/react-is": {
+      "version": "18.2.0",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
+      "dev": true
+    },
+    "node_modules/@vitest/spy": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-1.2.2.tgz",
+      "integrity": "sha512-k9Gcahssw8d7X3pSLq3e3XEu/0L78mUkCjivUqCQeXJm9clfXR/Td8+AP+VC1O6fKPIDLcHDTAmBOINVuv6+7g==",
       "dev": true,
       "dependencies": {
-        "esbuild": "^0.19.3",
-        "postcss": "^8.4.32",
-        "rollup": "^4.2.0"
-      },
-      "bin": {
-        "vite": "bin/vite.js"
-      },
-      "engines": {
-        "node": "^18.0.0 || >=20.0.0"
+        "tinyspy": "^2.2.0"
       },
       "funding": {
-        "url": "https://github.com/vitejs/vite?sponsor=1"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.3"
-      },
-      "peerDependencies": {
-        "@types/node": "^18.0.0 || >=20.0.0",
-        "less": "*",
-        "lightningcss": "^1.21.0",
-        "sass": "*",
-        "stylus": "*",
-        "sugarss": "*",
-        "terser": "^5.4.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        },
-        "less": {
-          "optional": true
-        },
-        "lightningcss": {
-          "optional": true
-        },
-        "sass": {
-          "optional": true
-        },
-        "stylus": {
-          "optional": true
-        },
-        "sugarss": {
-          "optional": true
-        },
-        "terser": {
-          "optional": true
-        }
+        "url": "https://opencollective.com/vitest"
       }
     },
-    "node_modules/@vanilla-extract/private": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@vanilla-extract/private/-/private-1.0.3.tgz",
-      "integrity": "sha512-17kVyLq3ePTKOkveHxXuIJZtGYs+cSoev7BlP+Lf4916qfDhk/HBjvlYDe8egrea7LNPHKwSZJK/bzZC+Q6AwQ==",
-      "dev": true
-    },
-    "node_modules/@vitejs/plugin-react": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-2.2.0.tgz",
-      "integrity": "sha512-FFpefhvExd1toVRlokZgxgy2JtnBOdp4ZDsq7ldCWaqGSGn9UhWMAVm/1lxPL14JfNS5yGz+s9yFrQY6shoStA==",
+    "node_modules/@vitest/utils": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-1.2.2.tgz",
+      "integrity": "sha512-WKITBHLsBHlpjnDQahr+XK6RE7MiAsgrIkr0pGhQ9ygoxBfUeG0lUG5iLlzqjmKSlBv3+j5EGsriBzh+C3Tq9g==",
       "dev": true,
       "dependencies": {
-        "@babel/core": "^7.19.6",
-        "@babel/plugin-transform-react-jsx": "^7.19.0",
-        "@babel/plugin-transform-react-jsx-development": "^7.18.6",
-        "@babel/plugin-transform-react-jsx-self": "^7.18.6",
-        "@babel/plugin-transform-react-jsx-source": "^7.19.6",
-        "magic-string": "^0.26.7",
-        "react-refresh": "^0.14.0"
+        "diff-sequences": "^29.6.3",
+        "estree-walker": "^3.0.3",
+        "loupe": "^2.3.7",
+        "pretty-format": "^29.7.0"
       },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "node_modules/@vitest/utils/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "dev": true,
       "engines": {
-        "node": "^14.18.0 || >=16.0.0"
+        "node": ">=10"
       },
-      "peerDependencies": {
-        "vite": "^3.0.0"
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/@vitest/coverage-c8": {
-      "version": "0.24.5",
-      "resolved": "https://registry.npmjs.org/@vitest/coverage-c8/-/coverage-c8-0.24.5.tgz",
-      "integrity": "sha512-955yK/SdSBZPYrSXgXB0F+0JnOX5EY9kSL7ywJ4rNajmkFUhwLjuKm13Xb6YKSyIY/g5WvbBnyowqfNRxBJ3ww==",
-      "deprecated": "v8 coverage is moved to @vitest/coverage-v8 package",
+    "node_modules/@vitest/utils/node_modules/pretty-format": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
+      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
       "dev": true,
       "dependencies": {
-        "c8": "^7.12.0",
-        "vitest": "0.24.5"
+        "@jest/schemas": "^29.6.3",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/antfu"
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
+    "node_modules/@vitest/utils/node_modules/react-is": {
+      "version": "18.2.0",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
+      "dev": true
+    },
     "node_modules/@web3-storage/multipart-parser": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/@web3-storage/multipart-parser/-/multipart-parser-1.0.0.tgz",
@@ -6964,6 +7186,12 @@
         "node": ">=6.5"
       }
     },
+    "node_modules/accept-language-parser": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/accept-language-parser/-/accept-language-parser-1.5.0.tgz",
+      "integrity": "sha512-QhyTbMLYo0BBGg1aWbeMG4ekWtds/31BrEU+DONOg/7ax23vxpL03Pb7/zBmha2v7vdD3AyzZVWBVGEZxKOXWw==",
+      "optional": true
+    },
     "node_modules/accepts": {
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
@@ -6997,6 +7225,15 @@
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
+    "node_modules/acorn-walk": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz",
+      "integrity": "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/agent-base": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
@@ -7216,13 +7453,16 @@
       }
     },
     "node_modules/array-buffer-byte-length": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz",
-      "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz",
+      "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "is-array-buffer": "^3.0.1"
+        "call-bind": "^1.0.5",
+        "is-array-buffer": "^3.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -7261,17 +7501,36 @@
         "node": ">=8"
       }
     },
-    "node_modules/array.prototype.findlastindex": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz",
-      "integrity": "sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==",
+    "node_modules/array.prototype.filter": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array.prototype.filter/-/array.prototype.filter-1.0.3.tgz",
+      "integrity": "sha512-VizNcj/RGJiUyQBgzwxzE5oHdeuXY5hSbbmKMlphj1cy1Vl7Pn2asCGbSrru6hSQjmCzqTBPVWAF/whmEOVHbw==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
         "es-abstract": "^1.22.1",
-        "es-shim-unscopables": "^1.0.0",
-        "get-intrinsic": "^1.2.1"
+        "es-array-method-boxes-properly": "^1.0.0",
+        "is-string": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.findlastindex": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.4.tgz",
+      "integrity": "sha512-hzvSHUshSpCflDR1QMUBLHGHP1VIEBegT4pix9H/Z92Xw3ySoy6c2qh7lJWTJnRJ8JCZ9bJNCgTyYaJGcJu6xQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.22.3",
+        "es-errors": "^1.3.0",
+        "es-shim-unscopables": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7317,30 +7576,31 @@
       }
     },
     "node_modules/array.prototype.tosorted": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.2.tgz",
-      "integrity": "sha512-HuQCHOlk1Weat5jzStICBCd83NxiIMwqDg/dHEsoefabn/hJRj5pVdWcPUSpRrwhwxZOsQassMpgN/xRYFBMIg==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.3.tgz",
+      "integrity": "sha512-/DdH4TiTmOKzyQbp/eadcCVexiCb36xJg7HshYOYJnNZFDj33GEv0P7GxsynpShhq4OLYJzbGcBDkLsDt7MnNg==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "es-shim-unscopables": "^1.0.0",
-        "get-intrinsic": "^1.2.1"
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.22.3",
+        "es-errors": "^1.1.0",
+        "es-shim-unscopables": "^1.0.2"
       }
     },
     "node_modules/arraybuffer.prototype.slice": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz",
-      "integrity": "sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz",
+      "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==",
       "dev": true,
       "dependencies": {
-        "array-buffer-byte-length": "^1.0.0",
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "get-intrinsic": "^1.2.1",
-        "is-array-buffer": "^3.0.2",
+        "array-buffer-byte-length": "^1.0.1",
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.22.3",
+        "es-errors": "^1.2.1",
+        "get-intrinsic": "^1.2.3",
+        "is-array-buffer": "^3.0.4",
         "is-shared-array-buffer": "^1.0.2"
       },
       "engines": {
@@ -7397,6 +7657,14 @@
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
       "dev": true
     },
+    "node_modules/atomic-sleep": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/atomic-sleep/-/atomic-sleep-1.0.0.tgz",
+      "integrity": "sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ==",
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
     "node_modules/attr-accept": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/attr-accept/-/attr-accept-2.2.2.tgz",
@@ -7445,11 +7713,6 @@
         "dequal": "^2.0.3"
       }
     },
-    "node_modules/b4a": {
-      "version": "1.6.4",
-      "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.4.tgz",
-      "integrity": "sha512-fpWrvyVHEKyeEvbKZTVOeZF3VSKKWtJxFIxX/jaVPf+cLbGUSitjb49pHLqPV2BUNNZ0LcoeEGfE/YCpyDYHIw=="
-    },
     "node_modules/bail": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/bail/-/bail-2.0.2.tgz",
@@ -7507,6 +7770,7 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
       "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+      "dev": true,
       "dependencies": {
         "buffer": "^5.5.0",
         "inherits": "^2.0.4",
@@ -7517,6 +7781,7 @@
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
       "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "dev": true,
       "dependencies": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
@@ -7639,9 +7904,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.22.3",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.3.tgz",
-      "integrity": "sha512-UAp55yfwNv0klWNapjs/ktHoguxuQNGnOzxYmfnXIS+8AsRDZkSDxg7R1AX3GKzn078SBI5dzwzj/Yx0Or0e3A==",
+      "version": "4.23.0",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz",
+      "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==",
       "dev": true,
       "funding": [
         {
@@ -7658,8 +7923,8 @@
         }
       ],
       "dependencies": {
-        "caniuse-lite": "^1.0.30001580",
-        "electron-to-chromium": "^1.4.648",
+        "caniuse-lite": "^1.0.30001587",
+        "electron-to-chromium": "^1.4.668",
         "node-releases": "^2.0.14",
         "update-browserslist-db": "^1.0.13"
       },
@@ -7674,6 +7939,7 @@
       "version": "5.7.1",
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
       "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -7745,98 +8011,6 @@
         "typewise-core": "^1.2"
       }
     },
-    "node_modules/c8": {
-      "version": "7.14.0",
-      "resolved": "https://registry.npmjs.org/c8/-/c8-7.14.0.tgz",
-      "integrity": "sha512-i04rtkkcNcCf7zsQcSv/T9EbUn4RXQ6mropeMcjFOsQXQ0iGLAr/xT6TImQg4+U9hmNpN9XdvPkjUL1IzbgxJw==",
-      "dev": true,
-      "dependencies": {
-        "@bcoe/v8-coverage": "^0.2.3",
-        "@istanbuljs/schema": "^0.1.3",
-        "find-up": "^5.0.0",
-        "foreground-child": "^2.0.0",
-        "istanbul-lib-coverage": "^3.2.0",
-        "istanbul-lib-report": "^3.0.0",
-        "istanbul-reports": "^3.1.4",
-        "rimraf": "^3.0.2",
-        "test-exclude": "^6.0.0",
-        "v8-to-istanbul": "^9.0.0",
-        "yargs": "^16.2.0",
-        "yargs-parser": "^20.2.9"
-      },
-      "bin": {
-        "c8": "bin/c8.js"
-      },
-      "engines": {
-        "node": ">=10.12.0"
-      }
-    },
-    "node_modules/c8/node_modules/cliui": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^7.0.0"
-      }
-    },
-    "node_modules/c8/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/c8/node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/c8/node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/c8/node_modules/yargs": {
-      "version": "16.2.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-      "dev": true,
-      "dependencies": {
-        "cliui": "^7.0.2",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.0",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^20.2.2"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/cac": {
       "version": "6.7.14",
       "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz",
@@ -7905,26 +8079,19 @@
         "node": ">=14.16"
       }
     },
-    "node_modules/cacheable-request/node_modules/mimic-response": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-4.0.0.tgz",
-      "integrity": "sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg==",
-      "dev": true,
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/call-bind": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz",
-      "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
       "dependencies": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
         "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.1",
-        "set-function-length": "^1.1.1"
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -7960,9 +8127,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001582",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001582.tgz",
-      "integrity": "sha512-vsJG3V5vgfduaQGVxL53uSX/HUzxyr2eA8xCo36OLal7sRcSZbibJtLeh0qja4sFOr/QQGt4opB4tOy+eOgAxg==",
+      "version": "1.0.30001587",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001587.tgz",
+      "integrity": "sha512-HMFNotUmLXn71BQxg8cijvqxnIAofforZOwGsxyXJ0qugTdspUF4sPSJ2vhgprHCB996tIDzEq1ubumPDV8ULA==",
       "dev": true,
       "funding": [
         {
@@ -8074,6 +8241,11 @@
       "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
       "dev": true
     },
+    "node_modules/cheap-ruler": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/cheap-ruler/-/cheap-ruler-3.0.2.tgz",
+      "integrity": "sha512-02T332h1/HTN6cDSufLP8x4JzDs2+VC+8qZ/N0kWIVPyc2xUkWwWh3B2fJxR7raXkL4Mq7k554mfuM9ofv/vGg=="
+    },
     "node_modules/check-error": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz",
@@ -8096,15 +8268,9 @@
       }
     },
     "node_modules/chokidar": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://paulmillr.com/funding/"
-        }
-      ],
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
       "dependencies": {
         "anymatch": "~3.1.2",
         "braces": "~3.0.2",
@@ -8117,6 +8283,9 @@
       "engines": {
         "node": ">= 8.10.0"
       },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      },
       "optionalDependencies": {
         "fsevents": "~2.3.2"
       }
@@ -8348,6 +8517,11 @@
         "color-support": "bin.js"
       }
     },
+    "node_modules/colorette": {
+      "version": "2.0.20",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
+      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w=="
+    },
     "node_modules/combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -8504,9 +8678,9 @@
       "dev": true
     },
     "node_modules/cookie": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
+      "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
       "engines": {
         "node": ">= 0.6"
       }
@@ -8649,8 +8823,7 @@
     "node_modules/csstype": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
-      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
-      "devOptional": true
+      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
     },
     "node_modules/csv-parse": {
       "version": "5.5.3",
@@ -8785,12 +8958,19 @@
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-3.3.1.tgz",
       "integrity": "sha512-y8e109LYGgoQDveiEBD3DYXKba1jWf5BA8YU1FL5Tvm0BTdEfy54WLCwnuYWZNnzzvALy/QQ4Hov+Q9RVRv+Zw==",
-      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/kossnocorp"
       }
     },
+    "node_modules/dateformat": {
+      "version": "4.6.3",
+      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-4.6.3.tgz",
+      "integrity": "sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA==",
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/debug": {
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@@ -8829,6 +9009,7 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
       "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
+      "dev": true,
       "dependencies": {
         "mimic-response": "^3.1.0"
       },
@@ -8839,6 +9020,18 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/decompress-response/node_modules/mimic-response": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
+      "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/deep-eql": {
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz",
@@ -8887,6 +9080,7 @@
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
       "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+      "dev": true,
       "engines": {
         "node": ">=4.0.0"
       }
@@ -8933,16 +9127,19 @@
       }
     },
     "node_modules/define-data-property": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
-      "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
       "dependencies": {
-        "get-intrinsic": "^1.2.1",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.0"
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/define-properties": {
@@ -9038,9 +9235,9 @@
       "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw=="
     },
     "node_modules/diff": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz",
-      "integrity": "sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz",
+      "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==",
       "dev": true,
       "engines": {
         "node": ">=0.3.1"
@@ -9091,11 +9288,12 @@
       "dev": true
     },
     "node_modules/dom-helpers": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz",
-      "integrity": "sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz",
+      "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==",
       "dependencies": {
-        "@babel/runtime": "^7.1.2"
+        "@babel/runtime": "^7.8.7",
+        "csstype": "^3.0.2"
       }
     },
     "node_modules/dom-serializer": {
@@ -9170,36 +9368,36 @@
       }
     },
     "node_modules/dotenv": {
-      "version": "16.4.1",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.1.tgz",
-      "integrity": "sha512-CjA3y+Dr3FyFDOAMnxZEGtnW9KBR2M0JvvUtXNW+dYJL5ROWxP9DUHCwgFqpMk0OXCc0ljhaNTr2w/kutYIcHQ==",
+      "version": "16.4.4",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.4.tgz",
+      "integrity": "sha512-XvPXc8XAQThSjAbY6cQ/9PcBXmFoWuw1sQ3b8HqUCR6ziGXjkTi//kB9SWa2UwqlgdAIuRqAa/9hVljzPehbYg==",
       "dev": true,
       "engines": {
         "node": ">=12"
       },
       "funding": {
-        "url": "https://github.com/motdotla/dotenv?sponsor=1"
+        "url": "https://dotenvx.com"
       }
     },
     "node_modules/dotenv-cli": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/dotenv-cli/-/dotenv-cli-6.0.0.tgz",
-      "integrity": "sha512-qXlCOi3UMDhCWFKe0yq5sg3X+pJAz+RQDiFN38AMSbUrnY3uZshSfDJUAge951OS7J9gwLZGfsBlWRSOYz/TRg==",
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/dotenv-cli/-/dotenv-cli-7.3.0.tgz",
+      "integrity": "sha512-314CA4TyK34YEJ6ntBf80eUY+t1XaFLyem1k9P0sX1gn30qThZ5qZr/ZwE318gEnzyYP9yj9HJk6SqwE0upkfw==",
       "dev": true,
       "dependencies": {
         "cross-spawn": "^7.0.3",
-        "dotenv": "^16.0.0",
-        "dotenv-expand": "^8.0.1",
-        "minimist": "^1.2.5"
+        "dotenv": "^16.3.0",
+        "dotenv-expand": "^10.0.0",
+        "minimist": "^1.2.6"
       },
       "bin": {
         "dotenv": "cli.js"
       }
     },
     "node_modules/dotenv-expand": {
-      "version": "8.0.3",
-      "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-8.0.3.tgz",
-      "integrity": "sha512-SErOMvge0ZUyWd5B0NXMQlDkN+8r+HhVUsxgOO7IoPDOdDRD2JjExpN6y3KnFR66jsJMwSn1pqIivhU5rcJiNg==",
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-10.0.0.tgz",
+      "integrity": "sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A==",
       "dev": true,
       "engines": {
         "node": ">=12"
@@ -9278,9 +9476,9 @@
       "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.653",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.653.tgz",
-      "integrity": "sha512-wA2A2LQCqnEwQAvwADQq3KpMpNwgAUBnRmrFgRzHnPhbQUFArTR32Ab46f4p0MovDLcg4uqd4nCsN2hTltslpA==",
+      "version": "1.4.670",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.670.tgz",
+      "integrity": "sha512-hcijYOWjOtjKrKPtNA6tuLlA/bTLO3heFG8pQA6mLpq7dRydSWicXova5lyxDzp1iVJaYhK7J2OQlGE52KYn7A==",
       "dev": true
     },
     "node_modules/emoji-regex": {
@@ -9374,50 +9572,52 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.22.3",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.3.tgz",
-      "integrity": "sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==",
-      "dev": true,
-      "dependencies": {
-        "array-buffer-byte-length": "^1.0.0",
-        "arraybuffer.prototype.slice": "^1.0.2",
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.5",
-        "es-set-tostringtag": "^2.0.1",
+      "version": "1.22.4",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.4.tgz",
+      "integrity": "sha512-vZYJlk2u6qHYxBOTjAeg7qUxHdNfih64Uu2J8QqWgXZ2cri0ZpJAkzDUK/q593+mvKwlxyaxr6F1Q+3LKoQRgg==",
+      "dev": true,
+      "dependencies": {
+        "array-buffer-byte-length": "^1.0.1",
+        "arraybuffer.prototype.slice": "^1.0.3",
+        "available-typed-arrays": "^1.0.6",
+        "call-bind": "^1.0.7",
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "es-set-tostringtag": "^2.0.2",
         "es-to-primitive": "^1.2.1",
         "function.prototype.name": "^1.1.6",
-        "get-intrinsic": "^1.2.2",
-        "get-symbol-description": "^1.0.0",
+        "get-intrinsic": "^1.2.4",
+        "get-symbol-description": "^1.0.2",
         "globalthis": "^1.0.3",
         "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.0",
+        "has-property-descriptors": "^1.0.2",
         "has-proto": "^1.0.1",
         "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0",
-        "internal-slot": "^1.0.5",
-        "is-array-buffer": "^3.0.2",
+        "hasown": "^2.0.1",
+        "internal-slot": "^1.0.7",
+        "is-array-buffer": "^3.0.4",
         "is-callable": "^1.2.7",
         "is-negative-zero": "^2.0.2",
         "is-regex": "^1.1.4",
         "is-shared-array-buffer": "^1.0.2",
         "is-string": "^1.0.7",
-        "is-typed-array": "^1.1.12",
+        "is-typed-array": "^1.1.13",
         "is-weakref": "^1.0.2",
         "object-inspect": "^1.13.1",
         "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.5.1",
-        "safe-array-concat": "^1.0.1",
-        "safe-regex-test": "^1.0.0",
+        "object.assign": "^4.1.5",
+        "regexp.prototype.flags": "^1.5.2",
+        "safe-array-concat": "^1.1.0",
+        "safe-regex-test": "^1.0.3",
         "string.prototype.trim": "^1.2.8",
         "string.prototype.trimend": "^1.0.7",
         "string.prototype.trimstart": "^1.0.7",
-        "typed-array-buffer": "^1.0.0",
+        "typed-array-buffer": "^1.0.1",
         "typed-array-byte-length": "^1.0.0",
         "typed-array-byte-offset": "^1.0.0",
         "typed-array-length": "^1.0.4",
         "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.13"
+        "which-typed-array": "^1.1.14"
       },
       "engines": {
         "node": ">= 0.4"
@@ -9426,379 +9626,158 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/es-get-iterator": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz",
-      "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.3",
-        "has-symbols": "^1.0.3",
-        "is-arguments": "^1.1.1",
-        "is-map": "^2.0.2",
-        "is-set": "^2.0.2",
-        "is-string": "^1.0.7",
-        "isarray": "^2.0.5",
-        "stop-iteration-iterator": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/es-iterator-helpers": {
-      "version": "1.0.15",
-      "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.15.tgz",
-      "integrity": "sha512-GhoY8uYqd6iwUl2kgjTm4CZAf6oo5mHK7BPqx3rKgx893YSsy0LGHV6gfqqQvZt/8xM8xeOnfXBCfqclMKkJ5g==",
-      "dev": true,
-      "dependencies": {
-        "asynciterator.prototype": "^1.0.0",
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.22.1",
-        "es-set-tostringtag": "^2.0.1",
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.2.1",
-        "globalthis": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.5",
-        "iterator.prototype": "^1.1.2",
-        "safe-array-concat": "^1.0.1"
-      }
-    },
-    "node_modules/es-set-tostringtag": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz",
-      "integrity": "sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.2.2",
-        "has-tostringtag": "^1.0.0",
-        "hasown": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/es-shim-unscopables": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz",
-      "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==",
-      "dev": true,
-      "dependencies": {
-        "hasown": "^2.0.0"
-      }
+    "node_modules/es-array-method-boxes-properly": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz",
+      "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==",
+      "dev": true
     },
-    "node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
+    "node_modules/es-define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
       "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/esbuild": {
-      "version": "0.17.6",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.6.tgz",
-      "integrity": "sha512-TKFRp9TxrJDdRWfSsSERKEovm6v30iHnrjlcGhLBOtReE28Yp1VSBRfO3GTaOFMoxsNerx4TjrhzSuma9ha83Q==",
-      "dev": true,
-      "hasInstallScript": true,
-      "bin": {
-        "esbuild": "bin/esbuild"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "optionalDependencies": {
-        "@esbuild/android-arm": "0.17.6",
-        "@esbuild/android-arm64": "0.17.6",
-        "@esbuild/android-x64": "0.17.6",
-        "@esbuild/darwin-arm64": "0.17.6",
-        "@esbuild/darwin-x64": "0.17.6",
-        "@esbuild/freebsd-arm64": "0.17.6",
-        "@esbuild/freebsd-x64": "0.17.6",
-        "@esbuild/linux-arm": "0.17.6",
-        "@esbuild/linux-arm64": "0.17.6",
-        "@esbuild/linux-ia32": "0.17.6",
-        "@esbuild/linux-loong64": "0.17.6",
-        "@esbuild/linux-mips64el": "0.17.6",
-        "@esbuild/linux-ppc64": "0.17.6",
-        "@esbuild/linux-riscv64": "0.17.6",
-        "@esbuild/linux-s390x": "0.17.6",
-        "@esbuild/linux-x64": "0.17.6",
-        "@esbuild/netbsd-x64": "0.17.6",
-        "@esbuild/openbsd-x64": "0.17.6",
-        "@esbuild/sunos-x64": "0.17.6",
-        "@esbuild/win32-arm64": "0.17.6",
-        "@esbuild/win32-ia32": "0.17.6",
-        "@esbuild/win32-x64": "0.17.6"
-      }
-    },
-    "node_modules/esbuild-android-64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.15.18.tgz",
-      "integrity": "sha512-wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-android-arm64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.15.18.tgz",
-      "integrity": "sha512-G4xu89B8FCzav9XU8EjsXacCKSG2FT7wW9J6hOc18soEHJdtWu03L3TQDGf0geNxfLTtxENKBzMSq9LlbjS8OQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-darwin-64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.15.18.tgz",
-      "integrity": "sha512-2WAvs95uPnVJPuYKP0Eqx+Dl/jaYseZEUUT1sjg97TJa4oBtbAKnPnl3b5M9l51/nbx7+QAEtuummJZW0sBEmg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-darwin-arm64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.18.tgz",
-      "integrity": "sha512-tKPSxcTJ5OmNb1btVikATJ8NftlyNlc8BVNtyT/UAr62JFOhwHlnoPrhYWz09akBLHI9nElFVfWSTSRsrZiDUA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-freebsd-64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.18.tgz",
-      "integrity": "sha512-TT3uBUxkteAjR1QbsmvSsjpKjOX6UkCstr8nMr+q7zi3NuZ1oIpa8U41Y8I8dJH2fJgdC3Dj3CXO5biLQpfdZA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-freebsd-arm64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.18.tgz",
-      "integrity": "sha512-R/oVr+X3Tkh+S0+tL41wRMbdWtpWB8hEAMsOXDumSSa6qJR89U0S/PpLXrGF7Wk/JykfpWNokERUpCeHDl47wA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-32": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.15.18.tgz",
-      "integrity": "sha512-lphF3HiCSYtaa9p1DtXndiQEeQDKPl9eN/XNoBf2amEghugNuqXNZA/ZovthNE2aa4EN43WroO0B85xVSjYkbg==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.18.tgz",
-      "integrity": "sha512-hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-arm": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.15.18.tgz",
-      "integrity": "sha512-UH779gstRblS4aoS2qpMl3wjg7U0j+ygu3GjIeTonCcN79ZvpPee12Qun3vcdxX+37O5LFxz39XeW2I9bybMVA==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
+        "get-intrinsic": "^1.2.4"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/esbuild-linux-arm64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.18.tgz",
-      "integrity": "sha512-54qr8kg/6ilcxd+0V3h9rjT4qmjc0CccMVWrjOEM/pEcUzt8X62HfBSeZfT2ECpM7104mk4yfQXkosY8Quptug==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
       "engines": {
-        "node": ">=12"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/esbuild-linux-mips64le": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.18.tgz",
-      "integrity": "sha512-Mk6Ppwzzz3YbMl/ZZL2P0q1tnYqh/trYZ1VfNP47C31yT0K8t9s7Z077QrDA/guU60tGNp2GOwCQnp+DYv7bxQ==",
-      "cpu": [
-        "mips64el"
-      ],
+    "node_modules/es-get-iterator": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz",
+      "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.3",
+        "has-symbols": "^1.0.3",
+        "is-arguments": "^1.1.1",
+        "is-map": "^2.0.2",
+        "is-set": "^2.0.2",
+        "is-string": "^1.0.7",
+        "isarray": "^2.0.5",
+        "stop-iteration-iterator": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/esbuild-linux-ppc64le": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.18.tgz",
-      "integrity": "sha512-b0XkN4pL9WUulPTa/VKHx2wLCgvIAbgwABGnKMY19WhKZPT+8BxhZdqz6EgkqCLld7X5qiCY2F/bfpUUlnFZ9w==",
-      "cpu": [
-        "ppc64"
-      ],
+    "node_modules/es-iterator-helpers": {
+      "version": "1.0.17",
+      "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.17.tgz",
+      "integrity": "sha512-lh7BsUqelv4KUbR5a/ZTaGGIMLCjPGPqJ6q+Oq24YP0RdyptX1uzm4vvaqzk7Zx3bpl/76YLTTDj9L7uYQ92oQ==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
+      "dependencies": {
+        "asynciterator.prototype": "^1.0.0",
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.22.4",
+        "es-errors": "^1.3.0",
+        "es-set-tostringtag": "^2.0.2",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "globalthis": "^1.0.3",
+        "has-property-descriptors": "^1.0.2",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.7",
+        "iterator.prototype": "^1.1.2",
+        "safe-array-concat": "^1.1.0"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/esbuild-linux-riscv64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.18.tgz",
-      "integrity": "sha512-ba2COaoF5wL6VLZWn04k+ACZjZ6NYniMSQStodFKH/Pu6RxzQqzsmjR1t9QC89VYJxBeyVPTaHuBMCejl3O/xg==",
-      "cpu": [
-        "riscv64"
-      ],
+    "node_modules/es-module-lexer": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.4.1.tgz",
+      "integrity": "sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w==",
+      "dev": true
+    },
+    "node_modules/es-set-tostringtag": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz",
+      "integrity": "sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
+      "dependencies": {
+        "get-intrinsic": "^1.2.2",
+        "has-tostringtag": "^1.0.0",
+        "hasown": "^2.0.0"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/esbuild-linux-s390x": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.18.tgz",
-      "integrity": "sha512-VbpGuXEl5FCs1wDVp93O8UIzl3ZrglgnSQ+Hu79g7hZu6te6/YHgVJxCM2SqfIila0J3k0csfnf8VD2W7u2kzQ==",
-      "cpu": [
-        "s390x"
-      ],
+    "node_modules/es-shim-unscopables": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz",
+      "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
+      "dependencies": {
+        "hasown": "^2.0.0"
       }
     },
-    "node_modules/esbuild-netbsd-64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.18.tgz",
-      "integrity": "sha512-98ukeCdvdX7wr1vUYQzKo4kQ0N2p27H7I11maINv73fVEXt2kyh4K4m9f35U1K43Xc2QGXlzAw0K9yoU7JUjOg==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
+      "dependencies": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/esbuild-openbsd-64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.18.tgz",
-      "integrity": "sha512-yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/esbuild": {
+      "version": "0.17.6",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.6.tgz",
+      "integrity": "sha512-TKFRp9TxrJDdRWfSsSERKEovm6v30iHnrjlcGhLBOtReE28Yp1VSBRfO3GTaOFMoxsNerx4TjrhzSuma9ha83Q==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
+      "hasInstallScript": true,
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
       "engines": {
         "node": ">=12"
+      },
+      "optionalDependencies": {
+        "@esbuild/android-arm": "0.17.6",
+        "@esbuild/android-arm64": "0.17.6",
+        "@esbuild/android-x64": "0.17.6",
+        "@esbuild/darwin-arm64": "0.17.6",
+        "@esbuild/darwin-x64": "0.17.6",
+        "@esbuild/freebsd-arm64": "0.17.6",
+        "@esbuild/freebsd-x64": "0.17.6",
+        "@esbuild/linux-arm": "0.17.6",
+        "@esbuild/linux-arm64": "0.17.6",
+        "@esbuild/linux-ia32": "0.17.6",
+        "@esbuild/linux-loong64": "0.17.6",
+        "@esbuild/linux-mips64el": "0.17.6",
+        "@esbuild/linux-ppc64": "0.17.6",
+        "@esbuild/linux-riscv64": "0.17.6",
+        "@esbuild/linux-s390x": "0.17.6",
+        "@esbuild/linux-x64": "0.17.6",
+        "@esbuild/netbsd-x64": "0.17.6",
+        "@esbuild/openbsd-x64": "0.17.6",
+        "@esbuild/sunos-x64": "0.17.6",
+        "@esbuild/win32-arm64": "0.17.6",
+        "@esbuild/win32-ia32": "0.17.6",
+        "@esbuild/win32-x64": "0.17.6"
       }
     },
     "node_modules/esbuild-plugins-node-modules-polyfill": {
@@ -9818,74 +9797,10 @@
         "esbuild": "^0.14.0 || ^0.15.0 || ^0.16.0 || ^0.17.0 || ^0.18.0 || ^0.19.0 || ^0.20.0"
       }
     },
-    "node_modules/esbuild-sunos-64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.15.18.tgz",
-      "integrity": "sha512-On22LLFlBeLNj/YF3FT+cXcyKPEI263nflYlAhz5crxtp3yRG1Ugfr7ITyxmCmjm4vbN/dGrb/B7w7U8yJR9yw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-windows-32": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.15.18.tgz",
-      "integrity": "sha512-o+eyLu2MjVny/nt+E0uPnBxYuJHBvho8vWsC2lV61A7wwTWC3jkN2w36jtA+yv1UgYkHRihPuQsL23hsCYGcOQ==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-windows-64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.15.18.tgz",
-      "integrity": "sha512-qinug1iTTaIIrCorAUjR0fcBk24fjzEedFYhhispP8Oc7SFvs+XeW3YpAKiKp8dRpizl4YYAhxMjlftAMJiaUw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-windows-arm64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.18.tgz",
-      "integrity": "sha512-q9bsYzegpZcLziq0zgUi5KqGVtfhjxGbnksaBFYmWLxeV/S1fK4OLdq2DFYnXcLMjlZw2L0jLsk1eGoB522WXQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
+      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
       "engines": {
         "node": ">=6"
       }
@@ -9975,9 +9890,9 @@
       }
     },
     "node_modules/eslint-config-prettier": {
-      "version": "8.10.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz",
-      "integrity": "sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==",
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz",
+      "integrity": "sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==",
       "dev": true,
       "bin": {
         "eslint-config-prettier": "bin/cli.js"
@@ -10471,9 +10386,9 @@
       }
     },
     "node_modules/eslint-plugin-tailwindcss": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-tailwindcss/-/eslint-plugin-tailwindcss-3.14.1.tgz",
-      "integrity": "sha512-orNkVzJ1fdCkj5d8AHE3tAbixNpMJRoKoHPnxZbZ6iBHTsNvOEmeBz62C3THPhFnXCXaD55SRbNjqGzMEXRoZA==",
+      "version": "3.14.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-tailwindcss/-/eslint-plugin-tailwindcss-3.14.2.tgz",
+      "integrity": "sha512-fNzdf4poZP2yQC0xC2prQxMuArMSb5mnellLQvwb9HC3NcLzxs+0IVKWIg1BqUqyui0c+bbjMmhWcKUWK67SLQ==",
       "dev": true,
       "dependencies": {
         "fast-glob": "^3.2.5",
@@ -10858,7 +10773,6 @@
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
       "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-      "dev": true,
       "engines": {
         "node": ">=0.8.x"
       }
@@ -10898,30 +10812,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/expand-template": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
-      "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/expect": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
-      "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
-      "dev": true,
-      "dependencies": {
-        "@jest/expect-utils": "^29.7.0",
-        "jest-get-type": "^29.6.3",
-        "jest-matcher-utils": "^29.7.0",
-        "jest-message-util": "^29.7.0",
-        "jest-util": "^29.7.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
     "node_modules/exponential-backoff": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz",
@@ -10969,6 +10859,14 @@
         "node": ">= 0.10.0"
       }
     },
+    "node_modules/express/node_modules/cookie": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/express/node_modules/cookie-signature": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
@@ -10987,6 +10885,11 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
+    "node_modules/express/node_modules/path-to-regexp": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
+    },
     "node_modules/express/node_modules/safe-buffer": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@@ -11037,11 +10940,16 @@
         "node": ">=4"
       }
     },
+    "node_modules/fast-copy": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/fast-copy/-/fast-copy-3.0.1.tgz",
+      "integrity": "sha512-Knr7NOtK3HWRYGtHoJrjkaWepqT8thIVGAwt0p0aUs1zqkAzXZV4vo9fFNwyb5fcqK1GKYFYxldQdIDVKhUAfA=="
+    },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
+      "devOptional": true
     },
     "node_modules/fast-equals": {
       "version": "5.0.1",
@@ -11051,11 +10959,6 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/fast-fifo": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz",
-      "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ=="
-    },
     "node_modules/fast-glob": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
@@ -11089,10 +10992,15 @@
       "integrity": "sha512-Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw==",
       "dev": true
     },
+    "node_modules/fast-safe-stringify": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
+      "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA=="
+    },
     "node_modules/fastq": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.0.tgz",
-      "integrity": "sha512-zGygtijUMT7jnk3h26kUms3BkSDp4IfIKjmnqI2tvx6nuBfiF1UqOxbnLfzdv+apBy+53oaImsKtMw/xYbW+1w==",
+      "version": "1.17.1",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
+      "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
       "dependencies": {
         "reusify": "^1.0.4"
       }
@@ -11263,16 +11171,29 @@
       }
     },
     "node_modules/foreground-child": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz",
-      "integrity": "sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==",
-      "dev": true,
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
+      "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
       "dependencies": {
         "cross-spawn": "^7.0.0",
-        "signal-exit": "^3.0.2"
+        "signal-exit": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=14"
       },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/foreground-child/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
       "engines": {
-        "node": ">=8.0.0"
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/form-data": {
@@ -11325,9 +11246,9 @@
       }
     },
     "node_modules/framer-motion": {
-      "version": "9.1.7",
-      "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-9.1.7.tgz",
-      "integrity": "sha512-nKxBkIO4IPkMEqcBbbATxsVjwPYShKl051yhBv9628iAH6JLeHD0siBHxkL62oQzMC1+GNX73XtPjgP753ufuw==",
+      "version": "11.0.5",
+      "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-11.0.5.tgz",
+      "integrity": "sha512-Lb0EYbQcSK/pgyQUJm+KzsQrKrJRX9sFRyzl9hSr9gFG4Mk8yP7BjhuxvRXzblOM/+JxycrJdCDVmOQBsjpYlw==",
       "dependencies": {
         "tslib": "^2.4.0"
       },
@@ -11337,6 +11258,14 @@
       "peerDependencies": {
         "react": "^18.0.0",
         "react-dom": "^18.0.0"
+      },
+      "peerDependenciesMeta": {
+        "react": {
+          "optional": true
+        },
+        "react-dom": {
+          "optional": true
+        }
       }
     },
     "node_modules/fresh": {
@@ -11356,7 +11285,8 @@
     "node_modules/fs-constants": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
+      "dev": true
     },
     "node_modules/fs-extra": {
       "version": "10.1.0",
@@ -11518,15 +11448,19 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz",
-      "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
       "dependencies": {
+        "es-errors": "^1.3.0",
         "function-bind": "^1.1.2",
         "has-proto": "^1.0.1",
         "has-symbols": "^1.0.3",
         "hasown": "^2.0.0"
       },
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -11574,13 +11508,14 @@
       }
     },
     "node_modules/get-symbol-description": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz",
+      "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
+        "call-bind": "^1.0.5",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4"
       },
       "engines": {
         "node": ">= 0.4"
@@ -11609,11 +11544,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/github-from-package": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
-      "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw=="
-    },
     "node_modules/gl-matrix": {
       "version": "3.4.3",
       "resolved": "https://registry.npmjs.org/gl-matrix/-/gl-matrix-3.4.3.tgz",
@@ -11651,38 +11581,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/glob-regex": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/glob-regex/-/glob-regex-0.3.2.tgz",
-      "integrity": "sha512-m5blUd3/OqDTWwzBBtWBPrGlAzatRywHameHeekAZyZrskYouOGdNB8T/q6JucucvJXtOuyHIn0/Yia7iDasDw==",
-      "dev": true
-    },
-    "node_modules/glob/node_modules/foreground-child": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
-      "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
-      "dependencies": {
-        "cross-spawn": "^7.0.0",
-        "signal-exit": "^4.0.1"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/glob/node_modules/signal-exit": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/global-dirs": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.1.tgz",
@@ -11861,29 +11759,17 @@
       }
     },
     "node_modules/happy-dom": {
-      "version": "10.11.2",
-      "resolved": "https://registry.npmjs.org/happy-dom/-/happy-dom-10.11.2.tgz",
-      "integrity": "sha512-rzgmLjLkhyaOdFEyU8CWXzbgyCyM7wJHLqhaoeEVSTyur1fjcUaiNTHx+D4CPaLvx16tGy+SBPd9TVnP/kzL3w==",
+      "version": "13.3.8",
+      "resolved": "https://registry.npmjs.org/happy-dom/-/happy-dom-13.3.8.tgz",
+      "integrity": "sha512-RAbq4oYfJNkVan1m1F3jfA4YEyRY0/ASoNvZsNJbuX85jIypidmsz9jQZD7Tqz0VXA2MhAGfcsh5oshwmwNYSg==",
       "dev": true,
       "dependencies": {
-        "css.escape": "^1.5.1",
         "entities": "^4.5.0",
-        "iconv-lite": "^0.6.3",
         "webidl-conversions": "^7.0.0",
-        "whatwg-encoding": "^2.0.0",
         "whatwg-mimetype": "^3.0.0"
-      }
-    },
-    "node_modules/happy-dom/node_modules/iconv-lite": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "dev": true,
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=16.0.0"
       }
     },
     "node_modules/has-bigints": {
@@ -11905,11 +11791,11 @@
       }
     },
     "node_modules/has-property-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz",
-      "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
       "dependencies": {
-        "get-intrinsic": "^1.2.2"
+        "es-define-property": "^1.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -11938,11 +11824,11 @@
       }
     },
     "node_modules/has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
       "dependencies": {
-        "has-symbols": "^1.0.2"
+        "has-symbols": "^1.0.3"
       },
       "engines": {
         "node": ">= 0.4"
@@ -11970,9 +11856,9 @@
       }
     },
     "node_modules/hasown": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
-      "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.1.tgz",
+      "integrity": "sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==",
       "dependencies": {
         "function-bind": "^1.1.2"
       },
@@ -12023,6 +11909,11 @@
       "integrity": "sha512-tUCGvt191vNSQgttSyJoibR+VO+I6+iCHIUdhzEMJKE+EAL8BwCN7fUOZlY4ofOelNHsK+gEjxB/B+9N3EWtdA==",
       "dev": true
     },
+    "node_modules/help-me": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/help-me/-/help-me-5.0.0.tgz",
+      "integrity": "sha512-7xgomUX6ADmcYzFik0HzAxh/73YlKR9bmFzf51CZwR+b6YtzU2m0u49hQCqV6SvlqIqsaxovfwdvbnsw3b/zpg=="
+    },
     "node_modules/hoist-non-react-statics": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
@@ -12031,6 +11922,14 @@
         "react-is": "^16.7.0"
       }
     },
+    "node_modules/hono": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/hono/-/hono-4.0.2.tgz",
+      "integrity": "sha512-ZW/13BsQmQHlFb3IYGuzgbzY0wBO6WTvOHbpmUfVhVvdMyBNGtuz55quxM7JXoG2orzmv5hEorOAm3ocwzaV0Q==",
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
     "node_modules/hosted-git-info": {
       "version": "6.1.1",
       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz",
@@ -12058,6 +11957,16 @@
       "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
       "dev": true
     },
+    "node_modules/html-parse-stringify": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz",
+      "integrity": "sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "void-elements": "3.1.0"
+      }
+    },
     "node_modules/html-to-text": {
       "version": "9.0.5",
       "resolved": "https://registry.npmjs.org/html-to-text/-/html-to-text-9.0.5.tgz",
@@ -12170,20 +12079,43 @@
       }
     },
     "node_modules/husky": {
-      "version": "8.0.3",
-      "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.3.tgz",
-      "integrity": "sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg==",
+      "version": "9.0.11",
+      "resolved": "https://registry.npmjs.org/husky/-/husky-9.0.11.tgz",
+      "integrity": "sha512-AB6lFlbwwyIqMdHYhwPe+kjOC3Oc5P3nThEoW/AaO2BX3vJDjWPFxYLxokUZOo6RNX20He3AaT8sESs9NJcmEw==",
       "dev": true,
       "bin": {
-        "husky": "lib/bin.js"
+        "husky": "bin.mjs"
       },
       "engines": {
-        "node": ">=14"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/typicode"
       }
     },
+    "node_modules/i18next": {
+      "version": "23.8.2",
+      "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.8.2.tgz",
+      "integrity": "sha512-Z84zyEangrlERm0ZugVy4bIt485e/H8VecGUZkZWrH7BDePG6jT73QdL9EA1tRTTVVMpry/MgWIP1FjEn0DRXA==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://locize.com"
+        },
+        {
+          "type": "individual",
+          "url": "https://locize.com/i18next.html"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.i18next.com/how-to/faq#i18next-is-awesome.-how-can-i-support-the-project"
+        }
+      ],
+      "optional": true,
+      "dependencies": {
+        "@babel/runtime": "^7.23.2"
+      }
+    },
     "node_modules/iconv-lite": {
       "version": "0.4.24",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@@ -12387,12 +12319,12 @@
       }
     },
     "node_modules/internal-slot": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.6.tgz",
-      "integrity": "sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz",
+      "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==",
       "dev": true,
       "dependencies": {
-        "get-intrinsic": "^1.2.2",
+        "es-errors": "^1.3.0",
         "hasown": "^2.0.0",
         "side-channel": "^1.0.4"
       },
@@ -12424,11 +12356,18 @@
         "loose-envify": "^1.0.0"
       }
     },
-    "node_modules/ip": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz",
-      "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==",
-      "dev": true
+    "node_modules/ip-address": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
+      "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
+      "dev": true,
+      "dependencies": {
+        "jsbn": "1.1.0",
+        "sprintf-js": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 12"
+      }
     },
     "node_modules/ipaddr.js": {
       "version": "1.9.1",
@@ -12478,14 +12417,16 @@
       }
     },
     "node_modules/is-array-buffer": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
-      "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz",
+      "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.0",
-        "is-typed-array": "^1.1.10"
+        "get-intrinsic": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -12942,11 +12883,11 @@
       }
     },
     "node_modules/is-typed-array": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
-      "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz",
+      "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==",
       "dependencies": {
-        "which-typed-array": "^1.1.11"
+        "which-typed-array": "^1.1.14"
       },
       "engines": {
         "node": ">= 0.4"
@@ -13023,11 +12964,11 @@
       "dev": true
     },
     "node_modules/isbot": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/isbot/-/isbot-3.8.0.tgz",
-      "integrity": "sha512-vne1mzQUTR+qsMLeCBL9+/tgnDXRyc2pygLGl/WsgA+EZKIiB5Ehu0CiVTHIIk30zhJ24uGz4M5Ppse37aR0Hg==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/isbot/-/isbot-4.4.0.tgz",
+      "integrity": "sha512-8ZvOWUA68kyJO4hHJdWjyreq7TYNWTS9y15IzeqVdKxR9pPr3P/3r9AHcoIv9M0Rllkao5qWz2v1lmcyKIVCzQ==",
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/isexe": {
@@ -13051,242 +12992,93 @@
       "engines": {
         "node": ">=8"
       }
-    },
-    "node_modules/istanbul-lib-report": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
-      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
-      "dev": true,
-      "dependencies": {
-        "istanbul-lib-coverage": "^3.0.0",
-        "make-dir": "^4.0.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/istanbul-reports": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.6.tgz",
-      "integrity": "sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==",
-      "dev": true,
-      "dependencies": {
-        "html-escaper": "^2.0.0",
-        "istanbul-lib-report": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/iterator.prototype": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.2.tgz",
-      "integrity": "sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.2.1",
-        "get-intrinsic": "^1.2.1",
-        "has-symbols": "^1.0.3",
-        "reflect.getprototypeof": "^1.0.4",
-        "set-function-name": "^2.0.1"
-      }
-    },
-    "node_modules/jackspeak": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz",
-      "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==",
-      "dependencies": {
-        "@isaacs/cliui": "^8.0.2"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      },
-      "optionalDependencies": {
-        "@pkgjs/parseargs": "^0.11.0"
-      }
-    },
-    "node_modules/javascript-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/javascript-stringify/-/javascript-stringify-2.1.0.tgz",
-      "integrity": "sha512-JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg==",
-      "dev": true
-    },
-    "node_modules/jest-diff": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
-      "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "diff-sequences": "^29.6.3",
-        "jest-get-type": "^29.6.3",
-        "pretty-format": "^29.7.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-diff/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-diff/node_modules/pretty-format": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
-      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-      "dev": true,
-      "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-diff/node_modules/react-is": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
-      "dev": true
-    },
-    "node_modules/jest-get-type": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
-      "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
-      "dev": true,
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-matcher-utils": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
-      "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "jest-diff": "^29.7.0",
-        "jest-get-type": "^29.6.3",
-        "pretty-format": "^29.7.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-matcher-utils/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-matcher-utils/node_modules/pretty-format": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
-      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
+    },
+    "node_modules/istanbul-lib-report": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
       "dev": true,
       "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^4.0.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">=10"
       }
     },
-    "node_modules/jest-matcher-utils/node_modules/react-is": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
-      "dev": true
-    },
-    "node_modules/jest-message-util": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
-      "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
+    "node_modules/istanbul-lib-source-maps": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^29.6.3",
-        "@types/stack-utils": "^2.0.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^29.7.0",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0",
+        "source-map": "^0.6.1"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">=10"
       }
     },
-    "node_modules/jest-message-util/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+    "node_modules/istanbul-lib-source-maps/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/jest-message-util/node_modules/pretty-format": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
-      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
+    "node_modules/istanbul-reports": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.6.tgz",
+      "integrity": "sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==",
       "dev": true,
       "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">=8"
       }
     },
-    "node_modules/jest-message-util/node_modules/react-is": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
-      "dev": true
-    },
-    "node_modules/jest-util": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
-      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
+    "node_modules/iterator.prototype": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.2.tgz",
+      "integrity": "sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^29.6.3",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
+        "define-properties": "^1.2.1",
+        "get-intrinsic": "^1.2.1",
+        "has-symbols": "^1.0.3",
+        "reflect.getprototypeof": "^1.0.4",
+        "set-function-name": "^2.0.1"
+      }
+    },
+    "node_modules/jackspeak": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz",
+      "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==",
+      "dependencies": {
+        "@isaacs/cliui": "^8.0.2"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
       }
     },
+    "node_modules/javascript-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/javascript-stringify/-/javascript-stringify-2.1.0.tgz",
+      "integrity": "sha512-JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg==",
+      "dev": true
+    },
     "node_modules/jiti": {
       "version": "1.21.0",
       "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz",
@@ -13334,6 +13126,14 @@
         }
       }
     },
+    "node_modules/joycon": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/joycon/-/joycon-3.1.1.tgz",
+      "integrity": "sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/js-beautify": {
       "version": "1.14.11",
       "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.11.tgz",
@@ -13379,6 +13179,12 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
+    "node_modules/jsbn": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
+      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
+      "dev": true
+    },
     "node_modules/jsesc": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
@@ -13434,9 +13240,9 @@
       "dev": true
     },
     "node_modules/json-stringify-pretty-compact": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/json-stringify-pretty-compact/-/json-stringify-pretty-compact-3.0.0.tgz",
-      "integrity": "sha512-Rc2suX5meI0S3bfdZuA7JMFBGkJ875ApfVyq2WHELjBiiG22My/l7/8zPpH/CfFVQHuVLd8NLR0nv6vi0BYYKA=="
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/json-stringify-pretty-compact/-/json-stringify-pretty-compact-4.0.0.tgz",
+      "integrity": "sha512-3CNZ2DnrpByG9Nqj6Xo8vqbjT4F6N+tb4Gb28ESAZjYZ5yqvmc56J+/kuIwkaAMOyblTQhUW7PxMkUb8Q36N3Q=="
     },
     "node_modules/json5": {
       "version": "2.2.3",
@@ -13657,11 +13463,14 @@
       }
     },
     "node_modules/lilconfig": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.0.0.tgz",
-      "integrity": "sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.0.tgz",
+      "integrity": "sha512-p3cz0JV5vw/XeouBU3Ldnp+ZkBjE+n8ydJ4mcwBrOiXXPqNlrzGBqWs9X4MWF7f+iKUBu794Y8Hh8yawiJbCjw==",
       "engines": {
         "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antonk52"
       }
     },
     "node_modules/lines-and-columns": {
@@ -13872,17 +13681,28 @@
       }
     },
     "node_modules/magic-string": {
-      "version": "0.26.7",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.26.7.tgz",
-      "integrity": "sha512-hX9XH3ziStPoPhJxLq1syWuZMxbDvGNbVchfrdCtanC7D13888bMFow61x8axrx+GfHLtVeAx2kxL7tTGRl+Ow==",
+      "version": "0.30.7",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.7.tgz",
+      "integrity": "sha512-8vBuFF/I/+OSLRmdf2wwFCJCz+nSn0m6DPvGH1fS/KiQoSaR+sETbov0eIk9KhEKy8CYqIkIAnbohxT/4H0kuA==",
       "dev": true,
       "dependencies": {
-        "sourcemap-codec": "^1.4.8"
+        "@jridgewell/sourcemap-codec": "^1.4.15"
       },
       "engines": {
         "node": ">=12"
       }
     },
+    "node_modules/magicast": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/magicast/-/magicast-0.3.3.tgz",
+      "integrity": "sha512-ZbrP1Qxnpoes8sz47AM0z08U+jW6TyRgZzcWy3Ma3vDhJttwMwAFDMMQFobwdBxByBD46JYmxRzeF7w2+wJEuw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/parser": "^7.23.6",
+        "@babel/types": "^7.23.6",
+        "source-map-js": "^1.0.2"
+      }
+    },
     "node_modules/make-dir": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
@@ -13949,9 +13769,9 @@
       "dev": true
     },
     "node_modules/mapbox-gl": {
-      "version": "2.15.0",
-      "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-2.15.0.tgz",
-      "integrity": "sha512-fjv+aYrd5TIHiL7wRa+W7KjtUqKWziJMZUkK5hm8TvJ3OLeNPx4NmW/DgfYhd/jHej8wWL+QJBDbdMMAKvNC0A==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-3.1.2.tgz",
+      "integrity": "sha512-+KoLEqZM8GxO/ViPz9tKgGURteKne+Y0pXiVCNsowymiZFH3FiL6dt9oZE95owMg5XqD3Kygz5mfchR1ZgmWlA==",
       "dependencies": {
         "@mapbox/geojson-rewind": "^0.5.2",
         "@mapbox/jsonlint-lines-primitives": "^2.0.2",
@@ -13961,6 +13781,7 @@
         "@mapbox/unitbezier": "^0.0.1",
         "@mapbox/vector-tile": "^1.3.1",
         "@mapbox/whoots-js": "^3.1.0",
+        "cheap-ruler": "^3.0.1",
         "csscolorparser": "~1.0.3",
         "earcut": "^2.2.4",
         "geojson-vt": "^3.2.1",
@@ -13978,9 +13799,9 @@
       }
     },
     "node_modules/maplibre-gl": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-3.6.2.tgz",
-      "integrity": "sha512-krg2KFIdOpLPngONDhP6ixCoWl5kbdMINP0moMSJFVX7wX1Clm2M9hlNKXS8vBGlVWwR5R3ZfI6IPrYz7c+aCQ==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-4.0.1.tgz",
+      "integrity": "sha512-UF+wI2utIciFXNg6+gYaMe7IGa9fMLzAZM3vdlGilqyWYmuibjcN40yGVgkz2r28//aOLphvtli3TbDEjEqHww==",
       "dependencies": {
         "@mapbox/geojson-rewind": "^0.5.2",
         "@mapbox/jsonlint-lines-primitives": "^2.0.2",
@@ -13989,8 +13810,9 @@
         "@mapbox/unitbezier": "^0.0.1",
         "@mapbox/vector-tile": "^1.3.1",
         "@mapbox/whoots-js": "^3.1.0",
-        "@maplibre/maplibre-gl-style-spec": "^19.3.3",
-        "@types/geojson": "^7946.0.13",
+        "@maplibre/maplibre-gl-style-spec": "^20.1.1",
+        "@types/geojson": "^7946.0.14",
+        "@types/geojson-vt": "3.2.5",
         "@types/mapbox__point-geometry": "^0.1.4",
         "@types/mapbox__vector-tile": "^1.3.4",
         "@types/pbf": "^3.0.5",
@@ -14899,14 +14721,15 @@
       }
     },
     "node_modules/mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
+      "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
+      "optional": true,
       "bin": {
         "mime": "cli.js"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=4.0.0"
       }
     },
     "node_modules/mime-db": {
@@ -14938,11 +14761,12 @@
       }
     },
     "node_modules/mimic-response": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
-      "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-4.0.0.tgz",
+      "integrity": "sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg==",
+      "dev": true,
       "engines": {
-        "node": ">=10"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -15207,7 +15031,8 @@
     "node_modules/mkdirp-classic": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
-      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
+      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
+      "dev": true
     },
     "node_modules/mlly": {
       "version": "1.5.0",
@@ -15334,6 +15159,12 @@
         }
       }
     },
+    "node_modules/msw/node_modules/@types/cookie": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz",
+      "integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==",
+      "dev": true
+    },
     "node_modules/msw/node_modules/cookie": {
       "version": "0.4.2",
       "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
@@ -15343,12 +15174,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/msw/node_modules/path-to-regexp": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.1.tgz",
-      "integrity": "sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw==",
-      "dev": true
-    },
     "node_modules/murmurhash-js": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/murmurhash-js/-/murmurhash-js-1.0.0.tgz",
@@ -15387,11 +15212,6 @@
         "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
       }
     },
-    "node_modules/napi-build-utils": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
-      "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg=="
-    },
     "node_modules/natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -15418,22 +15238,6 @@
       "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
       "dev": true
     },
-    "node_modules/node-abi": {
-      "version": "3.54.0",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.54.0.tgz",
-      "integrity": "sha512-p7eGEiQil0YUV3ItH4/tBb781L5impVmmx2E9FRKF7d18XXzp4PGT2tdYMFY6wQqgxD0IwNZOiSJ0/K0fSi/OA==",
-      "dependencies": {
-        "semver": "^7.3.5"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/node-addon-api": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz",
-      "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA=="
-    },
     "node_modules/node-fetch": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
@@ -15846,9 +15650,9 @@
       }
     },
     "node_modules/npm-check-updates": {
-      "version": "16.14.14",
-      "resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-16.14.14.tgz",
-      "integrity": "sha512-Y3ajS/Ep40jM489rLBdz9jehn/BMil5s9fA4PSr2ZJxxSmtLWCSmRqsI2IEZ9Nb3MTMu8a3s7kBs0l+JbjdkTA==",
+      "version": "16.14.15",
+      "resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-16.14.15.tgz",
+      "integrity": "sha512-WH0wJ9j6CP7Azl+LLCxWAYqroT2IX02kRIzgK/fg0rPpMbETgHITWBdOPtrv521xmA3JMgeNsQ62zvVtS/nCmQ==",
       "dev": true,
       "dependencies": {
         "chalk": "^5.3.0",
@@ -16404,15 +16208,16 @@
       }
     },
     "node_modules/object.groupby": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.1.tgz",
-      "integrity": "sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.2.tgz",
+      "integrity": "sha512-bzBq58S+x+uo0VjurFT0UktpKHOZmv4/xePiOA1nbB9pMqpGK7rUPNgf+1YC+7mE+0HzhTMqNUuCqvKhj6FnBw==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "get-intrinsic": "^1.2.1"
+        "array.prototype.filter": "^1.0.3",
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.22.3",
+        "es-errors": "^1.0.0"
       }
     },
     "node_modules/object.hasown": {
@@ -16445,6 +16250,14 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/on-exit-leak-free": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/on-exit-leak-free/-/on-exit-leak-free-2.1.2.tgz",
+      "integrity": "sha512-0eJJY6hXLGf1udHwfNftBqH+g73EU4B504nZeKpz1sYRKafAghwxEJunB2O7rDZkL4PGfsMVnTXZ2EjibbqcsA==",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
     "node_modules/on-finished": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
@@ -16812,9 +16625,9 @@
       }
     },
     "node_modules/path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.1.tgz",
+      "integrity": "sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw=="
     },
     "node_modules/path-type": {
       "version": "4.0.0",
@@ -17016,16 +16829,179 @@
         "pidtree": "bin/pidtree.js"
       },
       "engines": {
-        "node": ">=0.10"
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/pify": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+      "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/pino-abstract-transport": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/pino-abstract-transport/-/pino-abstract-transport-1.1.0.tgz",
+      "integrity": "sha512-lsleG3/2a/JIWUtf9Q5gUNErBqwIu1tUKTT3dUzaf5DySw9ra1wcqKjJjLX1VTY64Wk1eEOYsVGSaGfCK85ekA==",
+      "dependencies": {
+        "readable-stream": "^4.0.0",
+        "split2": "^4.0.0"
+      }
+    },
+    "node_modules/pino-abstract-transport/node_modules/buffer": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.2.1"
+      }
+    },
+    "node_modules/pino-abstract-transport/node_modules/readable-stream": {
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.5.2.tgz",
+      "integrity": "sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g==",
+      "dependencies": {
+        "abort-controller": "^3.0.0",
+        "buffer": "^6.0.3",
+        "events": "^3.3.0",
+        "process": "^0.11.10",
+        "string_decoder": "^1.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/pino-abstract-transport/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/pino-abstract-transport/node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "node_modules/pino-pretty": {
+      "version": "10.3.1",
+      "resolved": "https://registry.npmjs.org/pino-pretty/-/pino-pretty-10.3.1.tgz",
+      "integrity": "sha512-az8JbIYeN/1iLj2t0jR9DV48/LQ3RC6hZPpapKPkb84Q+yTidMCpgWxIT3N0flnBDilyBQ1luWNpOeJptjdp/g==",
+      "dependencies": {
+        "colorette": "^2.0.7",
+        "dateformat": "^4.6.3",
+        "fast-copy": "^3.0.0",
+        "fast-safe-stringify": "^2.1.1",
+        "help-me": "^5.0.0",
+        "joycon": "^3.1.1",
+        "minimist": "^1.2.6",
+        "on-exit-leak-free": "^2.1.0",
+        "pino-abstract-transport": "^1.0.0",
+        "pump": "^3.0.0",
+        "readable-stream": "^4.0.0",
+        "secure-json-parse": "^2.4.0",
+        "sonic-boom": "^3.0.0",
+        "strip-json-comments": "^3.1.1"
+      },
+      "bin": {
+        "pino-pretty": "bin.js"
+      }
+    },
+    "node_modules/pino-pretty/node_modules/buffer": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.2.1"
+      }
+    },
+    "node_modules/pino-pretty/node_modules/readable-stream": {
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.5.2.tgz",
+      "integrity": "sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g==",
+      "dependencies": {
+        "abort-controller": "^3.0.0",
+        "buffer": "^6.0.3",
+        "events": "^3.3.0",
+        "process": "^0.11.10",
+        "string_decoder": "^1.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
-    "node_modules/pify": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
+    "node_modules/pino-pretty/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/pino-pretty/node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
       }
     },
     "node_modules/pirates": {
@@ -17048,12 +17024,12 @@
       }
     },
     "node_modules/playwright": {
-      "version": "1.41.1",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.41.1.tgz",
-      "integrity": "sha512-gdZAWG97oUnbBdRL3GuBvX3nDDmUOuqzV/D24dytqlKt+eI5KbwusluZRGljx1YoJKZ2NRPaeWiFTeGZO7SosQ==",
+      "version": "1.41.2",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.41.2.tgz",
+      "integrity": "sha512-v0bOa6H2GJChDL8pAeLa/LZC4feoAMbSQm1/jF/ySsWWoaNItvrMP7GEkvEEFyCTUYKMxjQKaTSg5up7nR6/8A==",
       "dev": true,
       "dependencies": {
-        "playwright-core": "1.41.1"
+        "playwright-core": "1.41.2"
       },
       "bin": {
         "playwright": "cli.js"
@@ -17066,9 +17042,9 @@
       }
     },
     "node_modules/playwright-core": {
-      "version": "1.41.1",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.41.1.tgz",
-      "integrity": "sha512-/KPO5DzXSMlxSX77wy+HihKGOunh3hqndhqeo/nMxfigiKzogn8kfL0ZBDu0L1RKgan5XHCPmn6zXd2NUJgjhg==",
+      "version": "1.41.2",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.41.2.tgz",
+      "integrity": "sha512-VaTvwCA4Y8kxEe+kfm2+uUUw5Lubf38RxF7FpBxLPmGe5sdNkSg5e3ChEigaGrX7qdqT3pt2m/98LiyvU2x6CA==",
       "dev": true,
       "bin": {
         "playwright-core": "cli.js"
@@ -17092,9 +17068,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.33",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.33.tgz",
-      "integrity": "sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==",
+      "version": "8.4.35",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.35.tgz",
+      "integrity": "sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==",
       "funding": [
         {
           "type": "opencollective",
@@ -17364,40 +17340,6 @@
       "resolved": "https://registry.npmjs.org/potpack/-/potpack-2.0.0.tgz",
       "integrity": "sha512-Q+/tYsFU9r7xoOJ+y/ZTtdVQwTWfzjbiXBDMM/JKUux3+QPP02iUuIoeBQ+Ot6oEDlC+/PGjB/5A3K7KKb7hcw=="
     },
-    "node_modules/prebuild-install": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz",
-      "integrity": "sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==",
-      "dependencies": {
-        "detect-libc": "^2.0.0",
-        "expand-template": "^2.0.3",
-        "github-from-package": "0.0.0",
-        "minimist": "^1.2.3",
-        "mkdirp-classic": "^0.5.3",
-        "napi-build-utils": "^1.0.1",
-        "node-abi": "^3.3.0",
-        "pump": "^3.0.0",
-        "rc": "^1.2.7",
-        "simple-get": "^4.0.0",
-        "tar-fs": "^2.0.0",
-        "tunnel-agent": "^0.6.0"
-      },
-      "bin": {
-        "prebuild-install": "bin.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/prebuild-install/node_modules/pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
     "node_modules/prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
@@ -17491,6 +17433,17 @@
         }
       }
     },
+    "node_modules/pretty-cache-header": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/pretty-cache-header/-/pretty-cache-header-1.0.0.tgz",
+      "integrity": "sha512-xtXazslu25CdnGnUkByU1RoOjK55TqwatJkjjJLg5ZAdz2Lngko/mmaUgeET36P2GMlNwh3fdM7FWBO717pNcw==",
+      "dependencies": {
+        "timestring": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=12.13"
+      }
+    },
     "node_modules/pretty-format": {
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
@@ -17571,6 +17524,14 @@
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
+    "node_modules/process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
     "node_modules/process-nextick-args": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
@@ -17679,10 +17640,9 @@
       }
     },
     "node_modules/pump": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
-      "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
-      "dev": true,
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
       "dependencies": {
         "end-of-stream": "^1.1.0",
         "once": "^1.3.1"
@@ -17699,6 +17659,16 @@
         "pump": "^2.0.0"
       }
     },
+    "node_modules/pumpify/node_modules/pump": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
+      "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+      "dev": true,
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
     "node_modules/punycode": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
@@ -17761,11 +17731,6 @@
         }
       ]
     },
-    "node_modules/queue-tick": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz",
-      "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag=="
-    },
     "node_modules/quick-lru": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
@@ -17817,6 +17782,7 @@
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
       "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+      "dev": true,
       "dependencies": {
         "deep-extend": "^0.6.0",
         "ini": "~1.3.0",
@@ -17843,6 +17809,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
       "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -17899,16 +17866,34 @@
         "react": ">= 16.8 || 18.0.0"
       }
     },
+    "node_modules/react-i18next": {
+      "version": "14.0.5",
+      "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-14.0.5.tgz",
+      "integrity": "sha512-5+bQSeEtgJrMBABBL5lO7jPdSNAbeAZ+MlFWDw//7FnVacuVu3l9EeWFzBQvZsKy+cihkbThWOAThEdH8YjGEw==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@babel/runtime": "^7.23.9",
+        "html-parse-stringify": "^3.0.1"
+      },
+      "peerDependencies": {
+        "i18next": ">= 23.2.3",
+        "react": ">= 16.8.0"
+      },
+      "peerDependenciesMeta": {
+        "react-dom": {
+          "optional": true
+        },
+        "react-native": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/react-is": {
       "version": "16.13.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
     },
-    "node_modules/react-lifecycles-compat": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
-      "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
-    },
     "node_modules/react-map-gl": {
       "version": "7.1.7",
       "resolved": "https://registry.npmjs.org/react-map-gl/-/react-map-gl-7.1.7.tgz",
@@ -17932,6 +17917,29 @@
         }
       }
     },
+    "node_modules/react-map-gl/node_modules/@maplibre/maplibre-gl-style-spec": {
+      "version": "19.3.3",
+      "resolved": "https://registry.npmjs.org/@maplibre/maplibre-gl-style-spec/-/maplibre-gl-style-spec-19.3.3.tgz",
+      "integrity": "sha512-cOZZOVhDSulgK0meTsTkmNXb1ahVvmTmWmfx9gRBwc6hq98wS9JP35ESIoNq3xqEan+UN+gn8187Z6E4NKhLsw==",
+      "dependencies": {
+        "@mapbox/jsonlint-lines-primitives": "~2.0.2",
+        "@mapbox/unitbezier": "^0.0.1",
+        "json-stringify-pretty-compact": "^3.0.0",
+        "minimist": "^1.2.8",
+        "rw": "^1.3.3",
+        "sort-object": "^3.0.3"
+      },
+      "bin": {
+        "gl-style-format": "dist/gl-style-format.mjs",
+        "gl-style-migrate": "dist/gl-style-migrate.mjs",
+        "gl-style-validate": "dist/gl-style-validate.mjs"
+      }
+    },
+    "node_modules/react-map-gl/node_modules/json-stringify-pretty-compact": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/json-stringify-pretty-compact/-/json-stringify-pretty-compact-3.0.0.tgz",
+      "integrity": "sha512-Rc2suX5meI0S3bfdZuA7JMFBGkJ875ApfVyq2WHELjBiiG22My/l7/8zPpH/CfFVQHuVLd8NLR0nv6vi0BYYKA=="
+    },
     "node_modules/react-microsoft-clarity": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/react-microsoft-clarity/-/react-microsoft-clarity-1.2.0.tgz",
@@ -17992,11 +18000,11 @@
       }
     },
     "node_modules/react-router": {
-      "version": "6.17.0",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.17.0.tgz",
-      "integrity": "sha512-YJR3OTJzi3zhqeJYADHANCGPUu9J+6fT5GLv82UWRGSxu6oJYCKVmxUcaBQuGm9udpWmPsvpme/CdHumqgsoaA==",
+      "version": "6.21.3",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.21.3.tgz",
+      "integrity": "sha512-a0H638ZXULv1OdkmiK6s6itNhoy33ywxmUFT/xtSoVyf9VnC7n7+VT4LjVzdIHSaF5TIh9ylUgxMXksHTgGrKg==",
       "dependencies": {
-        "@remix-run/router": "1.10.0"
+        "@remix-run/router": "1.14.2"
       },
       "engines": {
         "node": ">=14.0.0"
@@ -18006,12 +18014,12 @@
       }
     },
     "node_modules/react-router-dom": {
-      "version": "6.17.0",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.17.0.tgz",
-      "integrity": "sha512-qWHkkbXQX+6li0COUUPKAUkxjNNqPJuiBd27dVwQGDNsuFBdMbrS6UZ0CLYc4CsbdLYTckn4oB4tGDuPZpPhaQ==",
+      "version": "6.21.3",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.21.3.tgz",
+      "integrity": "sha512-kNzubk7n4YHSrErzjLK72j0B5i969GsuCGazRl3G6j1zqZBLjuSlYBdVdkDOgzGdPIffUOc9nmgiadTEVoq91g==",
       "dependencies": {
-        "@remix-run/router": "1.10.0",
-        "react-router": "6.17.0"
+        "@remix-run/router": "1.14.2",
+        "react-router": "6.21.3"
       },
       "engines": {
         "node": ">=14.0.0"
@@ -18021,18 +18029,34 @@
         "react-dom": ">=16.8"
       }
     },
+    "node_modules/react-router-dom/node_modules/@remix-run/router": {
+      "version": "1.14.2",
+      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.14.2.tgz",
+      "integrity": "sha512-ACXpdMM9hmKZww21yEqWwiLws/UPLhNKvimN8RrYSqPSvB3ov7sLvAcfvaxePeLvccTQKGdkDIhLYApZVDFuKg==",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/react-router/node_modules/@remix-run/router": {
+      "version": "1.14.2",
+      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.14.2.tgz",
+      "integrity": "sha512-ACXpdMM9hmKZww21yEqWwiLws/UPLhNKvimN8RrYSqPSvB3ov7sLvAcfvaxePeLvccTQKGdkDIhLYApZVDFuKg==",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
     "node_modules/react-smooth": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/react-smooth/-/react-smooth-2.0.5.tgz",
-      "integrity": "sha512-BMP2Ad42tD60h0JW6BFaib+RJuV5dsXJK9Baxiv/HlNFjvRLqA9xrNKxVWnUIZPQfzUwGXIlU/dSYLU+54YGQA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/react-smooth/-/react-smooth-4.0.0.tgz",
+      "integrity": "sha512-2NMXOBY1uVUQx1jBeENGA497HK20y6CPGYL1ZnJLeoQ8rrc3UfmOM82sRxtzpcoCkUMy4CS0RGylfuVhuFjBgg==",
       "dependencies": {
-        "fast-equals": "^5.0.0",
-        "react-transition-group": "2.9.0"
+        "fast-equals": "^5.0.1",
+        "prop-types": "^15.8.1",
+        "react-transition-group": "^4.4.5"
       },
       "peerDependencies": {
-        "prop-types": "^15.6.0",
-        "react": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0",
-        "react-dom": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0"
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
       }
     },
     "node_modules/react-style-singleton": {
@@ -18069,27 +18093,27 @@
       }
     },
     "node_modules/react-to-print": {
-      "version": "2.14.15",
-      "resolved": "https://registry.npmjs.org/react-to-print/-/react-to-print-2.14.15.tgz",
-      "integrity": "sha512-SKnwOzU2cJ8eaAkoJO7+gNhvfEDmm+Y34IdcHsjtHioUevUPhprqbVtvNJlZ2JkGJ8ExK2QNWM9pXECTDR5D8w==",
+      "version": "2.15.1",
+      "resolved": "https://registry.npmjs.org/react-to-print/-/react-to-print-2.15.1.tgz",
+      "integrity": "sha512-1foogIFbCpzAVxydkhBiDfMiFYhIMphiagDOfcG4X/EcQ+fBPqJ0rby9Wv/emzY1YLkIQy/rEgOrWQT+rBKhjw==",
       "peerDependencies": {
         "react": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0",
         "react-dom": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0"
       }
     },
     "node_modules/react-transition-group": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.9.0.tgz",
-      "integrity": "sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==",
+      "version": "4.4.5",
+      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz",
+      "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==",
       "dependencies": {
-        "dom-helpers": "^3.4.0",
+        "@babel/runtime": "^7.5.5",
+        "dom-helpers": "^5.0.1",
         "loose-envify": "^1.4.0",
-        "prop-types": "^15.6.2",
-        "react-lifecycles-compat": "^3.0.4"
+        "prop-types": "^15.6.2"
       },
       "peerDependencies": {
-        "react": ">=15.0.0",
-        "react-dom": ">=15.0.0"
+        "react": ">=16.6.0",
+        "react-dom": ">=16.6.0"
       }
     },
     "node_modules/react-transition-state": {
@@ -18102,9 +18126,9 @@
       }
     },
     "node_modules/react-zorm": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/react-zorm/-/react-zorm-0.6.2.tgz",
-      "integrity": "sha512-3U2HT9pSFAfbtXTB5/KN1KPJ1vErEKXrmeUO9KwYC9hFqDQwo8wTUK3aN9fdz+yzM9lOGrUg6/brc3IHoqMPyw==",
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/react-zorm/-/react-zorm-0.9.0.tgz",
+      "integrity": "sha512-esuEiNUuj+JfI4Lz5o36KgT2JNN/NTNeO/70FghbRSBjCxRKeEtjO4KXP7SOMzbOa6rhOFNiP+goPXOUTLG/pw==",
       "peerDependencies": {
         "react": ">=17.0.0",
         "react-dom": ">=17.0.0",
@@ -18239,15 +18263,15 @@
       }
     },
     "node_modules/recharts": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/recharts/-/recharts-2.11.0.tgz",
-      "integrity": "sha512-5s+u1m5Hwxb2nh0LABkE3TS/lFqFHyWl7FnPbQhHobbQQia4ih1t3o3+ikPYr31Ns+kYe4FASIthKeKi/YYvMg==",
+      "version": "2.12.0",
+      "resolved": "https://registry.npmjs.org/recharts/-/recharts-2.12.0.tgz",
+      "integrity": "sha512-rVNcdNQ5b7+40Ue7mcEKZJyEv+3SUk2bDEVvOyXPDXXVE7TU3lrvnJUgAvO36hSzhRP2DnAamKXvHLFIFOU0Ww==",
       "dependencies": {
         "clsx": "^2.0.0",
         "eventemitter3": "^4.0.1",
         "lodash": "^4.17.19",
         "react-is": "^16.10.2",
-        "react-smooth": "^2.0.5",
+        "react-smooth": "^4.0.0",
         "recharts-scale": "^0.4.4",
         "tiny-invariant": "^1.3.1",
         "victory-vendor": "^36.6.8"
@@ -18256,7 +18280,6 @@
         "node": ">=14"
       },
       "peerDependencies": {
-        "prop-types": "^15.6.0",
         "react": "^16.0.0 || ^17.0.0 || ^18.0.0",
         "react-dom": "^16.0.0 || ^17.0.0 || ^18.0.0"
       }
@@ -18269,25 +18292,6 @@
         "decimal.js-light": "^2.4.1"
       }
     },
-    "node_modules/recrawl-sync": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/recrawl-sync/-/recrawl-sync-2.2.3.tgz",
-      "integrity": "sha512-vSaTR9t+cpxlskkdUFrsEpnf67kSmPk66yAGT1fZPrDudxQjoMzPgQhSMImQ0pAw5k0NPirefQfhopSjhdUtpQ==",
-      "dev": true,
-      "dependencies": {
-        "@cush/relative": "^1.0.0",
-        "glob-regex": "^0.3.0",
-        "slash": "^3.0.0",
-        "sucrase": "^3.20.3",
-        "tslib": "^1.9.3"
-      }
-    },
-    "node_modules/recrawl-sync/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
-    },
     "node_modules/redent": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
@@ -18302,15 +18306,16 @@
       }
     },
     "node_modules/reflect.getprototypeof": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.4.tgz",
-      "integrity": "sha512-ECkTw8TmJwW60lOTR+ZkODISW6RQ8+2CL3COqtiJKLd6MmB45hN51HprHFziKLGkAuTGQhBb91V8cy+KHlaCjw==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.5.tgz",
+      "integrity": "sha512-62wgfC8dJWrmxv44CA36pLDnP6KKl3Vhxb7PL+8+qrrFMMoJij4vgiMP8zV4O8+CBMXY1mHxI5fITGHXFHVmQQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "get-intrinsic": "^1.2.1",
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.22.3",
+        "es-errors": "^1.0.0",
+        "get-intrinsic": "^1.2.3",
         "globalthis": "^1.0.3",
         "which-builtin-type": "^1.1.3"
       },
@@ -18327,14 +18332,15 @@
       "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
     },
     "node_modules/regexp.prototype.flags": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz",
-      "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==",
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz",
+      "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "set-function-name": "^2.0.0"
+        "call-bind": "^1.0.6",
+        "define-properties": "^1.2.1",
+        "es-errors": "^1.3.0",
+        "set-function-name": "^2.0.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -18469,12 +18475,13 @@
       }
     },
     "node_modules/remix-flat-routes": {
-      "version": "0.5.12",
-      "resolved": "https://registry.npmjs.org/remix-flat-routes/-/remix-flat-routes-0.5.12.tgz",
-      "integrity": "sha512-NsskCt0euxpTNvLsCVW2UzOFK7YIeldQI00a+rIglgavAMUoFVe7tiPTkq4LJ2AXGsfIDq7kPa63ftqOLst+Dg==",
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/remix-flat-routes/-/remix-flat-routes-0.6.4.tgz",
+      "integrity": "sha512-/0bTfaNSd2O3ak+cCLAlmHIsgm7YWiaBiu5ENUyuSWSNwF/KaHuKFhcHHhozPevQ8ROgCZG9tNbWzH6ktJoprA==",
       "dev": true,
       "dependencies": {
         "@remix-run/v1-route-convention": "^0.1.3",
+        "fs-extra": "^11.1.1",
         "minimatch": "^5.1.0"
       },
       "bin": {
@@ -18484,6 +18491,20 @@
         "@remix-run/dev": "^1.15.0 || ^2"
       }
     },
+    "node_modules/remix-flat-routes/node_modules/fs-extra": {
+      "version": "11.2.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=14.14"
+      }
+    },
     "node_modules/remix-flat-routes/node_modules/minimatch": {
       "version": "5.1.6",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
@@ -18496,6 +18517,64 @@
         "node": ">=10"
       }
     },
+    "node_modules/remix-hono": {
+      "version": "0.0.15",
+      "resolved": "https://registry.npmjs.org/remix-hono/-/remix-hono-0.0.15.tgz",
+      "integrity": "sha512-s+c/16BapI3snIp76ClZITkS3AzpM6oCQvYyYTOpYyaGlbRTy8E/MzM2IrPcxGPz2yrzSzd5uy8lRTlCir0oIQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sergiodxa"
+        }
+      ],
+      "dependencies": {
+        "@remix-run/server-runtime": "^2.5.0",
+        "hono": "^3.12.5",
+        "pretty-cache-header": "^1.0.0"
+      },
+      "optionalDependencies": {
+        "@remix-run/cloudflare": "^2.0.0",
+        "i18next": "^23.0.0",
+        "remix-i18next": "^5.0.0",
+        "zod": "^3.0.0"
+      }
+    },
+    "node_modules/remix-hono/node_modules/hono": {
+      "version": "3.12.12",
+      "resolved": "https://registry.npmjs.org/hono/-/hono-3.12.12.tgz",
+      "integrity": "sha512-5IAMJOXfpA5nT+K0MNjClchzz0IhBHs2Szl7WFAhrFOsbtQsYmNynFyJRg/a3IPsmCfxcrf8txUGiNShXpK5Rg==",
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/remix-i18next": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/remix-i18next/-/remix-i18next-5.5.0.tgz",
+      "integrity": "sha512-QAHYlwb/0fmoSmH+t7AiJ3EhyG4SSQNQnAAPfqbkn/3UJfWO+NFFVxuggGx25FRJ3SOPexaspoiaCddcEayPAQ==",
+      "optional": true,
+      "dependencies": {
+        "accept-language-parser": "^1.5.0",
+        "intl-parse-accept-language": "^1.0.0",
+        "lru-cache": "^7.14.1",
+        "use-consistent-value": "^1.0.0"
+      },
+      "peerDependencies": {
+        "@remix-run/react": "^1.0.0 || ^2.0.0",
+        "@remix-run/server-runtime": "^1.0.0 || ^2.0.0",
+        "i18next": "^23.1.0",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+        "react-i18next": "^13.0.0 || ^14.0.0"
+      }
+    },
+    "node_modules/remix-i18next/node_modules/lru-cache": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+      "optional": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/remix-utils": {
       "version": "7.5.0",
       "resolved": "https://registry.npmjs.org/remix-utils/-/remix-utils-7.5.0.tgz",
@@ -18767,17 +18846,34 @@
       }
     },
     "node_modules/rollup": {
-      "version": "2.79.1",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz",
-      "integrity": "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==",
+      "version": "4.11.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.11.0.tgz",
+      "integrity": "sha512-2xIbaXDXjf3u2tajvA5xROpib7eegJ9Y/uPlSFhXLNpK9ampCczXAhLEb5yLzJyG3LAdI1NWtNjDXiLyniNdjQ==",
       "dev": true,
+      "dependencies": {
+        "@types/estree": "1.0.5"
+      },
       "bin": {
         "rollup": "dist/bin/rollup"
       },
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">=18.0.0",
+        "npm": ">=8.0.0"
       },
       "optionalDependencies": {
+        "@rollup/rollup-android-arm-eabi": "4.11.0",
+        "@rollup/rollup-android-arm64": "4.11.0",
+        "@rollup/rollup-darwin-arm64": "4.11.0",
+        "@rollup/rollup-darwin-x64": "4.11.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.11.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.11.0",
+        "@rollup/rollup-linux-arm64-musl": "4.11.0",
+        "@rollup/rollup-linux-riscv64-gnu": "4.11.0",
+        "@rollup/rollup-linux-x64-gnu": "4.11.0",
+        "@rollup/rollup-linux-x64-musl": "4.11.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.11.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.11.0",
+        "@rollup/rollup-win32-x64-msvc": "4.11.0",
         "fsevents": "~2.3.2"
       }
     },
@@ -18862,13 +18958,13 @@
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
     "node_modules/safe-regex-test": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.2.tgz",
-      "integrity": "sha512-83S9w6eFq12BBIJYvjMux6/dkirb8+4zJRA9cxNBVb7Wq5fJBW+Xze48WqR8pxua7bDuAaaAxtVVd4Idjp1dBQ==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz",
+      "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.5",
-        "get-intrinsic": "^1.2.2",
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
         "is-regex": "^1.1.4"
       },
       "engines": {
@@ -18891,6 +18987,11 @@
         "loose-envify": "^1.1.0"
       }
     },
+    "node_modules/secure-json-parse": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/secure-json-parse/-/secure-json-parse-2.7.0.tgz",
+      "integrity": "sha512-6aU+Rwsezw7VR8/nyvKTx8QpWH9FrcYiXXlqC4z5d5XQBDRqtbfsRjnwGyqbi3gddNtWHuEk9OANUotL26qKUw=="
+    },
     "node_modules/selderee": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/selderee/-/selderee-0.11.0.tgz",
@@ -18903,9 +19004,9 @@
       }
     },
     "node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
+      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -18989,6 +19090,17 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
+    "node_modules/send/node_modules/mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/send/node_modules/ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
@@ -19045,13 +19157,14 @@
       "integrity": "sha512-RVnVQxTXuerk653XfuliOxBP81Sf0+qfQE73LIYKcyMYHG94AuH0kgrQpRDuTZnSmjpysHmzxJXKNfa6PjFhyQ=="
     },
     "node_modules/set-function-length": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.0.tgz",
-      "integrity": "sha512-4DBHDoyHlM1IRPGYcoxexgh67y4ueR53FKV1yyxwFMY7aCqcN/38M1+SwZ/qJQ8iLv7+ck385ot4CcisOAPT9w==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.1.tgz",
+      "integrity": "sha512-j4t6ccc+VsKwYHso+kElc5neZpjtq9EnRICFZtWyBsLojhmeF/ZBd/elqm22WJh/BziDe/SBiOeAt0m2mfLD0g==",
       "dependencies": {
-        "define-data-property": "^1.1.1",
+        "define-data-property": "^1.1.2",
+        "es-errors": "^1.3.0",
         "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.2",
+        "get-intrinsic": "^1.2.3",
         "gopd": "^1.0.1",
         "has-property-descriptors": "^1.0.1"
       },
@@ -19094,58 +19207,46 @@
     },
     "node_modules/setprototypeof": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
-    },
-    "node_modules/sharp": {
-      "version": "0.32.6",
-      "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.32.6.tgz",
-      "integrity": "sha512-KyLTWwgcR9Oe4d9HwCwNM2l7+J0dUQwn/yf7S0EnTtb0eVS4RxO0eUSvxPtzT4F3SY+C4K6fqdv/DO27sJ/v/w==",
-      "hasInstallScript": true,
-      "dependencies": {
-        "color": "^4.2.3",
-        "detect-libc": "^2.0.2",
-        "node-addon-api": "^6.1.0",
-        "prebuild-install": "^7.1.1",
-        "semver": "^7.5.4",
-        "simple-get": "^4.0.1",
-        "tar-fs": "^3.0.4",
-        "tunnel-agent": "^0.6.0"
-      },
-      "engines": {
-        "node": ">=14.15.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/sharp/node_modules/pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "node_modules/sharp/node_modules/tar-fs": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.4.tgz",
-      "integrity": "sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==",
-      "dependencies": {
-        "mkdirp-classic": "^0.5.2",
-        "pump": "^3.0.0",
-        "tar-stream": "^3.1.5"
-      }
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
     },
-    "node_modules/sharp/node_modules/tar-stream": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz",
-      "integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==",
+    "node_modules/sharp": {
+      "version": "0.33.2",
+      "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.33.2.tgz",
+      "integrity": "sha512-WlYOPyyPDiiM07j/UO+E720ju6gtNtHjEGg5vovUk1Lgxyjm2LFO+37Nt/UI3MMh2l6hxTWQWi7qk3cXJTutcQ==",
+      "hasInstallScript": true,
       "dependencies": {
-        "b4a": "^1.6.4",
-        "fast-fifo": "^1.2.0",
-        "streamx": "^2.15.0"
+        "color": "^4.2.3",
+        "detect-libc": "^2.0.2",
+        "semver": "^7.5.4"
+      },
+      "engines": {
+        "libvips": ">=8.15.1",
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-darwin-arm64": "0.33.2",
+        "@img/sharp-darwin-x64": "0.33.2",
+        "@img/sharp-libvips-darwin-arm64": "1.0.1",
+        "@img/sharp-libvips-darwin-x64": "1.0.1",
+        "@img/sharp-libvips-linux-arm": "1.0.1",
+        "@img/sharp-libvips-linux-arm64": "1.0.1",
+        "@img/sharp-libvips-linux-s390x": "1.0.1",
+        "@img/sharp-libvips-linux-x64": "1.0.1",
+        "@img/sharp-libvips-linuxmusl-arm64": "1.0.1",
+        "@img/sharp-libvips-linuxmusl-x64": "1.0.1",
+        "@img/sharp-linux-arm": "0.33.2",
+        "@img/sharp-linux-arm64": "0.33.2",
+        "@img/sharp-linux-s390x": "0.33.2",
+        "@img/sharp-linux-x64": "0.33.2",
+        "@img/sharp-linuxmusl-arm64": "0.33.2",
+        "@img/sharp-linuxmusl-x64": "0.33.2",
+        "@img/sharp-wasm32": "0.33.2",
+        "@img/sharp-win32-ia32": "0.33.2",
+        "@img/sharp-win32-x64": "0.33.2"
       }
     },
     "node_modules/shebang-command": {
@@ -19177,18 +19278,28 @@
       }
     },
     "node_modules/side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.5.tgz",
+      "integrity": "sha512-QcgiIWV4WV7qWExbN5llt6frQB/lBven9pqliLXfGPB+K9ZYXxDozp0wLkHS24kWCm+6YXH/f0HhnObZnZOBnQ==",
       "dependencies": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4",
+        "object-inspect": "^1.13.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/siginfo": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz",
+      "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==",
+      "dev": true
+    },
     "node_modules/signal-exit": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
@@ -19214,49 +19325,6 @@
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
-    "node_modules/simple-concat": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
-      "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/simple-get": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz",
-      "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "decompress-response": "^6.0.0",
-        "once": "^1.3.1",
-        "simple-concat": "^1.0.0"
-      }
-    },
     "node_modules/simple-swizzle": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
@@ -19296,16 +19364,16 @@
       }
     },
     "node_modules/socks": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz",
-      "integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==",
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.3.tgz",
+      "integrity": "sha512-vfuYK48HXCTFD03G/1/zkIls3Ebr2YNa4qU9gHDZdblHLiqhJrJGkY3+0Nx0JpN9qBhJbVObc1CNciT1bIZJxw==",
       "dev": true,
       "dependencies": {
-        "ip": "^2.0.0",
+        "ip-address": "^9.0.5",
         "smart-buffer": "^4.2.0"
       },
       "engines": {
-        "node": ">= 10.13.0",
+        "node": ">= 10.0.0",
         "npm": ">= 3.0.0"
       }
     },
@@ -19323,6 +19391,14 @@
         "node": ">= 10"
       }
     },
+    "node_modules/sonic-boom": {
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/sonic-boom/-/sonic-boom-3.8.0.tgz",
+      "integrity": "sha512-ybz6OYOUjoQQCQ/i4LU8kaToD8ACtYP+Cj5qd2AO36bwbdewxWJ3ArmJ2cr6AvxlL2o0PqnCcPGUgkILbfkaCA==",
+      "dependencies": {
+        "atomic-sleep": "^1.0.0"
+      }
+    },
     "node_modules/sort-asc": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/sort-asc/-/sort-asc-0.2.0.tgz",
@@ -19388,13 +19464,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/sourcemap-codec": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
-      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
-      "deprecated": "Please use @jridgewell/sourcemap-codec instead",
-      "dev": true
-    },
     "node_modules/space-separated-tokens": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-2.0.2.tgz",
@@ -19428,9 +19497,9 @@
       }
     },
     "node_modules/spdx-exceptions": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.4.0.tgz",
-      "integrity": "sha512-hcjppoJ68fhxA/cjbN4T8N6uCUejN8yFw69ttpqtBeCbF3u13n7mb31NB9jKwGTTWWnt9IbRA/mf1FprYS8wfw==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz",
+      "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==",
       "dev": true
     },
     "node_modules/spdx-expression-parse": {
@@ -19444,9 +19513,9 @@
       }
     },
     "node_modules/spdx-license-ids": {
-      "version": "3.0.16",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz",
-      "integrity": "sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw==",
+      "version": "3.0.17",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz",
+      "integrity": "sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==",
       "dev": true
     },
     "node_modules/split": {
@@ -19503,6 +19572,12 @@
         "node": ">= 10.x"
       }
     },
+    "node_modules/sprintf-js": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
+      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
+      "dev": true
+    },
     "node_modules/ssri": {
       "version": "10.0.5",
       "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.5.tgz",
@@ -19515,26 +19590,11 @@
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
-    "node_modules/stack-utils": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
-      "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
-      "dev": true,
-      "dependencies": {
-        "escape-string-regexp": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/stack-utils/node_modules/escape-string-regexp": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
+    "node_modules/stackback": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz",
+      "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==",
+      "dev": true
     },
     "node_modules/start-server-and-test": {
       "version": "2.0.3",
@@ -19568,6 +19628,12 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/std-env": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.7.0.tgz",
+      "integrity": "sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==",
+      "dev": true
+    },
     "node_modules/stop-iteration-iterator": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz",
@@ -19600,15 +19666,6 @@
       "resolved": "https://registry.npmjs.org/stream-slice/-/stream-slice-0.1.2.tgz",
       "integrity": "sha512-QzQxpoacatkreL6jsxnVb7X5R/pGw9OUv2qWTYWnmLpg4NdN31snPy/f3TdQE1ZUXaThRvj1Zw4/OGg0ZkaLMA=="
     },
-    "node_modules/streamx": {
-      "version": "2.15.6",
-      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.15.6.tgz",
-      "integrity": "sha512-q+vQL4AAz+FdfT137VF69Cc/APqUbxy+MDOImRrMvchJpigHj9GksgDU2LYbO9rx7RX6osWgxJB2WxhYv4SZAw==",
-      "dependencies": {
-        "fast-fifo": "^1.1.0",
-        "queue-tick": "^1.0.1"
-      }
-    },
     "node_modules/strict-event-emitter": {
       "version": "0.4.6",
       "resolved": "https://registry.npmjs.org/strict-event-emitter/-/strict-event-emitter-0.4.6.tgz",
@@ -19842,7 +19899,6 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
       "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       },
@@ -19851,21 +19907,21 @@
       }
     },
     "node_modules/strip-literal": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-0.4.2.tgz",
-      "integrity": "sha512-pv48ybn4iE1O9RLgCAN0iU4Xv7RlBTiit6DKmMiErbs9x1wH6vXBs45tWc0H5wUIF6TLTrKweqkmYF/iraQKNw==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-1.3.0.tgz",
+      "integrity": "sha512-PugKzOsyXpArk0yWmUwqOZecSO0GH0bPoctLcqNDH9J04pVW3lflYE0ujElBGTloevcxF5MofAOZ7C5l2b+wLg==",
       "dev": true,
       "dependencies": {
-        "acorn": "^8.8.0"
+        "acorn": "^8.10.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/antfu"
       }
     },
     "node_modules/stripe": {
-      "version": "12.18.0",
-      "resolved": "https://registry.npmjs.org/stripe/-/stripe-12.18.0.tgz",
-      "integrity": "sha512-cYjgBM2SY/dTm8Lr6eMyyONaHTZHA/QjHxFUIW5WH8FevSRIGAVtXEmBkUXF1fsqe7QvvRgQSGSJZmjDacegGg==",
+      "version": "14.16.0",
+      "resolved": "https://registry.npmjs.org/stripe/-/stripe-14.16.0.tgz",
+      "integrity": "sha512-1gOr2LzafWV84cPIO5Md/QPh4XVPLKULVuRpBVOV3Plq3seiHmg/eeOktX+hDl8jpNZuORHYaUJGrNqrABLwdg==",
       "dependencies": {
         "@types/node": ">=8.1.0",
         "qs": "^6.11.0"
@@ -19944,9 +20000,9 @@
       }
     },
     "node_modules/swiper": {
-      "version": "10.3.1",
-      "resolved": "https://registry.npmjs.org/swiper/-/swiper-10.3.1.tgz",
-      "integrity": "sha512-24Wk3YUdZHxjc9faID97GTu6xnLNia+adMt6qMTZG/HgdSUt4fS0REsGUXJOgpTED0Amh/j+gRGQxsLayJUlBQ==",
+      "version": "11.0.6",
+      "resolved": "https://registry.npmjs.org/swiper/-/swiper-11.0.6.tgz",
+      "integrity": "sha512-W/Me7MQl5rNgdM5x9i3Gll76WsyVpnHn91GhBOyL7RCFUeg62aVnflzlVfIpXzZ/87FtJOfAoDH79ZH2Yq76zA==",
       "funding": [
         {
           "type": "patreon",
@@ -19967,18 +20023,21 @@
       "integrity": "sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew=="
     },
     "node_modules/tailwind-merge": {
-      "version": "1.14.0",
-      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-1.14.0.tgz",
-      "integrity": "sha512-3mFKyCo/MBcgyOTlrY8T7odzZFx+w+qKSMAmdFzRvqBfLlSigU6TZnlFHK0lkMwj9Bj8OYU+9yW9lmGuS0QEnQ==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.2.1.tgz",
+      "integrity": "sha512-o+2GTLkthfa5YUt4JxPfzMIpQzZ3adD1vLVkvKE1Twl9UAhGsEbIZhHHZVRttyW177S8PDJI3bTQNaebyofK3Q==",
+      "dependencies": {
+        "@babel/runtime": "^7.23.7"
+      },
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/dcastil"
       }
     },
     "node_modules/tailwind-scrollbar": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tailwind-scrollbar/-/tailwind-scrollbar-2.1.0.tgz",
-      "integrity": "sha512-zpvY5mDs0130YzYjZKBiDaw32rygxk5RyJ4KmeHjGnwkvbjm/PszON1m4Bbt2DkMRIXlXsfNevykAESgURN4KA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/tailwind-scrollbar/-/tailwind-scrollbar-3.1.0.tgz",
+      "integrity": "sha512-pmrtDIZeHyu2idTejfV59SbaJyvp1VRjYxAjZBH0jnyrPRo6HL1kD5Glz8VPagasqr6oAx6M05+Tuw429Z8jxg==",
       "dev": true,
       "engines": {
         "node": ">=12.13.0"
@@ -20092,6 +20151,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
       "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+      "dev": true,
       "dependencies": {
         "chownr": "^1.1.1",
         "mkdirp-classic": "^0.5.2",
@@ -20102,21 +20162,14 @@
     "node_modules/tar-fs/node_modules/chownr": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
-    },
-    "node_modules/tar-fs/node_modules/pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+      "dev": true
     },
     "node_modules/tar-stream": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
       "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+      "dev": true,
       "dependencies": {
         "bl": "^4.0.3",
         "end-of-stream": "^1.4.1",
@@ -20132,6 +20185,7 @@
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
       "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "dev": true,
       "dependencies": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
@@ -20277,6 +20331,14 @@
         "xtend": "~4.0.1"
       }
     },
+    "node_modules/timestring": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/timestring/-/timestring-6.0.0.tgz",
+      "integrity": "sha512-wMctrWD2HZZLuIlchlkE2dfXJh7J2KDI9Dwl+2abPYg0mswQHfOAyQW3jJg1pY5VfttSINZuKcXoB3FGypVklA==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/tiny-invariant": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.1.tgz",
@@ -20289,9 +20351,9 @@
       "dev": true
     },
     "node_modules/tinypool": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-0.3.1.tgz",
-      "integrity": "sha512-zLA1ZXlstbU2rlpA4CIeVaqvWq41MTWqLY3FfsAXgC8+f7Pk7zroaJQxDgxn1xNudKW6Kmj4808rPFShUlIRmQ==",
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-0.8.2.tgz",
+      "integrity": "sha512-SUszKYe5wgsxnNOVlBYO6IC+8VGWdVGZWAqUxp3UErNBtptZvWbwyUOyzNL59zigz2rCA92QiL3wvG+JDSdJdQ==",
       "dev": true,
       "engines": {
         "node": ">=14.0.0"
@@ -20303,9 +20365,9 @@
       "integrity": "sha512-ppJZNDuKGgxzkHihX8v9v9G5f+18gzaTfrukGrq6ueg0lmH4nqVnA2IPG0AEH3jKEk2GRJCUhDoqpoiw3PHLBA=="
     },
     "node_modules/tinyspy": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-1.1.1.tgz",
-      "integrity": "sha512-UVq5AXt/gQlti7oxoIg5oi/9r0WpF7DGEVwXgqWSMmyN16+e3tl5lIvTaOpJ3TAtu5xFzWccFRM4R5NaWHF+4g==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-2.2.1.tgz",
+      "integrity": "sha512-KYad6Vy5VDWV4GH3fjpseMQ/XU2BhIYP7Vzd0LG44qRWm/Yt2WCOTicFdvmgo6gWaqooMQCawTtILVQJupKu7A==",
       "dev": true,
       "engines": {
         "node": ">=14.0.0"
@@ -20373,9 +20435,9 @@
       }
     },
     "node_modules/trough": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/trough/-/trough-2.1.0.tgz",
-      "integrity": "sha512-AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/trough/-/trough-2.2.0.tgz",
+      "integrity": "sha512-tmMpK00BjZiUyVyvrBK7knerNgmgvcV/KLVyuma/SC+TQN167GrMRciANTz09+k3zW8L8t60jWO1GpfkZdjTaw==",
       "dev": true,
       "funding": {
         "type": "github",
@@ -20395,6 +20457,26 @@
       "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz",
       "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA=="
     },
+    "node_modules/tsconfck": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/tsconfck/-/tsconfck-3.0.2.tgz",
+      "integrity": "sha512-6lWtFjwuhS3XI4HsX4Zg0izOI3FU/AI9EGVlPEUMDIhvLPMD4wkiof0WCoDgW7qY+Dy198g4d9miAqUHWHFH6Q==",
+      "dev": true,
+      "bin": {
+        "tsconfck": "bin/tsconfck.js"
+      },
+      "engines": {
+        "node": "^18 || >=20"
+      },
+      "peerDependencies": {
+        "typescript": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/tsconfig-paths": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz",
@@ -20436,26 +20518,28 @@
       "dev": true
     },
     "node_modules/tsx": {
-      "version": "3.14.0",
-      "resolved": "https://registry.npmjs.org/tsx/-/tsx-3.14.0.tgz",
-      "integrity": "sha512-xHtFaKtHxM9LOklMmJdI3BEnQq/D5F73Of2E1GDrITi9sgoVkvIsrQUTY1G8FlmGtA+awCI4EBlTRRYxkL2sRg==",
+      "version": "4.7.1",
+      "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.7.1.tgz",
+      "integrity": "sha512-8d6VuibXHtlN5E3zFkgY8u4DX7Y3Z27zvvPKVmLon/D4AjuKzarkUBTLDBgj9iTQ0hg5xM7c/mYiRVM+HETf0g==",
       "dev": true,
       "dependencies": {
-        "esbuild": "~0.18.20",
-        "get-tsconfig": "^4.7.2",
-        "source-map-support": "^0.5.21"
+        "esbuild": "~0.19.10",
+        "get-tsconfig": "^4.7.2"
       },
       "bin": {
         "tsx": "dist/cli.mjs"
       },
+      "engines": {
+        "node": ">=18.0.0"
+      },
       "optionalDependencies": {
         "fsevents": "~2.3.3"
       }
     },
     "node_modules/tsx/node_modules/@esbuild/android-arm": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz",
-      "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==",
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.12.tgz",
+      "integrity": "sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==",
       "cpu": [
         "arm"
       ],
@@ -20469,9 +20553,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/android-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz",
-      "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==",
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz",
+      "integrity": "sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==",
       "cpu": [
         "arm64"
       ],
@@ -20485,9 +20569,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/android-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz",
-      "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==",
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.12.tgz",
+      "integrity": "sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==",
       "cpu": [
         "x64"
       ],
@@ -20501,9 +20585,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/darwin-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz",
-      "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==",
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz",
+      "integrity": "sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==",
       "cpu": [
         "arm64"
       ],
@@ -20517,9 +20601,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/darwin-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz",
-      "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==",
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz",
+      "integrity": "sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==",
       "cpu": [
         "x64"
       ],
@@ -20533,9 +20617,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz",
-      "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==",
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz",
+      "integrity": "sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==",
       "cpu": [
         "arm64"
       ],
@@ -20549,9 +20633,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/freebsd-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz",
-      "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==",
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz",
+      "integrity": "sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==",
       "cpu": [
         "x64"
       ],
@@ -20565,9 +20649,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/linux-arm": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz",
-      "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==",
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz",
+      "integrity": "sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==",
       "cpu": [
         "arm"
       ],
@@ -20581,9 +20665,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/linux-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz",
-      "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==",
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz",
+      "integrity": "sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==",
       "cpu": [
         "arm64"
       ],
@@ -20597,9 +20681,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/linux-ia32": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz",
-      "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==",
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz",
+      "integrity": "sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==",
       "cpu": [
         "ia32"
       ],
@@ -20613,9 +20697,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/linux-loong64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz",
-      "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==",
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz",
+      "integrity": "sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==",
       "cpu": [
         "loong64"
       ],
@@ -20629,9 +20713,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/linux-mips64el": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz",
-      "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==",
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz",
+      "integrity": "sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==",
       "cpu": [
         "mips64el"
       ],
@@ -20645,9 +20729,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/linux-ppc64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz",
-      "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==",
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz",
+      "integrity": "sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==",
       "cpu": [
         "ppc64"
       ],
@@ -20661,9 +20745,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/linux-riscv64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz",
-      "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==",
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz",
+      "integrity": "sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==",
       "cpu": [
         "riscv64"
       ],
@@ -20677,9 +20761,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/linux-s390x": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz",
-      "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==",
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz",
+      "integrity": "sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==",
       "cpu": [
         "s390x"
       ],
@@ -20693,9 +20777,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/linux-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz",
-      "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==",
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz",
+      "integrity": "sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==",
       "cpu": [
         "x64"
       ],
@@ -20709,9 +20793,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/netbsd-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz",
-      "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==",
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz",
+      "integrity": "sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==",
       "cpu": [
         "x64"
       ],
@@ -20725,9 +20809,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/openbsd-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz",
-      "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==",
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz",
+      "integrity": "sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==",
       "cpu": [
         "x64"
       ],
@@ -20741,9 +20825,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/sunos-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz",
-      "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==",
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz",
+      "integrity": "sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==",
       "cpu": [
         "x64"
       ],
@@ -20757,9 +20841,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/win32-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz",
-      "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==",
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz",
+      "integrity": "sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==",
       "cpu": [
         "arm64"
       ],
@@ -20773,9 +20857,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/win32-ia32": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz",
-      "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==",
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz",
+      "integrity": "sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==",
       "cpu": [
         "ia32"
       ],
@@ -20789,9 +20873,9 @@
       }
     },
     "node_modules/tsx/node_modules/@esbuild/win32-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz",
-      "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==",
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz",
+      "integrity": "sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==",
       "cpu": [
         "x64"
       ],
@@ -20805,9 +20889,9 @@
       }
     },
     "node_modules/tsx/node_modules/esbuild": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz",
-      "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==",
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.12.tgz",
+      "integrity": "sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==",
       "dev": true,
       "hasInstallScript": true,
       "bin": {
@@ -20817,28 +20901,29 @@
         "node": ">=12"
       },
       "optionalDependencies": {
-        "@esbuild/android-arm": "0.18.20",
-        "@esbuild/android-arm64": "0.18.20",
-        "@esbuild/android-x64": "0.18.20",
-        "@esbuild/darwin-arm64": "0.18.20",
-        "@esbuild/darwin-x64": "0.18.20",
-        "@esbuild/freebsd-arm64": "0.18.20",
-        "@esbuild/freebsd-x64": "0.18.20",
-        "@esbuild/linux-arm": "0.18.20",
-        "@esbuild/linux-arm64": "0.18.20",
-        "@esbuild/linux-ia32": "0.18.20",
-        "@esbuild/linux-loong64": "0.18.20",
-        "@esbuild/linux-mips64el": "0.18.20",
-        "@esbuild/linux-ppc64": "0.18.20",
-        "@esbuild/linux-riscv64": "0.18.20",
-        "@esbuild/linux-s390x": "0.18.20",
-        "@esbuild/linux-x64": "0.18.20",
-        "@esbuild/netbsd-x64": "0.18.20",
-        "@esbuild/openbsd-x64": "0.18.20",
-        "@esbuild/sunos-x64": "0.18.20",
-        "@esbuild/win32-arm64": "0.18.20",
-        "@esbuild/win32-ia32": "0.18.20",
-        "@esbuild/win32-x64": "0.18.20"
+        "@esbuild/aix-ppc64": "0.19.12",
+        "@esbuild/android-arm": "0.19.12",
+        "@esbuild/android-arm64": "0.19.12",
+        "@esbuild/android-x64": "0.19.12",
+        "@esbuild/darwin-arm64": "0.19.12",
+        "@esbuild/darwin-x64": "0.19.12",
+        "@esbuild/freebsd-arm64": "0.19.12",
+        "@esbuild/freebsd-x64": "0.19.12",
+        "@esbuild/linux-arm": "0.19.12",
+        "@esbuild/linux-arm64": "0.19.12",
+        "@esbuild/linux-ia32": "0.19.12",
+        "@esbuild/linux-loong64": "0.19.12",
+        "@esbuild/linux-mips64el": "0.19.12",
+        "@esbuild/linux-ppc64": "0.19.12",
+        "@esbuild/linux-riscv64": "0.19.12",
+        "@esbuild/linux-s390x": "0.19.12",
+        "@esbuild/linux-x64": "0.19.12",
+        "@esbuild/netbsd-x64": "0.19.12",
+        "@esbuild/openbsd-x64": "0.19.12",
+        "@esbuild/sunos-x64": "0.19.12",
+        "@esbuild/win32-arm64": "0.19.12",
+        "@esbuild/win32-ia32": "0.19.12",
+        "@esbuild/win32-x64": "0.19.12"
       }
     },
     "node_modules/tuf-js": {
@@ -20855,17 +20940,6 @@
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
-    "node_modules/tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
-      "dependencies": {
-        "safe-buffer": "^5.0.1"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/type-check": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -20912,14 +20986,14 @@
       }
     },
     "node_modules/typed-array-buffer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz",
-      "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.1.tgz",
+      "integrity": "sha512-RSqu1UEuSlrBhHTWC8O9FnPjOduNs4M7rJ4pRKoEjtx1zUNOPN2sSXHLDX+Y2WPbHIxbvg4JFo2DNAEfPIKWoQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.1",
-        "is-typed-array": "^1.1.10"
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "is-typed-array": "^1.1.13"
       },
       "engines": {
         "node": ">= 0.4"
@@ -21034,9 +21108,9 @@
       }
     },
     "node_modules/ufo": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.3.2.tgz",
-      "integrity": "sha512-o+ORpgGwaYQXgqGDwd+hkS4PuZ3QnmqMMxRuajK/a38L6fTpcE5GPIfrf+L/KemFzfUpeUQc1rRS1iDBozvnFA==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.4.0.tgz",
+      "integrity": "sha512-Hhy+BhRBleFjpJ2vchUNN40qgkh0366FWJGqVLYBHev0vpHTrXSA0ryT+74UiW6KWsldNurQMKGqCm1M2zBciQ==",
       "dev": true
     },
     "node_modules/unbox-primitive": {
@@ -21373,6 +21447,21 @@
         }
       }
     },
+    "node_modules/use-consistent-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/use-consistent-value/-/use-consistent-value-1.0.0.tgz",
+      "integrity": "sha512-enIOysu0IwqjafsUXvhZPajB6UYjxwu8w38xWaHLfVs1onIyg2c0DwPgcknxqO0TpYpAHXdFDXOp7Cs9HbTIkw==",
+      "optional": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "react": ">=16"
+      }
+    },
     "node_modules/use-isomorphic-layout-effect": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz",
@@ -21537,9 +21626,9 @@
       }
     },
     "node_modules/victory-vendor": {
-      "version": "36.8.5",
-      "resolved": "https://registry.npmjs.org/victory-vendor/-/victory-vendor-36.8.5.tgz",
-      "integrity": "sha512-gqLYO8pqI0bEEB/MygK/A9ZyMflvhMTYr3mymH0I9dv2OFUGNgY0ZqGZ7KJ/Trmyg/3D7DG3Hx0SYvD2emQ4EQ==",
+      "version": "36.9.1",
+      "resolved": "https://registry.npmjs.org/victory-vendor/-/victory-vendor-36.9.1.tgz",
+      "integrity": "sha512-+pZIP+U3pEJdDCeFmsXwHzV7vNHQC/eIbHklfe2ZCZqayYRH7lQbHcVgsJ0XOOv27hWs4jH4MONgXxHMObTMSA==",
       "dependencies": {
         "@types/d3-array": "^3.0.3",
         "@types/d3-ease": "^3.0.0",
@@ -21558,28 +21647,31 @@
       }
     },
     "node_modules/vite": {
-      "version": "3.2.8",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-3.2.8.tgz",
-      "integrity": "sha512-EtQU16PLIJpAZol2cTLttNP1mX6L0SyI0pgQB1VOoWeQnMSvtiwovV3D6NcjN8CZQWWyESD2v5NGnpz5RvgOZA==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.1.2.tgz",
+      "integrity": "sha512-uwiFebQbTWRIGbCaTEBVAfKqgqKNKMJ2uPXsXeLIZxM8MVMjoS3j0cG8NrPxdDIadaWnPSjrkLWffLSC+uiP3Q==",
       "dev": true,
       "dependencies": {
-        "esbuild": "^0.15.9",
-        "postcss": "^8.4.18",
-        "resolve": "^1.22.1",
-        "rollup": "^2.79.1"
+        "esbuild": "^0.19.3",
+        "postcss": "^8.4.35",
+        "rollup": "^4.2.0"
       },
       "bin": {
         "vite": "bin/vite.js"
       },
       "engines": {
-        "node": "^14.18.0 || >=16.0.0"
+        "node": "^18.0.0 || >=20.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/vitejs/vite?sponsor=1"
       },
       "optionalDependencies": {
-        "fsevents": "~2.3.2"
+        "fsevents": "~2.3.3"
       },
       "peerDependencies": {
-        "@types/node": ">= 14",
+        "@types/node": "^18.0.0 || >=20.0.0",
         "less": "*",
+        "lightningcss": "^1.21.0",
         "sass": "*",
         "stylus": "*",
         "sugarss": "*",
@@ -21592,6 +21684,9 @@
         "less": {
           "optional": true
         },
+        "lightningcss": {
+          "optional": true
+        },
         "sass": {
           "optional": true
         },
@@ -21628,7 +21723,26 @@
         "url": "https://opencollective.com/vitest"
       }
     },
-    "node_modules/vite-node/node_modules/@esbuild/android-arm": {
+    "node_modules/vite-tsconfig-paths": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-4.3.1.tgz",
+      "integrity": "sha512-cfgJwcGOsIxXOLU/nELPny2/LUD/lcf1IbfyeKTv2bsupVbTH/xpFtdQlBmIP1GEK2CjjLxYhFfB+QODFAx5aw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.1",
+        "globrex": "^0.1.2",
+        "tsconfck": "^3.0.1"
+      },
+      "peerDependencies": {
+        "vite": "*"
+      },
+      "peerDependenciesMeta": {
+        "vite": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/android-arm": {
       "version": "0.19.12",
       "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.12.tgz",
       "integrity": "sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==",
@@ -21644,7 +21758,7 @@
         "node": ">=12"
       }
     },
-    "node_modules/vite-node/node_modules/@esbuild/android-arm64": {
+    "node_modules/vite/node_modules/@esbuild/android-arm64": {
       "version": "0.19.12",
       "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz",
       "integrity": "sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==",
@@ -21660,7 +21774,7 @@
         "node": ">=12"
       }
     },
-    "node_modules/vite-node/node_modules/@esbuild/android-x64": {
+    "node_modules/vite/node_modules/@esbuild/android-x64": {
       "version": "0.19.12",
       "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.12.tgz",
       "integrity": "sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==",
@@ -21676,7 +21790,7 @@
         "node": ">=12"
       }
     },
-    "node_modules/vite-node/node_modules/@esbuild/darwin-arm64": {
+    "node_modules/vite/node_modules/@esbuild/darwin-arm64": {
       "version": "0.19.12",
       "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz",
       "integrity": "sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==",
@@ -21692,7 +21806,7 @@
         "node": ">=12"
       }
     },
-    "node_modules/vite-node/node_modules/@esbuild/darwin-x64": {
+    "node_modules/vite/node_modules/@esbuild/darwin-x64": {
       "version": "0.19.12",
       "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz",
       "integrity": "sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==",
@@ -21708,7 +21822,7 @@
         "node": ">=12"
       }
     },
-    "node_modules/vite-node/node_modules/@esbuild/freebsd-arm64": {
+    "node_modules/vite/node_modules/@esbuild/freebsd-arm64": {
       "version": "0.19.12",
       "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz",
       "integrity": "sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==",
@@ -21724,7 +21838,7 @@
         "node": ">=12"
       }
     },
-    "node_modules/vite-node/node_modules/@esbuild/freebsd-x64": {
+    "node_modules/vite/node_modules/@esbuild/freebsd-x64": {
       "version": "0.19.12",
       "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz",
       "integrity": "sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==",
@@ -21740,7 +21854,7 @@
         "node": ">=12"
       }
     },
-    "node_modules/vite-node/node_modules/@esbuild/linux-arm": {
+    "node_modules/vite/node_modules/@esbuild/linux-arm": {
       "version": "0.19.12",
       "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz",
       "integrity": "sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==",
@@ -21756,7 +21870,7 @@
         "node": ">=12"
       }
     },
-    "node_modules/vite-node/node_modules/@esbuild/linux-arm64": {
+    "node_modules/vite/node_modules/@esbuild/linux-arm64": {
       "version": "0.19.12",
       "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz",
       "integrity": "sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==",
@@ -21772,7 +21886,7 @@
         "node": ">=12"
       }
     },
-    "node_modules/vite-node/node_modules/@esbuild/linux-ia32": {
+    "node_modules/vite/node_modules/@esbuild/linux-ia32": {
       "version": "0.19.12",
       "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz",
       "integrity": "sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==",
@@ -21788,7 +21902,7 @@
         "node": ">=12"
       }
     },
-    "node_modules/vite-node/node_modules/@esbuild/linux-loong64": {
+    "node_modules/vite/node_modules/@esbuild/linux-loong64": {
       "version": "0.19.12",
       "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz",
       "integrity": "sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==",
@@ -21804,7 +21918,7 @@
         "node": ">=12"
       }
     },
-    "node_modules/vite-node/node_modules/@esbuild/linux-mips64el": {
+    "node_modules/vite/node_modules/@esbuild/linux-mips64el": {
       "version": "0.19.12",
       "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz",
       "integrity": "sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==",
@@ -21820,7 +21934,7 @@
         "node": ">=12"
       }
     },
-    "node_modules/vite-node/node_modules/@esbuild/linux-ppc64": {
+    "node_modules/vite/node_modules/@esbuild/linux-ppc64": {
       "version": "0.19.12",
       "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz",
       "integrity": "sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==",
@@ -21836,7 +21950,7 @@
         "node": ">=12"
       }
     },
-    "node_modules/vite-node/node_modules/@esbuild/linux-riscv64": {
+    "node_modules/vite/node_modules/@esbuild/linux-riscv64": {
       "version": "0.19.12",
       "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz",
       "integrity": "sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==",
@@ -21852,7 +21966,7 @@
         "node": ">=12"
       }
     },
-    "node_modules/vite-node/node_modules/@esbuild/linux-s390x": {
+    "node_modules/vite/node_modules/@esbuild/linux-s390x": {
       "version": "0.19.12",
       "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz",
       "integrity": "sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==",
@@ -21868,7 +21982,7 @@
         "node": ">=12"
       }
     },
-    "node_modules/vite-node/node_modules/@esbuild/linux-x64": {
+    "node_modules/vite/node_modules/@esbuild/linux-x64": {
       "version": "0.19.12",
       "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz",
       "integrity": "sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==",
@@ -21884,7 +21998,7 @@
         "node": ">=12"
       }
     },
-    "node_modules/vite-node/node_modules/@esbuild/netbsd-x64": {
+    "node_modules/vite/node_modules/@esbuild/netbsd-x64": {
       "version": "0.19.12",
       "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz",
       "integrity": "sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==",
@@ -21900,7 +22014,7 @@
         "node": ">=12"
       }
     },
-    "node_modules/vite-node/node_modules/@esbuild/openbsd-x64": {
+    "node_modules/vite/node_modules/@esbuild/openbsd-x64": {
       "version": "0.19.12",
       "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz",
       "integrity": "sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==",
@@ -21916,7 +22030,7 @@
         "node": ">=12"
       }
     },
-    "node_modules/vite-node/node_modules/@esbuild/sunos-x64": {
+    "node_modules/vite/node_modules/@esbuild/sunos-x64": {
       "version": "0.19.12",
       "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz",
       "integrity": "sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==",
@@ -21932,7 +22046,7 @@
         "node": ">=12"
       }
     },
-    "node_modules/vite-node/node_modules/@esbuild/win32-arm64": {
+    "node_modules/vite/node_modules/@esbuild/win32-arm64": {
       "version": "0.19.12",
       "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz",
       "integrity": "sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==",
@@ -21948,7 +22062,7 @@
         "node": ">=12"
       }
     },
-    "node_modules/vite-node/node_modules/@esbuild/win32-ia32": {
+    "node_modules/vite/node_modules/@esbuild/win32-ia32": {
       "version": "0.19.12",
       "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz",
       "integrity": "sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==",
@@ -21964,7 +22078,7 @@
         "node": ">=12"
       }
     },
-    "node_modules/vite-node/node_modules/@esbuild/win32-x64": {
+    "node_modules/vite/node_modules/@esbuild/win32-x64": {
       "version": "0.19.12",
       "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz",
       "integrity": "sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==",
@@ -21980,7 +22094,7 @@
         "node": ">=12"
       }
     },
-    "node_modules/vite-node/node_modules/esbuild": {
+    "node_modules/vite/node_modules/esbuild": {
       "version": "0.19.12",
       "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.12.tgz",
       "integrity": "sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==",
@@ -22018,239 +22132,214 @@
         "@esbuild/win32-x64": "0.19.12"
       }
     },
-    "node_modules/vite-node/node_modules/rollup": {
-      "version": "4.9.6",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.9.6.tgz",
-      "integrity": "sha512-05lzkCS2uASX0CiLFybYfVkwNbKZG5NFQ6Go0VWyogFTXXbR039UVsegViTntkk4OglHBdF54ccApXRRuXRbsg==",
-      "dev": true,
-      "dependencies": {
-        "@types/estree": "1.0.5"
-      },
-      "bin": {
-        "rollup": "dist/bin/rollup"
-      },
-      "engines": {
-        "node": ">=18.0.0",
-        "npm": ">=8.0.0"
-      },
-      "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.9.6",
-        "@rollup/rollup-android-arm64": "4.9.6",
-        "@rollup/rollup-darwin-arm64": "4.9.6",
-        "@rollup/rollup-darwin-x64": "4.9.6",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.9.6",
-        "@rollup/rollup-linux-arm64-gnu": "4.9.6",
-        "@rollup/rollup-linux-arm64-musl": "4.9.6",
-        "@rollup/rollup-linux-riscv64-gnu": "4.9.6",
-        "@rollup/rollup-linux-x64-gnu": "4.9.6",
-        "@rollup/rollup-linux-x64-musl": "4.9.6",
-        "@rollup/rollup-win32-arm64-msvc": "4.9.6",
-        "@rollup/rollup-win32-ia32-msvc": "4.9.6",
-        "@rollup/rollup-win32-x64-msvc": "4.9.6",
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/vite-node/node_modules/vite": {
-      "version": "5.0.12",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.12.tgz",
-      "integrity": "sha512-4hsnEkG3q0N4Tzf1+t6NdN9dg/L3BM+q8SWgbSPnJvrgH2kgdyzfVJwbR1ic69/4uMJJ/3dqDZZE5/WwqW8U1w==",
+    "node_modules/vitest": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-1.2.2.tgz",
+      "integrity": "sha512-d5Ouvrnms3GD9USIK36KG8OZ5bEvKEkITFtnGv56HFaSlbItJuYr7hv2Lkn903+AvRAgSixiamozUVfORUekjw==",
       "dev": true,
       "dependencies": {
-        "esbuild": "^0.19.3",
-        "postcss": "^8.4.32",
-        "rollup": "^4.2.0"
+        "@vitest/expect": "1.2.2",
+        "@vitest/runner": "1.2.2",
+        "@vitest/snapshot": "1.2.2",
+        "@vitest/spy": "1.2.2",
+        "@vitest/utils": "1.2.2",
+        "acorn-walk": "^8.3.2",
+        "cac": "^6.7.14",
+        "chai": "^4.3.10",
+        "debug": "^4.3.4",
+        "execa": "^8.0.1",
+        "local-pkg": "^0.5.0",
+        "magic-string": "^0.30.5",
+        "pathe": "^1.1.1",
+        "picocolors": "^1.0.0",
+        "std-env": "^3.5.0",
+        "strip-literal": "^1.3.0",
+        "tinybench": "^2.5.1",
+        "tinypool": "^0.8.2",
+        "vite": "^5.0.0",
+        "vite-node": "1.2.2",
+        "why-is-node-running": "^2.2.2"
       },
       "bin": {
-        "vite": "bin/vite.js"
+        "vitest": "vitest.mjs"
       },
       "engines": {
         "node": "^18.0.0 || >=20.0.0"
       },
       "funding": {
-        "url": "https://github.com/vitejs/vite?sponsor=1"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.3"
+        "url": "https://opencollective.com/vitest"
       },
       "peerDependencies": {
+        "@edge-runtime/vm": "*",
         "@types/node": "^18.0.0 || >=20.0.0",
-        "less": "*",
-        "lightningcss": "^1.21.0",
-        "sass": "*",
-        "stylus": "*",
-        "sugarss": "*",
-        "terser": "^5.4.0"
+        "@vitest/browser": "^1.0.0",
+        "@vitest/ui": "^1.0.0",
+        "happy-dom": "*",
+        "jsdom": "*"
       },
       "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        },
-        "less": {
+        "@edge-runtime/vm": {
           "optional": true
         },
-        "lightningcss": {
+        "@types/node": {
           "optional": true
         },
-        "sass": {
+        "@vitest/browser": {
           "optional": true
         },
-        "stylus": {
+        "@vitest/ui": {
           "optional": true
         },
-        "sugarss": {
+        "happy-dom": {
           "optional": true
         },
-        "terser": {
+        "jsdom": {
           "optional": true
         }
       }
     },
-    "node_modules/vite-tsconfig-paths": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-3.6.0.tgz",
-      "integrity": "sha512-UfsPYonxLqPD633X8cWcPFVuYzx/CMNHAjZTasYwX69sXpa4gNmQkR0XCjj82h7zhLGdTWagMjC1qfb9S+zv0A==",
+    "node_modules/vitest/node_modules/execa": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz",
+      "integrity": "sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==",
       "dev": true,
       "dependencies": {
-        "debug": "^4.1.1",
-        "globrex": "^0.1.2",
-        "recrawl-sync": "^2.0.3",
-        "tsconfig-paths": "^4.0.0"
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^8.0.1",
+        "human-signals": "^5.0.0",
+        "is-stream": "^3.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^5.1.0",
+        "onetime": "^6.0.0",
+        "signal-exit": "^4.1.0",
+        "strip-final-newline": "^3.0.0"
       },
-      "peerDependencies": {
-        "vite": ">2.0.0-0"
+      "engines": {
+        "node": ">=16.17"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
       }
     },
-    "node_modules/vite/node_modules/@esbuild/android-arm": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.15.18.tgz",
-      "integrity": "sha512-5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw==",
-      "cpu": [
-        "arm"
-      ],
+    "node_modules/vitest/node_modules/get-stream": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz",
+      "integrity": "sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
       "engines": {
-        "node": ">=12"
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/vite/node_modules/@esbuild/linux-loong64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.18.tgz",
-      "integrity": "sha512-L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ==",
-      "cpu": [
-        "loong64"
-      ],
+    "node_modules/vitest/node_modules/human-signals": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz",
+      "integrity": "sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
       "engines": {
-        "node": ">=12"
+        "node": ">=16.17.0"
       }
     },
-    "node_modules/vite/node_modules/esbuild": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.15.18.tgz",
-      "integrity": "sha512-x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q==",
+    "node_modules/vitest/node_modules/is-stream": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz",
+      "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==",
       "dev": true,
-      "hasInstallScript": true,
-      "bin": {
-        "esbuild": "bin/esbuild"
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/vitest/node_modules/mimic-fn": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
+      "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==",
+      "dev": true,
       "engines": {
         "node": ">=12"
       },
-      "optionalDependencies": {
-        "@esbuild/android-arm": "0.15.18",
-        "@esbuild/linux-loong64": "0.15.18",
-        "esbuild-android-64": "0.15.18",
-        "esbuild-android-arm64": "0.15.18",
-        "esbuild-darwin-64": "0.15.18",
-        "esbuild-darwin-arm64": "0.15.18",
-        "esbuild-freebsd-64": "0.15.18",
-        "esbuild-freebsd-arm64": "0.15.18",
-        "esbuild-linux-32": "0.15.18",
-        "esbuild-linux-64": "0.15.18",
-        "esbuild-linux-arm": "0.15.18",
-        "esbuild-linux-arm64": "0.15.18",
-        "esbuild-linux-mips64le": "0.15.18",
-        "esbuild-linux-ppc64le": "0.15.18",
-        "esbuild-linux-riscv64": "0.15.18",
-        "esbuild-linux-s390x": "0.15.18",
-        "esbuild-netbsd-64": "0.15.18",
-        "esbuild-openbsd-64": "0.15.18",
-        "esbuild-sunos-64": "0.15.18",
-        "esbuild-windows-32": "0.15.18",
-        "esbuild-windows-64": "0.15.18",
-        "esbuild-windows-arm64": "0.15.18"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/vitest": {
-      "version": "0.24.5",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-0.24.5.tgz",
-      "integrity": "sha512-zw6JhPUHtLILQDe5Q39b/SzoITkG+R7hcFjuthp4xsi6zpmfQPOZcHodZ+3bqoWl4EdGK/p1fuMiEwdxgbGLOA==",
+    "node_modules/vitest/node_modules/npm-run-path": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.2.0.tgz",
+      "integrity": "sha512-W4/tgAXFqFA0iL7fk0+uQ3g7wkL8xJmx3XdK0VGb4cHW//eZTtKGvFBBoRKVTpY7n6ze4NL9ly7rgXcHufqXKg==",
       "dev": true,
       "dependencies": {
-        "@types/chai": "^4.3.3",
-        "@types/chai-subset": "^1.3.3",
-        "@types/node": "*",
-        "chai": "^4.3.6",
-        "debug": "^4.3.4",
-        "local-pkg": "^0.4.2",
-        "strip-literal": "^0.4.2",
-        "tinybench": "^2.3.1",
-        "tinypool": "^0.3.0",
-        "tinyspy": "^1.0.2",
-        "vite": "^3.0.0"
-      },
-      "bin": {
-        "vitest": "vitest.mjs"
+        "path-key": "^4.0.0"
       },
       "engines": {
-        "node": ">=v14.16.0"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/antfu"
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/vitest/node_modules/onetime": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz",
+      "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==",
+      "dev": true,
+      "dependencies": {
+        "mimic-fn": "^4.0.0"
       },
-      "peerDependencies": {
-        "@edge-runtime/vm": "*",
-        "@vitest/browser": "*",
-        "@vitest/ui": "*",
-        "happy-dom": "*",
-        "jsdom": "*"
+      "engines": {
+        "node": ">=12"
       },
-      "peerDependenciesMeta": {
-        "@edge-runtime/vm": {
-          "optional": true
-        },
-        "@vitest/browser": {
-          "optional": true
-        },
-        "@vitest/ui": {
-          "optional": true
-        },
-        "happy-dom": {
-          "optional": true
-        },
-        "jsdom": {
-          "optional": true
-        }
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/vitest/node_modules/path-key": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
+      "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/vitest/node_modules/local-pkg": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.4.3.tgz",
-      "integrity": "sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==",
+    "node_modules/vitest/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
       "dev": true,
       "engines": {
         "node": ">=14"
       },
       "funding": {
-        "url": "https://github.com/sponsors/antfu"
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/vitest/node_modules/strip-final-newline": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz",
+      "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/void-elements": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz",
+      "integrity": "sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
     "node_modules/vt-pbf": {
@@ -22319,30 +22408,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/whatwg-encoding": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
-      "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
-      "dev": true,
-      "dependencies": {
-        "iconv-lite": "0.6.3"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/whatwg-encoding/node_modules/iconv-lite": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "dev": true,
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/whatwg-mimetype": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
@@ -22439,15 +22504,15 @@
       }
     },
     "node_modules/which-typed-array": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz",
-      "integrity": "sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==",
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.14.tgz",
+      "integrity": "sha512-VnXFiIW8yNn9kIHN88xvZ4yOWchftKDsRJ8fEPacX/wl1lOvBrhsJ/OeJCXq7B0AaijRuqgzSKalJoPk+D8MPg==",
       "dependencies": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.4",
+        "available-typed-arrays": "^1.0.6",
+        "call-bind": "^1.0.5",
         "for-each": "^0.3.3",
         "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.0"
+        "has-tostringtag": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -22456,6 +22521,22 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/why-is-node-running": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.2.2.tgz",
+      "integrity": "sha512-6tSwToZxTOcotxHeA+qGCq1mVzKR3CwcJGmVcY+QE8SHy6TnpFnh8PAvPNHYr7EcuVeG0QSMxtYCuO1ta/G/oA==",
+      "dev": true,
+      "dependencies": {
+        "siginfo": "^2.0.0",
+        "stackback": "0.0.2"
+      },
+      "bin": {
+        "why-is-node-running": "cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/wide-align": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
@@ -22685,12 +22766,11 @@
       }
     },
     "node_modules/yargs-parser": {
-      "version": "20.2.9",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
-      "dev": true,
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
       }
     },
     "node_modules/yargs/node_modules/emoji-regex": {
@@ -22711,14 +22791,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/yargs/node_modules/yargs-parser": {
-      "version": "21.1.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/yocto-queue": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
diff --git a/package.json b/package.json
index 62c46abdb..bd6128b51 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,8 @@
     "db:deploy-migration": "prisma migrate deploy && prisma generate",
     "db:deploy-migration:staging": "dotenv -e .env.staging -- prisma migrate deploy && prisma generate",
     "db:deploy-migration:production": "dotenv -e .env.production -- prisma migrate deploy && prisma generate",
-    "dev": "remix dev",
+    "dev": "dotenv -e .env -- run-p dev:*",
+    "dev:remix": "remix dev -c \"node build/index.js\" | pino-pretty",
     "production:dev": "dotenv -e .env.production -- remix dev",
     "staging:dev": "dotenv -e .env.staging -- remix dev",
     "format": "prettier --write .",
@@ -38,110 +39,116 @@
     "precommit": "npm run db:generate-type && npm run lint:fix && npm run format && npm run typecheck"
   },
   "dependencies": {
-    "@markdoc/markdoc": "^0.2.2",
-    "@prisma/client": "^5.4.2",
-    "@radix-ui/react-alert-dialog": "^1.0.4",
+    "@hono/node-server": "^1.7.0",
+    "@markdoc/markdoc": "^0.4.0",
+    "@prisma/client": "^5.9.1",
+    "@radix-ui/react-alert-dialog": "^1.0.5",
     "@radix-ui/react-dropdown-menu": "2.0.4",
-    "@radix-ui/react-hover-card": "^1.0.6",
+    "@radix-ui/react-hover-card": "^1.0.7",
     "@radix-ui/react-icons": "^1.3.0",
-    "@radix-ui/react-popover": "^1.0.6",
+    "@radix-ui/react-popover": "^1.0.7",
     "@radix-ui/react-select": "1.2.1",
     "@radix-ui/react-switch": "^1.0.3",
     "@radix-ui/react-tabs": "1.0.3",
     "@radix-ui/react-toast": "1.1.3",
-    "@radix-ui/react-tooltip": "^1.0.6",
+    "@radix-ui/react-tooltip": "^1.0.7",
     "@react-email/components": "0.0.14",
-    "@remix-run/css-bundle": "2.1.0",
-    "@remix-run/node": "2.1.0",
-    "@remix-run/react": "2.1.0",
-    "@remix-run/serve": "2.1.0",
-    "@sentry/remix": "^7.98.0",
-    "@stripe/react-stripe-js": "^2.1.1",
-    "@stripe/stripe-js": "^1.54.2",
-    "@supabase/supabase-js": "^2.26.0",
-    "@tremor/react": "^3.10.0",
+    "@remix-run/css-bundle": "2.5.1",
+    "@remix-run/node": "2.5.1",
+    "@remix-run/react": "2.5.1",
+    "@remix-run/serve": "2.5.1",
+    "@sentry/remix": "^7.101.0",
+    "@stripe/react-stripe-js": "^2.5.0",
+    "@stripe/stripe-js": "^3.0.2",
+    "@supabase/supabase-js": "^2.39.6",
+    "@tremor/react": "^3.14.0",
     "@zxing/library": "^0.20.0",
     "changedpi": "^1.0.4",
-    "cookie": "^0.5.0",
-    "crisp-sdk-web": "^1.0.19",
-    "csv-parse": "^5.4.0",
+    "cookie": "^0.6.0",
+    "crisp-sdk-web": "^1.0.21",
+    "csv-parse": "^5.5.3",
+    "date-fns": "^3.3.1",
     "detectrtc": "^1.4.1",
     "dom-to-image": "^2.6.0",
-    "framer-motion": "^9.1.7",
+    "framer-motion": "^11.0.5",
+    "hono": "^4.0.2",
     "intl-parse-accept-language": "^1.0.0",
-    "isbot": "^3.6.12",
-    "jotai": "^2.2.1",
+    "isbot": "^4.4.0",
+    "jotai": "^2.6.4",
     "jsonwebtoken": "^9.0.2",
     "jszip": "^3.10.1",
     "luxon": "^3.4.4",
-    "mapbox-gl": "^2.15.0",
-    "maplibre-gl": "^3.1.0",
-    "nodemailer": "^6.9.3",
+    "mapbox-gl": "^3.1.2",
+    "maplibre-gl": "^4.0.0",
+    "nodemailer": "^6.9.9",
+    "path-to-regexp": "^6.2.1",
     "pg-boss": "^9.0.3",
+    "pino-pretty": "^10.3.1",
     "qrcode-generator": "^1.4.4",
     "react": "^18.2.0",
-    "react-day-picker": "^8.8.2",
+    "react-day-picker": "^8.10.0",
     "react-dom": "^18.2.0",
     "react-dropzone": "^14.2.3",
-    "react-map-gl": "^7.1.0",
+    "react-map-gl": "^7.1.7",
     "react-microsoft-clarity": "^1.2.0",
-    "react-tag-autocomplete": "^7.0.0-rc.8",
-    "react-to-print": "^2.14.13",
-    "react-zorm": "^0.6.2",
-    "remix-utils": "^7.0.2",
-    "sharp": "^0.32.1",
-    "stripe": "^12.16.0",
-    "swiper": "^10.3.1",
-    "tailwind-merge": "^1.13.2",
-    "tailwindcss-animate": "^1.0.6",
+    "react-tag-autocomplete": "^7.1.0",
+    "react-to-print": "^2.15.1",
+    "react-zorm": "^0.9.0",
+    "remix-hono": "^0.0.15",
+    "remix-utils": "^7.5.0",
+    "sharp": "^0.33.2",
+    "stripe": "^14.16.0",
+    "swiper": "^11.0.6",
+    "tailwind-merge": "^2.2.1",
+    "tailwindcss-animate": "^1.0.7",
     "tiny-invariant": "^1.3.1",
-    "ua-parser-js": "^1.0.35",
-    "zod": "^3.21.4"
+    "ua-parser-js": "^1.0.37",
+    "zod": "^3.22.4"
   },
   "devDependencies": {
-    "@faker-js/faker": "^7.6.0",
-    "@playwright/test": "^1.34.3",
-    "@remix-run/dev": "2.1.0",
-    "@remix-run/eslint-config": "2.1.0",
+    "@faker-js/faker": "^8.4.1",
+    "@playwright/test": "^1.41.2",
+    "@remix-run/dev": "2.5.1",
+    "@remix-run/eslint-config": "2.5.1",
     "@tailwindcss/aspect-ratio": "^0.4.2",
-    "@tailwindcss/forms": "^0.5.3",
-    "@tailwindcss/typography": "^0.5.9",
-    "@testing-library/jest-dom": "^5.16.5",
-    "@testing-library/react": "^13.4.0",
-    "@testing-library/user-event": "^14.4.3",
-    "@types/dom-to-image": "^2.6.4",
-    "@types/jsonwebtoken": "^9.0.3",
-    "@types/luxon": "^3.3.7",
-    "@types/nodemailer": "^6.4.8",
-    "@types/react": "^18.2.14",
-    "@types/react-dom": "^18.2.6",
-    "@vitejs/plugin-react": "^2.2.0",
-    "@vitest/coverage-c8": "^0.24.5",
+    "@tailwindcss/forms": "^0.5.7",
+    "@tailwindcss/typography": "^0.5.10",
+    "@testing-library/jest-dom": "^6.4.2",
+    "@testing-library/react": "^14.2.1",
+    "@testing-library/user-event": "^14.5.2",
+    "@types/dom-to-image": "^2.6.7",
+    "@types/jsonwebtoken": "^9.0.5",
+    "@types/luxon": "^3.4.2",
+    "@types/nodemailer": "^6.4.14",
+    "@types/react": "^18.2.55",
+    "@types/react-dom": "^18.2.19",
+    "@vitejs/plugin-react": "^4.2.1",
+    "@vitest/coverage-v8": "^1.2.2",
     "cross-env": "^7.0.3",
-    "dotenv-cli": "^6.0.0",
-    "eslint": "^8.44.0",
-    "eslint-config-prettier": "^8.8.0",
-    "eslint-plugin-tailwindcss": "^3.13.0",
-    "happy-dom": "^10.0.3",
-    "husky": "^8.0.0",
-    "msw": "^1.2.2",
-    "nodemailer-mock": "^2.0.1",
+    "dotenv-cli": "^7.3.0",
+    "eslint": "^8.56.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-tailwindcss": "^3.14.2",
+    "happy-dom": "^13.3.8",
+    "husky": "^9.0.11",
+    "msw": "^1.2.0",
+    "nodemailer-mock": "^2.0.4",
     "npm-run-all": "^4.1.5",
     "prettier": "3.0.3",
-    "prettier-plugin-tailwindcss": "^0.5.4",
-    "prisma": "^5.4.2",
-    "remix-flat-routes": "^0.5.10",
+    "prettier-plugin-tailwindcss": "^0.5.11",
+    "prisma": "^5.9.1",
+    "remix-flat-routes": "^0.6.4",
     "start-server-and-test": "^2.0.3",
-    "tailwind-scrollbar": "^2.1.0",
-    "tailwindcss": "^3.3.2",
+    "tailwind-scrollbar": "^3.1.0",
+    "tailwindcss": "^3.4.1",
     "tsconfig-paths": "^4.2.0",
-    "tsx": "^3.13.0",
+    "tsx": "^4.7.1",
     "typescript": "^5.1.0",
-    "vite-tsconfig-paths": "^3.6.0",
-    "vitest": "^0.24.5"
+    "vite-tsconfig-paths": "^4.3.1",
+    "vitest": "^1.2.2"
   },
   "engines": {
-    "node": ">=18"
+    "node": ">=20"
   },
   "prisma": {
     "schema": "app/database/schema.prisma",
diff --git a/public/favicon.ico b/public/static/favicon.ico
similarity index 100%
rename from public/favicon.ico
rename to public/static/favicon.ico
diff --git a/public/fonts/inter/Inter.var.woff2 b/public/static/fonts/inter/Inter.var.woff2
similarity index 100%
rename from public/fonts/inter/Inter.var.woff2
rename to public/static/fonts/inter/Inter.var.woff2
diff --git a/public/images/asset-placeholder.jpg b/public/static/images/asset-placeholder.jpg
similarity index 100%
rename from public/images/asset-placeholder.jpg
rename to public/static/images/asset-placeholder.jpg
diff --git a/public/images/auth-cover.jpg b/public/static/images/auth-cover.jpg
similarity index 100%
rename from public/images/auth-cover.jpg
rename to public/static/images/auth-cover.jpg
diff --git a/public/images/bg-overlay1.png b/public/static/images/bg-overlay1.png
similarity index 100%
rename from public/images/bg-overlay1.png
rename to public/static/images/bg-overlay1.png
diff --git a/public/images/carlos-support.jpg b/public/static/images/carlos-support.jpg
similarity index 100%
rename from public/images/carlos-support.jpg
rename to public/static/images/carlos-support.jpg
diff --git a/public/images/default_pfp.jpg b/public/static/images/default_pfp.jpg
similarity index 100%
rename from public/images/default_pfp.jpg
rename to public/static/images/default_pfp.jpg
diff --git a/public/images/empty-state.svg b/public/static/images/empty-state.svg
similarity index 100%
rename from public/images/empty-state.svg
rename to public/static/images/empty-state.svg
diff --git a/public/images/error-icon.svg b/public/static/images/error-icon.svg
similarity index 100%
rename from public/images/error-icon.svg
rename to public/static/images/error-icon.svg
diff --git a/public/images/logo-full-color(x2).png b/public/static/images/logo-full-color(x2).png
similarity index 100%
rename from public/images/logo-full-color(x2).png
rename to public/static/images/logo-full-color(x2).png
diff --git a/public/images/map-marker.png b/public/static/images/map-marker.png
similarity index 100%
rename from public/images/map-marker.png
rename to public/static/images/map-marker.png
diff --git a/public/images/map-placeholder.jpg b/public/static/images/map-placeholder.jpg
similarity index 100%
rename from public/images/map-placeholder.jpg
rename to public/static/images/map-placeholder.jpg
diff --git a/public/images/no-location-image.jpg b/public/static/images/no-location-image.jpg
similarity index 100%
rename from public/images/no-location-image.jpg
rename to public/static/images/no-location-image.jpg
diff --git a/public/images/no-notes.svg b/public/static/images/no-notes.svg
similarity index 100%
rename from public/images/no-notes.svg
rename to public/static/images/no-notes.svg
diff --git a/public/images/occultist.png b/public/static/images/occultist.png
similarity index 100%
rename from public/images/occultist.png
rename to public/static/images/occultist.png
diff --git a/public/images/placeholder-square.png b/public/static/images/placeholder-square.png
similarity index 100%
rename from public/images/placeholder-square.png
rename to public/static/images/placeholder-square.png
diff --git a/public/images/qr-code-placeholder.jpg b/public/static/images/qr-code-placeholder.jpg
similarity index 100%
rename from public/images/qr-code-placeholder.jpg
rename to public/static/images/qr-code-placeholder.jpg
diff --git a/public/images/shelf-logo-white-text.png b/public/static/images/shelf-logo-white-text.png
similarity index 100%
rename from public/images/shelf-logo-white-text.png
rename to public/static/images/shelf-logo-white-text.png
diff --git a/public/images/shelf-logo-x512.png b/public/static/images/shelf-logo-x512.png
similarity index 100%
rename from public/images/shelf-logo-x512.png
rename to public/static/images/shelf-logo-x512.png
diff --git a/public/images/shelf-symbol-desktop.ico b/public/static/images/shelf-symbol-desktop.ico
similarity index 100%
rename from public/images/shelf-symbol-desktop.ico
rename to public/static/images/shelf-symbol-desktop.ico
diff --git a/public/images/shelf-symbol-desktop.png b/public/static/images/shelf-symbol-desktop.png
similarity index 100%
rename from public/images/shelf-symbol-desktop.png
rename to public/static/images/shelf-symbol-desktop.png
diff --git a/public/images/shelf-symbol.png b/public/static/images/shelf-symbol.png
similarity index 100%
rename from public/images/shelf-symbol.png
rename to public/static/images/shelf-symbol.png
diff --git a/public/images/shelf-symbol.svg b/public/static/images/shelf-symbol.svg
similarity index 100%
rename from public/images/shelf-symbol.svg
rename to public/static/images/shelf-symbol.svg
diff --git a/public/images/shelf-typography.svg b/public/static/images/shelf-typography.svg
similarity index 100%
rename from public/images/shelf-typography.svg
rename to public/static/images/shelf-typography.svg
diff --git a/public/images/shelf-visual1.jpg b/public/static/images/shelf-visual1.jpg
similarity index 100%
rename from public/images/shelf-visual1.jpg
rename to public/static/images/shelf-visual1.jpg
diff --git a/public/images/shelf-visual2.jpg b/public/static/images/shelf-visual2.jpg
similarity index 100%
rename from public/images/shelf-visual2.jpg
rename to public/static/images/shelf-visual2.jpg
diff --git a/public/images/shelf-visual3.jpg b/public/static/images/shelf-visual3.jpg
similarity index 100%
rename from public/images/shelf-visual3.jpg
rename to public/static/images/shelf-visual3.jpg
diff --git a/public/manifest.json b/public/static/manifest.json
similarity index 89%
rename from public/manifest.json
rename to public/static/manifest.json
index cc89a8cfa..ca0cfec7f 100644
--- a/public/manifest.json
+++ b/public/static/manifest.json
@@ -10,7 +10,7 @@
   "background_color": "#FFFFFF",
   "icons": [
     {
-      "src": "/images/shelf-logo-x512.png",
+      "src": "/static/images/shelf-logo-x512.png",
       "sizes": "512x512",
       "type": "image/png",
       "purpose": "any"
diff --git a/public/shelf.nu-example-asset-import-from-content.csv b/public/static/shelf.nu-example-asset-import-from-content.csv
similarity index 100%
rename from public/shelf.nu-example-asset-import-from-content.csv
rename to public/static/shelf.nu-example-asset-import-from-content.csv
diff --git a/public/splash_screens/10.2__iPad_landscape.png b/public/static/splash_screens/10.2__iPad_landscape.png
similarity index 100%
rename from public/splash_screens/10.2__iPad_landscape.png
rename to public/static/splash_screens/10.2__iPad_landscape.png
diff --git a/public/splash_screens/10.2__iPad_portrait.png b/public/static/splash_screens/10.2__iPad_portrait.png
similarity index 100%
rename from public/splash_screens/10.2__iPad_portrait.png
rename to public/static/splash_screens/10.2__iPad_portrait.png
diff --git a/public/splash_screens/10.5__iPad_Air_landscape.png b/public/static/splash_screens/10.5__iPad_Air_landscape.png
similarity index 100%
rename from public/splash_screens/10.5__iPad_Air_landscape.png
rename to public/static/splash_screens/10.5__iPad_Air_landscape.png
diff --git a/public/splash_screens/10.5__iPad_Air_portrait.png b/public/static/splash_screens/10.5__iPad_Air_portrait.png
similarity index 100%
rename from public/splash_screens/10.5__iPad_Air_portrait.png
rename to public/static/splash_screens/10.5__iPad_Air_portrait.png
diff --git a/public/splash_screens/10.9__iPad_Air_landscape.png b/public/static/splash_screens/10.9__iPad_Air_landscape.png
similarity index 100%
rename from public/splash_screens/10.9__iPad_Air_landscape.png
rename to public/static/splash_screens/10.9__iPad_Air_landscape.png
diff --git a/public/splash_screens/10.9__iPad_Air_portrait.png b/public/static/splash_screens/10.9__iPad_Air_portrait.png
similarity index 100%
rename from public/splash_screens/10.9__iPad_Air_portrait.png
rename to public/static/splash_screens/10.9__iPad_Air_portrait.png
diff --git a/public/splash_screens/11__iPad_Pro__10.5__iPad_Pro_landscape.png b/public/static/splash_screens/11__iPad_Pro__10.5__iPad_Pro_landscape.png
similarity index 100%
rename from public/splash_screens/11__iPad_Pro__10.5__iPad_Pro_landscape.png
rename to public/static/splash_screens/11__iPad_Pro__10.5__iPad_Pro_landscape.png
diff --git a/public/splash_screens/11__iPad_Pro__10.5__iPad_Pro_portrait.png b/public/static/splash_screens/11__iPad_Pro__10.5__iPad_Pro_portrait.png
similarity index 100%
rename from public/splash_screens/11__iPad_Pro__10.5__iPad_Pro_portrait.png
rename to public/static/splash_screens/11__iPad_Pro__10.5__iPad_Pro_portrait.png
diff --git a/public/splash_screens/12.9__iPad_Pro_landscape.png b/public/static/splash_screens/12.9__iPad_Pro_landscape.png
similarity index 100%
rename from public/splash_screens/12.9__iPad_Pro_landscape.png
rename to public/static/splash_screens/12.9__iPad_Pro_landscape.png
diff --git a/public/splash_screens/12.9__iPad_Pro_portrait.png b/public/static/splash_screens/12.9__iPad_Pro_portrait.png
similarity index 100%
rename from public/splash_screens/12.9__iPad_Pro_portrait.png
rename to public/static/splash_screens/12.9__iPad_Pro_portrait.png
diff --git a/public/splash_screens/4__iPhone_SE__iPod_touch_5th_generation_and_later_landscape.png b/public/static/splash_screens/4__iPhone_SE__iPod_touch_5th_generation_and_later_landscape.png
similarity index 100%
rename from public/splash_screens/4__iPhone_SE__iPod_touch_5th_generation_and_later_landscape.png
rename to public/static/splash_screens/4__iPhone_SE__iPod_touch_5th_generation_and_later_landscape.png
diff --git a/public/splash_screens/4__iPhone_SE__iPod_touch_5th_generation_and_later_portrait.png b/public/static/splash_screens/4__iPhone_SE__iPod_touch_5th_generation_and_later_portrait.png
similarity index 100%
rename from public/splash_screens/4__iPhone_SE__iPod_touch_5th_generation_and_later_portrait.png
rename to public/static/splash_screens/4__iPhone_SE__iPod_touch_5th_generation_and_later_portrait.png
diff --git a/public/splash_screens/8.3__iPad_Mini_landscape.png b/public/static/splash_screens/8.3__iPad_Mini_landscape.png
similarity index 100%
rename from public/splash_screens/8.3__iPad_Mini_landscape.png
rename to public/static/splash_screens/8.3__iPad_Mini_landscape.png
diff --git a/public/splash_screens/8.3__iPad_Mini_portrait.png b/public/static/splash_screens/8.3__iPad_Mini_portrait.png
similarity index 100%
rename from public/splash_screens/8.3__iPad_Mini_portrait.png
rename to public/static/splash_screens/8.3__iPad_Mini_portrait.png
diff --git a/public/splash_screens/9.7__iPad_Pro__7.9__iPad_mini__9.7__iPad_Air__9.7__iPad_landscape.png b/public/static/splash_screens/9.7__iPad_Pro__7.9__iPad_mini__9.7__iPad_Air__9.7__iPad_landscape.png
similarity index 100%
rename from public/splash_screens/9.7__iPad_Pro__7.9__iPad_mini__9.7__iPad_Air__9.7__iPad_landscape.png
rename to public/static/splash_screens/9.7__iPad_Pro__7.9__iPad_mini__9.7__iPad_Air__9.7__iPad_landscape.png
diff --git a/public/splash_screens/9.7__iPad_Pro__7.9__iPad_mini__9.7__iPad_Air__9.7__iPad_portrait.png b/public/static/splash_screens/9.7__iPad_Pro__7.9__iPad_mini__9.7__iPad_Air__9.7__iPad_portrait.png
similarity index 100%
rename from public/splash_screens/9.7__iPad_Pro__7.9__iPad_mini__9.7__iPad_Air__9.7__iPad_portrait.png
rename to public/static/splash_screens/9.7__iPad_Pro__7.9__iPad_mini__9.7__iPad_Air__9.7__iPad_portrait.png
diff --git a/public/splash_screens/iPhone_11_Pro_Max__iPhone_XS_Max_landscape.png b/public/static/splash_screens/iPhone_11_Pro_Max__iPhone_XS_Max_landscape.png
similarity index 100%
rename from public/splash_screens/iPhone_11_Pro_Max__iPhone_XS_Max_landscape.png
rename to public/static/splash_screens/iPhone_11_Pro_Max__iPhone_XS_Max_landscape.png
diff --git a/public/splash_screens/iPhone_11_Pro_Max__iPhone_XS_Max_portrait.png b/public/static/splash_screens/iPhone_11_Pro_Max__iPhone_XS_Max_portrait.png
similarity index 100%
rename from public/splash_screens/iPhone_11_Pro_Max__iPhone_XS_Max_portrait.png
rename to public/static/splash_screens/iPhone_11_Pro_Max__iPhone_XS_Max_portrait.png
diff --git a/public/splash_screens/iPhone_11__iPhone_XR_landscape.png b/public/static/splash_screens/iPhone_11__iPhone_XR_landscape.png
similarity index 100%
rename from public/splash_screens/iPhone_11__iPhone_XR_landscape.png
rename to public/static/splash_screens/iPhone_11__iPhone_XR_landscape.png
diff --git a/public/splash_screens/iPhone_11__iPhone_XR_portrait.png b/public/static/splash_screens/iPhone_11__iPhone_XR_portrait.png
similarity index 100%
rename from public/splash_screens/iPhone_11__iPhone_XR_portrait.png
rename to public/static/splash_screens/iPhone_11__iPhone_XR_portrait.png
diff --git a/public/splash_screens/iPhone_13_mini__iPhone_12_mini__iPhone_11_Pro__iPhone_XS__iPhone_X_landscape.png b/public/static/splash_screens/iPhone_13_mini__iPhone_12_mini__iPhone_11_Pro__iPhone_XS__iPhone_X_landscape.png
similarity index 100%
rename from public/splash_screens/iPhone_13_mini__iPhone_12_mini__iPhone_11_Pro__iPhone_XS__iPhone_X_landscape.png
rename to public/static/splash_screens/iPhone_13_mini__iPhone_12_mini__iPhone_11_Pro__iPhone_XS__iPhone_X_landscape.png
diff --git a/public/splash_screens/iPhone_13_mini__iPhone_12_mini__iPhone_11_Pro__iPhone_XS__iPhone_X_portrait.png b/public/static/splash_screens/iPhone_13_mini__iPhone_12_mini__iPhone_11_Pro__iPhone_XS__iPhone_X_portrait.png
similarity index 100%
rename from public/splash_screens/iPhone_13_mini__iPhone_12_mini__iPhone_11_Pro__iPhone_XS__iPhone_X_portrait.png
rename to public/static/splash_screens/iPhone_13_mini__iPhone_12_mini__iPhone_11_Pro__iPhone_XS__iPhone_X_portrait.png
diff --git a/public/splash_screens/iPhone_14_Plus__iPhone_13_Pro_Max__iPhone_12_Pro_Max_landscape.png b/public/static/splash_screens/iPhone_14_Plus__iPhone_13_Pro_Max__iPhone_12_Pro_Max_landscape.png
similarity index 100%
rename from public/splash_screens/iPhone_14_Plus__iPhone_13_Pro_Max__iPhone_12_Pro_Max_landscape.png
rename to public/static/splash_screens/iPhone_14_Plus__iPhone_13_Pro_Max__iPhone_12_Pro_Max_landscape.png
diff --git a/public/splash_screens/iPhone_14_Plus__iPhone_13_Pro_Max__iPhone_12_Pro_Max_portrait.png b/public/static/splash_screens/iPhone_14_Plus__iPhone_13_Pro_Max__iPhone_12_Pro_Max_portrait.png
similarity index 100%
rename from public/splash_screens/iPhone_14_Plus__iPhone_13_Pro_Max__iPhone_12_Pro_Max_portrait.png
rename to public/static/splash_screens/iPhone_14_Plus__iPhone_13_Pro_Max__iPhone_12_Pro_Max_portrait.png
diff --git a/public/splash_screens/iPhone_14__iPhone_13_Pro__iPhone_13__iPhone_12_Pro__iPhone_12_landscape.png b/public/static/splash_screens/iPhone_14__iPhone_13_Pro__iPhone_13__iPhone_12_Pro__iPhone_12_landscape.png
similarity index 100%
rename from public/splash_screens/iPhone_14__iPhone_13_Pro__iPhone_13__iPhone_12_Pro__iPhone_12_landscape.png
rename to public/static/splash_screens/iPhone_14__iPhone_13_Pro__iPhone_13__iPhone_12_Pro__iPhone_12_landscape.png
diff --git a/public/splash_screens/iPhone_14__iPhone_13_Pro__iPhone_13__iPhone_12_Pro__iPhone_12_portrait.png b/public/static/splash_screens/iPhone_14__iPhone_13_Pro__iPhone_13__iPhone_12_Pro__iPhone_12_portrait.png
similarity index 100%
rename from public/splash_screens/iPhone_14__iPhone_13_Pro__iPhone_13__iPhone_12_Pro__iPhone_12_portrait.png
rename to public/static/splash_screens/iPhone_14__iPhone_13_Pro__iPhone_13__iPhone_12_Pro__iPhone_12_portrait.png
diff --git a/public/splash_screens/iPhone_15_Pro_Max__iPhone_15_Plus__iPhone_14_Pro_Max_landscape.png b/public/static/splash_screens/iPhone_15_Pro_Max__iPhone_15_Plus__iPhone_14_Pro_Max_landscape.png
similarity index 100%
rename from public/splash_screens/iPhone_15_Pro_Max__iPhone_15_Plus__iPhone_14_Pro_Max_landscape.png
rename to public/static/splash_screens/iPhone_15_Pro_Max__iPhone_15_Plus__iPhone_14_Pro_Max_landscape.png
diff --git a/public/splash_screens/iPhone_15_Pro_Max__iPhone_15_Plus__iPhone_14_Pro_Max_portrait.png b/public/static/splash_screens/iPhone_15_Pro_Max__iPhone_15_Plus__iPhone_14_Pro_Max_portrait.png
similarity index 100%
rename from public/splash_screens/iPhone_15_Pro_Max__iPhone_15_Plus__iPhone_14_Pro_Max_portrait.png
rename to public/static/splash_screens/iPhone_15_Pro_Max__iPhone_15_Plus__iPhone_14_Pro_Max_portrait.png
diff --git a/public/splash_screens/iPhone_15_Pro__iPhone_15__iPhone_14_Pro_landscape.png b/public/static/splash_screens/iPhone_15_Pro__iPhone_15__iPhone_14_Pro_landscape.png
similarity index 100%
rename from public/splash_screens/iPhone_15_Pro__iPhone_15__iPhone_14_Pro_landscape.png
rename to public/static/splash_screens/iPhone_15_Pro__iPhone_15__iPhone_14_Pro_landscape.png
diff --git a/public/splash_screens/iPhone_15_Pro__iPhone_15__iPhone_14_Pro_portrait.png b/public/static/splash_screens/iPhone_15_Pro__iPhone_15__iPhone_14_Pro_portrait.png
similarity index 100%
rename from public/splash_screens/iPhone_15_Pro__iPhone_15__iPhone_14_Pro_portrait.png
rename to public/static/splash_screens/iPhone_15_Pro__iPhone_15__iPhone_14_Pro_portrait.png
diff --git a/public/splash_screens/iPhone_8_Plus__iPhone_7_Plus__iPhone_6s_Plus__iPhone_6_Plus_landscape.png b/public/static/splash_screens/iPhone_8_Plus__iPhone_7_Plus__iPhone_6s_Plus__iPhone_6_Plus_landscape.png
similarity index 100%
rename from public/splash_screens/iPhone_8_Plus__iPhone_7_Plus__iPhone_6s_Plus__iPhone_6_Plus_landscape.png
rename to public/static/splash_screens/iPhone_8_Plus__iPhone_7_Plus__iPhone_6s_Plus__iPhone_6_Plus_landscape.png
diff --git a/public/splash_screens/iPhone_8_Plus__iPhone_7_Plus__iPhone_6s_Plus__iPhone_6_Plus_portrait.png b/public/static/splash_screens/iPhone_8_Plus__iPhone_7_Plus__iPhone_6s_Plus__iPhone_6_Plus_portrait.png
similarity index 100%
rename from public/splash_screens/iPhone_8_Plus__iPhone_7_Plus__iPhone_6s_Plus__iPhone_6_Plus_portrait.png
rename to public/static/splash_screens/iPhone_8_Plus__iPhone_7_Plus__iPhone_6s_Plus__iPhone_6_Plus_portrait.png
diff --git a/public/splash_screens/iPhone_8__iPhone_7__iPhone_6s__iPhone_6__4.7__iPhone_SE_landscape.png b/public/static/splash_screens/iPhone_8__iPhone_7__iPhone_6s__iPhone_6__4.7__iPhone_SE_landscape.png
similarity index 100%
rename from public/splash_screens/iPhone_8__iPhone_7__iPhone_6s__iPhone_6__4.7__iPhone_SE_landscape.png
rename to public/static/splash_screens/iPhone_8__iPhone_7__iPhone_6s__iPhone_6__4.7__iPhone_SE_landscape.png
diff --git a/public/splash_screens/iPhone_8__iPhone_7__iPhone_6s__iPhone_6__4.7__iPhone_SE_portrait.png b/public/static/splash_screens/iPhone_8__iPhone_7__iPhone_6s__iPhone_6__4.7__iPhone_SE_portrait.png
similarity index 100%
rename from public/splash_screens/iPhone_8__iPhone_7__iPhone_6s__iPhone_6__4.7__iPhone_SE_portrait.png
rename to public/static/splash_screens/iPhone_8__iPhone_7__iPhone_6s__iPhone_6__4.7__iPhone_SE_portrait.png
diff --git a/public/splash_screens/icon.png b/public/static/splash_screens/icon.png
similarity index 100%
rename from public/splash_screens/icon.png
rename to public/static/splash_screens/icon.png
diff --git a/public/videos/celebration.mp4 b/public/static/videos/celebration.mp4
similarity index 100%
rename from public/videos/celebration.mp4
rename to public/static/videos/celebration.mp4
diff --git a/remix.config.js b/remix.config.js
index 4a63d97ec..a8b1c908f 100644
--- a/remix.config.js
+++ b/remix.config.js
@@ -6,7 +6,23 @@ const { flatRoutes } = require("remix-flat-routes");
 module.exports = {
   ignoredRouteFiles: ["**/.*"],
   serverModuleFormat: "cjs",
-  serverDependenciesToBundle: ["maplibre-gl", /swiper/, /remix-utils/],
+  server: "./server/index.ts",
+  serverBuildPath: "./build/index.js",
+  serverPlatform: "node",
+  serverDependenciesToBundle: [
+    "maplibre-gl",
+    /swiper/,
+    /^@remix-pwa*/,
+    /remix-utils/,
+    /^remix-hono*/,
+  ],
+  watchPaths: ["./server/**/*.ts"],
+  dev: {
+    command: "node build/index.js",
+    // 👇 For https dev server
+    // tlsCert: "./server/dev/cert.pem",
+    // tlsKey: "./server/dev/key.pem",
+  },
   routes: async (defineRoutes) => {
     return flatRoutes("routes", defineRoutes);
   },
diff --git a/server/builder.ts b/server/builder.ts
new file mode 100644
index 000000000..bc1d5a8c9
--- /dev/null
+++ b/server/builder.ts
@@ -0,0 +1,23 @@
+import esbuild from "esbuild";
+
+esbuild
+  .build({
+    // The final file name
+    outfile: "build/server/index.js",
+    // Our server entry point
+    entryPoints: ["server/index.ts"],
+    // Dependencies that should not be bundled
+    // We import the remix build from "../build/server/remix.js", so no need to bundle it again
+    external: ["./build/server/*"],
+    platform: "node",
+    format: "esm",
+    // Don't include node_modules in the bundle
+    packages: "external",
+    bundle: true,
+    logLevel: "info",
+  })
+  .catch((error: unknown) => {
+    // eslint-disable-next-line no-console
+    console.error(error);
+    process.exit(1);
+  });
diff --git a/server/index.ts b/server/index.ts
new file mode 100644
index 000000000..bd945b691
--- /dev/null
+++ b/server/index.ts
@@ -0,0 +1,250 @@
+import { serve } from "@hono/node-server";
+import { serveStatic } from "@hono/node-server/serve-static";
+import * as serverBuild from "@remix-run/dev/server-build";
+import type { AppLoadContext, ServerBuild } from "@remix-run/node";
+import { createCookieSessionStorage } from "@remix-run/node";
+import { broadcastDevReady } from "@remix-run/server-runtime";
+import { Hono } from "hono";
+import { remix } from "remix-hono/handler";
+import { getSession, session } from "remix-hono/session";
+
+import { initEnv, env } from "~/utils/env";
+import { ShelfStackError } from "~/utils/error";
+
+import { logger } from "./logger";
+import { cache, protect, refreshSession } from "./middleware";
+import { authSessionKey, type FlashData, type SessionData } from "./session";
+
+// Server will not start if the env is not valid
+initEnv();
+
+const build = serverBuild as ServerBuild;
+
+const mode = env.NODE_ENV === "test" ? "development" : env.NODE_ENV;
+
+const app = new Hono();
+
+/**
+ * Serve build files from public/build
+ */
+app.use(
+  "/build/*",
+  cache(60 * 60 * 24 * 365), // 1 year
+  serveStatic({ root: "./public" })
+);
+
+/**
+ * Serve static files from public
+ */
+app.use(
+  "/static/*",
+  cache(60 * 60), // cache for 1 hour
+  serveStatic({ root: "./public" })
+);
+
+/**
+ * Add logger middleware
+ */
+app.use("*", logger());
+
+/**
+ * Add session middleware
+ */
+app.use(
+  //@ts-expect-error fixed soon
+  session({
+    autoCommit: true,
+    createSessionStorage() {
+      const sessionStorage = createCookieSessionStorage({
+        cookie: {
+          name: "__authSession",
+          httpOnly: true,
+          path: "/",
+          sameSite: "lax",
+          secrets: [env.SESSION_SECRET],
+          secure: env.NODE_ENV === "production",
+        },
+      });
+
+      return {
+        ...sessionStorage,
+        // If a user doesn't come back to the app within 30 days, their session will be deleted.
+        async commitSession(session) {
+          return sessionStorage.commitSession(session, {
+            maxAge: 60 * 60 * 24 * 30, // 30 days
+          });
+        },
+      };
+    },
+  })
+);
+
+/**
+ * Add refresh session middleware
+ *
+ */
+app.use("*", refreshSession());
+
+/**
+ * Add protected routes middleware
+ *
+ */
+app.use(
+  "*",
+  protect({
+    onFailRedirectTo: "/login",
+    publicPaths: [
+      "/accept-invite/:path*", // :path* is a wildcard that will match any path after /accept-invite
+      "/forgot-password",
+      "/join",
+      "/login",
+      "/logout",
+      "/oauth/callback",
+      "/resend-email-confirmation",
+      "/reset-password",
+      "/send-magic-link",
+      "/verify-email",
+      "/healthcheck",
+      "/api/public-stats",
+      "/api/oss-friends",
+      "/api/stripe-webhook",
+      "/qr",
+      "/qr/:path*/",
+      "/qr/:path*/contact-owner",
+      "/qr/:path*/not-logged-in",
+    ],
+  })
+);
+
+/**
+ * Add remix middleware to Hono server
+ */
+app.use(
+  //@ts-expect-error fixed soon
+  remix({
+    // @ts-ignore
+    build,
+    mode,
+    getLoadContext(context) {
+      const session = getSession<SessionData, FlashData>(context);
+
+      return {
+        // Nice to have if you want to display the app version or do something in the app when deploying a new version
+        // Exemple: on navigate, check if the app version is the same as the one in the build assets and if not, display a toast to the user to refresh the page
+        // Prevent the user to use an old version of the client side code (it is only downloaded on document request)
+        appVersion: build.assets.version,
+        isAuthenticated: session.has(authSessionKey),
+        // we could ensure that session.get() match a specific shape
+        // let's trust our system for now
+        getSession: () => {
+          const auth = session.get(authSessionKey);
+
+          if (!auth) {
+            throw new ShelfStackError({
+              cause: null,
+              message:
+                "There is no session here. This should not happen because if you require it, this route should be mark as protected and catch by the protect middleware.",
+              status: 403,
+            });
+          }
+
+          return auth;
+        },
+        setSession: (auth: any) => {
+          session.set(authSessionKey, auth);
+        },
+        destroySession: () => {
+          session.unset(authSessionKey);
+        },
+        errorMessage: session.get("errorMessage") || null,
+      } satisfies AppLoadContext;
+    },
+  })
+);
+
+/**
+ * Declare our loaders and actions context type
+ */
+declare module "@remix-run/node" {
+  interface AppLoadContext {
+    /**
+     * The app version from the build assets
+     */
+    readonly appVersion: string;
+    /**
+     * Whether the user is authenticated or not
+     */
+    isAuthenticated: boolean;
+    /**
+     * Get the current session
+     *
+     * If the user is not logged it will throw an error
+     *
+     * @returns The session
+     */
+    getSession(): SessionData["auth"];
+    /**
+     * Set the session to the session storage
+     *
+     * It will then be automatically handled by the session middleware
+     *
+     * @param session - The auth session to commit
+     */
+    setSession(session: SessionData["auth"]): void;
+    /**
+     * Destroy the session from the session storage middleware
+     *
+     * It will then be automatically handled by the session middleware
+     */
+    destroySession(): void;
+    /**
+     * The flash error message related to session
+     */
+    errorMessage: string | null;
+  }
+}
+
+/**
+ * Start the server
+ */
+serve(
+  mode === "production"
+    ? {
+        ...app,
+        port: Number(process.env.PORT) || 3000,
+      }
+    : {
+        ...app, // 👇 is for https dev server. If you go that route, remove `...app`
+        // fetch: app.fetch,
+        // createServer: createSecureServer, // import { createSecureServer } from "node:http2";
+        // serverOptions: {
+        // 	key: fs.readFileSync("./server/dev/key.pem"), // import fs from "node:fs";
+        // 	cert: fs.readFileSync("./server/dev/cert.pem"),
+        // },
+        port: Number(process.env.PORT) || 3000,
+      },
+  async (info) => {
+    // eslint-disable-next-line no-console
+    console.log(`🚀 Server started on port ${info.port}`);
+
+    if (mode === "development") {
+      const os = await import("node:os");
+      const dns = await import("node:dns");
+      await new Promise((resolve) => {
+        dns.lookup(os.hostname(), 4, (_, address) => {
+          // If you want to use https dev server, you need to change http to https
+          // eslint-disable-next-line no-console
+          console.log(
+            `🌍 http://localhost:${info.port} - http://${
+              address || info.address
+            }:${info.port}`
+          );
+
+          resolve(null);
+        });
+      });
+      // @ts-expect-error fixed soon
+      broadcastDevReady(build);
+    }
+  }
+);
diff --git a/server/logger.ts b/server/logger.ts
new file mode 100644
index 000000000..88dc8f0a8
--- /dev/null
+++ b/server/logger.ts
@@ -0,0 +1,72 @@
+import type { MiddlewareHandler } from "hono";
+import { getPath, getQueryStrings } from "hono/utils/url";
+
+enum LogPrefix {
+  Outgoing = "-->",
+  Incoming = "<--",
+  Error = "xxx",
+}
+
+const colorStatus = (status: number) => {
+  const out: { [key: string]: string } = {
+    7: `\x1b[35m${status}\x1b[0m`,
+    5: `\x1b[31m${status}\x1b[0m`,
+    4: `\x1b[33m${status}\x1b[0m`,
+    3: `\x1b[36m${status}\x1b[0m`,
+    2: `\x1b[32m${status}\x1b[0m`,
+    1: `\x1b[32m${status}\x1b[0m`,
+    0: `\x1b[33m${status}\x1b[0m`,
+  };
+
+  const calculateStatus = (status / 100) | 0;
+
+  return out[calculateStatus];
+};
+
+const humanize = (times: string[]) => {
+  const [delimiter, separator] = [",", "."];
+
+  const orderTimes = times.map((v) =>
+    v.replace(/(\d)(?=(\d\d\d)+(?!\d))/g, "$1" + delimiter)
+  );
+
+  return orderTimes.join(separator);
+};
+
+const time = (start: number) => {
+  const delta = Date.now() - start;
+  return humanize([
+    delta < 1000 ? delta + "ms" : Math.round(delta / 1000) + "s",
+  ]);
+};
+
+function log(
+  prefix: string,
+  method: string,
+  path: string,
+  status: number = 0,
+  elapsed?: string
+) {
+  const out =
+    prefix === LogPrefix.Incoming
+      ? `  ${prefix} ${method} ${path}`
+      : `  ${prefix} ${method} ${path} ${colorStatus(status)} ${elapsed}`;
+  // eslint-disable-next-line no-console
+  console.log(out);
+}
+
+export const logger = (): MiddlewareHandler =>
+  async function logger(c, next) {
+    const { method } = c.req;
+    const path = getPath(c.req.raw) + getQueryStrings(c.req.raw.url);
+
+    log(LogPrefix.Incoming, method, path);
+
+    const start = Date.now();
+
+    await next();
+
+    const { status } = new Response(null, c.res);
+
+    log(LogPrefix.Outgoing, method, path, status, time(start));
+  };
diff --git a/server/middleware.ts b/server/middleware.ts
new file mode 100644
index 000000000..12a1f3ecb
--- /dev/null
+++ b/server/middleware.ts
@@ -0,0 +1,112 @@
+import { createMiddleware } from "hono/factory";
+import { pathToRegexp } from "path-to-regexp";
+import { getSession } from "remix-hono/session";
+
+import { refreshAccessToken } from "~/modules/auth";
+import { authSessionKey, type FlashData, type SessionData } from "./session";
+
+/**
+ * Protected routes middleware
+ *
+ * @param options.publicPath - The public paths
+ * @param options.onFailRedirectTo - The path to redirect to if the user is not logged in
+ */
+export function protect({
+  publicPaths,
+  onFailRedirectTo,
+}: {
+  publicPaths: string[];
+  onFailRedirectTo: string;
+}) {
+  return createMiddleware(async (c, next) => {
+    const isPublic = pathMatch(publicPaths, c.req.path);
+
+    if (isPublic) {
+      return next();
+    }
+    //@ts-expect-error fixed soon
+    const session = getSession<SessionData, FlashData>(c);
+    const auth = session.get(authSessionKey);
+
+    if (!auth) {
+      session.flash(
+        "errorMessage",
+        "This content is only available to logged in users."
+      );
+
+      return c.redirect(`${onFailRedirectTo}?redirectTo=${c.req.path}`);
+    }
+
+    return next();
+  });
+}
+
+function pathMatch(paths: string[], requestPath: string) {
+  for (const path of paths) {
+    const regex = pathToRegexp(path);
+
+    if (regex.test(requestPath)) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+function isExpiringSoon(expiresAt: number | undefined) {
+  if (!expiresAt) {
+    return true;
+  }
+
+  return (expiresAt - 60 * 0.1) * 1000 < Date.now(); // 1 minute left before token expires
+}
+
+/**
+ * Refresh access token middleware
+ *
+ */
+export function refreshSession() {
+  return createMiddleware(async (c, next) => {
+    //@ts-expect-error fixed soon
+    const session = getSession<SessionData, FlashData>(c);
+    const auth = session.get(authSessionKey);
+
+    if (!auth || !isExpiringSoon(auth.expiresAt)) {
+      return next();
+    }
+
+    try {
+      session.set(authSessionKey, await refreshAccessToken(auth.refreshToken));
+    } catch (cause) {
+      session.flash(
+        "errorMessage",
+        "You have been logged out. Please log in again."
+      );
+
+      session.unset(authSessionKey);
+    }
+
+    return next();
+  });
+}
+
+/**
+ * Cache middleware
+ *
+ * @param seconds - The number of seconds to cache
+ */
+export function cache(seconds: number) {
+  return createMiddleware(async (c, next) => {
+    if (!c.req.path.match(/\.[a-zA-Z0-9]+$/)) {
+      return next();
+    }
+
+    await next();
+
+    if (!c.res.ok) {
+      return;
+    }
+
+    c.res.headers.set("cache-control", `public, max-age=${seconds}`);
+  });
+}
diff --git a/server/session.ts b/server/session.ts
new file mode 100644
index 000000000..e2d564d82
--- /dev/null
+++ b/server/session.ts
@@ -0,0 +1,16 @@
+export type AuthSession = {
+  accessToken: string;
+  refreshToken: string;
+  userId: string;
+  email: string;
+  expiresIn: number;
+  expiresAt: number;
+};
+
+export const authSessionKey = "auth";
+
+export type SessionData = {
+  [authSessionKey]: AuthSession;
+};
+
+export type FlashData = { errorMessage: string };