From f74069e6c5e4bae25d5d5c2eda868e03f8798507 Mon Sep 17 00:00:00 2001
From: Diego Alzate <diego35.da@gmail.com>
Date: Thu, 20 Jun 2024 09:09:46 +0100
Subject: [PATCH 01/15] initial account hub (#598)

* remove redundant type in voting utils

* make input validation cleaner

* extract account form

* make account form title dynamic

* fix build issues

* create tab manager

* add fallback to tab manager

* fix typo and add lucid react

* add new query apis and show list in account hub
---
 package.json                                  |   6 +-
 packages/api/src/fetchUserOptions.ts          |  24 ++
 packages/api/src/index.ts                     |   1 +
 packages/api/src/types/CycleType.ts           |   1 +
 packages/api/src/types/RegistrationType.ts    |  12 +-
 packages/api/src/types/UserOptionType.ts      |  21 ++
 .../{form => form-input}/FormInput.tsx        |  16 +-
 .../FormNumberInput.tsx}                      |  28 +-
 .../FormSelectInput.tsx}                      |   2 +-
 .../FormTextAreaInput.tsx}                    |  30 +--
 .../FormTextInput.tsx}                        |  33 +--
 .../berlin/src/components/form-input/index.ts |   5 +
 .../src/components/form/AccountForm.tsx       | 130 +++++++++
 .../ResearchGroupForm.tsx                     |   8 +-
 packages/berlin/src/components/form/index.ts  |   7 +-
 .../src/components/header/Header.styled.tsx   |   2 +-
 .../berlin/src/components/header/Header.tsx   |  94 +------
 .../components/research-group-form/index.ts   |   1 -
 .../src/components/tab-manager/TabManager.tsx |  13 +
 .../src/components/tab-manager/index.ts       |   1 +
 packages/berlin/src/pages/Account.tsx         | 248 ++++++++----------
 packages/berlin/src/pages/Register.tsx        |   2 +-
 .../src/pages/SecretGroupRegistration.tsx     |   2 +-
 packages/berlin/src/utils/validation.ts       |  12 +
 packages/berlin/src/utils/voting.ts           |  15 +-
 pnpm-lock.yaml                                |  12 +
 26 files changed, 408 insertions(+), 318 deletions(-)
 create mode 100644 packages/api/src/fetchUserOptions.ts
 create mode 100644 packages/api/src/types/UserOptionType.ts
 rename packages/berlin/src/components/{form => form-input}/FormInput.tsx (77%)
 rename packages/berlin/src/components/{form/NumberInput.tsx => form-input/FormNumberInput.tsx} (57%)
 rename packages/berlin/src/components/{form/SelectInput.tsx => form-input/FormSelectInput.tsx} (94%)
 rename packages/berlin/src/components/{form/TextAreaInput.tsx => form-input/FormTextAreaInput.tsx} (52%)
 rename packages/berlin/src/components/{form/TextInput.tsx => form-input/FormTextInput.tsx} (50%)
 create mode 100644 packages/berlin/src/components/form-input/index.ts
 create mode 100644 packages/berlin/src/components/form/AccountForm.tsx
 rename packages/berlin/src/components/{research-group-form => form}/ResearchGroupForm.tsx (92%)
 delete mode 100644 packages/berlin/src/components/research-group-form/index.ts
 create mode 100644 packages/berlin/src/components/tab-manager/TabManager.tsx
 create mode 100644 packages/berlin/src/components/tab-manager/index.ts
 create mode 100644 packages/berlin/src/utils/validation.ts

diff --git a/package.json b/package.json
index bb190c8b..460ea736 100644
--- a/package.json
+++ b/package.json
@@ -4,9 +4,6 @@
   "version": "1.0.0",
   "type": "module",
   "scripts": {
-    "core:dev": "pnpm -r --filter core dev",
-    "core:build": "pnpm -r --filter core build",
-    "core:preview": "pnpm -r --filter core preview",
     "berlin:dev": "pnpm -r --filter berlin dev",
     "berlin:build": "pnpm -r --filter berlin build",
     "berlin:preview": "pnpm -r --filter berlin preview",
@@ -29,6 +26,7 @@
     "@radix-ui/react-dialog": "^1.0.5",
     "@tanstack/react-query": "^5.13.4",
     "@tanstack/react-query-devtools": "^5.13.5",
+    "lucide-react": "^0.395.0",
     "react": "^18.2.0",
     "react-content-loader": "^7.0.0",
     "react-dom": "^18.2.0",
@@ -57,4 +55,4 @@
     "vite": "^5.0.0",
     "vite-plugin-node-polyfills": "^0.17.0"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/api/src/fetchUserOptions.ts b/packages/api/src/fetchUserOptions.ts
new file mode 100644
index 00000000..eff058d9
--- /dev/null
+++ b/packages/api/src/fetchUserOptions.ts
@@ -0,0 +1,24 @@
+import { GetUserOptionsResponse } from './types/UserOptionType';
+
+async function fetchUserOptions(userId: string): Promise<GetUserOptionsResponse | null> {
+  try {
+    const response = await fetch(`${import.meta.env.VITE_SERVER_URL}/api/users/${userId}/options`, {
+      credentials: 'include',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+    });
+
+    if (!response.ok) {
+      throw new Error(`HTTP Error! Status: ${response.status}`);
+    }
+
+    const userOptions = (await response.json()) as { data: GetUserOptionsResponse };
+    return userOptions.data;
+  } catch (error) {
+    console.error('Error fetching user options:', error);
+    return null;
+  }
+}
+
+export default fetchUserOptions;
diff --git a/packages/api/src/index.ts b/packages/api/src/index.ts
index 5fd17c38..5f3de8b5 100644
--- a/packages/api/src/index.ts
+++ b/packages/api/src/index.ts
@@ -37,4 +37,5 @@ export { default as putRegistration } from './putRegistration';
 export { default as putUser } from './putUser';
 export { default as putUsersToGroups } from './putUsersToGroups';
 export { default as fetchEventGroupCategories } from './fetchEventGroupCategories';
+export { default as fetchUserOptions } from './fetchUserOptions';
 export * from './types';
diff --git a/packages/api/src/types/CycleType.ts b/packages/api/src/types/CycleType.ts
index 66977300..e920862e 100644
--- a/packages/api/src/types/CycleType.ts
+++ b/packages/api/src/types/CycleType.ts
@@ -1,5 +1,6 @@
 export type GetCycleResponse = {
   id: string;
+  eventId: string;
   createdAt: string;
   updatedAt: string;
   status: 'OPEN' | 'CLOSED' | 'UPCOMING' | null;
diff --git a/packages/api/src/types/RegistrationType.ts b/packages/api/src/types/RegistrationType.ts
index da9e0855..768e7645 100644
--- a/packages/api/src/types/RegistrationType.ts
+++ b/packages/api/src/types/RegistrationType.ts
@@ -1,4 +1,4 @@
-export type RegistrationStatus = 'DRAFT' | 'APPROVED' | 'PUBLISHED' | null;
+export type RegistrationStatus = 'DRAFT' | 'APPROVED' | 'REJECTED' | null;
 
 export type GetRegistrationResponseType = {
   id?: string | undefined;
@@ -8,6 +8,16 @@ export type GetRegistrationResponseType = {
   eventId?: string | undefined;
   createdAt: string;
   updatedAt: string;
+  event?: {
+    id: string;
+    name: string;
+    imageUrl: string;
+    link: string | null;
+    registrationDescription: string | null;
+    createdAt: string;
+    updatedAt: string;
+    description: string | null;
+  };
 };
 
 export type GetRegistrationsResponseType = GetRegistrationResponseType[];
diff --git a/packages/api/src/types/UserOptionType.ts b/packages/api/src/types/UserOptionType.ts
new file mode 100644
index 00000000..fb0697b4
--- /dev/null
+++ b/packages/api/src/types/UserOptionType.ts
@@ -0,0 +1,21 @@
+export type GetUserOptionsResponse = {
+  id: string;
+  createdAt: Date;
+  updatedAt: Date;
+  userId: string | null;
+  registrationId: string | null;
+  questionId: string;
+  optionTitle: string;
+  optionSubTitle: string | null;
+  accepted: boolean | null;
+  voteScore: string;
+  fundingRequest: string | null;
+  forumQuestion: {
+    id: string;
+    createdAt: string;
+    updatedAt: string;
+    description: string | null;
+    cycleId: string;
+    title: string;
+  };
+}[];
diff --git a/packages/berlin/src/components/form/FormInput.tsx b/packages/berlin/src/components/form-input/FormInput.tsx
similarity index 77%
rename from packages/berlin/src/components/form/FormInput.tsx
rename to packages/berlin/src/components/form-input/FormInput.tsx
index 2f5bc69f..706e87f3 100644
--- a/packages/berlin/src/components/form/FormInput.tsx
+++ b/packages/berlin/src/components/form-input/FormInput.tsx
@@ -1,8 +1,8 @@
 import { FieldValues, Path, UseFormReturn } from 'react-hook-form';
-import { SelectInput } from './SelectInput';
-import { TextAreaInput } from './TextAreaInput';
-import { TextInput } from './TextInput';
-import { NumberInput } from './NumberInput';
+import { FormSelectInput } from './FormSelectInput';
+import { FormTextAreaInput } from './FormTextAreaInput';
+import { FormTextInput } from './FormTextInput';
+import { FormNumberInput } from './FormNumberInput';
 
 export function FormInput<T extends FieldValues>(props: {
   form: UseFormReturn<T>;
@@ -15,7 +15,7 @@ export function FormInput<T extends FieldValues>(props: {
   switch (props.type) {
     case 'TEXT':
       return (
-        <TextInput
+        <FormTextInput
           form={props.form}
           name={props.name}
           label={props.label}
@@ -24,7 +24,7 @@ export function FormInput<T extends FieldValues>(props: {
       );
     case 'TEXTAREA':
       return (
-        <TextAreaInput
+        <FormTextAreaInput
           form={props.form}
           name={props.name}
           label={props.label}
@@ -33,7 +33,7 @@ export function FormInput<T extends FieldValues>(props: {
       );
     case 'SELECT':
       return (
-        <SelectInput
+        <FormSelectInput
           form={props.form}
           name={props.name}
           label={props.label}
@@ -43,7 +43,7 @@ export function FormInput<T extends FieldValues>(props: {
       );
     case 'NUMBER':
       return (
-        <NumberInput
+        <FormNumberInput
           form={props.form}
           name={props.name}
           label={props.label}
diff --git a/packages/berlin/src/components/form/NumberInput.tsx b/packages/berlin/src/components/form-input/FormNumberInput.tsx
similarity index 57%
rename from packages/berlin/src/components/form/NumberInput.tsx
rename to packages/berlin/src/components/form-input/FormNumberInput.tsx
index 921c763e..a1da375e 100644
--- a/packages/berlin/src/components/form/NumberInput.tsx
+++ b/packages/berlin/src/components/form-input/FormNumberInput.tsx
@@ -1,32 +1,21 @@
 import { Controller, FieldValues, Path, UseFormReturn } from 'react-hook-form';
 import Input from '../input';
 
-export function NumberInput<T extends FieldValues>(props: {
+export function FormNumberInput<T extends FieldValues>(props: {
   form: UseFormReturn<T>;
   name: Path<T>;
   label: string;
   required: boolean | null;
   customValidation?: (value: number) => string | undefined;
 }) {
-  const handleChange = (
-    val: string,
-    onSuccess: (val: string) => void,
-    onFailure: (errorMsg: string) => void,
-  ) => {
-    if (props.customValidation) {
-      const customError = props.customValidation(Number(val));
-      if (customError) {
-        onFailure(customError);
-        return;
-      }
-    }
-    onSuccess(val);
-  };
-
   return (
     <Controller
       name={props.name}
       control={props.form.control}
+      rules={{
+        required: props.required ? `${props.label} is required` : false,
+        validate: props.customValidation,
+      }}
       render={({ field }) => (
         <Input
           type="number"
@@ -39,11 +28,8 @@ export function NumberInput<T extends FieldValues>(props: {
               : []
           }
           value={field.value ?? undefined}
-          onChange={(e) =>
-            handleChange(e.target.value, field.onChange, (err) => {
-              props.form.setError(props.name, { message: err });
-            })
-          }
+          onChange={field.onChange}
+          onBlur={field.onBlur}
         />
       )}
     />
diff --git a/packages/berlin/src/components/form/SelectInput.tsx b/packages/berlin/src/components/form-input/FormSelectInput.tsx
similarity index 94%
rename from packages/berlin/src/components/form/SelectInput.tsx
rename to packages/berlin/src/components/form-input/FormSelectInput.tsx
index 102beaed..a3263ac2 100644
--- a/packages/berlin/src/components/form/SelectInput.tsx
+++ b/packages/berlin/src/components/form-input/FormSelectInput.tsx
@@ -1,7 +1,7 @@
 import { Controller, FieldValues, Path, UseFormReturn } from 'react-hook-form';
 import Select from '../select';
 
-export function SelectInput<T extends FieldValues>(props: {
+export function FormSelectInput<T extends FieldValues>(props: {
   form: UseFormReturn<T>;
   name: Path<T>;
   label: string;
diff --git a/packages/berlin/src/components/form/TextAreaInput.tsx b/packages/berlin/src/components/form-input/FormTextAreaInput.tsx
similarity index 52%
rename from packages/berlin/src/components/form/TextAreaInput.tsx
rename to packages/berlin/src/components/form-input/FormTextAreaInput.tsx
index 13d550d3..6d02feb7 100644
--- a/packages/berlin/src/components/form/TextAreaInput.tsx
+++ b/packages/berlin/src/components/form-input/FormTextAreaInput.tsx
@@ -1,32 +1,21 @@
 import { Controller, FieldValues, Path, UseFormReturn } from 'react-hook-form';
 import Textarea from '../textarea';
 
-export function TextAreaInput<T extends FieldValues>(props: {
+export function FormTextAreaInput<T extends FieldValues>(props: {
   form: UseFormReturn<T>;
   name: Path<T>;
   label: string;
   required: boolean | null;
-  customValidation?: (value: number) => string | undefined;
+  customValidation?: (value: string) => string | undefined;
 }) {
-  const handleChange = (
-    val: string,
-    onSuccess: (val: string) => void,
-    onFailure: (errorMsg: string) => void,
-  ) => {
-    if (props.customValidation) {
-      const customError = props.customValidation(Number(val));
-      if (customError) {
-        onFailure(customError);
-        return;
-      }
-    }
-    onSuccess(val);
-  };
-
   return (
     <Controller
       name={props.name}
       control={props.form.control}
+      rules={{
+        required: props.required ? `${props.label} is required` : false,
+        validate: props.customValidation,
+      }}
       render={({ field }) => (
         <Textarea
           label={props.label}
@@ -38,11 +27,8 @@ export function TextAreaInput<T extends FieldValues>(props: {
               : []
           }
           value={field.value ?? undefined}
-          onChange={(e) =>
-            handleChange(e.target.value, field.onChange, (err) => {
-              props.form.setError(props.name, { message: err });
-            })
-          }
+          onChange={field.onChange}
+          onBlur={field.onBlur}
         />
       )}
     />
diff --git a/packages/berlin/src/components/form/TextInput.tsx b/packages/berlin/src/components/form-input/FormTextInput.tsx
similarity index 50%
rename from packages/berlin/src/components/form/TextInput.tsx
rename to packages/berlin/src/components/form-input/FormTextInput.tsx
index bfc005be..6a50fcda 100644
--- a/packages/berlin/src/components/form/TextInput.tsx
+++ b/packages/berlin/src/components/form-input/FormTextInput.tsx
@@ -1,49 +1,36 @@
 import { Controller, FieldValues, Path, UseFormReturn } from 'react-hook-form';
 import Input from '../input';
 
-export function TextInput<T extends FieldValues>(props: {
+export function FormTextInput<T extends FieldValues>(props: {
   form: UseFormReturn<T>;
   name: Path<T>;
   label: string;
   required: boolean | null;
-  customValidation?: (value: number) => string | undefined;
+  placeholder?: string;
+  customValidation?: (value: string) => string | undefined;
 }) {
-  const handleChange = (
-    val: string,
-    onSuccess: (val: string) => void,
-    onFailure: (errorMsg: string) => void,
-  ) => {
-    if (props.customValidation) {
-      const customError = props.customValidation(Number(val));
-      if (customError) {
-        onFailure(customError);
-        return;
-      }
-    }
-    onSuccess(val);
-  };
-
   return (
     <Controller
       name={props.name}
       control={props.form.control}
+      rules={{
+        required: props.required ? `${props.label} is required` : false,
+        validate: props.customValidation,
+      }}
       render={({ field }) => (
         <Input
           type="text"
           label={props.label}
           required={!!props.required}
-          placeholder="Enter a value"
+          placeholder={props.placeholder ?? 'Please enter a value'}
           errors={
             props.form.formState.errors[props.name]
               ? [props.form.formState.errors[props.name]?.message?.toString() ?? '']
               : []
           }
           value={field.value ?? undefined}
-          onChange={(e) =>
-            handleChange(e.target.value, field.onChange, (err) => {
-              props.form.setError(props.name, { message: err });
-            })
-          }
+          onBlur={field.onBlur}
+          onChange={field.onChange}
         />
       )}
     />
diff --git a/packages/berlin/src/components/form-input/index.ts b/packages/berlin/src/components/form-input/index.ts
new file mode 100644
index 00000000..5f31fbd5
--- /dev/null
+++ b/packages/berlin/src/components/form-input/index.ts
@@ -0,0 +1,5 @@
+export * from './FormNumberInput';
+export * from './FormSelectInput';
+export * from './FormTextAreaInput';
+export * from './FormTextInput';
+export * from './FormInput';
diff --git a/packages/berlin/src/components/form/AccountForm.tsx b/packages/berlin/src/components/form/AccountForm.tsx
new file mode 100644
index 00000000..2ea39367
--- /dev/null
+++ b/packages/berlin/src/components/form/AccountForm.tsx
@@ -0,0 +1,130 @@
+// React and third-party libraries
+import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { useForm } from 'react-hook-form';
+import toast from 'react-hot-toast';
+
+// API Calls
+import { putUser, type GetUserResponse } from 'api';
+
+// Components
+import Button from '../button';
+import { FlexColumn } from '../containers/FlexColumn.styled';
+import { Subtitle } from '../typography/Subtitle.styled';
+
+// Store
+import { FlexRowToColumn } from '../containers/FlexRowToColumn.styled';
+import { FormTextInput } from '../form-input';
+import { z } from 'zod';
+import { returnZodError } from '../../utils/validation';
+
+type InitialUser = {
+  username: string;
+  firstName: string;
+  lastName: string;
+  email: string;
+};
+
+export function AccountForm({
+  initialUser,
+  user,
+  title,
+  afterSubmit,
+}: {
+  initialUser: InitialUser;
+  user: GetUserResponse | null | undefined;
+  afterSubmit?: () => void;
+  title: string;
+}) {
+  const queryClient = useQueryClient();
+
+  const { mutate: mutateUserData } = useMutation({
+    mutationFn: putUser,
+    onSuccess: async (body) => {
+      if (!body) {
+        return;
+      }
+
+      if ('errors' in body) {
+        toast.error(`There was an error: ${body.errors.join(', ')}`);
+        return;
+      }
+
+      await queryClient.invalidateQueries({ queryKey: ['user'] });
+
+      toast.success('User data updated!');
+
+      if (afterSubmit) {
+        afterSubmit();
+      }
+    },
+    onError: () => {
+      toast.error('There was an error, please try again.');
+    },
+  });
+
+  const form = useForm({
+    defaultValues: initialUser,
+    mode: 'all',
+  });
+
+  const {
+    handleSubmit,
+    formState: { isValid, isSubmitting },
+  } = form;
+
+  const onSubmit = async (value: typeof initialUser) => {
+    if (isValid && user && user.id) {
+      await mutateUserData({
+        userId: user.id,
+        username: value.username,
+        email: value.email,
+        firstName: value.firstName,
+        lastName: value.lastName,
+      });
+    }
+  };
+
+  return (
+    <FlexColumn>
+      <Subtitle>{title}</Subtitle>
+      <form onSubmit={handleSubmit(onSubmit)} style={{ width: '100%' }}>
+        <FlexColumn>
+          <FlexRowToColumn>
+            <FormTextInput
+              form={form}
+              name="firstName"
+              label="First name"
+              placeholder="Enter your first name"
+              required
+            />
+            <FormTextInput
+              form={form}
+              name="lastName"
+              label="Last name"
+              placeholder="Enter your last name"
+              required
+            />
+          </FlexRowToColumn>
+          <FormTextInput
+            form={form}
+            name="username"
+            label="Username"
+            placeholder="Enter your username"
+            required
+          />
+          <FormTextInput
+            form={form}
+            name="email"
+            label="Email"
+            placeholder="Enter your email"
+            required
+            customValidation={(value) => returnZodError(() => z.string().email().parse(value))}
+          />
+          <Button type="submit" disabled={isSubmitting}>
+            Submit
+          </Button>
+        </FlexColumn>
+      </form>
+    </FlexColumn>
+  );
+}
diff --git a/packages/berlin/src/components/research-group-form/ResearchGroupForm.tsx b/packages/berlin/src/components/form/ResearchGroupForm.tsx
similarity index 92%
rename from packages/berlin/src/components/research-group-form/ResearchGroupForm.tsx
rename to packages/berlin/src/components/form/ResearchGroupForm.tsx
index 8591cf20..32272121 100644
--- a/packages/berlin/src/components/research-group-form/ResearchGroupForm.tsx
+++ b/packages/berlin/src/components/form/ResearchGroupForm.tsx
@@ -21,7 +21,11 @@ type ResearchGroupFormProps = {
   setGroupName: React.Dispatch<React.SetStateAction<string | null>>;
 };
 
-function ResearchGroupForm({ formData, handleCreateGroup, setGroupName }: ResearchGroupFormProps) {
+export function ResearchGroupForm({
+  formData,
+  handleCreateGroup,
+  setGroupName,
+}: ResearchGroupFormProps) {
   const researchGroupSchema = z.object({
     name: z.string().min(2, { message: formData.input.requiredMessage }),
   });
@@ -61,5 +65,3 @@ function ResearchGroupForm({ formData, handleCreateGroup, setGroupName }: Resear
     </Form>
   );
 }
-
-export default ResearchGroupForm;
diff --git a/packages/berlin/src/components/form/index.ts b/packages/berlin/src/components/form/index.ts
index 038dc54e..42c7ef9c 100644
--- a/packages/berlin/src/components/form/index.ts
+++ b/packages/berlin/src/components/form/index.ts
@@ -1,5 +1,2 @@
-export * from './NumberInput';
-export * from './SelectInput';
-export * from './TextAreaInput';
-export * from './TextInput';
-export * from './FormInput';
+export * from './AccountForm';
+export * from './ResearchGroupForm';
diff --git a/packages/berlin/src/components/header/Header.styled.tsx b/packages/berlin/src/components/header/Header.styled.tsx
index 36e34cce..3f61b9dd 100644
--- a/packages/berlin/src/components/header/Header.styled.tsx
+++ b/packages/berlin/src/components/header/Header.styled.tsx
@@ -1,7 +1,7 @@
 import styled, { keyframes } from 'styled-components';
 import Button from '../button/Button';
 
-export const SyledHeader = styled.header`
+export const StyledHeader = styled.header`
   align-items: center;
   display: flex;
   justify-content: center;
diff --git a/packages/berlin/src/components/header/Header.tsx b/packages/berlin/src/components/header/Header.tsx
index 79544b75..096e5e26 100644
--- a/packages/berlin/src/components/header/Header.tsx
+++ b/packages/berlin/src/components/header/Header.tsx
@@ -1,6 +1,6 @@
 // React and third-party libraries
 import { useState } from 'react';
-import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { useLocation, useNavigate } from 'react-router-dom';
 
 // Store
@@ -10,7 +10,7 @@ import { useAppStore } from '../../store';
 import header from '../../data/header';
 
 // API
-import { fetchAlerts, fetchEvents, fetchUserRegistrations, logout } from 'api';
+import { logout } from 'api';
 
 // Hooks
 import useUser from '../../hooks/useUser';
@@ -35,7 +35,7 @@ import {
   MobileButtons,
   NavButtons,
   NavContainer,
-  SyledHeader,
+  StyledHeader,
   ThemeButton,
 } from './Header.styled';
 import IconButton from '../icon-button';
@@ -58,29 +58,10 @@ function Header() {
     },
   });
 
-  const { data: registrationsData } = useQuery({
-    queryKey: [user?.id, 'registrations'],
-    queryFn: () => fetchUserRegistrations(user?.id ?? ''),
-    enabled: !!user,
-  });
-
-  const { data: alerts } = useQuery({
-    queryKey: ['alerts'],
-    queryFn: () => fetchAlerts(),
-    enabled: !!user,
-    refetchInterval: 10000, // Poll every 10 seconds
-  });
-
-  const { data: events } = useQuery({
-    queryKey: ['events'],
-    queryFn: () => fetchEvents(),
-    enabled: !!user,
-  });
-
   const [isBurgerMenuOpen, setIsBurgerMenuOpen] = useState(false);
 
   return (
-    <SyledHeader>
+    <StyledHeader>
       <HeaderContainer>
         <LogoContainer onClick={() => navigate('/')}>
           <LogoImage src={header.logo.src} alt={header.logo.alt} height={96} width={96} />
@@ -96,41 +77,9 @@ function Header() {
             <DesktopButtons>
               {user ? (
                 <>
-                  {registrationsData?.some(
-                    (registration) => registration.status === 'APPROVED',
-                  ) && (
-                    <>
-                      {alerts &&
-                        alerts.length > 0 &&
-                        alerts
-                          // newest alerts first
-                          .sort(
-                            (a, b) =>
-                              new Date(b.updatedAt).getTime() - new Date(a.updatedAt).getTime(),
-                          )
-                          ?.map((alert) => {
-                            return (
-                              alert.link &&
-                              alert.title && (
-                                <NavButton
-                                  key={alert.title + 1}
-                                  to={alert.link}
-                                  $color="secondary"
-                                  end
-                                >
-                                  {alert.title}
-                                </NavButton>
-                              )
-                            );
-                          })}
-                      <NavButton to={`/events/${events?.[0].id}/register`} $color="secondary">
-                        My proposals
-                      </NavButton>
-                      <NavButton to={`/events/${events?.[0].id}/cycles`} $color="secondary">
-                        Agenda
-                      </NavButton>
-                    </>
-                  )}
+                  <NavButton to={`/events`} $color="secondary">
+                    Events
+                  </NavButton>
                   <Button onClick={() => mutateLogout()}>Log out</Button>
                   <IconButton
                     onClick={() => navigate('/account')}
@@ -166,30 +115,9 @@ function Header() {
             <MobileButtons>
               {user ? (
                 <>
-                  {registrationsData?.some(
-                    (registration) => registration.status === 'APPROVED',
-                  ) && (
-                    <>
-                      {alerts &&
-                        alerts.length > 0 &&
-                        alerts?.map((alert) => {
-                          return (
-                            alert.link &&
-                            alert.title && (
-                              <NavButton key={alert.title + 1} to={alert.link} $color="secondary">
-                                {alert.title}
-                              </NavButton>
-                            )
-                          );
-                        })}
-                      <NavButton to={`/events/${events?.[0].id}/register`} $color="secondary">
-                        My proposals
-                      </NavButton>
-                      <NavButton to={`/events/${events?.[0].id}/cycles`} $color="secondary">
-                        Agenda
-                      </NavButton>
-                    </>
-                  )}
+                  <NavButton to={`/events`} $color="secondary">
+                    Events
+                  </NavButton>
 
                   <NavButton to="/account" $color="secondary">
                     Account
@@ -203,7 +131,7 @@ function Header() {
           </NavButtons>
         </BurgerMenuContainer>
       </HeaderContainer>
-    </SyledHeader>
+    </StyledHeader>
   );
 }
 
diff --git a/packages/berlin/src/components/research-group-form/index.ts b/packages/berlin/src/components/research-group-form/index.ts
deleted file mode 100644
index 4b4c949a..00000000
--- a/packages/berlin/src/components/research-group-form/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './ResearchGroupForm';
diff --git a/packages/berlin/src/components/tab-manager/TabManager.tsx b/packages/berlin/src/components/tab-manager/TabManager.tsx
new file mode 100644
index 00000000..25cda9f2
--- /dev/null
+++ b/packages/berlin/src/components/tab-manager/TabManager.tsx
@@ -0,0 +1,13 @@
+export function TabManager<T extends string>({
+  tabs,
+  tab,
+  fallback,
+}: {
+  tabs: {
+    [key in T]?: React.ReactNode;
+  };
+  tab: T;
+  fallback: React.ReactNode;
+}) {
+  return tabs[tab] || fallback;
+}
diff --git a/packages/berlin/src/components/tab-manager/index.ts b/packages/berlin/src/components/tab-manager/index.ts
new file mode 100644
index 00000000..7ab46372
--- /dev/null
+++ b/packages/berlin/src/components/tab-manager/index.ts
@@ -0,0 +1 @@
+export * from './TabManager';
diff --git a/packages/berlin/src/pages/Account.tsx b/packages/berlin/src/pages/Account.tsx
index 47ea2897..384f2605 100644
--- a/packages/berlin/src/pages/Account.tsx
+++ b/packages/berlin/src/pages/Account.tsx
@@ -1,159 +1,139 @@
-// React and third-party libraries
-import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
-import { useForm } from 'react-hook-form';
-import toast from 'react-hot-toast';
-import { useNavigate } from 'react-router-dom';
-
-// API Calls
-import { GetEventsResponse, fetchEvents, putUser, type GetUserResponse } from 'api';
-
-// Components
-import Button from '../components/button';
-import { FlexColumn } from '../components/containers/FlexColumn.styled';
-import Input from '../components/input';
-import { Subtitle } from '../components/typography/Subtitle.styled';
+import { useState } from 'react';
+import { AccountForm } from '../components/form/AccountForm';
 import { Title } from '../components/typography/Title.styled';
-
-// Hooks
 import useUser from '../hooks/useUser';
-
-// Store
-import { useEffect, useMemo } from 'react';
-import { FlexRowToColumn } from '../components/containers/FlexRowToColumn.styled';
-
-type InitialUser = {
-  username: string;
-  firstName: string;
-  lastName: string;
-  email: string;
-};
+import { FlexColumn } from '../components/containers/FlexColumn.styled';
+import { FlexRow } from '../components/containers/FlexRow.styled';
+import { TabManager } from '../components/tab-manager';
+import { Edit, X } from 'lucide-react';
+import {
+  GetUserResponse,
+  fetchCycle,
+  fetchUserOptions,
+  fetchUserRegistrations,
+  fetchUsersToGroups,
+} from 'api';
+import { Subtitle } from '../components/typography/Subtitle.styled';
+import { Separator } from '../components/separator';
+import { Body } from '../components/typography/Body.styled';
+import { useQueries, useQuery } from '@tanstack/react-query';
+import Link from '../components/link';
+import { Underline } from '../components/typography/Underline.styled';
 
 function Account() {
   const { user, isLoading: userIsLoading } = useUser();
-
-  const { data: events } = useQuery({
-    queryKey: ['events'],
-    queryFn: fetchEvents,
-    enabled: !!user?.id,
-  });
-
-  const initialUser: InitialUser = useMemo(() => {
-    return {
-      username: user?.username || '',
-      firstName: user?.firstName || '',
-      lastName: user?.lastName || '',
-      email: user?.email || '',
-    };
-  }, [user]);
+  const [tab, setTab] = useState<'view' | 'edit'>('view');
 
   if (userIsLoading) {
     return <Title>Loading...</Title>;
   }
 
-  return <AccountForm initialUser={initialUser} user={user} events={events} />;
-}
-
-function AccountForm({
-  initialUser,
-  user,
-  events,
-}: {
-  initialUser: InitialUser;
-  user: GetUserResponse | null | undefined;
-  events: GetEventsResponse | null | undefined;
-}) {
-  const navigate = useNavigate();
-  const queryClient = useQueryClient();
-
-  const { mutate: mutateUserData } = useMutation({
-    mutationFn: putUser,
-    onSuccess: async (body) => {
-      if (!body) {
-        return;
-      }
-
-      if ('errors' in body) {
-        toast.error(`There was an error: ${body.errors.join(', ')}`);
-        return;
-      }
-
-      await queryClient.invalidateQueries({ queryKey: ['user'] });
-      await queryClient.invalidateQueries({ queryKey: ['user', user?.id, 'groups'] });
+  const tabs = {
+    edit: (
+      <AccountForm
+        user={user}
+        initialUser={{
+          email: user?.email ?? '',
+          firstName: user?.firstName ?? '',
+          lastName: user?.lastName ?? '',
+          username: user?.username ?? '',
+        }}
+        title="Edit Account"
+        afterSubmit={() => {
+          setTab('view');
+        }}
+      />
+    ),
+    view: <AccountHub user={user} />,
+  };
 
-      toast.success('User data updated!');
+  return (
+    <FlexColumn>
+      <FlexRow $justify="flex-end">
+        {tab === 'view' ? (
+          <Edit
+            onClick={() => {
+              setTab('edit');
+            }}
+          />
+        ) : (
+          <X
+            onClick={() => {
+              setTab('view');
+            }}
+          />
+        )}
+      </FlexRow>
+      <TabManager tabs={tabs} tab={tab} fallback={<Title>Tab not found</Title>} />
+    </FlexColumn>
+  );
+}
 
-      if (events?.length === 1) {
-        navigate(`/events/${events?.[0].id}/register`);
-      }
-    },
-    onError: () => {
-      toast.error('There was an error, please try again.');
-    },
+function AccountHub({ user }: { user: GetUserResponse | null | undefined }) {
+  const { data: registrations } = useQuery({
+    queryKey: ['users', user?.id, 'registrations'],
+    queryFn: () => fetchUserRegistrations(user?.id ?? ''),
   });
 
-  const {
-    register,
-    formState: { errors, isValid, isSubmitting },
-    handleSubmit,
-    reset,
-  } = useForm({
-    defaultValues: useMemo(() => initialUser, [initialUser]),
-    mode: 'all',
+  const { data: options } = useQuery({
+    queryKey: ['users', user?.id, 'options'],
+    queryFn: () => fetchUserOptions(user?.id ?? ''),
   });
 
-  useEffect(() => {
-    reset(initialUser);
-  }, [initialUser, reset]);
+  const { data: usersToGroups } = useQuery({
+    queryKey: ['users', user?.id, 'groups'],
+    queryFn: () => fetchUsersToGroups(user?.id ?? ''),
+  });
 
-  const onSubmit = async (value: typeof initialUser) => {
-    if (isValid && user && user.id) {
-      await mutateUserData({
-        userId: user.id,
-        username: value.username,
-        email: value.email,
-        firstName: value.firstName,
-        lastName: value.lastName,
-      });
-    }
-  };
+  const cycles = useQueries({
+    queries:
+      // can be improved by filtering repeated cycles
+      options?.map((option) => ({
+        queryKey: ['cycles', option.forumQuestion.cycleId],
+        queryFn: () => fetchCycle(option.forumQuestion.cycleId),
+      })) ?? [],
+  });
 
   return (
     <FlexColumn>
-      <Subtitle>Complete your registration</Subtitle>
-      <form onSubmit={handleSubmit(onSubmit)} style={{ width: '100%' }}>
+      <div>
+        <Subtitle>
+          {user?.firstName} {user?.lastName}
+        </Subtitle>
+        <Body>@{user?.username}</Body>
+        <Body>{user?.email}</Body>
+      </div>
+      <Separator />
+      <div>
+        <Subtitle>Events</Subtitle>
         <FlexColumn>
-          <FlexRowToColumn>
-            <Input
-              label="First name"
-              autoComplete="off"
-              placeholder="Enter your first name"
-              required
-              {...register('firstName', { required: 'First name is required' })}
-              errors={errors.firstName ? [errors.firstName.message ?? ''] : []}
-            />
-            <Input
-              label="Last name"
-              autoComplete="off"
-              placeholder="Enter your last name"
-              required
-              {...register('lastName', { required: 'Last name is required' })}
-              errors={errors.lastName ? [errors.lastName.message ?? ''] : []}
-            />
-          </FlexRowToColumn>
-          <Input
-            label="Username"
-            placeholder="Enter your Username"
-            autoComplete="off"
-            required
-            {...register('username', { required: 'Username is required', minLength: 3 })}
-            errors={errors.username ? [errors.username.message ?? ''] : []}
-          />
-          <Input label="Email" placeholder="Enter your Email" {...register('email')} />
-          <Button type="submit" disabled={isSubmitting}>
-            Submit
-          </Button>
+          {registrations
+            ?.filter((registrations) => registrations.status !== 'REJECTED')
+            .map((registration) => (
+              <Link to={`/events/${registration.eventId}/cycles`}>
+                - {registration.event?.name}
+              </Link>
+            ))}
+        </FlexColumn>
+      </div>
+      <div>
+        <Subtitle>Proposals</Subtitle>
+        <FlexColumn>
+          {options?.map((option) => (
+            <Link
+              to={`/events/${cycles.find((c) => c.data?.id === option.forumQuestion.cycleId)?.data?.eventId}/cycles/${option.forumQuestion.cycleId}/options/${option.id}`}
+            >
+              - {option.optionTitle}
+            </Link>
+          ))}
+        </FlexColumn>
+      </div>
+      <div>
+        <Subtitle>Groups</Subtitle>
+        <FlexColumn>
+          {usersToGroups?.map((userToGroup) => <Underline>- {userToGroup.group?.name}</Underline>)}
         </FlexColumn>
-      </form>
+      </div>
     </FlexColumn>
   );
 }
diff --git a/packages/berlin/src/pages/Register.tsx b/packages/berlin/src/pages/Register.tsx
index 0727f2b8..788a5bf5 100644
--- a/packages/berlin/src/pages/Register.tsx
+++ b/packages/berlin/src/pages/Register.tsx
@@ -36,7 +36,7 @@ import useUser from '../hooks/useUser';
 import Button from '../components/button';
 import { FlexColumn } from '../components/containers/FlexColumn.styled';
 import { Form } from '../components/containers/Form.styled';
-import { FormInput } from '../components/form';
+import { FormInput } from '../components/form-input';
 import Select from '../components/select';
 import Label from '../components/typography/Label';
 import { Subtitle } from '../components/typography/Subtitle.styled';
diff --git a/packages/berlin/src/pages/SecretGroupRegistration.tsx b/packages/berlin/src/pages/SecretGroupRegistration.tsx
index 33b85418..6835e7c8 100644
--- a/packages/berlin/src/pages/SecretGroupRegistration.tsx
+++ b/packages/berlin/src/pages/SecretGroupRegistration.tsx
@@ -28,7 +28,7 @@ import Divider from '../components/divider';
 import GroupsColumns from '../components/columns/groups-columns';
 import GroupsTable from '../components/tables/groups-table';
 import Input from '../components/input';
-import ResearchGroupForm from '../components/research-group-form';
+import { ResearchGroupForm } from '../components/form';
 import SecretCode from '../components/secret-code';
 
 function SecretGroupRegistration() {
diff --git a/packages/berlin/src/utils/validation.ts b/packages/berlin/src/utils/validation.ts
new file mode 100644
index 00000000..ebcad2aa
--- /dev/null
+++ b/packages/berlin/src/utils/validation.ts
@@ -0,0 +1,12 @@
+import { z } from 'zod';
+
+export function returnZodError(validationFn: () => string): string | undefined {
+  try {
+    validationFn();
+  } catch (error) {
+    // check if zod error
+    if (error instanceof z.ZodError) {
+      return error.errors[0].message;
+    }
+  }
+}
diff --git a/packages/berlin/src/utils/voting.ts b/packages/berlin/src/utils/voting.ts
index 8e97b8f3..b395e064 100644
--- a/packages/berlin/src/utils/voting.ts
+++ b/packages/berlin/src/utils/voting.ts
@@ -1,11 +1,10 @@
 import { GetUserVotesResponse, PostVotesRequest } from 'api';
-import { ResponseUserVotesType } from '../types/CycleType';
 import toast from 'react-hot-toast';
 import { INITIAL_HEARTS } from './constants';
 
 export const handleLocalVote = (
   optionId: string,
-  prevLocalUserVotes: ResponseUserVotesType | { optionId: string; numOfVotes: number }[],
+  prevLocalUserVotes: { optionId: string; numOfVotes: number }[],
 ) => {
   // find if the user has already voted for this option
   const prevVote = prevLocalUserVotes.find((x) => x.optionId === optionId);
@@ -28,7 +27,7 @@ export const handleLocalVote = (
 
 export const handleLocalUnVote = (
   optionId: string,
-  prevLocalUserVotes: ResponseUserVotesType | { optionId: string; numOfVotes: number }[],
+  prevLocalUserVotes: { optionId: string; numOfVotes: number }[],
 ) => {
   // this will just find the option and decrease the number of votes by 1
   const updatedLocalVotes = prevLocalUserVotes.map((prevLocalUserVote) => {
@@ -52,12 +51,10 @@ export const handleAvailableHearts = (availableHearts: number, type: 'vote' | 'u
 
 export const handleSaveVotes = (
   userVotes: GetUserVotesResponse | null | undefined,
-  localUserVotes:
-    | ResponseUserVotesType
-    | {
-        optionId: string;
-        numOfVotes: number;
-      }[],
+  localUserVotes: {
+    optionId: string;
+    numOfVotes: number;
+  }[],
   mutateVotes: (data: PostVotesRequest) => void,
 ) => {
   try {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 76c8fc08..fcdb6723 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -32,6 +32,9 @@ importers:
       '@tanstack/react-query-devtools':
         specifier: ^5.13.5
         version: 5.13.5(@tanstack/react-query@5.13.4(react@18.2.0))(react@18.2.0)
+      lucide-react:
+        specifier: ^0.395.0
+        version: 0.395.0(react@18.2.0)
       react:
         specifier: ^18.2.0
         version: 18.2.0
@@ -2636,6 +2639,11 @@ packages:
     resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==}
     engines: {node: '>=10'}
 
+  lucide-react@0.395.0:
+    resolution: {integrity: sha512-6hzdNH5723A4FLaYZWpK50iyZH8iS2Jq5zuPRRotOFkhu6kxxJiebVdJ72tCR5XkiIeYFOU5NUawFZOac+VeYw==}
+    peerDependencies:
+      react: ^16.5.1 || ^17.0.0 || ^18.0.0
+
   magic-string@0.30.5:
     resolution: {integrity: sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==}
     engines: {node: '>=12'}
@@ -6904,6 +6912,10 @@ snapshots:
     dependencies:
       yallist: 4.0.0
 
+  lucide-react@0.395.0(react@18.2.0):
+    dependencies:
+      react: 18.2.0
+
   magic-string@0.30.5:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.4.15

From 85c263a22a03ed16ef3d22d8f7cdb958dd480767 Mon Sep 17 00:00:00 2001
From: Camilo Vega <59750365+camilovegag@users.noreply.github.com>
Date: Thu, 20 Jun 2024 03:19:13 -0500
Subject: [PATCH 02/15] 599 update agenda page (#600)

* Create TabsHeader and TabsManager

* Create cycle component

* Update Event

* Remove gap

* Update tabs header

* Add groups to event page

* Fixes

* join tabs components

---------

Co-authored-by: Diego Alzate <diego35.da@gmail.com>
---
 .../src/components/cycles/Cycles.styled.tsx   |   9 ++
 .../berlin/src/components/cycles/Cycles.tsx   |  32 ++++
 .../berlin/src/components/cycles/index.ts     |   1 +
 .../event-card/EventCard.styled.tsx           |   2 +-
 .../src/components/event-card/EventCard.tsx   |   2 +-
 .../src/components/tab-manager/index.ts       |   1 -
 .../src/components/tabs/TabsHeader.styled.tsx |  21 +++
 .../berlin/src/components/tabs/TabsHeader.tsx |  36 +++++
 .../TabManager.tsx => tabs/TabsManager.tsx}   |   2 +-
 packages/berlin/src/components/tabs/index.ts  |   2 +
 packages/berlin/src/pages/Account.tsx         |   4 +-
 packages/berlin/src/pages/Event.tsx           | 148 ++++++++++--------
 12 files changed, 189 insertions(+), 71 deletions(-)
 create mode 100644 packages/berlin/src/components/cycles/Cycles.styled.tsx
 create mode 100644 packages/berlin/src/components/cycles/Cycles.tsx
 create mode 100644 packages/berlin/src/components/cycles/index.ts
 delete mode 100644 packages/berlin/src/components/tab-manager/index.ts
 create mode 100644 packages/berlin/src/components/tabs/TabsHeader.styled.tsx
 create mode 100644 packages/berlin/src/components/tabs/TabsHeader.tsx
 rename packages/berlin/src/components/{tab-manager/TabManager.tsx => tabs/TabsManager.tsx} (76%)
 create mode 100644 packages/berlin/src/components/tabs/index.ts

diff --git a/packages/berlin/src/components/cycles/Cycles.styled.tsx b/packages/berlin/src/components/cycles/Cycles.styled.tsx
new file mode 100644
index 00000000..5a0c32b3
--- /dev/null
+++ b/packages/berlin/src/components/cycles/Cycles.styled.tsx
@@ -0,0 +1,9 @@
+import styled from 'styled-components';
+import { FlexRowToColumn } from '../containers/FlexRowToColumn.styled';
+
+export const CycleContainer = styled(FlexRowToColumn)`
+  border: 1px solid var(--color-black);
+  padding: 2rem;
+  justify-content: space-between;
+  border-radius: 0.5rem;
+`;
diff --git a/packages/berlin/src/components/cycles/Cycles.tsx b/packages/berlin/src/components/cycles/Cycles.tsx
new file mode 100644
index 00000000..09b0746f
--- /dev/null
+++ b/packages/berlin/src/components/cycles/Cycles.tsx
@@ -0,0 +1,32 @@
+import { GetCycleResponse } from 'api';
+import { Body } from '../typography/Body.styled';
+import { CycleContainer } from './Cycles.styled';
+
+type CyclesProps = {
+  cycles: GetCycleResponse[] | undefined;
+  errorMessage: string;
+};
+
+function Cycles({ cycles, errorMessage }: CyclesProps) {
+  const formatDate = (date: string) => {
+    const eventEndDate = new Date(date);
+    return eventEndDate.toLocaleDateString();
+  };
+
+  return (
+    <>
+      {cycles?.length ? (
+        cycles.map((cycle) => (
+          <CycleContainer key={cycle.id}>
+            <Body>{cycle.forumQuestions[0]?.questionTitle}</Body>
+            <Body>{formatDate(cycle.endAt)}</Body>
+          </CycleContainer>
+        ))
+      ) : (
+        <Body>{errorMessage}</Body>
+      )}
+    </>
+  );
+}
+
+export default Cycles;
diff --git a/packages/berlin/src/components/cycles/index.ts b/packages/berlin/src/components/cycles/index.ts
new file mode 100644
index 00000000..7e9e6dfc
--- /dev/null
+++ b/packages/berlin/src/components/cycles/index.ts
@@ -0,0 +1 @@
+export { default } from './Cycles';
diff --git a/packages/berlin/src/components/event-card/EventCard.styled.tsx b/packages/berlin/src/components/event-card/EventCard.styled.tsx
index a3742b19..14382b84 100644
--- a/packages/berlin/src/components/event-card/EventCard.styled.tsx
+++ b/packages/berlin/src/components/event-card/EventCard.styled.tsx
@@ -3,7 +3,7 @@ import { FlexColumn } from '../containers/FlexColumn.styled';
 import { FlexRowToColumn } from '../containers/FlexRowToColumn.styled';
 
 export const Card = styled(FlexRowToColumn)`
-  border-radius: 1rem;
+  border-radius: 0.5rem;
   border: 1px solid var(--color-black);
   overflow: hidden;
   width: 100%;
diff --git a/packages/berlin/src/components/event-card/EventCard.tsx b/packages/berlin/src/components/event-card/EventCard.tsx
index 5c6d1878..e08c61aa 100644
--- a/packages/berlin/src/components/event-card/EventCard.tsx
+++ b/packages/berlin/src/components/event-card/EventCard.tsx
@@ -15,7 +15,7 @@ type EventCardProps = {
 
 function EventCard({ event, onClick }: EventCardProps) {
   return (
-    <Card>
+    <Card $gap="0">
       <ImageContainer>
         <img src={event.imageUrl} alt={`${event.name} image`} />
       </ImageContainer>
diff --git a/packages/berlin/src/components/tab-manager/index.ts b/packages/berlin/src/components/tab-manager/index.ts
deleted file mode 100644
index 7ab46372..00000000
--- a/packages/berlin/src/components/tab-manager/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './TabManager';
diff --git a/packages/berlin/src/components/tabs/TabsHeader.styled.tsx b/packages/berlin/src/components/tabs/TabsHeader.styled.tsx
new file mode 100644
index 00000000..37162994
--- /dev/null
+++ b/packages/berlin/src/components/tabs/TabsHeader.styled.tsx
@@ -0,0 +1,21 @@
+import styled from 'styled-components';
+import { Body } from '../typography/Body.styled';
+import { FlexRow } from '../containers/FlexRow.styled';
+
+export const Tabs = styled(FlexRow)`
+  justify-content: flex-start;
+
+  @media (min-width: 600px) {
+    justify-content: flex-end;
+  }
+`;
+
+export const Tab = styled(Body)`
+  cursor: pointer;
+  text-transform: capitalize;
+
+  &.active {
+    font-weight: 600;
+    text-decoration: underline;
+  }
+`;
diff --git a/packages/berlin/src/components/tabs/TabsHeader.tsx b/packages/berlin/src/components/tabs/TabsHeader.tsx
new file mode 100644
index 00000000..37ac4450
--- /dev/null
+++ b/packages/berlin/src/components/tabs/TabsHeader.tsx
@@ -0,0 +1,36 @@
+import { Fragment, useState } from 'react';
+import { Body } from '../typography/Body.styled';
+import { Tab, Tabs } from './TabsHeader.styled';
+
+type TabsHeaderProps = {
+  tabNames: string[];
+  initialTab?: string;
+  onTabChange?: (tab: string) => void;
+};
+
+export function TabsHeader({ tabNames, initialTab, onTabChange }: TabsHeaderProps) {
+  const [activeTab, setActiveTab] = useState<string>(initialTab || tabNames[0]);
+
+  const handleTabClick = (tab: string) => {
+    setActiveTab(tab);
+    if (onTabChange) {
+      onTabChange(tab);
+    }
+  };
+
+  return (
+    <Tabs $gap="0.5rem">
+      {tabNames.map((tabName, index) => (
+        <Fragment key={tabName}>
+          <Tab
+            className={activeTab === tabName ? 'active' : ''}
+            onClick={() => handleTabClick(tabName)}
+          >
+            {tabName}
+          </Tab>
+          {index < tabNames.length - 1 && <Body>/</Body>}
+        </Fragment>
+      ))}
+    </Tabs>
+  );
+}
diff --git a/packages/berlin/src/components/tab-manager/TabManager.tsx b/packages/berlin/src/components/tabs/TabsManager.tsx
similarity index 76%
rename from packages/berlin/src/components/tab-manager/TabManager.tsx
rename to packages/berlin/src/components/tabs/TabsManager.tsx
index 25cda9f2..eba28ca8 100644
--- a/packages/berlin/src/components/tab-manager/TabManager.tsx
+++ b/packages/berlin/src/components/tabs/TabsManager.tsx
@@ -1,4 +1,4 @@
-export function TabManager<T extends string>({
+export function TabsManager<T extends string>({
   tabs,
   tab,
   fallback,
diff --git a/packages/berlin/src/components/tabs/index.ts b/packages/berlin/src/components/tabs/index.ts
new file mode 100644
index 00000000..c3d97fbe
--- /dev/null
+++ b/packages/berlin/src/components/tabs/index.ts
@@ -0,0 +1,2 @@
+export * from './TabsHeader';
+export * from './TabsManager';
diff --git a/packages/berlin/src/pages/Account.tsx b/packages/berlin/src/pages/Account.tsx
index 384f2605..01024fe3 100644
--- a/packages/berlin/src/pages/Account.tsx
+++ b/packages/berlin/src/pages/Account.tsx
@@ -4,7 +4,7 @@ import { Title } from '../components/typography/Title.styled';
 import useUser from '../hooks/useUser';
 import { FlexColumn } from '../components/containers/FlexColumn.styled';
 import { FlexRow } from '../components/containers/FlexRow.styled';
-import { TabManager } from '../components/tab-manager';
+import { TabsManager } from '../components/tabs';
 import { Edit, X } from 'lucide-react';
 import {
   GetUserResponse,
@@ -64,7 +64,7 @@ function Account() {
           />
         )}
       </FlexRow>
-      <TabManager tabs={tabs} tab={tab} fallback={<Title>Tab not found</Title>} />
+      <TabsManager tabs={tabs} tab={tab} fallback={<Title>Tab not found</Title>} />
     </FlexColumn>
   );
 }
diff --git a/packages/berlin/src/pages/Event.tsx b/packages/berlin/src/pages/Event.tsx
index 1930710e..80872b12 100644
--- a/packages/berlin/src/pages/Event.tsx
+++ b/packages/berlin/src/pages/Event.tsx
@@ -1,21 +1,28 @@
 // React and third-party libraries
-import { useMemo } from 'react';
+import { useState, useMemo } from 'react';
 import { useQuery } from '@tanstack/react-query';
 import { useNavigate, useParams } from 'react-router-dom';
 
 // API
-import { GetCycleResponse, fetchEvent, fetchEventCycles } from 'api';
+import {
+  fetchEvent,
+  fetchEventCycles,
+  fetchEventGroupCategories,
+  GetGroupCategoriesResponse,
+} from 'api';
 
 // Components
 import { Body } from '../components/typography/Body.styled';
 import { FlexColumn } from '../components/containers/FlexColumn.styled';
-import { Table } from '../components/table';
+import { FlexRow } from '../components/containers/FlexRow.styled';
+import { Subtitle } from '../components/typography/Subtitle.styled';
 import Button from '../components/button';
+import Cycles from '../components/cycles';
 import EventCard from '../components/event-card';
 import Link from '../components/link';
+import * as Tabs from '../components/tabs';
 
 function Event() {
-  const navigate = useNavigate();
   const { eventId } = useParams();
   const { data: event } = useQuery({
     queryKey: ['event', eventId],
@@ -30,6 +37,12 @@ function Event() {
     refetchInterval: 5000, // Poll every 5 seconds
   });
 
+  const { data: groupCategories } = useQuery({
+    queryKey: ['event', eventId, 'group-categories'],
+    queryFn: () => fetchEventGroupCategories(eventId || ''),
+    enabled: !!eventId,
+  });
+
   const openCycles = useMemo(
     () => eventCycles?.filter((cycle) => cycle.status === 'OPEN'),
     [eventCycles],
@@ -39,83 +52,88 @@ function Event() {
     [eventCycles],
   );
 
-  const handleDataPolicyClick = () => {
-    navigate(`/data-policy`);
-  };
-
-  // TODO: Create functions to navigate to onboarding slides
+  const tabNames = ['upcoming', 'past'];
+  const [activeTab, setActiveTab] = useState<string>('upcoming');
 
-  const handleOnboardingClick = () => {
-    navigate(`/onboarding`);
+  const tabs = {
+    upcoming: <Cycles cycles={openCycles} errorMessage="No upcoming events" />,
+    past: <Cycles cycles={closedCycles} errorMessage="No past events" />,
   };
 
+  // TODO: flag for showing groups.
+  const showGroups = true;
+
   return (
     <FlexColumn $gap="2rem">
-      {/* <BackButton /> */}
-      {!!openCycles?.length && <CycleTable cycles={openCycles} status="open" />}
-      {!!closedCycles?.length && <CycleTable cycles={closedCycles} status="closed" />}
       {event && <EventCard event={event} />}
-      <Body>
-        Click to revisit the{' '}
-        <Link
-          to="#"
-          onClick={handleOnboardingClick}
-          state={{ onboardingStep: 2, previousPath: location.pathname }}
-        >
-          event rules
-        </Link>
-        ,{' '}
-        <Link
-          to="#"
-          onClick={handleOnboardingClick}
-          state={{ onboardingStep: 0, previousPath: location.pathname }}
-        >
-          trust assumptions
-        </Link>
-        , and the community’s{' '}
-        <Link to="#" onClick={handleDataPolicyClick}>
-          data policy
-        </Link>
-        .
-      </Body>
+      <Subtitle>Questions</Subtitle>
+      <Tabs.TabsHeader tabNames={tabNames} onTabChange={setActiveTab} />
+      <FlexColumn>
+        <Tabs.TabsManager tabs={tabs} tab={activeTab} fallback={'Tab not found'} />
+      </FlexColumn>
+      {showGroups && <Groups groups={groupCategories} />}
+      <RunningText />
     </FlexColumn>
   );
 }
 
-function CycleTable({ cycles, status }: { cycles: GetCycleResponse[]; status: 'open' | 'closed' }) {
-  const { eventId } = useParams();
+function RunningText() {
   const navigate = useNavigate();
-  const formatDate = (date: string) => {
-    const eventEndDate = new Date(date);
-    return eventEndDate.toLocaleDateString();
-  };
-  const handleClick = (cycleId: string) => {
-    navigate(`/events/${eventId}/cycles/${cycleId}`);
+
+  const handleDataPolicyClick = () => {
+    navigate(`/data-policy`);
   };
 
-  const formattedColumnText = () => {
-    if (status === 'open') {
-      return 'Closes on';
-    } else {
-      return 'Closed on';
-    }
+  const handleOnboardingClick = () => {
+    navigate(`/onboarding`);
   };
 
   return (
-    <Table
-      columns={[
-        `${status.charAt(0).toUpperCase() + status.slice(1)} Agendas`,
-        formattedColumnText(),
-        '',
-      ]}
-      rows={cycles.map((cycle) => [
-        cycle.forumQuestions?.[0]?.questionTitle,
-        formatDate(cycle.endAt),
-        <Button onClick={() => handleClick(cycle.id)}>
-          {status === 'open' ? 'Vote' : 'Results'}
-        </Button>,
-      ])}
-    />
+    <Body>
+      Click to revisit the{' '}
+      <Link
+        to="#"
+        onClick={handleOnboardingClick}
+        state={{ onboardingStep: 2, previousPath: location.pathname }}
+      >
+        event rules
+      </Link>
+      ,{' '}
+      <Link
+        to="#"
+        onClick={handleOnboardingClick}
+        state={{ onboardingStep: 0, previousPath: location.pathname }}
+      >
+        trust assumptions
+      </Link>
+      , and the community’s{' '}
+      <Link to="#" onClick={handleDataPolicyClick}>
+        data policy
+      </Link>
+      .
+    </Body>
+  );
+}
+
+function Groups({ groups }: { groups: GetGroupCategoriesResponse | null | undefined }) {
+  const navigate = useNavigate();
+
+  return groups ? (
+    <>
+      <Subtitle>Groups</Subtitle>
+      <FlexRow $wrap>
+        {groups.map((group) => (
+          <Button
+            key={group.id}
+            onClick={() => navigate(`/secret-groups?groupcategory=${group.name}`)}
+          >
+            {group.name}
+          </Button>
+        ))}
+      </FlexRow>
+    </>
+  ) : (
+    <Body>No groups</Body>
   );
 }
 

From a7679c10f9d3e2686e617ca5ad165a8114da8a80 Mon Sep 17 00:00:00 2001
From: Diego Alzate <diego35.da@gmail.com>
Date: Mon, 24 Jun 2024 09:41:23 +0100
Subject: [PATCH 03/15] merge conflicts with develop

---
 packages/api/src/types/CycleType.ts           |   6 +-
 .../berlin/public/logos/lexicon-light.svg     |  19 +-
 .../cycle-columns/CycleColumns.styled.tsx     |   2 +-
 packages/berlin/src/components/dots/Dots.tsx  |   6 +-
 .../berlin/src/components/header/Header.tsx   |  20 +-
 .../src/components/option-card/OptionCard.tsx |  11 +-
 .../tables/results-table/ResultsTable.tsx     |  74 +++++-
 packages/berlin/src/pages/Comments.tsx        | 178 +++++++------
 packages/berlin/src/pages/Cycle.tsx           |   8 +-
 packages/berlin/src/pages/Landing.tsx         |   2 +-
 packages/berlin/src/pages/Onboarding.tsx      |   2 +-
 packages/berlin/src/pages/Register.tsx        | 238 +++++++++++-------
 packages/berlin/src/pages/Results.tsx         |   2 +
 13 files changed, 340 insertions(+), 228 deletions(-)

diff --git a/packages/api/src/types/CycleType.ts b/packages/api/src/types/CycleType.ts
index e920862e..28e6e6d6 100644
--- a/packages/api/src/types/CycleType.ts
+++ b/packages/api/src/types/CycleType.ts
@@ -24,11 +24,11 @@ export type GetCycleResponse = {
       accepted: boolean;
       voteScore?: number;
       fundingRequest: string;
-      user: {
-        groups: {
+      user?: {
+        groups?: {
           id: string;
           name: string;
-          groupCategory: {
+          groupCategory?: {
             id: string;
             name: string | null;
             createdAt: Date;
diff --git a/packages/berlin/public/logos/lexicon-light.svg b/packages/berlin/public/logos/lexicon-light.svg
index 53a5bf02..f0109986 100644
--- a/packages/berlin/public/logos/lexicon-light.svg
+++ b/packages/berlin/public/logos/lexicon-light.svg
@@ -1,19 +1,24 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_113_4524)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M15.1565 4.80038L53.7173 4L48.5759 11.7904L61.2689 32.2801L45.6839 59.8664L14.9959 59.5463L0 33.4006L8.53257 7.57503H13.8176L15.1565 4.80038ZM43.1667 9.70937L16.6026 55.4377L3.05273 32.5468L16.3348 9.76273L43.1667 9.70937ZM34.0621 38.3096L32.7232 35.5883L18.5306 56.6116H43.8629L54.3601 38.3096H34.0621Z" fill="black"/>
-<path d="M34.0635 38.3427L32.7246 35.6188L34.492 32.8415L57.6285 32.3608L54.3615 38.3427H34.0635Z" fill="url(#paint0_linear_113_4524)"/>
-<path d="M64.0005 20.9307L59.3411 29.2626L48.5762 11.7977L53.5034 4.32031L64.0005 20.9307Z" fill="url(#paint1_linear_113_4524)"/>
+<g clip-path="url(#clip0_128_12540)">
+<mask id="mask0_128_12540" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="64" height="64">
+<path d="M64 0H0V64H64V0Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_128_12540)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.1565 4.80038L53.7173 4L48.5759 11.7904L61.2689 32.2801L45.6839 59.8664L14.9959 59.5463L0 33.4006L8.53257 7.57503H13.8176L15.1565 4.80038ZM43.1667 9.70937L16.6026 55.4377L3.05273 32.5468L16.3348 9.76273L43.1667 9.70937ZM34.0621 38.3096L32.7232 35.5883L18.5306 56.6116H43.8629L54.3601 38.3096H34.0621Z" fill="#222222"/>
+<path d="M34.0635 38.3427L32.7246 35.6188L34.492 32.8415L57.6285 32.3608L54.3615 38.3427H34.0635Z" fill="url(#paint0_linear_128_12540)"/>
+<path d="M64.0005 20.9307L59.3411 29.2626L48.5762 11.7977L53.5034 4.32031L64.0005 20.9307Z" fill="url(#paint1_linear_128_12540)"/>
+</g>
 </g>
 <defs>
-<linearGradient id="paint0_linear_113_4524" x1="32.7246" y1="35.3518" x2="57.6285" y2="35.3518" gradientUnits="userSpaceOnUse">
+<linearGradient id="paint0_linear_128_12540" x1="32.7246" y1="35.3518" x2="57.6285" y2="35.3518" gradientUnits="userSpaceOnUse">
 <stop offset="0.0958369" stop-color="#91869B"/>
 <stop offset="1" stop-color="#4CF3DE"/>
 </linearGradient>
-<linearGradient id="paint1_linear_113_4524" x1="51.2005" y1="8.00558" x2="62.2429" y2="25.7115" gradientUnits="userSpaceOnUse">
+<linearGradient id="paint1_linear_128_12540" x1="51.2005" y1="8.00558" x2="62.2429" y2="25.7115" gradientUnits="userSpaceOnUse">
 <stop offset="0.0424592" stop-color="#F1FBFA"/>
 <stop offset="1" stop-color="#4CF3DE"/>
 </linearGradient>
-<clipPath id="clip0_113_4524">
+<clipPath id="clip0_128_12540">
 <rect width="64" height="64" fill="white"/>
 </clipPath>
 </defs>
diff --git a/packages/berlin/src/components/columns/cycle-columns/CycleColumns.styled.tsx b/packages/berlin/src/components/columns/cycle-columns/CycleColumns.styled.tsx
index 7f968495..9ddf80a7 100644
--- a/packages/berlin/src/components/columns/cycle-columns/CycleColumns.styled.tsx
+++ b/packages/berlin/src/components/columns/cycle-columns/CycleColumns.styled.tsx
@@ -58,6 +58,6 @@ export const Hearts = styled(FlexRow)`
 `;
 
 export const Plurality = styled(FlexRow)`
-  max-width: 5.5rem;
+  max-width: 5rem;
   padding: 1.5rem;
 `;
diff --git a/packages/berlin/src/components/dots/Dots.tsx b/packages/berlin/src/components/dots/Dots.tsx
index d5bef910..fd3ede01 100644
--- a/packages/berlin/src/components/dots/Dots.tsx
+++ b/packages/berlin/src/components/dots/Dots.tsx
@@ -4,14 +4,14 @@ import { Dot } from './Dots.styled';
 type DotsProps = {
   dots: number;
   activeDotIndex: number;
-  setStep: React.Dispatch<React.SetStateAction<number>>;
+  handleClick: (index: number) => void;
 };
 
-function Dots({ dots, activeDotIndex, setStep }: DotsProps) {
+function Dots({ dots, activeDotIndex, handleClick }: DotsProps) {
   return (
     <FlexRow>
       {Array.from({ length: dots }).map((_, index) => (
-        <Dot key={index} $active={index === activeDotIndex} onClick={() => setStep(index)} />
+        <Dot key={index} $active={index === activeDotIndex} onClick={() => handleClick(index)} />
       ))}
     </FlexRow>
   );
diff --git a/packages/berlin/src/components/header/Header.tsx b/packages/berlin/src/components/header/Header.tsx
index 096e5e26..1bc8ebbb 100644
--- a/packages/berlin/src/components/header/Header.tsx
+++ b/packages/berlin/src/components/header/Header.tsx
@@ -1,7 +1,7 @@
 // React and third-party libraries
-import { useState } from 'react';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
-import { useLocation, useNavigate } from 'react-router-dom';
+import { useState } from 'react';
+import { useNavigate } from 'react-router-dom';
 
 // Store
 import { useAppStore } from '../../store';
@@ -21,13 +21,13 @@ import NavButton from '../nav-button';
 import ZupassLoginButton from '../zupass-button/ZupassLoginButton';
 
 // Styled components
+import IconButton from '../icon-button';
 import {
   Bar,
   BurgerMenuContainer,
   DesktopButtons,
   HeaderContainer,
   LogoContainer,
-  LogoImage,
   LogoSubtitle,
   LogoTextContainer,
   LogoTitle,
@@ -38,12 +38,10 @@ import {
   StyledHeader,
   ThemeButton,
 } from './Header.styled';
-import IconButton from '../icon-button';
 
 function Header() {
   const queryClient = useQueryClient();
   const { user } = useUser();
-  const location = useLocation();
   const theme = useAppStore((state) => state.theme);
   const toggleTheme = useAppStore((state) => state.toggleTheme);
   const navigate = useNavigate();
@@ -64,13 +62,11 @@ function Header() {
     <StyledHeader>
       <HeaderContainer>
         <LogoContainer onClick={() => navigate('/')}>
-          <LogoImage src={header.logo.src} alt={header.logo.alt} height={96} width={96} />
-          {location.pathname === '/' && (
-            <LogoTextContainer>
-              <LogoTitle>{header.title}</LogoTitle>
-              <LogoSubtitle>{header.subtitle}</LogoSubtitle>
-            </LogoTextContainer>
-          )}
+          <img src={`/logos/lexicon-${theme}.svg`} alt="Lexicon Logo" height={64} width={64} />
+          <LogoTextContainer>
+            <LogoTitle>{header.title}</LogoTitle>
+            <LogoSubtitle>{header.subtitle}</LogoSubtitle>
+          </LogoTextContainer>
         </LogoContainer>
         <NavContainer>
           <NavButtons>
diff --git a/packages/berlin/src/components/option-card/OptionCard.tsx b/packages/berlin/src/components/option-card/OptionCard.tsx
index e2e17a4c..1072de63 100644
--- a/packages/berlin/src/components/option-card/OptionCard.tsx
+++ b/packages/berlin/src/components/option-card/OptionCard.tsx
@@ -55,7 +55,7 @@ function OptionCard({
 
   const [expanded, setExpanded] = useState(false);
 
-  const author = `${option.user.firstName} ${option.user.lastName}`;
+  const author = option.user ? `${option.user?.firstName} ${option.user?.lastName}` : 'Anonymous';
 
   const handleCommentsClick = () => {
     navigate(`/events/${eventId}/cycles/${cycleId}/options/${option.id}`);
@@ -63,9 +63,9 @@ function OptionCard({
 
   const coauthors = useMemo(() => {
     return optionUsers?.group?.users?.filter(
-      (optionUser) => optionUser.username !== option.user.username,
+      (optionUser) => optionUser.username !== option.user?.username,
     );
-  }, [optionUsers, option.user.username]);
+  }, [optionUsers, option.user?.username]);
 
   return (
     <Card $expanded={expanded}>
@@ -89,7 +89,10 @@ function OptionCard({
           </Author>
           <Affiliation>
             <Field>Affiliation:</Field>
-            <Body>{option.user?.groups.find((group) => group.groupCategory.required)?.name}</Body>
+            <Body>
+              {option.user?.groups?.find((group) => group.groupCategory?.required)?.name ??
+                'No affiliation'}
+            </Body>
           </Affiliation>
           <Votes $showScore={showScore}>
             <VotesIcon $gap="-4px">
diff --git a/packages/berlin/src/components/tables/results-table/ResultsTable.tsx b/packages/berlin/src/components/tables/results-table/ResultsTable.tsx
index 3a80978c..6e4487fc 100644
--- a/packages/berlin/src/components/tables/results-table/ResultsTable.tsx
+++ b/packages/berlin/src/components/tables/results-table/ResultsTable.tsx
@@ -1,21 +1,28 @@
 // React and third-party libraries
+import { useQuery } from '@tanstack/react-query';
 import { useMemo } from 'react';
 
+// API
+import { fetchOptionUsers, fetchRegistrationData, fetchRegistrationFields } from 'api';
+
 // Store
 import { useAppStore } from '../../../store';
 
 // Components
-import { Body } from '../../typography/Body.styled';
-import { Bold } from '../../typography/Bold.styled';
 import { FlexColumn } from '../../containers/FlexColumn.styled';
 import { FlexRow } from '../../containers/FlexRow.styled';
 import IconButton from '../../icon-button';
+import { Body } from '../../typography/Body.styled';
+import { Bold } from '../../typography/Bold.styled';
 
 // Styled Components
+import { useNavigate } from 'react-router-dom';
 import { Card, Funding, Icon, Plurality, TitleContainer } from './ResultsTable.styled';
 
 type ResultsTableProps = {
   $expanded: boolean;
+  eventId?: string;
+  cycleId?: string;
   option: {
     optionTitle: string;
     pluralityScore: string;
@@ -31,9 +38,9 @@ type ResultsTableProps = {
   onClick: () => void;
 };
 
-function ResultsTable({ $expanded, option, onClick }: ResultsTableProps) {
+function ResultsTable({ $expanded, option, onClick, cycleId, eventId }: ResultsTableProps) {
   const theme = useAppStore((state) => state.theme);
-
+  const navigate = useNavigate();
   const formattedQuadraticScore = useMemo(() => {
     const score = parseFloat(option.quadraticScore);
     return score % 1 === 0 ? score.toFixed(0) : score.toFixed(3);
@@ -44,6 +51,44 @@ function ResultsTable({ $expanded, option, onClick }: ResultsTableProps) {
     return score % 1 === 0 ? score.toFixed(0) : score.toFixed(3);
   }, [option.pluralityScore]);
 
+  const { data: optionUsers } = useQuery({
+    queryKey: ['option', option.id, 'users'],
+    queryFn: () => fetchOptionUsers(option.id || ''),
+    enabled: !!option.id,
+  });
+
+  const { data: registrationFields } = useQuery({
+    queryKey: ['event', eventId, 'registrations', 'fields'],
+    queryFn: () => fetchRegistrationFields(eventId || ''),
+    enabled: !!eventId,
+  });
+
+  const { data: registrationData } = useQuery({
+    queryKey: ['registrations', optionUsers?.registrationId, 'registration-data'],
+    queryFn: () => fetchRegistrationData(optionUsers?.registrationId || ''),
+    enabled: !!optionUsers?.registrationId,
+  });
+
+  const researchOutputField = registrationFields?.find(
+    (field) => field.name === 'Select research output:',
+  );
+
+  const researchOutputValue = registrationData?.find(
+    (data) => data.registrationFieldId === researchOutputField?.id,
+  )?.value;
+
+  const collaborators = optionUsers?.group?.users
+    ?.filter(
+      (user) =>
+        user.firstName !== optionUsers?.user?.firstName ||
+        user.lastName !== optionUsers?.user?.lastName,
+    )
+    .map((user) => `${user.firstName} ${user.lastName}`);
+
+  const handleCommentsClick = () => {
+    navigate(`/events/${eventId}/cycles/${cycleId}/options/${option.id}`);
+  };
+
   return (
     <Card $expanded={$expanded} $showFunding={option.allocatedFunding !== null} $rowgap="2rem">
       <TitleContainer>
@@ -116,14 +161,31 @@ function ResultsTable({ $expanded, option, onClick }: ResultsTableProps) {
       <FlexColumn className="description">
         <Body>{option.optionSubTitle}</Body>
         <Body>
-          <Bold>Distinct voters:</Bold> {option.distinctUsers}
+          <Bold>Research Output:</Bold> {researchOutputValue}
+        </Body>
+        <Body>
+          <Bold>Lead Author:</Bold> {optionUsers?.user?.firstName} {optionUsers?.user?.lastName}
         </Body>
         <Body>
-          <Bold>Distinct groups:</Bold> {option.distinctGroups}
+          <Bold>Collaborators:</Bold>{' '}
+          {collaborators && collaborators.length > 0 ? collaborators.join(', ') : 'None'}
+        </Body>
+        <Body>
+          <Bold>Distinct voters:</Bold> {option.distinctUsers}
         </Body>
         <Body>
           <Bold>Voter affiliations:</Bold> {option.listOfGroupNames.join(', ')}
         </Body>
+        <Body>
+          <IconButton
+            $padding={0}
+            $color="secondary"
+            icon={{ src: `/icons/comments-${theme}.svg`, alt: 'Comments icon' }}
+            onClick={handleCommentsClick}
+            $width={24}
+            $height={24}
+          />
+        </Body>
       </FlexColumn>
     </Card>
   );
diff --git a/packages/berlin/src/pages/Comments.tsx b/packages/berlin/src/pages/Comments.tsx
index 6f361816..d30167bc 100644
--- a/packages/berlin/src/pages/Comments.tsx
+++ b/packages/berlin/src/pages/Comments.tsx
@@ -1,29 +1,21 @@
 // React and third-party libraries
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import { useParams } from 'react-router-dom';
-import { useEffect, useMemo, useState } from 'react';
-import toast from 'react-hot-toast';
+import { useMemo, useState } from 'react';
 
 // API
-import {
-  fetchOption,
-  postVotes,
-  fetchUserVotes,
-  fetchComments,
-  postComment,
-  fetchOptionUsers,
-} from 'api';
+import { fetchOption, fetchComments, postComment, fetchOptionUsers } from 'api';
 
 // Hooks
-import useUser from '../hooks/useUser';
+// import useUser from '../hooks/useUser';
 
 // Utils
-import {
-  handleSaveVotes,
-  handleAvailableHearts,
-  handleLocalUnVote,
-  handleLocalVote,
-} from '../utils/voting';
+// import {
+//   handleSaveVotes,
+//   handleAvailableHearts,
+//   handleLocalUnVote,
+//   handleLocalVote,
+// } from '../utils/voting';
 
 // Store
 import { useAppStore } from '../store';
@@ -41,17 +33,17 @@ import CommentsTable from '../components/tables/comment-table';
 import CommentsColumns from '../components/columns/comments-columns';
 import IconButton from '../components/icon-button';
 import Textarea from '../components/textarea';
-import { INITIAL_HEARTS } from '../utils/constants';
+// import { INITIAL_HEARTS } from '../utils/constants';
 
-type LocalUserVotes = { optionId: string; numOfVotes: number }[];
+// type LocalUserVotes = { optionId: string; numOfVotes: number }[];
 
 function Comments() {
   const theme = useAppStore((state) => state.theme);
   const queryClient = useQueryClient();
-  const { cycleId, optionId } = useParams();
-  const { user } = useUser();
-  const [localUserVotes, setLocalUserVotes] = useState<LocalUserVotes>([]);
-  const [localOptionHearts, setLocalOptionHearts] = useState(0);
+  const { optionId } = useParams();
+  // const { user } = useUser();
+  // const [localUserVotes, setLocalUserVotes] = useState<LocalUserVotes>([]);
+  // const [localOptionHearts, setLocalOptionHearts] = useState(0);
   const [comment, setComment] = useState('');
   const [sortOrder, setSortOrder] = useState('desc'); // 'asc' for ascending, 'desc' for descending
 
@@ -61,16 +53,16 @@ function Comments() {
     enabled: !!optionId,
   });
 
-  const availableHearts =
-    useAppStore((state) => state.availableHearts[option?.questionId || '']) ?? INITIAL_HEARTS;
-  const setAvailableHearts = useAppStore((state) => state.setAvailableHearts);
+  // const availableHearts =
+  //   useAppStore((state) => state.availableHearts[option?.questionId || '']) ?? INITIAL_HEARTS;
+  // const setAvailableHearts = useAppStore((state) => state.setAvailableHearts);
 
-  const { data: userVotes } = useQuery({
-    queryKey: ['votes', cycleId],
-    queryFn: () => fetchUserVotes(cycleId || ''),
-    enabled: !!user?.id && !!cycleId,
-    retry: false,
-  });
+  // const { data: userVotes } = useQuery({
+  //   queryKey: ['votes', cycleId],
+  //   queryFn: () => fetchUserVotes(cycleId || ''),
+  //   enabled: !!user?.id && !!cycleId,
+  //   retry: false,
+  // });
 
   const { data: optionUsers } = useQuery({
     queryKey: ['option', optionId, 'users'],
@@ -99,19 +91,19 @@ function Comments() {
     });
   }, [comments, sortOrder]);
 
-  useEffect(() => {
-    if (optionId) {
-      const sumOfAllVotes = userVotes?.reduce((acc, option) => acc + option.numOfVotes, 0) || 0;
-      const hearts = userVotes?.find((option) => optionId === option.optionId)?.numOfVotes || 0;
-      setLocalOptionHearts(hearts);
-      setLocalUserVotes([{ optionId: optionId, numOfVotes: hearts }]);
-      // update the available hearts
-      setAvailableHearts({
-        questionId: option?.questionId ?? '',
-        hearts: Math.max(0, INITIAL_HEARTS - sumOfAllVotes),
-      });
-    }
-  }, [optionId, userVotes, setAvailableHearts, option?.questionId]);
+  // useEffect(() => {
+  //   if (optionId) {
+  //     const sumOfAllVotes = userVotes?.reduce((acc, option) => acc + option.numOfVotes, 0) || 0;
+  //     const hearts = userVotes?.find((option) => optionId === option.optionId)?.numOfVotes || 0;
+  //     setLocalOptionHearts(hearts);
+  //     setLocalUserVotes([{ optionId: optionId, numOfVotes: hearts }]);
+  //     // update the available hearts
+  //     setAvailableHearts({
+  //       questionId: option?.questionId ?? '',
+  //       hearts: Math.max(0, INITIAL_HEARTS - sumOfAllVotes),
+  //     });
+  //   }
+  // }, [optionId, userVotes, setAvailableHearts, option?.questionId]);
 
   const { mutate: mutateComments } = useMutation({
     mutationFn: postComment,
@@ -122,51 +114,51 @@ function Comments() {
     },
   });
 
-  const handleVoteWrapper = (optionId: string) => {
-    if (availableHearts === 0) {
-      toast.error('No hearts left to give');
-      return;
-    }
-
-    setLocalOptionHearts((prevLocalOptionHearts) => prevLocalOptionHearts + 1);
-    setLocalUserVotes((prevLocalUserVotes) => handleLocalVote(optionId, prevLocalUserVotes));
-    setAvailableHearts({
-      questionId: option?.questionId ?? '',
-      hearts: handleAvailableHearts(availableHearts, 'vote'),
-    });
-  };
-
-  const handleUnVoteWrapper = (optionId: string) => {
-    if (availableHearts === INITIAL_HEARTS) {
-      toast.error('No votes to left to remove');
-      return;
-    }
-
-    setLocalOptionHearts((prevLocalOptionHearts) => Math.max(0, prevLocalOptionHearts - 1));
-    setLocalUserVotes((prevLocalUserVotes) => handleLocalUnVote(optionId, prevLocalUserVotes));
-    setAvailableHearts({
-      questionId: option?.questionId ?? '',
-      hearts: handleAvailableHearts(availableHearts, 'unVote'),
-    });
-  };
-
-  const { mutate: mutateVotes } = useMutation({
-    mutationFn: postVotes,
-    onSuccess: (body) => {
-      if (body?.errors?.length) {
-        toast.error(`Failed to save votes, ${body?.errors[0].message}`);
-      } else if (body?.data.length) {
-        queryClient.invalidateQueries({ queryKey: ['votes', cycleId] });
-        // this is to update the plural scores in each option
-        queryClient.invalidateQueries({ queryKey: ['cycles', cycleId] });
-        toast.success('Votes saved successfully!');
-      }
-    },
-  });
-
-  const handleSaveVoteWrapper = () => {
-    handleSaveVotes(userVotes, localUserVotes, mutateVotes);
-  };
+  // const handleVoteWrapper = (optionId: string) => {
+  //   if (availableHearts === 0) {
+  //     toast.error('No hearts left to give');
+  //     return;
+  //   }
+
+  //   setLocalOptionHearts((prevLocalOptionHearts) => prevLocalOptionHearts + 1);
+  //   setLocalUserVotes((prevLocalUserVotes) => handleLocalVote(optionId, prevLocalUserVotes));
+  //   setAvailableHearts({
+  //     questionId: option?.questionId ?? '',
+  //     hearts: handleAvailableHearts(availableHearts, 'vote'),
+  //   });
+  // };
+
+  // const handleUnVoteWrapper = (optionId: string) => {
+  //   if (availableHearts === INITIAL_HEARTS) {
+  //     toast.error('No votes to left to remove');
+  //     return;
+  //   }
+
+  //   setLocalOptionHearts((prevLocalOptionHearts) => Math.max(0, prevLocalOptionHearts - 1));
+  //   setLocalUserVotes((prevLocalUserVotes) => handleLocalUnVote(optionId, prevLocalUserVotes));
+  //   setAvailableHearts({
+  //     questionId: option?.questionId ?? '',
+  //     hearts: handleAvailableHearts(availableHearts, 'unVote'),
+  //   });
+  // };
+
+  // const { mutate: mutateVotes } = useMutation({
+  //   mutationFn: postVotes,
+  //   onSuccess: (body) => {
+  //     if (body?.errors?.length) {
+  //       toast.error(`Failed to save votes, ${body?.errors[0].message}`);
+  //     } else if (body?.data.length) {
+  //       queryClient.invalidateQueries({ queryKey: ['votes', cycleId] });
+  //       // this is to update the plural scores in each option
+  //       queryClient.invalidateQueries({ queryKey: ['cycles', cycleId] });
+  //       toast.success('Votes saved successfully!');
+  //     }
+  //   },
+  // });
+
+  // const handleSaveVoteWrapper = () => {
+  //   handleSaveVotes(userVotes, localUserVotes, mutateVotes);
+  // };
 
   const handlePostComment = () => {
     if (optionId && comment) {
@@ -183,7 +175,7 @@ function Comments() {
     <FlexColumn $gap="2rem">
       <BackButton />
       <FlexColumn>
-        <FlexRow style={{ maxWidth: '4rem' }}>
+        {/* <FlexRow style={{ maxWidth: '4rem' }}>
           <FlexColumn $gap="-4px" style={{ maxWidth: '1rem' }}>
             <IconButton
               $padding={0}
@@ -205,7 +197,7 @@ function Comments() {
             />
           </FlexColumn>
           <Subtitle>{localOptionHearts}</Subtitle>
-        </FlexRow>
+        </FlexRow> */}
         <Subtitle>{option?.optionTitle}</Subtitle>
         <Body>{option?.optionSubTitle}</Body>
         <Body>
@@ -218,7 +210,7 @@ function Comments() {
           )}
         </Body>
       </FlexColumn>
-      <Button onClick={handleSaveVoteWrapper}>Save votes</Button>
+      {/* <Button onClick={handleSaveVoteWrapper}>Save votes</Button> */}
       <Form>
         <Textarea
           label="Leave a comment:"
diff --git a/packages/berlin/src/pages/Cycle.tsx b/packages/berlin/src/pages/Cycle.tsx
index aff29e95..a625aa85 100644
--- a/packages/berlin/src/pages/Cycle.tsx
+++ b/packages/berlin/src/pages/Cycle.tsx
@@ -219,8 +219,8 @@ function Cycle() {
   };
 
   const sortByLead = (a: QuestionOption, b: QuestionOption, order: Order) => {
-    const leadA = (a.user.lastName || a.user.username).toUpperCase();
-    const leadB = (b.user.lastName || b.user.username).toUpperCase();
+    const leadA = (a.user?.lastName || a.user?.username || '').toUpperCase();
+    const leadB = (b.user?.lastName || b.user?.username || '').toUpperCase();
 
     if (leadA === leadB) {
       return sortId(a, b, order);
@@ -231,9 +231,9 @@ function Cycle() {
 
   const sortByAffiliation = (a: QuestionOption, b: QuestionOption, order: Order) => {
     const affiliationA =
-      a.user.groups.find((group) => group.groupCategory.required)?.name.toUpperCase() ?? '';
+      a.user?.groups?.find((group) => group.groupCategory?.required)?.name.toUpperCase() ?? '';
     const affiliationB =
-      b.user.groups.find((group) => group.groupCategory.required)?.name.toUpperCase() ?? '';
+      b.user?.groups?.find((group) => group.groupCategory?.required)?.name.toUpperCase() ?? '';
 
     if (affiliationA === affiliationB) {
       return sortId(a, b, order);
diff --git a/packages/berlin/src/pages/Landing.tsx b/packages/berlin/src/pages/Landing.tsx
index 4d73c30e..152a886b 100644
--- a/packages/berlin/src/pages/Landing.tsx
+++ b/packages/berlin/src/pages/Landing.tsx
@@ -19,7 +19,7 @@ function Landing() {
           intersections where breakthroughs tend to emerge.
         </Body>
         <Body>
-          Our first convening is <Bold>May 28 in Berlin</Bold>, where the community is tasked to
+          Our first convening was <Bold>May 28 in Berlin</Bold>, where the community was tasked to
           allocate 100,000 ARB in research grants.
         </Body>
         <Body>
diff --git a/packages/berlin/src/pages/Onboarding.tsx b/packages/berlin/src/pages/Onboarding.tsx
index 48e83d52..beb4f67e 100644
--- a/packages/berlin/src/pages/Onboarding.tsx
+++ b/packages/berlin/src/pages/Onboarding.tsx
@@ -56,7 +56,7 @@ function Onboarding() {
       <FlexColumn $gap="3rem">
         <Subtitle>{data[step].title}</Subtitle>
         <BodyContent content={data[step].body} />
-        <Dots dots={data.length} activeDotIndex={step} setStep={setStep} />
+        <Dots dots={data.length} activeDotIndex={step} handleClick={(i) => setStep(i)} />
         <FlexRow>
           <Button onClick={handleSkip} $color="secondary">
             Skip
diff --git a/packages/berlin/src/pages/Register.tsx b/packages/berlin/src/pages/Register.tsx
index 788a5bf5..95355277 100644
--- a/packages/berlin/src/pages/Register.tsx
+++ b/packages/berlin/src/pages/Register.tsx
@@ -35,53 +35,17 @@ import useUser from '../hooks/useUser';
 // Components
 import Button from '../components/button';
 import { FlexColumn } from '../components/containers/FlexColumn.styled';
+import { FlexRow } from '../components/containers/FlexRow.styled';
 import { Form } from '../components/containers/Form.styled';
+import Dots from '../components/dots';
 import { FormInput } from '../components/form-input';
 import Select from '../components/select';
 import Label from '../components/typography/Label';
 import { Subtitle } from '../components/typography/Subtitle.styled';
 import { SafeArea } from '../layout/Layout.styled';
 
-const sortRegistrationsByCreationDate = (registrations: GetRegistrationResponseType[]) => {
-  return [
-    ...registrations.sort((a, b) => {
-      return new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime();
-    }),
-  ];
-};
-
-const createRegistrationForms = ({
-  registrations,
-  usersToGroups,
-}: {
-  registrations: GetRegistrationsResponseType | undefined | null;
-  usersToGroups: GetUsersToGroupsResponse | undefined | null;
-}) => {
-  const sortedRegistrationsByCreationDate = sortRegistrationsByCreationDate(registrations || []);
-
-  const registrationForms: {
-    key: string | 'create';
-    registration?: GetRegistrationResponseType;
-    group?: GetUsersToGroupsResponse[number]['group'];
-    mode: 'edit' | 'create';
-  }[] = sortedRegistrationsByCreationDate.map((reg) => {
-    return {
-      key: reg.id || '',
-      registration: reg,
-      group: usersToGroups?.find((userToGroup) => userToGroup.group.id === reg.groupId)?.group,
-      mode: 'edit',
-    };
-  });
-
-  registrationForms.push({
-    key: 'create',
-    mode: 'create',
-  });
-
-  return registrationForms;
-};
-
 function Register() {
+  const [step, setStep] = useState<number | null>(null);
   const { user, isLoading } = useUser();
   const { eventId } = useParams();
   const [selectedRegistrationFormKey, setSelectedRegistrationFormKey] = useState<
@@ -118,6 +82,22 @@ function Register() {
     enabled: !!eventId,
   });
 
+  const defaultStep = useMemo(() => {
+    // check if the user is already in all required groups for the event
+    const requiredCategories = groupCategories?.filter((category) => category.required);
+    const userGroups = usersToGroups?.map((userToGroup) => userToGroup.group.groupCategoryId);
+
+    if (requiredCategories && userGroups) {
+      const userGroupCategories = requiredCategories.map((category) => category.id);
+
+      if (userGroupCategories.every((category) => userGroups.includes(category))) {
+        return 1;
+      }
+    }
+
+    return 0;
+  }, [groupCategories, usersToGroups]);
+
   const multipleRegistrationData = useQueries({
     queries:
       registrations?.map((registration) => ({
@@ -169,66 +149,127 @@ function Register() {
     return <Subtitle>Loading...</Subtitle>;
   }
 
+  const getRecentStep = (step: number | null, defaultStep: number) => {
+    if (step === null) {
+      return defaultStep;
+    }
+
+    return step;
+  };
+
   return (
     <SafeArea>
       <FlexColumn $gap="1.5rem">
-        {groupCategories
-          ?.filter((groupCategory) => groupCategory.required)
-          .map((groupCategory) => (
-            <SelectEventGroup
-              key={groupCategory.id}
-              groupCategory={groupCategory}
-              userToGroups={usersToGroups}
-              user={user}
-            />
-          ))}
-        <SelectRegistrationDropdown
-          onSelectedRegistrationFormKeyChange={setSelectedRegistrationFormKey}
-          registrations={registrations}
-          usersToGroups={usersToGroups}
-          selectedRegistrationFormKey={selectedRegistrationFormKey}
-          multipleRegistrationData={multipleRegistrationData}
-          registrationFields={registrationFields}
-        />
-        {createRegistrationForms({ registrations, usersToGroups }).map((form, idx) => {
-          return (
-            <RegisterForm
-              show={showRegistrationForm({
-                selectedRegistrationFormKey,
-                registrationId: form.registration?.id,
-              })}
+        {getRecentStep(step, defaultStep) === 0 &&
+          groupCategories
+            ?.filter((groupCategory) => groupCategory.required)
+            .map((groupCategory) => (
+              <SelectEventGroup
+                key={groupCategory.id}
+                groupCategory={groupCategory}
+                userToGroups={usersToGroups}
+                user={user}
+                afterSubmit={() => setStep(1)}
+              />
+            ))}
+        {getRecentStep(step, defaultStep) === 1 && (
+          <>
+            <SelectRegistrationDropdown
+              onSelectedRegistrationFormKeyChange={setSelectedRegistrationFormKey}
+              registrations={registrations}
               usersToGroups={usersToGroups}
-              userIsApproved={
-                registrations?.some((registration) => registration.status === 'APPROVED')
-                  ? true
-                  : false
-              }
-              registrationData={multipleRegistrationData[form.registration?.id || '']?.data}
-              key={idx}
-              user={user}
-              groupId={form.group?.id}
+              selectedRegistrationFormKey={selectedRegistrationFormKey}
+              multipleRegistrationData={multipleRegistrationData}
               registrationFields={registrationFields}
-              registrationId={form.registration?.id}
-              mode={form.mode}
-              isLoading={multipleRegistrationData[form.registration?.id || '']?.loading}
-              event={event}
-              onRegistrationFormCreate={onRegistrationFormCreate}
             />
-          );
-        })}
+            {createRegistrationForms({ registrations, usersToGroups }).map((form, idx) => {
+              return (
+                <RegisterForm
+                  show={showRegistrationForm({
+                    selectedRegistrationFormKey,
+                    registrationId: form.registration?.id,
+                  })}
+                  usersToGroups={usersToGroups}
+                  registrationData={multipleRegistrationData[form.registration?.id || '']?.data}
+                  key={idx}
+                  user={user}
+                  groupId={form.group?.id}
+                  registrationFields={registrationFields}
+                  registrationId={form.registration?.id}
+                  mode={form.mode}
+                  isLoading={multipleRegistrationData[form.registration?.id || '']?.loading}
+                  event={event}
+                  onRegistrationFormCreate={onRegistrationFormCreate}
+                />
+              );
+            })}
+          </>
+        )}
+        <Dots
+          dots={2}
+          activeDotIndex={getRecentStep(step, defaultStep)}
+          handleClick={(i) => {
+            // the user is not allowed to go out of the first step
+            if (defaultStep == 0) {
+              return;
+            }
+
+            setStep(i);
+          }}
+        />
       </FlexColumn>
     </SafeArea>
   );
 }
+const sortRegistrationsByCreationDate = (registrations: GetRegistrationResponseType[]) => {
+  return [
+    ...registrations.sort((a, b) => {
+      return new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime();
+    }),
+  ];
+};
+
+const createRegistrationForms = ({
+  registrations,
+  usersToGroups,
+}: {
+  registrations: GetRegistrationsResponseType | undefined | null;
+  usersToGroups: GetUsersToGroupsResponse | undefined | null;
+}) => {
+  const sortedRegistrationsByCreationDate = sortRegistrationsByCreationDate(registrations || []);
+
+  const registrationForms: {
+    key: string | 'create';
+    registration?: GetRegistrationResponseType;
+    group?: GetUsersToGroupsResponse[number]['group'];
+    mode: 'edit' | 'create';
+  }[] = sortedRegistrationsByCreationDate.map((reg) => {
+    return {
+      key: reg.id || '',
+      registration: reg,
+      group: usersToGroups?.find((userToGroup) => userToGroup.group.id === reg.groupId)?.group,
+      mode: 'edit',
+    };
+  });
+
+  registrationForms.push({
+    key: 'create',
+    mode: 'create',
+  });
+
+  return registrationForms;
+};
 
 const SelectEventGroup = ({
   groupCategory,
   userToGroups,
   user,
+  afterSubmit,
 }: {
   userToGroups: GetUsersToGroupsResponse | null | undefined;
   groupCategory: GetGroupCategoriesResponse[number] | null | undefined;
   user: GetUserResponse | null | undefined;
+  afterSubmit?: () => void;
 }) => {
   // fetch all the groups in the category
   // show a select with all the groups
@@ -249,6 +290,7 @@ const SelectEventGroup = ({
       }
       queryClient.invalidateQueries({ queryKey: ['user', user?.id, 'users-to-groups'] });
       toast.success(`Joined group successfully!`);
+      afterSubmit?.();
     },
     onError: () => {
       toast.error('Something went wrong.');
@@ -269,6 +311,7 @@ const SelectEventGroup = ({
 
       queryClient.invalidateQueries({ queryKey: ['user', user?.id, 'users-to-groups'] });
       toast.success(`Updated group successfully!`);
+      afterSubmit?.();
     },
     onError: () => {
       toast.error('Something went wrong.');
@@ -302,12 +345,14 @@ const SelectEventGroup = ({
         placeholder="Select a Group"
         onChange={setNewGroup}
       />
-      <Button
-        disabled={!newGroup || (userGroup && userGroup.group.id === newGroup)}
-        onClick={onSubmit}
-      >
-        Save
-      </Button>
+      <FlexRow>
+        <Button
+          disabled={!newGroup || (userGroup && userGroup.group.id === newGroup)}
+          onClick={onSubmit}
+        >
+          Save
+        </Button>
+      </FlexRow>
     </FlexColumn>
   );
 };
@@ -479,7 +524,6 @@ const filterRegistrationFields = (
 
 function RegisterForm(props: {
   user: GetUserResponse | null | undefined;
-  userIsApproved: boolean;
   usersToGroups: GetUsersToGroupsResponse | null | undefined;
   registrationFields: GetRegistrationFieldsResponse | null | undefined;
   registrationId: string | null | undefined;
@@ -493,12 +537,12 @@ function RegisterForm(props: {
 }) {
   const navigate = useNavigate();
   const queryClient = useQueryClient();
-  const [selectedGroupId, setSelectedGroupId] = useState<string>('');
-  const prevSelectGroupId = props.groupId ?? 'none';
 
   // i want to differentiate between when a group is selected and it is not
   // so i can show the correct registration fields
   // i will use the selectedGroupId to do this
+  const [selectedGroupId, setSelectedGroupId] = useState<string>('');
+  const prevSelectGroupId = props.groupId ?? 'none';
 
   const form = useForm({
     defaultValues: useMemo(
@@ -530,10 +574,12 @@ function RegisterForm(props: {
     return sortedFields;
   }, [props.registrationFields, selectedGroupId, prevSelectGroupId]);
 
-  const redirectToHoldingPage = (isApproved: boolean) => {
+  const redirectToNextPage = (isApproved: boolean) => {
     if (!isApproved) {
       navigate(`/events/${props.event?.id}/holding`);
     }
+
+    navigate(`/events/${props.event?.id}/cycles`);
   };
 
   const { mutate: mutateRegistrationData, isPending } = useMutation({
@@ -548,9 +594,15 @@ function RegisterForm(props: {
           queryKey: ['registrations', body.id, 'registration-data'],
         });
 
+        // invalidate user registrations, this is for the 1 event use case
+        // where the authentication is because you are approved to the event
+        await queryClient.invalidateQueries({
+          queryKey: [props.user?.id, 'registrations'],
+        });
+
         props.onRegistrationFormCreate?.(body.id);
 
-        redirectToHoldingPage(props.userIsApproved);
+        redirectToNextPage(body.status === 'APPROVED');
       } else {
         toast.error('Failed to save registration, please try again');
       }
@@ -574,7 +626,7 @@ function RegisterForm(props: {
           queryKey: ['registrations', props.registrationId, 'registration-data'],
         });
 
-        redirectToHoldingPage(props.userIsApproved);
+        redirectToNextPage(body.status === 'APPROVED');
       } else {
         toast.error('Failed to update registration, please try again');
       }
@@ -682,7 +734,7 @@ function RegisterForm(props: {
             type={regField.type.toLocaleUpperCase()}
             options={regField.registrationFieldOptions?.map((option) => ({
               name: option.value,
-              value: option.id,
+              value: option.value,
             }))}
           />
         ))}
diff --git a/packages/berlin/src/pages/Results.tsx b/packages/berlin/src/pages/Results.tsx
index 7b15b4f5..3faa5245 100644
--- a/packages/berlin/src/pages/Results.tsx
+++ b/packages/berlin/src/pages/Results.tsx
@@ -80,6 +80,8 @@ function Results() {
             key={option.id}
             $expanded={expandedIndex === index}
             option={option}
+            cycleId={cycleId}
+            eventId={eventId}
             onClick={() => setExpandedIndex(expandedIndex === index ? null : index)}
           />
         ))}

From 48f1f24711c04f0824799c0edfb0bbce9b9bee14 Mon Sep 17 00:00:00 2001
From: Camilo Vega <59750365+camilovegag@users.noreply.github.com>
Date: Fri, 19 Jul 2024 04:57:34 -0500
Subject: [PATCH 04/15] 669 new header (#670)

* Add tailwind plugin

* Install prettier tailwind plugin

* Create new header (transitional component)

* Update some css variable styles

* Add shadcn component

* Work in progress

* Current changes

* Modify component

* Fix formatting

* Add font family & fix shadcn component

* Finish new header (pending mobile)

* Comment old header at layout

* Fix formatting

* Improvements to submenu

* Match styles

* Add mobile menu

* Remove old header

* Update import
---
 .prettierrc.cjs                               |   3 +-
 package.json                                  |   9 +-
 .../src/_components/ui/navigation-menu.tsx    | 117 ++++++++
 .../src/components/header/Header.styled.tsx   | 170 -----------
 .../berlin/src/components/header/Header.tsx   | 276 +++++++++++-------
 packages/berlin/src/components/icon/Icon.tsx  |   7 +-
 .../components/theme-toggler/ThemeToggler.tsx |  17 ++
 .../src/components/theme-toggler/index.ts     |   1 +
 .../zupass-button/ZupassLoginButton.tsx       |   7 +-
 packages/berlin/src/global.styled.tsx         |   2 +
 packages/berlin/src/index.css                 |   8 +-
 packages/berlin/src/layout/Layout.tsx         |   2 +-
 packages/berlin/tailwind.config.js            |   3 +
 packages/ui/src/components/ui/command.tsx     |  14 +-
 packages/ui/src/components/ui/dialog.tsx      |   8 +-
 packages/ui/src/components/ui/popover.tsx     |   2 +-
 pnpm-lock.yaml                                |  59 ++++
 17 files changed, 403 insertions(+), 302 deletions(-)
 create mode 100644 packages/berlin/src/_components/ui/navigation-menu.tsx
 delete mode 100644 packages/berlin/src/components/header/Header.styled.tsx
 create mode 100644 packages/berlin/src/components/theme-toggler/ThemeToggler.tsx
 create mode 100644 packages/berlin/src/components/theme-toggler/index.ts

diff --git a/.prettierrc.cjs b/.prettierrc.cjs
index c920e99b..7b8b2d7f 100644
--- a/.prettierrc.cjs
+++ b/.prettierrc.cjs
@@ -3,4 +3,5 @@ module.exports = {
   singleQuote: true,
   quoteProps: 'consistent',
   printWidth: 100,
-};
\ No newline at end of file
+  plugins: ['prettier-plugin-tailwindcss'],
+};
diff --git a/package.json b/package.json
index fede6c6a..98cb06f6 100644
--- a/package.json
+++ b/package.json
@@ -45,18 +45,19 @@
     "@hookform/devtools": "^4.3.1",
     "@tanstack/eslint-plugin-query": "^5.18.0",
     "@types/node": "^20.12.4",
-    "@types/react": "^18.2.37",
     "@types/react-dom": "^18.2.15",
+    "@types/react": "^18.2.37",
     "@typescript-eslint/eslint-plugin": "^6.19.0",
     "@typescript-eslint/parser": "^6.19.0",
     "@vitejs/plugin-react": "^4.2.0",
-    "eslint": "^8.56.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-react-refresh": "^0.4.4",
+    "eslint": "^8.56.0",
+    "prettier-plugin-tailwindcss": "^0.6.5",
     "prettier": "^3.1.1",
     "typescript": "^5.5.2",
-    "vite": "^5.0.0",
-    "vite-plugin-node-polyfills": "^0.17.0"
+    "vite-plugin-node-polyfills": "^0.17.0",
+    "vite": "^5.0.0"
   }
 }
diff --git a/packages/berlin/src/_components/ui/navigation-menu.tsx b/packages/berlin/src/_components/ui/navigation-menu.tsx
new file mode 100644
index 00000000..18024242
--- /dev/null
+++ b/packages/berlin/src/_components/ui/navigation-menu.tsx
@@ -0,0 +1,117 @@
+import * as React from 'react';
+import * as NavigationMenuPrimitive from '@radix-ui/react-navigation-menu';
+import { cva } from 'class-variance-authority';
+
+import { cn } from '@/lib/utils';
+
+const NavigationMenu = React.forwardRef<
+  React.ElementRef<typeof NavigationMenuPrimitive.Root>,
+  React.ComponentPropsWithoutRef<typeof NavigationMenuPrimitive.Root>
+>(({ className, children, ...props }, ref) => (
+  <NavigationMenuPrimitive.Root
+    ref={ref}
+    className={cn('relative z-10 flex max-w-max flex-1 items-center justify-center', className)}
+    {...props}
+  >
+    {children}
+  </NavigationMenuPrimitive.Root>
+));
+NavigationMenu.displayName = NavigationMenuPrimitive.Root.displayName;
+
+const NavigationMenuList = React.forwardRef<
+  React.ElementRef<typeof NavigationMenuPrimitive.List>,
+  React.ComponentPropsWithoutRef<typeof NavigationMenuPrimitive.List>
+>(({ className, ...props }, ref) => (
+  <NavigationMenuPrimitive.List
+    ref={ref}
+    className={cn('group flex flex-1 list-none items-center justify-center space-x-1', className)}
+    {...props}
+  />
+));
+NavigationMenuList.displayName = NavigationMenuPrimitive.List.displayName;
+
+const NavigationMenuItem = NavigationMenuPrimitive.Item;
+
+const navigationMenuTriggerStyle = cva();
+// "group inline-flex h-9 w-max items-center justify-center rounded-md bg-background px-4 py-2 text-sm font-medium transition-colors hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground focus:outline-none disabled:pointer-events-none disabled:opacity-50 data-[active]:bg-accent/50 data-[state=open]:bg-accent/50"
+
+const NavigationMenuTrigger = React.forwardRef<
+  React.ElementRef<typeof NavigationMenuPrimitive.Trigger>,
+  React.ComponentPropsWithoutRef<typeof NavigationMenuPrimitive.Trigger>
+>(({ className, children, ...props }, ref) => (
+  <NavigationMenuPrimitive.Trigger
+    ref={ref}
+    className={cn(navigationMenuTriggerStyle(), 'group', className)}
+    {...props}
+  >
+    {children}
+  </NavigationMenuPrimitive.Trigger>
+));
+NavigationMenuTrigger.displayName = NavigationMenuPrimitive.Trigger.displayName;
+
+const NavigationMenuContent = React.forwardRef<
+  React.ElementRef<typeof NavigationMenuPrimitive.Content>,
+  React.ComponentPropsWithoutRef<typeof NavigationMenuPrimitive.Content>
+>(({ className, ...props }, ref) => (
+  <NavigationMenuPrimitive.Content
+    ref={ref}
+    className={cn(
+      'absolute right-0',
+      'bg-primary absolute w-fit',
+      'data-[motion^=from-]:animate-in data-[motion^=to-]:animate-out data-[motion^=from-]:fade-in data-[motion^=to-]:fade-out data-[motion=from-end]:slide-in-from-right-52 data-[motion=from-start]:slide-in-from-left-52 data-[motion=to-end]:slide-out-to-right-52 data-[motion=to-start]:slide-out-to-left-52',
+      'origin-top-center bg-primary text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-90 absolute mt-4 h-[var(--radix-navigation-menu-viewport-height)] w-fit overflow-hidden rounded-md shadow-lg',
+
+      className,
+    )}
+    {...props}
+  />
+));
+NavigationMenuContent.displayName = NavigationMenuPrimitive.Content.displayName;
+
+const NavigationMenuLink = NavigationMenuPrimitive.Link;
+
+const NavigationMenuViewport = React.forwardRef<
+  React.ElementRef<typeof NavigationMenuPrimitive.Viewport>,
+  React.ComponentPropsWithoutRef<typeof NavigationMenuPrimitive.Viewport>
+>(({ className, ...props }, ref) => (
+  <div className={cn('absolute left-0 top-full flex justify-center')}>
+    <NavigationMenuPrimitive.Viewport
+      className={cn(
+        'origin-top-center bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-90 relative mt-1.5 h-[var(--radix-navigation-menu-viewport-height)] w-full overflow-hidden rounded-md border shadow md:w-[var(--radix-navigation-menu-viewport-width)]',
+        className,
+      )}
+      ref={ref}
+      {...props}
+    />
+  </div>
+));
+NavigationMenuViewport.displayName = NavigationMenuPrimitive.Viewport.displayName;
+
+const NavigationMenuIndicator = React.forwardRef<
+  React.ElementRef<typeof NavigationMenuPrimitive.Indicator>,
+  React.ComponentPropsWithoutRef<typeof NavigationMenuPrimitive.Indicator>
+>(({ className, ...props }, ref) => (
+  <NavigationMenuPrimitive.Indicator
+    ref={ref}
+    className={cn(
+      'data-[state=visible]:animate-in data-[state=hidden]:animate-out data-[state=hidden]:fade-out data-[state=visible]:fade-in top-full z-[1] flex h-1.5 items-end justify-center overflow-hidden',
+      className,
+    )}
+    {...props}
+  >
+    <div className="bg-border relative top-[60%] h-2 w-2 rotate-45 rounded-tl-sm shadow-md" />
+  </NavigationMenuPrimitive.Indicator>
+));
+NavigationMenuIndicator.displayName = NavigationMenuPrimitive.Indicator.displayName;
+
+export {
+  navigationMenuTriggerStyle,
+  NavigationMenu,
+  NavigationMenuList,
+  NavigationMenuItem,
+  NavigationMenuContent,
+  NavigationMenuTrigger,
+  NavigationMenuLink,
+  NavigationMenuIndicator,
+  NavigationMenuViewport,
+};
diff --git a/packages/berlin/src/components/header/Header.styled.tsx b/packages/berlin/src/components/header/Header.styled.tsx
deleted file mode 100644
index 3f61b9dd..00000000
--- a/packages/berlin/src/components/header/Header.styled.tsx
+++ /dev/null
@@ -1,170 +0,0 @@
-import styled, { keyframes } from 'styled-components';
-import Button from '../button/Button';
-
-export const StyledHeader = styled.header`
-  align-items: center;
-  display: flex;
-  justify-content: center;
-  min-height: 10rem;
-  padding-block: 2rem;
-`;
-
-export const HeaderContainer = styled.div`
-  align-items: center;
-  background-color: var(--color-white);
-  display: flex;
-  gap: 1rem;
-  justify-content: space-between;
-  margin-inline: auto;
-  width: min(90%, 1080px);
-`;
-
-export const LogoContainer = styled.div`
-  align-items: center;
-  cursor: pointer;
-  display: flex;
-  gap: 0.75rem;
-`;
-
-export const LogoImage = styled.img`
-  height: 3.5rem;
-  max-width: 3.5rem;
-
-  @media (min-width: 430px) {
-    height: 5rem;
-    max-width: 5rem;
-  }
-`;
-
-export const LogoTextContainer = styled.div`
-  display: flex;
-  flex-direction: column;
-  gap: 0.5rem;
-`;
-
-export const LogoTitle = styled.h1`
-  font-size: 1.5rem;
-  line-height: 1.65rem;
-
-  @media (min-width: 430px) {
-    display: block;
-    font-family: var(--font-family-title);
-    font-size: 1.75rem;
-    font-weight: 600;
-    line-height: 1.75rem;
-  }
-
-  @media (min-width: 600px) {
-    max-width: none;
-  }
-`;
-
-export const LogoSubtitle = styled.h2`
-  display: block;
-  font-family: var(--font-family-body);
-  font-size: 0.65rem;
-  font-style: italic;
-  font-weight: 600;
-  line-height: 0.75rem;
-  max-width: 360px;
-  @media (min-width: 600px) {
-    font-size: 1rem;
-  }
-`;
-
-export const NavContainer = styled.nav`
-  align-items: center;
-  display: flex;
-`;
-
-export const NavButtons = styled.ul`
-  display: flex;
-  gap: 0.75rem;
-  list-style: none;
-`;
-
-export const DesktopButtons = styled.div`
-  display: none;
-  @media (min-width: 1080px) {
-    display: flex;
-    gap: 0.75rem;
-  }
-`;
-
-export const MobileButtons = styled.div`
-  display: flex;
-  flex-direction: column;
-  gap: 1.5rem;
-  height: 100%;
-  text-align: center;
-  @media (min-width: 1080px) {
-    display: none;
-  }
-`;
-
-export const ThemeButton = styled(Button)`
-  img {
-    min-width: 20px;
-  }
-`;
-
-export const MenuButton = styled.li`
-  align-items: center;
-  cursor: pointer;
-  display: flex;
-  flex-direction: column;
-  height: 2.25rem;
-  justify-content: center;
-  width: 2.25rem;
-
-  @media (min-width: 1080px) {
-    display: none;
-  }
-`;
-
-export const Bar = styled.div<{ $isOpen: boolean }>`
-  background-color: var(--color-black);
-  border-radius: 8px;
-  height: 3px;
-  margin: 2px 0;
-  transition: 0.4s;
-  width: 27px;
-
-  &:first-child {
-    transform: ${({ $isOpen }) => ($isOpen ? 'rotate(-45deg) translateY(10px)' : '')};
-  }
-
-  &:nth-child(2) {
-    opacity: ${({ $isOpen }) => ($isOpen ? '0' : '1')};
-    transition: 0.2s;
-  }
-
-  &:nth-child(3) {
-    transform: ${({ $isOpen }) => ($isOpen ? 'rotate(45deg) translateY(-10px)' : '')};
-  }
-`;
-
-const fadeIn = keyframes`
-  from {
-    opacity: 0;
-  }
-  to {
-    opacity: 1;
-  }
-`;
-
-export const BurgerMenuContainer = styled.nav<{ $$isOpen: boolean }>`
-  align-items: center;
-  background-color: var(--color-white);
-  bottom: 0;
-  display: flex;
-  height: calc(100% - 160px);
-  justify-content: center;
-  left: 0;
-  position: fixed;
-  width: 100%;
-  z-index: 999;
-
-  display: ${(props) => (props.$$isOpen ? 'flex' : 'none')};
-  animation: ${fadeIn} 0.3s ease-out;
-`;
diff --git a/packages/berlin/src/components/header/Header.tsx b/packages/berlin/src/components/header/Header.tsx
index de8a5313..3fee0c8a 100644
--- a/packages/berlin/src/components/header/Header.tsx
+++ b/packages/berlin/src/components/header/Header.tsx
@@ -1,53 +1,156 @@
-// React and third-party libraries
-import { useMutation, useQueryClient } from '@tanstack/react-query';
-import { useState } from 'react';
 import {
-  // useLocation,
-  useNavigate,
-} from 'react-router-dom';
-import { SunMoon, User } from 'lucide-react';
+  NavigationMenu,
+  NavigationMenuContent,
+  NavigationMenuItem,
+  NavigationMenuLink,
+  NavigationMenuList,
+  NavigationMenuTrigger,
+} from '@/_components/ui/navigation-menu';
+import useUser from '@/hooks/useUser';
+import { useAppStore } from '@/store';
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { fetchAlerts, fetchEvents, fetchUserRegistrations, GetUserResponse, logout } from 'api';
+import { Menu, User } from 'lucide-react';
+import { useMemo, useState } from 'react';
+import { NavLink } from 'react-router-dom';
+import Icon from '../icon';
+import ThemeToggler from '../theme-toggler';
+import { useNavigate } from 'react-router-dom';
+import ZupassLoginButton from '../zupass-button';
 
-// Store
-import { useAppStore } from '../../store';
+export default function NewHeader() {
+  const theme = useAppStore((state) => state.theme);
+  const { user } = useUser();
+  const [isMenuOpen, setIsMenuOpen] = useState(false);
 
-// Data
-import header from '../../data/header';
+  return (
+    <header className="bg-primary border-secondary border-b text-sm">
+      {isMenuOpen && (
+        <NavigationMenu
+          className="font-raleway bg-primary absolute z-20 mt-[65px] flex h-full flex-col items-center justify-center uppercase"
+          onClick={() => setIsMenuOpen(!isMenuOpen)}
+        >
+          <NavigationMenuList className="w-screen flex-col gap-5">
+            {user && <HeaderLinks user={user} />}
+            <UserMenuLinks />
+          </NavigationMenuList>
+        </NavigationMenu>
+      )}
+      <section className="mx-auto flex min-h-16 w-[min(90%,1080px)] items-center justify-between">
+        <div className="flex items-center gap-2">
+          <img src={`/logos/lexicon-${theme}.svg`} alt="Lexicon Logo" height={32} width={32} />
+          <h1 className="text-2xl font-semibold leading-6">Lexicon</h1>
+        </div>
+        <NavigationMenu className="font-raleway uppercase">
+          <NavigationMenuList className="gap-3">
+            {user ? (
+              <>
+                <div className="hidden gap-3 md:flex">
+                  <HeaderLinks user={user} />
+                  <UserMenu />
+                </div>
+                <div className="md:hidden">
+                  <Icon onClick={() => setIsMenuOpen(!isMenuOpen)}>
+                    <Menu />
+                  </Icon>
+                </div>
+              </>
+            ) : (
+              <ZupassLoginButton>Login</ZupassLoginButton>
+            )}
+            <NavigationMenuItem>
+              <NavigationMenuLink>
+                <ThemeToggler />
+              </NavigationMenuLink>
+            </NavigationMenuItem>
+          </NavigationMenuList>
+        </NavigationMenu>
+      </section>
+    </header>
+  );
+}
 
-// API
-import { logout } from 'api';
+const HeaderLinks = ({ user }: { user: GetUserResponse }) => {
+  const { data: events } = useQuery({
+    queryKey: ['events'],
+    queryFn: fetchEvents,
+    enabled: !!user,
+  });
 
-// Hooks
-import useUser from '../../hooks/useUser';
+  const { data: registrationsData } = useQuery({
+    queryKey: [user?.id, 'registrations'],
+    queryFn: () => fetchUserRegistrations(user?.id ?? ''),
+    enabled: !!user,
+  });
 
-// Components
-import Button from '../button';
-import NavButton from '../nav-button';
-import ZupassLoginButton from '../zupass-button/ZupassLoginButton';
+  const { data: alerts } = useQuery({
+    queryKey: ['alerts'],
+    queryFn: () => fetchAlerts(),
+    enabled: !!user,
+    refetchInterval: 10000,
+  });
 
-// Styled components
-import {
-  Bar,
-  BurgerMenuContainer,
-  DesktopButtons,
-  HeaderContainer,
-  LogoContainer,
-  LogoSubtitle,
-  LogoTextContainer,
-  LogoTitle,
-  MenuButton,
-  MobileButtons,
-  NavButtons,
-  NavContainer,
-  StyledHeader,
-} from './Header.styled';
+  const links = useMemo(() => {
+    const baseLinks = [
+      {
+        title: 'My Proposals',
+        link: events ? `/events/${events?.[0].id}/register` : '',
+      },
+      {
+        title: 'Agenda',
+        link: events ? `/events/${events?.[0].id}/cycles` : '',
+      },
+    ];
+
+    if (
+      registrationsData?.some((registration) => registration.status === 'APPROVED') &&
+      alerts &&
+      alerts.length > 0
+    ) {
+      const alertsLinks = alerts.map((alert) => ({
+        title: alert.title,
+        link: alert.link || '',
+      }));
+      return [...baseLinks, ...alertsLinks];
+    }
+
+    return baseLinks;
+  }, [events, registrationsData, alerts]);
+
+  return links.map(({ title, link }) => (
+    <NavigationMenuItem key={title}>
+      <NavigationMenuLink asChild>
+        <NavLink
+          to={link}
+          className="border-secondary aria-[current=page]:border-b-2 aria-[current=page]:pb-1"
+        >
+          {title}
+        </NavLink>
+      </NavigationMenuLink>
+    </NavigationMenuItem>
+  ));
+};
+
+const UserMenu = () => {
+  return (
+    <NavigationMenuItem className="relative">
+      <NavigationMenuTrigger className="flex">
+        <Icon>
+          <User />
+        </Icon>
+      </NavigationMenuTrigger>
+      <NavigationMenuContent className="flex flex-col gap-4 p-4">
+        <UserMenuLinks />
+      </NavigationMenuContent>
+    </NavigationMenuItem>
+  );
+};
 
-function Header() {
+const UserMenuLinks = () => {
   const queryClient = useQueryClient();
-  const { user } = useUser();
-  const theme = useAppStore((state) => state.theme);
-  const toggleTheme = useAppStore((state) => state.toggleTheme);
-  const navigate = useNavigate();
   const resetState = useAppStore((state) => state.reset);
+  const navigate = useNavigate();
+
   const { mutate: mutateLogout } = useMutation({
     mutationFn: logout,
     onSuccess: async () => {
@@ -57,71 +160,30 @@ function Header() {
       navigate('/');
     },
   });
+  const links = useMemo(() => {
+    return [
+      {
+        title: 'Account',
+        link: '/account',
+      },
+      {
+        title: 'Log out',
+        onClick: () => mutateLogout(),
+      },
+    ];
+  }, [mutateLogout]);
 
-  const [isBurgerMenuOpen, setIsBurgerMenuOpen] = useState(false);
-
-  return (
-    <StyledHeader>
-      <HeaderContainer>
-        <LogoContainer onClick={() => navigate('/')}>
-          <img src={`/logos/lexicon-${theme}.svg`} alt="Lexicon Logo" height={64} width={64} />
-          <LogoTextContainer>
-            <LogoTitle>{header.title}</LogoTitle>
-            <LogoSubtitle>{header.subtitle}</LogoSubtitle>
-          </LogoTextContainer>
-        </LogoContainer>
-        <NavContainer>
-          <NavButtons>
-            <DesktopButtons>
-              {user ? (
-                <>
-                  <NavButton to={`/events`} $color="secondary">
-                    Events
-                  </NavButton>
-                  <Button onClick={() => mutateLogout()}>Log out</Button>
-                  <Button onClick={() => navigate('/account')}>
-                    <User />
-                  </Button>
-                </>
-              ) : (
-                <ZupassLoginButton>Login with Zupass</ZupassLoginButton>
-              )}
-            </DesktopButtons>
-            <MenuButton onClick={() => setIsBurgerMenuOpen(!isBurgerMenuOpen)}>
-              <Bar $isOpen={isBurgerMenuOpen} />
-              <Bar $isOpen={isBurgerMenuOpen} />
-              <Bar $isOpen={isBurgerMenuOpen} />
-            </MenuButton>
-            <li>
-              <Button onClick={toggleTheme}>
-                <SunMoon />
-              </Button>
-            </li>
-          </NavButtons>
-        </NavContainer>
-        <BurgerMenuContainer $$isOpen={isBurgerMenuOpen} onClick={() => setIsBurgerMenuOpen(false)}>
-          <NavButtons>
-            <MobileButtons>
-              {user ? (
-                <>
-                  <NavButton to={`/events`} $color="secondary">
-                    Events
-                  </NavButton>
-
-                  <NavButton to="/account" $color="secondary">
-                    Account
-                  </NavButton>
-                  <Button onClick={() => mutateLogout()}>Log out</Button>
-                </>
-              ) : (
-                <ZupassLoginButton>Login with Zupass</ZupassLoginButton>
-              )}
-            </MobileButtons>
-          </NavButtons>
-        </BurgerMenuContainer>
-      </HeaderContainer>
-    </StyledHeader>
-  );
-}
-
-export default Header;
+  return links.map(({ title, link, onClick }) => (
+    <NavigationMenuItem key={title}>
+      <NavigationMenuLink asChild>
+        <NavLink
+          to={link || ''}
+          onClick={onClick}
+          className="border-secondary aria-[current=page]:border-b-2 aria-[current=page]:pb-1"
+        >
+          {title}
+        </NavLink>
+      </NavigationMenuLink>
+    </NavigationMenuItem>
+  ));
+};
diff --git a/packages/berlin/src/components/icon/Icon.tsx b/packages/berlin/src/components/icon/Icon.tsx
index ba3d553c..5c21c6d1 100644
--- a/packages/berlin/src/components/icon/Icon.tsx
+++ b/packages/berlin/src/components/icon/Icon.tsx
@@ -3,10 +3,13 @@ import { StyledIcon } from './Icon.styled';
 
 type IconProps = {
   children: React.ReactNode;
+  onClick?: () => void;
 };
 
-const Icon = forwardRef<HTMLDivElement, IconProps>(({ children }, ref) => (
-  <StyledIcon ref={ref}>{children}</StyledIcon>
+const Icon = forwardRef<HTMLDivElement, IconProps>(({ children, onClick }, ref) => (
+  <StyledIcon ref={ref} onClick={onClick}>
+    {children}
+  </StyledIcon>
 ));
 
 export default Icon;
diff --git a/packages/berlin/src/components/theme-toggler/ThemeToggler.tsx b/packages/berlin/src/components/theme-toggler/ThemeToggler.tsx
new file mode 100644
index 00000000..55036590
--- /dev/null
+++ b/packages/berlin/src/components/theme-toggler/ThemeToggler.tsx
@@ -0,0 +1,17 @@
+import { useEffect } from 'react';
+import { useAppStore } from '@/store';
+import Icon from '../icon';
+import { Moon, Sun } from 'lucide-react';
+
+export default function ThemeToggler() {
+  const theme = useAppStore((state) => state.theme);
+  const toggleTheme = useAppStore((state) => state.toggleTheme);
+
+  useEffect(() => {
+    const root = window.document.documentElement;
+    root.classList.remove('light', 'dark');
+    root.classList.add(theme);
+  }, [theme]);
+
+  return <Icon onClick={toggleTheme}>{theme === 'dark' ? <Sun /> : <Moon />}</Icon>;
+}
diff --git a/packages/berlin/src/components/theme-toggler/index.ts b/packages/berlin/src/components/theme-toggler/index.ts
new file mode 100644
index 00000000..a9f59a23
--- /dev/null
+++ b/packages/berlin/src/components/theme-toggler/index.ts
@@ -0,0 +1 @@
+export { default } from './ThemeToggler';
diff --git a/packages/berlin/src/components/zupass-button/ZupassLoginButton.tsx b/packages/berlin/src/components/zupass-button/ZupassLoginButton.tsx
index 642240a5..488e422d 100644
--- a/packages/berlin/src/components/zupass-button/ZupassLoginButton.tsx
+++ b/packages/berlin/src/components/zupass-button/ZupassLoginButton.tsx
@@ -80,7 +80,12 @@ function ZupassLoginButton({ children, $variant, ...props }: ZupassLoginButtonPr
 
   return (
     <>
-      <Button onClick={handleLoginClick} {...props} $variant={$variant}>
+      <Button
+        onClick={handleLoginClick}
+        {...props}
+        $variant={$variant}
+        style={{ fontSize: '14px', lineHeight: '14px', borderRadius: 4 }}
+      >
         {children}
       </Button>
     </>
diff --git a/packages/berlin/src/global.styled.tsx b/packages/berlin/src/global.styled.tsx
index dc7a8263..c9b40c50 100644
--- a/packages/berlin/src/global.styled.tsx
+++ b/packages/berlin/src/global.styled.tsx
@@ -11,6 +11,8 @@ export const GlobalStyle = createGlobalStyle`
 }
 
 :root {
+  --color-primary: '#222';
+  --color-secondary: '#fff';
   --color-white: ${(props) => props.theme.backgroundColor};
   --color-black: ${(props) => props.theme.textColor};
   --color-gray:  ${(props) => props.theme.gray};
diff --git a/packages/berlin/src/index.css b/packages/berlin/src/index.css
index 8abdb15c..c6b2a343 100644
--- a/packages/berlin/src/index.css
+++ b/packages/berlin/src/index.css
@@ -13,10 +13,10 @@
     --popover: 0 0% 100%;
     --popover-foreground: 222.2 84% 4.9%;
 
-    --primary: 222.2 47.4% 11.2%;
+    --primary: 0 0% 100%;
     --primary-foreground: 210 40% 98%;
 
-    --secondary: 210 40% 96.1%;
+    --secondary: 0 0% 13%;
     --secondary-foreground: 222.2 47.4% 11.2%;
 
     --muted: 210 40% 96.1%;
@@ -45,10 +45,10 @@
     --popover: 222.2 84% 4.9%;
     --popover-foreground: 210 40% 98%;
 
-    --primary: 210 40% 98%;
+    --primary: 0 0% 13%;
     --primary-foreground: 222.2 47.4% 11.2%;
 
-    --secondary: 217.2 32.6% 17.5%;
+    --secondary: 0 0% 100%;
     --secondary-foreground: 210 40% 98%;
 
     --muted: 217.2 32.6% 17.5%;
diff --git a/packages/berlin/src/layout/Layout.tsx b/packages/berlin/src/layout/Layout.tsx
index 9824e5e4..c4f86618 100644
--- a/packages/berlin/src/layout/Layout.tsx
+++ b/packages/berlin/src/layout/Layout.tsx
@@ -6,8 +6,8 @@ import { Outlet } from 'react-router-dom';
 import { Main } from './Layout.styled';
 
 // Components
-import Header from '../components/header';
 import Footer from '../components/footer';
+import Header from '@/components/header';
 
 function Layout() {
   return (
diff --git a/packages/berlin/tailwind.config.js b/packages/berlin/tailwind.config.js
index fe12db56..eb76aef6 100644
--- a/packages/berlin/tailwind.config.js
+++ b/packages/berlin/tailwind.config.js
@@ -17,6 +17,9 @@ module.exports = {
       },
     },
     extend: {
+      fontFamily: {
+        raleway: ["'Raleway'", 'sans-serif'],
+      },
       colors: {
         border: 'hsl(var(--border))',
         input: 'hsl(var(--input))',
diff --git a/packages/ui/src/components/ui/command.tsx b/packages/ui/src/components/ui/command.tsx
index 907de29d..9223ca4e 100644
--- a/packages/ui/src/components/ui/command.tsx
+++ b/packages/ui/src/components/ui/command.tsx
@@ -15,7 +15,7 @@ const Command = React.forwardRef<
   <CommandPrimitive
     ref={ref}
     className={cn(
-      'flex h-full w-full flex-col overflow-hidden rounded-md bg-popover text-popover-foreground',
+      'bg-popover text-popover-foreground flex h-full w-full flex-col overflow-hidden rounded-md',
       className,
     )}
     {...props}
@@ -29,7 +29,7 @@ const CommandDialog = ({ children, ...props }: CommandDialogProps) => {
   return (
     <Dialog {...props}>
       <DialogContent className="overflow-hidden p-0">
-        <Command className="[&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group-heading]]:text-muted-foreground [&_[cmdk-group]:not([hidden])_~[cmdk-group]]:pt-0 [&_[cmdk-group]]:px-2 [&_[cmdk-input-wrapper]_svg]:h-5 [&_[cmdk-input-wrapper]_svg]:w-5 [&_[cmdk-input]]:h-12 [&_[cmdk-item]]:px-2 [&_[cmdk-item]]:py-3 [&_[cmdk-item]_svg]:h-5 [&_[cmdk-item]_svg]:w-5">
+        <Command className="[&_[cmdk-group-heading]]:text-muted-foreground [&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group]:not([hidden])_~[cmdk-group]]:pt-0 [&_[cmdk-group]]:px-2 [&_[cmdk-input-wrapper]_svg]:h-5 [&_[cmdk-input-wrapper]_svg]:w-5 [&_[cmdk-input]]:h-12 [&_[cmdk-item]]:px-2 [&_[cmdk-item]]:py-3 [&_[cmdk-item]_svg]:h-5 [&_[cmdk-item]_svg]:w-5">
           {children}
         </Command>
       </DialogContent>
@@ -46,7 +46,7 @@ const CommandInput = React.forwardRef<
     <CommandPrimitive.Input
       ref={ref}
       className={cn(
-        'flex h-10 w-full rounded-md bg-transparent py-3 text-sm outline-none placeholder:text-muted-foreground disabled:cursor-not-allowed disabled:opacity-50',
+        'placeholder:text-muted-foreground flex h-10 w-full rounded-md bg-transparent py-3 text-sm outline-none disabled:cursor-not-allowed disabled:opacity-50',
         className,
       )}
       {...props}
@@ -85,7 +85,7 @@ const CommandGroup = React.forwardRef<
   <CommandPrimitive.Group
     ref={ref}
     className={cn(
-      'overflow-hidden p-1 text-foreground [&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:py-1.5 [&_[cmdk-group-heading]]:text-xs [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group-heading]]:text-muted-foreground',
+      'text-foreground [&_[cmdk-group-heading]]:text-muted-foreground overflow-hidden p-1 [&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:py-1.5 [&_[cmdk-group-heading]]:text-xs [&_[cmdk-group-heading]]:font-medium',
       className,
     )}
     {...props}
@@ -100,7 +100,7 @@ const CommandSeparator = React.forwardRef<
 >(({ className, ...props }, ref) => (
   <CommandPrimitive.Separator
     ref={ref}
-    className={cn('-mx-1 h-px bg-border', className)}
+    className={cn('bg-border -mx-1 h-px', className)}
     {...props}
   />
 ));
@@ -113,7 +113,7 @@ const CommandItem = React.forwardRef<
   <CommandPrimitive.Item
     ref={ref}
     className={cn(
-      `relative flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none aria-selected:bg-accent aria-selected:text-accent-foreground data-[disabled='true']:pointer-events-none data-[disabled='true']:opacity-50`,
+      `aria-selected:bg-accent aria-selected:text-accent-foreground relative flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none data-[disabled='true']:pointer-events-none data-[disabled='true']:opacity-50`,
       className,
     )}
     {...props}
@@ -125,7 +125,7 @@ CommandItem.displayName = CommandPrimitive.Item.displayName;
 const CommandShortcut = ({ className, ...props }: React.HTMLAttributes<HTMLSpanElement>) => {
   return (
     <span
-      className={cn('ml-auto text-xs tracking-widest text-muted-foreground', className)}
+      className={cn('text-muted-foreground ml-auto text-xs tracking-widest', className)}
       {...props}
     />
   );
diff --git a/packages/ui/src/components/ui/dialog.tsx b/packages/ui/src/components/ui/dialog.tsx
index bd3d3561..919dcc21 100644
--- a/packages/ui/src/components/ui/dialog.tsx
+++ b/packages/ui/src/components/ui/dialog.tsx
@@ -21,7 +21,7 @@ const DialogOverlay = React.forwardRef<
   <DialogPrimitive.Overlay
     ref={ref}
     className={cn(
-      'fixed inset-0 z-50 bg-black/80  data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0',
+      'data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/80',
       className,
     )}
     {...props}
@@ -38,13 +38,13 @@ const DialogContent = React.forwardRef<
     <DialogPrimitive.Content
       ref={ref}
       className={cn(
-        'fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg',
+        'bg-background data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border p-6 shadow-lg duration-200 sm:rounded-lg',
         className,
       )}
       {...props}
     >
       {children}
-      <DialogPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-muted-foreground">
+      <DialogPrimitive.Close className="ring-offset-background focus:ring-ring data-[state=open]:bg-accent data-[state=open]:text-muted-foreground absolute right-4 top-4 rounded-sm opacity-70 transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-offset-2 disabled:pointer-events-none">
         <Cross2Icon className="h-4 w-4" />
         <span className="sr-only">Close</span>
       </DialogPrimitive.Close>
@@ -84,7 +84,7 @@ const DialogDescription = React.forwardRef<
 >(({ className, ...props }, ref) => (
   <DialogPrimitive.Description
     ref={ref}
-    className={cn('text-sm text-muted-foreground', className)}
+    className={cn('text-muted-foreground text-sm', className)}
     {...props}
   />
 ));
diff --git a/packages/ui/src/components/ui/popover.tsx b/packages/ui/src/components/ui/popover.tsx
index 2c1582d6..30034c5f 100644
--- a/packages/ui/src/components/ui/popover.tsx
+++ b/packages/ui/src/components/ui/popover.tsx
@@ -21,7 +21,7 @@ const PopoverContent = React.forwardRef<
       align={align}
       sideOffset={sideOffset}
       className={cn(
-        'z-50 w-72 rounded-md border bg-popover p-4 text-popover-foreground shadow-md outline-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2',
+        'bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-72 rounded-md border p-4 shadow-md outline-none',
         className,
       )}
       {...props}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2dfcfa96..2a36c5b1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -113,6 +113,9 @@ importers:
       prettier:
         specifier: ^3.1.1
         version: 3.2.5
+      prettier-plugin-tailwindcss:
+        specifier: ^0.6.5
+        version: 0.6.5(prettier@3.2.5)
       typescript:
         specifier: ^5.5.2
         version: 5.5.2
@@ -5352,6 +5355,58 @@ packages:
       }
     engines: { node: '>= 0.8.0' }
 
+  prettier-plugin-tailwindcss@0.6.5:
+    resolution: {integrity: sha512-axfeOArc/RiGHjOIy9HytehlC0ZLeMaqY09mm8YCkMzznKiDkwFzOpBvtuhuv3xG5qB73+Mj7OCe2j/L1ryfuQ==}
+    engines: {node: '>=14.21.3'}
+    peerDependencies:
+      '@ianvs/prettier-plugin-sort-imports': '*'
+      '@prettier/plugin-pug': '*'
+      '@shopify/prettier-plugin-liquid': '*'
+      '@trivago/prettier-plugin-sort-imports': '*'
+      '@zackad/prettier-plugin-twig-melody': '*'
+      prettier: ^3.0
+      prettier-plugin-astro: '*'
+      prettier-plugin-css-order: '*'
+      prettier-plugin-import-sort: '*'
+      prettier-plugin-jsdoc: '*'
+      prettier-plugin-marko: '*'
+      prettier-plugin-organize-attributes: '*'
+      prettier-plugin-organize-imports: '*'
+      prettier-plugin-sort-imports: '*'
+      prettier-plugin-style-order: '*'
+      prettier-plugin-svelte: '*'
+    peerDependenciesMeta:
+      '@ianvs/prettier-plugin-sort-imports':
+        optional: true
+      '@prettier/plugin-pug':
+        optional: true
+      '@shopify/prettier-plugin-liquid':
+        optional: true
+      '@trivago/prettier-plugin-sort-imports':
+        optional: true
+      '@zackad/prettier-plugin-twig-melody':
+        optional: true
+      prettier-plugin-astro:
+        optional: true
+      prettier-plugin-css-order:
+        optional: true
+      prettier-plugin-import-sort:
+        optional: true
+      prettier-plugin-jsdoc:
+        optional: true
+      prettier-plugin-marko:
+        optional: true
+      prettier-plugin-organize-attributes:
+        optional: true
+      prettier-plugin-organize-imports:
+        optional: true
+      prettier-plugin-sort-imports:
+        optional: true
+      prettier-plugin-style-order:
+        optional: true
+      prettier-plugin-svelte:
+        optional: true
+
   prettier@3.2.5:
     resolution:
       {
@@ -10740,6 +10795,10 @@ snapshots:
 
   prelude-ls@1.2.1: {}
 
+  prettier-plugin-tailwindcss@0.6.5(prettier@3.2.5):
+    dependencies:
+      prettier: 3.2.5
+
   prettier@3.2.5: {}
 
   pretty-hrtime@1.0.3: {}

From 79c743f9d1d73e2aa4087d39b027cac74df8b9c5 Mon Sep 17 00:00:00 2001
From: Camilo Vega <59750365+camilovegag@users.noreply.github.com>
Date: Fri, 19 Jul 2024 04:59:24 -0500
Subject: [PATCH 05/15] 682 new footer (#683)

* Delete styles

* Add tailwind classes

* Remove unused copy and logos
---
 .../src/components/footer/Footer.styled.tsx   | 21 ---------------
 .../berlin/src/components/footer/Footer.tsx   | 16 +++++------
 packages/berlin/src/data/footer.ts            | 27 +++----------------
 3 files changed, 11 insertions(+), 53 deletions(-)
 delete mode 100644 packages/berlin/src/components/footer/Footer.styled.tsx

diff --git a/packages/berlin/src/components/footer/Footer.styled.tsx b/packages/berlin/src/components/footer/Footer.styled.tsx
deleted file mode 100644
index 0d4958d8..00000000
--- a/packages/berlin/src/components/footer/Footer.styled.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import styled from 'styled-components';
-import { FlexColumn } from '../containers/FlexColumn.styled';
-
-export const SyledFooter = styled.footer`
-  align-items: center;
-  display: flex;
-  justify-content: center;
-  min-height: 7.5rem;
-  padding-block: 2rem;
-`;
-
-export const FooterContainer = styled(FlexColumn)`
-  background-color: var(--color-white);
-  width: min(90%, 1080px);
-  text-align: center;
-`;
-
-export const Copy = styled.p`
-  font-size: 0.875rem;
-  line-height: 1.25rem;
-`;
diff --git a/packages/berlin/src/components/footer/Footer.tsx b/packages/berlin/src/components/footer/Footer.tsx
index 36a3c203..7474c447 100644
--- a/packages/berlin/src/components/footer/Footer.tsx
+++ b/packages/berlin/src/components/footer/Footer.tsx
@@ -1,27 +1,25 @@
 import { useAppStore } from '../../store';
-import { FlexRow } from '../containers/FlexRow.styled';
 import { Link as RouterLink } from 'react-router-dom';
-import { Copy, FooterContainer, SyledFooter } from './Footer.styled';
 import footerData from '../../data/footer';
 
 function Footer() {
   const theme = useAppStore((state) => state.theme);
 
   return (
-    <SyledFooter>
-      <FooterContainer $gap="0.75rem" $align="center">
+    <footer className="bg-primary border-secondary border-t py-4 text-sm">
+      <section className="mx-auto flex w-[min(90%,1080px)] flex-col items-center gap-2">
         {footerData.copy.map(({ id, text }) => (
-          <Copy key={id}>{text}</Copy>
+          <p key={id}>{text}</p>
         ))}
-        <FlexRow $justify="center">
+        <div className="flex">
           {footerData.logos.map((logo) => (
             <RouterLink key={logo.src} to={logo.link}>
               <img src={`/logos/${logo.src}-${theme}.svg`} alt={logo.alt} height={24} width={24} />
             </RouterLink>
           ))}
-        </FlexRow>
-      </FooterContainer>
-    </SyledFooter>
+        </div>
+      </section>
+    </footer>
   );
 }
 
diff --git a/packages/berlin/src/data/footer.ts b/packages/berlin/src/data/footer.ts
index 70d35fac..43698bcf 100644
--- a/packages/berlin/src/data/footer.ts
+++ b/packages/berlin/src/data/footer.ts
@@ -1,30 +1,11 @@
 const footer = {
   copy: [
-    { id: 0, text: 'A grants program funded by Plurality Labs and the Arbitrum DAO' },
-    { id: 1, text: 'Co-sponsored by RadicalXChange, MetaGov & De-Sci Foundation' },
-    { id: 2, text: 'Tooling built by Lexicon Governance' },
-  ],
-  logos: [
-    {
-      src: `arbitrum`, // src here its just the filename as we render it as `/logo/${src}-{theme}.svg`
-      alt: 'Arbitrum',
-      link: 'https://arbitrum.foundation/grants',
-    },
-    {
-      src: `radicalxchange`,
-      alt: 'RadicalXChange',
-      link: 'https://www.radicalxchange.org/',
-    },
-    {
-      src: `metagov`,
-      alt: 'MetaGov',
-      link: 'https://metagov.org/',
-    },
     {
-      src: `desci`,
-      alt: 'De-Sci Foundation',
-      link: 'https://www.descifoundation.org/',
+      id: 0,
+      text: 'Tooling built by Lexicon Governance',
     },
+  ],
+  logos: [
     {
       src: `lexicon`,
       alt: 'Lexicon Governance',

From c5deff51e965b2efaec4cd16cce46eb8234efacd Mon Sep 17 00:00:00 2001
From: Camilo Vega <59750365+camilovegag@users.noreply.github.com>
Date: Fri, 19 Jul 2024 09:17:14 -0500
Subject: [PATCH 06/15] 684 new event page (#686)

* Remove styled

* Update tw and date

* Update event page

* Remove comment

---------

Co-authored-by: Diego Alzate <diego35.da@gmail.com>
---
 .../src/components/cycles/Cycles.styled.tsx   |   9 --
 .../berlin/src/components/cycles/Cycles.tsx   |   7 +-
 .../src/components/tabs/TabsHeader.styled.tsx |   8 --
 .../berlin/src/components/tabs/TabsHeader.tsx |   6 +-
 packages/berlin/src/pages/Event.tsx           | 104 ++++--------------
 5 files changed, 26 insertions(+), 108 deletions(-)
 delete mode 100644 packages/berlin/src/components/cycles/Cycles.styled.tsx

diff --git a/packages/berlin/src/components/cycles/Cycles.styled.tsx b/packages/berlin/src/components/cycles/Cycles.styled.tsx
deleted file mode 100644
index 5a0c32b3..00000000
--- a/packages/berlin/src/components/cycles/Cycles.styled.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import styled from 'styled-components';
-import { FlexRowToColumn } from '../containers/FlexRowToColumn.styled';
-
-export const CycleContainer = styled(FlexRowToColumn)`
-  border: 1px solid var(--color-black);
-  padding: 2rem;
-  justify-content: space-between;
-  border-radius: 0.5rem;
-`;
diff --git a/packages/berlin/src/components/cycles/Cycles.tsx b/packages/berlin/src/components/cycles/Cycles.tsx
index 09b0746f..da5a0cc4 100644
--- a/packages/berlin/src/components/cycles/Cycles.tsx
+++ b/packages/berlin/src/components/cycles/Cycles.tsx
@@ -1,6 +1,5 @@
 import { GetCycleResponse } from 'api';
 import { Body } from '../typography/Body.styled';
-import { CycleContainer } from './Cycles.styled';
 
 type CyclesProps = {
   cycles: GetCycleResponse[] | undefined;
@@ -10,17 +9,17 @@ type CyclesProps = {
 function Cycles({ cycles, errorMessage }: CyclesProps) {
   const formatDate = (date: string) => {
     const eventEndDate = new Date(date);
-    return eventEndDate.toLocaleDateString();
+    return new Intl.DateTimeFormat('en-US', { month: 'long', day: 'numeric' }).format(eventEndDate);
   };
 
   return (
     <>
       {cycles?.length ? (
         cycles.map((cycle) => (
-          <CycleContainer key={cycle.id}>
+          <div className='flex flex-col border-secondary w-full p-4 gap-4' key={cycle.id}>
             <Body>{cycle.forumQuestions[0]?.questionTitle}</Body>
             <Body>{formatDate(cycle.endAt)}</Body>
-          </CycleContainer>
+          </div>
         ))
       ) : (
         <Body>{errorMessage}</Body>
diff --git a/packages/berlin/src/components/tabs/TabsHeader.styled.tsx b/packages/berlin/src/components/tabs/TabsHeader.styled.tsx
index 37162994..4a60854c 100644
--- a/packages/berlin/src/components/tabs/TabsHeader.styled.tsx
+++ b/packages/berlin/src/components/tabs/TabsHeader.styled.tsx
@@ -1,14 +1,6 @@
 import styled from 'styled-components';
 import { Body } from '../typography/Body.styled';
-import { FlexRow } from '../containers/FlexRow.styled';
 
-export const Tabs = styled(FlexRow)`
-  justify-content: flex-start;
-
-  @media (min-width: 600px) {
-    justify-content: flex-end;
-  }
-`;
 
 export const Tab = styled(Body)`
   cursor: pointer;
diff --git a/packages/berlin/src/components/tabs/TabsHeader.tsx b/packages/berlin/src/components/tabs/TabsHeader.tsx
index 37ac4450..54a20efb 100644
--- a/packages/berlin/src/components/tabs/TabsHeader.tsx
+++ b/packages/berlin/src/components/tabs/TabsHeader.tsx
@@ -1,6 +1,6 @@
 import { Fragment, useState } from 'react';
 import { Body } from '../typography/Body.styled';
-import { Tab, Tabs } from './TabsHeader.styled';
+import { Tab } from './TabsHeader.styled';
 
 type TabsHeaderProps = {
   tabNames: string[];
@@ -19,7 +19,7 @@ export function TabsHeader({ tabNames, initialTab, onTabChange }: TabsHeaderProp
   };
 
   return (
-    <Tabs $gap="0.5rem">
+    <div className='flex gap-2'>
       {tabNames.map((tabName, index) => (
         <Fragment key={tabName}>
           <Tab
@@ -31,6 +31,6 @@ export function TabsHeader({ tabNames, initialTab, onTabChange }: TabsHeaderProp
           {index < tabNames.length - 1 && <Body>/</Body>}
         </Fragment>
       ))}
-    </Tabs>
+    </div>
   );
 }
diff --git a/packages/berlin/src/pages/Event.tsx b/packages/berlin/src/pages/Event.tsx
index 80872b12..365d5448 100644
--- a/packages/berlin/src/pages/Event.tsx
+++ b/packages/berlin/src/pages/Event.tsx
@@ -1,26 +1,20 @@
 // React and third-party libraries
 import { useState, useMemo } from 'react';
 import { useQuery } from '@tanstack/react-query';
-import { useNavigate, useParams } from 'react-router-dom';
+import { useParams } from 'react-router-dom';
 
 // API
-import {
-  fetchEvent,
-  fetchEventCycles,
-  fetchEventGroupCategories,
-  GetGroupCategoriesResponse,
-} from 'api';
+import { fetchEvent, fetchEventCycles } from 'api';
 
 // Components
 import { Body } from '../components/typography/Body.styled';
 import { FlexColumn } from '../components/containers/FlexColumn.styled';
-import { FlexRow } from '../components/containers/FlexRow.styled';
 import { Subtitle } from '../components/typography/Subtitle.styled';
-import Button from '../components/button';
 import Cycles from '../components/cycles';
-import EventCard from '../components/event-card';
 import Link from '../components/link';
 import * as Tabs from '../components/tabs';
+import Markdown from 'react-markdown';
+import BackButton from '@/components/back-button';
 
 function Event() {
   const { eventId } = useParams();
@@ -37,12 +31,6 @@ function Event() {
     refetchInterval: 5000, // Poll every 5 seconds
   });
 
-  const { data: groupCategories } = useQuery({
-    queryKey: ['event', eventId, 'group-categories'],
-    queryFn: () => fetchEventGroupCategories(eventId || ''),
-    enabled: !!eventId,
-  });
-
   const openCycles = useMemo(
     () => eventCycles?.filter((cycle) => cycle.status === 'OPEN'),
     [eventCycles],
@@ -60,81 +48,29 @@ function Event() {
     past: <Cycles cycles={closedCycles} errorMessage="No past events" />,
   };
 
-  // TODO: flag for showing groups.
-  const showGroups = true;
-
   return (
     <FlexColumn $gap="2rem">
-      {event && <EventCard event={event} />}
-      <Subtitle>Questions</Subtitle>
-      <Tabs.TabsHeader tabNames={tabNames} onTabChange={setActiveTab} />
+      <BackButton />
+      <Subtitle>{event?.name}</Subtitle>
+      {event?.description && (
+        <Markdown
+          components={{
+            a: ({ node, ...props }) => <Link to={props.href ?? ''}>{props.children}</Link>,
+            p: ({ node, ...props }) => <Body>{props.children}</Body>,
+          }}
+        >
+          {event.description}
+        </Markdown>
+      )}
+      <div className="flex flex-col md:flex-row justify-between md:items-center gap-2 w-full">
+        <Subtitle>Questions</Subtitle>
+        <Tabs.TabsHeader tabNames={tabNames} onTabChange={setActiveTab} />
+      </div>
       <FlexColumn>
         <Tabs.TabsManager tabs={tabs} tab={activeTab} fallback={'Tab not found'} />
       </FlexColumn>
-      {showGroups && <Groups groups={groupCategories} />}
-      <RunningText />
     </FlexColumn>
   );
 }
 
-function RunningText() {
-  const navigate = useNavigate();
-
-  const handleDataPolicyClick = () => {
-    navigate(`/data-policy`);
-  };
-
-  const handleOnboardingClick = () => {
-    navigate(`/onboarding`);
-  };
-
-  return (
-    <Body>
-      Click to revisit the{' '}
-      <Link
-        to="#"
-        onClick={handleOnboardingClick}
-        state={{ onboardingStep: 2, previousPath: location.pathname }}
-      >
-        event rules
-      </Link>
-      ,{' '}
-      <Link
-        to="#"
-        onClick={handleOnboardingClick}
-        state={{ onboardingStep: 0, previousPath: location.pathname }}
-      >
-        trust assumptions
-      </Link>
-      , and the community’s{' '}
-      <Link to="#" onClick={handleDataPolicyClick}>
-        data policy
-      </Link>
-      .
-    </Body>
-  );
-}
-
-function Groups({ groups }: { groups: GetGroupCategoriesResponse | null | undefined }) {
-  const navigate = useNavigate();
-
-  return groups ? (
-    <>
-      <Subtitle>Groups</Subtitle>
-      <FlexRow $wrap>
-        {groups.map((group) => (
-          <Button
-            key={group.id}
-            onClick={() => navigate(`/secret-groups?groupcategory=${group.name}`)}
-          >
-            {group.name}
-          </Button>
-        ))}
-      </FlexRow>
-    </>
-  ) : (
-    <Body>No groups</Body>
-  );
-}
-
 export default Event;

From 9abea9a1526749e98ce953079083767f2010c85f Mon Sep 17 00:00:00 2001
From: Diego Alzate <diego35.da@gmail.com>
Date: Fri, 19 Jul 2024 15:45:29 +0100
Subject: [PATCH 07/15] Update packages/berlin/src/pages/Account.tsx

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
---
 packages/berlin/src/pages/Account.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/berlin/src/pages/Account.tsx b/packages/berlin/src/pages/Account.tsx
index 01024fe3..aa5fedb3 100644
--- a/packages/berlin/src/pages/Account.tsx
+++ b/packages/berlin/src/pages/Account.tsx
@@ -131,7 +131,7 @@ function AccountHub({ user }: { user: GetUserResponse | null | undefined }) {
       <div>
         <Subtitle>Groups</Subtitle>
         <FlexColumn>
-          {usersToGroups?.map((userToGroup) => <Underline>- {userToGroup.group?.name}</Underline>)}
+          {usersToGroups?.map((userToGroup) => <Underline key={userToGroup.group?.id}>- {userToGroup.group?.name}</Underline>)}
         </FlexColumn>
       </div>
     </FlexColumn>

From 648e9879c13b5f4c361d0807ed4ce0e595a64861 Mon Sep 17 00:00:00 2001
From: Diego Alzate <diego35.da@gmail.com>
Date: Fri, 19 Jul 2024 15:45:41 +0100
Subject: [PATCH 08/15] Update packages/berlin/src/pages/Account.tsx

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
---
 packages/berlin/src/pages/Account.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/berlin/src/pages/Account.tsx b/packages/berlin/src/pages/Account.tsx
index aa5fedb3..ef7ae071 100644
--- a/packages/berlin/src/pages/Account.tsx
+++ b/packages/berlin/src/pages/Account.tsx
@@ -110,7 +110,7 @@ function AccountHub({ user }: { user: GetUserResponse | null | undefined }) {
           {registrations
             ?.filter((registrations) => registrations.status !== 'REJECTED')
             .map((registration) => (
-              <Link to={`/events/${registration.eventId}/cycles`}>
+              <Link key={registration.eventId} to={`/events/${registration.eventId}/cycles`}>
                 - {registration.event?.name}
               </Link>
             ))}

From 694725ea198efd9345cef4c0233ab29abe7fbad0 Mon Sep 17 00:00:00 2001
From: Diego Alzate <diego35.da@gmail.com>
Date: Fri, 19 Jul 2024 15:46:07 +0100
Subject: [PATCH 09/15] Update packages/berlin/src/pages/Account.tsx

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
---
 packages/berlin/src/pages/Account.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/berlin/src/pages/Account.tsx b/packages/berlin/src/pages/Account.tsx
index ef7ae071..3e72bacd 100644
--- a/packages/berlin/src/pages/Account.tsx
+++ b/packages/berlin/src/pages/Account.tsx
@@ -121,6 +121,7 @@ function AccountHub({ user }: { user: GetUserResponse | null | undefined }) {
         <FlexColumn>
           {options?.map((option) => (
             <Link
+              key={option.id}
               to={`/events/${cycles.find((c) => c.data?.id === option.forumQuestion.cycleId)?.data?.eventId}/cycles/${option.forumQuestion.cycleId}/options/${option.id}`}
             >
               - {option.optionTitle}

From e0dad78b115f62c29327430c04345f8191257c34 Mon Sep 17 00:00:00 2001
From: Camilo Vega <59750365+camilovegag@users.noreply.github.com>
Date: Fri, 19 Jul 2024 10:14:42 -0500
Subject: [PATCH 10/15] Update layout (#690)

---
 packages/berlin/src/layout/Layout.styled.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/berlin/src/layout/Layout.styled.tsx b/packages/berlin/src/layout/Layout.styled.tsx
index f4bf615d..a428a000 100644
--- a/packages/berlin/src/layout/Layout.styled.tsx
+++ b/packages/berlin/src/layout/Layout.styled.tsx
@@ -2,7 +2,7 @@ import styled from 'styled-components';
 
 export const Main = styled.main`
   margin-inline: auto;
-  min-height: calc(100vh - 21.5rem);
+  min-height: calc(100vh - 9.375rem);
   padding-block: 4rem;
   width: min(90%, 1080px);
 `;

From 34d17f7a75f6500afb9f2a013f82b3f3b3671775 Mon Sep 17 00:00:00 2001
From: Diego Alzate <diego35.da@gmail.com>
Date: Fri, 26 Jul 2024 19:11:42 +0100
Subject: [PATCH 11/15] support v2.6.0 api (#698)

undefined
---
 .eslintrc.cjs                                 |    7 +-
 package.json                                  |   64 +-
 packages/api/package.json                     |    2 +-
 packages/api/src/deleteComment.ts             |   11 +-
 packages/api/src/deleteLike.ts                |   24 +-
 packages/api/src/deleteUsersToGroups.ts       |   26 +-
 packages/api/src/fetchAlerts.ts               |   10 +-
 packages/api/src/fetchCommentLikes.ts         |   22 +-
 packages/api/src/fetchComments.ts             |   22 +-
 packages/api/src/fetchCycle.ts                |   11 +-
 packages/api/src/fetchCycles.ts               |   10 +-
 packages/api/src/fetchEvent.ts                |   11 +-
 packages/api/src/fetchEventCycles.ts          |   22 +-
 packages/api/src/fetchEventGroupCategories.ts |   24 +-
 packages/api/src/fetchEvents.ts               |   10 +-
 packages/api/src/fetchForumQuestionFunding.ts |   26 -
 .../api/src/fetchForumQuestionStatistics.ts   |   28 -
 packages/api/src/fetchGroupCategories.ts      |   10 +-
 packages/api/src/fetchGroupMembers.ts         |   22 +-
 packages/api/src/fetchGroupRegistrations.ts   |   22 +-
 packages/api/src/fetchGroups.ts               |   24 +-
 packages/api/src/fetchOption.ts               |   11 +-
 packages/api/src/fetchOptionUsers.ts          |   22 +-
 packages/api/src/fetchQuestionFunding.ts      |   24 +
 packages/api/src/fetchQuestionStatistics.ts   |   24 +
 packages/api/src/fetchRegistrationData.ts     |   13 +-
 packages/api/src/fetchRegistrationFields.ts   |   24 +-
 packages/api/src/fetchRegistrations.ts        |   22 +-
 packages/api/src/fetchUser.ts                 |   10 +-
 packages/api/src/fetchUserAttributes.ts       |   22 +-
 packages/api/src/fetchUserOptions.ts          |   12 +-
 packages/api/src/fetchUserRegistrations.ts    |   24 +-
 packages/api/src/fetchUserVotes.ts            |   11 +-
 packages/api/src/fetchUsersToGroups.ts        |   22 +-
 packages/api/src/index.ts                     |   80 +-
 packages/api/src/logout.ts                    |    8 +-
 packages/api/src/postComment.ts               |   11 +-
 packages/api/src/postGroup.ts                 |   11 +-
 packages/api/src/postLike.ts                  |   24 +-
 packages/api/src/postRegistration.ts          |   13 +-
 packages/api/src/postUsersToGroups.ts         |   13 +-
 packages/api/src/postVerify.ts                |   17 +-
 packages/api/src/postVotes.ts                 |   11 +-
 packages/api/src/putRegistration.ts           |   28 +-
 packages/api/src/putUser.ts                   |   13 +-
 packages/api/src/putUsersToGroups.ts          |   28 +-
 .../api/src/types/{AlertType.ts => Alerts.ts} |    0
 packages/api/src/types/ApiRequest.ts          |    3 +
 .../src/types/{CommentType.ts => Comments.ts} |    0
 .../api/src/types/{CycleType.ts => Cycles.ts} |    4 +-
 .../api/src/types/{EventType.ts => Events.ts} |    0
 .../src/types/{FundingType.ts => Funding.ts}  |    0
 ...roupCategoryType.ts => GroupCategories.ts} |    0
 .../{GroupMembersType.ts => GroupMembers.ts}  |    0
 ...strationsType.ts => GroupRegistrations.ts} |    0
 .../api/src/types/{GroupType.ts => Groups.ts} |    0
 .../api/src/types/{LikeType.ts => Likes.ts}   |    0
 .../{OptionUsersType.ts => OptionUsers.ts}    |    0
 .../{QuestionOptionType.ts => Options.ts}     |    0
 .../{ForumQuestionType.ts => Questions.ts}    |    2 +-
 ...trationDataType.ts => RegistrationData.ts} |    2 +-
 ...ionType.ts => RegistrationFieldOptions.ts} |    0
 ...tionFieldType.ts => RegistrationFields.ts} |    2 +-
 .../{RegistrationType.ts => Registrations.ts} |    0
 ...serAttributesType.ts => UserAttributes.ts} |    0
 .../{UserOptionType.ts => UserOptions.ts}     |    2 +-
 .../types/{UserVotesType.ts => UserVotes.ts}  |    0
 .../api/src/types/{UserType.ts => Users.ts}   |    0
 ...{UsersToGroupsType.ts => UsersToGroups.ts} |    0
 packages/api/src/types/index.ts               |   43 +-
 packages/berlin/package.json                  |   48 +-
 packages/berlin/src/App.tsx                   |   25 +-
 .../berlin/src/components/cycles/Cycles.tsx   |    4 +-
 .../src/components/form/AccountForm.tsx       |    1 +
 .../berlin/src/components/header/Header.tsx   |   12 +-
 .../src/components/option-card/OptionCard.tsx |    5 +-
 .../tables/comment-table/CommentsTable.tsx    |    9 +-
 .../tables/cycle-table/CycleTable.tsx         |    2 +-
 .../tables/groups-table/GroupsTable.tsx       |   16 +-
 .../tables/results-table/ResultsTable.tsx     |   15 +-
 .../src/components/tabs/TabsHeader.styled.tsx |    1 -
 .../berlin/src/components/tabs/TabsHeader.tsx |    2 +-
 .../zupass-button/ZupassLoginButton.tsx       |    5 +-
 packages/berlin/src/hooks/useUser.tsx         |    2 +-
 packages/berlin/src/pages/Account.tsx         |   26 +-
 packages/berlin/src/pages/Comments.tsx        |  112 +-
 packages/berlin/src/pages/Cycle.tsx           |   29 +-
 packages/berlin/src/pages/Event.tsx           |    8 +-
 packages/berlin/src/pages/Events.tsx          |    2 +-
 .../src/pages/PublicGroupRegistration.tsx     |   15 +-
 packages/berlin/src/pages/Register.tsx        |   38 +-
 packages/berlin/src/pages/Results.tsx         |   25 +-
 .../src/pages/SecretGroupRegistration.tsx     |   14 +-
 packages/berlin/tsconfig.json                 |   25 +-
 packages/berlin/tsconfig.node.json            |   11 -
 packages/berlin/vite.config.ts                |   13 +-
 pnpm-lock.yaml                                | 6068 ++++-------------
 tsconfig.json                                 |    1 -
 98 files changed, 2047 insertions(+), 5451 deletions(-)
 delete mode 100644 packages/api/src/fetchForumQuestionFunding.ts
 delete mode 100644 packages/api/src/fetchForumQuestionStatistics.ts
 create mode 100644 packages/api/src/fetchQuestionFunding.ts
 create mode 100644 packages/api/src/fetchQuestionStatistics.ts
 rename packages/api/src/types/{AlertType.ts => Alerts.ts} (100%)
 create mode 100644 packages/api/src/types/ApiRequest.ts
 rename packages/api/src/types/{CommentType.ts => Comments.ts} (100%)
 rename packages/api/src/types/{CycleType.ts => Cycles.ts} (96%)
 rename packages/api/src/types/{EventType.ts => Events.ts} (100%)
 rename packages/api/src/types/{FundingType.ts => Funding.ts} (100%)
 rename packages/api/src/types/{GroupCategoryType.ts => GroupCategories.ts} (100%)
 rename packages/api/src/types/{GroupMembersType.ts => GroupMembers.ts} (100%)
 rename packages/api/src/types/{GroupRegistrationsType.ts => GroupRegistrations.ts} (100%)
 rename packages/api/src/types/{GroupType.ts => Groups.ts} (100%)
 rename packages/api/src/types/{LikeType.ts => Likes.ts} (100%)
 rename packages/api/src/types/{OptionUsersType.ts => OptionUsers.ts} (100%)
 rename packages/api/src/types/{QuestionOptionType.ts => Options.ts} (100%)
 rename packages/api/src/types/{ForumQuestionType.ts => Questions.ts} (91%)
 rename packages/api/src/types/{RegistrationDataType.ts => RegistrationData.ts} (95%)
 rename packages/api/src/types/{RegistrationFieldOptionType.ts => RegistrationFieldOptions.ts} (100%)
 rename packages/api/src/types/{RegistrationFieldType.ts => RegistrationFields.ts} (98%)
 rename packages/api/src/types/{RegistrationType.ts => Registrations.ts} (100%)
 rename packages/api/src/types/{UserAttributesType.ts => UserAttributes.ts} (100%)
 rename packages/api/src/types/{UserOptionType.ts => UserOptions.ts} (95%)
 rename packages/api/src/types/{UserVotesType.ts => UserVotes.ts} (100%)
 rename packages/api/src/types/{UserType.ts => Users.ts} (100%)
 rename packages/api/src/types/{UsersToGroupsType.ts => UsersToGroups.ts} (100%)
 delete mode 100644 packages/berlin/tsconfig.node.json

diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index d942c2d5..fb2c88af 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -3,7 +3,6 @@ module.exports = {
     'eslint:recommended',
     'plugin:@typescript-eslint/recommended',
     'plugin:react-hooks/recommended',
-    'plugin:@tanstack/eslint-plugin-query/recommended',
     'prettier',
   ],
   parser: '@typescript-eslint/parser',
@@ -28,11 +27,7 @@ module.exports = {
     //    Warn to encourage type safety, could be upgraded to 'error' for stricter enforcement
     '@typescript-eslint/no-explicit-any': 'warn',
 
-    // 5. '@tanstack/query/exhaustive-deps': Ensure exhaustive dependency arrays in React hooks
-    //    Warn to highlight potential issues, but doesn't necessarily break the build
-    '@tanstack/query/exhaustive-deps': 'warn',
-
-    // 6. '@typescript-eslint/no-unused-vars': Avoid unused variables, enforcing cleaner code
+    // 5. '@typescript-eslint/no-unused-vars': Avoid unused variables, enforcing cleaner code
     //    Error to ensure unused variables are caught during linting
     '@typescript-eslint/no-unused-vars': [
       'error',
diff --git a/package.json b/package.json
index 98cb06f6..83022304 100644
--- a/package.json
+++ b/package.json
@@ -1,63 +1,29 @@
 {
   "name": "lexicon-frontend",
   "private": true,
-  "version": "1.0.0",
   "type": "module",
   "scripts": {
-    "berlin:dev": "pnpm -r --filter berlin dev",
-    "berlin:build": "pnpm -r --filter berlin build",
-    "berlin:preview": "pnpm -r --filter berlin preview",
-    "format": "prettier --check \"packages/**/*.{ts,tsx,json,md}\"",
-    "format:fix": "prettier --write \"packages/**/*.{ts,tsx,json,md}\"",
-    "lint": "eslint ."
+    "dev": "pnpm -r --filter berlin dev",
+    "build": "pnpm -r --filter berlin build",
+    "preview": "pnpm -r --filter berlin preview",
+    "format": "pnpm exec prettier --check \"packages/**/*.{ts,tsx,json,md}\"",
+    "format:fix": "pnpm exec prettier --write \"packages/**/*.{ts,tsx,json,md}\"",
+    "lint": "pnpm exec eslint ."
   },
   "keywords": [],
   "author": "",
   "license": "ISC",
-  "engines": {
-    "node": "^20"
-  },
-  "dependencies": {
-    "@hookform/resolvers": "^3.3.4",
-    "@pcd/passport-interface": "^0.8.0",
-    "@pcd/pcd-types": "^0.8.0",
-    "@pcd/semaphore-identity-pcd": "^0.8.0",
-    "@pcd/semaphore-signature-pcd": "^0.9.0",
-    "@radix-ui/react-dialog": "^1.0.5",
-    "@radix-ui/react-icons": "^1.3.0",
-    "@tanstack/react-query": "^5.13.4",
-    "@tanstack/react-query-devtools": "^5.13.5",
-    "class-variance-authority": "^0.7.0",
-    "clsx": "^2.1.0",
-    "lucide-react": "^0.397.0",
-    "react": "^18.2.0",
-    "react-content-loader": "^7.0.0",
-    "react-dom": "^18.2.0",
-    "react-hook-form": "^7.49.3",
-    "react-hot-toast": "^2.4.1",
-    "react-markdown": "^9.0.1",
-    "react-router-dom": "^6.20.1",
-    "styled-components": "^6.1.1",
-    "zod": "^3.22.4",
-    "zustand": "^4.4.7"
-  },
   "devDependencies": {
-    "@hookform/devtools": "^4.3.1",
-    "@tanstack/eslint-plugin-query": "^5.18.0",
-    "@types/node": "^20.12.4",
-    "@types/react-dom": "^18.2.15",
-    "@types/react": "^18.2.37",
-    "@typescript-eslint/eslint-plugin": "^6.19.0",
-    "@typescript-eslint/parser": "^6.19.0",
-    "@vitejs/plugin-react": "^4.2.0",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-react-hooks": "^4.6.0",
-    "eslint-plugin-react-refresh": "^0.4.4",
-    "eslint": "^8.56.0",
     "prettier-plugin-tailwindcss": "^0.6.5",
     "prettier": "^3.1.1",
-    "typescript": "^5.5.2",
-    "vite-plugin-node-polyfills": "^0.17.0",
-    "vite": "^5.0.0"
+    "eslint": "^8.57.0",
+    "eslint-plugin-react-hooks": "^4.6.0",
+    "eslint-plugin-react-refresh": "^0.4.6",
+    "@typescript-eslint/parser": "^7.2.0",
+    "typescript": "^5.5.2"
+  },
+  "engines": {
+    "node": "^20"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/api/package.json b/packages/api/package.json
index 03f62343..05c9fc26 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "api",
-  "version": "2.4.0",
+  "version": "2.6.0",
   "type": "module",
   "main": "./src/index.ts"
 }
diff --git a/packages/api/src/deleteComment.ts b/packages/api/src/deleteComment.ts
index 9d53e897..a52844a1 100644
--- a/packages/api/src/deleteComment.ts
+++ b/packages/api/src/deleteComment.ts
@@ -1,10 +1,11 @@
-import { DeleteCommentRequest, DeleteCommentResponse } from './types';
+import { ApiRequest, DeleteCommentRequest, DeleteCommentResponse } from './types';
 
-async function deleteComment({
+export async function deleteComment({
   commentId,
-}: DeleteCommentRequest): Promise<DeleteCommentResponse | null> {
+  serverUrl,
+}: ApiRequest<DeleteCommentRequest>): Promise<DeleteCommentResponse | null> {
   try {
-    const response = await fetch(`${import.meta.env.VITE_SERVER_URL}/api/comments/${commentId}`, {
+    const response = await fetch(`${serverUrl}/api/comments/${commentId}`, {
       method: 'DELETE',
       credentials: 'include',
       headers: {
@@ -23,5 +24,3 @@ async function deleteComment({
     return null;
   }
 }
-
-export default deleteComment;
diff --git a/packages/api/src/deleteLike.ts b/packages/api/src/deleteLike.ts
index 2d4d9ac4..2d0a202f 100644
--- a/packages/api/src/deleteLike.ts
+++ b/packages/api/src/deleteLike.ts
@@ -1,17 +1,17 @@
-import { DeleteLikeRequest, DeleteLikeResponse } from './types';
+import { ApiRequest, DeleteLikeRequest, DeleteLikeResponse } from './types';
 
-async function deleteLike({ commentId }: DeleteLikeRequest): Promise<DeleteLikeResponse | null> {
+export async function deleteLike({
+  commentId,
+  serverUrl,
+}: ApiRequest<DeleteLikeRequest>): Promise<DeleteLikeResponse | null> {
   try {
-    const response = await fetch(
-      `${import.meta.env.VITE_SERVER_URL}/api/comments/${commentId}/likes`,
-      {
-        method: 'DELETE',
-        credentials: 'include',
-        headers: {
-          'Content-Type': 'application/json',
-        },
+    const response = await fetch(`${serverUrl}/api/comments/${commentId}/likes`, {
+      method: 'DELETE',
+      credentials: 'include',
+      headers: {
+        'Content-Type': 'application/json',
       },
-    );
+    });
 
     if (!response.ok) {
       throw new Error(`HTTP Error! Status: ${response.status}`);
@@ -24,5 +24,3 @@ async function deleteLike({ commentId }: DeleteLikeRequest): Promise<DeleteLikeR
     return null;
   }
 }
-
-export default deleteLike;
diff --git a/packages/api/src/deleteUsersToGroups.ts b/packages/api/src/deleteUsersToGroups.ts
index 25a5e795..251dbfd8 100644
--- a/packages/api/src/deleteUsersToGroups.ts
+++ b/packages/api/src/deleteUsersToGroups.ts
@@ -1,19 +1,19 @@
-import { DeleteUsersToGroupsRequest, DeleteUsersToGroupsResponse } from './types';
+import { ApiRequest, DeleteUsersToGroupsRequest, DeleteUsersToGroupsResponse } from './types';
 
-async function deleteUsersToGroups({
+export async function deleteUsersToGroups({
   userToGroupId,
-}: DeleteUsersToGroupsRequest): Promise<DeleteUsersToGroupsResponse | { errors: string[] } | null> {
+  serverUrl,
+}: ApiRequest<DeleteUsersToGroupsRequest>): Promise<
+  DeleteUsersToGroupsResponse | { errors: string[] } | null
+> {
   try {
-    const response = await fetch(
-      `${import.meta.env.VITE_SERVER_URL}/api/users-to-groups/${userToGroupId}`,
-      {
-        method: 'DELETE',
-        credentials: 'include',
-        headers: {
-          'Content-Type': 'application/json',
-        },
+    const response = await fetch(`${serverUrl}/api/users-to-groups/${userToGroupId}`, {
+      method: 'DELETE',
+      credentials: 'include',
+      headers: {
+        'Content-Type': 'application/json',
       },
-    );
+    });
 
     if (!response.ok) {
       if (response.status < 500) {
@@ -33,5 +33,3 @@ async function deleteUsersToGroups({
     return null;
   }
 }
-
-export default deleteUsersToGroups;
diff --git a/packages/api/src/fetchAlerts.ts b/packages/api/src/fetchAlerts.ts
index 3a22dafc..444ee160 100644
--- a/packages/api/src/fetchAlerts.ts
+++ b/packages/api/src/fetchAlerts.ts
@@ -1,8 +1,10 @@
-import { GetAlertsResponse } from './types';
+import { ApiRequest, GetAlertsResponse } from './types';
 
-async function fetchAlerts(): Promise<GetAlertsResponse | null> {
+export async function fetchAlerts({
+  serverUrl,
+}: ApiRequest<unknown>): Promise<GetAlertsResponse | null> {
   try {
-    const response = await fetch(`${import.meta.env.VITE_SERVER_URL}/api/alerts`, {
+    const response = await fetch(`${serverUrl}/api/alerts`, {
       credentials: 'include',
       headers: {
         'Content-Type': 'application/json',
@@ -20,5 +22,3 @@ async function fetchAlerts(): Promise<GetAlertsResponse | null> {
     return null;
   }
 }
-
-export default fetchAlerts;
diff --git a/packages/api/src/fetchCommentLikes.ts b/packages/api/src/fetchCommentLikes.ts
index 7a1e09d7..c73a0031 100644
--- a/packages/api/src/fetchCommentLikes.ts
+++ b/packages/api/src/fetchCommentLikes.ts
@@ -1,16 +1,16 @@
-import { GetLikesRequest, GetLikesResponse } from './types';
+import { ApiRequest, GetLikesRequest, GetLikesResponse } from './types';
 
-async function fetchLikes({ commentId }: GetLikesRequest): Promise<GetLikesResponse | null> {
+export async function fetchCommentLikes({
+  commentId,
+  serverUrl,
+}: ApiRequest<GetLikesRequest>): Promise<GetLikesResponse | null> {
   try {
-    const response = await fetch(
-      `${import.meta.env.VITE_SERVER_URL}/api/comments/${commentId}/likes`,
-      {
-        credentials: 'include',
-        headers: {
-          'Content-type': 'application/json',
-        },
+    const response = await fetch(`${serverUrl}/api/comments/${commentId}/likes`, {
+      credentials: 'include',
+      headers: {
+        'Content-type': 'application/json',
       },
-    );
+    });
 
     if (!response.ok) {
       throw new Error(`HTTP Error! Status: ${response.status}`);
@@ -23,5 +23,3 @@ async function fetchLikes({ commentId }: GetLikesRequest): Promise<GetLikesRespo
     return null;
   }
 }
-
-export default fetchLikes;
diff --git a/packages/api/src/fetchComments.ts b/packages/api/src/fetchComments.ts
index c2071529..0a0b38ac 100644
--- a/packages/api/src/fetchComments.ts
+++ b/packages/api/src/fetchComments.ts
@@ -1,18 +1,16 @@
-import { GetCommentsRequest, GetCommentsResponse } from './types';
+import { ApiRequest, GetCommentsRequest, GetCommentsResponse } from './types';
 
-async function fetchComments({
+export async function fetchComments({
   optionId,
-}: GetCommentsRequest): Promise<GetCommentsResponse | null> {
+  serverUrl,
+}: ApiRequest<GetCommentsRequest>): Promise<GetCommentsResponse | null> {
   try {
-    const response = await fetch(
-      `${import.meta.env.VITE_SERVER_URL}/api/options/${optionId}/comments`,
-      {
-        credentials: 'include',
-        headers: {
-          'Content-type': 'application/json',
-        },
+    const response = await fetch(`${serverUrl}/api/options/${optionId}/comments`, {
+      credentials: 'include',
+      headers: {
+        'Content-type': 'application/json',
       },
-    );
+    });
 
     if (!response.ok) {
       throw new Error(`HTTP Error! Status: ${response.status}`);
@@ -25,5 +23,3 @@ async function fetchComments({
     return null;
   }
 }
-
-export default fetchComments;
diff --git a/packages/api/src/fetchCycle.ts b/packages/api/src/fetchCycle.ts
index 788d776b..392ff4f4 100644
--- a/packages/api/src/fetchCycle.ts
+++ b/packages/api/src/fetchCycle.ts
@@ -1,8 +1,11 @@
-import { GetCyclesResponse } from './types';
+import { ApiRequest, GetCyclesResponse } from './types';
 
-async function fetchCycle(cycleId: string): Promise<GetCyclesResponse[number] | null> {
+export async function fetchCycle({
+  cycleId,
+  serverUrl,
+}: ApiRequest<{ cycleId: string }>): Promise<GetCyclesResponse[number] | null> {
   try {
-    const response = await fetch(`${import.meta.env.VITE_SERVER_URL}/api/cycles/${cycleId}`, {
+    const response = await fetch(`${serverUrl}/api/cycles/${cycleId}`, {
       credentials: 'include',
       headers: {
         'Content-Type': 'application/json',
@@ -20,5 +23,3 @@ async function fetchCycle(cycleId: string): Promise<GetCyclesResponse[number] |
     return null;
   }
 }
-
-export default fetchCycle;
diff --git a/packages/api/src/fetchCycles.ts b/packages/api/src/fetchCycles.ts
index 8751e39f..91dc91c7 100644
--- a/packages/api/src/fetchCycles.ts
+++ b/packages/api/src/fetchCycles.ts
@@ -1,8 +1,10 @@
-import { GetCyclesResponse } from './types';
+import { ApiRequest, GetCyclesResponse } from './types';
 
-async function fetchCycles(): Promise<GetCyclesResponse | null> {
+export async function fetchCycles({
+  serverUrl,
+}: ApiRequest<unknown>): Promise<GetCyclesResponse | null> {
   try {
-    const response = await fetch(`${import.meta.env.VITE_SERVER_URL}/api/cycles`, {
+    const response = await fetch(`${serverUrl}/api/cycles`, {
       credentials: 'include',
       headers: {
         'Content-Type': 'application/json',
@@ -20,5 +22,3 @@ async function fetchCycles(): Promise<GetCyclesResponse | null> {
     return null;
   }
 }
-
-export default fetchCycles;
diff --git a/packages/api/src/fetchEvent.ts b/packages/api/src/fetchEvent.ts
index 3a8d1843..a6beaa22 100644
--- a/packages/api/src/fetchEvent.ts
+++ b/packages/api/src/fetchEvent.ts
@@ -1,8 +1,11 @@
-import { GetEventResponse } from './types';
+import { ApiRequest, GetEventResponse } from './types';
 
-async function fetchEvent(eventId: string): Promise<GetEventResponse | null> {
+export async function fetchEvent({
+  serverUrl,
+  eventId,
+}: ApiRequest<{ eventId: string }>): Promise<GetEventResponse | null> {
   try {
-    const response = await fetch(`${import.meta.env.VITE_SERVER_URL}/api/events/${eventId}`, {
+    const response = await fetch(`${serverUrl}/api/events/${eventId}`, {
       credentials: 'include',
       headers: {
         'Content-Type': 'application/json',
@@ -20,5 +23,3 @@ async function fetchEvent(eventId: string): Promise<GetEventResponse | null> {
     return null;
   }
 }
-
-export default fetchEvent;
diff --git a/packages/api/src/fetchEventCycles.ts b/packages/api/src/fetchEventCycles.ts
index 086f865c..7efdcb39 100644
--- a/packages/api/src/fetchEventCycles.ts
+++ b/packages/api/src/fetchEventCycles.ts
@@ -1,16 +1,16 @@
-import { GetCyclesResponse } from './types';
+import { ApiRequest, GetCyclesResponse } from './types';
 
-async function fetchEventCycles(eventId: string): Promise<GetCyclesResponse | null> {
+export async function fetchEventCycles({
+  eventId,
+  serverUrl,
+}: ApiRequest<{ eventId: string }>): Promise<GetCyclesResponse | null> {
   try {
-    const response = await fetch(
-      `${import.meta.env.VITE_SERVER_URL}/api/events/${eventId}/cycles`,
-      {
-        credentials: 'include',
-        headers: {
-          'Content-Type': 'application/json',
-        },
+    const response = await fetch(`${serverUrl}/api/events/${eventId}/cycles`, {
+      credentials: 'include',
+      headers: {
+        'Content-Type': 'application/json',
       },
-    );
+    });
 
     if (!response.ok) {
       throw new Error(`HTTP Error! Status: ${response.status}`);
@@ -23,5 +23,3 @@ async function fetchEventCycles(eventId: string): Promise<GetCyclesResponse | nu
     return null;
   }
 }
-
-export default fetchEventCycles;
diff --git a/packages/api/src/fetchEventGroupCategories.ts b/packages/api/src/fetchEventGroupCategories.ts
index 5bd3f82e..08758f24 100644
--- a/packages/api/src/fetchEventGroupCategories.ts
+++ b/packages/api/src/fetchEventGroupCategories.ts
@@ -1,18 +1,16 @@
-import { GetGroupCategoriesResponse } from './types';
+import { ApiRequest, GetGroupCategoriesResponse } from './types';
 
-async function fetchEventGroupCategories(
-  eventId: string,
-): Promise<GetGroupCategoriesResponse | null> {
+export async function fetchEventGroupCategories({
+  eventId,
+  serverUrl,
+}: ApiRequest<{ eventId: string }>): Promise<GetGroupCategoriesResponse | null> {
   try {
-    const response = await fetch(
-      `${import.meta.env.VITE_SERVER_URL}/api/events/${eventId}/group-categories`,
-      {
-        credentials: 'include',
-        headers: {
-          'Content-Type': 'application/json',
-        },
+    const response = await fetch(`${serverUrl}/api/events/${eventId}/group-categories`, {
+      credentials: 'include',
+      headers: {
+        'Content-Type': 'application/json',
       },
-    );
+    });
 
     if (!response.ok) {
       throw new Error(`HTTP Error! Status: ${response.status}`);
@@ -25,5 +23,3 @@ async function fetchEventGroupCategories(
     return null;
   }
 }
-
-export default fetchEventGroupCategories;
diff --git a/packages/api/src/fetchEvents.ts b/packages/api/src/fetchEvents.ts
index ebe15c99..0df4240f 100644
--- a/packages/api/src/fetchEvents.ts
+++ b/packages/api/src/fetchEvents.ts
@@ -1,8 +1,10 @@
-import { GetEventsResponse } from './types';
+import { ApiRequest, GetEventsResponse } from './types';
 
-async function fetchEvents(): Promise<GetEventsResponse | null> {
+export async function fetchEvents({
+  serverUrl,
+}: ApiRequest<unknown>): Promise<GetEventsResponse | null> {
   try {
-    const response = await fetch(`${import.meta.env.VITE_SERVER_URL}/api/events`, {
+    const response = await fetch(`${serverUrl}/api/events`, {
       credentials: 'include',
       headers: {
         'Content-Type': 'application/json',
@@ -20,5 +22,3 @@ async function fetchEvents(): Promise<GetEventsResponse | null> {
     return null;
   }
 }
-
-export default fetchEvents;
diff --git a/packages/api/src/fetchForumQuestionFunding.ts b/packages/api/src/fetchForumQuestionFunding.ts
deleted file mode 100644
index e8ab651f..00000000
--- a/packages/api/src/fetchForumQuestionFunding.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { GetFundingResponse } from './types';
-
-async function fetchForumQuestionFunding(questionId: string): Promise<GetFundingResponse | null> {
-  try {
-    const response = await fetch(
-      `${import.meta.env.VITE_SERVER_URL}/api/forum-questions/${questionId}/funding`,
-      {
-        credentials: 'include',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-      },
-    );
-    if (!response.ok) {
-      throw new Error(`HTTP Error! Status: ${response.status}`);
-    }
-
-    const stats = (await response.json()) as { data: GetFundingResponse };
-    return stats.data;
-  } catch (error) {
-    console.error('Error fetching forum question funding:', error);
-    return null;
-  }
-}
-
-export default fetchForumQuestionFunding;
diff --git a/packages/api/src/fetchForumQuestionStatistics.ts b/packages/api/src/fetchForumQuestionStatistics.ts
deleted file mode 100644
index fe14e18d..00000000
--- a/packages/api/src/fetchForumQuestionStatistics.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { GetForumQuestionStatisticsResponse } from './types';
-
-async function fetchForumQuestionStatistics(
-  questionId: string,
-): Promise<GetForumQuestionStatisticsResponse | null> {
-  try {
-    const response = await fetch(
-      `${import.meta.env.VITE_SERVER_URL}/api/forum-questions/${questionId}/statistics`,
-      {
-        credentials: 'include',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-      },
-    );
-    if (!response.ok) {
-      throw new Error(`HTTP Error! Status: ${response.status}`);
-    }
-
-    const stats = (await response.json()) as { data: GetForumQuestionStatisticsResponse };
-    return stats.data;
-  } catch (error) {
-    console.error('Error fetching forum question statistics:', error);
-    return null;
-  }
-}
-
-export default fetchForumQuestionStatistics;
diff --git a/packages/api/src/fetchGroupCategories.ts b/packages/api/src/fetchGroupCategories.ts
index f9c4d49d..7fdc3a82 100644
--- a/packages/api/src/fetchGroupCategories.ts
+++ b/packages/api/src/fetchGroupCategories.ts
@@ -1,8 +1,10 @@
-import { GetGroupCategoriesResponse } from './types';
+import { ApiRequest, GetGroupCategoriesResponse } from './types';
 
-async function fetchGroupCategories(): Promise<GetGroupCategoriesResponse | null> {
+export async function fetchGroupCategories({
+  serverUrl,
+}: ApiRequest<unknown>): Promise<GetGroupCategoriesResponse | null> {
   try {
-    const response = await fetch(`${import.meta.env.VITE_SERVER_URL}/api/group-categories`, {
+    const response = await fetch(`${serverUrl}/api/group-categories`, {
       credentials: 'include',
       headers: {
         'Content-type': 'application/json',
@@ -20,5 +22,3 @@ async function fetchGroupCategories(): Promise<GetGroupCategoriesResponse | null
     return null;
   }
 }
-
-export default fetchGroupCategories;
diff --git a/packages/api/src/fetchGroupMembers.ts b/packages/api/src/fetchGroupMembers.ts
index 25344860..60781ffc 100644
--- a/packages/api/src/fetchGroupMembers.ts
+++ b/packages/api/src/fetchGroupMembers.ts
@@ -1,16 +1,16 @@
-import { GetGroupMembers } from './types';
+import { ApiRequest, GetGroupMembers } from './types';
 
-async function fetchGroupMembers(groupId: string): Promise<GetGroupMembers | null> {
+export async function fetchGroupMembers({
+  serverUrl,
+  groupId,
+}: ApiRequest<{ groupId: string }>): Promise<GetGroupMembers | null> {
   try {
-    const response = await fetch(
-      `${import.meta.env.VITE_SERVER_URL}/api/groups/${groupId}/users-to-groups`,
-      {
-        credentials: 'include',
-        headers: {
-          'Content-type': 'application/json',
-        },
+    const response = await fetch(`${serverUrl}/api/groups/${groupId}/users-to-groups`, {
+      credentials: 'include',
+      headers: {
+        'Content-type': 'application/json',
       },
-    );
+    });
 
     if (!response.ok) {
       throw new Error(`HTTP Error! Status: ${response.status}`);
@@ -23,5 +23,3 @@ async function fetchGroupMembers(groupId: string): Promise<GetGroupMembers | nul
     return null;
   }
 }
-
-export default fetchGroupMembers;
diff --git a/packages/api/src/fetchGroupRegistrations.ts b/packages/api/src/fetchGroupRegistrations.ts
index d5d53f29..3fe3d1d5 100644
--- a/packages/api/src/fetchGroupRegistrations.ts
+++ b/packages/api/src/fetchGroupRegistrations.ts
@@ -1,16 +1,16 @@
-import { GetGroupRegistrations } from './types';
+import { ApiRequest, GetGroupRegistrations } from './types';
 
-async function fetchGroupRegistrations(groupId: string): Promise<GetGroupRegistrations | null> {
+export async function fetchGroupRegistrations({
+  serverUrl,
+  groupId,
+}: ApiRequest<{ groupId: string }>): Promise<GetGroupRegistrations | null> {
   try {
-    const response = await fetch(
-      `${import.meta.env.VITE_SERVER_URL}/api/groups/${groupId}/registrations`,
-      {
-        credentials: 'include',
-        headers: {
-          'Content-type': 'application/json',
-        },
+    const response = await fetch(`${serverUrl}/api/groups/${groupId}/registrations`, {
+      credentials: 'include',
+      headers: {
+        'Content-type': 'application/json',
       },
-    );
+    });
 
     if (!response.ok) {
       throw new Error(`HTTP Error! Status: ${response.status}`);
@@ -23,5 +23,3 @@ async function fetchGroupRegistrations(groupId: string): Promise<GetGroupRegistr
     return null;
   }
 }
-
-export default fetchGroupRegistrations;
diff --git a/packages/api/src/fetchGroups.ts b/packages/api/src/fetchGroups.ts
index bda24450..c14d776b 100644
--- a/packages/api/src/fetchGroups.ts
+++ b/packages/api/src/fetchGroups.ts
@@ -1,20 +1,16 @@
-import { GetGroupsResponse } from './types';
+import { ApiRequest, GetGroupsResponse } from './types';
 
-async function fetchGroups({
+export async function fetchGroups({
+  serverUrl,
   groupCategoryId,
-}: {
-  groupCategoryId: string;
-}): Promise<GetGroupsResponse[] | null> {
+}: ApiRequest<{ groupCategoryId: string }>): Promise<GetGroupsResponse[] | null> {
   try {
-    const response = await fetch(
-      `${import.meta.env.VITE_SERVER_URL}/api/group-categories/${groupCategoryId}/groups`,
-      {
-        credentials: 'include',
-        headers: {
-          'Content-type': 'application/json',
-        },
+    const response = await fetch(`${serverUrl}/api/group-categories/${groupCategoryId}/groups`, {
+      credentials: 'include',
+      headers: {
+        'Content-type': 'application/json',
       },
-    );
+    });
 
     if (!response.ok) {
       throw new Error(`HTTP Error! Status: ${response.status}`);
@@ -27,5 +23,3 @@ async function fetchGroups({
     return null;
   }
 }
-
-export default fetchGroups;
diff --git a/packages/api/src/fetchOption.ts b/packages/api/src/fetchOption.ts
index 4b483e5b..138d29af 100644
--- a/packages/api/src/fetchOption.ts
+++ b/packages/api/src/fetchOption.ts
@@ -1,8 +1,11 @@
-import { GetQuestionOptionResponse } from './types';
+import { ApiRequest, GetQuestionOptionResponse } from './types';
 
-async function fetchOption(optionId: string): Promise<GetQuestionOptionResponse | null> {
+export async function fetchOption({
+  serverUrl,
+  optionId,
+}: ApiRequest<{ optionId: string }>): Promise<GetQuestionOptionResponse | null> {
   try {
-    const response = await fetch(`${import.meta.env.VITE_SERVER_URL}/api/options/${optionId}`, {
+    const response = await fetch(`${serverUrl}/api/options/${optionId}`, {
       credentials: 'include',
       headers: {
         'Content-type': 'application/json',
@@ -19,5 +22,3 @@ async function fetchOption(optionId: string): Promise<GetQuestionOptionResponse
     return null;
   }
 }
-
-export default fetchOption;
diff --git a/packages/api/src/fetchOptionUsers.ts b/packages/api/src/fetchOptionUsers.ts
index 57792972..8edcda4c 100644
--- a/packages/api/src/fetchOptionUsers.ts
+++ b/packages/api/src/fetchOptionUsers.ts
@@ -1,16 +1,16 @@
-import { GetOptionUsersResponse } from './types';
+import { ApiRequest, GetOptionUsersResponse } from './types';
 
-async function fetchOptionUsers(optionId: string): Promise<GetOptionUsersResponse | null> {
+export async function fetchOptionUsers({
+  serverUrl,
+  optionId,
+}: ApiRequest<{ optionId: string }>): Promise<GetOptionUsersResponse | null> {
   try {
-    const response = await fetch(
-      `${import.meta.env.VITE_SERVER_URL}/api/options/${optionId}/users`,
-      {
-        credentials: 'include',
-        headers: {
-          'Content-Type': 'application/json',
-        },
+    const response = await fetch(`${serverUrl}/api/options/${optionId}/users`, {
+      credentials: 'include',
+      headers: {
+        'Content-Type': 'application/json',
       },
-    );
+    });
 
     if (!response.ok) {
       throw new Error(`HTTP Error! Status: ${response.status}`);
@@ -23,5 +23,3 @@ async function fetchOptionUsers(optionId: string): Promise<GetOptionUsersRespons
     return null;
   }
 }
-
-export default fetchOptionUsers;
diff --git a/packages/api/src/fetchQuestionFunding.ts b/packages/api/src/fetchQuestionFunding.ts
new file mode 100644
index 00000000..ad79650f
--- /dev/null
+++ b/packages/api/src/fetchQuestionFunding.ts
@@ -0,0 +1,24 @@
+import { ApiRequest, GetFundingResponse } from './types';
+
+export async function fetchQuestionFunding({
+  serverUrl,
+  questionId,
+}: ApiRequest<{ questionId: string }>): Promise<GetFundingResponse | null> {
+  try {
+    const response = await fetch(`${serverUrl}/api/questions/${questionId}/funding`, {
+      credentials: 'include',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+    });
+    if (!response.ok) {
+      throw new Error(`HTTP Error! Status: ${response.status}`);
+    }
+
+    const stats = (await response.json()) as { data: GetFundingResponse };
+    return stats.data;
+  } catch (error) {
+    console.error('Error fetching forum question funding:', error);
+    return null;
+  }
+}
diff --git a/packages/api/src/fetchQuestionStatistics.ts b/packages/api/src/fetchQuestionStatistics.ts
new file mode 100644
index 00000000..aeeb3578
--- /dev/null
+++ b/packages/api/src/fetchQuestionStatistics.ts
@@ -0,0 +1,24 @@
+import { ApiRequest, GetQuestionStatisticsResponse } from './types';
+
+export async function fetchQuestionStatistics({
+  serverUrl,
+  questionId,
+}: ApiRequest<{ questionId: string }>): Promise<GetQuestionStatisticsResponse | null> {
+  try {
+    const response = await fetch(`${serverUrl}/api/questions/${questionId}/statistics`, {
+      credentials: 'include',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+    });
+    if (!response.ok) {
+      throw new Error(`HTTP Error! Status: ${response.status}`);
+    }
+
+    const stats = (await response.json()) as { data: GetQuestionStatisticsResponse };
+    return stats.data;
+  } catch (error) {
+    console.error('Error fetching forum question statistics:', error);
+    return null;
+  }
+}
diff --git a/packages/api/src/fetchRegistrationData.ts b/packages/api/src/fetchRegistrationData.ts
index a896fa7d..01a7267a 100644
--- a/packages/api/src/fetchRegistrationData.ts
+++ b/packages/api/src/fetchRegistrationData.ts
@@ -1,11 +1,12 @@
-import { GetRegistrationDataResponse } from './types';
+import { ApiRequest, GetRegistrationDataResponse } from './types';
 
-async function fetchRegistrationData(
-  registrationId: string,
-): Promise<GetRegistrationDataResponse | null> {
+export async function fetchRegistrationData({
+  serverUrl,
+  registrationId,
+}: ApiRequest<{ registrationId: string }>): Promise<GetRegistrationDataResponse | null> {
   try {
     const response = await fetch(
-      `${import.meta.env.VITE_SERVER_URL}/api/registrations/${registrationId}/registration-data`,
+      `${serverUrl}/api/registrations/${registrationId}/registration-data`,
       {
         credentials: 'include',
         headers: {
@@ -25,5 +26,3 @@ async function fetchRegistrationData(
     return null;
   }
 }
-
-export default fetchRegistrationData;
diff --git a/packages/api/src/fetchRegistrationFields.ts b/packages/api/src/fetchRegistrationFields.ts
index 6b92592e..56840ea2 100644
--- a/packages/api/src/fetchRegistrationFields.ts
+++ b/packages/api/src/fetchRegistrationFields.ts
@@ -1,18 +1,16 @@
-import { GetRegistrationFieldsResponse } from './types';
+import { ApiRequest, GetRegistrationFieldsResponse } from './types';
 
-async function fetchRegistrationFields(
-  eventId: string,
-): Promise<GetRegistrationFieldsResponse | null> {
+export async function fetchRegistrationFields({
+  serverUrl,
+  eventId,
+}: ApiRequest<{ eventId: string }>): Promise<GetRegistrationFieldsResponse | null> {
   try {
-    const response = await fetch(
-      `${import.meta.env.VITE_SERVER_URL}/api/events/${eventId}/registration-fields`,
-      {
-        credentials: 'include',
-        headers: {
-          'Content-Type': 'application/json',
-        },
+    const response = await fetch(`${serverUrl}/api/events/${eventId}/registration-fields`, {
+      credentials: 'include',
+      headers: {
+        'Content-Type': 'application/json',
       },
-    );
+    });
 
     if (!response.ok) {
       throw new Error(`HTTP error! Status: ${response.status}`);
@@ -25,5 +23,3 @@ async function fetchRegistrationFields(
     return null;
   }
 }
-
-export default fetchRegistrationFields;
diff --git a/packages/api/src/fetchRegistrations.ts b/packages/api/src/fetchRegistrations.ts
index 48ec2aac..364f8a23 100644
--- a/packages/api/src/fetchRegistrations.ts
+++ b/packages/api/src/fetchRegistrations.ts
@@ -1,16 +1,16 @@
-import { GetRegistrationsResponseType } from './types';
+import { ApiRequest, GetRegistrationsResponseType } from './types';
 
-async function fetchRegistrations(eventId: string): Promise<GetRegistrationsResponseType | null> {
+export async function fetchRegistrations({
+  serverUrl,
+  eventId,
+}: ApiRequest<{ eventId: string }>): Promise<GetRegistrationsResponseType | null> {
   try {
-    const response = await fetch(
-      `${import.meta.env.VITE_SERVER_URL}/api/events/${eventId}/registrations`,
-      {
-        credentials: 'include',
-        headers: {
-          'Content-Type': 'application/json',
-        },
+    const response = await fetch(`${serverUrl}/api/events/${eventId}/registrations`, {
+      credentials: 'include',
+      headers: {
+        'Content-Type': 'application/json',
       },
-    );
+    });
 
     if (!response.ok) {
       throw new Error(`HTTP error! Status: ${response.status}`);
@@ -27,5 +27,3 @@ async function fetchRegistrations(eventId: string): Promise<GetRegistrationsResp
     return null;
   }
 }
-
-export default fetchRegistrations;
diff --git a/packages/api/src/fetchUser.ts b/packages/api/src/fetchUser.ts
index d594c32b..2a9120f6 100644
--- a/packages/api/src/fetchUser.ts
+++ b/packages/api/src/fetchUser.ts
@@ -1,8 +1,10 @@
-import { GetUserResponse } from './types';
+import { ApiRequest, GetUserResponse } from './types';
 
-async function fetchUserData(): Promise<GetUserResponse | null> {
+export async function fetchUser({
+  serverUrl,
+}: ApiRequest<unknown>): Promise<GetUserResponse | null> {
   try {
-    const response = await fetch(`${import.meta.env.VITE_SERVER_URL}/api/users`, {
+    const response = await fetch(`${serverUrl}/api/users`, {
       credentials: 'include',
       headers: {
         'Content-Type': 'application/json',
@@ -20,5 +22,3 @@ async function fetchUserData(): Promise<GetUserResponse | null> {
     return null;
   }
 }
-
-export default fetchUserData;
diff --git a/packages/api/src/fetchUserAttributes.ts b/packages/api/src/fetchUserAttributes.ts
index cf718a2f..7b5948e2 100644
--- a/packages/api/src/fetchUserAttributes.ts
+++ b/packages/api/src/fetchUserAttributes.ts
@@ -1,16 +1,16 @@
-import { GetUserAttributesResponse } from './types';
+import { ApiRequest, GetUserAttributesResponse } from './types';
 
-async function fetchUserAttributes(userId: string): Promise<GetUserAttributesResponse | null> {
+export async function fetchUserAttributes({
+  serverUrl,
+  userId,
+}: ApiRequest<{ userId: string }>): Promise<GetUserAttributesResponse | null> {
   try {
-    const response = await fetch(
-      `${import.meta.env.VITE_SERVER_URL}/api/users/${userId}/attributes`,
-      {
-        credentials: 'include',
-        headers: {
-          'Content-Type': 'application/json',
-        },
+    const response = await fetch(`${serverUrl}/api/users/${userId}/attributes`, {
+      credentials: 'include',
+      headers: {
+        'Content-Type': 'application/json',
       },
-    );
+    });
 
     if (!response.ok) {
       throw new Error(`HTTP Error! Status: ${response.status}`);
@@ -23,5 +23,3 @@ async function fetchUserAttributes(userId: string): Promise<GetUserAttributesRes
     return null;
   }
 }
-
-export default fetchUserAttributes;
diff --git a/packages/api/src/fetchUserOptions.ts b/packages/api/src/fetchUserOptions.ts
index eff058d9..e2ef1e2c 100644
--- a/packages/api/src/fetchUserOptions.ts
+++ b/packages/api/src/fetchUserOptions.ts
@@ -1,8 +1,12 @@
-import { GetUserOptionsResponse } from './types/UserOptionType';
+import { ApiRequest } from './types';
+import { GetUserOptionsResponse } from './types/UserOptions';
 
-async function fetchUserOptions(userId: string): Promise<GetUserOptionsResponse | null> {
+export async function fetchUserOptions({
+  serverUrl,
+  userId,
+}: ApiRequest<{ userId: string }>): Promise<GetUserOptionsResponse | null> {
   try {
-    const response = await fetch(`${import.meta.env.VITE_SERVER_URL}/api/users/${userId}/options`, {
+    const response = await fetch(`${serverUrl}/api/users/${userId}/options`, {
       credentials: 'include',
       headers: {
         'Content-Type': 'application/json',
@@ -20,5 +24,3 @@ async function fetchUserOptions(userId: string): Promise<GetUserOptionsResponse
     return null;
   }
 }
-
-export default fetchUserOptions;
diff --git a/packages/api/src/fetchUserRegistrations.ts b/packages/api/src/fetchUserRegistrations.ts
index 0ee8786f..ed741920 100644
--- a/packages/api/src/fetchUserRegistrations.ts
+++ b/packages/api/src/fetchUserRegistrations.ts
@@ -1,18 +1,16 @@
-import { GetRegistrationsResponseType } from './types';
+import { ApiRequest, GetRegistrationsResponseType } from './types';
 
-async function fetchUserRegistrations(
-  userId: string,
-): Promise<GetRegistrationsResponseType | null> {
+export async function fetchUserRegistrations({
+  serverUrl,
+  userId,
+}: ApiRequest<{ userId: string }>): Promise<GetRegistrationsResponseType | null> {
   try {
-    const response = await fetch(
-      `${import.meta.env.VITE_SERVER_URL}/api/users/${userId}/registrations`,
-      {
-        credentials: 'include',
-        headers: {
-          'Content-Type': 'application/json',
-        },
+    const response = await fetch(`${serverUrl}/api/users/${userId}/registrations`, {
+      credentials: 'include',
+      headers: {
+        'Content-Type': 'application/json',
       },
-    );
+    });
 
     if (!response.ok) {
       throw new Error(`HTTP Error! Status: ${response.status}`);
@@ -25,5 +23,3 @@ async function fetchUserRegistrations(
     return null;
   }
 }
-
-export default fetchUserRegistrations;
diff --git a/packages/api/src/fetchUserVotes.ts b/packages/api/src/fetchUserVotes.ts
index d957578a..fab3d056 100644
--- a/packages/api/src/fetchUserVotes.ts
+++ b/packages/api/src/fetchUserVotes.ts
@@ -1,8 +1,11 @@
-import { GetUserVotesResponse } from './types';
+import { ApiRequest, GetUserVotesResponse } from './types';
 
-async function fetchUserVotes(cycleId: string): Promise<GetUserVotesResponse | null> {
+export async function fetchUserVotes({
+  serverUrl,
+  cycleId,
+}: ApiRequest<{ cycleId: string }>): Promise<GetUserVotesResponse | null> {
   try {
-    const response = await fetch(`${import.meta.env.VITE_SERVER_URL}/api/cycles/${cycleId}/votes`, {
+    const response = await fetch(`${serverUrl}/api/cycles/${cycleId}/votes`, {
       credentials: 'include',
       headers: {
         'Content-Type': 'application/json',
@@ -19,5 +22,3 @@ async function fetchUserVotes(cycleId: string): Promise<GetUserVotesResponse | n
     return null;
   }
 }
-
-export default fetchUserVotes;
diff --git a/packages/api/src/fetchUsersToGroups.ts b/packages/api/src/fetchUsersToGroups.ts
index 533361c0..a5188ceb 100644
--- a/packages/api/src/fetchUsersToGroups.ts
+++ b/packages/api/src/fetchUsersToGroups.ts
@@ -1,16 +1,16 @@
-import { GetUsersToGroupsResponse } from './types';
+import { ApiRequest, GetUsersToGroupsResponse } from './types';
 
-async function fetchUsersToGroups(userId: string): Promise<GetUsersToGroupsResponse | null> {
+export async function fetchUsersToGroups({
+  serverUrl,
+  userId,
+}: ApiRequest<{ userId: string }>): Promise<GetUsersToGroupsResponse | null> {
   try {
-    const response = await fetch(
-      `${import.meta.env.VITE_SERVER_URL}/api/users/${userId}/users-to-groups`,
-      {
-        credentials: 'include',
-        headers: {
-          'Content-Type': 'application/json',
-        },
+    const response = await fetch(`${serverUrl}/api/users/${userId}/users-to-groups`, {
+      credentials: 'include',
+      headers: {
+        'Content-Type': 'application/json',
       },
-    );
+    });
 
     if (!response.ok) {
       throw new Error(`HTTP Error! Status: ${response.status}`);
@@ -23,5 +23,3 @@ async function fetchUsersToGroups(userId: string): Promise<GetUsersToGroupsRespo
     return null;
   }
 }
-
-export default fetchUsersToGroups;
diff --git a/packages/api/src/index.ts b/packages/api/src/index.ts
index 5f3de8b5..ed31b4af 100644
--- a/packages/api/src/index.ts
+++ b/packages/api/src/index.ts
@@ -1,41 +1,41 @@
-export { default as deleteComment } from './deleteComment';
-export { default as deleteLike } from './deleteLike';
-export { default as deleteUsersToGroups } from './deleteUsersToGroups';
-export { default as fetchAlerts } from './fetchAlerts';
-export { default as fetchCommentLikes } from './fetchCommentLikes';
-export { default as fetchComments } from './fetchComments';
-export { default as fetchCycle } from './fetchCycle';
-export { default as fetchCycles } from './fetchCycles';
-export { default as fetchEvent } from './fetchEvent';
-export { default as fetchEventCycles } from './fetchEventCycles';
-export { default as fetchEvents } from './fetchEvents';
-export { default as fetchForumQuestionStatistics } from './fetchForumQuestionStatistics';
-export { default as fetchForumQuestionFunding } from './fetchForumQuestionFunding';
-export { default as fetchGroupCategories } from './fetchGroupCategories';
-export { default as fetchGroupMembers } from './fetchGroupMembers';
-export { default as fetchGroupRegistrations } from './fetchGroupRegistrations';
-export { default as fetchGroups } from './fetchGroups';
-export { default as fetchOption } from './fetchOption';
-export { default as fetchOptionUsers } from './fetchOptionUsers';
-export { default as fetchRegistrationData } from './fetchRegistrationData';
-export { default as fetchRegistrationFields } from './fetchRegistrationFields';
-export { default as fetchRegistrations } from './fetchRegistrations';
-export { default as fetchUser } from './fetchUser';
-export { default as fetchUserAttributes } from './fetchUserAttributes';
-export { default as fetchUserRegistrations } from './fetchUserRegistrations';
-export { default as fetchUsersToGroups } from './fetchUsersToGroups';
-export { default as fetchUserVotes } from './fetchUserVotes';
-export { default as logout } from './logout';
-export { default as postComment } from './postComment';
-export { default as postGroup } from './postGroup';
-export { default as postLike } from './postLike';
-export { default as postPcdStr } from './postVerify';
-export { default as postRegistration } from './postRegistration';
-export { default as postUsersToGroups } from './postUsersToGroups';
-export { default as postVotes } from './postVotes';
-export { default as putRegistration } from './putRegistration';
-export { default as putUser } from './putUser';
-export { default as putUsersToGroups } from './putUsersToGroups';
-export { default as fetchEventGroupCategories } from './fetchEventGroupCategories';
-export { default as fetchUserOptions } from './fetchUserOptions';
+export * from './deleteComment';
+export * from './deleteLike';
+export * from './deleteUsersToGroups';
+export * from './fetchAlerts';
+export * from './fetchCommentLikes';
+export * from './fetchComments';
+export * from './fetchCycle';
+export * from './fetchCycles';
+export * from './fetchEvent';
+export * from './fetchEventCycles';
+export * from './fetchEvents';
+export * from './fetchQuestionStatistics';
+export * from './fetchQuestionFunding';
+export * from './fetchGroupCategories';
+export * from './fetchGroupMembers';
+export * from './fetchGroupRegistrations';
+export * from './fetchGroups';
+export * from './fetchOption';
+export * from './fetchOptionUsers';
+export * from './fetchRegistrationData';
+export * from './fetchRegistrationFields';
+export * from './fetchRegistrations';
+export * from './fetchUser';
+export * from './fetchUserAttributes';
+export * from './fetchUserRegistrations';
+export * from './fetchUsersToGroups';
+export * from './fetchUserVotes';
+export * from './logout';
+export * from './postComment';
+export * from './postGroup';
+export * from './postLike';
+export * from './postVerify';
+export * from './postRegistration';
+export * from './postUsersToGroups';
+export * from './postVotes';
+export * from './putRegistration';
+export * from './putUser';
+export * from './putUsersToGroups';
+export * from './fetchEventGroupCategories';
+export * from './fetchUserOptions';
 export * from './types';
diff --git a/packages/api/src/logout.ts b/packages/api/src/logout.ts
index 71c04daf..d56f6c99 100644
--- a/packages/api/src/logout.ts
+++ b/packages/api/src/logout.ts
@@ -1,6 +1,8 @@
-async function logout() {
+import { ApiRequest } from './types';
+
+export async function logout({ serverUrl }: ApiRequest<unknown>) {
   try {
-    const response = await fetch(`${import.meta.env.VITE_SERVER_URL}/api/auth/logout`, {
+    const response = await fetch(`${serverUrl}/api/auth/logout`, {
       method: 'POST',
       credentials: 'include',
       headers: {
@@ -18,5 +20,3 @@ async function logout() {
     throw new Error('Logout failed');
   }
 }
-
-export default logout;
diff --git a/packages/api/src/postComment.ts b/packages/api/src/postComment.ts
index 35a8c0ed..e7693bc5 100644
--- a/packages/api/src/postComment.ts
+++ b/packages/api/src/postComment.ts
@@ -1,11 +1,12 @@
-import { PostCommentRequest, PostCommentResponse } from './types';
+import { ApiRequest, PostCommentRequest, PostCommentResponse } from './types';
 
-async function postComment({
+export async function postComment({
   questionOptionId,
   value,
-}: PostCommentRequest): Promise<PostCommentResponse | null> {
+  serverUrl,
+}: ApiRequest<PostCommentRequest>): Promise<PostCommentResponse | null> {
   try {
-    const response = await fetch(`${import.meta.env.VITE_SERVER_URL}/api/comments`, {
+    const response = await fetch(`${serverUrl}/api/comments`, {
       method: 'POST',
       credentials: 'include',
       headers: {
@@ -25,5 +26,3 @@ async function postComment({
     return null;
   }
 }
-
-export default postComment;
diff --git a/packages/api/src/postGroup.ts b/packages/api/src/postGroup.ts
index 53bd46c2..61d90694 100644
--- a/packages/api/src/postGroup.ts
+++ b/packages/api/src/postGroup.ts
@@ -1,11 +1,12 @@
-import { PostGroupRequest, PostGroupResponse } from './types';
+import { ApiRequest, PostGroupRequest, PostGroupResponse } from './types';
 
-async function postGroup({
+export async function postGroup({
   name,
   groupCategoryId,
-}: PostGroupRequest): Promise<PostGroupResponse | null> {
+  serverUrl,
+}: ApiRequest<PostGroupRequest>): Promise<PostGroupResponse | null> {
   try {
-    const response = await fetch(`${import.meta.env.VITE_SERVER_URL}/api/groups`, {
+    const response = await fetch(`${serverUrl}/api/groups`, {
       method: 'POST',
       credentials: 'include',
       headers: {
@@ -28,5 +29,3 @@ async function postGroup({
     return null;
   }
 }
-
-export default postGroup;
diff --git a/packages/api/src/postLike.ts b/packages/api/src/postLike.ts
index 5b1e7099..75d3ed85 100644
--- a/packages/api/src/postLike.ts
+++ b/packages/api/src/postLike.ts
@@ -1,17 +1,17 @@
-import { PostLikeRequest, PostLikeResponse } from './types';
+import { ApiRequest, PostLikeRequest, PostLikeResponse } from './types';
 
-async function postLike({ commentId }: PostLikeRequest): Promise<PostLikeResponse | null> {
+export async function postLike({
+  commentId,
+  serverUrl,
+}: ApiRequest<PostLikeRequest>): Promise<PostLikeResponse | null> {
   try {
-    const response = await fetch(
-      `${import.meta.env.VITE_SERVER_URL}/api/comments/${commentId}/likes`,
-      {
-        method: 'POST',
-        credentials: 'include',
-        headers: {
-          'Content-Type': 'application/json',
-        },
+    const response = await fetch(`${serverUrl}/api/comments/${commentId}/likes`, {
+      method: 'POST',
+      credentials: 'include',
+      headers: {
+        'Content-Type': 'application/json',
       },
-    );
+    });
 
     if (!response.ok) {
       throw new Error(`HTTP Error! Status: ${response.status}`);
@@ -24,5 +24,3 @@ async function postLike({ commentId }: PostLikeRequest): Promise<PostLikeRespons
     return null;
   }
 }
-
-export default postLike;
diff --git a/packages/api/src/postRegistration.ts b/packages/api/src/postRegistration.ts
index c4dc6027..365eed51 100644
--- a/packages/api/src/postRegistration.ts
+++ b/packages/api/src/postRegistration.ts
@@ -1,12 +1,13 @@
-import { PostRegistrationRequest, PostRegistrationResponse } from './types';
+import { ApiRequest, PostRegistrationRequest, PostRegistrationResponse } from './types';
 
-async function postRegistration({
+export async function postRegistration({
   body,
-}: {
+  serverUrl,
+}: ApiRequest<{
   body: PostRegistrationRequest;
-}): Promise<PostRegistrationResponse | null> {
+}>): Promise<PostRegistrationResponse | null> {
   try {
-    const response = await fetch(`${import.meta.env.VITE_SERVER_URL}/api/registrations`, {
+    const response = await fetch(`${serverUrl}/api/registrations`, {
       method: 'POST',
       credentials: 'include',
       headers: {
@@ -26,5 +27,3 @@ async function postRegistration({
     return null;
   }
 }
-
-export default postRegistration;
diff --git a/packages/api/src/postUsersToGroups.ts b/packages/api/src/postUsersToGroups.ts
index a4357b9b..f39f3877 100644
--- a/packages/api/src/postUsersToGroups.ts
+++ b/packages/api/src/postUsersToGroups.ts
@@ -1,11 +1,14 @@
-import { PostUsersToGroupsRequest, PostUsersToGroupsResponse } from './types';
+import { ApiRequest, PostUsersToGroupsRequest, PostUsersToGroupsResponse } from './types';
 
-async function postUserToGroups({
+export async function postUsersToGroups({
   secret,
   groupId,
-}: PostUsersToGroupsRequest): Promise<PostUsersToGroupsResponse | { errors: string[] } | null> {
+  serverUrl,
+}: ApiRequest<PostUsersToGroupsRequest>): Promise<
+  PostUsersToGroupsResponse | { errors: string[] } | null
+> {
   try {
-    const response = await fetch(`${import.meta.env.VITE_SERVER_URL}/api/users-to-groups`, {
+    const response = await fetch(`${serverUrl}/api/users-to-groups`, {
       method: 'POST',
       credentials: 'include',
       headers: {
@@ -32,5 +35,3 @@ async function postUserToGroups({
     return null;
   }
 }
-
-export default postUserToGroups;
diff --git a/packages/api/src/postVerify.ts b/packages/api/src/postVerify.ts
index 9b68549d..d3753ce8 100644
--- a/packages/api/src/postVerify.ts
+++ b/packages/api/src/postVerify.ts
@@ -1,18 +1,23 @@
-import { GetUserResponse } from './types';
+import { ApiRequest, GetUserResponse } from './types';
 
-async function postVerify(body: {
+export async function postVerify({
+  email,
+  pcdStr,
+  serverUrl,
+  uuid,
+}: ApiRequest<{
   pcdStr: string;
   email: string;
   uuid: string;
-}): Promise<GetUserResponse | null> {
+}>): Promise<GetUserResponse | null> {
   try {
-    const response = await fetch(`${import.meta.env.VITE_SERVER_URL}/api/auth/zupass/verify`, {
+    const response = await fetch(`${serverUrl}/api/auth/zupass/verify`, {
       method: 'POST',
       credentials: 'include',
       headers: {
         'Content-Type': 'application/json',
       },
-      body: JSON.stringify({ pcd: body.pcdStr, email: body.email, uuid: body.uuid }),
+      body: JSON.stringify({ pcd: pcdStr, email: email, uuid: uuid }),
     });
 
     if (!response.ok) {
@@ -26,5 +31,3 @@ async function postVerify(body: {
     return null;
   }
 }
-
-export default postVerify;
diff --git a/packages/api/src/postVotes.ts b/packages/api/src/postVotes.ts
index 2f660a9b..b486afc4 100644
--- a/packages/api/src/postVotes.ts
+++ b/packages/api/src/postVotes.ts
@@ -1,8 +1,11 @@
-import { PostVotesRequest, PostVotesResponse } from './types';
+import { ApiRequest, PostVotesRequest, PostVotesResponse } from './types';
 
-async function postVotes({ votes }: PostVotesRequest): Promise<PostVotesResponse | null> {
+export async function postVotes({
+  votes,
+  serverUrl,
+}: ApiRequest<PostVotesRequest>): Promise<PostVotesResponse | null> {
   try {
-    const response = await fetch(`${import.meta.env.VITE_SERVER_URL}/api/votes`, {
+    const response = await fetch(`${serverUrl}/api/votes`, {
       method: 'POST',
       credentials: 'include',
       headers: {
@@ -22,5 +25,3 @@ async function postVotes({ votes }: PostVotesRequest): Promise<PostVotesResponse
     return null;
   }
 }
-
-export default postVotes;
diff --git a/packages/api/src/putRegistration.ts b/packages/api/src/putRegistration.ts
index 50afa574..9ddbf0e5 100644
--- a/packages/api/src/putRegistration.ts
+++ b/packages/api/src/putRegistration.ts
@@ -1,24 +1,22 @@
-import { PutRegistrationRequest, PutRegistrationResponse } from './types';
+import { ApiRequest, PutRegistrationRequest, PutRegistrationResponse } from './types';
 
-async function putRegistration({
+export async function putRegistration({
   registrationId,
   body,
-}: {
+  serverUrl,
+}: ApiRequest<{
   registrationId: string;
   body: PutRegistrationRequest;
-}): Promise<PutRegistrationResponse | null> {
+}>): Promise<PutRegistrationResponse | null> {
   try {
-    const response = await fetch(
-      `${import.meta.env.VITE_SERVER_URL}/api/registrations/${registrationId}`,
-      {
-        method: 'PUT',
-        credentials: 'include',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify(body),
+    const response = await fetch(`${serverUrl}/api/registrations/${registrationId}`, {
+      method: 'PUT',
+      credentials: 'include',
+      headers: {
+        'Content-Type': 'application/json',
       },
-    );
+      body: JSON.stringify(body),
+    });
 
     if (!response.ok) {
       throw new Error(`HTTP error! Status: ${response.status}`);
@@ -31,5 +29,3 @@ async function putRegistration({
     return null;
   }
 }
-
-export default putRegistration;
diff --git a/packages/api/src/putUser.ts b/packages/api/src/putUser.ts
index e492ee00..cffd455f 100644
--- a/packages/api/src/putUser.ts
+++ b/packages/api/src/putUser.ts
@@ -1,16 +1,16 @@
-import { PutUserRequest, GetUserResponse } from './types';
+import { PutUserRequest, GetUserResponse, ApiRequest } from './types';
 
-async function updateUserData({
+export async function putUser({
   email,
   firstName,
   lastName,
   telegram,
-  userAttributes,
   userId,
   username,
-}: PutUserRequest): Promise<{ data: GetUserResponse } | { errors: string[] } | null> {
+  serverUrl,
+}: ApiRequest<PutUserRequest>): Promise<{ data: GetUserResponse } | { errors: string[] } | null> {
   try {
-    const response = await fetch(`${import.meta.env.VITE_SERVER_URL}/api/users/${userId}`, {
+    const response = await fetch(`${serverUrl}/api/users/${userId}`, {
       method: 'PUT',
       credentials: 'include',
       headers: {
@@ -21,7 +21,6 @@ async function updateUserData({
         firstName,
         lastName,
         telegram,
-        userAttributes,
         username,
       }),
     });
@@ -41,5 +40,3 @@ async function updateUserData({
     return null;
   }
 }
-
-export default updateUserData;
diff --git a/packages/api/src/putUsersToGroups.ts b/packages/api/src/putUsersToGroups.ts
index 94e3fd08..96f1abcb 100644
--- a/packages/api/src/putUsersToGroups.ts
+++ b/packages/api/src/putUsersToGroups.ts
@@ -1,21 +1,21 @@
-import { PostUsersToGroupsResponse, PutUsersToGroupsRequest } from './types';
+import { ApiRequest, PostUsersToGroupsResponse, PutUsersToGroupsRequest } from './types';
 
-async function postUsersToGroups({
+export async function putUsersToGroups({
   groupId,
   userToGroupId,
-}: PutUsersToGroupsRequest): Promise<PostUsersToGroupsResponse | { errors: string[] } | null> {
+  serverUrl,
+}: ApiRequest<PutUsersToGroupsRequest>): Promise<
+  PostUsersToGroupsResponse | { errors: string[] } | null
+> {
   try {
-    const response = await fetch(
-      `${import.meta.env.VITE_SERVER_URL}/api/users-to-groups/${userToGroupId}`,
-      {
-        method: 'PUT',
-        credentials: 'include',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({ groupId }),
+    const response = await fetch(`${serverUrl}/api/users-to-groups/${userToGroupId}`, {
+      method: 'PUT',
+      credentials: 'include',
+      headers: {
+        'Content-Type': 'application/json',
       },
-    );
+      body: JSON.stringify({ groupId }),
+    });
 
     if (!response.ok) {
       if (response.status < 500) {
@@ -35,5 +35,3 @@ async function postUsersToGroups({
     return null;
   }
 }
-
-export default postUsersToGroups;
diff --git a/packages/api/src/types/AlertType.ts b/packages/api/src/types/Alerts.ts
similarity index 100%
rename from packages/api/src/types/AlertType.ts
rename to packages/api/src/types/Alerts.ts
diff --git a/packages/api/src/types/ApiRequest.ts b/packages/api/src/types/ApiRequest.ts
new file mode 100644
index 00000000..9186407e
--- /dev/null
+++ b/packages/api/src/types/ApiRequest.ts
@@ -0,0 +1,3 @@
+export type ApiRequest<T> = {
+  serverUrl: string;
+} & T;
diff --git a/packages/api/src/types/CommentType.ts b/packages/api/src/types/Comments.ts
similarity index 100%
rename from packages/api/src/types/CommentType.ts
rename to packages/api/src/types/Comments.ts
diff --git a/packages/api/src/types/CycleType.ts b/packages/api/src/types/Cycles.ts
similarity index 96%
rename from packages/api/src/types/CycleType.ts
rename to packages/api/src/types/Cycles.ts
index 28e6e6d6..56ff9166 100644
--- a/packages/api/src/types/CycleType.ts
+++ b/packages/api/src/types/Cycles.ts
@@ -6,7 +6,7 @@ export type GetCycleResponse = {
   status: 'OPEN' | 'CLOSED' | 'UPCOMING' | null;
   startAt: string;
   endAt: string;
-  forumQuestions: {
+  questions: {
     id: string;
     showScore: boolean;
     createdAt: string;
@@ -14,7 +14,7 @@ export type GetCycleResponse = {
     questionSubTitle: string | null;
     cycleId: string;
     questionTitle: string;
-    questionOptions: {
+    options: {
       id: string;
       createdAt: string;
       updatedAt: string;
diff --git a/packages/api/src/types/EventType.ts b/packages/api/src/types/Events.ts
similarity index 100%
rename from packages/api/src/types/EventType.ts
rename to packages/api/src/types/Events.ts
diff --git a/packages/api/src/types/FundingType.ts b/packages/api/src/types/Funding.ts
similarity index 100%
rename from packages/api/src/types/FundingType.ts
rename to packages/api/src/types/Funding.ts
diff --git a/packages/api/src/types/GroupCategoryType.ts b/packages/api/src/types/GroupCategories.ts
similarity index 100%
rename from packages/api/src/types/GroupCategoryType.ts
rename to packages/api/src/types/GroupCategories.ts
diff --git a/packages/api/src/types/GroupMembersType.ts b/packages/api/src/types/GroupMembers.ts
similarity index 100%
rename from packages/api/src/types/GroupMembersType.ts
rename to packages/api/src/types/GroupMembers.ts
diff --git a/packages/api/src/types/GroupRegistrationsType.ts b/packages/api/src/types/GroupRegistrations.ts
similarity index 100%
rename from packages/api/src/types/GroupRegistrationsType.ts
rename to packages/api/src/types/GroupRegistrations.ts
diff --git a/packages/api/src/types/GroupType.ts b/packages/api/src/types/Groups.ts
similarity index 100%
rename from packages/api/src/types/GroupType.ts
rename to packages/api/src/types/Groups.ts
diff --git a/packages/api/src/types/LikeType.ts b/packages/api/src/types/Likes.ts
similarity index 100%
rename from packages/api/src/types/LikeType.ts
rename to packages/api/src/types/Likes.ts
diff --git a/packages/api/src/types/OptionUsersType.ts b/packages/api/src/types/OptionUsers.ts
similarity index 100%
rename from packages/api/src/types/OptionUsersType.ts
rename to packages/api/src/types/OptionUsers.ts
diff --git a/packages/api/src/types/QuestionOptionType.ts b/packages/api/src/types/Options.ts
similarity index 100%
rename from packages/api/src/types/QuestionOptionType.ts
rename to packages/api/src/types/Options.ts
diff --git a/packages/api/src/types/ForumQuestionType.ts b/packages/api/src/types/Questions.ts
similarity index 91%
rename from packages/api/src/types/ForumQuestionType.ts
rename to packages/api/src/types/Questions.ts
index c8cd09ee..3ce98759 100644
--- a/packages/api/src/types/ForumQuestionType.ts
+++ b/packages/api/src/types/Questions.ts
@@ -1,4 +1,4 @@
-export type GetForumQuestionStatisticsResponse = {
+export type GetQuestionStatisticsResponse = {
   numProposals: number;
   sumNumOfHearts: number;
   numOfParticipants: number;
diff --git a/packages/api/src/types/RegistrationDataType.ts b/packages/api/src/types/RegistrationData.ts
similarity index 95%
rename from packages/api/src/types/RegistrationDataType.ts
rename to packages/api/src/types/RegistrationData.ts
index 83c7e198..f6d8168f 100644
--- a/packages/api/src/types/RegistrationDataType.ts
+++ b/packages/api/src/types/RegistrationData.ts
@@ -1,4 +1,4 @@
-import { RegistrationStatus } from './RegistrationType';
+import { RegistrationStatus } from './Registrations';
 
 export type GetRegistrationDataResponse = {
   id: string;
diff --git a/packages/api/src/types/RegistrationFieldOptionType.ts b/packages/api/src/types/RegistrationFieldOptions.ts
similarity index 100%
rename from packages/api/src/types/RegistrationFieldOptionType.ts
rename to packages/api/src/types/RegistrationFieldOptions.ts
diff --git a/packages/api/src/types/RegistrationFieldType.ts b/packages/api/src/types/RegistrationFields.ts
similarity index 98%
rename from packages/api/src/types/RegistrationFieldType.ts
rename to packages/api/src/types/RegistrationFields.ts
index 506308cb..1a707107 100644
--- a/packages/api/src/types/RegistrationFieldType.ts
+++ b/packages/api/src/types/RegistrationFields.ts
@@ -1,4 +1,4 @@
-import { RegistrationFieldOption } from './RegistrationFieldOptionType';
+import { RegistrationFieldOption } from './RegistrationFieldOptions';
 
 export type GetRegistrationFieldsResponse = {
   id: string;
diff --git a/packages/api/src/types/RegistrationType.ts b/packages/api/src/types/Registrations.ts
similarity index 100%
rename from packages/api/src/types/RegistrationType.ts
rename to packages/api/src/types/Registrations.ts
diff --git a/packages/api/src/types/UserAttributesType.ts b/packages/api/src/types/UserAttributes.ts
similarity index 100%
rename from packages/api/src/types/UserAttributesType.ts
rename to packages/api/src/types/UserAttributes.ts
diff --git a/packages/api/src/types/UserOptionType.ts b/packages/api/src/types/UserOptions.ts
similarity index 95%
rename from packages/api/src/types/UserOptionType.ts
rename to packages/api/src/types/UserOptions.ts
index fb0697b4..6208f635 100644
--- a/packages/api/src/types/UserOptionType.ts
+++ b/packages/api/src/types/UserOptions.ts
@@ -10,7 +10,7 @@ export type GetUserOptionsResponse = {
   accepted: boolean | null;
   voteScore: string;
   fundingRequest: string | null;
-  forumQuestion: {
+  question: {
     id: string;
     createdAt: string;
     updatedAt: string;
diff --git a/packages/api/src/types/UserVotesType.ts b/packages/api/src/types/UserVotes.ts
similarity index 100%
rename from packages/api/src/types/UserVotesType.ts
rename to packages/api/src/types/UserVotes.ts
diff --git a/packages/api/src/types/UserType.ts b/packages/api/src/types/Users.ts
similarity index 100%
rename from packages/api/src/types/UserType.ts
rename to packages/api/src/types/Users.ts
diff --git a/packages/api/src/types/UsersToGroupsType.ts b/packages/api/src/types/UsersToGroups.ts
similarity index 100%
rename from packages/api/src/types/UsersToGroupsType.ts
rename to packages/api/src/types/UsersToGroups.ts
diff --git a/packages/api/src/types/index.ts b/packages/api/src/types/index.ts
index 7f94de9e..b0aab253 100644
--- a/packages/api/src/types/index.ts
+++ b/packages/api/src/types/index.ts
@@ -1,21 +1,22 @@
-export * from './AlertType';
-export * from './CommentType';
-export * from './CycleType';
-export * from './EventType';
-export * from './ForumQuestionType';
-export * from './FundingType';
-export * from './GroupCategoryType';
-export * from './GroupMembersType';
-export * from './GroupRegistrationsType';
-export * from './GroupType';
-export * from './LikeType';
-export * from './OptionUsersType';
-export * from './QuestionOptionType';
-export * from './RegistrationDataType';
-export * from './RegistrationFieldOptionType';
-export * from './RegistrationFieldType';
-export * from './RegistrationType';
-export * from './UserAttributesType';
-export * from './UsersToGroupsType';
-export * from './UserType';
-export * from './UserVotesType';
+export * from './Alerts';
+export * from './Comments';
+export * from './Cycles';
+export * from './Events';
+export * from './Questions';
+export * from './Funding';
+export * from './GroupCategories';
+export * from './GroupMembers';
+export * from './GroupRegistrations';
+export * from './Groups';
+export * from './Likes';
+export * from './OptionUsers';
+export * from './Options';
+export * from './RegistrationData';
+export * from './RegistrationFieldOptions';
+export * from './RegistrationFields';
+export * from './Registrations';
+export * from './UserAttributes';
+export * from './UsersToGroups';
+export * from './Users';
+export * from './UserVotes';
+export * from './ApiRequest';
diff --git a/packages/berlin/package.json b/packages/berlin/package.json
index 98f43ed6..3de7f620 100644
--- a/packages/berlin/package.json
+++ b/packages/berlin/package.json
@@ -4,11 +4,11 @@
   "type": "module",
   "main": "./src/main.ts",
   "scripts": {
-    "dev": "vite",
-    "build": "vite build",
-    "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
-    "format": "npx prettier . --write",
-    "preview": "vite preview"
+    "dev": "pnpm exec vite",
+    "build": "pnpm exec vite build",
+    "lint": "pnpm exec eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
+    "format": "pnpm exec prettier . --write",
+    "preview": "pnpm exec vite preview"
   },
   "dependencies": {
     "@radix-ui/react-dialog": "^1.0.5",
@@ -17,30 +17,48 @@
     "@radix-ui/react-popover": "^1.0.7",
     "@radix-ui/react-separator": "^1.1.0",
     "@radix-ui/react-slot": "^1.0.2",
-    "api": "workspace:*",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.0",
     "cmdk": "^1.0.0",
     "lucide-react": "^0.397.0",
     "tailwind-merge": "^2.2.2",
     "tailwindcss-animate": "^1.0.7",
-    "ui": "workspace:*"
+    "@hookform/resolvers": "^3.3.4",
+    "@pcd/passport-interface": "^0.8.0",
+    "@pcd/semaphore-identity-pcd": "^0.8.0",
+    "@pcd/semaphore-signature-pcd": "^0.9.0",
+    "@tanstack/react-query": "^5.13.4",
+    "react": "^18.2.0",
+    "react-content-loader": "^7.0.0",
+    "react-dom": "^18.2.0",
+    "react-hook-form": "^7.49.3",
+    "react-hot-toast": "^2.4.1",
+    "react-markdown": "^9.0.1",
+    "react-router-dom": "^6.20.1",
+    "styled-components": "^6.1.1",
+    "zod": "^3.22.4",
+    "zustand": "^4.4.7",
+    "ui": "workspace:*",
+    "api": "workspace:*"
   },
   "devDependencies": {
     "@types/node": "^20.12.4",
-    "@types/react-dom": "^18.2.22",
     "@types/react": "^18.3.3",
+    "@types/react-dom": "^18.2.22",
     "@typescript-eslint/eslint-plugin": "^7.2.0",
-    "@typescript-eslint/parser": "^7.2.0",
+    "@pcd/pcd-types": "^0.8.0",
+    "@tanstack/react-query-devtools": "^5.13.5",
     "@vitejs/plugin-react": "^4.2.1",
     "autoprefixer": "^10.4.19",
-    "eslint-plugin-react-hooks": "^4.6.0",
-    "eslint-plugin-react-refresh": "^0.4.6",
-    "eslint": "^8.57.0",
-    "postcss-cli": "^11.0.0",
     "postcss": "^8.4.38",
+    "postcss-cli": "^11.0.0",
     "tailwindcss": "^3.4.3",
-    "vite-plugin-dts": "^3.8.1",
-    "vite": "^5.2.0"
+    "vite": "^5.3.5",
+    "vite-plugin-node-polyfills": "^0.17.0",
+    "@hookform/devtools": "^4.3.1",
+    "typescript": "^5.5.2"
+  },
+  "engines": {
+    "node": "^20"
   }
 }
diff --git a/packages/berlin/src/App.tsx b/packages/berlin/src/App.tsx
index a7a349db..f73ac45f 100644
--- a/packages/berlin/src/App.tsx
+++ b/packages/berlin/src/App.tsx
@@ -31,7 +31,7 @@ import SecretGroupRegistration from './pages/SecretGroupRegistration.tsx';
 async function redirectToLandingLoader(queryClient: QueryClient) {
   const user = await queryClient.fetchQuery({
     queryKey: ['user'],
-    queryFn: fetchUser,
+    queryFn: () => fetchUser({ serverUrl: import.meta.env.VITE_SERVER_URL }),
     staleTime: 10000,
   });
 
@@ -47,7 +47,7 @@ async function redirectToLandingLoader(queryClient: QueryClient) {
 async function redirectToAccount(queryClient: QueryClient) {
   const user = await queryClient.fetchQuery({
     queryKey: ['user'],
-    queryFn: fetchUser,
+    queryFn: () => fetchUser({ serverUrl: import.meta.env.VITE_SERVER_URL }),
   });
 
   if (user?.username) {
@@ -65,7 +65,7 @@ async function redirectToAccount(queryClient: QueryClient) {
 async function redirectOnLandingLoader(queryClient: QueryClient) {
   const user = await queryClient.fetchQuery({
     queryKey: ['user'],
-    queryFn: fetchUser,
+    queryFn: () => fetchUser({ serverUrl: import.meta.env.VITE_SERVER_URL }),
   });
 
   if (!user) {
@@ -80,7 +80,7 @@ async function redirectOnLandingLoader(queryClient: QueryClient) {
 
   const events = await queryClient.fetchQuery({
     queryKey: ['events'],
-    queryFn: fetchEvents,
+    queryFn: () => fetchEvents({ serverUrl: import.meta.env.VITE_SERVER_URL }),
   });
 
   const userIsComplete = await redirectToAccount(queryClient);
@@ -92,7 +92,11 @@ async function redirectOnLandingLoader(queryClient: QueryClient) {
   if (events?.length === 1) {
     const registrations = await queryClient.fetchQuery({
       queryKey: ['event', events?.[0].id, 'registrations'],
-      queryFn: () => fetchRegistrations(events?.[0].id || ''),
+      queryFn: () =>
+        fetchRegistrations({
+          eventId: events?.[0].id || '',
+          serverUrl: import.meta.env.VITE_SERVER_URL,
+        }),
     });
 
     if (registrations && registrations.some((registration) => registration.status === 'APPROVED')) {
@@ -111,7 +115,7 @@ async function redirectOnLandingLoader(queryClient: QueryClient) {
 async function redirectToOnlyOneEventLoader(queryClient: QueryClient) {
   const events = await queryClient.fetchQuery({
     queryKey: ['events'],
-    queryFn: fetchEvents,
+    queryFn: () => fetchEvents({ serverUrl: import.meta.env.VITE_SERVER_URL }),
   });
 
   if (events?.length === 1) {
@@ -128,7 +132,8 @@ async function redirectToOnlyOneEventLoader(queryClient: QueryClient) {
 async function redirectToEventHoldingOrRegister(queryClient: QueryClient, eventId?: string) {
   const registrations = await queryClient.fetchQuery({
     queryKey: ['event', eventId, 'registrations'],
-    queryFn: () => fetchRegistrations(eventId || ''),
+    queryFn: () =>
+      fetchRegistrations({ eventId: eventId || '', serverUrl: import.meta.env.VITE_SERVER_URL }),
   });
 
   if (!registrations || !registrations.length) {
@@ -152,7 +157,8 @@ async function redirectToCycleResultsLoader(
 ) {
   const cycle = await queryClient.fetchQuery({
     queryKey: ['cycles', cycleId],
-    queryFn: () => fetchCycle(cycleId || ''),
+    queryFn: () =>
+      fetchCycle({ cycleId: cycleId || '', serverUrl: import.meta.env.VITE_SERVER_URL }),
   });
 
   if (cycle?.status === 'CLOSED') {
@@ -168,7 +174,8 @@ async function redirectToCycleResultsLoader(
 async function redirectToCycleIfOpen(queryClient: QueryClient, eventId?: string, cycleId?: string) {
   const cycle = await queryClient.fetchQuery({
     queryKey: ['cycles', cycleId],
-    queryFn: () => fetchCycle(cycleId || ''),
+    queryFn: () =>
+      fetchCycle({ cycleId: cycleId || '', serverUrl: import.meta.env.VITE_SERVER_URL }),
   });
 
   if (cycle?.status === 'OPEN') {
diff --git a/packages/berlin/src/components/cycles/Cycles.tsx b/packages/berlin/src/components/cycles/Cycles.tsx
index da5a0cc4..7b29b7e9 100644
--- a/packages/berlin/src/components/cycles/Cycles.tsx
+++ b/packages/berlin/src/components/cycles/Cycles.tsx
@@ -16,8 +16,8 @@ function Cycles({ cycles, errorMessage }: CyclesProps) {
     <>
       {cycles?.length ? (
         cycles.map((cycle) => (
-          <div className='flex flex-col border-secondary w-full p-4 gap-4' key={cycle.id}>
-            <Body>{cycle.forumQuestions[0]?.questionTitle}</Body>
+          <div className="border-secondary flex w-full flex-col gap-4 p-4" key={cycle.id}>
+            <Body>{cycle.questions[0]?.questionTitle}</Body>
             <Body>{formatDate(cycle.endAt)}</Body>
           </div>
         ))
diff --git a/packages/berlin/src/components/form/AccountForm.tsx b/packages/berlin/src/components/form/AccountForm.tsx
index 2ea39367..da9b6c24 100644
--- a/packages/berlin/src/components/form/AccountForm.tsx
+++ b/packages/berlin/src/components/form/AccountForm.tsx
@@ -80,6 +80,7 @@ export function AccountForm({
         email: value.email,
         firstName: value.firstName,
         lastName: value.lastName,
+        serverUrl: import.meta.env.VITE_SERVER_URL,
       });
     }
   };
diff --git a/packages/berlin/src/components/header/Header.tsx b/packages/berlin/src/components/header/Header.tsx
index 3fee0c8a..7acf0a19 100644
--- a/packages/berlin/src/components/header/Header.tsx
+++ b/packages/berlin/src/components/header/Header.tsx
@@ -73,19 +73,23 @@ export default function NewHeader() {
 const HeaderLinks = ({ user }: { user: GetUserResponse }) => {
   const { data: events } = useQuery({
     queryKey: ['events'],
-    queryFn: fetchEvents,
+    queryFn: () => fetchEvents({ serverUrl: import.meta.env.VITE_SERVER_URL }),
     enabled: !!user,
   });
 
   const { data: registrationsData } = useQuery({
     queryKey: [user?.id, 'registrations'],
-    queryFn: () => fetchUserRegistrations(user?.id ?? ''),
+    queryFn: () =>
+      fetchUserRegistrations({
+        userId: user?.id ?? '',
+        serverUrl: import.meta.env.VITE_SERVER_URL,
+      }),
     enabled: !!user,
   });
 
   const { data: alerts } = useQuery({
     queryKey: ['alerts'],
-    queryFn: () => fetchAlerts(),
+    queryFn: () => fetchAlerts({ serverUrl: import.meta.env.VITE_SERVER_URL }),
     enabled: !!user,
     refetchInterval: 10000,
   });
@@ -168,7 +172,7 @@ const UserMenuLinks = () => {
       },
       {
         title: 'Log out',
-        onClick: () => mutateLogout(),
+        onClick: () => mutateLogout({ serverUrl: import.meta.env.VITE_SERVER_URL }),
       },
     ];
   }, [mutateLogout]);
diff --git a/packages/berlin/src/components/option-card/OptionCard.tsx b/packages/berlin/src/components/option-card/OptionCard.tsx
index b1ecb8d1..6ac20e37 100644
--- a/packages/berlin/src/components/option-card/OptionCard.tsx
+++ b/packages/berlin/src/components/option-card/OptionCard.tsx
@@ -36,7 +36,7 @@ import {
 } from './OptionCard.styled';
 
 type OptionCardProps = {
-  option: GetCycleResponse['forumQuestions'][number]['questionOptions'][number];
+  option: GetCycleResponse['questions'][number]['options'][number];
   showFundingRequest?: boolean;
   showScore?: boolean;
   numOfVotes: number;
@@ -57,7 +57,8 @@ function OptionCard({
   const navigate = useNavigate();
   const { data: optionUsers } = useQuery({
     queryKey: ['option', option.id, 'users'],
-    queryFn: () => fetchOptionUsers(option.id || ''),
+    queryFn: () =>
+      fetchOptionUsers({ optionId: option.id || '', serverUrl: import.meta.env.VITE_SERVER_URL }),
     enabled: !!option.id,
   });
 
diff --git a/packages/berlin/src/components/tables/comment-table/CommentsTable.tsx b/packages/berlin/src/components/tables/comment-table/CommentsTable.tsx
index 4a5801f0..eae28a52 100644
--- a/packages/berlin/src/components/tables/comment-table/CommentsTable.tsx
+++ b/packages/berlin/src/components/tables/comment-table/CommentsTable.tsx
@@ -39,7 +39,8 @@ function CommentsTable({ comment }: CommentsTableProps) {
 
   const { data: commentLikes } = useQuery({
     queryKey: ['commentLikes', comment.id],
-    queryFn: () => fetchCommentLikes({ commentId: comment.id }),
+    queryFn: () =>
+      fetchCommentLikes({ commentId: comment.id, serverUrl: import.meta.env.VITE_SERVER_URL }),
     enabled: !!comment.id,
     refetchInterval: 5000, // Poll every 5 seconds
   });
@@ -83,15 +84,15 @@ function CommentsTable({ comment }: CommentsTableProps) {
 
   const handleLikeClick = () => {
     if (isCommentLiked) {
-      deleteLikeMutation({ commentId: comment.id });
+      deleteLikeMutation({ commentId: comment.id, serverUrl: import.meta.env.VITE_SERVER_URL });
     } else {
-      postLikeMutation({ commentId: comment.id });
+      postLikeMutation({ commentId: comment.id, serverUrl: import.meta.env.VITE_SERVER_URL });
     }
   };
 
   const handleTrashClick = () => {
     if (optionId) {
-      deleteCommentMutation({ commentId: comment.id });
+      deleteCommentMutation({ commentId: comment.id, serverUrl: import.meta.env.VITE_SERVER_URL });
     }
   };
 
diff --git a/packages/berlin/src/components/tables/cycle-table/CycleTable.tsx b/packages/berlin/src/components/tables/cycle-table/CycleTable.tsx
index a3d12f81..2d8aa9a1 100644
--- a/packages/berlin/src/components/tables/cycle-table/CycleTable.tsx
+++ b/packages/berlin/src/components/tables/cycle-table/CycleTable.tsx
@@ -34,7 +34,7 @@ function CycleTable({ cycle }: CycleTableProps) {
   return (
     <Card>
       <FlexColumn $gap="0.5rem">
-        <Subtitle>{cycle.forumQuestions[0].questionTitle}</Subtitle>
+        <Subtitle>{cycle.questions[0].questionTitle}</Subtitle>
         <Body>
           {formattedDateText()} {formattedDate}
         </Body>
diff --git a/packages/berlin/src/components/tables/groups-table/GroupsTable.tsx b/packages/berlin/src/components/tables/groups-table/GroupsTable.tsx
index 64edd8eb..e3611864 100644
--- a/packages/berlin/src/components/tables/groups-table/GroupsTable.tsx
+++ b/packages/berlin/src/components/tables/groups-table/GroupsTable.tsx
@@ -38,13 +38,21 @@ function GroupCard({ userToGroup, theme, onLeaveGroup }: GroupCardProps) {
 
   const { data: groupMembers } = useQuery({
     queryKey: ['group', userToGroup.group.id, 'users-to-groups'],
-    queryFn: () => fetchGroupMembers(userToGroup.group.id),
+    queryFn: () =>
+      fetchGroupMembers({
+        groupId: userToGroup.group.id,
+        serverUrl: import.meta.env.VITE_SERVER_URL,
+      }),
     enabled: !!userToGroup.group.id,
   });
 
   const { data: groupRegistrations } = useQuery({
     queryKey: ['group', userToGroup.group.id, 'group-registrations'],
-    queryFn: () => fetchGroupRegistrations(userToGroup.group.id || ''),
+    queryFn: () =>
+      fetchGroupRegistrations({
+        groupId: userToGroup.group.id || '',
+        serverUrl: import.meta.env.VITE_SERVER_URL,
+      }),
     enabled: !!userToGroup.group.id,
   });
 
@@ -157,7 +165,9 @@ function GroupsTable({ groupsInCategory }: { groupsInCategory?: GetUsersToGroups
       key={userToGroup.id}
       userToGroup={userToGroup}
       theme={theme}
-      onLeaveGroup={(userToGroupId) => mutate({ userToGroupId })}
+      onLeaveGroup={(userToGroupId) =>
+        mutate({ userToGroupId, serverUrl: import.meta.env.VITE_SERVER_URL })
+      }
     />
   ));
 }
diff --git a/packages/berlin/src/components/tables/results-table/ResultsTable.tsx b/packages/berlin/src/components/tables/results-table/ResultsTable.tsx
index 248d0bed..21f63cdb 100644
--- a/packages/berlin/src/components/tables/results-table/ResultsTable.tsx
+++ b/packages/berlin/src/components/tables/results-table/ResultsTable.tsx
@@ -56,19 +56,28 @@ function ResultsTable({ $expanded, option, onClick, cycleId, eventId }: ResultsT
 
   const { data: optionUsers } = useQuery({
     queryKey: ['option', option.id, 'users'],
-    queryFn: () => fetchOptionUsers(option.id || ''),
+    queryFn: () =>
+      fetchOptionUsers({ optionId: option.id || '', serverUrl: import.meta.env.VITE_SERVER_URL }),
     enabled: !!option.id,
   });
 
   const { data: registrationFields } = useQuery({
     queryKey: ['event', eventId, 'registrations', 'fields'],
-    queryFn: () => fetchRegistrationFields(eventId || ''),
+    queryFn: () =>
+      fetchRegistrationFields({
+        eventId: eventId || '',
+        serverUrl: import.meta.env.VITE_SERVER_URL,
+      }),
     enabled: !!eventId,
   });
 
   const { data: registrationData } = useQuery({
     queryKey: ['registrations', optionUsers?.registrationId, 'registration-data'],
-    queryFn: () => fetchRegistrationData(optionUsers?.registrationId || ''),
+    queryFn: () =>
+      fetchRegistrationData({
+        registrationId: optionUsers?.registrationId || '',
+        serverUrl: import.meta.env.VITE_SERVER_URL,
+      }),
     enabled: !!optionUsers?.registrationId,
   });
 
diff --git a/packages/berlin/src/components/tabs/TabsHeader.styled.tsx b/packages/berlin/src/components/tabs/TabsHeader.styled.tsx
index 4a60854c..ca12c1fe 100644
--- a/packages/berlin/src/components/tabs/TabsHeader.styled.tsx
+++ b/packages/berlin/src/components/tabs/TabsHeader.styled.tsx
@@ -1,7 +1,6 @@
 import styled from 'styled-components';
 import { Body } from '../typography/Body.styled';
 
-
 export const Tab = styled(Body)`
   cursor: pointer;
   text-transform: capitalize;
diff --git a/packages/berlin/src/components/tabs/TabsHeader.tsx b/packages/berlin/src/components/tabs/TabsHeader.tsx
index 54a20efb..53cf930b 100644
--- a/packages/berlin/src/components/tabs/TabsHeader.tsx
+++ b/packages/berlin/src/components/tabs/TabsHeader.tsx
@@ -19,7 +19,7 @@ export function TabsHeader({ tabNames, initialTab, onTabChange }: TabsHeaderProp
   };
 
   return (
-    <div className='flex gap-2'>
+    <div className="flex gap-2">
       {tabNames.map((tabName, index) => (
         <Fragment key={tabName}>
           <Tab
diff --git a/packages/berlin/src/components/zupass-button/ZupassLoginButton.tsx b/packages/berlin/src/components/zupass-button/ZupassLoginButton.tsx
index 488e422d..e7b6f735 100644
--- a/packages/berlin/src/components/zupass-button/ZupassLoginButton.tsx
+++ b/packages/berlin/src/components/zupass-button/ZupassLoginButton.tsx
@@ -8,7 +8,7 @@ import {
   useZupassPopupMessages,
 } from '@pcd/passport-interface';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
-import { postPcdStr } from 'api';
+import { postVerify } from 'api';
 import { useEffect, useState } from 'react';
 import Button from '../button';
 import { useNavigate } from 'react-router-dom';
@@ -25,7 +25,7 @@ function ZupassLoginButton({ children, $variant, ...props }: ZupassLoginButtonPr
   const queryClient = useQueryClient();
 
   const { mutate: mutateVerify } = useMutation({
-    mutationFn: postPcdStr,
+    mutationFn: postVerify,
     onSuccess: (body) => {
       if (body) {
         queryClient.invalidateQueries({ queryKey: ['user'] });
@@ -67,6 +67,7 @@ function ZupassLoginButton({ children, $variant, ...props }: ZupassLoginButtonPr
             email: user.value.email,
             uuid: user.value.uuid,
             pcdStr: JSON.parse(pcdStr).pcd,
+            serverUrl: import.meta.env.VITE_SERVER_URL,
           });
         }
       });
diff --git a/packages/berlin/src/hooks/useUser.tsx b/packages/berlin/src/hooks/useUser.tsx
index 28f17cef..f070e612 100644
--- a/packages/berlin/src/hooks/useUser.tsx
+++ b/packages/berlin/src/hooks/useUser.tsx
@@ -8,7 +8,7 @@ function useUser() {
     isError,
   } = useQuery({
     queryKey: ['user'],
-    queryFn: fetchUser,
+    queryFn: () => fetchUser({ serverUrl: import.meta.env.VITE_SERVER_URL }),
   });
 
   return { user, isLoading, isError };
diff --git a/packages/berlin/src/pages/Account.tsx b/packages/berlin/src/pages/Account.tsx
index 3e72bacd..e9a2524a 100644
--- a/packages/berlin/src/pages/Account.tsx
+++ b/packages/berlin/src/pages/Account.tsx
@@ -72,25 +72,35 @@ function Account() {
 function AccountHub({ user }: { user: GetUserResponse | null | undefined }) {
   const { data: registrations } = useQuery({
     queryKey: ['users', user?.id, 'registrations'],
-    queryFn: () => fetchUserRegistrations(user?.id ?? ''),
+    queryFn: () =>
+      fetchUserRegistrations({
+        userId: user?.id ?? '',
+        serverUrl: import.meta.env.VITE_SERVER_URL,
+      }),
   });
 
   const { data: options } = useQuery({
     queryKey: ['users', user?.id, 'options'],
-    queryFn: () => fetchUserOptions(user?.id ?? ''),
+    queryFn: () =>
+      fetchUserOptions({ userId: user?.id ?? '', serverUrl: import.meta.env.VITE_SERVER_URL }),
   });
 
   const { data: usersToGroups } = useQuery({
     queryKey: ['users', user?.id, 'groups'],
-    queryFn: () => fetchUsersToGroups(user?.id ?? ''),
+    queryFn: () =>
+      fetchUsersToGroups({ userId: user?.id ?? '', serverUrl: import.meta.env.VITE_SERVER_URL }),
   });
 
   const cycles = useQueries({
     queries:
       // can be improved by filtering repeated cycles
       options?.map((option) => ({
-        queryKey: ['cycles', option.forumQuestion.cycleId],
-        queryFn: () => fetchCycle(option.forumQuestion.cycleId),
+        queryKey: ['cycles', option.question.cycleId],
+        queryFn: () =>
+          fetchCycle({
+            cycleId: option.question.cycleId,
+            serverUrl: import.meta.env.VITE_SERVER_URL,
+          }),
       })) ?? [],
   });
 
@@ -122,7 +132,7 @@ function AccountHub({ user }: { user: GetUserResponse | null | undefined }) {
           {options?.map((option) => (
             <Link
               key={option.id}
-              to={`/events/${cycles.find((c) => c.data?.id === option.forumQuestion.cycleId)?.data?.eventId}/cycles/${option.forumQuestion.cycleId}/options/${option.id}`}
+              to={`/events/${cycles.find((c) => c.data?.id === option.question.cycleId)?.data?.eventId}/cycles/${option.question.cycleId}/options/${option.id}`}
             >
               - {option.optionTitle}
             </Link>
@@ -132,7 +142,9 @@ function AccountHub({ user }: { user: GetUserResponse | null | undefined }) {
       <div>
         <Subtitle>Groups</Subtitle>
         <FlexColumn>
-          {usersToGroups?.map((userToGroup) => <Underline key={userToGroup.group?.id}>- {userToGroup.group?.name}</Underline>)}
+          {usersToGroups?.map((userToGroup) => (
+            <Underline key={userToGroup.group?.id}>- {userToGroup.group?.name}</Underline>
+          ))}
         </FlexColumn>
       </div>
     </FlexColumn>
diff --git a/packages/berlin/src/pages/Comments.tsx b/packages/berlin/src/pages/Comments.tsx
index 1d7e49c3..2b221805 100644
--- a/packages/berlin/src/pages/Comments.tsx
+++ b/packages/berlin/src/pages/Comments.tsx
@@ -38,32 +38,20 @@ import Textarea from '../components/textarea';
 function Comments() {
   const queryClient = useQueryClient();
   const { optionId } = useParams();
-  // const { user } = useUser();
-  // const [localUserVotes, setLocalUserVotes] = useState<LocalUserVotes>([]);
-  // const [localOptionHearts, setLocalOptionHearts] = useState(0);
   const [comment, setComment] = useState('');
   const [sortOrder, setSortOrder] = useState('desc'); // 'asc' for ascending, 'desc' for descending
 
   const { data: option, isLoading } = useQuery({
     queryKey: ['option', optionId],
-    queryFn: () => fetchOption(optionId || ''),
+    queryFn: () =>
+      fetchOption({ optionId: optionId || '', serverUrl: import.meta.env.VITE_SERVER_URL }),
     enabled: !!optionId,
   });
 
-  // const availableHearts =
-  //   useAppStore((state) => state.availableHearts[option?.questionId || '']) ?? INITIAL_HEARTS;
-  // const setAvailableHearts = useAppStore((state) => state.setAvailableHearts);
-
-  // const { data: userVotes } = useQuery({
-  //   queryKey: ['votes', cycleId],
-  //   queryFn: () => fetchUserVotes(cycleId || ''),
-  //   enabled: !!user?.id && !!cycleId,
-  //   retry: false,
-  // });
-
   const { data: optionUsers } = useQuery({
     queryKey: ['option', optionId, 'users'],
-    queryFn: () => fetchOptionUsers(optionId || ''),
+    queryFn: () =>
+      fetchOptionUsers({ optionId: optionId || '', serverUrl: import.meta.env.VITE_SERVER_URL }),
     enabled: !!optionId,
   });
 
@@ -73,7 +61,8 @@ function Comments() {
 
   const { data: comments } = useQuery({
     queryKey: ['option', optionId, 'comments'],
-    queryFn: () => fetchComments({ optionId: optionId || '' }),
+    queryFn: () =>
+      fetchComments({ optionId: optionId || '', serverUrl: import.meta.env.VITE_SERVER_URL }),
     enabled: !!optionId,
     refetchInterval: 5000, // Poll every 5 seconds
   });
@@ -88,20 +77,6 @@ function Comments() {
     });
   }, [comments, sortOrder]);
 
-  // useEffect(() => {
-  //   if (optionId) {
-  //     const sumOfAllVotes = userVotes?.reduce((acc, option) => acc + option.numOfVotes, 0) || 0;
-  //     const hearts = userVotes?.find((option) => optionId === option.optionId)?.numOfVotes || 0;
-  //     setLocalOptionHearts(hearts);
-  //     setLocalUserVotes([{ optionId: optionId, numOfVotes: hearts }]);
-  //     // update the available hearts
-  //     setAvailableHearts({
-  //       questionId: option?.questionId ?? '',
-  //       hearts: Math.max(0, INITIAL_HEARTS - sumOfAllVotes),
-  //     });
-  //   }
-  // }, [optionId, userVotes, setAvailableHearts, option?.questionId]);
-
   const { mutate: mutateComments } = useMutation({
     mutationFn: postComment,
     onSuccess: (body) => {
@@ -111,55 +86,13 @@ function Comments() {
     },
   });
 
-  // const handleVoteWrapper = (optionId: string) => {
-  //   if (availableHearts === 0) {
-  //     toast.error('No hearts left to give');
-  //     return;
-  //   }
-
-  //   setLocalOptionHearts((prevLocalOptionHearts) => prevLocalOptionHearts + 1);
-  //   setLocalUserVotes((prevLocalUserVotes) => handleLocalVote(optionId, prevLocalUserVotes));
-  //   setAvailableHearts({
-  //     questionId: option?.questionId ?? '',
-  //     hearts: handleAvailableHearts(availableHearts, 'vote'),
-  //   });
-  // };
-
-  // const handleUnVoteWrapper = (optionId: string) => {
-  //   if (availableHearts === INITIAL_HEARTS) {
-  //     toast.error('No votes to left to remove');
-  //     return;
-  //   }
-
-  //   setLocalOptionHearts((prevLocalOptionHearts) => Math.max(0, prevLocalOptionHearts - 1));
-  //   setLocalUserVotes((prevLocalUserVotes) => handleLocalUnVote(optionId, prevLocalUserVotes));
-  //   setAvailableHearts({
-  //     questionId: option?.questionId ?? '',
-  //     hearts: handleAvailableHearts(availableHearts, 'unVote'),
-  //   });
-  // };
-
-  // const { mutate: mutateVotes } = useMutation({
-  //   mutationFn: postVotes,
-  //   onSuccess: (body) => {
-  //     if (body?.errors?.length) {
-  //       toast.error(`Failed to save votes, ${body?.errors[0].message}`);
-  //     } else if (body?.data.length) {
-  //       queryClient.invalidateQueries({ queryKey: ['votes', cycleId] });
-  //       // this is to update the plural scores in each option
-  //       queryClient.invalidateQueries({ queryKey: ['cycles', cycleId] });
-  //       toast.success('Votes saved successfully!');
-  //     }
-  //   },
-  // });
-
-  // const handleSaveVoteWrapper = () => {
-  //   handleSaveVotes(userVotes, localUserVotes, mutateVotes);
-  // };
-
   const handlePostComment = () => {
     if (optionId && comment) {
-      mutateComments({ questionOptionId: optionId, value: comment });
+      mutateComments({
+        questionOptionId: optionId,
+        value: comment,
+        serverUrl: import.meta.env.VITE_SERVER_URL,
+      });
       setComment('');
     }
   };
@@ -172,29 +105,6 @@ function Comments() {
     <FlexColumn $gap="2rem">
       <BackButton />
       <FlexColumn>
-        {/* <FlexRow style={{ maxWidth: '4rem' }}>
-          <FlexColumn $gap="-4px" style={{ maxWidth: '1rem' }}>
-            <IconButton
-              $padding={0}
-              $color="secondary"
-              icon={{ src: `/icons/upvote-${theme}.svg`, alt: 'Upvote arrow' }}
-              onClick={() => handleVoteWrapper(option?.id ?? '')}
-              $width={16}
-              $height={16}
-              disabled={availableHearts === 0}
-            />
-            <IconButton
-              $padding={0}
-              $color="secondary"
-              icon={{ src: `/icons/downvote-${theme}.svg`, alt: 'Downvote arrow' }}
-              onClick={() => handleUnVoteWrapper(option?.id ?? '')}
-              $width={16}
-              $height={16}
-              disabled={localOptionHearts === 0}
-            />
-          </FlexColumn>
-          <Subtitle>{localOptionHearts}</Subtitle>
-        </FlexRow> */}
         <Subtitle>{option?.optionTitle}</Subtitle>
         <Body>{option?.optionSubTitle}</Body>
         <Body>
diff --git a/packages/berlin/src/pages/Cycle.tsx b/packages/berlin/src/pages/Cycle.tsx
index ecfc1666..d26001a5 100644
--- a/packages/berlin/src/pages/Cycle.tsx
+++ b/packages/berlin/src/pages/Cycle.tsx
@@ -37,7 +37,7 @@ import { Heart } from 'lucide-react';
 
 type Order = 'asc' | 'desc';
 type LocalUserVotes = { optionId: string; numOfVotes: number }[];
-type QuestionOption = GetCycleResponse['forumQuestions'][number]['questionOptions'][number];
+type QuestionOption = GetCycleResponse['questions'][number]['options'][number];
 
 function Cycle() {
   const queryClient = useQueryClient();
@@ -46,20 +46,21 @@ function Cycle() {
   const { eventId, cycleId } = useParams();
   const { data: cycle } = useQuery({
     queryKey: ['cycles', cycleId],
-    queryFn: () => fetchCycle(cycleId || ''),
+    queryFn: () =>
+      fetchCycle({ cycleId: cycleId || '', serverUrl: import.meta.env.VITE_SERVER_URL }),
     enabled: !!cycleId,
     refetchInterval: 5000, // Poll every 5 seconds
   });
 
   const { data: userVotes } = useQuery({
     queryKey: ['votes', cycleId],
-    queryFn: () => fetchUserVotes(cycleId || ''),
+    queryFn: () =>
+      fetchUserVotes({ cycleId: cycleId || '', serverUrl: import.meta.env.VITE_SERVER_URL }),
     enabled: !!user?.id && !!cycleId,
   });
 
   const availableHearts =
-    useAppStore((state) => state.availableHearts[cycle?.forumQuestions[0].id || '']) ??
-    INITIAL_HEARTS;
+    useAppStore((state) => state.availableHearts[cycle?.questions[0].id || '']) ?? INITIAL_HEARTS;
   const setAvailableHearts = useAppStore((state) => state.setAvailableHearts);
   const [startAt, setStartAt] = useState<string | null>(null);
   const [endAt, setEndAt] = useState<string | null>(null);
@@ -90,11 +91,11 @@ function Cycle() {
 
   useEffect(() => {
     // Initial sorting
-    if (cycle?.forumQuestions[0].questionOptions.length) {
+    if (cycle?.questions[0].options.length) {
       setSortedOptions((prev) => ({
         ...prev,
         options: sortOptions({
-          options: cycle.forumQuestions[0].questionOptions,
+          options: cycle.questions[0].options,
           sorting: prev,
           votes: userVotes,
         }),
@@ -124,7 +125,7 @@ function Cycle() {
       votes?.map((option) => option.numOfVotes).reduce((prev, curr) => prev + curr, 0) ?? 0;
 
     setAvailableHearts({
-      questionId: cycle?.forumQuestions[0].id || '',
+      questionId: cycle?.questions[0].id || '',
       hearts: Math.max(0, INITIAL_HEARTS - givenVotes),
     });
 
@@ -175,7 +176,7 @@ function Cycle() {
 
     setLocalUserVotes((prevLocalUserVotes) => handleLocalVote(optionId, prevLocalUserVotes));
     setAvailableHearts({
-      questionId: cycle?.forumQuestions[0].id ?? '',
+      questionId: cycle?.questions[0].id ?? '',
       hearts: handleAvailableHearts(availableHearts, 'vote'),
     });
   };
@@ -188,20 +189,22 @@ function Cycle() {
 
     setLocalUserVotes((prevLocalUserVotes) => handleLocalUnVote(optionId, prevLocalUserVotes));
     setAvailableHearts({
-      questionId: cycle?.forumQuestions[0].id ?? '',
+      questionId: cycle?.questions[0].id ?? '',
       hearts: handleAvailableHearts(availableHearts, 'unVote'),
     });
   };
 
   const handleSaveVotesWrapper = () => {
     if (cycle?.status === 'OPEN') {
-      handleSaveVotes(userVotes, localUserVotes, mutateVotes);
+      handleSaveVotes(userVotes, localUserVotes, ({ votes }) =>
+        mutateVotes({ votes, serverUrl: import.meta.env.VITE_SERVER_URL }),
+      );
     } else {
       toast.error('Cycle is not open');
     }
   };
 
-  const currentCycle = cycle?.forumQuestions[0];
+  const currentCycle = cycle?.questions[0];
 
   const sortId = (a: QuestionOption, b: QuestionOption, order: Order) => {
     const idA = a.id.toUpperCase();
@@ -310,7 +313,7 @@ function Cycle() {
           Save all votes
         </Button>
       </FlexColumn>
-      {currentCycle?.questionOptions.length ? (
+      {currentCycle?.options.length ? (
         <FlexColumn $gap="0">
           <CycleColumns onColumnClick={handleColumnClick} showScore={currentCycle.showScore} />
           {sortedOptions.options.map((option) => {
diff --git a/packages/berlin/src/pages/Event.tsx b/packages/berlin/src/pages/Event.tsx
index 365d5448..1e83f543 100644
--- a/packages/berlin/src/pages/Event.tsx
+++ b/packages/berlin/src/pages/Event.tsx
@@ -20,13 +20,15 @@ function Event() {
   const { eventId } = useParams();
   const { data: event } = useQuery({
     queryKey: ['event', eventId],
-    queryFn: () => fetchEvent(eventId || ''),
+    queryFn: () =>
+      fetchEvent({ eventId: eventId || '', serverUrl: import.meta.env.VITE_SERVER_URL }),
     enabled: !!eventId,
   });
 
   const { data: eventCycles } = useQuery({
     queryKey: ['events', eventId, 'cycles'],
-    queryFn: () => fetchEventCycles(eventId || ''),
+    queryFn: () =>
+      fetchEventCycles({ eventId: eventId || '', serverUrl: import.meta.env.VITE_SERVER_URL }),
     enabled: !!eventId,
     refetchInterval: 5000, // Poll every 5 seconds
   });
@@ -62,7 +64,7 @@ function Event() {
           {event.description}
         </Markdown>
       )}
-      <div className="flex flex-col md:flex-row justify-between md:items-center gap-2 w-full">
+      <div className="flex w-full flex-col justify-between gap-2 md:flex-row md:items-center">
         <Subtitle>Questions</Subtitle>
         <Tabs.TabsHeader tabNames={tabNames} onTabChange={setActiveTab} />
       </div>
diff --git a/packages/berlin/src/pages/Events.tsx b/packages/berlin/src/pages/Events.tsx
index 31a8afba..8d153202 100644
--- a/packages/berlin/src/pages/Events.tsx
+++ b/packages/berlin/src/pages/Events.tsx
@@ -18,7 +18,7 @@ function Events() {
   const { user } = useUser();
   const { data: events } = useQuery({
     queryKey: ['events'],
-    queryFn: fetchEvents,
+    queryFn: () => fetchEvents({ serverUrl: import.meta.env.VITE_SERVER_URL }),
     enabled: !!user?.id,
   });
 
diff --git a/packages/berlin/src/pages/PublicGroupRegistration.tsx b/packages/berlin/src/pages/PublicGroupRegistration.tsx
index 428681b9..db12851b 100644
--- a/packages/berlin/src/pages/PublicGroupRegistration.tsx
+++ b/packages/berlin/src/pages/PublicGroupRegistration.tsx
@@ -36,13 +36,18 @@ function PublicGroupRegistration() {
 
   const { data: groups } = useQuery({
     queryKey: ['group-categories', groupCategoryIdParam, 'groups'],
-    queryFn: () => fetchGroups({ groupCategoryId: groupCategoryIdParam || '' }),
+    queryFn: () =>
+      fetchGroups({
+        groupCategoryId: groupCategoryIdParam || '',
+        serverUrl: import.meta.env.VITE_SERVER_URL,
+      }),
     enabled: !!user?.id && !!groupCategoryIdParam,
   });
 
   const { data: usersToGroups } = useQuery({
     queryKey: ['user', user?.id, 'users-to-groups'],
-    queryFn: () => fetchUsersToGroups(user?.id || ''),
+    queryFn: () =>
+      fetchUsersToGroups({ userId: user?.id || '', serverUrl: import.meta.env.VITE_SERVER_URL }),
     enabled: !!user?.id,
   });
 
@@ -109,6 +114,7 @@ function PublicGroupRegistration() {
         putUsersToGroupsMutation({
           userToGroupId: prevUserToGroup.id,
           groupId: getValues('group'),
+          serverUrl: import.meta.env.VITE_SERVER_URL,
         });
         setValue('group', '');
         reset();
@@ -116,7 +122,10 @@ function PublicGroupRegistration() {
       }
 
       // If the user is not in the category group, create a new userToGroup
-      postUsersToGroupsMutation({ groupId: getValues('group') });
+      postUsersToGroupsMutation({
+        groupId: getValues('group'),
+        serverUrl: import.meta.env.VITE_SERVER_URL,
+      });
       setValue('group', '');
       reset();
     }
diff --git a/packages/berlin/src/pages/Register.tsx b/packages/berlin/src/pages/Register.tsx
index 01183fcf..02779cfd 100644
--- a/packages/berlin/src/pages/Register.tsx
+++ b/packages/berlin/src/pages/Register.tsx
@@ -54,31 +54,42 @@ function Register() {
 
   const { data: event } = useQuery({
     queryKey: ['event', eventId],
-    queryFn: () => fetchEvent(eventId || ''),
+    queryFn: () =>
+      fetchEvent({ eventId: eventId || '', serverUrl: import.meta.env.VITE_SERVER_URL }),
     enabled: !!eventId,
   });
 
   const { data: registrations } = useQuery({
     queryKey: ['event', eventId, 'registrations'],
-    queryFn: () => fetchRegistrations(eventId || ''),
+    queryFn: () =>
+      fetchRegistrations({ eventId: eventId || '', serverUrl: import.meta.env.VITE_SERVER_URL }),
     enabled: !!eventId,
   });
 
   const { data: registrationFields } = useQuery({
     queryKey: ['event', eventId, 'registrations', 'fields'],
-    queryFn: () => fetchRegistrationFields(eventId || ''),
+    queryFn: () =>
+      fetchRegistrationFields({
+        eventId: eventId || '',
+        serverUrl: import.meta.env.VITE_SERVER_URL,
+      }),
     enabled: !!eventId,
   });
 
   const { data: usersToGroups } = useQuery({
     queryKey: ['user', user?.id, 'users-to-groups'],
-    queryFn: () => fetchUsersToGroups(user?.id || ''),
+    queryFn: () =>
+      fetchUsersToGroups({ userId: user?.id || '', serverUrl: import.meta.env.VITE_SERVER_URL }),
     enabled: !!user?.id,
   });
 
   const { data: groupCategories } = useQuery({
     queryKey: ['event', eventId, 'group-categories'],
-    queryFn: () => fetchEventGroupCategories(eventId || ''),
+    queryFn: () =>
+      fetchEventGroupCategories({
+        eventId: eventId || '',
+        serverUrl: import.meta.env.VITE_SERVER_URL,
+      }),
     enabled: !!eventId,
   });
 
@@ -102,7 +113,11 @@ function Register() {
     queries:
       registrations?.map((registration) => ({
         queryKey: ['registrations', registration.id, 'registration-data'],
-        queryFn: () => fetchRegistrationData(registration.id || ''),
+        queryFn: () =>
+          fetchRegistrationData({
+            registrationId: registration.id || '',
+            serverUrl: import.meta.env.VITE_SERVER_URL,
+          }),
         enabled: !!registration.id,
       })) ?? [],
     combine: (results) => {
@@ -278,7 +293,11 @@ const SelectEventGroup = ({
   const queryClient = useQueryClient();
   const { data: groups } = useQuery({
     queryKey: ['group-category', groupCategory?.id, 'groups'],
-    queryFn: () => fetchGroups({ groupCategoryId: groupCategory?.id ?? '' }),
+    queryFn: () =>
+      fetchGroups({
+        groupCategoryId: groupCategory?.id ?? '',
+        serverUrl: import.meta.env.VITE_SERVER_URL,
+      }),
     enabled: !!groupCategory?.id,
   });
 
@@ -328,12 +347,13 @@ const SelectEventGroup = ({
       putUsersToGroupsMutation({
         groupId: newGroup,
         userToGroupId: userGroup.id,
+        serverUrl: import.meta.env.VITE_SERVER_URL,
       });
       return;
     }
 
     // create a new group
-    postUsersToGroupsMutation({ groupId: newGroup });
+    postUsersToGroupsMutation({ groupId: newGroup, serverUrl: import.meta.env.VITE_SERVER_URL });
   };
 
   return (
@@ -666,6 +686,7 @@ function RegisterForm(props: {
           status: 'DRAFT',
           registrationData: registrationData,
         },
+        serverUrl: import.meta.env.VITE_SERVER_URL,
       });
     } else {
       mutateRegistrationData({
@@ -675,6 +696,7 @@ function RegisterForm(props: {
           status: 'DRAFT',
           registrationData: registrationData,
         },
+        serverUrl: import.meta.env.VITE_SERVER_URL,
       });
     }
   };
diff --git a/packages/berlin/src/pages/Results.tsx b/packages/berlin/src/pages/Results.tsx
index 3faa5245..c0f93b0e 100644
--- a/packages/berlin/src/pages/Results.tsx
+++ b/packages/berlin/src/pages/Results.tsx
@@ -1,4 +1,4 @@
-import { fetchCycle, fetchForumQuestionFunding, fetchForumQuestionStatistics } from 'api';
+import { fetchCycle, fetchQuestionFunding, fetchQuestionStatistics } from 'api';
 import { FlexColumn } from '../components/containers/FlexColumn.styled';
 import { Subtitle } from '../components/typography/Subtitle.styled';
 import { useParams } from 'react-router-dom';
@@ -19,22 +19,31 @@ function Results() {
 
   const { data: cycle } = useQuery({
     queryKey: ['cycles', cycleId],
-    queryFn: () => fetchCycle(cycleId || ''),
+    queryFn: () =>
+      fetchCycle({ cycleId: cycleId || '', serverUrl: import.meta.env.VITE_SERVER_URL }),
     enabled: !!cycleId,
     retry: false,
   });
 
   const { data: statistics } = useQuery({
-    queryKey: ['cycles', cycleId, 'forumQuestions', 0, 'statistics', cycle?.forumQuestions[0].id],
-    queryFn: () => fetchForumQuestionStatistics(cycle?.forumQuestions[0].id || ''),
+    queryKey: ['cycles', cycleId, 'forumQuestions', 0, 'statistics', cycle?.questions[0].id],
+    queryFn: () =>
+      fetchQuestionStatistics({
+        questionId: cycle?.questions[0].id || '',
+        serverUrl: import.meta.env.VITE_SERVER_URL,
+      }),
     enabled: !!cycle?.id,
     retry: false,
   });
 
   const { data: funding } = useQuery({
-    queryKey: ['funding', cycle?.forumQuestions[0].id],
-    queryFn: () => fetchForumQuestionFunding(cycle?.forumQuestions[0].id || ''),
-    enabled: !!cycle?.id && cycle?.forumQuestions?.[0].questionTitle === FINAL_QUESTION_TITLE,
+    queryKey: ['funding', cycle?.questions[0].id],
+    queryFn: () =>
+      fetchQuestionFunding({
+        questionId: cycle?.questions[0].id || '',
+        serverUrl: import.meta.env.VITE_SERVER_URL,
+      }),
+    enabled: !!cycle?.id && cycle?.questions?.[0].questionTitle === FINAL_QUESTION_TITLE,
   });
 
   const overallStatistics = [
@@ -72,7 +81,7 @@ function Results() {
   return (
     <FlexColumn $gap="2rem">
       <BackButton fallbackRoute={`/events/${eventId}/cycles`} />
-      <Subtitle>Results for: {cycle?.forumQuestions?.[0].questionTitle}</Subtitle>
+      <Subtitle>Results for: {cycle?.questions?.[0].questionTitle}</Subtitle>
       <Column>
         <ResultsColumns $showFunding={!!funding} />
         {optionStatsArray.map((option, index) => (
diff --git a/packages/berlin/src/pages/SecretGroupRegistration.tsx b/packages/berlin/src/pages/SecretGroupRegistration.tsx
index 6835e7c8..fa3370aa 100644
--- a/packages/berlin/src/pages/SecretGroupRegistration.tsx
+++ b/packages/berlin/src/pages/SecretGroupRegistration.tsx
@@ -59,7 +59,8 @@ function SecretGroupRegistration() {
 
   const { data: usersToGroups } = useQuery({
     queryKey: ['user', user?.id, 'users-to-groups'],
-    queryFn: () => fetchUsersToGroups(user?.id || ''),
+    queryFn: () =>
+      fetchUsersToGroups({ userId: user?.id || '', serverUrl: import.meta.env.VITE_SERVER_URL }),
     enabled: !!user?.id,
   });
 
@@ -110,13 +111,20 @@ function SecretGroupRegistration() {
 
   const onSubmit = () => {
     if (isValid) {
-      postUsersToGroupsMutation({ secret: getValues('secret') });
+      postUsersToGroupsMutation({
+        secret: getValues('secret'),
+        serverUrl: import.meta.env.VITE_SERVER_URL,
+      });
       reset();
     }
   };
 
   const handleCreateGroup = (name: string) => {
-    postGroupMutation({ name, groupCategoryId: groupCategoryIdParam || '' });
+    postGroupMutation({
+      name,
+      groupCategoryId: groupCategoryIdParam || '',
+      serverUrl: import.meta.env.VITE_SERVER_URL,
+    });
   };
 
   return (
diff --git a/packages/berlin/tsconfig.json b/packages/berlin/tsconfig.json
index 4605800c..d41fbb19 100644
--- a/packages/berlin/tsconfig.json
+++ b/packages/berlin/tsconfig.json
@@ -1,34 +1,15 @@
 {
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "target": "ES2020",
-    "useDefineForClassFields": true,
-    "lib": ["ES2020", "DOM", "DOM.Iterable"],
-    "module": "ESNext",
-    "skipLibCheck": true,
+    "types": ["vite/client"],
     "baseUrl": ".",
     "paths": {
       "@/*": ["./src/*"]
     },
-
-    /* Bundler mode */
-    "moduleResolution": "bundler",
-    "allowImportingTsExtensions": true,
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "noEmit": true,
-    "jsx": "react-jsx",
-
-    /* Linting */
-    "strict": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "noFallthroughCasesInSwitch": true,
-
     /* Build */
     "outDir": "dist",
     "declaration": true,
     "declarationMap": true
   },
-  "include": ["src"],
-  "references": [{ "path": "./tsconfig.node.json" }]
+  "include": ["src"]
 }
diff --git a/packages/berlin/tsconfig.node.json b/packages/berlin/tsconfig.node.json
deleted file mode 100644
index 97ede7ee..00000000
--- a/packages/berlin/tsconfig.node.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "compilerOptions": {
-    "composite": true,
-    "skipLibCheck": true,
-    "module": "ESNext",
-    "moduleResolution": "bundler",
-    "allowSyntheticDefaultImports": true,
-    "strict": true
-  },
-  "include": ["vite.config.ts"]
-}
diff --git a/packages/berlin/vite.config.ts b/packages/berlin/vite.config.ts
index f7f51a87..5c8844e2 100644
--- a/packages/berlin/vite.config.ts
+++ b/packages/berlin/vite.config.ts
@@ -3,19 +3,8 @@ import react from '@vitejs/plugin-react';
 import { nodePolyfills } from 'vite-plugin-node-polyfills';
 import path from 'path';
 
-// https://vitejs.dev/config/
 export default defineConfig({
-  // This is needed because qr-image relies on it being here
-  // https://github.com/alexeyten/qr-image/issues/13#issuecomment-421289572
-  plugins: [
-    react(),
-    nodePolyfills({
-      include: ['process'],
-      globals: {
-        process: true,
-      },
-    }),
-  ],
+  plugins: [react(), nodePolyfills()],
   resolve: {
     alias: {
       '@': path.resolve(__dirname, './src'),
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2a36c5b1..e9808c39 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5,111 +5,24 @@ settings:
   excludeLinksFromLockfile: false
 
 importers:
+
   .:
-    dependencies:
-      '@hookform/resolvers':
-        specifier: ^3.3.4
-        version: 3.3.4(react-hook-form@7.49.3(react@18.2.0))
-      '@pcd/passport-interface':
-        specifier: ^0.8.0
-        version: 0.8.0(@babel/core@7.23.5)(react-dom@18.2.0(react@18.2.0))(react-is@16.13.1)
-      '@pcd/pcd-types':
-        specifier: ^0.8.0
-        version: 0.8.0
-      '@pcd/semaphore-identity-pcd':
-        specifier: ^0.8.0
-        version: 0.8.0(@babel/core@7.23.5)(react-dom@18.2.0(react@18.2.0))(react-is@16.13.1)
-      '@pcd/semaphore-signature-pcd':
-        specifier: ^0.9.0
-        version: 0.9.0(@babel/core@7.23.5)(react-dom@18.2.0(react@18.2.0))(react-is@16.13.1)(react@18.2.0)
-      '@radix-ui/react-dialog':
-        specifier: ^1.0.5
-        version: 1.0.5(@types/react-dom@18.2.17)(@types/react@18.2.42)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@radix-ui/react-icons':
-        specifier: ^1.3.0
-        version: 1.3.0(react@18.2.0)
-      '@tanstack/react-query':
-        specifier: ^5.13.4
-        version: 5.13.4(react@18.2.0)
-      '@tanstack/react-query-devtools':
-        specifier: ^5.13.5
-        version: 5.13.5(@tanstack/react-query@5.13.4(react@18.2.0))(react@18.2.0)
-      class-variance-authority:
-        specifier: ^0.7.0
-        version: 0.7.0
-      clsx:
-        specifier: ^2.1.0
-        version: 2.1.0
-      lucide-react:
-        specifier: ^0.397.0
-        version: 0.397.0(react@18.2.0)
-      react:
-        specifier: ^18.2.0
-        version: 18.2.0
-      react-content-loader:
-        specifier: ^7.0.0
-        version: 7.0.0(react@18.2.0)
-      react-dom:
-        specifier: ^18.2.0
-        version: 18.2.0(react@18.2.0)
-      react-hook-form:
-        specifier: ^7.49.3
-        version: 7.49.3(react@18.2.0)
-      react-hot-toast:
-        specifier: ^2.4.1
-        version: 2.4.1(csstype@3.1.2)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      react-markdown:
-        specifier: ^9.0.1
-        version: 9.0.1(@types/react@18.2.42)(react@18.2.0)
-      react-router-dom:
-        specifier: ^6.20.1
-        version: 6.20.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      styled-components:
-        specifier: ^6.1.1
-        version: 6.1.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      zod:
-        specifier: ^3.22.4
-        version: 3.22.4
-      zustand:
-        specifier: ^4.4.7
-        version: 4.4.7(@types/react@18.2.42)(react@18.2.0)
     devDependencies:
-      '@hookform/devtools':
-        specifier: ^4.3.1
-        version: 4.3.1(@types/react@18.2.42)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@tanstack/eslint-plugin-query':
-        specifier: ^5.18.0
-        version: 5.18.1(eslint@8.56.0)(typescript@5.5.2)
-      '@types/node':
-        specifier: ^20.12.4
-        version: 20.12.4
-      '@types/react':
-        specifier: ^18.2.37
-        version: 18.2.42
-      '@types/react-dom':
-        specifier: ^18.2.15
-        version: 18.2.17
-      '@typescript-eslint/eslint-plugin':
-        specifier: ^6.19.0
-        version: 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.5.2))(eslint@8.56.0)(typescript@5.5.2)
       '@typescript-eslint/parser':
-        specifier: ^6.19.0
-        version: 6.21.0(eslint@8.56.0)(typescript@5.5.2)
-      '@vitejs/plugin-react':
-        specifier: ^4.2.0
-        version: 4.2.1(vite@5.0.6(@types/node@20.12.4))
+        specifier: ^7.2.0
+        version: 7.5.0(eslint@8.57.0)(typescript@5.5.2)
       eslint:
-        specifier: ^8.56.0
-        version: 8.56.0
+        specifier: ^8.57.0
+        version: 8.57.0
       eslint-config-prettier:
         specifier: ^9.1.0
-        version: 9.1.0(eslint@8.56.0)
+        version: 9.1.0(eslint@8.57.0)
       eslint-plugin-react-hooks:
         specifier: ^4.6.0
-        version: 4.6.0(eslint@8.56.0)
+        version: 4.6.0(eslint@8.57.0)
       eslint-plugin-react-refresh:
-        specifier: ^0.4.4
-        version: 0.4.5(eslint@8.56.0)
+        specifier: ^0.4.6
+        version: 0.4.6(eslint@8.57.0)
       prettier:
         specifier: ^3.1.1
         version: 3.2.5
@@ -119,17 +32,23 @@ importers:
       typescript:
         specifier: ^5.5.2
         version: 5.5.2
-      vite:
-        specifier: ^5.0.0
-        version: 5.0.6(@types/node@20.12.4)
-      vite-plugin-node-polyfills:
-        specifier: ^0.17.0
-        version: 0.17.0(rollup@4.14.0)(vite@5.0.6(@types/node@20.12.4))
 
   packages/api: {}
 
   packages/berlin:
     dependencies:
+      '@hookform/resolvers':
+        specifier: ^3.3.4
+        version: 3.3.4(react-hook-form@7.49.3(react@18.2.0))
+      '@pcd/passport-interface':
+        specifier: ^0.8.0
+        version: 0.8.0(@babel/core@7.23.5)(react-dom@18.2.0(react@18.2.0))(react-is@16.13.1)
+      '@pcd/semaphore-identity-pcd':
+        specifier: ^0.8.0
+        version: 0.8.0(@babel/core@7.23.5)(react-dom@18.2.0(react@18.2.0))(react-is@16.13.1)
+      '@pcd/semaphore-signature-pcd':
+        specifier: ^0.9.0
+        version: 0.9.0(@babel/core@7.23.5)(react-dom@18.2.0(react@18.2.0))(react-is@16.13.1)(react@18.2.0)
       '@radix-ui/react-dialog':
         specifier: ^1.0.5
         version: 1.0.5(@types/react-dom@18.2.24)(@types/react@18.3.3)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
@@ -148,6 +67,9 @@ importers:
       '@radix-ui/react-slot':
         specifier: ^1.0.2
         version: 1.0.2(@types/react@18.3.3)(react@18.2.0)
+      '@tanstack/react-query':
+        specifier: ^5.13.4
+        version: 5.13.4(react@18.2.0)
       api:
         specifier: workspace:*
         version: link:../api
@@ -163,6 +85,30 @@ importers:
       lucide-react:
         specifier: ^0.397.0
         version: 0.397.0(react@18.2.0)
+      react:
+        specifier: ^18.2.0
+        version: 18.2.0
+      react-content-loader:
+        specifier: ^7.0.0
+        version: 7.0.0(react@18.2.0)
+      react-dom:
+        specifier: ^18.2.0
+        version: 18.2.0(react@18.2.0)
+      react-hook-form:
+        specifier: ^7.49.3
+        version: 7.49.3(react@18.2.0)
+      react-hot-toast:
+        specifier: ^2.4.1
+        version: 2.4.1(csstype@3.1.2)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      react-markdown:
+        specifier: ^9.0.1
+        version: 9.0.1(@types/react@18.3.3)(react@18.2.0)
+      react-router-dom:
+        specifier: ^6.20.1
+        version: 6.20.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      styled-components:
+        specifier: ^6.1.1
+        version: 6.1.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       tailwind-merge:
         specifier: ^2.2.2
         version: 2.2.2
@@ -172,7 +118,22 @@ importers:
       ui:
         specifier: workspace:*
         version: link:../ui
+      zod:
+        specifier: ^3.22.4
+        version: 3.22.4
+      zustand:
+        specifier: ^4.4.7
+        version: 4.4.7(@types/react@18.3.3)(react@18.2.0)
     devDependencies:
+      '@hookform/devtools':
+        specifier: ^4.3.1
+        version: 4.3.1(@types/react@18.3.3)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@pcd/pcd-types':
+        specifier: ^0.8.0
+        version: 0.8.0
+      '@tanstack/react-query-devtools':
+        specifier: ^5.13.5
+        version: 5.13.5(@tanstack/react-query@5.13.4(react@18.2.0))(react@18.2.0)
       '@types/node':
         specifier: ^20.12.4
         version: 20.12.4
@@ -185,24 +146,12 @@ importers:
       '@typescript-eslint/eslint-plugin':
         specifier: ^7.2.0
         version: 7.5.0(@typescript-eslint/parser@7.5.0(eslint@8.57.0)(typescript@5.5.2))(eslint@8.57.0)(typescript@5.5.2)
-      '@typescript-eslint/parser':
-        specifier: ^7.2.0
-        version: 7.5.0(eslint@8.57.0)(typescript@5.5.2)
       '@vitejs/plugin-react':
         specifier: ^4.2.1
-        version: 4.2.1(vite@5.2.8(@types/node@20.12.4))
+        version: 4.2.1(vite@5.3.5(@types/node@20.12.4))
       autoprefixer:
         specifier: ^10.4.19
         version: 10.4.19(postcss@8.4.38)
-      eslint:
-        specifier: ^8.57.0
-        version: 8.57.0
-      eslint-plugin-react-hooks:
-        specifier: ^4.6.0
-        version: 4.6.0(eslint@8.57.0)
-      eslint-plugin-react-refresh:
-        specifier: ^0.4.6
-        version: 0.4.6(eslint@8.57.0)
       postcss:
         specifier: ^8.4.38
         version: 8.4.38
@@ -212,12 +161,15 @@ importers:
       tailwindcss:
         specifier: ^3.4.3
         version: 3.4.3
+      typescript:
+        specifier: ^5.5.2
+        version: 5.5.2
       vite:
-        specifier: ^5.2.0
-        version: 5.2.8(@types/node@20.12.4)
-      vite-plugin-dts:
-        specifier: ^3.8.1
-        version: 3.8.1(@types/node@20.12.4)(rollup@4.14.0)(typescript@5.5.2)(vite@5.2.8(@types/node@20.12.4))
+        specifier: ^5.3.5
+        version: 5.3.5(@types/node@20.12.4)
+      vite-plugin-node-polyfills:
+        specifier: ^0.17.0
+        version: 0.17.0(rollup@4.14.0)(vite@5.3.5(@types/node@20.12.4))
 
   packages/ui:
     dependencies:
@@ -305,275 +257,162 @@ importers:
         version: 3.8.1(@types/node@20.12.4)(rollup@4.14.0)(typescript@5.3.3)(vite@5.2.8(@types/node@20.12.4))
 
 packages:
+
   '@aashutoshrathi/word-wrap@1.2.6':
-    resolution:
-      {
-        integrity: sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==,
-      }
-    engines: { node: '>=0.10.0' }
+    resolution: {integrity: sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==}
+    engines: {node: '>=0.10.0'}
 
   '@alloc/quick-lru@5.2.0':
-    resolution:
-      {
-        integrity: sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==}
+    engines: {node: '>=10'}
 
   '@ampproject/remapping@2.2.1':
-    resolution:
-      {
-        integrity: sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==,
-      }
-    engines: { node: '>=6.0.0' }
+    resolution: {integrity: sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==}
+    engines: {node: '>=6.0.0'}
 
   '@babel/code-frame@7.23.5':
-    resolution:
-      {
-        integrity: sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==}
+    engines: {node: '>=6.9.0'}
 
   '@babel/compat-data@7.23.5':
-    resolution:
-      {
-        integrity: sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==}
+    engines: {node: '>=6.9.0'}
 
   '@babel/core@7.23.5':
-    resolution:
-      {
-        integrity: sha512-Cwc2XjUrG4ilcfOw4wBAK+enbdgwAcAJCfGUItPBKR7Mjw4aEfAFYrLxeRp4jWgtNIKn3n2AlBOfwwafl+42/g==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-Cwc2XjUrG4ilcfOw4wBAK+enbdgwAcAJCfGUItPBKR7Mjw4aEfAFYrLxeRp4jWgtNIKn3n2AlBOfwwafl+42/g==}
+    engines: {node: '>=6.9.0'}
 
   '@babel/generator@7.23.5':
-    resolution:
-      {
-        integrity: sha512-BPssCHrBD+0YrxviOa3QzpqwhNIXKEtOa2jQrm4FlmkC2apYgRnQcmPWiGZDlGxiNtltnUFolMe8497Esry+jA==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-BPssCHrBD+0YrxviOa3QzpqwhNIXKEtOa2jQrm4FlmkC2apYgRnQcmPWiGZDlGxiNtltnUFolMe8497Esry+jA==}
+    engines: {node: '>=6.9.0'}
 
   '@babel/helper-annotate-as-pure@7.22.5':
-    resolution:
-      {
-        integrity: sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==}
+    engines: {node: '>=6.9.0'}
 
   '@babel/helper-compilation-targets@7.22.15':
-    resolution:
-      {
-        integrity: sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==}
+    engines: {node: '>=6.9.0'}
 
   '@babel/helper-environment-visitor@7.22.20':
-    resolution:
-      {
-        integrity: sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==}
+    engines: {node: '>=6.9.0'}
 
   '@babel/helper-function-name@7.23.0':
-    resolution:
-      {
-        integrity: sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==}
+    engines: {node: '>=6.9.0'}
 
   '@babel/helper-hoist-variables@7.22.5':
-    resolution:
-      {
-        integrity: sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==}
+    engines: {node: '>=6.9.0'}
 
   '@babel/helper-module-imports@7.22.15':
-    resolution:
-      {
-        integrity: sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==}
+    engines: {node: '>=6.9.0'}
 
   '@babel/helper-module-transforms@7.23.3':
-    resolution:
-      {
-        integrity: sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
 
   '@babel/helper-plugin-utils@7.22.5':
-    resolution:
-      {
-        integrity: sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==}
+    engines: {node: '>=6.9.0'}
 
   '@babel/helper-simple-access@7.22.5':
-    resolution:
-      {
-        integrity: sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==}
+    engines: {node: '>=6.9.0'}
 
   '@babel/helper-split-export-declaration@7.22.6':
-    resolution:
-      {
-        integrity: sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==}
+    engines: {node: '>=6.9.0'}
 
   '@babel/helper-string-parser@7.23.4':
-    resolution:
-      {
-        integrity: sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==}
+    engines: {node: '>=6.9.0'}
 
   '@babel/helper-validator-identifier@7.22.20':
-    resolution:
-      {
-        integrity: sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==}
+    engines: {node: '>=6.9.0'}
 
   '@babel/helper-validator-option@7.23.5':
-    resolution:
-      {
-        integrity: sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==}
+    engines: {node: '>=6.9.0'}
 
   '@babel/helpers@7.23.5':
-    resolution:
-      {
-        integrity: sha512-oO7us8FzTEsG3U6ag9MfdF1iA/7Z6dz+MtFhifZk8C8o453rGJFFWUP1t+ULM9TUIAzC9uxXEiXjOiVMyd7QPg==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-oO7us8FzTEsG3U6ag9MfdF1iA/7Z6dz+MtFhifZk8C8o453rGJFFWUP1t+ULM9TUIAzC9uxXEiXjOiVMyd7QPg==}
+    engines: {node: '>=6.9.0'}
 
   '@babel/highlight@7.23.4':
-    resolution:
-      {
-        integrity: sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==}
+    engines: {node: '>=6.9.0'}
 
   '@babel/parser@7.23.5':
-    resolution:
-      {
-        integrity: sha512-hOOqoiNXrmGdFbhgCzu6GiURxUgM27Xwd/aPuu8RfHEZPBzL1Z54okAHAQjXfcQNwvrlkAmAp4SlRTZ45vlthQ==,
-      }
-    engines: { node: '>=6.0.0' }
+    resolution: {integrity: sha512-hOOqoiNXrmGdFbhgCzu6GiURxUgM27Xwd/aPuu8RfHEZPBzL1Z54okAHAQjXfcQNwvrlkAmAp4SlRTZ45vlthQ==}
+    engines: {node: '>=6.0.0'}
     hasBin: true
 
   '@babel/parser@7.24.4':
-    resolution:
-      {
-        integrity: sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg==,
-      }
-    engines: { node: '>=6.0.0' }
+    resolution: {integrity: sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg==}
+    engines: {node: '>=6.0.0'}
     hasBin: true
 
   '@babel/plugin-syntax-jsx@7.23.3':
-    resolution:
-      {
-        integrity: sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
   '@babel/plugin-transform-react-jsx-self@7.23.3':
-    resolution:
-      {
-        integrity: sha512-qXRvbeKDSfwnlJnanVRp0SfuWE5DQhwQr5xtLBzp56Wabyo+4CMosF6Kfp+eOD/4FYpql64XVJ2W0pVLlJZxOQ==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-qXRvbeKDSfwnlJnanVRp0SfuWE5DQhwQr5xtLBzp56Wabyo+4CMosF6Kfp+eOD/4FYpql64XVJ2W0pVLlJZxOQ==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
   '@babel/plugin-transform-react-jsx-source@7.23.3':
-    resolution:
-      {
-        integrity: sha512-91RS0MDnAWDNvGC6Wio5XYkyWI39FMFO+JK9+4AlgaTH+yWwVTsw7/sn6LK0lH7c5F+TFkpv/3LfCJ1Ydwof/g==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-91RS0MDnAWDNvGC6Wio5XYkyWI39FMFO+JK9+4AlgaTH+yWwVTsw7/sn6LK0lH7c5F+TFkpv/3LfCJ1Ydwof/g==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
   '@babel/runtime@7.23.9':
-    resolution:
-      {
-        integrity: sha512-0CX6F+BI2s9dkUqr08KFrAIZgNFj75rdBU/DjCyYLIaV/quFjkk6T+EJ2LkZHyZTbEV4L5p97mNkUsHl2wLFAw==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-0CX6F+BI2s9dkUqr08KFrAIZgNFj75rdBU/DjCyYLIaV/quFjkk6T+EJ2LkZHyZTbEV4L5p97mNkUsHl2wLFAw==}
+    engines: {node: '>=6.9.0'}
 
   '@babel/runtime@7.24.4':
-    resolution:
-      {
-        integrity: sha512-dkxf7+hn8mFBwKjs9bvBlArzLVxVbS8usaPUDd5p2a9JCL9tB8OaOVN1isD4+Xyk4ns89/xeOmbQvgdK7IIVdA==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-dkxf7+hn8mFBwKjs9bvBlArzLVxVbS8usaPUDd5p2a9JCL9tB8OaOVN1isD4+Xyk4ns89/xeOmbQvgdK7IIVdA==}
+    engines: {node: '>=6.9.0'}
 
   '@babel/template@7.22.15':
-    resolution:
-      {
-        integrity: sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==}
+    engines: {node: '>=6.9.0'}
 
   '@babel/traverse@7.23.5':
-    resolution:
-      {
-        integrity: sha512-czx7Xy5a6sapWWRx61m1Ke1Ra4vczu1mCTtJam5zRTBOonfdJ+S/B6HYmGYu3fJtr8GGET3si6IhgWVBhJ/m8w==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-czx7Xy5a6sapWWRx61m1Ke1Ra4vczu1mCTtJam5zRTBOonfdJ+S/B6HYmGYu3fJtr8GGET3si6IhgWVBhJ/m8w==}
+    engines: {node: '>=6.9.0'}
 
   '@babel/types@7.23.5':
-    resolution:
-      {
-        integrity: sha512-ON5kSOJwVO6xXVRTvOI0eOnWe7VdUcIpsovGo9U/Br4Ie4UVFQTboO2cYnDhAGU6Fp+UxSiT+pMft0SMHfuq6w==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-ON5kSOJwVO6xXVRTvOI0eOnWe7VdUcIpsovGo9U/Br4Ie4UVFQTboO2cYnDhAGU6Fp+UxSiT+pMft0SMHfuq6w==}
+    engines: {node: '>=6.9.0'}
 
   '@emotion/babel-plugin@11.11.0':
-    resolution:
-      {
-        integrity: sha512-m4HEDZleaaCH+XgDDsPF15Ht6wTLsgDTeR3WYj9Q/k76JtWhrJjcP4+/XlG8LGT/Rol9qUfOIztXeA84ATpqPQ==,
-      }
+    resolution: {integrity: sha512-m4HEDZleaaCH+XgDDsPF15Ht6wTLsgDTeR3WYj9Q/k76JtWhrJjcP4+/XlG8LGT/Rol9qUfOIztXeA84ATpqPQ==}
 
   '@emotion/cache@11.11.0':
-    resolution:
-      {
-        integrity: sha512-P34z9ssTCBi3e9EI1ZsWpNHcfY1r09ZO0rZbRO2ob3ZQMnFI35jB536qoXbkdesr5EUhYi22anuEJuyxifaqAQ==,
-      }
+    resolution: {integrity: sha512-P34z9ssTCBi3e9EI1ZsWpNHcfY1r09ZO0rZbRO2ob3ZQMnFI35jB536qoXbkdesr5EUhYi22anuEJuyxifaqAQ==}
 
   '@emotion/hash@0.9.1':
-    resolution:
-      {
-        integrity: sha512-gJB6HLm5rYwSLI6PQa+X1t5CFGrv1J1TWG+sOyMCeKz2ojaj6Fnl/rZEspogG+cvqbt4AE/2eIyD2QfLKTBNlQ==,
-      }
+    resolution: {integrity: sha512-gJB6HLm5rYwSLI6PQa+X1t5CFGrv1J1TWG+sOyMCeKz2ojaj6Fnl/rZEspogG+cvqbt4AE/2eIyD2QfLKTBNlQ==}
 
   '@emotion/is-prop-valid@1.2.1':
-    resolution:
-      {
-        integrity: sha512-61Mf7Ufx4aDxx1xlDeOm8aFFigGHE4z+0sKCa+IHCeZKiyP9RLD0Mmx7m8b9/Cf37f7NAvQOOJAbQQGVr5uERw==,
-      }
+    resolution: {integrity: sha512-61Mf7Ufx4aDxx1xlDeOm8aFFigGHE4z+0sKCa+IHCeZKiyP9RLD0Mmx7m8b9/Cf37f7NAvQOOJAbQQGVr5uERw==}
 
   '@emotion/memoize@0.8.1':
-    resolution:
-      {
-        integrity: sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA==,
-      }
+    resolution: {integrity: sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA==}
 
   '@emotion/react@11.11.3':
-    resolution:
-      {
-        integrity: sha512-Cnn0kuq4DoONOMcnoVsTOR8E+AdnKFf//6kUWc4LCdnxj31pZWn7rIULd6Y7/Js1PiPHzn7SKCM9vB/jBni8eA==,
-      }
+    resolution: {integrity: sha512-Cnn0kuq4DoONOMcnoVsTOR8E+AdnKFf//6kUWc4LCdnxj31pZWn7rIULd6Y7/Js1PiPHzn7SKCM9vB/jBni8eA==}
     peerDependencies:
       '@types/react': '*'
       react: '>=16.8.0'
@@ -582,22 +421,13 @@ packages:
         optional: true
 
   '@emotion/serialize@1.1.3':
-    resolution:
-      {
-        integrity: sha512-iD4D6QVZFDhcbH0RAG1uVu1CwVLMWUkCvAqqlewO/rxf8+87yIBAlt4+AxMiiKPLs5hFc0owNk/sLLAOROw3cA==,
-      }
+    resolution: {integrity: sha512-iD4D6QVZFDhcbH0RAG1uVu1CwVLMWUkCvAqqlewO/rxf8+87yIBAlt4+AxMiiKPLs5hFc0owNk/sLLAOROw3cA==}
 
   '@emotion/sheet@1.2.2':
-    resolution:
-      {
-        integrity: sha512-0QBtGvaqtWi+nx6doRwDdBIzhNdZrXUppvTM4dtZZWEGTXL/XE/yJxLMGlDT1Gt+UHH5IX1n+jkXyytE/av7OA==,
-      }
+    resolution: {integrity: sha512-0QBtGvaqtWi+nx6doRwDdBIzhNdZrXUppvTM4dtZZWEGTXL/XE/yJxLMGlDT1Gt+UHH5IX1n+jkXyytE/av7OA==}
 
   '@emotion/styled@11.11.0':
-    resolution:
-      {
-        integrity: sha512-hM5Nnvu9P3midq5aaXj4I+lnSfNi7Pmd4EWk1fOZ3pxookaQTNew6bp4JaCBYM4HVFZF9g7UjJmsUmC2JlxOng==,
-      }
+    resolution: {integrity: sha512-hM5Nnvu9P3midq5aaXj4I+lnSfNi7Pmd4EWk1fOZ3pxookaQTNew6bp4JaCBYM4HVFZF9g7UjJmsUmC2JlxOng==}
     peerDependencies:
       '@emotion/react': ^11.0.0-rc.0
       '@types/react': '*'
@@ -607,972 +437,570 @@ packages:
         optional: true
 
   '@emotion/stylis@0.8.5':
-    resolution:
-      {
-        integrity: sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ==,
-      }
+    resolution: {integrity: sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ==}
 
   '@emotion/unitless@0.7.5':
-    resolution:
-      {
-        integrity: sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==,
-      }
+    resolution: {integrity: sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==}
 
   '@emotion/unitless@0.8.1':
-    resolution:
-      {
-        integrity: sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ==,
-      }
+    resolution: {integrity: sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ==}
 
   '@emotion/use-insertion-effect-with-fallbacks@1.0.1':
-    resolution:
-      {
-        integrity: sha512-jT/qyKZ9rzLErtrjGgdkMBn2OP8wl0G3sQlBb3YPryvKHsjvINUhVaPFfP+fpBcOkmrVOVEEHQFJ7nbj2TH2gw==,
-      }
+    resolution: {integrity: sha512-jT/qyKZ9rzLErtrjGgdkMBn2OP8wl0G3sQlBb3YPryvKHsjvINUhVaPFfP+fpBcOkmrVOVEEHQFJ7nbj2TH2gw==}
     peerDependencies:
       react: '>=16.8.0'
 
   '@emotion/utils@1.2.1':
-    resolution:
-      {
-        integrity: sha512-Y2tGf3I+XVnajdItskUCn6LX+VUDmP6lTL4fcqsXAv43dnlbZiuW4MWQW38rW/BVWSE7Q/7+XQocmpnRYILUmg==,
-      }
+    resolution: {integrity: sha512-Y2tGf3I+XVnajdItskUCn6LX+VUDmP6lTL4fcqsXAv43dnlbZiuW4MWQW38rW/BVWSE7Q/7+XQocmpnRYILUmg==}
 
   '@emotion/weak-memoize@0.3.1':
-    resolution:
-      {
-        integrity: sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww==,
-      }
+    resolution: {integrity: sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww==}
 
   '@esbuild/aix-ppc64@0.20.2':
-    resolution:
-      {
-        integrity: sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==,
-      }
-    engines: { node: '>=12' }
+    resolution: {integrity: sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==}
+    engines: {node: '>=12'}
     cpu: [ppc64]
     os: [aix]
 
-  '@esbuild/android-arm64@0.19.8':
-    resolution:
-      {
-        integrity: sha512-B8JbS61bEunhfx8kasogFENgQfr/dIp+ggYXwTqdbMAgGDhRa3AaPpQMuQU0rNxDLECj6FhDzk1cF9WHMVwrtA==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/aix-ppc64@0.21.5':
+    resolution: {integrity: sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==}
+    engines: {node: '>=12'}
+    cpu: [ppc64]
+    os: [aix]
+
+  '@esbuild/android-arm64@0.20.2':
+    resolution: {integrity: sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==}
+    engines: {node: '>=12'}
     cpu: [arm64]
     os: [android]
 
-  '@esbuild/android-arm64@0.20.2':
-    resolution:
-      {
-        integrity: sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/android-arm64@0.21.5':
+    resolution: {integrity: sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==}
+    engines: {node: '>=12'}
     cpu: [arm64]
     os: [android]
 
-  '@esbuild/android-arm@0.19.8':
-    resolution:
-      {
-        integrity: sha512-31E2lxlGM1KEfivQl8Yf5aYU/mflz9g06H6S15ITUFQueMFtFjESRMoDSkvMo8thYvLBax+VKTPlpnx+sPicOA==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/android-arm@0.20.2':
+    resolution: {integrity: sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==}
+    engines: {node: '>=12'}
     cpu: [arm]
     os: [android]
 
-  '@esbuild/android-arm@0.20.2':
-    resolution:
-      {
-        integrity: sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/android-arm@0.21.5':
+    resolution: {integrity: sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==}
+    engines: {node: '>=12'}
     cpu: [arm]
     os: [android]
 
-  '@esbuild/android-x64@0.19.8':
-    resolution:
-      {
-        integrity: sha512-rdqqYfRIn4jWOp+lzQttYMa2Xar3OK9Yt2fhOhzFXqg0rVWEfSclJvZq5fZslnz6ypHvVf3CT7qyf0A5pM682A==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/android-x64@0.20.2':
+    resolution: {integrity: sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==}
+    engines: {node: '>=12'}
     cpu: [x64]
     os: [android]
 
-  '@esbuild/android-x64@0.20.2':
-    resolution:
-      {
-        integrity: sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/android-x64@0.21.5':
+    resolution: {integrity: sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==}
+    engines: {node: '>=12'}
     cpu: [x64]
     os: [android]
 
-  '@esbuild/darwin-arm64@0.19.8':
-    resolution:
-      {
-        integrity: sha512-RQw9DemMbIq35Bprbboyf8SmOr4UXsRVxJ97LgB55VKKeJOOdvsIPy0nFyF2l8U+h4PtBx/1kRf0BelOYCiQcw==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/darwin-arm64@0.20.2':
+    resolution: {integrity: sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==}
+    engines: {node: '>=12'}
     cpu: [arm64]
     os: [darwin]
 
-  '@esbuild/darwin-arm64@0.20.2':
-    resolution:
-      {
-        integrity: sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/darwin-arm64@0.21.5':
+    resolution: {integrity: sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==}
+    engines: {node: '>=12'}
     cpu: [arm64]
     os: [darwin]
 
-  '@esbuild/darwin-x64@0.19.8':
-    resolution:
-      {
-        integrity: sha512-3sur80OT9YdeZwIVgERAysAbwncom7b4bCI2XKLjMfPymTud7e/oY4y+ci1XVp5TfQp/bppn7xLw1n/oSQY3/Q==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/darwin-x64@0.20.2':
+    resolution: {integrity: sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==}
+    engines: {node: '>=12'}
     cpu: [x64]
     os: [darwin]
 
-  '@esbuild/darwin-x64@0.20.2':
-    resolution:
-      {
-        integrity: sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/darwin-x64@0.21.5':
+    resolution: {integrity: sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==}
+    engines: {node: '>=12'}
     cpu: [x64]
     os: [darwin]
 
-  '@esbuild/freebsd-arm64@0.19.8':
-    resolution:
-      {
-        integrity: sha512-WAnPJSDattvS/XtPCTj1tPoTxERjcTpH6HsMr6ujTT+X6rylVe8ggxk8pVxzf5U1wh5sPODpawNicF5ta/9Tmw==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/freebsd-arm64@0.20.2':
+    resolution: {integrity: sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==}
+    engines: {node: '>=12'}
     cpu: [arm64]
     os: [freebsd]
 
-  '@esbuild/freebsd-arm64@0.20.2':
-    resolution:
-      {
-        integrity: sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/freebsd-arm64@0.21.5':
+    resolution: {integrity: sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==}
+    engines: {node: '>=12'}
     cpu: [arm64]
     os: [freebsd]
 
-  '@esbuild/freebsd-x64@0.19.8':
-    resolution:
-      {
-        integrity: sha512-ICvZyOplIjmmhjd6mxi+zxSdpPTKFfyPPQMQTK/w+8eNK6WV01AjIztJALDtwNNfFhfZLux0tZLC+U9nSyA5Zg==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/freebsd-x64@0.20.2':
+    resolution: {integrity: sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==}
+    engines: {node: '>=12'}
     cpu: [x64]
     os: [freebsd]
 
-  '@esbuild/freebsd-x64@0.20.2':
-    resolution:
-      {
-        integrity: sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/freebsd-x64@0.21.5':
+    resolution: {integrity: sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==}
+    engines: {node: '>=12'}
     cpu: [x64]
     os: [freebsd]
 
-  '@esbuild/linux-arm64@0.19.8':
-    resolution:
-      {
-        integrity: sha512-z1zMZivxDLHWnyGOctT9JP70h0beY54xDDDJt4VpTX+iwA77IFsE1vCXWmprajJGa+ZYSqkSbRQ4eyLCpCmiCQ==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/linux-arm64@0.20.2':
+    resolution: {integrity: sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==}
+    engines: {node: '>=12'}
     cpu: [arm64]
     os: [linux]
 
-  '@esbuild/linux-arm64@0.20.2':
-    resolution:
-      {
-        integrity: sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/linux-arm64@0.21.5':
+    resolution: {integrity: sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==}
+    engines: {node: '>=12'}
     cpu: [arm64]
     os: [linux]
 
-  '@esbuild/linux-arm@0.19.8':
-    resolution:
-      {
-        integrity: sha512-H4vmI5PYqSvosPaTJuEppU9oz1dq2A7Mr2vyg5TF9Ga+3+MGgBdGzcyBP7qK9MrwFQZlvNyJrvz6GuCaj3OukQ==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/linux-arm@0.20.2':
+    resolution: {integrity: sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==}
+    engines: {node: '>=12'}
     cpu: [arm]
     os: [linux]
 
-  '@esbuild/linux-arm@0.20.2':
-    resolution:
-      {
-        integrity: sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/linux-arm@0.21.5':
+    resolution: {integrity: sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==}
+    engines: {node: '>=12'}
     cpu: [arm]
     os: [linux]
 
-  '@esbuild/linux-ia32@0.19.8':
-    resolution:
-      {
-        integrity: sha512-1a8suQiFJmZz1khm/rDglOc8lavtzEMRo0v6WhPgxkrjcU0LkHj+TwBrALwoz/OtMExvsqbbMI0ChyelKabSvQ==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/linux-ia32@0.20.2':
+    resolution: {integrity: sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==}
+    engines: {node: '>=12'}
     cpu: [ia32]
     os: [linux]
 
-  '@esbuild/linux-ia32@0.20.2':
-    resolution:
-      {
-        integrity: sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/linux-ia32@0.21.5':
+    resolution: {integrity: sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==}
+    engines: {node: '>=12'}
     cpu: [ia32]
     os: [linux]
 
-  '@esbuild/linux-loong64@0.19.8':
-    resolution:
-      {
-        integrity: sha512-fHZWS2JJxnXt1uYJsDv9+b60WCc2RlvVAy1F76qOLtXRO+H4mjt3Tr6MJ5l7Q78X8KgCFudnTuiQRBhULUyBKQ==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/linux-loong64@0.20.2':
+    resolution: {integrity: sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==}
+    engines: {node: '>=12'}
     cpu: [loong64]
     os: [linux]
 
-  '@esbuild/linux-loong64@0.20.2':
-    resolution:
-      {
-        integrity: sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/linux-loong64@0.21.5':
+    resolution: {integrity: sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==}
+    engines: {node: '>=12'}
     cpu: [loong64]
     os: [linux]
 
-  '@esbuild/linux-mips64el@0.19.8':
-    resolution:
-      {
-        integrity: sha512-Wy/z0EL5qZYLX66dVnEg9riiwls5IYnziwuju2oUiuxVc+/edvqXa04qNtbrs0Ukatg5HEzqT94Zs7J207dN5Q==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/linux-mips64el@0.20.2':
+    resolution: {integrity: sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==}
+    engines: {node: '>=12'}
     cpu: [mips64el]
     os: [linux]
 
-  '@esbuild/linux-mips64el@0.20.2':
-    resolution:
-      {
-        integrity: sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/linux-mips64el@0.21.5':
+    resolution: {integrity: sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==}
+    engines: {node: '>=12'}
     cpu: [mips64el]
     os: [linux]
 
-  '@esbuild/linux-ppc64@0.19.8':
-    resolution:
-      {
-        integrity: sha512-ETaW6245wK23YIEufhMQ3HSeHO7NgsLx8gygBVldRHKhOlD1oNeNy/P67mIh1zPn2Hr2HLieQrt6tWrVwuqrxg==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/linux-ppc64@0.20.2':
+    resolution: {integrity: sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==}
+    engines: {node: '>=12'}
     cpu: [ppc64]
     os: [linux]
 
-  '@esbuild/linux-ppc64@0.20.2':
-    resolution:
-      {
-        integrity: sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/linux-ppc64@0.21.5':
+    resolution: {integrity: sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==}
+    engines: {node: '>=12'}
     cpu: [ppc64]
     os: [linux]
 
-  '@esbuild/linux-riscv64@0.19.8':
-    resolution:
-      {
-        integrity: sha512-T2DRQk55SgoleTP+DtPlMrxi/5r9AeFgkhkZ/B0ap99zmxtxdOixOMI570VjdRCs9pE4Wdkz7JYrsPvsl7eESg==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/linux-riscv64@0.20.2':
+    resolution: {integrity: sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==}
+    engines: {node: '>=12'}
     cpu: [riscv64]
     os: [linux]
 
-  '@esbuild/linux-riscv64@0.20.2':
-    resolution:
-      {
-        integrity: sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/linux-riscv64@0.21.5':
+    resolution: {integrity: sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==}
+    engines: {node: '>=12'}
     cpu: [riscv64]
     os: [linux]
 
-  '@esbuild/linux-s390x@0.19.8':
-    resolution:
-      {
-        integrity: sha512-NPxbdmmo3Bk7mbNeHmcCd7R7fptJaczPYBaELk6NcXxy7HLNyWwCyDJ/Xx+/YcNH7Im5dHdx9gZ5xIwyliQCbg==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/linux-s390x@0.20.2':
+    resolution: {integrity: sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==}
+    engines: {node: '>=12'}
     cpu: [s390x]
     os: [linux]
 
-  '@esbuild/linux-s390x@0.20.2':
-    resolution:
-      {
-        integrity: sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/linux-s390x@0.21.5':
+    resolution: {integrity: sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==}
+    engines: {node: '>=12'}
     cpu: [s390x]
     os: [linux]
 
-  '@esbuild/linux-x64@0.19.8':
-    resolution:
-      {
-        integrity: sha512-lytMAVOM3b1gPypL2TRmZ5rnXl7+6IIk8uB3eLsV1JwcizuolblXRrc5ShPrO9ls/b+RTp+E6gbsuLWHWi2zGg==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/linux-x64@0.20.2':
+    resolution: {integrity: sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==}
+    engines: {node: '>=12'}
     cpu: [x64]
     os: [linux]
 
-  '@esbuild/linux-x64@0.20.2':
-    resolution:
-      {
-        integrity: sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/linux-x64@0.21.5':
+    resolution: {integrity: sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==}
+    engines: {node: '>=12'}
     cpu: [x64]
     os: [linux]
 
-  '@esbuild/netbsd-x64@0.19.8':
-    resolution:
-      {
-        integrity: sha512-hvWVo2VsXz/8NVt1UhLzxwAfo5sioj92uo0bCfLibB0xlOmimU/DeAEsQILlBQvkhrGjamP0/el5HU76HAitGw==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/netbsd-x64@0.20.2':
+    resolution: {integrity: sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==}
+    engines: {node: '>=12'}
     cpu: [x64]
     os: [netbsd]
 
-  '@esbuild/netbsd-x64@0.20.2':
-    resolution:
-      {
-        integrity: sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/netbsd-x64@0.21.5':
+    resolution: {integrity: sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==}
+    engines: {node: '>=12'}
     cpu: [x64]
     os: [netbsd]
 
-  '@esbuild/openbsd-x64@0.19.8':
-    resolution:
-      {
-        integrity: sha512-/7Y7u77rdvmGTxR83PgaSvSBJCC2L3Kb1M/+dmSIvRvQPXXCuC97QAwMugBNG0yGcbEGfFBH7ojPzAOxfGNkwQ==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/openbsd-x64@0.20.2':
+    resolution: {integrity: sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==}
+    engines: {node: '>=12'}
     cpu: [x64]
     os: [openbsd]
 
-  '@esbuild/openbsd-x64@0.20.2':
-    resolution:
-      {
-        integrity: sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/openbsd-x64@0.21.5':
+    resolution: {integrity: sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==}
+    engines: {node: '>=12'}
     cpu: [x64]
     os: [openbsd]
 
-  '@esbuild/sunos-x64@0.19.8':
-    resolution:
-      {
-        integrity: sha512-9Lc4s7Oi98GqFA4HzA/W2JHIYfnXbUYgekUP/Sm4BG9sfLjyv6GKKHKKVs83SMicBF2JwAX6A1PuOLMqpD001w==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/sunos-x64@0.20.2':
+    resolution: {integrity: sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==}
+    engines: {node: '>=12'}
     cpu: [x64]
     os: [sunos]
 
-  '@esbuild/sunos-x64@0.20.2':
-    resolution:
-      {
-        integrity: sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/sunos-x64@0.21.5':
+    resolution: {integrity: sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==}
+    engines: {node: '>=12'}
     cpu: [x64]
     os: [sunos]
 
-  '@esbuild/win32-arm64@0.19.8':
-    resolution:
-      {
-        integrity: sha512-rq6WzBGjSzihI9deW3fC2Gqiak68+b7qo5/3kmB6Gvbh/NYPA0sJhrnp7wgV4bNwjqM+R2AApXGxMO7ZoGhIJg==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/win32-arm64@0.20.2':
+    resolution: {integrity: sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==}
+    engines: {node: '>=12'}
     cpu: [arm64]
     os: [win32]
 
-  '@esbuild/win32-arm64@0.20.2':
-    resolution:
-      {
-        integrity: sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/win32-arm64@0.21.5':
+    resolution: {integrity: sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==}
+    engines: {node: '>=12'}
     cpu: [arm64]
     os: [win32]
 
-  '@esbuild/win32-ia32@0.19.8':
-    resolution:
-      {
-        integrity: sha512-AIAbverbg5jMvJznYiGhrd3sumfwWs8572mIJL5NQjJa06P8KfCPWZQ0NwZbPQnbQi9OWSZhFVSUWjjIrn4hSw==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/win32-ia32@0.20.2':
+    resolution: {integrity: sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==}
+    engines: {node: '>=12'}
     cpu: [ia32]
     os: [win32]
 
-  '@esbuild/win32-ia32@0.20.2':
-    resolution:
-      {
-        integrity: sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/win32-ia32@0.21.5':
+    resolution: {integrity: sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==}
+    engines: {node: '>=12'}
     cpu: [ia32]
     os: [win32]
 
-  '@esbuild/win32-x64@0.19.8':
-    resolution:
-      {
-        integrity: sha512-bfZ0cQ1uZs2PqpulNL5j/3w+GDhP36k1K5c38QdQg+Swy51jFZWWeIkteNsufkQxp986wnqRRsb/bHbY1WQ7TA==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/win32-x64@0.20.2':
+    resolution: {integrity: sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==}
+    engines: {node: '>=12'}
     cpu: [x64]
     os: [win32]
 
-  '@esbuild/win32-x64@0.20.2':
-    resolution:
-      {
-        integrity: sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/win32-x64@0.21.5':
+    resolution: {integrity: sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==}
+    engines: {node: '>=12'}
     cpu: [x64]
     os: [win32]
 
   '@eslint-community/eslint-utils@4.4.0':
-    resolution:
-      {
-        integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==,
-      }
-    engines: { node: ^12.22.0 || ^14.17.0 || >=16.0.0 }
+    resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
 
   '@eslint-community/regexpp@4.10.0':
-    resolution:
-      {
-        integrity: sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==,
-      }
-    engines: { node: ^12.0.0 || ^14.0.0 || >=16.0.0 }
+    resolution: {integrity: sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==}
+    engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
 
   '@eslint/eslintrc@2.1.4':
-    resolution:
-      {
-        integrity: sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==,
-      }
-    engines: { node: ^12.22.0 || ^14.17.0 || >=16.0.0 }
-
-  '@eslint/js@8.56.0':
-    resolution:
-      {
-        integrity: sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==,
-      }
-    engines: { node: ^12.22.0 || ^14.17.0 || >=16.0.0 }
+    resolution: {integrity: sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
 
   '@eslint/js@8.57.0':
-    resolution:
-      {
-        integrity: sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==,
-      }
-    engines: { node: ^12.22.0 || ^14.17.0 || >=16.0.0 }
+    resolution: {integrity: sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
 
   '@ethersproject/abi@5.7.0':
-    resolution:
-      {
-        integrity: sha512-351ktp42TiRcYB3H1OP8yajPeAQstMW/yCFokj/AthP9bLHzQFPlOrxOcwYEDkUAICmOHljvN4K39OMTMUa9RA==,
-      }
+    resolution: {integrity: sha512-351ktp42TiRcYB3H1OP8yajPeAQstMW/yCFokj/AthP9bLHzQFPlOrxOcwYEDkUAICmOHljvN4K39OMTMUa9RA==}
 
   '@ethersproject/abstract-provider@5.7.0':
-    resolution:
-      {
-        integrity: sha512-R41c9UkchKCpAqStMYUpdunjo3pkEvZC3FAwZn5S5MGbXoMQOHIdHItezTETxAO5bevtMApSyEhn9+CHcDsWBw==,
-      }
+    resolution: {integrity: sha512-R41c9UkchKCpAqStMYUpdunjo3pkEvZC3FAwZn5S5MGbXoMQOHIdHItezTETxAO5bevtMApSyEhn9+CHcDsWBw==}
 
   '@ethersproject/abstract-signer@5.7.0':
-    resolution:
-      {
-        integrity: sha512-a16V8bq1/Cz+TGCkE2OPMTOUDLS3grCpdjoJCYNnVBbdYEMSgKrU0+B90s8b6H+ByYTBZN7a3g76jdIJi7UfKQ==,
-      }
+    resolution: {integrity: sha512-a16V8bq1/Cz+TGCkE2OPMTOUDLS3grCpdjoJCYNnVBbdYEMSgKrU0+B90s8b6H+ByYTBZN7a3g76jdIJi7UfKQ==}
 
   '@ethersproject/address@5.7.0':
-    resolution:
-      {
-        integrity: sha512-9wYhYt7aghVGo758POM5nqcOMaE168Q6aRLJZwUmiqSrAungkG74gSSeKEIR7ukixesdRZGPgVqme6vmxs1fkA==,
-      }
+    resolution: {integrity: sha512-9wYhYt7aghVGo758POM5nqcOMaE168Q6aRLJZwUmiqSrAungkG74gSSeKEIR7ukixesdRZGPgVqme6vmxs1fkA==}
 
   '@ethersproject/base64@5.7.0':
-    resolution:
-      {
-        integrity: sha512-Dr8tcHt2mEbsZr/mwTPIQAf3Ai0Bks/7gTw9dSqk1mQvhW3XvRlmDJr/4n+wg1JmCl16NZue17CDh8xb/vZ0sQ==,
-      }
+    resolution: {integrity: sha512-Dr8tcHt2mEbsZr/mwTPIQAf3Ai0Bks/7gTw9dSqk1mQvhW3XvRlmDJr/4n+wg1JmCl16NZue17CDh8xb/vZ0sQ==}
 
   '@ethersproject/basex@5.7.0':
-    resolution:
-      {
-        integrity: sha512-ywlh43GwZLv2Voc2gQVTKBoVQ1mti3d8HK5aMxsfu/nRDnMmNqaSJ3r3n85HBByT8OpoY96SXM1FogC533T4zw==,
-      }
+    resolution: {integrity: sha512-ywlh43GwZLv2Voc2gQVTKBoVQ1mti3d8HK5aMxsfu/nRDnMmNqaSJ3r3n85HBByT8OpoY96SXM1FogC533T4zw==}
 
   '@ethersproject/bignumber@5.7.0':
-    resolution:
-      {
-        integrity: sha512-n1CAdIHRWjSucQO3MC1zPSVgV/6dy/fjL9pMrPP9peL+QxEg9wOsVqwD4+818B6LUEtaXzVHQiuivzRoxPxUGw==,
-      }
+    resolution: {integrity: sha512-n1CAdIHRWjSucQO3MC1zPSVgV/6dy/fjL9pMrPP9peL+QxEg9wOsVqwD4+818B6LUEtaXzVHQiuivzRoxPxUGw==}
 
   '@ethersproject/bytes@5.7.0':
-    resolution:
-      {
-        integrity: sha512-nsbxwgFXWh9NyYWo+U8atvmMsSdKJprTcICAkvbBffT75qDocbuggBU0SJiVK2MuTrp0q+xvLkTnGMPK1+uA9A==,
-      }
+    resolution: {integrity: sha512-nsbxwgFXWh9NyYWo+U8atvmMsSdKJprTcICAkvbBffT75qDocbuggBU0SJiVK2MuTrp0q+xvLkTnGMPK1+uA9A==}
 
   '@ethersproject/constants@5.7.0':
-    resolution:
-      {
-        integrity: sha512-DHI+y5dBNvkpYUMiRQyxRBYBefZkJfo70VUkUAsRjcPs47muV9evftfZ0PJVCXYbAiCgght0DtcF9srFQmIgWA==,
-      }
+    resolution: {integrity: sha512-DHI+y5dBNvkpYUMiRQyxRBYBefZkJfo70VUkUAsRjcPs47muV9evftfZ0PJVCXYbAiCgght0DtcF9srFQmIgWA==}
 
   '@ethersproject/contracts@5.7.0':
-    resolution:
-      {
-        integrity: sha512-5GJbzEU3X+d33CdfPhcyS+z8MzsTrBGk/sc+G+59+tPa9yFkl6HQ9D6L0QMgNTA9q8dT0XKxxkyp883XsQvbbg==,
-      }
+    resolution: {integrity: sha512-5GJbzEU3X+d33CdfPhcyS+z8MzsTrBGk/sc+G+59+tPa9yFkl6HQ9D6L0QMgNTA9q8dT0XKxxkyp883XsQvbbg==}
 
   '@ethersproject/hash@5.7.0':
-    resolution:
-      {
-        integrity: sha512-qX5WrQfnah1EFnO5zJv1v46a8HW0+E5xuBBDTwMFZLuVTx0tbU2kkx15NqdjxecrLGatQN9FGQKpb1FKdHCt+g==,
-      }
+    resolution: {integrity: sha512-qX5WrQfnah1EFnO5zJv1v46a8HW0+E5xuBBDTwMFZLuVTx0tbU2kkx15NqdjxecrLGatQN9FGQKpb1FKdHCt+g==}
 
   '@ethersproject/hdnode@5.7.0':
-    resolution:
-      {
-        integrity: sha512-OmyYo9EENBPPf4ERhR7oj6uAtUAhYGqOnIS+jE5pTXvdKBS99ikzq1E7Iv0ZQZ5V36Lqx1qZLeak0Ra16qpeOg==,
-      }
+    resolution: {integrity: sha512-OmyYo9EENBPPf4ERhR7oj6uAtUAhYGqOnIS+jE5pTXvdKBS99ikzq1E7Iv0ZQZ5V36Lqx1qZLeak0Ra16qpeOg==}
 
   '@ethersproject/json-wallets@5.7.0':
-    resolution:
-      {
-        integrity: sha512-8oee5Xgu6+RKgJTkvEMl2wDgSPSAQ9MB/3JYjFV9jlKvcYHUXZC+cQp0njgmxdHkYWn8s6/IqIZYm0YWCjO/0g==,
-      }
+    resolution: {integrity: sha512-8oee5Xgu6+RKgJTkvEMl2wDgSPSAQ9MB/3JYjFV9jlKvcYHUXZC+cQp0njgmxdHkYWn8s6/IqIZYm0YWCjO/0g==}
 
   '@ethersproject/keccak256@5.7.0':
-    resolution:
-      {
-        integrity: sha512-2UcPboeL/iW+pSg6vZ6ydF8tCnv3Iu/8tUmLLzWWGzxWKFFqOBQFLo6uLUv6BDrLgCDfN28RJ/wtByx+jZ4KBg==,
-      }
+    resolution: {integrity: sha512-2UcPboeL/iW+pSg6vZ6ydF8tCnv3Iu/8tUmLLzWWGzxWKFFqOBQFLo6uLUv6BDrLgCDfN28RJ/wtByx+jZ4KBg==}
 
   '@ethersproject/logger@5.7.0':
-    resolution:
-      {
-        integrity: sha512-0odtFdXu/XHtjQXJYA3u9G0G8btm0ND5Cu8M7i5vhEcE8/HmF4Lbdqanwyv4uQTr2tx6b7fQRmgLrsnpQlmnig==,
-      }
+    resolution: {integrity: sha512-0odtFdXu/XHtjQXJYA3u9G0G8btm0ND5Cu8M7i5vhEcE8/HmF4Lbdqanwyv4uQTr2tx6b7fQRmgLrsnpQlmnig==}
 
   '@ethersproject/networks@5.7.1':
-    resolution:
-      {
-        integrity: sha512-n/MufjFYv3yFcUyfhnXotyDlNdFb7onmkSy8aQERi2PjNcnWQ66xXxa3XlS8nCcA8aJKJjIIMNJTC7tu80GwpQ==,
-      }
+    resolution: {integrity: sha512-n/MufjFYv3yFcUyfhnXotyDlNdFb7onmkSy8aQERi2PjNcnWQ66xXxa3XlS8nCcA8aJKJjIIMNJTC7tu80GwpQ==}
 
   '@ethersproject/pbkdf2@5.7.0':
-    resolution:
-      {
-        integrity: sha512-oR/dBRZR6GTyaofd86DehG72hY6NpAjhabkhxgr3X2FpJtJuodEl2auADWBZfhDHgVCbu3/H/Ocq2uC6dpNjjw==,
-      }
+    resolution: {integrity: sha512-oR/dBRZR6GTyaofd86DehG72hY6NpAjhabkhxgr3X2FpJtJuodEl2auADWBZfhDHgVCbu3/H/Ocq2uC6dpNjjw==}
 
   '@ethersproject/properties@5.7.0':
-    resolution:
-      {
-        integrity: sha512-J87jy8suntrAkIZtecpxEPxY//szqr1mlBaYlQ0r4RCaiD2hjheqF9s1LVE8vVuJCXisjIP+JgtK/Do54ej4Sw==,
-      }
+    resolution: {integrity: sha512-J87jy8suntrAkIZtecpxEPxY//szqr1mlBaYlQ0r4RCaiD2hjheqF9s1LVE8vVuJCXisjIP+JgtK/Do54ej4Sw==}
 
   '@ethersproject/providers@5.7.2':
-    resolution:
-      {
-        integrity: sha512-g34EWZ1WWAVgr4aptGlVBF8mhl3VWjv+8hoAnzStu8Ah22VHBsuGzP17eb6xDVRzw895G4W7vvx60lFFur/1Rg==,
-      }
+    resolution: {integrity: sha512-g34EWZ1WWAVgr4aptGlVBF8mhl3VWjv+8hoAnzStu8Ah22VHBsuGzP17eb6xDVRzw895G4W7vvx60lFFur/1Rg==}
 
   '@ethersproject/random@5.7.0':
-    resolution:
-      {
-        integrity: sha512-19WjScqRA8IIeWclFme75VMXSBvi4e6InrUNuaR4s5pTF2qNhcGdCUwdxUVGtDDqC00sDLCO93jPQoDUH4HVmQ==,
-      }
+    resolution: {integrity: sha512-19WjScqRA8IIeWclFme75VMXSBvi4e6InrUNuaR4s5pTF2qNhcGdCUwdxUVGtDDqC00sDLCO93jPQoDUH4HVmQ==}
 
   '@ethersproject/rlp@5.7.0':
-    resolution:
-      {
-        integrity: sha512-rBxzX2vK8mVF7b0Tol44t5Tb8gomOHkj5guL+HhzQ1yBh/ydjGnpw6at+X6Iw0Kp3OzzzkcKp8N9r0W4kYSs9w==,
-      }
+    resolution: {integrity: sha512-rBxzX2vK8mVF7b0Tol44t5Tb8gomOHkj5guL+HhzQ1yBh/ydjGnpw6at+X6Iw0Kp3OzzzkcKp8N9r0W4kYSs9w==}
 
   '@ethersproject/sha2@5.7.0':
-    resolution:
-      {
-        integrity: sha512-gKlH42riwb3KYp0reLsFTokByAKoJdgFCwI+CCiX/k+Jm2mbNs6oOaCjYQSlI1+XBVejwH2KrmCbMAT/GnRDQw==,
-      }
+    resolution: {integrity: sha512-gKlH42riwb3KYp0reLsFTokByAKoJdgFCwI+CCiX/k+Jm2mbNs6oOaCjYQSlI1+XBVejwH2KrmCbMAT/GnRDQw==}
 
   '@ethersproject/signing-key@5.7.0':
-    resolution:
-      {
-        integrity: sha512-MZdy2nL3wO0u7gkB4nA/pEf8lu1TlFswPNmy8AiYkfKTdO6eXBJyUdmHO/ehm/htHw9K/qF8ujnTyUAD+Ry54Q==,
-      }
+    resolution: {integrity: sha512-MZdy2nL3wO0u7gkB4nA/pEf8lu1TlFswPNmy8AiYkfKTdO6eXBJyUdmHO/ehm/htHw9K/qF8ujnTyUAD+Ry54Q==}
 
   '@ethersproject/solidity@5.7.0':
-    resolution:
-      {
-        integrity: sha512-HmabMd2Dt/raavyaGukF4XxizWKhKQ24DoLtdNbBmNKUOPqwjsKQSdV9GQtj9CBEea9DlzETlVER1gYeXXBGaA==,
-      }
+    resolution: {integrity: sha512-HmabMd2Dt/raavyaGukF4XxizWKhKQ24DoLtdNbBmNKUOPqwjsKQSdV9GQtj9CBEea9DlzETlVER1gYeXXBGaA==}
 
   '@ethersproject/strings@5.7.0':
-    resolution:
-      {
-        integrity: sha512-/9nu+lj0YswRNSH0NXYqrh8775XNyEdUQAuf3f+SmOrnVewcJ5SBNAjF7lpgehKi4abvNNXyf+HX86czCdJ8Mg==,
-      }
+    resolution: {integrity: sha512-/9nu+lj0YswRNSH0NXYqrh8775XNyEdUQAuf3f+SmOrnVewcJ5SBNAjF7lpgehKi4abvNNXyf+HX86czCdJ8Mg==}
 
   '@ethersproject/transactions@5.7.0':
-    resolution:
-      {
-        integrity: sha512-kmcNicCp1lp8qanMTC3RIikGgoJ80ztTyvtsFvCYpSCfkjhD0jZ2LOrnbcuxuToLIUYYf+4XwD1rP+B/erDIhQ==,
-      }
+    resolution: {integrity: sha512-kmcNicCp1lp8qanMTC3RIikGgoJ80ztTyvtsFvCYpSCfkjhD0jZ2LOrnbcuxuToLIUYYf+4XwD1rP+B/erDIhQ==}
 
   '@ethersproject/units@5.7.0':
-    resolution:
-      {
-        integrity: sha512-pD3xLMy3SJu9kG5xDGI7+xhTEmGXlEqXU4OfNapmfnxLVY4EMSSRp7j1k7eezutBPH7RBN/7QPnwR7hzNlEFeg==,
-      }
+    resolution: {integrity: sha512-pD3xLMy3SJu9kG5xDGI7+xhTEmGXlEqXU4OfNapmfnxLVY4EMSSRp7j1k7eezutBPH7RBN/7QPnwR7hzNlEFeg==}
 
   '@ethersproject/wallet@5.7.0':
-    resolution:
-      {
-        integrity: sha512-MhmXlJXEJFBFVKrDLB4ZdDzxcBxQ3rLyCkhNqVu3CDYvR97E+8r01UgrI+TI99Le+aYm/in/0vp86guJuM7FCA==,
-      }
+    resolution: {integrity: sha512-MhmXlJXEJFBFVKrDLB4ZdDzxcBxQ3rLyCkhNqVu3CDYvR97E+8r01UgrI+TI99Le+aYm/in/0vp86guJuM7FCA==}
 
   '@ethersproject/web@5.7.1':
-    resolution:
-      {
-        integrity: sha512-Gueu8lSvyjBWL4cYsWsjh6MtMwM0+H4HvqFPZfB6dV8ctbP9zFAO73VG1cMWae0FLPCtz0peKPpZY8/ugJJX2w==,
-      }
+    resolution: {integrity: sha512-Gueu8lSvyjBWL4cYsWsjh6MtMwM0+H4HvqFPZfB6dV8ctbP9zFAO73VG1cMWae0FLPCtz0peKPpZY8/ugJJX2w==}
 
   '@ethersproject/wordlists@5.7.0':
-    resolution:
-      {
-        integrity: sha512-S2TFNJNfHWVHNE6cNDjbVlZ6MgE17MIxMbMg2zv3wn+3XSJGosL1m9ZVv3GXCf/2ymSsQ+hRI5IzoMJTG6aoVA==,
-      }
+    resolution: {integrity: sha512-S2TFNJNfHWVHNE6cNDjbVlZ6MgE17MIxMbMg2zv3wn+3XSJGosL1m9ZVv3GXCf/2ymSsQ+hRI5IzoMJTG6aoVA==}
 
   '@floating-ui/core@1.6.0':
-    resolution:
-      {
-        integrity: sha512-PcF++MykgmTj3CIyOQbKA/hDzOAiqI3mhuoN44WRCopIs1sgoDoU4oty4Jtqaj/y3oDU6fnVSm4QG0a3t5i0+g==,
-      }
+    resolution: {integrity: sha512-PcF++MykgmTj3CIyOQbKA/hDzOAiqI3mhuoN44WRCopIs1sgoDoU4oty4Jtqaj/y3oDU6fnVSm4QG0a3t5i0+g==}
 
   '@floating-ui/dom@1.6.3':
-    resolution:
-      {
-        integrity: sha512-RnDthu3mzPlQ31Ss/BTwQ1zjzIhr3lk1gZB1OC56h/1vEtaXkESrOqL5fQVMfXpwGtRwX+YsZBdyHtJMQnkArw==,
-      }
+    resolution: {integrity: sha512-RnDthu3mzPlQ31Ss/BTwQ1zjzIhr3lk1gZB1OC56h/1vEtaXkESrOqL5fQVMfXpwGtRwX+YsZBdyHtJMQnkArw==}
 
   '@floating-ui/react-dom@2.0.8':
-    resolution:
-      {
-        integrity: sha512-HOdqOt3R3OGeTKidaLvJKcgg75S6tibQ3Tif4eyd91QnIJWr0NLvoXFpJA/j8HqkFSL68GDca9AuyWEHlhyClw==,
-      }
+    resolution: {integrity: sha512-HOdqOt3R3OGeTKidaLvJKcgg75S6tibQ3Tif4eyd91QnIJWr0NLvoXFpJA/j8HqkFSL68GDca9AuyWEHlhyClw==}
     peerDependencies:
       react: '>=16.8.0'
       react-dom: '>=16.8.0'
 
   '@floating-ui/utils@0.2.1':
-    resolution:
-      {
-        integrity: sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q==,
-      }
+    resolution: {integrity: sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q==}
 
   '@hookform/devtools@4.3.1':
-    resolution:
-      {
-        integrity: sha512-CrWxEoHQZaOXJZVQ8KBgOuAa8p2LI8M0DAN5GTRTmdCieRwFVjVDEmuTAVazWVRRkpEQSgSt3KYp7VmmqXdEnw==,
-      }
+    resolution: {integrity: sha512-CrWxEoHQZaOXJZVQ8KBgOuAa8p2LI8M0DAN5GTRTmdCieRwFVjVDEmuTAVazWVRRkpEQSgSt3KYp7VmmqXdEnw==}
     peerDependencies:
       react: ^16.8.0 || ^17 || ^18
       react-dom: ^16.8.0 || ^17 || ^18
 
   '@hookform/resolvers@3.3.4':
-    resolution:
-      {
-        integrity: sha512-o5cgpGOuJYrd+iMKvkttOclgwRW86EsWJZZRC23prf0uU2i48Htq4PuT73AVb9ionFyZrwYEITuOFGF+BydEtQ==,
-      }
+    resolution: {integrity: sha512-o5cgpGOuJYrd+iMKvkttOclgwRW86EsWJZZRC23prf0uU2i48Htq4PuT73AVb9ionFyZrwYEITuOFGF+BydEtQ==}
     peerDependencies:
       react-hook-form: ^7.0.0
 
-  '@humanwhocodes/config-array@0.11.13':
-    resolution:
-      {
-        integrity: sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==,
-      }
-    engines: { node: '>=10.10.0' }
-
   '@humanwhocodes/config-array@0.11.14':
-    resolution:
-      {
-        integrity: sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==,
-      }
-    engines: { node: '>=10.10.0' }
+    resolution: {integrity: sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==}
+    engines: {node: '>=10.10.0'}
+    deprecated: Use @eslint/config-array instead
 
   '@humanwhocodes/module-importer@1.0.1':
-    resolution:
-      {
-        integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==,
-      }
-    engines: { node: '>=12.22' }
-
-  '@humanwhocodes/object-schema@2.0.1':
-    resolution:
-      {
-        integrity: sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==,
-      }
+    resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==}
+    engines: {node: '>=12.22'}
 
   '@humanwhocodes/object-schema@2.0.3':
-    resolution:
-      {
-        integrity: sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==,
-      }
+    resolution: {integrity: sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==}
+    deprecated: Use @eslint/object-schema instead
 
   '@isaacs/cliui@8.0.2':
-    resolution:
-      {
-        integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==,
-      }
-    engines: { node: '>=12' }
+    resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==}
+    engines: {node: '>=12'}
 
   '@jridgewell/gen-mapping@0.3.3':
-    resolution:
-      {
-        integrity: sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==,
-      }
-    engines: { node: '>=6.0.0' }
+    resolution: {integrity: sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==}
+    engines: {node: '>=6.0.0'}
 
   '@jridgewell/resolve-uri@3.1.1':
-    resolution:
-      {
-        integrity: sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==,
-      }
-    engines: { node: '>=6.0.0' }
+    resolution: {integrity: sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==}
+    engines: {node: '>=6.0.0'}
 
   '@jridgewell/set-array@1.1.2':
-    resolution:
-      {
-        integrity: sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==,
-      }
-    engines: { node: '>=6.0.0' }
+    resolution: {integrity: sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==}
+    engines: {node: '>=6.0.0'}
 
   '@jridgewell/sourcemap-codec@1.4.15':
-    resolution:
-      {
-        integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==,
-      }
+    resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==}
 
   '@jridgewell/trace-mapping@0.3.20':
-    resolution:
-      {
-        integrity: sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==,
-      }
+    resolution: {integrity: sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==}
 
   '@microsoft/api-extractor-model@7.28.13':
-    resolution:
-      {
-        integrity: sha512-39v/JyldX4MS9uzHcdfmjjfS6cYGAoXV+io8B5a338pkHiSt+gy2eXQ0Q7cGFJ7quSa1VqqlMdlPrB6sLR/cAw==,
-      }
+    resolution: {integrity: sha512-39v/JyldX4MS9uzHcdfmjjfS6cYGAoXV+io8B5a338pkHiSt+gy2eXQ0Q7cGFJ7quSa1VqqlMdlPrB6sLR/cAw==}
 
   '@microsoft/api-extractor@7.43.0':
-    resolution:
-      {
-        integrity: sha512-GFhTcJpB+MI6FhvXEI9b2K0snulNLWHqC/BbcJtyNYcKUiw7l3Lgis5ApsYncJ0leALX7/of4XfmXk+maT111w==,
-      }
+    resolution: {integrity: sha512-GFhTcJpB+MI6FhvXEI9b2K0snulNLWHqC/BbcJtyNYcKUiw7l3Lgis5ApsYncJ0leALX7/of4XfmXk+maT111w==}
     hasBin: true
 
   '@microsoft/tsdoc-config@0.16.2':
-    resolution:
-      {
-        integrity: sha512-OGiIzzoBLgWWR0UdRJX98oYO+XKGf7tiK4Zk6tQ/E4IJqGCe7dvkTvgDZV5cFJUzLGDOjeAXrnZoA6QkVySuxw==,
-      }
+    resolution: {integrity: sha512-OGiIzzoBLgWWR0UdRJX98oYO+XKGf7tiK4Zk6tQ/E4IJqGCe7dvkTvgDZV5cFJUzLGDOjeAXrnZoA6QkVySuxw==}
 
   '@microsoft/tsdoc@0.14.2':
-    resolution:
-      {
-        integrity: sha512-9b8mPpKrfeGRuhFH5iO1iwCLeIIsV6+H1sRfxbkoGXIyQE2BTsPd9zqSqQJ+pv5sJ/hT5M1zvOFL02MnEezFug==,
-      }
+    resolution: {integrity: sha512-9b8mPpKrfeGRuhFH5iO1iwCLeIIsV6+H1sRfxbkoGXIyQE2BTsPd9zqSqQJ+pv5sJ/hT5M1zvOFL02MnEezFug==}
 
   '@nodelib/fs.scandir@2.1.5':
-    resolution:
-      {
-        integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==,
-      }
-    engines: { node: '>= 8' }
+    resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
+    engines: {node: '>= 8'}
 
   '@nodelib/fs.stat@2.0.5':
-    resolution:
-      {
-        integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==,
-      }
-    engines: { node: '>= 8' }
+    resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==}
+    engines: {node: '>= 8'}
 
   '@nodelib/fs.walk@1.2.8':
-    resolution:
-      {
-        integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==,
-      }
-    engines: { node: '>= 8' }
+    resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==}
+    engines: {node: '>= 8'}
 
   '@pcd/eddsa-pcd@0.3.0':
-    resolution:
-      {
-        integrity: sha512-tOCpQjOE0oXQXyLIIu+xKvjrhDnGa9nOndOSofqYp74kP8XXMEl5nIlNAebX8rs8p0cGNZTconxwpMuWq2yy7w==,
-      }
+    resolution: {integrity: sha512-tOCpQjOE0oXQXyLIIu+xKvjrhDnGa9nOndOSofqYp74kP8XXMEl5nIlNAebX8rs8p0cGNZTconxwpMuWq2yy7w==}
 
   '@pcd/eddsa-ticket-pcd@0.3.0':
-    resolution:
-      {
-        integrity: sha512-YjObtH/FMK5YGen5v39IhP2INo6dZ9/9xSx1YmjZ6pFB7OG+MKY73nUcerPFjcdUmWK+4PmFjJToFubqD1Y3Bg==,
-      }
+    resolution: {integrity: sha512-YjObtH/FMK5YGen5v39IhP2INo6dZ9/9xSx1YmjZ6pFB7OG+MKY73nUcerPFjcdUmWK+4PmFjJToFubqD1Y3Bg==}
 
   '@pcd/emitter@0.2.0':
-    resolution:
-      {
-        integrity: sha512-uRM0lAjdA2LOtv9ZdEVfykW6iZxQm6ckKd1snmEIb9LsFedVSvEKileL/lPgoHZlowRyPT8L+/fTdbcbSt4jJA==,
-      }
+    resolution: {integrity: sha512-uRM0lAjdA2LOtv9ZdEVfykW6iZxQm6ckKd1snmEIb9LsFedVSvEKileL/lPgoHZlowRyPT8L+/fTdbcbSt4jJA==}
 
   '@pcd/passport-crypto@0.8.0':
-    resolution:
-      {
-        integrity: sha512-YCVO8i8cbDh2iQatdLZV1pbm/Pfdb1Ryl/OTtHDahgaCEiQ5tT/JTvf2FvjTXaTVBaLsBlJnf20qI777hUHz/A==,
-      }
+    resolution: {integrity: sha512-YCVO8i8cbDh2iQatdLZV1pbm/Pfdb1Ryl/OTtHDahgaCEiQ5tT/JTvf2FvjTXaTVBaLsBlJnf20qI777hUHz/A==}
 
   '@pcd/passport-interface@0.8.0':
-    resolution:
-      {
-        integrity: sha512-6XYKLrYYtS0U89I2nmCUHo98z7CqXDybQV/SKaKZmcbRwCcXE22F4Z2jA/ltOaycuTB6Uuf0L+SzdufgX4DqPQ==,
-      }
+    resolution: {integrity: sha512-6XYKLrYYtS0U89I2nmCUHo98z7CqXDybQV/SKaKZmcbRwCcXE22F4Z2jA/ltOaycuTB6Uuf0L+SzdufgX4DqPQ==}
 
   '@pcd/passport-ui@0.8.0':
-    resolution:
-      {
-        integrity: sha512-/mDFbvuAgWyMVRa5cBhJgACTttcgwpUA4q6JiX1k0N2+cjM0temjke9EwArQmY+oKfWFX+ofWgTttk5Kp1Hv1w==,
-      }
+    resolution: {integrity: sha512-/mDFbvuAgWyMVRa5cBhJgACTttcgwpUA4q6JiX1k0N2+cjM0temjke9EwArQmY+oKfWFX+ofWgTttk5Kp1Hv1w==}
 
   '@pcd/passport-ui@0.9.0':
-    resolution:
-      {
-        integrity: sha512-w456K+LEqTDAHhExxAIue3+Q82xu5kw+BV2pva/LUbqGGMBRoMTUwbrzP1J1p6txnSUAFD+ZF24DDZ3lCOEheA==,
-      }
+    resolution: {integrity: sha512-w456K+LEqTDAHhExxAIue3+Q82xu5kw+BV2pva/LUbqGGMBRoMTUwbrzP1J1p6txnSUAFD+ZF24DDZ3lCOEheA==}
 
   '@pcd/pcd-collection@0.8.0':
-    resolution:
-      {
-        integrity: sha512-3E555DnW4YE6llPCFFJfxyfeTyKIHA3Q2JwfgnFTZfl1UxI+Zten26CYsxW/LtD4q9Jr+BfvGrh+V1rzRPhXqA==,
-      }
+    resolution: {integrity: sha512-3E555DnW4YE6llPCFFJfxyfeTyKIHA3Q2JwfgnFTZfl1UxI+Zten26CYsxW/LtD4q9Jr+BfvGrh+V1rzRPhXqA==}
 
   '@pcd/pcd-types@0.8.0':
-    resolution:
-      {
-        integrity: sha512-3+9bRpidRK7GNSlRZWBM1NJckn9q4Ki81StoL6w/52k9FUIGpdGNP5ymZhyZcUOi9JXh2zCiKXLLL5EPL6441w==,
-      }
+    resolution: {integrity: sha512-3+9bRpidRK7GNSlRZWBM1NJckn9q4Ki81StoL6w/52k9FUIGpdGNP5ymZhyZcUOi9JXh2zCiKXLLL5EPL6441w==}
 
   '@pcd/pcd-types@0.9.0':
-    resolution:
-      {
-        integrity: sha512-gtaBc8ampzyIlcbZ36mBFesBybs9S+HWCAMJkrKD8Nx4Keo9ThRY43DjmDOGXaT343ymWl9z3C4uBqwyzdA/pw==,
-      }
+    resolution: {integrity: sha512-gtaBc8ampzyIlcbZ36mBFesBybs9S+HWCAMJkrKD8Nx4Keo9ThRY43DjmDOGXaT343ymWl9z3C4uBqwyzdA/pw==}
 
   '@pcd/rsa-pcd@0.3.0':
-    resolution:
-      {
-        integrity: sha512-GvV3VieVeiak1tspC5VdR4t1aFLd9Yon9d3keeZvDENNAZvLGBtZy3fkaYnOgqhHyAbxzJ2HLDqL4oq2zpo5JQ==,
-      }
+    resolution: {integrity: sha512-GvV3VieVeiak1tspC5VdR4t1aFLd9Yon9d3keeZvDENNAZvLGBtZy3fkaYnOgqhHyAbxzJ2HLDqL4oq2zpo5JQ==}
 
   '@pcd/rsa-ticket-pcd@0.3.0':
-    resolution:
-      {
-        integrity: sha512-KB+owsh84hDT/UwdAye+dRut6mtlKgo7LPXDkNwdaMujPwllXTBebUNETfrBoE/kLYSSUt99HMlU1i6F6aAudA==,
-      }
+    resolution: {integrity: sha512-KB+owsh84hDT/UwdAye+dRut6mtlKgo7LPXDkNwdaMujPwllXTBebUNETfrBoE/kLYSSUt99HMlU1i6F6aAudA==}
 
   '@pcd/semaphore-group-pcd@0.8.0':
-    resolution:
-      {
-        integrity: sha512-8QwxkzTzwor8pf9NmsYaA0i9XPVLEUwIfyQ+rmuq4Mn4Ofwa7AigRs8xC7c/CjcRgB4JEv7i7oAZ+XX/g0+2TQ==,
-      }
+    resolution: {integrity: sha512-8QwxkzTzwor8pf9NmsYaA0i9XPVLEUwIfyQ+rmuq4Mn4Ofwa7AigRs8xC7c/CjcRgB4JEv7i7oAZ+XX/g0+2TQ==}
 
   '@pcd/semaphore-identity-pcd@0.8.0':
-    resolution:
-      {
-        integrity: sha512-eokbmugch+1pQjJwYJ8fvWQCU7y4YAd2WGC8vkDV8+ftKvplX1B5D3Hido3hnhb+JpCuEkUW/TyFIpKh1fIqWQ==,
-      }
+    resolution: {integrity: sha512-eokbmugch+1pQjJwYJ8fvWQCU7y4YAd2WGC8vkDV8+ftKvplX1B5D3Hido3hnhb+JpCuEkUW/TyFIpKh1fIqWQ==}
 
   '@pcd/semaphore-identity-pcd@0.9.0':
-    resolution:
-      {
-        integrity: sha512-GsIIVHQMi/CmpmYFcBVhCExmLOEkGp5QizLiyty6sJOsMwmdU8l9Y2naK8igdGSUod/kep4cF4oGNSrionxgvw==,
-      }
+    resolution: {integrity: sha512-GsIIVHQMi/CmpmYFcBVhCExmLOEkGp5QizLiyty6sJOsMwmdU8l9Y2naK8igdGSUod/kep4cF4oGNSrionxgvw==}
     peerDependencies:
       react: ^18.2.0
       react-dom: ^18.2.0
 
   '@pcd/semaphore-signature-pcd@0.8.0':
-    resolution:
-      {
-        integrity: sha512-tfBhJkAExCdTnscSMcLr8KOCIN44qNWhx0GEPKAoEKt0pInyKn9gKV7qSCJ+X1kTzdGqiKGAJ2lx5XZ22syr2A==,
-      }
+    resolution: {integrity: sha512-tfBhJkAExCdTnscSMcLr8KOCIN44qNWhx0GEPKAoEKt0pInyKn9gKV7qSCJ+X1kTzdGqiKGAJ2lx5XZ22syr2A==}
 
   '@pcd/semaphore-signature-pcd@0.9.0':
-    resolution:
-      {
-        integrity: sha512-4Iir91yP//6s+3YaC/la9sVImuq3bpv9g38kcbO86iQuKlenCk+q8xmEGg3mOLyhb+S2UY1V8CPI9TPaDmzeTg==,
-      }
+    resolution: {integrity: sha512-4Iir91yP//6s+3YaC/la9sVImuq3bpv9g38kcbO86iQuKlenCk+q8xmEGg3mOLyhb+S2UY1V8CPI9TPaDmzeTg==}
     peerDependencies:
       react: ^18.2.0
       react-dom: ^18.2.0
 
   '@pcd/util@0.2.0':
-    resolution:
-      {
-        integrity: sha512-tLM2DDmm2TAwdQNf38yMltPAptC0TswOOcAoegIqtDH/UtJphujePEXXmt+IFNKcR3D/TdmlmzW+qSHc20rrkg==,
-      }
+    resolution: {integrity: sha512-tLM2DDmm2TAwdQNf38yMltPAptC0TswOOcAoegIqtDH/UtJphujePEXXmt+IFNKcR3D/TdmlmzW+qSHc20rrkg==}
 
   '@pcd/util@0.3.0':
-    resolution:
-      {
-        integrity: sha512-xmZb5kJDnvfACGgj7SUe+fG6q40KSTpmzGkCHpHcYUll6f5Nu7c4Fkj+FslXVnISo5mnyxYhDi5Iw1b+iZgi3A==,
-      }
+    resolution: {integrity: sha512-xmZb5kJDnvfACGgj7SUe+fG6q40KSTpmzGkCHpHcYUll6f5Nu7c4Fkj+FslXVnISo5mnyxYhDi5Iw1b+iZgi3A==}
 
   '@pkgjs/parseargs@0.11.0':
-    resolution:
-      {
-        integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==,
-      }
-    engines: { node: '>=14' }
+    resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
+    engines: {node: '>=14'}
 
   '@radix-ui/primitive@1.0.1':
-    resolution:
-      {
-        integrity: sha512-yQ8oGX2GVsEYMWGxcovu1uGWPCxV5BFfeeYxqPmuAzUyLT9qmaMXSAhXpb0WrspIeqYzdJpkh2vHModJPgRIaw==,
-      }
+    resolution: {integrity: sha512-yQ8oGX2GVsEYMWGxcovu1uGWPCxV5BFfeeYxqPmuAzUyLT9qmaMXSAhXpb0WrspIeqYzdJpkh2vHModJPgRIaw==}
 
   '@radix-ui/primitive@1.1.0':
-    resolution:
-      {
-        integrity: sha512-4Z8dn6Upk0qk4P74xBhZ6Hd/w0mPEzOOLxy4xiPXOXqjF7jZS0VAKk7/x/H6FyY2zCkYJqePf1G5KmkmNJ4RBA==,
-      }
+    resolution: {integrity: sha512-4Z8dn6Upk0qk4P74xBhZ6Hd/w0mPEzOOLxy4xiPXOXqjF7jZS0VAKk7/x/H6FyY2zCkYJqePf1G5KmkmNJ4RBA==}
 
   '@radix-ui/react-arrow@1.0.3':
-    resolution:
-      {
-        integrity: sha512-wSP+pHsB/jQRaL6voubsQ/ZlrGBHHrOjmBnr19hxYgtS0WvAFwZhK2WP/YY5yF9uKECCEEDGxuLxq1NBK51wFA==,
-      }
+    resolution: {integrity: sha512-wSP+pHsB/jQRaL6voubsQ/ZlrGBHHrOjmBnr19hxYgtS0WvAFwZhK2WP/YY5yF9uKECCEEDGxuLxq1NBK51wFA==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -1585,10 +1013,7 @@ packages:
         optional: true
 
   '@radix-ui/react-collection@1.1.0':
-    resolution:
-      {
-        integrity: sha512-GZsZslMJEyo1VKm5L1ZJY8tGDxZNPAoUeQUIbKeJfoi7Q4kmig5AsgLMYYuyYbfjd8fBmFORAIwYAkXMnXZgZw==,
-      }
+    resolution: {integrity: sha512-GZsZslMJEyo1VKm5L1ZJY8tGDxZNPAoUeQUIbKeJfoi7Q4kmig5AsgLMYYuyYbfjd8fBmFORAIwYAkXMnXZgZw==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -1601,10 +1026,7 @@ packages:
         optional: true
 
   '@radix-ui/react-compose-refs@1.0.1':
-    resolution:
-      {
-        integrity: sha512-fDSBgd44FKHa1FRMU59qBMPFcl2PZE+2nmqunj+BWFyYYjnhIDWL2ItDs3rrbJDQOtzt5nIebLCQc4QRfz6LJw==,
-      }
+    resolution: {integrity: sha512-fDSBgd44FKHa1FRMU59qBMPFcl2PZE+2nmqunj+BWFyYYjnhIDWL2ItDs3rrbJDQOtzt5nIebLCQc4QRfz6LJw==}
     peerDependencies:
       '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0
@@ -1613,10 +1035,7 @@ packages:
         optional: true
 
   '@radix-ui/react-compose-refs@1.1.0':
-    resolution:
-      {
-        integrity: sha512-b4inOtiaOnYf9KWyO3jAeeCG6FeyfY6ldiEPanbUjWd+xIk5wZeHa8yVwmrJ2vderhu/BQvzCrJI0lHd+wIiqw==,
-      }
+    resolution: {integrity: sha512-b4inOtiaOnYf9KWyO3jAeeCG6FeyfY6ldiEPanbUjWd+xIk5wZeHa8yVwmrJ2vderhu/BQvzCrJI0lHd+wIiqw==}
     peerDependencies:
       '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
@@ -1625,10 +1044,7 @@ packages:
         optional: true
 
   '@radix-ui/react-context@1.0.1':
-    resolution:
-      {
-        integrity: sha512-ebbrdFoYTcuZ0v4wG5tedGnp9tzcV8awzsxYph7gXUyvnNLuTIcCk1q17JEbnVhXAKG9oX3KtchwiMIAYp9NLg==,
-      }
+    resolution: {integrity: sha512-ebbrdFoYTcuZ0v4wG5tedGnp9tzcV8awzsxYph7gXUyvnNLuTIcCk1q17JEbnVhXAKG9oX3KtchwiMIAYp9NLg==}
     peerDependencies:
       '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0
@@ -1637,10 +1053,7 @@ packages:
         optional: true
 
   '@radix-ui/react-context@1.1.0':
-    resolution:
-      {
-        integrity: sha512-OKrckBy+sMEgYM/sMmqmErVn0kZqrHPJze+Ql3DzYsDDp0hl0L62nx/2122/Bvps1qz645jlcu2tD9lrRSdf8A==,
-      }
+    resolution: {integrity: sha512-OKrckBy+sMEgYM/sMmqmErVn0kZqrHPJze+Ql3DzYsDDp0hl0L62nx/2122/Bvps1qz645jlcu2tD9lrRSdf8A==}
     peerDependencies:
       '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
@@ -1649,10 +1062,7 @@ packages:
         optional: true
 
   '@radix-ui/react-dialog@1.0.5':
-    resolution:
-      {
-        integrity: sha512-GjWJX/AUpB703eEBanuBnIWdIXg6NvJFCXcNlSZk4xdszCdhrJgBoUd1cGk67vFO+WdA2pfI/plOpqz/5GUP6Q==,
-      }
+    resolution: {integrity: sha512-GjWJX/AUpB703eEBanuBnIWdIXg6NvJFCXcNlSZk4xdszCdhrJgBoUd1cGk67vFO+WdA2pfI/plOpqz/5GUP6Q==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -1665,10 +1075,7 @@ packages:
         optional: true
 
   '@radix-ui/react-direction@1.1.0':
-    resolution:
-      {
-        integrity: sha512-BUuBvgThEiAXh2DWu93XsT+a3aWrGqolGlqqw5VU1kG7p/ZH2cuDlM1sRLNnY3QcBS69UIz2mcKhMxDsdewhjg==,
-      }
+    resolution: {integrity: sha512-BUuBvgThEiAXh2DWu93XsT+a3aWrGqolGlqqw5VU1kG7p/ZH2cuDlM1sRLNnY3QcBS69UIz2mcKhMxDsdewhjg==}
     peerDependencies:
       '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
@@ -1677,10 +1084,7 @@ packages:
         optional: true
 
   '@radix-ui/react-dismissable-layer@1.0.5':
-    resolution:
-      {
-        integrity: sha512-aJeDjQhywg9LBu2t/At58hCvr7pEm0o2Ke1x33B+MhjNmmZ17sy4KImo0KPLgsnc/zN7GPdce8Cnn0SWvwZO7g==,
-      }
+    resolution: {integrity: sha512-aJeDjQhywg9LBu2t/At58hCvr7pEm0o2Ke1x33B+MhjNmmZ17sy4KImo0KPLgsnc/zN7GPdce8Cnn0SWvwZO7g==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -1693,10 +1097,7 @@ packages:
         optional: true
 
   '@radix-ui/react-dismissable-layer@1.1.0':
-    resolution:
-      {
-        integrity: sha512-/UovfmmXGptwGcBQawLzvn2jOfM0t4z3/uKffoBlj724+n3FvBbZ7M0aaBOmkp6pqFYpO4yx8tSVJjx3Fl2jig==,
-      }
+    resolution: {integrity: sha512-/UovfmmXGptwGcBQawLzvn2jOfM0t4z3/uKffoBlj724+n3FvBbZ7M0aaBOmkp6pqFYpO4yx8tSVJjx3Fl2jig==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -1709,10 +1110,7 @@ packages:
         optional: true
 
   '@radix-ui/react-focus-guards@1.0.1':
-    resolution:
-      {
-        integrity: sha512-Rect2dWbQ8waGzhMavsIbmSVCgYxkXLxxR3ZvCX79JOglzdEy4JXMb98lq4hPxUbLr77nP0UOGf4rcMU+s1pUA==,
-      }
+    resolution: {integrity: sha512-Rect2dWbQ8waGzhMavsIbmSVCgYxkXLxxR3ZvCX79JOglzdEy4JXMb98lq4hPxUbLr77nP0UOGf4rcMU+s1pUA==}
     peerDependencies:
       '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0
@@ -1721,10 +1119,7 @@ packages:
         optional: true
 
   '@radix-ui/react-focus-scope@1.0.4':
-    resolution:
-      {
-        integrity: sha512-sL04Mgvf+FmyvZeYfNu1EPAaaxD+aw7cYeIB9L9Fvq8+urhltTRaEo5ysKOpHuKPclsZcSUMKlN05x4u+CINpA==,
-      }
+    resolution: {integrity: sha512-sL04Mgvf+FmyvZeYfNu1EPAaaxD+aw7cYeIB9L9Fvq8+urhltTRaEo5ysKOpHuKPclsZcSUMKlN05x4u+CINpA==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -1737,18 +1132,12 @@ packages:
         optional: true
 
   '@radix-ui/react-icons@1.3.0':
-    resolution:
-      {
-        integrity: sha512-jQxj/0LKgp+j9BiTXz3O3sgs26RNet2iLWmsPyRz2SIcR4q/4SbazXfnYwbAr+vLYKSfc7qxzyGQA1HLlYiuNw==,
-      }
+    resolution: {integrity: sha512-jQxj/0LKgp+j9BiTXz3O3sgs26RNet2iLWmsPyRz2SIcR4q/4SbazXfnYwbAr+vLYKSfc7qxzyGQA1HLlYiuNw==}
     peerDependencies:
       react: ^16.x || ^17.x || ^18.x
 
   '@radix-ui/react-id@1.0.1':
-    resolution:
-      {
-        integrity: sha512-tI7sT/kqYp8p96yGWY1OAnLHrqDgzHefRBKQ2YAkBS5ja7QLcZ9Z/uY7bEjPUatf8RomoXM8/1sMj1IJaE5UzQ==,
-      }
+    resolution: {integrity: sha512-tI7sT/kqYp8p96yGWY1OAnLHrqDgzHefRBKQ2YAkBS5ja7QLcZ9Z/uY7bEjPUatf8RomoXM8/1sMj1IJaE5UzQ==}
     peerDependencies:
       '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0
@@ -1757,10 +1146,7 @@ packages:
         optional: true
 
   '@radix-ui/react-id@1.1.0':
-    resolution:
-      {
-        integrity: sha512-EJUrI8yYh7WOjNOqpoJaf1jlFIH2LvtgAl+YcFqNCa+4hj64ZXmPkAKOFs/ukjz3byN6bdb/AVUqHkI8/uWWMA==,
-      }
+    resolution: {integrity: sha512-EJUrI8yYh7WOjNOqpoJaf1jlFIH2LvtgAl+YcFqNCa+4hj64ZXmPkAKOFs/ukjz3byN6bdb/AVUqHkI8/uWWMA==}
     peerDependencies:
       '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
@@ -1769,10 +1155,7 @@ packages:
         optional: true
 
   '@radix-ui/react-navigation-menu@1.2.0':
-    resolution:
-      {
-        integrity: sha512-OQ8tcwAOR0DhPlSY3e4VMXeHiol7la4PPdJWhhwJiJA+NLX0SaCaonOkRnI3gCDHoZ7Fo7bb/G6q25fRM2Y+3Q==,
-      }
+    resolution: {integrity: sha512-OQ8tcwAOR0DhPlSY3e4VMXeHiol7la4PPdJWhhwJiJA+NLX0SaCaonOkRnI3gCDHoZ7Fo7bb/G6q25fRM2Y+3Q==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -1785,10 +1168,7 @@ packages:
         optional: true
 
   '@radix-ui/react-popover@1.0.7':
-    resolution:
-      {
-        integrity: sha512-shtvVnlsxT6faMnK/a7n0wptwBD23xc1Z5mdrtKLwVEfsEMXodS0r5s0/g5P0hX//EKYZS2sxUjqfzlg52ZSnQ==,
-      }
+    resolution: {integrity: sha512-shtvVnlsxT6faMnK/a7n0wptwBD23xc1Z5mdrtKLwVEfsEMXodS0r5s0/g5P0hX//EKYZS2sxUjqfzlg52ZSnQ==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -1801,10 +1181,7 @@ packages:
         optional: true
 
   '@radix-ui/react-popper@1.1.3':
-    resolution:
-      {
-        integrity: sha512-cKpopj/5RHZWjrbF2846jBNacjQVwkP068DfmgrNJXpvVWrOvlAmE9xSiy5OqeE+Gi8D9fP+oDhUnPqNMY8/5w==,
-      }
+    resolution: {integrity: sha512-cKpopj/5RHZWjrbF2846jBNacjQVwkP068DfmgrNJXpvVWrOvlAmE9xSiy5OqeE+Gi8D9fP+oDhUnPqNMY8/5w==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -1817,10 +1194,7 @@ packages:
         optional: true
 
   '@radix-ui/react-portal@1.0.4':
-    resolution:
-      {
-        integrity: sha512-Qki+C/EuGUVCQTOTD5vzJzJuMUlewbzuKyUy+/iHM2uwGiru9gZeBJtHAPKAEkB5KWGi9mP/CHKcY0wt1aW45Q==,
-      }
+    resolution: {integrity: sha512-Qki+C/EuGUVCQTOTD5vzJzJuMUlewbzuKyUy+/iHM2uwGiru9gZeBJtHAPKAEkB5KWGi9mP/CHKcY0wt1aW45Q==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -1833,10 +1207,7 @@ packages:
         optional: true
 
   '@radix-ui/react-presence@1.0.1':
-    resolution:
-      {
-        integrity: sha512-UXLW4UAbIY5ZjcvzjfRFo5gxva8QirC9hF7wRE4U5gz+TP0DbRk+//qyuAQ1McDxBt1xNMBTaciFGvEmJvAZCg==,
-      }
+    resolution: {integrity: sha512-UXLW4UAbIY5ZjcvzjfRFo5gxva8QirC9hF7wRE4U5gz+TP0DbRk+//qyuAQ1McDxBt1xNMBTaciFGvEmJvAZCg==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -1849,10 +1220,7 @@ packages:
         optional: true
 
   '@radix-ui/react-presence@1.1.0':
-    resolution:
-      {
-        integrity: sha512-Gq6wuRN/asf9H/E/VzdKoUtT8GC9PQc9z40/vEr0VCJ4u5XvvhWIrSsCB6vD2/cH7ugTdSfYq9fLJCcM00acrQ==,
-      }
+    resolution: {integrity: sha512-Gq6wuRN/asf9H/E/VzdKoUtT8GC9PQc9z40/vEr0VCJ4u5XvvhWIrSsCB6vD2/cH7ugTdSfYq9fLJCcM00acrQ==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -1865,10 +1233,7 @@ packages:
         optional: true
 
   '@radix-ui/react-primitive@1.0.3':
-    resolution:
-      {
-        integrity: sha512-yi58uVyoAcK/Nq1inRY56ZSjKypBNKTa/1mcL8qdl6oJeEaDbOldlzrGn7P6Q3Id5d+SYNGc5AJgc4vGhjs5+g==,
-      }
+    resolution: {integrity: sha512-yi58uVyoAcK/Nq1inRY56ZSjKypBNKTa/1mcL8qdl6oJeEaDbOldlzrGn7P6Q3Id5d+SYNGc5AJgc4vGhjs5+g==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -1881,10 +1246,7 @@ packages:
         optional: true
 
   '@radix-ui/react-primitive@2.0.0':
-    resolution:
-      {
-        integrity: sha512-ZSpFm0/uHa8zTvKBDjLFWLo8dkr4MBsiDLz0g3gMUwqgLHz9rTaRRGYDgvZPtBJgYCBKXkS9fzmoySgr8CO6Cw==,
-      }
+    resolution: {integrity: sha512-ZSpFm0/uHa8zTvKBDjLFWLo8dkr4MBsiDLz0g3gMUwqgLHz9rTaRRGYDgvZPtBJgYCBKXkS9fzmoySgr8CO6Cw==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -1897,10 +1259,7 @@ packages:
         optional: true
 
   '@radix-ui/react-separator@1.1.0':
-    resolution:
-      {
-        integrity: sha512-3uBAs+egzvJBDZAzvb/n4NxxOYpnspmWxO2u5NbZ8Y6FM/NdrGSF9bop3Cf6F6C71z1rTSn8KV0Fo2ZVd79lGA==,
-      }
+    resolution: {integrity: sha512-3uBAs+egzvJBDZAzvb/n4NxxOYpnspmWxO2u5NbZ8Y6FM/NdrGSF9bop3Cf6F6C71z1rTSn8KV0Fo2ZVd79lGA==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -1913,10 +1272,7 @@ packages:
         optional: true
 
   '@radix-ui/react-slot@1.0.2':
-    resolution:
-      {
-        integrity: sha512-YeTpuq4deV+6DusvVUW4ivBgnkHwECUu0BiN43L5UCDFgdhsRUWAghhTF5MbvNTPzmiFOx90asDSUjWuCNapwg==,
-      }
+    resolution: {integrity: sha512-YeTpuq4deV+6DusvVUW4ivBgnkHwECUu0BiN43L5UCDFgdhsRUWAghhTF5MbvNTPzmiFOx90asDSUjWuCNapwg==}
     peerDependencies:
       '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0
@@ -1925,10 +1281,7 @@ packages:
         optional: true
 
   '@radix-ui/react-slot@1.1.0':
-    resolution:
-      {
-        integrity: sha512-FUCf5XMfmW4dtYl69pdS4DbxKy8nj4M7SafBgPllysxmdachynNflAdp/gCsnYWNDnge6tI9onzMp5ARYc1KNw==,
-      }
+    resolution: {integrity: sha512-FUCf5XMfmW4dtYl69pdS4DbxKy8nj4M7SafBgPllysxmdachynNflAdp/gCsnYWNDnge6tI9onzMp5ARYc1KNw==}
     peerDependencies:
       '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
@@ -1937,10 +1290,7 @@ packages:
         optional: true
 
   '@radix-ui/react-use-callback-ref@1.0.1':
-    resolution:
-      {
-        integrity: sha512-D94LjX4Sp0xJFVaoQOd3OO9k7tpBYNOXdVhkltUbGv2Qb9OXdrg/CpsjlZv7ia14Sylv398LswWBVVu5nqKzAQ==,
-      }
+    resolution: {integrity: sha512-D94LjX4Sp0xJFVaoQOd3OO9k7tpBYNOXdVhkltUbGv2Qb9OXdrg/CpsjlZv7ia14Sylv398LswWBVVu5nqKzAQ==}
     peerDependencies:
       '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0
@@ -1949,10 +1299,7 @@ packages:
         optional: true
 
   '@radix-ui/react-use-callback-ref@1.1.0':
-    resolution:
-      {
-        integrity: sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw==,
-      }
+    resolution: {integrity: sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw==}
     peerDependencies:
       '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
@@ -1961,10 +1308,7 @@ packages:
         optional: true
 
   '@radix-ui/react-use-controllable-state@1.0.1':
-    resolution:
-      {
-        integrity: sha512-Svl5GY5FQeN758fWKrjM6Qb7asvXeiZltlT4U2gVfl8Gx5UAv2sMR0LWo8yhsIZh2oQ0eFdZ59aoOOMV7b47VA==,
-      }
+    resolution: {integrity: sha512-Svl5GY5FQeN758fWKrjM6Qb7asvXeiZltlT4U2gVfl8Gx5UAv2sMR0LWo8yhsIZh2oQ0eFdZ59aoOOMV7b47VA==}
     peerDependencies:
       '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0
@@ -1973,10 +1317,7 @@ packages:
         optional: true
 
   '@radix-ui/react-use-controllable-state@1.1.0':
-    resolution:
-      {
-        integrity: sha512-MtfMVJiSr2NjzS0Aa90NPTnvTSg6C/JLCV7ma0W6+OMV78vd8OyRpID+Ng9LxzsPbLeuBnWBA1Nq30AtBIDChw==,
-      }
+    resolution: {integrity: sha512-MtfMVJiSr2NjzS0Aa90NPTnvTSg6C/JLCV7ma0W6+OMV78vd8OyRpID+Ng9LxzsPbLeuBnWBA1Nq30AtBIDChw==}
     peerDependencies:
       '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
@@ -1985,10 +1326,7 @@ packages:
         optional: true
 
   '@radix-ui/react-use-escape-keydown@1.0.3':
-    resolution:
-      {
-        integrity: sha512-vyL82j40hcFicA+M4Ex7hVkB9vHgSse1ZWomAqV2Je3RleKGO5iM8KMOEtfoSB0PnIelMd2lATjTGMYqN5ylTg==,
-      }
+    resolution: {integrity: sha512-vyL82j40hcFicA+M4Ex7hVkB9vHgSse1ZWomAqV2Je3RleKGO5iM8KMOEtfoSB0PnIelMd2lATjTGMYqN5ylTg==}
     peerDependencies:
       '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0
@@ -1997,10 +1335,7 @@ packages:
         optional: true
 
   '@radix-ui/react-use-escape-keydown@1.1.0':
-    resolution:
-      {
-        integrity: sha512-L7vwWlR1kTTQ3oh7g1O0CBF3YCyyTj8NmhLR+phShpyA50HCfBFKVJTpshm9PzLiKmehsrQzTYTpX9HvmC9rhw==,
-      }
+    resolution: {integrity: sha512-L7vwWlR1kTTQ3oh7g1O0CBF3YCyyTj8NmhLR+phShpyA50HCfBFKVJTpshm9PzLiKmehsrQzTYTpX9HvmC9rhw==}
     peerDependencies:
       '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
@@ -2009,10 +1344,7 @@ packages:
         optional: true
 
   '@radix-ui/react-use-layout-effect@1.0.1':
-    resolution:
-      {
-        integrity: sha512-v/5RegiJWYdoCvMnITBkNNx6bCj20fiaJnWtRkU18yITptraXjffz5Qbn05uOiQnOvi+dbkznkoaMltz1GnszQ==,
-      }
+    resolution: {integrity: sha512-v/5RegiJWYdoCvMnITBkNNx6bCj20fiaJnWtRkU18yITptraXjffz5Qbn05uOiQnOvi+dbkznkoaMltz1GnszQ==}
     peerDependencies:
       '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0
@@ -2021,10 +1353,7 @@ packages:
         optional: true
 
   '@radix-ui/react-use-layout-effect@1.1.0':
-    resolution:
-      {
-        integrity: sha512-+FPE0rOdziWSrH9athwI1R0HDVbWlEhd+FR+aSDk4uWGmSJ9Z54sdZVDQPZAinJhJXwfT+qnj969mCsT2gfm5w==,
-      }
+    resolution: {integrity: sha512-+FPE0rOdziWSrH9athwI1R0HDVbWlEhd+FR+aSDk4uWGmSJ9Z54sdZVDQPZAinJhJXwfT+qnj969mCsT2gfm5w==}
     peerDependencies:
       '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
@@ -2033,10 +1362,7 @@ packages:
         optional: true
 
   '@radix-ui/react-use-previous@1.1.0':
-    resolution:
-      {
-        integrity: sha512-Z/e78qg2YFnnXcW88A4JmTtm4ADckLno6F7OXotmkQfeuCVaKuYzqAATPhVzl3delXE7CxIV8shofPn3jPc5Og==,
-      }
+    resolution: {integrity: sha512-Z/e78qg2YFnnXcW88A4JmTtm4ADckLno6F7OXotmkQfeuCVaKuYzqAATPhVzl3delXE7CxIV8shofPn3jPc5Og==}
     peerDependencies:
       '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
@@ -2045,10 +1371,7 @@ packages:
         optional: true
 
   '@radix-ui/react-use-rect@1.0.1':
-    resolution:
-      {
-        integrity: sha512-Cq5DLuSiuYVKNU8orzJMbl15TXilTnJKUCltMVQg53BQOF1/C5toAaGrowkgksdBQ9H+SRL23g0HDmg9tvmxXw==,
-      }
+    resolution: {integrity: sha512-Cq5DLuSiuYVKNU8orzJMbl15TXilTnJKUCltMVQg53BQOF1/C5toAaGrowkgksdBQ9H+SRL23g0HDmg9tvmxXw==}
     peerDependencies:
       '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0
@@ -2057,10 +1380,7 @@ packages:
         optional: true
 
   '@radix-ui/react-use-size@1.0.1':
-    resolution:
-      {
-        integrity: sha512-ibay+VqrgcaI6veAojjofPATwledXiSmX+C0KrBk/xgpX9rBzPV3OsfwlhQdUOFbh+LKQorLYT+xTXW9V8yd0g==,
-      }
+    resolution: {integrity: sha512-ibay+VqrgcaI6veAojjofPATwledXiSmX+C0KrBk/xgpX9rBzPV3OsfwlhQdUOFbh+LKQorLYT+xTXW9V8yd0g==}
     peerDependencies:
       '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0
@@ -2069,10 +1389,7 @@ packages:
         optional: true
 
   '@radix-ui/react-visually-hidden@1.1.0':
-    resolution:
-      {
-        integrity: sha512-N8MDZqtgCgG5S3aV60INAB475osJousYpZ4cTJ2cFbMpdHS5Y6loLTH8LPtkj2QN0x93J30HT/M3qJXM0+lyeQ==,
-      }
+    resolution: {integrity: sha512-N8MDZqtgCgG5S3aV60INAB475osJousYpZ4cTJ2cFbMpdHS5Y6loLTH8LPtkj2QN0x93J30HT/M3qJXM0+lyeQ==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -2085,24 +1402,15 @@ packages:
         optional: true
 
   '@radix-ui/rect@1.0.1':
-    resolution:
-      {
-        integrity: sha512-fyrgCaedtvMg9NK3en0pnOYJdtfwxUcNolezkNPUsoX57X8oQk+NkqcvzHXD2uKNij6GXmWU9NDru2IWjrO4BQ==,
-      }
+    resolution: {integrity: sha512-fyrgCaedtvMg9NK3en0pnOYJdtfwxUcNolezkNPUsoX57X8oQk+NkqcvzHXD2uKNij6GXmWU9NDru2IWjrO4BQ==}
 
   '@remix-run/router@1.13.1':
-    resolution:
-      {
-        integrity: sha512-so+DHzZKsoOcoXrILB4rqDkMDy7NLMErRdOxvzvOKb507YINKUP4Di+shbTZDhSE/pBZ+vr7XGIpcOO0VLSA+Q==,
-      }
-    engines: { node: '>=14.0.0' }
+    resolution: {integrity: sha512-so+DHzZKsoOcoXrILB4rqDkMDy7NLMErRdOxvzvOKb507YINKUP4Di+shbTZDhSE/pBZ+vr7XGIpcOO0VLSA+Q==}
+    engines: {node: '>=14.0.0'}
 
   '@rollup/plugin-inject@5.0.5':
-    resolution:
-      {
-        integrity: sha512-2+DEJbNBoPROPkgTDNe8/1YXWcqxbN5DTjASVIOx8HS+pITXushyNiBV56RB08zuptzz8gT3YfkqriTBVycepg==,
-      }
-    engines: { node: '>=14.0.0' }
+    resolution: {integrity: sha512-2+DEJbNBoPROPkgTDNe8/1YXWcqxbN5DTjASVIOx8HS+pITXushyNiBV56RB08zuptzz8gT3YfkqriTBVycepg==}
+    engines: {node: '>=14.0.0'}
     peerDependencies:
       rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
     peerDependenciesMeta:
@@ -2110,11 +1418,8 @@ packages:
         optional: true
 
   '@rollup/pluginutils@5.1.0':
-    resolution:
-      {
-        integrity: sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==,
-      }
-    engines: { node: '>=14.0.0' }
+    resolution: {integrity: sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==}
+    engines: {node: '>=14.0.0'}
     peerDependencies:
       rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
     peerDependenciesMeta:
@@ -2122,226 +1427,82 @@ packages:
         optional: true
 
   '@rollup/rollup-android-arm-eabi@4.14.0':
-    resolution:
-      {
-        integrity: sha512-jwXtxYbRt1V+CdQSy6Z+uZti7JF5irRKF8hlKfEnF/xJpcNGuuiZMBvuoYM+x9sr9iWGnzrlM0+9hvQ1kgkf1w==,
-      }
-    cpu: [arm]
-    os: [android]
-
-  '@rollup/rollup-android-arm-eabi@4.6.1':
-    resolution:
-      {
-        integrity: sha512-0WQ0ouLejaUCRsL93GD4uft3rOmB8qoQMU05Kb8CmMtMBe7XUDLAltxVZI1q6byNqEtU7N1ZX1Vw5lIpgulLQA==,
-      }
+    resolution: {integrity: sha512-jwXtxYbRt1V+CdQSy6Z+uZti7JF5irRKF8hlKfEnF/xJpcNGuuiZMBvuoYM+x9sr9iWGnzrlM0+9hvQ1kgkf1w==}
     cpu: [arm]
     os: [android]
 
   '@rollup/rollup-android-arm64@4.14.0':
-    resolution:
-      {
-        integrity: sha512-fI9nduZhCccjzlsA/OuAwtFGWocxA4gqXGTLvOyiF8d+8o0fZUeSztixkYjcGq1fGZY3Tkq4yRvHPFxU+jdZ9Q==,
-      }
-    cpu: [arm64]
-    os: [android]
-
-  '@rollup/rollup-android-arm64@4.6.1':
-    resolution:
-      {
-        integrity: sha512-1TKm25Rn20vr5aTGGZqo6E4mzPicCUD79k17EgTLAsXc1zysyi4xXKACfUbwyANEPAEIxkzwue6JZ+stYzWUTA==,
-      }
+    resolution: {integrity: sha512-fI9nduZhCccjzlsA/OuAwtFGWocxA4gqXGTLvOyiF8d+8o0fZUeSztixkYjcGq1fGZY3Tkq4yRvHPFxU+jdZ9Q==}
     cpu: [arm64]
     os: [android]
 
   '@rollup/rollup-darwin-arm64@4.14.0':
-    resolution:
-      {
-        integrity: sha512-BcnSPRM76/cD2gQC+rQNGBN6GStBs2pl/FpweW8JYuz5J/IEa0Fr4AtrPv766DB/6b2MZ/AfSIOSGw3nEIP8SA==,
-      }
-    cpu: [arm64]
-    os: [darwin]
-
-  '@rollup/rollup-darwin-arm64@4.6.1':
-    resolution:
-      {
-        integrity: sha512-cEXJQY/ZqMACb+nxzDeX9IPLAg7S94xouJJCNVE5BJM8JUEP4HeTF+ti3cmxWeSJo+5D+o8Tc0UAWUkfENdeyw==,
-      }
+    resolution: {integrity: sha512-BcnSPRM76/cD2gQC+rQNGBN6GStBs2pl/FpweW8JYuz5J/IEa0Fr4AtrPv766DB/6b2MZ/AfSIOSGw3nEIP8SA==}
     cpu: [arm64]
     os: [darwin]
 
   '@rollup/rollup-darwin-x64@4.14.0':
-    resolution:
-      {
-        integrity: sha512-LDyFB9GRolGN7XI6955aFeI3wCdCUszFWumWU0deHA8VpR3nWRrjG6GtGjBrQxQKFevnUTHKCfPR4IvrW3kCgQ==,
-      }
-    cpu: [x64]
-    os: [darwin]
-
-  '@rollup/rollup-darwin-x64@4.6.1':
-    resolution:
-      {
-        integrity: sha512-LoSU9Xu56isrkV2jLldcKspJ7sSXmZWkAxg7sW/RfF7GS4F5/v4EiqKSMCFbZtDu2Nc1gxxFdQdKwkKS4rwxNg==,
-      }
+    resolution: {integrity: sha512-LDyFB9GRolGN7XI6955aFeI3wCdCUszFWumWU0deHA8VpR3nWRrjG6GtGjBrQxQKFevnUTHKCfPR4IvrW3kCgQ==}
     cpu: [x64]
     os: [darwin]
 
   '@rollup/rollup-linux-arm-gnueabihf@4.14.0':
-    resolution:
-      {
-        integrity: sha512-ygrGVhQP47mRh0AAD0zl6QqCbNsf0eTo+vgwkY6LunBcg0f2Jv365GXlDUECIyoXp1kKwL5WW6rsO429DBY/bA==,
-      }
-    cpu: [arm]
-    os: [linux]
-
-  '@rollup/rollup-linux-arm-gnueabihf@4.6.1':
-    resolution:
-      {
-        integrity: sha512-EfI3hzYAy5vFNDqpXsNxXcgRDcFHUWSx5nnRSCKwXuQlI5J9dD84g2Usw81n3FLBNsGCegKGwwTVsSKK9cooSQ==,
-      }
+    resolution: {integrity: sha512-ygrGVhQP47mRh0AAD0zl6QqCbNsf0eTo+vgwkY6LunBcg0f2Jv365GXlDUECIyoXp1kKwL5WW6rsO429DBY/bA==}
     cpu: [arm]
     os: [linux]
 
   '@rollup/rollup-linux-arm64-gnu@4.14.0':
-    resolution:
-      {
-        integrity: sha512-x+uJ6MAYRlHGe9wi4HQjxpaKHPM3d3JjqqCkeC5gpnnI6OWovLdXTpfa8trjxPLnWKyBsSi5kne+146GAxFt4A==,
-      }
-    cpu: [arm64]
-    os: [linux]
-
-  '@rollup/rollup-linux-arm64-gnu@4.6.1':
-    resolution:
-      {
-        integrity: sha512-9lhc4UZstsegbNLhH0Zu6TqvDfmhGzuCWtcTFXY10VjLLUe4Mr0Ye2L3rrtHaDd/J5+tFMEuo5LTCSCMXWfUKw==,
-      }
+    resolution: {integrity: sha512-x+uJ6MAYRlHGe9wi4HQjxpaKHPM3d3JjqqCkeC5gpnnI6OWovLdXTpfa8trjxPLnWKyBsSi5kne+146GAxFt4A==}
     cpu: [arm64]
     os: [linux]
 
   '@rollup/rollup-linux-arm64-musl@4.14.0':
-    resolution:
-      {
-        integrity: sha512-nrRw8ZTQKg6+Lttwqo6a2VxR9tOroa2m91XbdQ2sUUzHoedXlsyvY1fN4xWdqz8PKmf4orDwejxXHjh7YBGUCA==,
-      }
-    cpu: [arm64]
-    os: [linux]
-
-  '@rollup/rollup-linux-arm64-musl@4.6.1':
-    resolution:
-      {
-        integrity: sha512-FfoOK1yP5ksX3wwZ4Zk1NgyGHZyuRhf99j64I5oEmirV8EFT7+OhUZEnP+x17lcP/QHJNWGsoJwrz4PJ9fBEXw==,
-      }
+    resolution: {integrity: sha512-nrRw8ZTQKg6+Lttwqo6a2VxR9tOroa2m91XbdQ2sUUzHoedXlsyvY1fN4xWdqz8PKmf4orDwejxXHjh7YBGUCA==}
     cpu: [arm64]
     os: [linux]
 
   '@rollup/rollup-linux-powerpc64le-gnu@4.14.0':
-    resolution:
-      {
-        integrity: sha512-xV0d5jDb4aFu84XKr+lcUJ9y3qpIWhttO3Qev97z8DKLXR62LC3cXT/bMZXrjLF9X+P5oSmJTzAhqwUbY96PnA==,
-      }
+    resolution: {integrity: sha512-xV0d5jDb4aFu84XKr+lcUJ9y3qpIWhttO3Qev97z8DKLXR62LC3cXT/bMZXrjLF9X+P5oSmJTzAhqwUbY96PnA==}
     cpu: [ppc64le]
     os: [linux]
 
   '@rollup/rollup-linux-riscv64-gnu@4.14.0':
-    resolution:
-      {
-        integrity: sha512-SDDhBQwZX6LPRoPYjAZWyL27LbcBo7WdBFWJi5PI9RPCzU8ijzkQn7tt8NXiXRiFMJCVpkuMkBf4OxSxVMizAw==,
-      }
+    resolution: {integrity: sha512-SDDhBQwZX6LPRoPYjAZWyL27LbcBo7WdBFWJi5PI9RPCzU8ijzkQn7tt8NXiXRiFMJCVpkuMkBf4OxSxVMizAw==}
     cpu: [riscv64]
     os: [linux]
 
   '@rollup/rollup-linux-s390x-gnu@4.14.0':
-    resolution:
-      {
-        integrity: sha512-RxB/qez8zIDshNJDufYlTT0ZTVut5eCpAZ3bdXDU9yTxBzui3KhbGjROK2OYTTor7alM7XBhssgoO3CZ0XD3qA==,
-      }
+    resolution: {integrity: sha512-RxB/qez8zIDshNJDufYlTT0ZTVut5eCpAZ3bdXDU9yTxBzui3KhbGjROK2OYTTor7alM7XBhssgoO3CZ0XD3qA==}
     cpu: [s390x]
     os: [linux]
 
   '@rollup/rollup-linux-x64-gnu@4.14.0':
-    resolution:
-      {
-        integrity: sha512-C6y6z2eCNCfhZxT9u+jAM2Fup89ZjiG5pIzZIDycs1IwESviLxwkQcFRGLjnDrP+PT+v5i4YFvlcfAs+LnreXg==,
-      }
-    cpu: [x64]
-    os: [linux]
-
-  '@rollup/rollup-linux-x64-gnu@4.6.1':
-    resolution:
-      {
-        integrity: sha512-DNGZvZDO5YF7jN5fX8ZqmGLjZEXIJRdJEdTFMhiyXqyXubBa0WVLDWSNlQ5JR2PNgDbEV1VQowhVRUh+74D+RA==,
-      }
+    resolution: {integrity: sha512-C6y6z2eCNCfhZxT9u+jAM2Fup89ZjiG5pIzZIDycs1IwESviLxwkQcFRGLjnDrP+PT+v5i4YFvlcfAs+LnreXg==}
     cpu: [x64]
     os: [linux]
 
   '@rollup/rollup-linux-x64-musl@4.14.0':
-    resolution:
-      {
-        integrity: sha512-i0QwbHYfnOMYsBEyjxcwGu5SMIi9sImDVjDg087hpzXqhBSosxkE7gyIYFHgfFl4mr7RrXksIBZ4DoLoP4FhJg==,
-      }
-    cpu: [x64]
-    os: [linux]
-
-  '@rollup/rollup-linux-x64-musl@4.6.1':
-    resolution:
-      {
-        integrity: sha512-RkJVNVRM+piYy87HrKmhbexCHg3A6Z6MU0W9GHnJwBQNBeyhCJG9KDce4SAMdicQnpURggSvtbGo9xAWOfSvIQ==,
-      }
+    resolution: {integrity: sha512-i0QwbHYfnOMYsBEyjxcwGu5SMIi9sImDVjDg087hpzXqhBSosxkE7gyIYFHgfFl4mr7RrXksIBZ4DoLoP4FhJg==}
     cpu: [x64]
     os: [linux]
 
   '@rollup/rollup-win32-arm64-msvc@4.14.0':
-    resolution:
-      {
-        integrity: sha512-Fq52EYb0riNHLBTAcL0cun+rRwyZ10S9vKzhGKKgeD+XbwunszSY0rVMco5KbOsTlwovP2rTOkiII/fQ4ih/zQ==,
-      }
-    cpu: [arm64]
-    os: [win32]
-
-  '@rollup/rollup-win32-arm64-msvc@4.6.1':
-    resolution:
-      {
-        integrity: sha512-v2FVT6xfnnmTe3W9bJXl6r5KwJglMK/iRlkKiIFfO6ysKs0rDgz7Cwwf3tjldxQUrHL9INT/1r4VA0n9L/F1vQ==,
-      }
+    resolution: {integrity: sha512-Fq52EYb0riNHLBTAcL0cun+rRwyZ10S9vKzhGKKgeD+XbwunszSY0rVMco5KbOsTlwovP2rTOkiII/fQ4ih/zQ==}
     cpu: [arm64]
     os: [win32]
 
   '@rollup/rollup-win32-ia32-msvc@4.14.0':
-    resolution:
-      {
-        integrity: sha512-e/PBHxPdJ00O9p5Ui43+vixSgVf4NlLsmV6QneGERJ3lnjIua/kim6PRFe3iDueT1rQcgSkYP8ZBBXa/h4iPvw==,
-      }
-    cpu: [ia32]
-    os: [win32]
-
-  '@rollup/rollup-win32-ia32-msvc@4.6.1':
-    resolution:
-      {
-        integrity: sha512-YEeOjxRyEjqcWphH9dyLbzgkF8wZSKAKUkldRY6dgNR5oKs2LZazqGB41cWJ4Iqqcy9/zqYgmzBkRoVz3Q9MLw==,
-      }
+    resolution: {integrity: sha512-e/PBHxPdJ00O9p5Ui43+vixSgVf4NlLsmV6QneGERJ3lnjIua/kim6PRFe3iDueT1rQcgSkYP8ZBBXa/h4iPvw==}
     cpu: [ia32]
     os: [win32]
 
   '@rollup/rollup-win32-x64-msvc@4.14.0':
-    resolution:
-      {
-        integrity: sha512-aGg7iToJjdklmxlUlJh/PaPNa4PmqHfyRMLunbL3eaMO0gp656+q1zOKkpJ/CVe9CryJv6tAN1HDoR8cNGzkag==,
-      }
-    cpu: [x64]
-    os: [win32]
-
-  '@rollup/rollup-win32-x64-msvc@4.6.1':
-    resolution:
-      {
-        integrity: sha512-0zfTlFAIhgz8V2G8STq8toAjsYYA6eci1hnXuyOTUFnymrtJwnS6uGKiv3v5UrPZkBlamLvrLV2iiaeqCKzb0A==,
-      }
+    resolution: {integrity: sha512-aGg7iToJjdklmxlUlJh/PaPNa4PmqHfyRMLunbL3eaMO0gp656+q1zOKkpJ/CVe9CryJv6tAN1HDoR8cNGzkag==}
     cpu: [x64]
     os: [win32]
 
   '@rushstack/node-core-library@4.0.2':
-    resolution:
-      {
-        integrity: sha512-hyES82QVpkfQMeBMteQUnrhASL/KHPhd7iJ8euduwNJG4mu2GSOKybf0rOEjOm1Wz7CwJEUm9y0yD7jg2C1bfg==,
-      }
+    resolution: {integrity: sha512-hyES82QVpkfQMeBMteQUnrhASL/KHPhd7iJ8euduwNJG4mu2GSOKybf0rOEjOm1Wz7CwJEUm9y0yD7jg2C1bfg==}
     peerDependencies:
       '@types/node': '*'
     peerDependenciesMeta:
@@ -2349,16 +1510,10 @@ packages:
         optional: true
 
   '@rushstack/rig-package@0.5.2':
-    resolution:
-      {
-        integrity: sha512-mUDecIJeH3yYGZs2a48k+pbhM6JYwWlgjs2Ca5f2n1G2/kgdgP9D/07oglEGf6mRyXEnazhEENeYTSNDRCwdqA==,
-      }
+    resolution: {integrity: sha512-mUDecIJeH3yYGZs2a48k+pbhM6JYwWlgjs2Ca5f2n1G2/kgdgP9D/07oglEGf6mRyXEnazhEENeYTSNDRCwdqA==}
 
   '@rushstack/terminal@0.10.0':
-    resolution:
-      {
-        integrity: sha512-UbELbXnUdc7EKwfH2sb8ChqNgapUOdqcCIdQP4NGxBpTZV2sQyeekuK3zmfQSa/MN+/7b4kBogl2wq0vpkpYGw==,
-      }
+    resolution: {integrity: sha512-UbELbXnUdc7EKwfH2sb8ChqNgapUOdqcCIdQP4NGxBpTZV2sQyeekuK3zmfQSa/MN+/7b4kBogl2wq0vpkpYGw==}
     peerDependencies:
       '@types/node': '*'
     peerDependenciesMeta:
@@ -2366,252 +1521,113 @@ packages:
         optional: true
 
   '@rushstack/ts-command-line@4.19.1':
-    resolution:
-      {
-        integrity: sha512-J7H768dgcpG60d7skZ5uSSwyCZs/S2HrWP1Ds8d1qYAyaaeJmpmmLr9BVw97RjFzmQPOYnoXcKA4GkqDCkduQg==,
-      }
+    resolution: {integrity: sha512-J7H768dgcpG60d7skZ5uSSwyCZs/S2HrWP1Ds8d1qYAyaaeJmpmmLr9BVw97RjFzmQPOYnoXcKA4GkqDCkduQg==}
 
   '@semaphore-protocol/group@3.15.1':
-    resolution:
-      {
-        integrity: sha512-PS0tfyVquKruIMwRhEFg9qNmcbtlkFZba45JMTKqQkrOojWUJX5JnumkCIF69/BGZ8Jz4rNkgrJXbPveu/I4Wg==,
-      }
+    resolution: {integrity: sha512-PS0tfyVquKruIMwRhEFg9qNmcbtlkFZba45JMTKqQkrOojWUJX5JnumkCIF69/BGZ8Jz4rNkgrJXbPveu/I4Wg==}
 
   '@semaphore-protocol/identity@3.15.1':
-    resolution:
-      {
-        integrity: sha512-CZ8RvuweUp8Y2ldLStUcZOWk5WRZzno+1RcTXODRoCa9LTdbh5os7toT/iUFJBRZqqa1Y/rAfQya/hN1fHO5yA==,
-      }
+    resolution: {integrity: sha512-CZ8RvuweUp8Y2ldLStUcZOWk5WRZzno+1RcTXODRoCa9LTdbh5os7toT/iUFJBRZqqa1Y/rAfQya/hN1fHO5yA==}
 
   '@semaphore-protocol/proof@3.15.1':
-    resolution:
-      {
-        integrity: sha512-QruJMa4Yz5Wx+6B6DxFee2YPsZHoPSXp2crpqFPpP/uMOR5bvEBGRvhTW/oNzBTXH5PSmdlGkAKJlXvxxv3SrQ==,
-      }
+    resolution: {integrity: sha512-QruJMa4Yz5Wx+6B6DxFee2YPsZHoPSXp2crpqFPpP/uMOR5bvEBGRvhTW/oNzBTXH5PSmdlGkAKJlXvxxv3SrQ==}
     peerDependencies:
       '@semaphore-protocol/group': 3.15.1
       '@semaphore-protocol/identity': 3.15.1
 
   '@sindresorhus/merge-streams@2.3.0':
-    resolution:
-      {
-        integrity: sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==,
-      }
-    engines: { node: '>=18' }
-
-  '@tanstack/eslint-plugin-query@5.18.1':
-    resolution:
-      {
-        integrity: sha512-pLHqd2RYSbGxhFXdjVxo5Gmi1aJfcXDpZQsjLHEkGEXFb65WzX6LMCz7n2rW3wBElDerRLFZNVLC61Pg/TlYsA==,
-      }
-    peerDependencies:
-      eslint: ^8.0.0
+    resolution: {integrity: sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==}
+    engines: {node: '>=18'}
 
   '@tanstack/query-core@5.13.4':
-    resolution:
-      {
-        integrity: sha512-8+rJucXvC/xlr4OrxHhEIob/cTlbT4fgmz1VsvB0D12FRStKaXeLORNGcOhSAynRd2NL74SV/Qq0IIb4DedLcA==,
-      }
+    resolution: {integrity: sha512-8+rJucXvC/xlr4OrxHhEIob/cTlbT4fgmz1VsvB0D12FRStKaXeLORNGcOhSAynRd2NL74SV/Qq0IIb4DedLcA==}
 
   '@tanstack/query-devtools@5.13.5':
-    resolution:
-      {
-        integrity: sha512-effSYz9AWcZ6sNd+c8LCBYFIuDZApoCTXEpRlEYChBZpMz9QUUVMLToThwCyUY49+T5pANL3XxgZf3HV7hwJlg==,
-      }
+    resolution: {integrity: sha512-effSYz9AWcZ6sNd+c8LCBYFIuDZApoCTXEpRlEYChBZpMz9QUUVMLToThwCyUY49+T5pANL3XxgZf3HV7hwJlg==}
 
   '@tanstack/react-query-devtools@5.13.5':
-    resolution:
-      {
-        integrity: sha512-FB17B/yPtwnqg+DAdosAM+rFj3t8Pl121MPLiUGgl6jvG0A+U9XN3n39zVbhurbdSFO5jCMkPBlloW4NH5ojrA==,
-      }
+    resolution: {integrity: sha512-FB17B/yPtwnqg+DAdosAM+rFj3t8Pl121MPLiUGgl6jvG0A+U9XN3n39zVbhurbdSFO5jCMkPBlloW4NH5ojrA==}
     peerDependencies:
       '@tanstack/react-query': ^5.13.4
       react: ^18.0.0
 
   '@tanstack/react-query@5.13.4':
-    resolution:
-      {
-        integrity: sha512-3HjvkFFriEQwffUXtKHPiwkfFXUGbs46YATTzzyK1+Pw6Ekd3kwzS50e45qdamWuEXmXxyo5S1zp534LdFG0Rw==,
-      }
+    resolution: {integrity: sha512-3HjvkFFriEQwffUXtKHPiwkfFXUGbs46YATTzzyK1+Pw6Ekd3kwzS50e45qdamWuEXmXxyo5S1zp534LdFG0Rw==}
     peerDependencies:
       react: ^18.0.0
 
   '@types/argparse@1.0.38':
-    resolution:
-      {
-        integrity: sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==,
-      }
+    resolution: {integrity: sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==}
 
   '@types/babel__core@7.20.5':
-    resolution:
-      {
-        integrity: sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==,
-      }
+    resolution: {integrity: sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==}
 
   '@types/babel__generator@7.6.7':
-    resolution:
-      {
-        integrity: sha512-6Sfsq+EaaLrw4RmdFWE9Onp63TOUue71AWb4Gpa6JxzgTYtimbM086WnYTy2U67AofR++QKCo08ZP6pwx8YFHQ==,
-      }
+    resolution: {integrity: sha512-6Sfsq+EaaLrw4RmdFWE9Onp63TOUue71AWb4Gpa6JxzgTYtimbM086WnYTy2U67AofR++QKCo08ZP6pwx8YFHQ==}
 
   '@types/babel__template@7.4.4':
-    resolution:
-      {
-        integrity: sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==,
-      }
+    resolution: {integrity: sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==}
 
   '@types/babel__traverse@7.20.4':
-    resolution:
-      {
-        integrity: sha512-mSM/iKUk5fDDrEV/e83qY+Cr3I1+Q3qqTuEn++HAWYjEa1+NxZr6CNrcJGf2ZTnq4HoFGC3zaTPZTobCzCFukA==,
-      }
+    resolution: {integrity: sha512-mSM/iKUk5fDDrEV/e83qY+Cr3I1+Q3qqTuEn++HAWYjEa1+NxZr6CNrcJGf2ZTnq4HoFGC3zaTPZTobCzCFukA==}
 
   '@types/debug@4.1.12':
-    resolution:
-      {
-        integrity: sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==,
-      }
+    resolution: {integrity: sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==}
 
   '@types/estree-jsx@1.0.5':
-    resolution:
-      {
-        integrity: sha512-52CcUVNFyfb1A2ALocQw/Dd1BQFNmSdkuC3BkZ6iqhdMfQz7JWOFRuJFloOzjk+6WijU56m9oKXFAXc7o3Towg==,
-      }
+    resolution: {integrity: sha512-52CcUVNFyfb1A2ALocQw/Dd1BQFNmSdkuC3BkZ6iqhdMfQz7JWOFRuJFloOzjk+6WijU56m9oKXFAXc7o3Towg==}
 
   '@types/estree@1.0.5':
-    resolution:
-      {
-        integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==,
-      }
+    resolution: {integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==}
 
   '@types/hast@3.0.4':
-    resolution:
-      {
-        integrity: sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==,
-      }
+    resolution: {integrity: sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==}
 
   '@types/json-schema@7.0.15':
-    resolution:
-      {
-        integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==,
-      }
+    resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}
 
   '@types/lodash@4.14.202':
-    resolution:
-      {
-        integrity: sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ==,
-      }
+    resolution: {integrity: sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ==}
 
   '@types/mdast@4.0.3':
-    resolution:
-      {
-        integrity: sha512-LsjtqsyF+d2/yFOYaN22dHZI1Cpwkrj+g06G8+qtUKlhovPW89YhqSnfKtMbkgmEtYpH2gydRNULd6y8mciAFg==,
-      }
+    resolution: {integrity: sha512-LsjtqsyF+d2/yFOYaN22dHZI1Cpwkrj+g06G8+qtUKlhovPW89YhqSnfKtMbkgmEtYpH2gydRNULd6y8mciAFg==}
 
   '@types/ms@0.7.34':
-    resolution:
-      {
-        integrity: sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==,
-      }
+    resolution: {integrity: sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==}
 
   '@types/node@20.12.4':
-    resolution:
-      {
-        integrity: sha512-E+Fa9z3wSQpzgYQdYmme5X3OTuejnnTx88A6p6vkkJosR3KBz+HpE3kqNm98VE6cfLFcISx7zW7MsJkH6KwbTw==,
-      }
+    resolution: {integrity: sha512-E+Fa9z3wSQpzgYQdYmme5X3OTuejnnTx88A6p6vkkJosR3KBz+HpE3kqNm98VE6cfLFcISx7zW7MsJkH6KwbTw==}
 
   '@types/parse-json@4.0.2':
-    resolution:
-      {
-        integrity: sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==,
-      }
+    resolution: {integrity: sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==}
 
   '@types/prop-types@15.7.11':
-    resolution:
-      {
-        integrity: sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng==,
-      }
-
-  '@types/react-dom@18.2.17':
-    resolution:
-      {
-        integrity: sha512-rvrT/M7Df5eykWFxn6MYt5Pem/Dbyc1N8Y0S9Mrkw2WFCRiqUgw9P7ul2NpwsXCSM1DVdENzdG9J5SreqfAIWg==,
-      }
+    resolution: {integrity: sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng==}
 
   '@types/react-dom@18.2.24':
-    resolution:
-      {
-        integrity: sha512-cN6upcKd8zkGy4HU9F1+/s98Hrp6D4MOcippK4PoE8OZRngohHZpbJn1GsaDLz87MqvHNoT13nHvNqM9ocRHZg==,
-      }
-
-  '@types/react@18.2.42':
-    resolution:
-      {
-        integrity: sha512-c1zEr96MjakLYus/wPnuWDo1/zErfdU9rNsIGmE+NV71nx88FG9Ttgo5dqorXTu/LImX2f63WBP986gJkMPNbA==,
-      }
+    resolution: {integrity: sha512-cN6upcKd8zkGy4HU9F1+/s98Hrp6D4MOcippK4PoE8OZRngohHZpbJn1GsaDLz87MqvHNoT13nHvNqM9ocRHZg==}
 
   '@types/react@18.2.74':
-    resolution:
-      {
-        integrity: sha512-9AEqNZZyBx8OdZpxzQlaFEVCSFUM2YXJH46yPOiOpm078k6ZLOCcuAzGum/zK8YBwY+dbahVNbHrbgrAwIRlqw==,
-      }
+    resolution: {integrity: sha512-9AEqNZZyBx8OdZpxzQlaFEVCSFUM2YXJH46yPOiOpm078k6ZLOCcuAzGum/zK8YBwY+dbahVNbHrbgrAwIRlqw==}
 
   '@types/react@18.3.3':
-    resolution:
-      {
-        integrity: sha512-hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw==,
-      }
-
-  '@types/scheduler@0.16.8':
-    resolution:
-      {
-        integrity: sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==,
-      }
+    resolution: {integrity: sha512-hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw==}
 
   '@types/semver@7.5.6':
-    resolution:
-      {
-        integrity: sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==,
-      }
+    resolution: {integrity: sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==}
 
   '@types/stylis@4.2.4':
-    resolution:
-      {
-        integrity: sha512-36ZrGJ8fgtBr6nwNnuJ9jXIj+bn/pF6UoqmrQT7+Y99+tFFeHHsoR54+194dHdyhPjgbeoNz3Qru0oRt0l6ASQ==,
-      }
+    resolution: {integrity: sha512-36ZrGJ8fgtBr6nwNnuJ9jXIj+bn/pF6UoqmrQT7+Y99+tFFeHHsoR54+194dHdyhPjgbeoNz3Qru0oRt0l6ASQ==}
 
   '@types/unist@2.0.10':
-    resolution:
-      {
-        integrity: sha512-IfYcSBWE3hLpBg8+X2SEa8LVkJdJEkT2Ese2aaLs3ptGdVtABxndrMaxuFlQ1qdFf9Q5rDvDpxI3WwgvKFAsQA==,
-      }
+    resolution: {integrity: sha512-IfYcSBWE3hLpBg8+X2SEa8LVkJdJEkT2Ese2aaLs3ptGdVtABxndrMaxuFlQ1qdFf9Q5rDvDpxI3WwgvKFAsQA==}
 
   '@types/unist@3.0.2':
-    resolution:
-      {
-        integrity: sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==,
-      }
-
-  '@typescript-eslint/eslint-plugin@6.21.0':
-    resolution:
-      {
-        integrity: sha512-oy9+hTPCUFpngkEZUSzbf9MxI65wbKFoQYsgPdILTfbUldp5ovUuphZVe4i30emU9M/kP+T64Di0mxl7dSw3MA==,
-      }
-    engines: { node: ^16.0.0 || >=18.0.0 }
-    peerDependencies:
-      '@typescript-eslint/parser': ^6.0.0 || ^6.0.0-alpha
-      eslint: ^7.0.0 || ^8.0.0
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+    resolution: {integrity: sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==}
 
   '@typescript-eslint/eslint-plugin@7.5.0':
-    resolution:
-      {
-        integrity: sha512-HpqNTH8Du34nLxbKgVMGljZMG0rJd2O9ecvr2QLYp+7512ty1j42KnsFwspPXg1Vh8an9YImf6CokUBltisZFQ==,
-      }
-    engines: { node: ^18.18.0 || >=20.0.0 }
+    resolution: {integrity: sha512-HpqNTH8Du34nLxbKgVMGljZMG0rJd2O9ecvr2QLYp+7512ty1j42KnsFwspPXg1Vh8an9YImf6CokUBltisZFQ==}
+    engines: {node: ^18.18.0 || >=20.0.0}
     peerDependencies:
       '@typescript-eslint/parser': ^7.0.0
       eslint: ^8.56.0
@@ -2620,25 +1636,9 @@ packages:
       typescript:
         optional: true
 
-  '@typescript-eslint/parser@6.21.0':
-    resolution:
-      {
-        integrity: sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ==,
-      }
-    engines: { node: ^16.0.0 || >=18.0.0 }
-    peerDependencies:
-      eslint: ^7.0.0 || ^8.0.0
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-
   '@typescript-eslint/parser@7.5.0':
-    resolution:
-      {
-        integrity: sha512-cj+XGhNujfD2/wzR1tabNsidnYRaFfEkcULdcIyVBYcXjBvBKOes+mpMBP7hMpOyk+gBcfXsrg4NBGAStQyxjQ==,
-      }
-    engines: { node: ^18.18.0 || >=20.0.0 }
+    resolution: {integrity: sha512-cj+XGhNujfD2/wzR1tabNsidnYRaFfEkcULdcIyVBYcXjBvBKOes+mpMBP7hMpOyk+gBcfXsrg4NBGAStQyxjQ==}
+    engines: {node: ^18.18.0 || >=20.0.0}
     peerDependencies:
       eslint: ^8.56.0
       typescript: '*'
@@ -2646,46 +1646,13 @@ packages:
       typescript:
         optional: true
 
-  '@typescript-eslint/scope-manager@5.62.0':
-    resolution:
-      {
-        integrity: sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==,
-      }
-    engines: { node: ^12.22.0 || ^14.17.0 || >=16.0.0 }
-
-  '@typescript-eslint/scope-manager@6.21.0':
-    resolution:
-      {
-        integrity: sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg==,
-      }
-    engines: { node: ^16.0.0 || >=18.0.0 }
-
   '@typescript-eslint/scope-manager@7.5.0':
-    resolution:
-      {
-        integrity: sha512-Z1r7uJY0MDeUlql9XJ6kRVgk/sP11sr3HKXn268HZyqL7i4cEfrdFuSSY/0tUqT37l5zT0tJOsuDP16kio85iA==,
-      }
-    engines: { node: ^18.18.0 || >=20.0.0 }
-
-  '@typescript-eslint/type-utils@6.21.0':
-    resolution:
-      {
-        integrity: sha512-rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag==,
-      }
-    engines: { node: ^16.0.0 || >=18.0.0 }
-    peerDependencies:
-      eslint: ^7.0.0 || ^8.0.0
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+    resolution: {integrity: sha512-Z1r7uJY0MDeUlql9XJ6kRVgk/sP11sr3HKXn268HZyqL7i4cEfrdFuSSY/0tUqT37l5zT0tJOsuDP16kio85iA==}
+    engines: {node: ^18.18.0 || >=20.0.0}
 
   '@typescript-eslint/type-utils@7.5.0':
-    resolution:
-      {
-        integrity: sha512-A021Rj33+G8mx2Dqh0nMO9GyjjIBK3MqgVgZ2qlKf6CJy51wY/lkkFqq3TqqnH34XyAHUkq27IjlUkWlQRpLHw==,
-      }
-    engines: { node: ^18.18.0 || >=20.0.0 }
+    resolution: {integrity: sha512-A021Rj33+G8mx2Dqh0nMO9GyjjIBK3MqgVgZ2qlKf6CJy51wY/lkkFqq3TqqnH34XyAHUkq27IjlUkWlQRpLHw==}
+    engines: {node: ^18.18.0 || >=20.0.0}
     peerDependencies:
       eslint: ^8.56.0
       typescript: '*'
@@ -2693,161 +1660,55 @@ packages:
       typescript:
         optional: true
 
-  '@typescript-eslint/types@5.62.0':
-    resolution:
-      {
-        integrity: sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==,
-      }
-    engines: { node: ^12.22.0 || ^14.17.0 || >=16.0.0 }
-
-  '@typescript-eslint/types@6.21.0':
-    resolution:
-      {
-        integrity: sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==,
-      }
-    engines: { node: ^16.0.0 || >=18.0.0 }
-
   '@typescript-eslint/types@7.5.0':
-    resolution:
-      {
-        integrity: sha512-tv5B4IHeAdhR7uS4+bf8Ov3k793VEVHd45viRRkehIUZxm0WF82VPiLgHzA/Xl4TGPg1ZD49vfxBKFPecD5/mg==,
-      }
-    engines: { node: ^18.18.0 || >=20.0.0 }
-
-  '@typescript-eslint/typescript-estree@5.62.0':
-    resolution:
-      {
-        integrity: sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==,
-      }
-    engines: { node: ^12.22.0 || ^14.17.0 || >=16.0.0 }
-    peerDependencies:
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-
-  '@typescript-eslint/typescript-estree@6.21.0':
-    resolution:
-      {
-        integrity: sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==,
-      }
-    engines: { node: ^16.0.0 || >=18.0.0 }
-    peerDependencies:
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+    resolution: {integrity: sha512-tv5B4IHeAdhR7uS4+bf8Ov3k793VEVHd45viRRkehIUZxm0WF82VPiLgHzA/Xl4TGPg1ZD49vfxBKFPecD5/mg==}
+    engines: {node: ^18.18.0 || >=20.0.0}
 
   '@typescript-eslint/typescript-estree@7.5.0':
-    resolution:
-      {
-        integrity: sha512-YklQQfe0Rv2PZEueLTUffiQGKQneiIEKKnfIqPIOxgM9lKSZFCjT5Ad4VqRKj/U4+kQE3fa8YQpskViL7WjdPQ==,
-      }
-    engines: { node: ^18.18.0 || >=20.0.0 }
+    resolution: {integrity: sha512-YklQQfe0Rv2PZEueLTUffiQGKQneiIEKKnfIqPIOxgM9lKSZFCjT5Ad4VqRKj/U4+kQE3fa8YQpskViL7WjdPQ==}
+    engines: {node: ^18.18.0 || >=20.0.0}
     peerDependencies:
       typescript: '*'
     peerDependenciesMeta:
       typescript:
         optional: true
 
-  '@typescript-eslint/utils@5.62.0':
-    resolution:
-      {
-        integrity: sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==,
-      }
-    engines: { node: ^12.22.0 || ^14.17.0 || >=16.0.0 }
-    peerDependencies:
-      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-
-  '@typescript-eslint/utils@6.21.0':
-    resolution:
-      {
-        integrity: sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ==,
-      }
-    engines: { node: ^16.0.0 || >=18.0.0 }
-    peerDependencies:
-      eslint: ^7.0.0 || ^8.0.0
-
   '@typescript-eslint/utils@7.5.0':
-    resolution:
-      {
-        integrity: sha512-3vZl9u0R+/FLQcpy2EHyRGNqAS/ofJ3Ji8aebilfJe+fobK8+LbIFmrHciLVDxjDoONmufDcnVSF38KwMEOjzw==,
-      }
-    engines: { node: ^18.18.0 || >=20.0.0 }
+    resolution: {integrity: sha512-3vZl9u0R+/FLQcpy2EHyRGNqAS/ofJ3Ji8aebilfJe+fobK8+LbIFmrHciLVDxjDoONmufDcnVSF38KwMEOjzw==}
+    engines: {node: ^18.18.0 || >=20.0.0}
     peerDependencies:
       eslint: ^8.56.0
 
-  '@typescript-eslint/visitor-keys@5.62.0':
-    resolution:
-      {
-        integrity: sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==,
-      }
-    engines: { node: ^12.22.0 || ^14.17.0 || >=16.0.0 }
-
-  '@typescript-eslint/visitor-keys@6.21.0':
-    resolution:
-      {
-        integrity: sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==,
-      }
-    engines: { node: ^16.0.0 || >=18.0.0 }
-
   '@typescript-eslint/visitor-keys@7.5.0':
-    resolution:
-      {
-        integrity: sha512-mcuHM/QircmA6O7fy6nn2w/3ditQkj+SgtOc8DW3uQ10Yfj42amm2i+6F2K4YAOPNNTmE6iM1ynM6lrSwdendA==,
-      }
-    engines: { node: ^18.18.0 || >=20.0.0 }
+    resolution: {integrity: sha512-mcuHM/QircmA6O7fy6nn2w/3ditQkj+SgtOc8DW3uQ10Yfj42amm2i+6F2K4YAOPNNTmE6iM1ynM6lrSwdendA==}
+    engines: {node: ^18.18.0 || >=20.0.0}
 
   '@ungap/structured-clone@1.2.0':
-    resolution:
-      {
-        integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==,
-      }
+    resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==}
 
   '@vitejs/plugin-react@4.2.1':
-    resolution:
-      {
-        integrity: sha512-oojO9IDc4nCUUi8qIR11KoQm0XFFLIwsRBwHRR4d/88IWghn1y6ckz/bJ8GHDCsYEJee8mDzqtJxh15/cisJNQ==,
-      }
-    engines: { node: ^14.18.0 || >=16.0.0 }
+    resolution: {integrity: sha512-oojO9IDc4nCUUi8qIR11KoQm0XFFLIwsRBwHRR4d/88IWghn1y6ckz/bJ8GHDCsYEJee8mDzqtJxh15/cisJNQ==}
+    engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
       vite: ^4.2.0 || ^5.0.0
 
   '@volar/language-core@1.11.1':
-    resolution:
-      {
-        integrity: sha512-dOcNn3i9GgZAcJt43wuaEykSluAuOkQgzni1cuxLxTV0nJKanQztp7FxyswdRILaKH+P2XZMPRp2S4MV/pElCw==,
-      }
+    resolution: {integrity: sha512-dOcNn3i9GgZAcJt43wuaEykSluAuOkQgzni1cuxLxTV0nJKanQztp7FxyswdRILaKH+P2XZMPRp2S4MV/pElCw==}
 
   '@volar/source-map@1.11.1':
-    resolution:
-      {
-        integrity: sha512-hJnOnwZ4+WT5iupLRnuzbULZ42L7BWWPMmruzwtLhJfpDVoZLjNBxHDi2sY2bgZXCKlpU5XcsMFoYrsQmPhfZg==,
-      }
+    resolution: {integrity: sha512-hJnOnwZ4+WT5iupLRnuzbULZ42L7BWWPMmruzwtLhJfpDVoZLjNBxHDi2sY2bgZXCKlpU5XcsMFoYrsQmPhfZg==}
 
   '@volar/typescript@1.11.1':
-    resolution:
-      {
-        integrity: sha512-iU+t2mas/4lYierSnoFOeRFQUhAEMgsFuQxoxvwn5EdQopw43j+J27a4lt9LMInx1gLJBC6qL14WYGlgymaSMQ==,
-      }
+    resolution: {integrity: sha512-iU+t2mas/4lYierSnoFOeRFQUhAEMgsFuQxoxvwn5EdQopw43j+J27a4lt9LMInx1gLJBC6qL14WYGlgymaSMQ==}
 
   '@vue/compiler-core@3.4.21':
-    resolution:
-      {
-        integrity: sha512-MjXawxZf2SbZszLPYxaFCjxfibYrzr3eYbKxwpLR9EQN+oaziSu3qKVbwBERj1IFIB8OLUewxB5m/BFzi613og==,
-      }
+    resolution: {integrity: sha512-MjXawxZf2SbZszLPYxaFCjxfibYrzr3eYbKxwpLR9EQN+oaziSu3qKVbwBERj1IFIB8OLUewxB5m/BFzi613og==}
 
   '@vue/compiler-dom@3.4.21':
-    resolution:
-      {
-        integrity: sha512-IZC6FKowtT1sl0CR5DpXSiEB5ayw75oT2bma1BEhV7RRR1+cfwLrxc2Z8Zq/RGFzJ8w5r9QtCOvTjQgdn0IKmA==,
-      }
+    resolution: {integrity: sha512-IZC6FKowtT1sl0CR5DpXSiEB5ayw75oT2bma1BEhV7RRR1+cfwLrxc2Z8Zq/RGFzJ8w5r9QtCOvTjQgdn0IKmA==}
 
   '@vue/language-core@1.8.27':
-    resolution:
-      {
-        integrity: sha512-L8Kc27VdQserNaCUNiSFdDl9LWT24ly8Hpwf1ECy3aFb9m6bDhBGQYOujDm21N7EW3moKIOKEanQwe1q5BK+mA==,
-      }
+    resolution: {integrity: sha512-L8Kc27VdQserNaCUNiSFdDl9LWT24ly8Hpwf1ECy3aFb9m6bDhBGQYOujDm21N7EW3moKIOKEanQwe1q5BK+mA==}
     peerDependencies:
       typescript: '*'
     peerDependenciesMeta:
@@ -2855,696 +1716,375 @@ packages:
         optional: true
 
   '@vue/shared@3.4.21':
-    resolution:
-      {
-        integrity: sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==,
-      }
+    resolution: {integrity: sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==}
 
   '@zk-kit/groth16@0.3.0':
-    resolution:
-      {
-        integrity: sha512-rvTrzMcpxFy0lkiIveI5HHovVbyBQ+eDuh/RGAb0SHkzIxJ8kiPjSXvRXUmEdq278ZdhHvrCZSz5J53oIBuoFw==,
-      }
+    resolution: {integrity: sha512-rvTrzMcpxFy0lkiIveI5HHovVbyBQ+eDuh/RGAb0SHkzIxJ8kiPjSXvRXUmEdq278ZdhHvrCZSz5J53oIBuoFw==}
 
   '@zk-kit/incremental-merkle-tree@0.4.3':
-    resolution:
-      {
-        integrity: sha512-2qHfrJXtPx8/UmF0wFAUr4VqCLr3J/P859fk/e3fwKLUnf3baeIUAO6inY4wrh0NGy4bzpKUWYjDph0yTbPz6A==,
-      }
+    resolution: {integrity: sha512-2qHfrJXtPx8/UmF0wFAUr4VqCLr3J/P859fk/e3fwKLUnf3baeIUAO6inY4wrh0NGy4bzpKUWYjDph0yTbPz6A==}
 
   '@zk-kit/incremental-merkle-tree@1.1.0':
-    resolution:
-      {
-        integrity: sha512-WnNR/GQse3lX8zOHMU8zwhgX8u3qPoul8w4GjJ0WDHq+VGJimo7EGheRZ/ILeBQabnlzAerdv3vBqYBehBeoKA==,
-      }
+    resolution: {integrity: sha512-WnNR/GQse3lX8zOHMU8zwhgX8u3qPoul8w4GjJ0WDHq+VGJimo7EGheRZ/ILeBQabnlzAerdv3vBqYBehBeoKA==}
 
   acorn-jsx@5.3.2:
-    resolution:
-      {
-        integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==,
-      }
+    resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
       acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
 
   acorn@8.11.2:
-    resolution:
-      {
-        integrity: sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==,
-      }
-    engines: { node: '>=0.4.0' }
+    resolution: {integrity: sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==}
+    engines: {node: '>=0.4.0'}
     hasBin: true
 
   aes-js@3.0.0:
-    resolution:
-      {
-        integrity: sha512-H7wUZRn8WpTq9jocdxQ2c8x2sKo9ZVmzfRE13GiNJXfp7NcKYEdvl3vspKjXox6RIG2VtaRe4JFvxG4rqp2Zuw==,
-      }
+    resolution: {integrity: sha512-H7wUZRn8WpTq9jocdxQ2c8x2sKo9ZVmzfRE13GiNJXfp7NcKYEdvl3vspKjXox6RIG2VtaRe4JFvxG4rqp2Zuw==}
 
   ajv@6.12.6:
-    resolution:
-      {
-        integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==,
-      }
+    resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
 
   ansi-regex@5.0.1:
-    resolution:
-      {
-        integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
+    engines: {node: '>=8'}
 
   ansi-regex@6.0.1:
-    resolution:
-      {
-        integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==,
-      }
-    engines: { node: '>=12' }
+    resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==}
+    engines: {node: '>=12'}
 
   ansi-styles@3.2.1:
-    resolution:
-      {
-        integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==,
-      }
-    engines: { node: '>=4' }
+    resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==}
+    engines: {node: '>=4'}
 
   ansi-styles@4.3.0:
-    resolution:
-      {
-        integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
+    engines: {node: '>=8'}
 
   ansi-styles@6.2.1:
-    resolution:
-      {
-        integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==,
-      }
-    engines: { node: '>=12' }
+    resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==}
+    engines: {node: '>=12'}
 
   any-promise@1.3.0:
-    resolution:
-      {
-        integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==,
-      }
+    resolution: {integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==}
 
   anymatch@3.1.3:
-    resolution:
-      {
-        integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==,
-      }
-    engines: { node: '>= 8' }
+    resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==}
+    engines: {node: '>= 8'}
 
   arg@5.0.2:
-    resolution:
-      {
-        integrity: sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==,
-      }
+    resolution: {integrity: sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==}
 
   argparse@1.0.10:
-    resolution:
-      {
-        integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==,
-      }
+    resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==}
 
   argparse@2.0.1:
-    resolution:
-      {
-        integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==,
-      }
+    resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
 
   aria-hidden@1.2.3:
-    resolution:
-      {
-        integrity: sha512-xcLxITLe2HYa1cnYnwCjkOO1PqUHQpozB8x9AR0OgWN2woOBi5kSDVxKfd0b7sb1hw5qFeJhXm9H1nu3xSfLeQ==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-xcLxITLe2HYa1cnYnwCjkOO1PqUHQpozB8x9AR0OgWN2woOBi5kSDVxKfd0b7sb1hw5qFeJhXm9H1nu3xSfLeQ==}
+    engines: {node: '>=10'}
 
   array-union@2.1.0:
-    resolution:
-      {
-        integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}
+    engines: {node: '>=8'}
 
   asn1.js@5.4.1:
-    resolution:
-      {
-        integrity: sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==,
-      }
+    resolution: {integrity: sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==}
 
   asn1@0.2.6:
-    resolution:
-      {
-        integrity: sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==,
-      }
+    resolution: {integrity: sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==}
 
   assert@2.1.0:
-    resolution:
-      {
-        integrity: sha512-eLHpSK/Y4nhMJ07gDaAzoX/XAKS8PSaojml3M0DM4JpV1LAi5JOJ/p6H/XWrl8L+DzVEvVCW1z3vWAaB9oTsQw==,
-      }
+    resolution: {integrity: sha512-eLHpSK/Y4nhMJ07gDaAzoX/XAKS8PSaojml3M0DM4JpV1LAi5JOJ/p6H/XWrl8L+DzVEvVCW1z3vWAaB9oTsQw==}
 
   assertion-error@1.1.0:
-    resolution:
-      {
-        integrity: sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==,
-      }
+    resolution: {integrity: sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==}
 
   autoprefixer@10.4.19:
-    resolution:
-      {
-        integrity: sha512-BaENR2+zBZ8xXhM4pUaKUxlVdxZ0EZhjvbopwnXmxRUfqDmwSpC2lAi/QXvx7NRdPCo1WKEcEF6mV64si1z4Ew==,
-      }
-    engines: { node: ^10 || ^12 || >=14 }
+    resolution: {integrity: sha512-BaENR2+zBZ8xXhM4pUaKUxlVdxZ0EZhjvbopwnXmxRUfqDmwSpC2lAi/QXvx7NRdPCo1WKEcEF6mV64si1z4Ew==}
+    engines: {node: ^10 || ^12 || >=14}
     hasBin: true
     peerDependencies:
       postcss: ^8.1.0
 
   available-typed-arrays@1.0.5:
-    resolution:
-      {
-        integrity: sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==}
+    engines: {node: '>= 0.4'}
 
   b4a@1.6.4:
-    resolution:
-      {
-        integrity: sha512-fpWrvyVHEKyeEvbKZTVOeZF3VSKKWtJxFIxX/jaVPf+cLbGUSitjb49pHLqPV2BUNNZ0LcoeEGfE/YCpyDYHIw==,
-      }
+    resolution: {integrity: sha512-fpWrvyVHEKyeEvbKZTVOeZF3VSKKWtJxFIxX/jaVPf+cLbGUSitjb49pHLqPV2BUNNZ0LcoeEGfE/YCpyDYHIw==}
 
   babel-plugin-macros@3.1.0:
-    resolution:
-      {
-        integrity: sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==,
-      }
-    engines: { node: '>=10', npm: '>=6' }
+    resolution: {integrity: sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==}
+    engines: {node: '>=10', npm: '>=6'}
 
   babel-plugin-styled-components@2.1.4:
-    resolution:
-      {
-        integrity: sha512-Xgp9g+A/cG47sUyRwwYxGM4bR/jDRg5N6it/8+HxCnbT5XNKSKDT9xm4oag/osgqjC2It/vH0yXsomOG6k558g==,
-      }
+    resolution: {integrity: sha512-Xgp9g+A/cG47sUyRwwYxGM4bR/jDRg5N6it/8+HxCnbT5XNKSKDT9xm4oag/osgqjC2It/vH0yXsomOG6k558g==}
     peerDependencies:
       styled-components: '>= 2'
 
   bail@2.0.2:
-    resolution:
-      {
-        integrity: sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw==,
-      }
+    resolution: {integrity: sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw==}
 
   balanced-match@1.0.2:
-    resolution:
-      {
-        integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==,
-      }
+    resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
 
   base64-js@1.5.1:
-    resolution:
-      {
-        integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==,
-      }
+    resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
 
   bech32@1.1.4:
-    resolution:
-      {
-        integrity: sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ==,
-      }
+    resolution: {integrity: sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ==}
 
   bignumber.js@9.1.2:
-    resolution:
-      {
-        integrity: sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug==,
-      }
+    resolution: {integrity: sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug==}
 
   binary-extensions@2.3.0:
-    resolution:
-      {
-        integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==}
+    engines: {node: '>=8'}
 
   blake-hash@2.0.0:
-    resolution:
-      {
-        integrity: sha512-Igj8YowDu1PRkRsxZA7NVkdFNxH5rKv5cpLxQ0CVXSIA77pVYwCPRQJ2sMew/oneUpfuYRyjG6r8SmmmnbZb1w==,
-      }
-    engines: { node: '>= 10' }
+    resolution: {integrity: sha512-Igj8YowDu1PRkRsxZA7NVkdFNxH5rKv5cpLxQ0CVXSIA77pVYwCPRQJ2sMew/oneUpfuYRyjG6r8SmmmnbZb1w==}
+    engines: {node: '>= 10'}
 
   blake2b-wasm@2.4.0:
-    resolution:
-      {
-        integrity: sha512-S1kwmW2ZhZFFFOghcx73+ZajEfKBqhP82JMssxtLVMxlaPea1p9uoLiUZ5WYyHn0KddwbLc+0vh4wR0KBNoT5w==,
-      }
+    resolution: {integrity: sha512-S1kwmW2ZhZFFFOghcx73+ZajEfKBqhP82JMssxtLVMxlaPea1p9uoLiUZ5WYyHn0KddwbLc+0vh4wR0KBNoT5w==}
 
   blake2b@2.1.4:
-    resolution:
-      {
-        integrity: sha512-AyBuuJNI64gIvwx13qiICz6H6hpmjvYS5DGkG6jbXMOT8Z3WUJ3V1X0FlhIoT1b/5JtHE3ki+xjtMvu1nn+t9A==,
-      }
+    resolution: {integrity: sha512-AyBuuJNI64gIvwx13qiICz6H6hpmjvYS5DGkG6jbXMOT8Z3WUJ3V1X0FlhIoT1b/5JtHE3ki+xjtMvu1nn+t9A==}
 
   bn.js@4.12.0:
-    resolution:
-      {
-        integrity: sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==,
-      }
+    resolution: {integrity: sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==}
 
   bn.js@5.2.1:
-    resolution:
-      {
-        integrity: sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==,
-      }
+    resolution: {integrity: sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==}
 
   brace-expansion@1.1.11:
-    resolution:
-      {
-        integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==,
-      }
+    resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==}
 
   brace-expansion@2.0.1:
-    resolution:
-      {
-        integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==,
-      }
+    resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==}
 
   braces@3.0.2:
-    resolution:
-      {
-        integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==}
+    engines: {node: '>=8'}
 
   brorand@1.1.0:
-    resolution:
-      {
-        integrity: sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==,
-      }
+    resolution: {integrity: sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==}
 
   browser-resolve@2.0.0:
-    resolution:
-      {
-        integrity: sha512-7sWsQlYL2rGLy2IWm8WL8DCTJvYLc/qlOnsakDac87SOoCd16WLsaAMdCiAqsTNHIe+SXfaqyxyo6THoWqs8WQ==,
-      }
+    resolution: {integrity: sha512-7sWsQlYL2rGLy2IWm8WL8DCTJvYLc/qlOnsakDac87SOoCd16WLsaAMdCiAqsTNHIe+SXfaqyxyo6THoWqs8WQ==}
 
   browserify-aes@1.2.0:
-    resolution:
-      {
-        integrity: sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==,
-      }
+    resolution: {integrity: sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==}
 
   browserify-cipher@1.0.1:
-    resolution:
-      {
-        integrity: sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==,
-      }
+    resolution: {integrity: sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==}
 
   browserify-des@1.0.2:
-    resolution:
-      {
-        integrity: sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==,
-      }
+    resolution: {integrity: sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==}
 
   browserify-rsa@4.1.0:
-    resolution:
-      {
-        integrity: sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==,
-      }
+    resolution: {integrity: sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==}
 
   browserify-sign@4.2.2:
-    resolution:
-      {
-        integrity: sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==,
-      }
-    engines: { node: '>= 4' }
+    resolution: {integrity: sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==}
+    engines: {node: '>= 4'}
 
   browserify-zlib@0.2.0:
-    resolution:
-      {
-        integrity: sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==,
-      }
+    resolution: {integrity: sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==}
 
   browserslist@4.22.2:
-    resolution:
-      {
-        integrity: sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==,
-      }
-    engines: { node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7 }
+    resolution: {integrity: sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==}
+    engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
     hasBin: true
 
   browserslist@4.23.0:
-    resolution:
-      {
-        integrity: sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==,
-      }
-    engines: { node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7 }
+    resolution: {integrity: sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==}
+    engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
     hasBin: true
 
   buffer-xor@1.0.3:
-    resolution:
-      {
-        integrity: sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==,
-      }
+    resolution: {integrity: sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==}
 
   buffer@5.7.1:
-    resolution:
-      {
-        integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==,
-      }
+    resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}
 
   buffer@6.0.3:
-    resolution:
-      {
-        integrity: sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==,
-      }
+    resolution: {integrity: sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==}
 
   builtin-status-codes@3.0.0:
-    resolution:
-      {
-        integrity: sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==,
-      }
+    resolution: {integrity: sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==}
 
   call-bind@1.0.5:
-    resolution:
-      {
-        integrity: sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==,
-      }
+    resolution: {integrity: sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==}
 
   callsites@3.1.0:
-    resolution:
-      {
-        integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==,
-      }
-    engines: { node: '>=6' }
+    resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
+    engines: {node: '>=6'}
 
   camelcase-css@2.0.1:
-    resolution:
-      {
-        integrity: sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==,
-      }
-    engines: { node: '>= 6' }
+    resolution: {integrity: sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==}
+    engines: {node: '>= 6'}
 
   camelize@1.0.1:
-    resolution:
-      {
-        integrity: sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==,
-      }
+    resolution: {integrity: sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==}
 
   caniuse-lite@1.0.30001566:
-    resolution:
-      {
-        integrity: sha512-ggIhCsTxmITBAMmK8yZjEhCO5/47jKXPu6Dha/wuCS4JePVL+3uiDEBuhu2aIoT+bqTOR8L76Ip1ARL9xYsEJA==,
-      }
+    resolution: {integrity: sha512-ggIhCsTxmITBAMmK8yZjEhCO5/47jKXPu6Dha/wuCS4JePVL+3uiDEBuhu2aIoT+bqTOR8L76Ip1ARL9xYsEJA==}
 
   caniuse-lite@1.0.30001606:
-    resolution:
-      {
-        integrity: sha512-LPbwnW4vfpJId225pwjZJOgX1m9sGfbw/RKJvw/t0QhYOOaTXHvkjVGFGPpvwEzufrjvTlsULnVTxdy4/6cqkg==,
-      }
+    resolution: {integrity: sha512-LPbwnW4vfpJId225pwjZJOgX1m9sGfbw/RKJvw/t0QhYOOaTXHvkjVGFGPpvwEzufrjvTlsULnVTxdy4/6cqkg==}
 
   ccount@2.0.1:
-    resolution:
-      {
-        integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==,
-      }
+    resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==}
 
   chai@4.3.10:
-    resolution:
-      {
-        integrity: sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g==,
-      }
-    engines: { node: '>=4' }
+    resolution: {integrity: sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g==}
+    engines: {node: '>=4'}
 
   chalk@2.4.2:
-    resolution:
-      {
-        integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==,
-      }
-    engines: { node: '>=4' }
+    resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}
+    engines: {node: '>=4'}
 
   chalk@4.1.2:
-    resolution:
-      {
-        integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
+    engines: {node: '>=10'}
 
   character-entities-html4@2.1.0:
-    resolution:
-      {
-        integrity: sha512-1v7fgQRj6hnSwFpq1Eu0ynr/CDEw0rXo2B61qXrLNdHZmPKgb7fqS1a2JwF0rISo9q77jDI8VMEHoApn8qDoZA==,
-      }
+    resolution: {integrity: sha512-1v7fgQRj6hnSwFpq1Eu0ynr/CDEw0rXo2B61qXrLNdHZmPKgb7fqS1a2JwF0rISo9q77jDI8VMEHoApn8qDoZA==}
 
   character-entities-legacy@3.0.0:
-    resolution:
-      {
-        integrity: sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ==,
-      }
+    resolution: {integrity: sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ==}
 
   character-entities@2.0.2:
-    resolution:
-      {
-        integrity: sha512-shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ==,
-      }
+    resolution: {integrity: sha512-shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ==}
 
   character-reference-invalid@2.0.1:
-    resolution:
-      {
-        integrity: sha512-iBZ4F4wRbyORVsu0jPV7gXkOsGYjGHPmAyv+HiHG8gi5PtC9KI2j1+v8/tlibRvjoWX027ypmG/n0HtO5t7unw==,
-      }
+    resolution: {integrity: sha512-iBZ4F4wRbyORVsu0jPV7gXkOsGYjGHPmAyv+HiHG8gi5PtC9KI2j1+v8/tlibRvjoWX027ypmG/n0HtO5t7unw==}
 
   check-error@1.0.3:
-    resolution:
-      {
-        integrity: sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==,
-      }
+    resolution: {integrity: sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==}
 
   chokidar@3.6.0:
-    resolution:
-      {
-        integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==,
-      }
-    engines: { node: '>= 8.10.0' }
+    resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==}
+    engines: {node: '>= 8.10.0'}
 
   cipher-base@1.0.4:
-    resolution:
-      {
-        integrity: sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==,
-      }
+    resolution: {integrity: sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==}
 
   circom_runtime@0.1.24:
-    resolution:
-      {
-        integrity: sha512-H7/7I2J/cBmRnZm9docOCGhfxzS61BEm4TMCWcrZGsWNBQhePNfQq88Oj2XpUfzmBTCd8pRvRb3Mvazt3TMrJw==,
-      }
+    resolution: {integrity: sha512-H7/7I2J/cBmRnZm9docOCGhfxzS61BEm4TMCWcrZGsWNBQhePNfQq88Oj2XpUfzmBTCd8pRvRb3Mvazt3TMrJw==}
     hasBin: true
 
   circomlibjs@0.1.7:
-    resolution:
-      {
-        integrity: sha512-GRAUoAlKAsiiTa+PA725G9RmEmJJRc8tRFxw/zKktUxlQISGznT4hH4ESvW8FNTsrGg/nNd06sGP/Wlx0LUHVg==,
-      }
+    resolution: {integrity: sha512-GRAUoAlKAsiiTa+PA725G9RmEmJJRc8tRFxw/zKktUxlQISGznT4hH4ESvW8FNTsrGg/nNd06sGP/Wlx0LUHVg==}
 
   class-variance-authority@0.7.0:
-    resolution:
-      {
-        integrity: sha512-jFI8IQw4hczaL4ALINxqLEXQbWcNjoSkloa4IaufXCJr6QawJyw7tuRysRsrE8w2p/4gGaxKIt/hX3qz/IbD1A==,
-      }
+    resolution: {integrity: sha512-jFI8IQw4hczaL4ALINxqLEXQbWcNjoSkloa4IaufXCJr6QawJyw7tuRysRsrE8w2p/4gGaxKIt/hX3qz/IbD1A==}
 
   cliui@8.0.1:
-    resolution:
-      {
-        integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==,
-      }
-    engines: { node: '>=12' }
+    resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==}
+    engines: {node: '>=12'}
 
   clsx@2.0.0:
-    resolution:
-      {
-        integrity: sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q==,
-      }
-    engines: { node: '>=6' }
+    resolution: {integrity: sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q==}
+    engines: {node: '>=6'}
 
   clsx@2.1.0:
-    resolution:
-      {
-        integrity: sha512-m3iNNWpd9rl3jvvcBnu70ylMdrXt8Vlq4HYadnU5fwcOtvkSQWPmj7amUcDT2qYI7risszBjI5AUIUox9D16pg==,
-      }
-    engines: { node: '>=6' }
+    resolution: {integrity: sha512-m3iNNWpd9rl3jvvcBnu70ylMdrXt8Vlq4HYadnU5fwcOtvkSQWPmj7amUcDT2qYI7risszBjI5AUIUox9D16pg==}
+    engines: {node: '>=6'}
 
   cmdk@1.0.0:
-    resolution:
-      {
-        integrity: sha512-gDzVf0a09TvoJ5jnuPvygTB77+XdOSwEmJ88L6XPFPlv7T3RxbP9jgenfylrAMD0+Le1aO0nVjQUzl2g+vjz5Q==,
-      }
+    resolution: {integrity: sha512-gDzVf0a09TvoJ5jnuPvygTB77+XdOSwEmJ88L6XPFPlv7T3RxbP9jgenfylrAMD0+Le1aO0nVjQUzl2g+vjz5Q==}
     peerDependencies:
       react: ^18.0.0
       react-dom: ^18.0.0
 
   color-convert@1.9.3:
-    resolution:
-      {
-        integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==,
-      }
+    resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==}
 
   color-convert@2.0.1:
-    resolution:
-      {
-        integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==,
-      }
-    engines: { node: '>=7.0.0' }
+    resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
+    engines: {node: '>=7.0.0'}
 
   color-name@1.1.3:
-    resolution:
-      {
-        integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==,
-      }
+    resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==}
 
   color-name@1.1.4:
-    resolution:
-      {
-        integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==,
-      }
+    resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
 
   comma-separated-tokens@2.0.3:
-    resolution:
-      {
-        integrity: sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==,
-      }
+    resolution: {integrity: sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==}
 
   commander@4.1.1:
-    resolution:
-      {
-        integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==,
-      }
-    engines: { node: '>= 6' }
+    resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==}
+    engines: {node: '>= 6'}
 
   commander@9.5.0:
-    resolution:
-      {
-        integrity: sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==,
-      }
-    engines: { node: ^12.20.0 || >=14 }
+    resolution: {integrity: sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==}
+    engines: {node: ^12.20.0 || >=14}
 
   computeds@0.0.1:
-    resolution:
-      {
-        integrity: sha512-7CEBgcMjVmitjYo5q8JTJVra6X5mQ20uTThdK+0kR7UEaDrAWEQcRiBtWJzga4eRpP6afNwwLsX2SET2JhVB1Q==,
-      }
+    resolution: {integrity: sha512-7CEBgcMjVmitjYo5q8JTJVra6X5mQ20uTThdK+0kR7UEaDrAWEQcRiBtWJzga4eRpP6afNwwLsX2SET2JhVB1Q==}
 
   concat-map@0.0.1:
-    resolution:
-      {
-        integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==,
-      }
+    resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
 
   console-browserify@1.2.0:
-    resolution:
-      {
-        integrity: sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==,
-      }
+    resolution: {integrity: sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==}
 
   constants-browserify@1.0.0:
-    resolution:
-      {
-        integrity: sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==,
-      }
+    resolution: {integrity: sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==}
 
   convert-source-map@1.9.0:
-    resolution:
-      {
-        integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==,
-      }
+    resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==}
 
   convert-source-map@2.0.0:
-    resolution:
-      {
-        integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==,
-      }
+    resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==}
 
   cosmiconfig@7.1.0:
-    resolution:
-      {
-        integrity: sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==}
+    engines: {node: '>=10'}
 
   create-ecdh@4.0.4:
-    resolution:
-      {
-        integrity: sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==,
-      }
+    resolution: {integrity: sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==}
 
   create-hash@1.2.0:
-    resolution:
-      {
-        integrity: sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==,
-      }
+    resolution: {integrity: sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==}
 
   create-hmac@1.1.7:
-    resolution:
-      {
-        integrity: sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==,
-      }
+    resolution: {integrity: sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==}
 
   create-require@1.1.1:
-    resolution:
-      {
-        integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==,
-      }
+    resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==}
 
   cross-spawn@7.0.3:
-    resolution:
-      {
-        integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==,
-      }
-    engines: { node: '>= 8' }
+    resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==}
+    engines: {node: '>= 8'}
 
   crypto-browserify@3.12.0:
-    resolution:
-      {
-        integrity: sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==,
-      }
+    resolution: {integrity: sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==}
 
   css-color-keywords@1.0.0:
-    resolution:
-      {
-        integrity: sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg==,
-      }
-    engines: { node: '>=4' }
+    resolution: {integrity: sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg==}
+    engines: {node: '>=4'}
 
   css-to-react-native@3.2.0:
-    resolution:
-      {
-        integrity: sha512-e8RKaLXMOFii+02mOlqwjbD00KSEKqblnpO9e++1aXS1fPQOpS1YoqdVHBqPjHNoxeF2mimzVqawm2KCbEdtHQ==,
-      }
+    resolution: {integrity: sha512-e8RKaLXMOFii+02mOlqwjbD00KSEKqblnpO9e++1aXS1fPQOpS1YoqdVHBqPjHNoxeF2mimzVqawm2KCbEdtHQ==}
 
   cssesc@3.0.0:
-    resolution:
-      {
-        integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==,
-      }
-    engines: { node: '>=4' }
+    resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==}
+    engines: {node: '>=4'}
     hasBin: true
 
   csstype@3.1.2:
-    resolution:
-      {
-        integrity: sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==,
-      }
+    resolution: {integrity: sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==}
 
   de-indent@1.0.2:
-    resolution:
-      {
-        integrity: sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==,
-      }
+    resolution: {integrity: sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==}
 
   debug@4.3.4:
-    resolution:
-      {
-        integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==,
-      }
-    engines: { node: '>=6.0' }
+    resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
+    engines: {node: '>=6.0'}
     peerDependencies:
       supports-color: '*'
     peerDependenciesMeta:
@@ -3552,1740 +2092,931 @@ packages:
         optional: true
 
   decode-named-character-reference@1.0.2:
-    resolution:
-      {
-        integrity: sha512-O8x12RzrUF8xyVcY0KJowWsmaJxQbmy0/EtnNtHRpsOcT7dFk5W598coHqBVpmWo1oQQfsCqfCmkZN5DJrZVdg==,
-      }
+    resolution: {integrity: sha512-O8x12RzrUF8xyVcY0KJowWsmaJxQbmy0/EtnNtHRpsOcT7dFk5W598coHqBVpmWo1oQQfsCqfCmkZN5DJrZVdg==}
 
   deep-eql@4.1.3:
-    resolution:
-      {
-        integrity: sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==,
-      }
-    engines: { node: '>=6' }
+    resolution: {integrity: sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==}
+    engines: {node: '>=6'}
 
   deep-is@0.1.4:
-    resolution:
-      {
-        integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==,
-      }
+    resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
 
   define-data-property@1.1.1:
-    resolution:
-      {
-        integrity: sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==}
+    engines: {node: '>= 0.4'}
 
   define-properties@1.2.1:
-    resolution:
-      {
-        integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==}
+    engines: {node: '>= 0.4'}
 
   dependency-graph@0.11.0:
-    resolution:
-      {
-        integrity: sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg==,
-      }
-    engines: { node: '>= 0.6.0' }
+    resolution: {integrity: sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg==}
+    engines: {node: '>= 0.6.0'}
 
   dequal@2.0.3:
-    resolution:
-      {
-        integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==,
-      }
-    engines: { node: '>=6' }
+    resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==}
+    engines: {node: '>=6'}
 
   des.js@1.1.0:
-    resolution:
-      {
-        integrity: sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==,
-      }
+    resolution: {integrity: sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==}
 
   detect-node-es@1.1.0:
-    resolution:
-      {
-        integrity: sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==,
-      }
+    resolution: {integrity: sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==}
 
   devlop@1.1.0:
-    resolution:
-      {
-        integrity: sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==,
-      }
+    resolution: {integrity: sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==}
 
   didyoumean@1.2.2:
-    resolution:
-      {
-        integrity: sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==,
-      }
+    resolution: {integrity: sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==}
 
   diffie-hellman@5.0.3:
-    resolution:
-      {
-        integrity: sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==,
-      }
+    resolution: {integrity: sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==}
 
   dir-glob@3.0.1:
-    resolution:
-      {
-        integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
+    engines: {node: '>=8'}
 
   dlv@1.1.3:
-    resolution:
-      {
-        integrity: sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==,
-      }
+    resolution: {integrity: sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==}
 
   doctrine@3.0.0:
-    resolution:
-      {
-        integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==,
-      }
-    engines: { node: '>=6.0.0' }
+    resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==}
+    engines: {node: '>=6.0.0'}
 
   domain-browser@4.23.0:
-    resolution:
-      {
-        integrity: sha512-ArzcM/II1wCCujdCNyQjXrAFwS4mrLh4C7DZWlaI8mdh7h3BfKdNd3bKXITfl2PT9FtfQqaGvhi1vPRQPimjGA==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-ArzcM/II1wCCujdCNyQjXrAFwS4mrLh4C7DZWlaI8mdh7h3BfKdNd3bKXITfl2PT9FtfQqaGvhi1vPRQPimjGA==}
+    engines: {node: '>=10'}
 
   eastasianwidth@0.2.0:
-    resolution:
-      {
-        integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==,
-      }
+    resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==}
 
   electron-to-chromium@1.4.606:
-    resolution:
-      {
-        integrity: sha512-Zdv0XuhfyWZUsQ5Uq59d43ZmZOdoGZNWjeN4WCxxlQaP8crAWdnWcTxfHKcaJl6PW2SWpHx6DsxSx7v6KcGCuw==,
-      }
+    resolution: {integrity: sha512-Zdv0XuhfyWZUsQ5Uq59d43ZmZOdoGZNWjeN4WCxxlQaP8crAWdnWcTxfHKcaJl6PW2SWpHx6DsxSx7v6KcGCuw==}
 
   electron-to-chromium@1.4.729:
-    resolution:
-      {
-        integrity: sha512-bx7+5Saea/qu14kmPTDHQxkp2UnziG3iajUQu3BxFvCOnpAJdDbMV4rSl+EqFDkkpNNVUFlR1kDfpL59xfy1HA==,
-      }
+    resolution: {integrity: sha512-bx7+5Saea/qu14kmPTDHQxkp2UnziG3iajUQu3BxFvCOnpAJdDbMV4rSl+EqFDkkpNNVUFlR1kDfpL59xfy1HA==}
 
   elliptic@6.5.4:
-    resolution:
-      {
-        integrity: sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==,
-      }
+    resolution: {integrity: sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==}
 
   emoji-regex@8.0.0:
-    resolution:
-      {
-        integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==,
-      }
+    resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
 
   emoji-regex@9.2.2:
-    resolution:
-      {
-        integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==,
-      }
+    resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==}
 
   entities@4.5.0:
-    resolution:
-      {
-        integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==,
-      }
-    engines: { node: '>=0.12' }
+    resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==}
+    engines: {node: '>=0.12'}
 
   error-ex@1.3.2:
-    resolution:
-      {
-        integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==,
-      }
-
-  esbuild@0.19.8:
-    resolution:
-      {
-        integrity: sha512-l7iffQpT2OrZfH2rXIp7/FkmaeZM0vxbxN9KfiCwGYuZqzMg/JdvX26R31Zxn/Pxvsrg3Y9N6XTcnknqDyyv4w==,
-      }
-    engines: { node: '>=12' }
-    hasBin: true
+    resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==}
 
   esbuild@0.20.2:
-    resolution:
-      {
-        integrity: sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==,
-      }
-    engines: { node: '>=12' }
+    resolution: {integrity: sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==}
+    engines: {node: '>=12'}
+    hasBin: true
+
+  esbuild@0.21.5:
+    resolution: {integrity: sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==}
+    engines: {node: '>=12'}
     hasBin: true
 
   escalade@3.1.1:
-    resolution:
-      {
-        integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==,
-      }
-    engines: { node: '>=6' }
+    resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==}
+    engines: {node: '>=6'}
 
   escape-string-regexp@1.0.5:
-    resolution:
-      {
-        integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==,
-      }
-    engines: { node: '>=0.8.0' }
+    resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==}
+    engines: {node: '>=0.8.0'}
 
   escape-string-regexp@4.0.0:
-    resolution:
-      {
-        integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
+    engines: {node: '>=10'}
 
   eslint-config-prettier@9.1.0:
-    resolution:
-      {
-        integrity: sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==,
-      }
+    resolution: {integrity: sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==}
     hasBin: true
     peerDependencies:
       eslint: '>=7.0.0'
 
   eslint-plugin-react-hooks@4.6.0:
-    resolution:
-      {
-        integrity: sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==}
+    engines: {node: '>=10'}
     peerDependencies:
       eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0
 
-  eslint-plugin-react-refresh@0.4.5:
-    resolution:
-      {
-        integrity: sha512-D53FYKJa+fDmZMtriODxvhwrO+IOqrxoEo21gMA0sjHdU6dPVH4OhyFip9ypl8HOF5RV5KdTo+rBQLvnY2cO8w==,
-      }
-    peerDependencies:
-      eslint: '>=7'
-
   eslint-plugin-react-refresh@0.4.6:
-    resolution:
-      {
-        integrity: sha512-NjGXdm7zgcKRkKMua34qVO9doI7VOxZ6ancSvBELJSSoX97jyndXcSoa8XBh69JoB31dNz3EEzlMcizZl7LaMA==,
-      }
+    resolution: {integrity: sha512-NjGXdm7zgcKRkKMua34qVO9doI7VOxZ6ancSvBELJSSoX97jyndXcSoa8XBh69JoB31dNz3EEzlMcizZl7LaMA==}
     peerDependencies:
       eslint: '>=7'
 
-  eslint-scope@5.1.1:
-    resolution:
-      {
-        integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==,
-      }
-    engines: { node: '>=8.0.0' }
-
   eslint-scope@7.2.2:
-    resolution:
-      {
-        integrity: sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==,
-      }
-    engines: { node: ^12.22.0 || ^14.17.0 || >=16.0.0 }
+    resolution: {integrity: sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
 
   eslint-visitor-keys@3.4.3:
-    resolution:
-      {
-        integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==,
-      }
-    engines: { node: ^12.22.0 || ^14.17.0 || >=16.0.0 }
-
-  eslint@8.56.0:
-    resolution:
-      {
-        integrity: sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==,
-      }
-    engines: { node: ^12.22.0 || ^14.17.0 || >=16.0.0 }
-    hasBin: true
+    resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
 
   eslint@8.57.0:
-    resolution:
-      {
-        integrity: sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==,
-      }
-    engines: { node: ^12.22.0 || ^14.17.0 || >=16.0.0 }
+    resolution: {integrity: sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     hasBin: true
 
   espree@9.6.1:
-    resolution:
-      {
-        integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==,
-      }
-    engines: { node: ^12.22.0 || ^14.17.0 || >=16.0.0 }
+    resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
 
   esquery@1.5.0:
-    resolution:
-      {
-        integrity: sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==,
-      }
-    engines: { node: '>=0.10' }
+    resolution: {integrity: sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==}
+    engines: {node: '>=0.10'}
 
   esrecurse@4.3.0:
-    resolution:
-      {
-        integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==,
-      }
-    engines: { node: '>=4.0' }
-
-  estraverse@4.3.0:
-    resolution:
-      {
-        integrity: sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==,
-      }
-    engines: { node: '>=4.0' }
+    resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
+    engines: {node: '>=4.0'}
 
   estraverse@5.3.0:
-    resolution:
-      {
-        integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==,
-      }
-    engines: { node: '>=4.0' }
+    resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==}
+    engines: {node: '>=4.0'}
 
   estree-util-is-identifier-name@3.0.0:
-    resolution:
-      {
-        integrity: sha512-hFtqIDZTIUZ9BXLb8y4pYGyk6+wekIivNVTcmvk8NoOh+VeRn5y6cEHzbURrWbfp1fIqdVipilzj+lfaadNZmg==,
-      }
+    resolution: {integrity: sha512-hFtqIDZTIUZ9BXLb8y4pYGyk6+wekIivNVTcmvk8NoOh+VeRn5y6cEHzbURrWbfp1fIqdVipilzj+lfaadNZmg==}
 
   estree-walker@2.0.2:
-    resolution:
-      {
-        integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==,
-      }
+    resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==}
 
   esutils@2.0.3:
-    resolution:
-      {
-        integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==,
-      }
-    engines: { node: '>=0.10.0' }
+    resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
+    engines: {node: '>=0.10.0'}
 
   ethers@5.7.2:
-    resolution:
-      {
-        integrity: sha512-wswUsmWo1aOK8rR7DIKiWSw9DbLWe6x98Jrn8wcTflTVvaXhAMaB5zGAXy0GYQEQp9iO1iSHWVyARQm11zUtyg==,
-      }
+    resolution: {integrity: sha512-wswUsmWo1aOK8rR7DIKiWSw9DbLWe6x98Jrn8wcTflTVvaXhAMaB5zGAXy0GYQEQp9iO1iSHWVyARQm11zUtyg==}
 
   events@3.3.0:
-    resolution:
-      {
-        integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==,
-      }
-    engines: { node: '>=0.8.x' }
+    resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==}
+    engines: {node: '>=0.8.x'}
 
   evp_bytestokey@1.0.3:
-    resolution:
-      {
-        integrity: sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==,
-      }
+    resolution: {integrity: sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==}
 
   extend@3.0.2:
-    resolution:
-      {
-        integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==,
-      }
+    resolution: {integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==}
 
   fast-deep-equal@3.1.3:
-    resolution:
-      {
-        integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==,
-      }
+    resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
 
   fast-glob@3.3.2:
-    resolution:
-      {
-        integrity: sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==,
-      }
-    engines: { node: '>=8.6.0' }
+    resolution: {integrity: sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==}
+    engines: {node: '>=8.6.0'}
 
   fast-json-stable-stringify@2.1.0:
-    resolution:
-      {
-        integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==,
-      }
+    resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==}
 
   fast-levenshtein@2.0.6:
-    resolution:
-      {
-        integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==,
-      }
+    resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
 
   fastq@1.15.0:
-    resolution:
-      {
-        integrity: sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==,
-      }
+    resolution: {integrity: sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==}
 
   ffjavascript@0.2.60:
-    resolution:
-      {
-        integrity: sha512-T/9bnEL5xAZRDbQoEMf+pM9nrhK+C3JyZNmqiWub26EQorW7Jt+jR54gpqDhceA4Nj0YctPQwYnl8xa52/A26A==,
-      }
+    resolution: {integrity: sha512-T/9bnEL5xAZRDbQoEMf+pM9nrhK+C3JyZNmqiWub26EQorW7Jt+jR54gpqDhceA4Nj0YctPQwYnl8xa52/A26A==}
 
   ffjavascript@0.2.62:
-    resolution:
-      {
-        integrity: sha512-uJ7MTrdzhX/3f+hxn0XhdXbJCqYZJSBB6y2/ui4t21vKYVjyTMlU80pPXu40ir6qpqbrdzUeKdlOdJ0aFG9UNA==,
-      }
+    resolution: {integrity: sha512-uJ7MTrdzhX/3f+hxn0XhdXbJCqYZJSBB6y2/ui4t21vKYVjyTMlU80pPXu40ir6qpqbrdzUeKdlOdJ0aFG9UNA==}
 
   file-entry-cache@6.0.1:
-    resolution:
-      {
-        integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==,
-      }
-    engines: { node: ^10.12.0 || >=12.0.0 }
+    resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==}
+    engines: {node: ^10.12.0 || >=12.0.0}
 
   fill-range@7.0.1:
-    resolution:
-      {
-        integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==}
+    engines: {node: '>=8'}
 
   find-root@1.1.0:
-    resolution:
-      {
-        integrity: sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==,
-      }
+    resolution: {integrity: sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==}
 
   find-up@5.0.0:
-    resolution:
-      {
-        integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
+    engines: {node: '>=10'}
 
   flat-cache@3.2.0:
-    resolution:
-      {
-        integrity: sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==,
-      }
-    engines: { node: ^10.12.0 || >=12.0.0 }
+    resolution: {integrity: sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==}
+    engines: {node: ^10.12.0 || >=12.0.0}
 
   flatted@3.2.9:
-    resolution:
-      {
-        integrity: sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==,
-      }
+    resolution: {integrity: sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==}
 
   for-each@0.3.3:
-    resolution:
-      {
-        integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==,
-      }
+    resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}
 
   foreground-child@3.1.1:
-    resolution:
-      {
-        integrity: sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==,
-      }
-    engines: { node: '>=14' }
+    resolution: {integrity: sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==}
+    engines: {node: '>=14'}
 
   fraction.js@4.3.7:
-    resolution:
-      {
-        integrity: sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==,
-      }
+    resolution: {integrity: sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==}
 
   fs-extra@11.2.0:
-    resolution:
-      {
-        integrity: sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==,
-      }
-    engines: { node: '>=14.14' }
+    resolution: {integrity: sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==}
+    engines: {node: '>=14.14'}
 
   fs-extra@7.0.1:
-    resolution:
-      {
-        integrity: sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==,
-      }
-    engines: { node: '>=6 <7 || >=8' }
+    resolution: {integrity: sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==}
+    engines: {node: '>=6 <7 || >=8'}
 
   fs.realpath@1.0.0:
-    resolution:
-      {
-        integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==,
-      }
+    resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
 
   fsevents@2.3.3:
-    resolution:
-      {
-        integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==,
-      }
-    engines: { node: ^8.16.0 || ^10.6.0 || >=11.0.0 }
+    resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
+    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
     os: [darwin]
 
   function-bind@1.1.2:
-    resolution:
-      {
-        integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==,
-      }
+    resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}
 
   gensync@1.0.0-beta.2:
-    resolution:
-      {
-        integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==}
+    engines: {node: '>=6.9.0'}
 
   get-caller-file@2.0.5:
-    resolution:
-      {
-        integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==,
-      }
-    engines: { node: 6.* || 8.* || >= 10.* }
+    resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
+    engines: {node: 6.* || 8.* || >= 10.*}
 
   get-func-name@2.0.2:
-    resolution:
-      {
-        integrity: sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==,
-      }
+    resolution: {integrity: sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==}
 
   get-intrinsic@1.2.2:
-    resolution:
-      {
-        integrity: sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==,
-      }
+    resolution: {integrity: sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==}
 
   get-nonce@1.0.1:
-    resolution:
-      {
-        integrity: sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q==,
-      }
-    engines: { node: '>=6' }
+    resolution: {integrity: sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q==}
+    engines: {node: '>=6'}
 
   get-stdin@9.0.0:
-    resolution:
-      {
-        integrity: sha512-dVKBjfWisLAicarI2Sf+JuBE/DghV4UzNAVe9yhEJuzeREd3JhOTE9cUaJTeSa77fsbQUK3pcOpJfM59+VKZaA==,
-      }
-    engines: { node: '>=12' }
+    resolution: {integrity: sha512-dVKBjfWisLAicarI2Sf+JuBE/DghV4UzNAVe9yhEJuzeREd3JhOTE9cUaJTeSa77fsbQUK3pcOpJfM59+VKZaA==}
+    engines: {node: '>=12'}
 
   glob-parent@5.1.2:
-    resolution:
-      {
-        integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==,
-      }
-    engines: { node: '>= 6' }
+    resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
+    engines: {node: '>= 6'}
 
   glob-parent@6.0.2:
-    resolution:
-      {
-        integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==,
-      }
-    engines: { node: '>=10.13.0' }
+    resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}
+    engines: {node: '>=10.13.0'}
 
   glob@10.3.12:
-    resolution:
-      {
-        integrity: sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==,
-      }
-    engines: { node: '>=16 || 14 >=14.17' }
+    resolution: {integrity: sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==}
+    engines: {node: '>=16 || 14 >=14.17'}
     hasBin: true
 
   glob@7.2.3:
-    resolution:
-      {
-        integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==,
-      }
+    resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
+    deprecated: Glob versions prior to v9 are no longer supported
 
   globals@11.12.0:
-    resolution:
-      {
-        integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==,
-      }
-    engines: { node: '>=4' }
+    resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==}
+    engines: {node: '>=4'}
 
   globals@13.23.0:
-    resolution:
-      {
-        integrity: sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==}
+    engines: {node: '>=8'}
 
   globby@11.1.0:
-    resolution:
-      {
-        integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==}
+    engines: {node: '>=10'}
 
   globby@14.0.1:
-    resolution:
-      {
-        integrity: sha512-jOMLD2Z7MAhyG8aJpNOpmziMOP4rPLcc95oQPKXBazW82z+CEgPFBQvEpRUa1KeIMUJo4Wsm+q6uzO/Q/4BksQ==,
-      }
-    engines: { node: '>=18' }
+    resolution: {integrity: sha512-jOMLD2Z7MAhyG8aJpNOpmziMOP4rPLcc95oQPKXBazW82z+CEgPFBQvEpRUa1KeIMUJo4Wsm+q6uzO/Q/4BksQ==}
+    engines: {node: '>=18'}
 
   goober@2.1.13:
-    resolution:
-      {
-        integrity: sha512-jFj3BQeleOoy7t93E9rZ2de+ScC4lQICLwiAQmKMg9F6roKGaLSHoCDYKkWlSafg138jejvq/mTdvmnwDQgqoQ==,
-      }
+    resolution: {integrity: sha512-jFj3BQeleOoy7t93E9rZ2de+ScC4lQICLwiAQmKMg9F6roKGaLSHoCDYKkWlSafg138jejvq/mTdvmnwDQgqoQ==}
     peerDependencies:
       csstype: ^3.0.10
 
   gopd@1.0.1:
-    resolution:
-      {
-        integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==,
-      }
+    resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==}
 
   graceful-fs@4.2.11:
-    resolution:
-      {
-        integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==,
-      }
+    resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
 
   graphemer@1.4.0:
-    resolution:
-      {
-        integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==,
-      }
+    resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==}
 
   has-flag@3.0.0:
-    resolution:
-      {
-        integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==,
-      }
-    engines: { node: '>=4' }
+    resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==}
+    engines: {node: '>=4'}
 
   has-flag@4.0.0:
-    resolution:
-      {
-        integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
+    engines: {node: '>=8'}
 
   has-property-descriptors@1.0.1:
-    resolution:
-      {
-        integrity: sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==,
-      }
+    resolution: {integrity: sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==}
 
   has-proto@1.0.1:
-    resolution:
-      {
-        integrity: sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==}
+    engines: {node: '>= 0.4'}
 
   has-symbols@1.0.3:
-    resolution:
-      {
-        integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==}
+    engines: {node: '>= 0.4'}
 
   has-tostringtag@1.0.0:
-    resolution:
-      {
-        integrity: sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==}
+    engines: {node: '>= 0.4'}
 
   hash-base@3.1.0:
-    resolution:
-      {
-        integrity: sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==,
-      }
-    engines: { node: '>=4' }
+    resolution: {integrity: sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==}
+    engines: {node: '>=4'}
 
   hash.js@1.1.7:
-    resolution:
-      {
-        integrity: sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==,
-      }
+    resolution: {integrity: sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==}
 
   hasown@2.0.0:
-    resolution:
-      {
-        integrity: sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==}
+    engines: {node: '>= 0.4'}
 
   hast-util-to-jsx-runtime@2.3.0:
-    resolution:
-      {
-        integrity: sha512-H/y0+IWPdsLLS738P8tDnrQ8Z+dj12zQQ6WC11TIM21C8WFVoIxcqWXf2H3hiTVZjF1AWqoimGwrTWecWrnmRQ==,
-      }
+    resolution: {integrity: sha512-H/y0+IWPdsLLS738P8tDnrQ8Z+dj12zQQ6WC11TIM21C8WFVoIxcqWXf2H3hiTVZjF1AWqoimGwrTWecWrnmRQ==}
 
   hast-util-whitespace@3.0.0:
-    resolution:
-      {
-        integrity: sha512-88JUN06ipLwsnv+dVn+OIYOvAuvBMy/Qoi6O7mQHxdPXpjy+Cd6xRkWwux7DKO+4sYILtLBRIKgsdpS2gQc7qw==,
-      }
+    resolution: {integrity: sha512-88JUN06ipLwsnv+dVn+OIYOvAuvBMy/Qoi6O7mQHxdPXpjy+Cd6xRkWwux7DKO+4sYILtLBRIKgsdpS2gQc7qw==}
 
   he@1.2.0:
-    resolution:
-      {
-        integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==,
-      }
+    resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==}
     hasBin: true
 
   hmac-drbg@1.0.1:
-    resolution:
-      {
-        integrity: sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==,
-      }
+    resolution: {integrity: sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==}
 
   hoist-non-react-statics@3.3.2:
-    resolution:
-      {
-        integrity: sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==,
-      }
+    resolution: {integrity: sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==}
 
   html-url-attributes@3.0.0:
-    resolution:
-      {
-        integrity: sha512-/sXbVCWayk6GDVg3ctOX6nxaVj7So40FcFAnWlWGNAB1LpYKcV5Cd10APjPjW80O7zYW2MsjBV4zZ7IZO5fVow==,
-      }
+    resolution: {integrity: sha512-/sXbVCWayk6GDVg3ctOX6nxaVj7So40FcFAnWlWGNAB1LpYKcV5Cd10APjPjW80O7zYW2MsjBV4zZ7IZO5fVow==}
 
   https-browserify@1.0.0:
-    resolution:
-      {
-        integrity: sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==,
-      }
+    resolution: {integrity: sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==}
 
   ieee754@1.2.1:
-    resolution:
-      {
-        integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==,
-      }
+    resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
 
   ignore@5.3.0:
-    resolution:
-      {
-        integrity: sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==,
-      }
-    engines: { node: '>= 4' }
+    resolution: {integrity: sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==}
+    engines: {node: '>= 4'}
 
   import-fresh@3.3.0:
-    resolution:
-      {
-        integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==,
-      }
-    engines: { node: '>=6' }
+    resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==}
+    engines: {node: '>=6'}
 
   import-lazy@4.0.0:
-    resolution:
-      {
-        integrity: sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==}
+    engines: {node: '>=8'}
 
   imurmurhash@0.1.4:
-    resolution:
-      {
-        integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==,
-      }
-    engines: { node: '>=0.8.19' }
+    resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
+    engines: {node: '>=0.8.19'}
 
   inflight@1.0.6:
-    resolution:
-      {
-        integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==,
-      }
+    resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==}
+    deprecated: This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.
 
   inherits@2.0.4:
-    resolution:
-      {
-        integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==,
-      }
+    resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
 
   inline-style-parser@0.2.3:
-    resolution:
-      {
-        integrity: sha512-qlD8YNDqyTKTyuITrDOffsl6Tdhv+UC4hcdAVuQsK4IMQ99nSgd1MIA/Q+jQYoh9r3hVUXhYh7urSRmXPkW04g==,
-      }
+    resolution: {integrity: sha512-qlD8YNDqyTKTyuITrDOffsl6Tdhv+UC4hcdAVuQsK4IMQ99nSgd1MIA/Q+jQYoh9r3hVUXhYh7urSRmXPkW04g==}
 
   invariant@2.2.4:
-    resolution:
-      {
-        integrity: sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==,
-      }
+    resolution: {integrity: sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==}
 
   is-alphabetical@2.0.1:
-    resolution:
-      {
-        integrity: sha512-FWyyY60MeTNyeSRpkM2Iry0G9hpr7/9kD40mD/cGQEuilcZYS4okz8SN2Q6rLCJ8gbCt6fN+rC+6tMGS99LaxQ==,
-      }
+    resolution: {integrity: sha512-FWyyY60MeTNyeSRpkM2Iry0G9hpr7/9kD40mD/cGQEuilcZYS4okz8SN2Q6rLCJ8gbCt6fN+rC+6tMGS99LaxQ==}
 
   is-alphanumerical@2.0.1:
-    resolution:
-      {
-        integrity: sha512-hmbYhX/9MUMF5uh7tOXyK/n0ZvWpad5caBA17GsC6vyuCqaWliRG5K1qS9inmUhEMaOBIW7/whAnSwveW/LtZw==,
-      }
+    resolution: {integrity: sha512-hmbYhX/9MUMF5uh7tOXyK/n0ZvWpad5caBA17GsC6vyuCqaWliRG5K1qS9inmUhEMaOBIW7/whAnSwveW/LtZw==}
 
   is-arguments@1.1.1:
-    resolution:
-      {
-        integrity: sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==}
+    engines: {node: '>= 0.4'}
 
   is-arrayish@0.2.1:
-    resolution:
-      {
-        integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==,
-      }
+    resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==}
 
   is-binary-path@2.1.0:
-    resolution:
-      {
-        integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==}
+    engines: {node: '>=8'}
 
   is-callable@1.2.7:
-    resolution:
-      {
-        integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==}
+    engines: {node: '>= 0.4'}
 
   is-core-module@2.13.1:
-    resolution:
-      {
-        integrity: sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==,
-      }
+    resolution: {integrity: sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==}
 
   is-decimal@2.0.1:
-    resolution:
-      {
-        integrity: sha512-AAB9hiomQs5DXWcRB1rqsxGUstbRroFOPPVAomNk/3XHR5JyEZChOyTWe2oayKnsSsr/kcGqF+z6yuH6HHpN0A==,
-      }
+    resolution: {integrity: sha512-AAB9hiomQs5DXWcRB1rqsxGUstbRroFOPPVAomNk/3XHR5JyEZChOyTWe2oayKnsSsr/kcGqF+z6yuH6HHpN0A==}
 
   is-extglob@2.1.1:
-    resolution:
-      {
-        integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==,
-      }
-    engines: { node: '>=0.10.0' }
+    resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
+    engines: {node: '>=0.10.0'}
 
   is-fullwidth-code-point@3.0.0:
-    resolution:
-      {
-        integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
+    engines: {node: '>=8'}
 
   is-generator-function@1.0.10:
-    resolution:
-      {
-        integrity: sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==}
+    engines: {node: '>= 0.4'}
 
   is-glob@4.0.3:
-    resolution:
-      {
-        integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==,
-      }
-    engines: { node: '>=0.10.0' }
+    resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
+    engines: {node: '>=0.10.0'}
 
   is-hexadecimal@2.0.1:
-    resolution:
-      {
-        integrity: sha512-DgZQp241c8oO6cA1SbTEWiXeoxV42vlcJxgH+B3hi1AiqqKruZR3ZGF8In3fj4+/y/7rHvlOZLZtgJ/4ttYGZg==,
-      }
+    resolution: {integrity: sha512-DgZQp241c8oO6cA1SbTEWiXeoxV42vlcJxgH+B3hi1AiqqKruZR3ZGF8In3fj4+/y/7rHvlOZLZtgJ/4ttYGZg==}
 
   is-nan@1.3.2:
-    resolution:
-      {
-        integrity: sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==}
+    engines: {node: '>= 0.4'}
 
   is-number@7.0.0:
-    resolution:
-      {
-        integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==,
-      }
-    engines: { node: '>=0.12.0' }
+    resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
+    engines: {node: '>=0.12.0'}
 
   is-path-inside@3.0.3:
-    resolution:
-      {
-        integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==}
+    engines: {node: '>=8'}
 
   is-plain-obj@4.1.0:
-    resolution:
-      {
-        integrity: sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==,
-      }
-    engines: { node: '>=12' }
+    resolution: {integrity: sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==}
+    engines: {node: '>=12'}
 
   is-typed-array@1.1.12:
-    resolution:
-      {
-        integrity: sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==}
+    engines: {node: '>= 0.4'}
 
   isexe@2.0.0:
-    resolution:
-      {
-        integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==,
-      }
+    resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
 
   isomorphic-timers-promises@1.0.1:
-    resolution:
-      {
-        integrity: sha512-u4sej9B1LPSxTGKB/HiuzvEQnXH0ECYkSVQU39koSwmFAxhlEAFl9RdTvLv4TOTQUgBS5O3O5fwUxk6byBZ+IQ==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-u4sej9B1LPSxTGKB/HiuzvEQnXH0ECYkSVQU39koSwmFAxhlEAFl9RdTvLv4TOTQUgBS5O3O5fwUxk6byBZ+IQ==}
+    engines: {node: '>=10'}
 
   jackspeak@2.3.6:
-    resolution:
-      {
-        integrity: sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==,
-      }
-    engines: { node: '>=14' }
+    resolution: {integrity: sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==}
+    engines: {node: '>=14'}
 
   jiti@1.21.0:
-    resolution:
-      {
-        integrity: sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==,
-      }
+    resolution: {integrity: sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==}
     hasBin: true
 
   jju@1.4.0:
-    resolution:
-      {
-        integrity: sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==,
-      }
+    resolution: {integrity: sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==}
 
   js-sha256@0.10.1:
-    resolution:
-      {
-        integrity: sha512-5obBtsz9301ULlsgggLg542s/jqtddfOpV5KJc4hajc9JV8GeY2gZHSVpYBn4nWqAUTJ9v+xwtbJ1mIBgIH5Vw==,
-      }
+    resolution: {integrity: sha512-5obBtsz9301ULlsgggLg542s/jqtddfOpV5KJc4hajc9JV8GeY2gZHSVpYBn4nWqAUTJ9v+xwtbJ1mIBgIH5Vw==}
 
   js-sha256@0.9.0:
-    resolution:
-      {
-        integrity: sha512-sga3MHh9sgQN2+pJ9VYZ+1LPwXOxuBJBA5nrR5/ofPfuiJBE2hnjsaN8se8JznOmGLN2p49Pe5U/ttafcs/apA==,
-      }
+    resolution: {integrity: sha512-sga3MHh9sgQN2+pJ9VYZ+1LPwXOxuBJBA5nrR5/ofPfuiJBE2hnjsaN8se8JznOmGLN2p49Pe5U/ttafcs/apA==}
 
   js-sha3@0.8.0:
-    resolution:
-      {
-        integrity: sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q==,
-      }
+    resolution: {integrity: sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q==}
 
   js-sha512@0.8.0:
-    resolution:
-      {
-        integrity: sha512-PWsmefG6Jkodqt+ePTvBZCSMFgN7Clckjd0O7su3I0+BW2QWUTJNzjktHsztGLhncP2h8mcF9V9Y2Ha59pAViQ==,
-      }
+    resolution: {integrity: sha512-PWsmefG6Jkodqt+ePTvBZCSMFgN7Clckjd0O7su3I0+BW2QWUTJNzjktHsztGLhncP2h8mcF9V9Y2Ha59pAViQ==}
 
   js-tokens@4.0.0:
-    resolution:
-      {
-        integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==,
-      }
+    resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
 
   js-yaml@4.1.0:
-    resolution:
-      {
-        integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==,
-      }
+    resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==}
     hasBin: true
 
   jsesc@2.5.2:
-    resolution:
-      {
-        integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==,
-      }
-    engines: { node: '>=4' }
+    resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==}
+    engines: {node: '>=4'}
     hasBin: true
 
   json-bigint@1.0.0:
-    resolution:
-      {
-        integrity: sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==,
-      }
+    resolution: {integrity: sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==}
 
   json-buffer@3.0.1:
-    resolution:
-      {
-        integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==,
-      }
+    resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==}
 
   json-parse-even-better-errors@2.3.1:
-    resolution:
-      {
-        integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==,
-      }
+    resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==}
 
   json-schema-traverse@0.4.1:
-    resolution:
-      {
-        integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==,
-      }
+    resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
 
   json-stable-stringify-without-jsonify@1.0.1:
-    resolution:
-      {
-        integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==,
-      }
+    resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
 
   json5@2.2.3:
-    resolution:
-      {
-        integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==,
-      }
-    engines: { node: '>=6' }
+    resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==}
+    engines: {node: '>=6'}
     hasBin: true
 
   jsonfile@4.0.0:
-    resolution:
-      {
-        integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==,
-      }
+    resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==}
 
   jsonfile@6.1.0:
-    resolution:
-      {
-        integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==,
-      }
+    resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==}
 
   keyv@4.5.4:
-    resolution:
-      {
-        integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==,
-      }
+    resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==}
 
   kolorist@1.8.0:
-    resolution:
-      {
-        integrity: sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==,
-      }
+    resolution: {integrity: sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==}
 
   levn@0.4.1:
-    resolution:
-      {
-        integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==,
-      }
-    engines: { node: '>= 0.8.0' }
+    resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
+    engines: {node: '>= 0.8.0'}
 
   libsodium-sumo@0.7.13:
-    resolution:
-      {
-        integrity: sha512-zTGdLu4b9zSNLfovImpBCbdAA4xkpkZbMnSQjP8HShyOutnGjRHmSOKlsylh1okao6QhLiz7nG98EGn+04cZjQ==,
-      }
+    resolution: {integrity: sha512-zTGdLu4b9zSNLfovImpBCbdAA4xkpkZbMnSQjP8HShyOutnGjRHmSOKlsylh1okao6QhLiz7nG98EGn+04cZjQ==}
 
   libsodium-wrappers-sumo@0.7.13:
-    resolution:
-      {
-        integrity: sha512-lz4YdplzDRh6AhnLGF2Dj2IUj94xRN6Bh8T0HLNwzYGwPehQJX6c7iYVrFUPZ3QqxE0bqC+K0IIqqZJYWumwSQ==,
-      }
+    resolution: {integrity: sha512-lz4YdplzDRh6AhnLGF2Dj2IUj94xRN6Bh8T0HLNwzYGwPehQJX6c7iYVrFUPZ3QqxE0bqC+K0IIqqZJYWumwSQ==}
 
   lilconfig@2.1.0:
-    resolution:
-      {
-        integrity: sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==}
+    engines: {node: '>=10'}
 
   lilconfig@3.1.1:
-    resolution:
-      {
-        integrity: sha512-O18pf7nyvHTckunPWCV1XUNXU1piu01y2b7ATJ0ppkUkk8ocqVWBrYjJBCwHDjD/ZWcfyrA0P4gKhzWGi5EINQ==,
-      }
-    engines: { node: '>=14' }
+    resolution: {integrity: sha512-O18pf7nyvHTckunPWCV1XUNXU1piu01y2b7ATJ0ppkUkk8ocqVWBrYjJBCwHDjD/ZWcfyrA0P4gKhzWGi5EINQ==}
+    engines: {node: '>=14'}
 
   lines-and-columns@1.2.4:
-    resolution:
-      {
-        integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==,
-      }
+    resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
 
   little-state-machine@4.8.0:
-    resolution:
-      {
-        integrity: sha512-xfi5+iDxTLhu0hbnNubUs+qoQQqxhtEZeObP5ELjUlHnl74bbasY7mOonsGQrAouyrbag3ebNLSse5xX1T7buQ==,
-      }
+    resolution: {integrity: sha512-xfi5+iDxTLhu0hbnNubUs+qoQQqxhtEZeObP5ELjUlHnl74bbasY7mOonsGQrAouyrbag3ebNLSse5xX1T7buQ==}
     peerDependencies:
       react: ^16.8.0 || ^17 || ^18
 
   locate-path@6.0.0:
-    resolution:
-      {
-        integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==}
+    engines: {node: '>=10'}
 
   lodash.get@4.4.2:
-    resolution:
-      {
-        integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==,
-      }
+    resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
 
   lodash.isequal@4.5.0:
-    resolution:
-      {
-        integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==,
-      }
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
 
   lodash.merge@4.6.2:
-    resolution:
-      {
-        integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==,
-      }
+    resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
 
   lodash@4.17.21:
-    resolution:
-      {
-        integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==,
-      }
+    resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==}
 
   longest-streak@3.1.0:
-    resolution:
-      {
-        integrity: sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g==,
-      }
+    resolution: {integrity: sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g==}
 
   loose-envify@1.4.0:
-    resolution:
-      {
-        integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==,
-      }
+    resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}
     hasBin: true
 
   loupe@2.3.7:
-    resolution:
-      {
-        integrity: sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==,
-      }
+    resolution: {integrity: sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==}
 
   lru-cache@10.2.0:
-    resolution:
-      {
-        integrity: sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==,
-      }
-    engines: { node: 14 || >=16.14 }
+    resolution: {integrity: sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==}
+    engines: {node: 14 || >=16.14}
 
   lru-cache@5.1.1:
-    resolution:
-      {
-        integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==,
-      }
+    resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
 
   lru-cache@6.0.0:
-    resolution:
-      {
-        integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==}
+    engines: {node: '>=10'}
 
   lucide-react@0.397.0:
-    resolution:
-      {
-        integrity: sha512-rUcbRY5jFP/4za/OJvaRUUmdPsPb940Tw9zE1ehrRZmr9JnkDcW8OV3POR3XfEAAMDkssiTc5IWBFv8Y//pkDQ==,
-      }
+    resolution: {integrity: sha512-rUcbRY5jFP/4za/OJvaRUUmdPsPb940Tw9zE1ehrRZmr9JnkDcW8OV3POR3XfEAAMDkssiTc5IWBFv8Y//pkDQ==}
     peerDependencies:
       react: ^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0
 
-  magic-string@0.30.5:
-    resolution:
-      {
-        integrity: sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==,
-      }
-    engines: { node: '>=12' }
-
   magic-string@0.30.9:
-    resolution:
-      {
-        integrity: sha512-S1+hd+dIrC8EZqKyT9DstTH/0Z+f76kmmvZnkfQVmOpDEF9iVgdYif3Q/pIWHmCoo59bQVGW0kVL3e2nl+9+Sw==,
-      }
-    engines: { node: '>=12' }
+    resolution: {integrity: sha512-S1+hd+dIrC8EZqKyT9DstTH/0Z+f76kmmvZnkfQVmOpDEF9iVgdYif3Q/pIWHmCoo59bQVGW0kVL3e2nl+9+Sw==}
+    engines: {node: '>=12'}
 
   md5.js@1.3.5:
-    resolution:
-      {
-        integrity: sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==,
-      }
+    resolution: {integrity: sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==}
 
   mdast-util-from-markdown@2.0.0:
-    resolution:
-      {
-        integrity: sha512-n7MTOr/z+8NAX/wmhhDji8O3bRvPTV/U0oTCaZJkjhPSKTPhS3xufVhKGF8s1pJ7Ox4QgoIU7KHseh09S+9rTA==,
-      }
+    resolution: {integrity: sha512-n7MTOr/z+8NAX/wmhhDji8O3bRvPTV/U0oTCaZJkjhPSKTPhS3xufVhKGF8s1pJ7Ox4QgoIU7KHseh09S+9rTA==}
 
   mdast-util-mdx-expression@2.0.0:
-    resolution:
-      {
-        integrity: sha512-fGCu8eWdKUKNu5mohVGkhBXCXGnOTLuFqOvGMvdikr+J1w7lDJgxThOKpwRWzzbyXAU2hhSwsmssOY4yTokluw==,
-      }
+    resolution: {integrity: sha512-fGCu8eWdKUKNu5mohVGkhBXCXGnOTLuFqOvGMvdikr+J1w7lDJgxThOKpwRWzzbyXAU2hhSwsmssOY4yTokluw==}
 
   mdast-util-mdx-jsx@3.1.2:
-    resolution:
-      {
-        integrity: sha512-eKMQDeywY2wlHc97k5eD8VC+9ASMjN8ItEZQNGwJ6E0XWKiW/Z0V5/H8pvoXUf+y+Mj0VIgeRRbujBmFn4FTyA==,
-      }
+    resolution: {integrity: sha512-eKMQDeywY2wlHc97k5eD8VC+9ASMjN8ItEZQNGwJ6E0XWKiW/Z0V5/H8pvoXUf+y+Mj0VIgeRRbujBmFn4FTyA==}
 
   mdast-util-mdxjs-esm@2.0.1:
-    resolution:
-      {
-        integrity: sha512-EcmOpxsZ96CvlP03NghtH1EsLtr0n9Tm4lPUJUBccV9RwUOneqSycg19n5HGzCf+10LozMRSObtVr3ee1WoHtg==,
-      }
+    resolution: {integrity: sha512-EcmOpxsZ96CvlP03NghtH1EsLtr0n9Tm4lPUJUBccV9RwUOneqSycg19n5HGzCf+10LozMRSObtVr3ee1WoHtg==}
 
   mdast-util-phrasing@4.1.0:
-    resolution:
-      {
-        integrity: sha512-TqICwyvJJpBwvGAMZjj4J2n0X8QWp21b9l0o7eXyVJ25YNWYbJDVIyD1bZXE6WtV6RmKJVYmQAKWa0zWOABz2w==,
-      }
+    resolution: {integrity: sha512-TqICwyvJJpBwvGAMZjj4J2n0X8QWp21b9l0o7eXyVJ25YNWYbJDVIyD1bZXE6WtV6RmKJVYmQAKWa0zWOABz2w==}
 
   mdast-util-to-hast@13.1.0:
-    resolution:
-      {
-        integrity: sha512-/e2l/6+OdGp/FB+ctrJ9Avz71AN/GRH3oi/3KAx/kMnoUsD6q0woXlDT8lLEeViVKE7oZxE7RXzvO3T8kF2/sA==,
-      }
+    resolution: {integrity: sha512-/e2l/6+OdGp/FB+ctrJ9Avz71AN/GRH3oi/3KAx/kMnoUsD6q0woXlDT8lLEeViVKE7oZxE7RXzvO3T8kF2/sA==}
 
   mdast-util-to-markdown@2.1.0:
-    resolution:
-      {
-        integrity: sha512-SR2VnIEdVNCJbP6y7kVTJgPLifdr8WEU440fQec7qHoHOUz/oJ2jmNRqdDQ3rbiStOXb2mCDGTuwsK5OPUgYlQ==,
-      }
+    resolution: {integrity: sha512-SR2VnIEdVNCJbP6y7kVTJgPLifdr8WEU440fQec7qHoHOUz/oJ2jmNRqdDQ3rbiStOXb2mCDGTuwsK5OPUgYlQ==}
 
   mdast-util-to-string@4.0.0:
-    resolution:
-      {
-        integrity: sha512-0H44vDimn51F0YwvxSJSm0eCDOJTRlmN0R1yBh4HLj9wiV1Dn0QoXGbvFAWj2hSItVTlCmBF1hqKlIyUBVFLPg==,
-      }
+    resolution: {integrity: sha512-0H44vDimn51F0YwvxSJSm0eCDOJTRlmN0R1yBh4HLj9wiV1Dn0QoXGbvFAWj2hSItVTlCmBF1hqKlIyUBVFLPg==}
 
   medium-zoom@1.1.0:
-    resolution:
-      {
-        integrity: sha512-ewyDsp7k4InCUp3jRmwHBRFGyjBimKps/AJLjRSox+2q/2H4p/PNpQf+pwONWlJiOudkBXtbdmVbFjqyybfTmQ==,
-      }
+    resolution: {integrity: sha512-ewyDsp7k4InCUp3jRmwHBRFGyjBimKps/AJLjRSox+2q/2H4p/PNpQf+pwONWlJiOudkBXtbdmVbFjqyybfTmQ==}
 
   merge2@1.4.1:
-    resolution:
-      {
-        integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==,
-      }
-    engines: { node: '>= 8' }
+    resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
+    engines: {node: '>= 8'}
 
   micromark-core-commonmark@2.0.0:
-    resolution:
-      {
-        integrity: sha512-jThOz/pVmAYUtkroV3D5c1osFXAMv9e0ypGDOIZuCeAe91/sD6BoE2Sjzt30yuXtwOYUmySOhMas/PVyh02itA==,
-      }
+    resolution: {integrity: sha512-jThOz/pVmAYUtkroV3D5c1osFXAMv9e0ypGDOIZuCeAe91/sD6BoE2Sjzt30yuXtwOYUmySOhMas/PVyh02itA==}
 
   micromark-factory-destination@2.0.0:
-    resolution:
-      {
-        integrity: sha512-j9DGrQLm/Uhl2tCzcbLhy5kXsgkHUrjJHg4fFAeoMRwJmJerT9aw4FEhIbZStWN8A3qMwOp1uzHr4UL8AInxtA==,
-      }
+    resolution: {integrity: sha512-j9DGrQLm/Uhl2tCzcbLhy5kXsgkHUrjJHg4fFAeoMRwJmJerT9aw4FEhIbZStWN8A3qMwOp1uzHr4UL8AInxtA==}
 
   micromark-factory-label@2.0.0:
-    resolution:
-      {
-        integrity: sha512-RR3i96ohZGde//4WSe/dJsxOX6vxIg9TimLAS3i4EhBAFx8Sm5SmqVfR8E87DPSR31nEAjZfbt91OMZWcNgdZw==,
-      }
+    resolution: {integrity: sha512-RR3i96ohZGde//4WSe/dJsxOX6vxIg9TimLAS3i4EhBAFx8Sm5SmqVfR8E87DPSR31nEAjZfbt91OMZWcNgdZw==}
 
   micromark-factory-space@2.0.0:
-    resolution:
-      {
-        integrity: sha512-TKr+LIDX2pkBJXFLzpyPyljzYK3MtmllMUMODTQJIUfDGncESaqB90db9IAUcz4AZAJFdd8U9zOp9ty1458rxg==,
-      }
+    resolution: {integrity: sha512-TKr+LIDX2pkBJXFLzpyPyljzYK3MtmllMUMODTQJIUfDGncESaqB90db9IAUcz4AZAJFdd8U9zOp9ty1458rxg==}
 
   micromark-factory-title@2.0.0:
-    resolution:
-      {
-        integrity: sha512-jY8CSxmpWLOxS+t8W+FG3Xigc0RDQA9bKMY/EwILvsesiRniiVMejYTE4wumNc2f4UbAa4WsHqe3J1QS1sli+A==,
-      }
+    resolution: {integrity: sha512-jY8CSxmpWLOxS+t8W+FG3Xigc0RDQA9bKMY/EwILvsesiRniiVMejYTE4wumNc2f4UbAa4WsHqe3J1QS1sli+A==}
 
   micromark-factory-whitespace@2.0.0:
-    resolution:
-      {
-        integrity: sha512-28kbwaBjc5yAI1XadbdPYHX/eDnqaUFVikLwrO7FDnKG7lpgxnvk/XGRhX/PN0mOZ+dBSZ+LgunHS+6tYQAzhA==,
-      }
+    resolution: {integrity: sha512-28kbwaBjc5yAI1XadbdPYHX/eDnqaUFVikLwrO7FDnKG7lpgxnvk/XGRhX/PN0mOZ+dBSZ+LgunHS+6tYQAzhA==}
 
   micromark-util-character@2.1.0:
-    resolution:
-      {
-        integrity: sha512-KvOVV+X1yLBfs9dCBSopq/+G1PcgT3lAK07mC4BzXi5E7ahzMAF8oIupDDJ6mievI6F+lAATkbQQlQixJfT3aQ==,
-      }
+    resolution: {integrity: sha512-KvOVV+X1yLBfs9dCBSopq/+G1PcgT3lAK07mC4BzXi5E7ahzMAF8oIupDDJ6mievI6F+lAATkbQQlQixJfT3aQ==}
 
   micromark-util-chunked@2.0.0:
-    resolution:
-      {
-        integrity: sha512-anK8SWmNphkXdaKgz5hJvGa7l00qmcaUQoMYsBwDlSKFKjc6gjGXPDw3FNL3Nbwq5L8gE+RCbGqTw49FK5Qyvg==,
-      }
+    resolution: {integrity: sha512-anK8SWmNphkXdaKgz5hJvGa7l00qmcaUQoMYsBwDlSKFKjc6gjGXPDw3FNL3Nbwq5L8gE+RCbGqTw49FK5Qyvg==}
 
   micromark-util-classify-character@2.0.0:
-    resolution:
-      {
-        integrity: sha512-S0ze2R9GH+fu41FA7pbSqNWObo/kzwf8rN/+IGlW/4tC6oACOs8B++bh+i9bVyNnwCcuksbFwsBme5OCKXCwIw==,
-      }
+    resolution: {integrity: sha512-S0ze2R9GH+fu41FA7pbSqNWObo/kzwf8rN/+IGlW/4tC6oACOs8B++bh+i9bVyNnwCcuksbFwsBme5OCKXCwIw==}
 
   micromark-util-combine-extensions@2.0.0:
-    resolution:
-      {
-        integrity: sha512-vZZio48k7ON0fVS3CUgFatWHoKbbLTK/rT7pzpJ4Bjp5JjkZeasRfrS9wsBdDJK2cJLHMckXZdzPSSr1B8a4oQ==,
-      }
+    resolution: {integrity: sha512-vZZio48k7ON0fVS3CUgFatWHoKbbLTK/rT7pzpJ4Bjp5JjkZeasRfrS9wsBdDJK2cJLHMckXZdzPSSr1B8a4oQ==}
 
   micromark-util-decode-numeric-character-reference@2.0.1:
-    resolution:
-      {
-        integrity: sha512-bmkNc7z8Wn6kgjZmVHOX3SowGmVdhYS7yBpMnuMnPzDq/6xwVA604DuOXMZTO1lvq01g+Adfa0pE2UKGlxL1XQ==,
-      }
+    resolution: {integrity: sha512-bmkNc7z8Wn6kgjZmVHOX3SowGmVdhYS7yBpMnuMnPzDq/6xwVA604DuOXMZTO1lvq01g+Adfa0pE2UKGlxL1XQ==}
 
   micromark-util-decode-string@2.0.0:
-    resolution:
-      {
-        integrity: sha512-r4Sc6leeUTn3P6gk20aFMj2ntPwn6qpDZqWvYmAG6NgvFTIlj4WtrAudLi65qYoaGdXYViXYw2pkmn7QnIFasA==,
-      }
+    resolution: {integrity: sha512-r4Sc6leeUTn3P6gk20aFMj2ntPwn6qpDZqWvYmAG6NgvFTIlj4WtrAudLi65qYoaGdXYViXYw2pkmn7QnIFasA==}
 
   micromark-util-encode@2.0.0:
-    resolution:
-      {
-        integrity: sha512-pS+ROfCXAGLWCOc8egcBvT0kf27GoWMqtdarNfDcjb6YLuV5cM3ioG45Ys2qOVqeqSbjaKg72vU+Wby3eddPsA==,
-      }
+    resolution: {integrity: sha512-pS+ROfCXAGLWCOc8egcBvT0kf27GoWMqtdarNfDcjb6YLuV5cM3ioG45Ys2qOVqeqSbjaKg72vU+Wby3eddPsA==}
 
   micromark-util-html-tag-name@2.0.0:
-    resolution:
-      {
-        integrity: sha512-xNn4Pqkj2puRhKdKTm8t1YHC/BAjx6CEwRFXntTaRf/x16aqka6ouVoutm+QdkISTlT7e2zU7U4ZdlDLJd2Mcw==,
-      }
+    resolution: {integrity: sha512-xNn4Pqkj2puRhKdKTm8t1YHC/BAjx6CEwRFXntTaRf/x16aqka6ouVoutm+QdkISTlT7e2zU7U4ZdlDLJd2Mcw==}
 
   micromark-util-normalize-identifier@2.0.0:
-    resolution:
-      {
-        integrity: sha512-2xhYT0sfo85FMrUPtHcPo2rrp1lwbDEEzpx7jiH2xXJLqBuy4H0GgXk5ToU8IEwoROtXuL8ND0ttVa4rNqYK3w==,
-      }
+    resolution: {integrity: sha512-2xhYT0sfo85FMrUPtHcPo2rrp1lwbDEEzpx7jiH2xXJLqBuy4H0GgXk5ToU8IEwoROtXuL8ND0ttVa4rNqYK3w==}
 
   micromark-util-resolve-all@2.0.0:
-    resolution:
-      {
-        integrity: sha512-6KU6qO7DZ7GJkaCgwBNtplXCvGkJToU86ybBAUdavvgsCiG8lSSvYxr9MhwmQ+udpzywHsl4RpGJsYWG1pDOcA==,
-      }
+    resolution: {integrity: sha512-6KU6qO7DZ7GJkaCgwBNtplXCvGkJToU86ybBAUdavvgsCiG8lSSvYxr9MhwmQ+udpzywHsl4RpGJsYWG1pDOcA==}
 
   micromark-util-sanitize-uri@2.0.0:
-    resolution:
-      {
-        integrity: sha512-WhYv5UEcZrbAtlsnPuChHUAsu/iBPOVaEVsntLBIdpibO0ddy8OzavZz3iL2xVvBZOpolujSliP65Kq0/7KIYw==,
-      }
+    resolution: {integrity: sha512-WhYv5UEcZrbAtlsnPuChHUAsu/iBPOVaEVsntLBIdpibO0ddy8OzavZz3iL2xVvBZOpolujSliP65Kq0/7KIYw==}
 
   micromark-util-subtokenize@2.0.0:
-    resolution:
-      {
-        integrity: sha512-vc93L1t+gpR3p8jxeVdaYlbV2jTYteDje19rNSS/H5dlhxUYll5Fy6vJ2cDwP8RnsXi818yGty1ayP55y3W6fg==,
-      }
+    resolution: {integrity: sha512-vc93L1t+gpR3p8jxeVdaYlbV2jTYteDje19rNSS/H5dlhxUYll5Fy6vJ2cDwP8RnsXi818yGty1ayP55y3W6fg==}
 
   micromark-util-symbol@2.0.0:
-    resolution:
-      {
-        integrity: sha512-8JZt9ElZ5kyTnO94muPxIGS8oyElRJaiJO8EzV6ZSyGQ1Is8xwl4Q45qU5UOg+bGH4AikWziz0iN4sFLWs8PGw==,
-      }
+    resolution: {integrity: sha512-8JZt9ElZ5kyTnO94muPxIGS8oyElRJaiJO8EzV6ZSyGQ1Is8xwl4Q45qU5UOg+bGH4AikWziz0iN4sFLWs8PGw==}
 
   micromark-util-types@2.0.0:
-    resolution:
-      {
-        integrity: sha512-oNh6S2WMHWRZrmutsRmDDfkzKtxF+bc2VxLC9dvtrDIRFln627VsFP6fLMgTryGDljgLPjkrzQSDcPrjPyDJ5w==,
-      }
+    resolution: {integrity: sha512-oNh6S2WMHWRZrmutsRmDDfkzKtxF+bc2VxLC9dvtrDIRFln627VsFP6fLMgTryGDljgLPjkrzQSDcPrjPyDJ5w==}
 
   micromark@4.0.0:
-    resolution:
-      {
-        integrity: sha512-o/sd0nMof8kYff+TqcDx3VSrgBTcZpSvYcAHIfHhv5VAuNmisCxjhx6YmxS8PFEpb9z5WKWKPdzf0jM23ro3RQ==,
-      }
+    resolution: {integrity: sha512-o/sd0nMof8kYff+TqcDx3VSrgBTcZpSvYcAHIfHhv5VAuNmisCxjhx6YmxS8PFEpb9z5WKWKPdzf0jM23ro3RQ==}
 
   micromatch@4.0.5:
-    resolution:
-      {
-        integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==,
-      }
-    engines: { node: '>=8.6' }
+    resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==}
+    engines: {node: '>=8.6'}
 
   miller-rabin@4.0.1:
-    resolution:
-      {
-        integrity: sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==,
-      }
+    resolution: {integrity: sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==}
     hasBin: true
 
   minimalistic-assert@1.0.1:
-    resolution:
-      {
-        integrity: sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==,
-      }
+    resolution: {integrity: sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==}
 
   minimalistic-crypto-utils@1.0.1:
-    resolution:
-      {
-        integrity: sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==,
-      }
+    resolution: {integrity: sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==}
 
   minimatch@3.0.8:
-    resolution:
-      {
-        integrity: sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==,
-      }
+    resolution: {integrity: sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==}
 
   minimatch@3.1.2:
-    resolution:
-      {
-        integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==,
-      }
+    resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
 
   minimatch@9.0.3:
-    resolution:
-      {
-        integrity: sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==,
-      }
-    engines: { node: '>=16 || 14 >=14.17' }
+    resolution: {integrity: sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==}
+    engines: {node: '>=16 || 14 >=14.17'}
 
   minipass@7.0.4:
-    resolution:
-      {
-        integrity: sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==,
-      }
-    engines: { node: '>=16 || 14 >=14.17' }
+    resolution: {integrity: sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==}
+    engines: {node: '>=16 || 14 >=14.17'}
 
   ms@2.1.2:
-    resolution:
-      {
-        integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==,
-      }
+    resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
 
   muggle-string@0.3.1:
-    resolution:
-      {
-        integrity: sha512-ckmWDJjphvd/FvZawgygcUeQCxzvohjFO5RxTjj4eq8kw359gFF3E1brjfI+viLMxss5JrHTDRHZvu2/tuy0Qg==,
-      }
+    resolution: {integrity: sha512-ckmWDJjphvd/FvZawgygcUeQCxzvohjFO5RxTjj4eq8kw359gFF3E1brjfI+viLMxss5JrHTDRHZvu2/tuy0Qg==}
 
   mz@2.7.0:
-    resolution:
-      {
-        integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==,
-      }
+    resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==}
 
   nanoassert@2.0.0:
-    resolution:
-      {
-        integrity: sha512-7vO7n28+aYO4J+8w96AzhmU8G+Y/xpPDJz/se19ICsqj/momRbb9mh9ZUtkoJ5X3nTnPdhEJyc0qnM6yAsHBaA==,
-      }
+    resolution: {integrity: sha512-7vO7n28+aYO4J+8w96AzhmU8G+Y/xpPDJz/se19ICsqj/momRbb9mh9ZUtkoJ5X3nTnPdhEJyc0qnM6yAsHBaA==}
 
   nanoid@3.3.7:
-    resolution:
-      {
-        integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==,
-      }
-    engines: { node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1 }
+    resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==}
+    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
 
   natural-compare@1.4.0:
-    resolution:
-      {
-        integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==,
-      }
+    resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
 
   node-addon-api@3.2.1:
-    resolution:
-      {
-        integrity: sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==,
-      }
+    resolution: {integrity: sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==}
 
   node-gyp-build@4.7.1:
-    resolution:
-      {
-        integrity: sha512-wTSrZ+8lsRRa3I3H8Xr65dLWSgCvY2l4AOnaeKdPA9TB/WYMPaTcrzf3rXvFoVvjKNVnu0CcWSx54qq9GKRUYg==,
-      }
+    resolution: {integrity: sha512-wTSrZ+8lsRRa3I3H8Xr65dLWSgCvY2l4AOnaeKdPA9TB/WYMPaTcrzf3rXvFoVvjKNVnu0CcWSx54qq9GKRUYg==}
     hasBin: true
 
   node-releases@2.0.14:
-    resolution:
-      {
-        integrity: sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==,
-      }
+    resolution: {integrity: sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==}
 
   node-rsa@1.1.1:
-    resolution:
-      {
-        integrity: sha512-Jd4cvbJMryN21r5HgxQOpMEqv+ooke/korixNNK3mGqfGJmy0M77WDDzo/05969+OkMy3XW1UuZsSmW9KQm7Fw==,
-      }
+    resolution: {integrity: sha512-Jd4cvbJMryN21r5HgxQOpMEqv+ooke/korixNNK3mGqfGJmy0M77WDDzo/05969+OkMy3XW1UuZsSmW9KQm7Fw==}
 
   node-stdlib-browser@1.2.0:
-    resolution:
-      {
-        integrity: sha512-VSjFxUhRhkyed8AtLwSCkMrJRfQ3e2lGtG3sP6FEgaLKBBbxM/dLfjRe1+iLhjvyLFW3tBQ8+c0pcOtXGbAZJg==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-VSjFxUhRhkyed8AtLwSCkMrJRfQ3e2lGtG3sP6FEgaLKBBbxM/dLfjRe1+iLhjvyLFW3tBQ8+c0pcOtXGbAZJg==}
+    engines: {node: '>=10'}
 
   normalize-path@3.0.0:
-    resolution:
-      {
-        integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==,
-      }
-    engines: { node: '>=0.10.0' }
+    resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
+    engines: {node: '>=0.10.0'}
 
   normalize-range@0.1.2:
-    resolution:
-      {
-        integrity: sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==,
-      }
-    engines: { node: '>=0.10.0' }
+    resolution: {integrity: sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==}
+    engines: {node: '>=0.10.0'}
 
   object-assign@4.1.1:
-    resolution:
-      {
-        integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==,
-      }
-    engines: { node: '>=0.10.0' }
+    resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
+    engines: {node: '>=0.10.0'}
 
   object-hash@3.0.0:
-    resolution:
-      {
-        integrity: sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==,
-      }
-    engines: { node: '>= 6' }
+    resolution: {integrity: sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==}
+    engines: {node: '>= 6'}
 
   object-inspect@1.13.1:
-    resolution:
-      {
-        integrity: sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==,
-      }
+    resolution: {integrity: sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==}
 
   object-is@1.1.5:
-    resolution:
-      {
-        integrity: sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==}
+    engines: {node: '>= 0.4'}
 
   object-keys@1.1.1:
-    resolution:
-      {
-        integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==}
+    engines: {node: '>= 0.4'}
 
   object.assign@4.1.5:
-    resolution:
-      {
-        integrity: sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==}
+    engines: {node: '>= 0.4'}
 
   once@1.4.0:
-    resolution:
-      {
-        integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==,
-      }
+    resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
 
   optionator@0.9.3:
-    resolution:
-      {
-        integrity: sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==,
-      }
-    engines: { node: '>= 0.8.0' }
+    resolution: {integrity: sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==}
+    engines: {node: '>= 0.8.0'}
 
   os-browserify@0.3.0:
-    resolution:
-      {
-        integrity: sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==,
-      }
+    resolution: {integrity: sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==}
 
   p-limit@3.1.0:
-    resolution:
-      {
-        integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
+    engines: {node: '>=10'}
 
   p-locate@5.0.0:
-    resolution:
-      {
-        integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}
+    engines: {node: '>=10'}
 
   pako@1.0.11:
-    resolution:
-      {
-        integrity: sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==,
-      }
+    resolution: {integrity: sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==}
 
   pako@2.1.0:
-    resolution:
-      {
-        integrity: sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug==,
-      }
+    resolution: {integrity: sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug==}
 
   parent-module@1.0.1:
-    resolution:
-      {
-        integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==,
-      }
-    engines: { node: '>=6' }
+    resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
+    engines: {node: '>=6'}
 
   parse-asn1@5.1.6:
-    resolution:
-      {
-        integrity: sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==,
-      }
+    resolution: {integrity: sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==}
 
   parse-entities@4.0.1:
-    resolution:
-      {
-        integrity: sha512-SWzvYcSJh4d/SGLIOQfZ/CoNv6BTlI6YEQ7Nj82oDVnRpwe/Z/F1EMx42x3JAOwGBlCjeCH0BRJQbQ/opHL17w==,
-      }
+    resolution: {integrity: sha512-SWzvYcSJh4d/SGLIOQfZ/CoNv6BTlI6YEQ7Nj82oDVnRpwe/Z/F1EMx42x3JAOwGBlCjeCH0BRJQbQ/opHL17w==}
 
   parse-json@5.2.0:
-    resolution:
-      {
-        integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}
+    engines: {node: '>=8'}
 
   path-browserify@1.0.1:
-    resolution:
-      {
-        integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==,
-      }
+    resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==}
 
   path-exists@4.0.0:
-    resolution:
-      {
-        integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
+    engines: {node: '>=8'}
 
   path-is-absolute@1.0.1:
-    resolution:
-      {
-        integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==,
-      }
-    engines: { node: '>=0.10.0' }
+    resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==}
+    engines: {node: '>=0.10.0'}
 
   path-key@3.1.1:
-    resolution:
-      {
-        integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
+    engines: {node: '>=8'}
 
   path-parse@1.0.7:
-    resolution:
-      {
-        integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==,
-      }
+    resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
 
   path-scurry@1.10.2:
-    resolution:
-      {
-        integrity: sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==,
-      }
-    engines: { node: '>=16 || 14 >=14.17' }
+    resolution: {integrity: sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==}
+    engines: {node: '>=16 || 14 >=14.17'}
 
   path-type@4.0.0:
-    resolution:
-      {
-        integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
+    engines: {node: '>=8'}
 
   path-type@5.0.0:
-    resolution:
-      {
-        integrity: sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==,
-      }
-    engines: { node: '>=12' }
+    resolution: {integrity: sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==}
+    engines: {node: '>=12'}
 
   pathval@1.1.1:
-    resolution:
-      {
-        integrity: sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==,
-      }
+    resolution: {integrity: sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==}
 
   pbkdf2@3.1.2:
-    resolution:
-      {
-        integrity: sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==,
-      }
-    engines: { node: '>=0.12' }
+    resolution: {integrity: sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==}
+    engines: {node: '>=0.12'}
 
   picocolors@1.0.0:
-    resolution:
-      {
-        integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==,
-      }
+    resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==}
+
+  picocolors@1.0.1:
+    resolution: {integrity: sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==}
 
   picomatch@2.3.1:
-    resolution:
-      {
-        integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==,
-      }
-    engines: { node: '>=8.6' }
+    resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
+    engines: {node: '>=8.6'}
 
   pify@2.3.0:
-    resolution:
-      {
-        integrity: sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==,
-      }
-    engines: { node: '>=0.10.0' }
+    resolution: {integrity: sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==}
+    engines: {node: '>=0.10.0'}
 
   pirates@4.0.6:
-    resolution:
-      {
-        integrity: sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==,
-      }
-    engines: { node: '>= 6' }
+    resolution: {integrity: sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==}
+    engines: {node: '>= 6'}
 
   pkg-dir@5.0.0:
-    resolution:
-      {
-        integrity: sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==}
+    engines: {node: '>=10'}
 
   postcss-cli@11.0.0:
-    resolution:
-      {
-        integrity: sha512-xMITAI7M0u1yolVcXJ9XTZiO9aO49mcoKQy6pCDFdMh9kGqhzLVpWxeD/32M/QBmkhcGypZFFOLNLmIW4Pg4RA==,
-      }
-    engines: { node: '>=18' }
+    resolution: {integrity: sha512-xMITAI7M0u1yolVcXJ9XTZiO9aO49mcoKQy6pCDFdMh9kGqhzLVpWxeD/32M/QBmkhcGypZFFOLNLmIW4Pg4RA==}
+    engines: {node: '>=18'}
     hasBin: true
     peerDependencies:
       postcss: ^8.0.0
 
   postcss-import@15.1.0:
-    resolution:
-      {
-        integrity: sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==,
-      }
-    engines: { node: '>=14.0.0' }
+    resolution: {integrity: sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==}
+    engines: {node: '>=14.0.0'}
     peerDependencies:
       postcss: ^8.0.0
 
   postcss-js@4.0.1:
-    resolution:
-      {
-        integrity: sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==,
-      }
-    engines: { node: ^12 || ^14 || >= 16 }
+    resolution: {integrity: sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==}
+    engines: {node: ^12 || ^14 || >= 16}
     peerDependencies:
       postcss: ^8.4.21
 
   postcss-load-config@4.0.2:
-    resolution:
-      {
-        integrity: sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==,
-      }
-    engines: { node: '>= 14' }
+    resolution: {integrity: sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==}
+    engines: {node: '>= 14'}
     peerDependencies:
       postcss: '>=8.0.9'
       ts-node: '>=9.0.0'
@@ -5296,11 +3027,8 @@ packages:
         optional: true
 
   postcss-load-config@5.0.3:
-    resolution:
-      {
-        integrity: sha512-90pBBI5apUVruIEdCxZic93Wm+i9fTrp7TXbgdUCH+/L+2WnfpITSpq5dFU/IPvbv7aNiMlQISpUkAm3fEcvgQ==,
-      }
-    engines: { node: '>= 18' }
+    resolution: {integrity: sha512-90pBBI5apUVruIEdCxZic93Wm+i9fTrp7TXbgdUCH+/L+2WnfpITSpq5dFU/IPvbv7aNiMlQISpUkAm3fEcvgQ==}
+    engines: {node: '>= 18'}
     peerDependencies:
       jiti: '>=1.21.0'
       postcss: '>=8.0.9'
@@ -5311,49 +3039,35 @@ packages:
         optional: true
 
   postcss-nested@6.0.1:
-    resolution:
-      {
-        integrity: sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==,
-      }
-    engines: { node: '>=12.0' }
+    resolution: {integrity: sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==}
+    engines: {node: '>=12.0'}
     peerDependencies:
       postcss: ^8.2.14
 
   postcss-reporter@7.1.0:
-    resolution:
-      {
-        integrity: sha512-/eoEylGWyy6/DOiMP5lmFRdmDKThqgn7D6hP2dXKJI/0rJSO1ADFNngZfDzxL0YAxFvws+Rtpuji1YIHj4mySA==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-/eoEylGWyy6/DOiMP5lmFRdmDKThqgn7D6hP2dXKJI/0rJSO1ADFNngZfDzxL0YAxFvws+Rtpuji1YIHj4mySA==}
+    engines: {node: '>=10'}
     peerDependencies:
       postcss: ^8.1.0
 
   postcss-selector-parser@6.0.16:
-    resolution:
-      {
-        integrity: sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==,
-      }
-    engines: { node: '>=4' }
+    resolution: {integrity: sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==}
+    engines: {node: '>=4'}
 
   postcss-value-parser@4.2.0:
-    resolution:
-      {
-        integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==,
-      }
+    resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
 
   postcss@8.4.38:
-    resolution:
-      {
-        integrity: sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==,
-      }
-    engines: { node: ^10 || ^12 || >=14 }
+    resolution: {integrity: sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==}
+    engines: {node: ^10 || ^12 || >=14}
+
+  postcss@8.4.40:
+    resolution: {integrity: sha512-YF2kKIUzAofPMpfH6hOi2cGnv/HrUlfucspc7pDyvv7kGdqXrfj8SCl/t8owkEgKEuu8ZcRjSOxFxVLqwChZ2Q==}
+    engines: {node: ^10 || ^12 || >=14}
 
   prelude-ls@1.2.1:
-    resolution:
-      {
-        integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==,
-      }
-    engines: { node: '>= 0.8.0' }
+    resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
+    engines: {node: '>= 0.8.0'}
 
   prettier-plugin-tailwindcss@0.6.5:
     resolution: {integrity: sha512-axfeOArc/RiGHjOIy9HytehlC0ZLeMaqY09mm8YCkMzznKiDkwFzOpBvtuhuv3xG5qB73+Mj7OCe2j/L1ryfuQ==}
@@ -5408,154 +3122,91 @@ packages:
         optional: true
 
   prettier@3.2.5:
-    resolution:
-      {
-        integrity: sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==,
-      }
-    engines: { node: '>=14' }
+    resolution: {integrity: sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==}
+    engines: {node: '>=14'}
     hasBin: true
 
   pretty-hrtime@1.0.3:
-    resolution:
-      {
-        integrity: sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==,
-      }
-    engines: { node: '>= 0.8' }
+    resolution: {integrity: sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==}
+    engines: {node: '>= 0.8'}
 
   process@0.11.10:
-    resolution:
-      {
-        integrity: sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==,
-      }
-    engines: { node: '>= 0.6.0' }
+    resolution: {integrity: sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==}
+    engines: {node: '>= 0.6.0'}
 
   property-information@6.5.0:
-    resolution:
-      {
-        integrity: sha512-PgTgs/BlvHxOu8QuEN7wi5A0OmXaBcHpmCSTehcs6Uuu9IkDIEo13Hy7n898RHfrQ49vKCoGeWZSaAK01nwVig==,
-      }
+    resolution: {integrity: sha512-PgTgs/BlvHxOu8QuEN7wi5A0OmXaBcHpmCSTehcs6Uuu9IkDIEo13Hy7n898RHfrQ49vKCoGeWZSaAK01nwVig==}
 
   public-encrypt@4.0.3:
-    resolution:
-      {
-        integrity: sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==,
-      }
+    resolution: {integrity: sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==}
 
   punycode@1.4.1:
-    resolution:
-      {
-        integrity: sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==,
-      }
+    resolution: {integrity: sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==}
 
   punycode@2.3.1:
-    resolution:
-      {
-        integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==,
-      }
-    engines: { node: '>=6' }
+    resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}
+    engines: {node: '>=6'}
 
   qr-image@3.2.0:
-    resolution:
-      {
-        integrity: sha512-rXKDS5Sx3YipVsqmlMJsJsk6jXylEpiHRC2+nJy66fxA5ExYyGa4PqwteW69SaVmAb2OQ18HbYriT7cGQMbduw==,
-      }
+    resolution: {integrity: sha512-rXKDS5Sx3YipVsqmlMJsJsk6jXylEpiHRC2+nJy66fxA5ExYyGa4PqwteW69SaVmAb2OQ18HbYriT7cGQMbduw==}
 
   qs@6.11.2:
-    resolution:
-      {
-        integrity: sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==,
-      }
-    engines: { node: '>=0.6' }
+    resolution: {integrity: sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==}
+    engines: {node: '>=0.6'}
 
   querystring-es3@0.2.1:
-    resolution:
-      {
-        integrity: sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==,
-      }
-    engines: { node: '>=0.4.x' }
+    resolution: {integrity: sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==}
+    engines: {node: '>=0.4.x'}
 
   queue-microtask@1.2.3:
-    resolution:
-      {
-        integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==,
-      }
+    resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
 
   randombytes@2.1.0:
-    resolution:
-      {
-        integrity: sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==,
-      }
+    resolution: {integrity: sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==}
 
   randomfill@1.0.4:
-    resolution:
-      {
-        integrity: sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==,
-      }
+    resolution: {integrity: sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==}
 
   react-content-loader@7.0.0:
-    resolution:
-      {
-        integrity: sha512-xaBwpO7eiJyEc4ndym+g6wcruV9W2y3DKqbw4U48QFBsv0IeAVZO+aCUb8GptlDLWM8n5zi2HcFSGlj5r+53Tg==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-xaBwpO7eiJyEc4ndym+g6wcruV9W2y3DKqbw4U48QFBsv0IeAVZO+aCUb8GptlDLWM8n5zi2HcFSGlj5r+53Tg==}
+    engines: {node: '>=10'}
     peerDependencies:
       react: '>=16.0.0'
 
   react-dom@18.2.0:
-    resolution:
-      {
-        integrity: sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==,
-      }
+    resolution: {integrity: sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==}
     peerDependencies:
       react: ^18.2.0
 
   react-hook-form@7.49.3:
-    resolution:
-      {
-        integrity: sha512-foD6r3juidAT1cOZzpmD/gOKt7fRsDhXXZ0y28+Al1CHgX+AY1qIN9VSIIItXRq1dN68QrRwl1ORFlwjBaAqeQ==,
-      }
-    engines: { node: '>=18', pnpm: '8' }
+    resolution: {integrity: sha512-foD6r3juidAT1cOZzpmD/gOKt7fRsDhXXZ0y28+Al1CHgX+AY1qIN9VSIIItXRq1dN68QrRwl1ORFlwjBaAqeQ==}
+    engines: {node: '>=18', pnpm: '8'}
     peerDependencies:
       react: ^16.8.0 || ^17 || ^18
 
   react-hot-toast@2.4.1:
-    resolution:
-      {
-        integrity: sha512-j8z+cQbWIM5LY37pR6uZR6D4LfseplqnuAO4co4u8917hBUvXlEqyP1ZzqVLcqoyUesZZv/ImreoCeHVDpE5pQ==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-j8z+cQbWIM5LY37pR6uZR6D4LfseplqnuAO4co4u8917hBUvXlEqyP1ZzqVLcqoyUesZZv/ImreoCeHVDpE5pQ==}
+    engines: {node: '>=10'}
     peerDependencies:
       react: '>=16'
       react-dom: '>=16'
 
   react-is@16.13.1:
-    resolution:
-      {
-        integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==,
-      }
+    resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==}
 
   react-markdown@9.0.1:
-    resolution:
-      {
-        integrity: sha512-186Gw/vF1uRkydbsOIkcGXw7aHq0sZOCRFFjGrr7b9+nVZg4UfA4enXCaxm4fUzecU38sWfrNDitGhshuU7rdg==,
-      }
+    resolution: {integrity: sha512-186Gw/vF1uRkydbsOIkcGXw7aHq0sZOCRFFjGrr7b9+nVZg4UfA4enXCaxm4fUzecU38sWfrNDitGhshuU7rdg==}
     peerDependencies:
       '@types/react': '>=18'
       react: '>=18'
 
   react-refresh@0.14.0:
-    resolution:
-      {
-        integrity: sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==,
-      }
-    engines: { node: '>=0.10.0' }
+    resolution: {integrity: sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==}
+    engines: {node: '>=0.10.0'}
 
   react-remove-scroll-bar@2.3.6:
-    resolution:
-      {
-        integrity: sha512-DtSYaao4mBmX+HDo5YWYdBWQwYIQQshUV/dVxFxK+KM26Wjwp1gZ6rv6OC3oujI6Bfu6Xyg3TwK533AQutsn/g==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-DtSYaao4mBmX+HDo5YWYdBWQwYIQQshUV/dVxFxK+KM26Wjwp1gZ6rv6OC3oujI6Bfu6Xyg3TwK533AQutsn/g==}
+    engines: {node: '>=10'}
     peerDependencies:
       '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -5564,11 +3215,8 @@ packages:
         optional: true
 
   react-remove-scroll@2.5.5:
-    resolution:
-      {
-        integrity: sha512-ImKhrzJJsyXJfBZ4bzu8Bwpka14c/fQt0k+cyFp/PBhTfyDnU5hjOtM4AG/0AMyy8oKzOTR0lDgJIM7pYXI0kw==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-ImKhrzJJsyXJfBZ4bzu8Bwpka14c/fQt0k+cyFp/PBhTfyDnU5hjOtM4AG/0AMyy8oKzOTR0lDgJIM7pYXI0kw==}
+    engines: {node: '>=10'}
     peerDependencies:
       '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -5577,38 +3225,26 @@ packages:
         optional: true
 
   react-router-dom@6.20.1:
-    resolution:
-      {
-        integrity: sha512-npzfPWcxfQN35psS7rJgi/EW0Gx6EsNjfdJSAk73U/HqMEJZ2k/8puxfwHFgDQhBGmS3+sjnGbMdMSV45axPQw==,
-      }
-    engines: { node: '>=14.0.0' }
+    resolution: {integrity: sha512-npzfPWcxfQN35psS7rJgi/EW0Gx6EsNjfdJSAk73U/HqMEJZ2k/8puxfwHFgDQhBGmS3+sjnGbMdMSV45axPQw==}
+    engines: {node: '>=14.0.0'}
     peerDependencies:
       react: '>=16.8'
       react-dom: '>=16.8'
 
   react-router@6.20.1:
-    resolution:
-      {
-        integrity: sha512-ccvLrB4QeT5DlaxSFFYi/KR8UMQ4fcD8zBcR71Zp1kaYTC5oJKYAp1cbavzGrogwxca+ubjkd7XjFZKBW8CxPA==,
-      }
-    engines: { node: '>=14.0.0' }
+    resolution: {integrity: sha512-ccvLrB4QeT5DlaxSFFYi/KR8UMQ4fcD8zBcR71Zp1kaYTC5oJKYAp1cbavzGrogwxca+ubjkd7XjFZKBW8CxPA==}
+    engines: {node: '>=14.0.0'}
     peerDependencies:
       react: '>=16.8'
 
   react-simple-animate@3.5.2:
-    resolution:
-      {
-        integrity: sha512-xLE65euP920QMTOmv5haPlml+hmOPDkbIr5WeF7ADIXWBYt5kW/vwpNfWg8EKMab8aeDxIZ6QjffVh8v2dUyhg==,
-      }
+    resolution: {integrity: sha512-xLE65euP920QMTOmv5haPlml+hmOPDkbIr5WeF7ADIXWBYt5kW/vwpNfWg8EKMab8aeDxIZ6QjffVh8v2dUyhg==}
     peerDependencies:
       react-dom: ^16.8.0 || ^17 || ^18
 
   react-style-singleton@2.2.1:
-    resolution:
-      {
-        integrity: sha512-ZWj0fHEMyWkHzKYUr2Bs/4zU6XLmq9HsgBURm7g5pAVfyn49DgUiNgY2d4lXRlYSiCif9YBGpQleewkcqddc7g==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-ZWj0fHEMyWkHzKYUr2Bs/4zU6XLmq9HsgBURm7g5pAVfyn49DgUiNgY2d4lXRlYSiCif9YBGpQleewkcqddc7g==}
+    engines: {node: '>=10'}
     peerDependencies:
       '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -5617,683 +3253,366 @@ packages:
         optional: true
 
   react@18.2.0:
-    resolution:
-      {
-        integrity: sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==,
-      }
-    engines: { node: '>=0.10.0' }
+    resolution: {integrity: sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==}
+    engines: {node: '>=0.10.0'}
 
   read-cache@1.0.0:
-    resolution:
-      {
-        integrity: sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==,
-      }
+    resolution: {integrity: sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==}
 
   readable-stream@3.6.2:
-    resolution:
-      {
-        integrity: sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==,
-      }
-    engines: { node: '>= 6' }
+    resolution: {integrity: sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==}
+    engines: {node: '>= 6'}
 
   readdirp@3.6.0:
-    resolution:
-      {
-        integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==,
-      }
-    engines: { node: '>=8.10.0' }
+    resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==}
+    engines: {node: '>=8.10.0'}
 
   regenerator-runtime@0.14.1:
-    resolution:
-      {
-        integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==,
-      }
+    resolution: {integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==}
 
   remark-parse@11.0.0:
-    resolution:
-      {
-        integrity: sha512-FCxlKLNGknS5ba/1lmpYijMUzX2esxW5xQqjWxw2eHFfS2MSdaHVINFmhjo+qN1WhZhNimq0dZATN9pH0IDrpA==,
-      }
+    resolution: {integrity: sha512-FCxlKLNGknS5ba/1lmpYijMUzX2esxW5xQqjWxw2eHFfS2MSdaHVINFmhjo+qN1WhZhNimq0dZATN9pH0IDrpA==}
 
   remark-rehype@11.1.0:
-    resolution:
-      {
-        integrity: sha512-z3tJrAs2kIs1AqIIy6pzHmAHlF1hWQ+OdY4/hv+Wxe35EhyLKcajL33iUEn3ScxtFox9nUvRufR/Zre8Q08H/g==,
-      }
+    resolution: {integrity: sha512-z3tJrAs2kIs1AqIIy6pzHmAHlF1hWQ+OdY4/hv+Wxe35EhyLKcajL33iUEn3ScxtFox9nUvRufR/Zre8Q08H/g==}
 
   require-directory@2.1.1:
-    resolution:
-      {
-        integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==,
-      }
-    engines: { node: '>=0.10.0' }
+    resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
+    engines: {node: '>=0.10.0'}
 
   resolve-from@4.0.0:
-    resolution:
-      {
-        integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==,
-      }
-    engines: { node: '>=4' }
+    resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
+    engines: {node: '>=4'}
 
   resolve@1.19.0:
-    resolution:
-      {
-        integrity: sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==,
-      }
+    resolution: {integrity: sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==}
 
   resolve@1.22.8:
-    resolution:
-      {
-        integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==,
-      }
+    resolution: {integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==}
     hasBin: true
 
   reusify@1.0.4:
-    resolution:
-      {
-        integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==,
-      }
-    engines: { iojs: '>=1.0.0', node: '>=0.10.0' }
+    resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==}
+    engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
 
   rimraf@3.0.2:
-    resolution:
-      {
-        integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==,
-      }
+    resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==}
+    deprecated: Rimraf versions prior to v4 are no longer supported
     hasBin: true
 
   ripemd160@2.0.2:
-    resolution:
-      {
-        integrity: sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==,
-      }
+    resolution: {integrity: sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==}
 
   rollup@4.14.0:
-    resolution:
-      {
-        integrity: sha512-Qe7w62TyawbDzB4yt32R0+AbIo6m1/sqO7UPzFS8Z/ksL5mrfhA0v4CavfdmFav3D+ub4QeAgsGEe84DoWe/nQ==,
-      }
-    engines: { node: '>=18.0.0', npm: '>=8.0.0' }
-    hasBin: true
-
-  rollup@4.6.1:
-    resolution:
-      {
-        integrity: sha512-jZHaZotEHQaHLgKr8JnQiDT1rmatjgKlMekyksz+yk9jt/8z9quNjnKNRoaM0wd9DC2QKXjmWWuDYtM3jfF8pQ==,
-      }
-    engines: { node: '>=18.0.0', npm: '>=8.0.0' }
+    resolution: {integrity: sha512-Qe7w62TyawbDzB4yt32R0+AbIo6m1/sqO7UPzFS8Z/ksL5mrfhA0v4CavfdmFav3D+ub4QeAgsGEe84DoWe/nQ==}
+    engines: {node: '>=18.0.0', npm: '>=8.0.0'}
     hasBin: true
 
   run-parallel@1.2.0:
-    resolution:
-      {
-        integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==,
-      }
+    resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
 
   safe-buffer@5.2.1:
-    resolution:
-      {
-        integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==,
-      }
+    resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
 
   safer-buffer@2.1.2:
-    resolution:
-      {
-        integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==,
-      }
+    resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
 
   scheduler@0.23.0:
-    resolution:
-      {
-        integrity: sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==,
-      }
+    resolution: {integrity: sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==}
 
   scrypt-js@3.0.1:
-    resolution:
-      {
-        integrity: sha512-cdwTTnqPu0Hyvf5in5asVdZocVDTNRmR7XEcJuIzMjJeSHybHl7vpB66AzwTaIg6CLSbtjcxc8fqcySfnTkccA==,
-      }
+    resolution: {integrity: sha512-cdwTTnqPu0Hyvf5in5asVdZocVDTNRmR7XEcJuIzMjJeSHybHl7vpB66AzwTaIg6CLSbtjcxc8fqcySfnTkccA==}
 
   semver@6.3.1:
-    resolution:
-      {
-        integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==,
-      }
+    resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==}
     hasBin: true
 
   semver@7.5.4:
-    resolution:
-      {
-        integrity: sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==}
+    engines: {node: '>=10'}
     hasBin: true
 
   set-function-length@1.1.1:
-    resolution:
-      {
-        integrity: sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==}
+    engines: {node: '>= 0.4'}
 
   setimmediate@1.0.5:
-    resolution:
-      {
-        integrity: sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==,
-      }
+    resolution: {integrity: sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==}
 
   sha.js@2.4.11:
-    resolution:
-      {
-        integrity: sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==,
-      }
+    resolution: {integrity: sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==}
     hasBin: true
 
   shallowequal@1.1.0:
-    resolution:
-      {
-        integrity: sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==,
-      }
+    resolution: {integrity: sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==}
 
   shebang-command@2.0.0:
-    resolution:
-      {
-        integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
+    engines: {node: '>=8'}
 
   shebang-regex@3.0.0:
-    resolution:
-      {
-        integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
+    engines: {node: '>=8'}
 
   side-channel@1.0.4:
-    resolution:
-      {
-        integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==,
-      }
+    resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==}
 
   signal-exit@4.1.0:
-    resolution:
-      {
-        integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==,
-      }
-    engines: { node: '>=14' }
+    resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==}
+    engines: {node: '>=14'}
 
   slash@3.0.0:
-    resolution:
-      {
-        integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
+    engines: {node: '>=8'}
 
   slash@5.1.0:
-    resolution:
-      {
-        integrity: sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==,
-      }
-    engines: { node: '>=14.16' }
-
-  source-map-js@1.0.2:
-    resolution:
-      {
-        integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==,
-      }
-    engines: { node: '>=0.10.0' }
+    resolution: {integrity: sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==}
+    engines: {node: '>=14.16'}
 
   source-map-js@1.2.0:
-    resolution:
-      {
-        integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==,
-      }
-    engines: { node: '>=0.10.0' }
+    resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==}
+    engines: {node: '>=0.10.0'}
 
   source-map@0.5.7:
-    resolution:
-      {
-        integrity: sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==,
-      }
-    engines: { node: '>=0.10.0' }
+    resolution: {integrity: sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==}
+    engines: {node: '>=0.10.0'}
 
   source-map@0.6.1:
-    resolution:
-      {
-        integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==,
-      }
-    engines: { node: '>=0.10.0' }
+    resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
+    engines: {node: '>=0.10.0'}
 
   space-separated-tokens@2.0.2:
-    resolution:
-      {
-        integrity: sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==,
-      }
+    resolution: {integrity: sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==}
 
   sprintf-js@1.0.3:
-    resolution:
-      {
-        integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==,
-      }
+    resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==}
 
   stream-browserify@3.0.0:
-    resolution:
-      {
-        integrity: sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==,
-      }
+    resolution: {integrity: sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==}
 
   stream-http@3.2.0:
-    resolution:
-      {
-        integrity: sha512-Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A==,
-      }
+    resolution: {integrity: sha512-Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A==}
 
   string-argv@0.3.2:
-    resolution:
-      {
-        integrity: sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==,
-      }
-    engines: { node: '>=0.6.19' }
+    resolution: {integrity: sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==}
+    engines: {node: '>=0.6.19'}
 
   string-width@4.2.3:
-    resolution:
-      {
-        integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==}
+    engines: {node: '>=8'}
 
   string-width@5.1.2:
-    resolution:
-      {
-        integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==,
-      }
-    engines: { node: '>=12' }
+    resolution: {integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==}
+    engines: {node: '>=12'}
 
   string_decoder@1.3.0:
-    resolution:
-      {
-        integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==,
-      }
+    resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==}
 
   stringify-entities@4.0.4:
-    resolution:
-      {
-        integrity: sha512-IwfBptatlO+QCJUo19AqvrPNqlVMpW9YEL2LIVY+Rpv2qsjCGxaDLNRgeGsQWJhfItebuJhsGSLjaBbNSQ+ieg==,
-      }
+    resolution: {integrity: sha512-IwfBptatlO+QCJUo19AqvrPNqlVMpW9YEL2LIVY+Rpv2qsjCGxaDLNRgeGsQWJhfItebuJhsGSLjaBbNSQ+ieg==}
 
   strip-ansi@6.0.1:
-    resolution:
-      {
-        integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}
+    engines: {node: '>=8'}
 
   strip-ansi@7.1.0:
-    resolution:
-      {
-        integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==,
-      }
-    engines: { node: '>=12' }
+    resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==}
+    engines: {node: '>=12'}
 
   strip-json-comments@3.1.1:
-    resolution:
-      {
-        integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
+    engines: {node: '>=8'}
 
   style-to-object@1.0.6:
-    resolution:
-      {
-        integrity: sha512-khxq+Qm3xEyZfKd/y9L3oIWQimxuc4STrQKtQn8aSDRHb8mFgpukgX1hdzfrMEW6JCjyJ8p89x+IUMVnCBI1PA==,
-      }
+    resolution: {integrity: sha512-khxq+Qm3xEyZfKd/y9L3oIWQimxuc4STrQKtQn8aSDRHb8mFgpukgX1hdzfrMEW6JCjyJ8p89x+IUMVnCBI1PA==}
 
   styled-components@5.3.11:
-    resolution:
-      {
-        integrity: sha512-uuzIIfnVkagcVHv9nE0VPlHPSCmXIUGKfJ42LNjxCCTDTL5sgnJ8Z7GZBq0EnLYGln77tPpEpExt2+qa+cZqSw==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-uuzIIfnVkagcVHv9nE0VPlHPSCmXIUGKfJ42LNjxCCTDTL5sgnJ8Z7GZBq0EnLYGln77tPpEpExt2+qa+cZqSw==}
+    engines: {node: '>=10'}
     peerDependencies:
       react: '>= 16.8.0'
       react-dom: '>= 16.8.0'
       react-is: '>= 16.8.0'
 
   styled-components@6.1.1:
-    resolution:
-      {
-        integrity: sha512-cpZZP5RrKRIClBW5Eby4JM1wElLVP4NQrJbJ0h10TidTyJf4SIIwa3zLXOoPb4gJi8MsJ8mjq5mu2IrEhZIAcQ==,
-      }
-    engines: { node: '>= 16' }
+    resolution: {integrity: sha512-cpZZP5RrKRIClBW5Eby4JM1wElLVP4NQrJbJ0h10TidTyJf4SIIwa3zLXOoPb4gJi8MsJ8mjq5mu2IrEhZIAcQ==}
+    engines: {node: '>= 16'}
     peerDependencies:
       react: '>= 16.8.0'
       react-dom: '>= 16.8.0'
 
   stylis@4.2.0:
-    resolution:
-      {
-        integrity: sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==,
-      }
+    resolution: {integrity: sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==}
 
   stylis@4.3.0:
-    resolution:
-      {
-        integrity: sha512-E87pIogpwUsUwXw7dNyU4QDjdgVMy52m+XEOPEKUn161cCzWjjhPSQhByfd1CcNvrOLnXQ6OnnZDwnJrz/Z4YQ==,
-      }
+    resolution: {integrity: sha512-E87pIogpwUsUwXw7dNyU4QDjdgVMy52m+XEOPEKUn161cCzWjjhPSQhByfd1CcNvrOLnXQ6OnnZDwnJrz/Z4YQ==}
 
   sucrase@3.35.0:
-    resolution:
-      {
-        integrity: sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==,
-      }
-    engines: { node: '>=16 || 14 >=14.17' }
+    resolution: {integrity: sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==}
+    engines: {node: '>=16 || 14 >=14.17'}
     hasBin: true
 
   supports-color@5.5.0:
-    resolution:
-      {
-        integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==,
-      }
-    engines: { node: '>=4' }
+    resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==}
+    engines: {node: '>=4'}
 
   supports-color@7.2.0:
-    resolution:
-      {
-        integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
+    engines: {node: '>=8'}
 
   supports-color@8.1.1:
-    resolution:
-      {
-        integrity: sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==}
+    engines: {node: '>=10'}
 
   supports-preserve-symlinks-flag@1.0.0:
-    resolution:
-      {
-        integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
+    engines: {node: '>= 0.4'}
 
   tailwind-merge@2.2.2:
-    resolution:
-      {
-        integrity: sha512-tWANXsnmJzgw6mQ07nE3aCDkCK4QdT3ThPMCzawoYA2Pws7vSTCvz3Vrjg61jVUGfFZPJzxEP+NimbcW+EdaDw==,
-      }
+    resolution: {integrity: sha512-tWANXsnmJzgw6mQ07nE3aCDkCK4QdT3ThPMCzawoYA2Pws7vSTCvz3Vrjg61jVUGfFZPJzxEP+NimbcW+EdaDw==}
 
   tailwindcss-animate@1.0.7:
-    resolution:
-      {
-        integrity: sha512-bl6mpH3T7I3UFxuvDEXLxy/VuFxBk5bbzplh7tXI68mwMokNYd1t9qPBHlnyTwfa4JGC4zP516I1hYYtQ/vspA==,
-      }
+    resolution: {integrity: sha512-bl6mpH3T7I3UFxuvDEXLxy/VuFxBk5bbzplh7tXI68mwMokNYd1t9qPBHlnyTwfa4JGC4zP516I1hYYtQ/vspA==}
     peerDependencies:
       tailwindcss: '>=3.0.0 || insiders'
 
   tailwindcss@3.4.3:
-    resolution:
-      {
-        integrity: sha512-U7sxQk/n397Bmx4JHbJx/iSOOv5G+II3f1kpLpY2QeUv5DcPdcTsYLlusZfq1NthHS1c1cZoyFmmkex1rzke0A==,
-      }
-    engines: { node: '>=14.0.0' }
+    resolution: {integrity: sha512-U7sxQk/n397Bmx4JHbJx/iSOOv5G+II3f1kpLpY2QeUv5DcPdcTsYLlusZfq1NthHS1c1cZoyFmmkex1rzke0A==}
+    engines: {node: '>=14.0.0'}
     hasBin: true
 
   text-table@0.2.0:
-    resolution:
-      {
-        integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==,
-      }
+    resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
 
   thenby@1.3.4:
-    resolution:
-      {
-        integrity: sha512-89Gi5raiWA3QZ4b2ePcEwswC3me9JIg+ToSgtE0JWeCynLnLxNr/f9G+xfo9K+Oj4AFdom8YNJjibIARTJmapQ==,
-      }
+    resolution: {integrity: sha512-89Gi5raiWA3QZ4b2ePcEwswC3me9JIg+ToSgtE0JWeCynLnLxNr/f9G+xfo9K+Oj4AFdom8YNJjibIARTJmapQ==}
 
   thenify-all@1.6.0:
-    resolution:
-      {
-        integrity: sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==,
-      }
-    engines: { node: '>=0.8' }
+    resolution: {integrity: sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==}
+    engines: {node: '>=0.8'}
 
   thenify@3.3.1:
-    resolution:
-      {
-        integrity: sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==,
-      }
+    resolution: {integrity: sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==}
 
   timers-browserify@2.0.12:
-    resolution:
-      {
-        integrity: sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==,
-      }
-    engines: { node: '>=0.6.0' }
+    resolution: {integrity: sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==}
+    engines: {node: '>=0.6.0'}
 
   to-fast-properties@2.0.0:
-    resolution:
-      {
-        integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==,
-      }
-    engines: { node: '>=4' }
+    resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==}
+    engines: {node: '>=4'}
 
   to-regex-range@5.0.1:
-    resolution:
-      {
-        integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==,
-      }
-    engines: { node: '>=8.0' }
+    resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
+    engines: {node: '>=8.0'}
 
   trim-lines@3.0.1:
-    resolution:
-      {
-        integrity: sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==,
-      }
+    resolution: {integrity: sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==}
 
   trough@2.2.0:
-    resolution:
-      {
-        integrity: sha512-tmMpK00BjZiUyVyvrBK7knerNgmgvcV/KLVyuma/SC+TQN167GrMRciANTz09+k3zW8L8t60jWO1GpfkZdjTaw==,
-      }
+    resolution: {integrity: sha512-tmMpK00BjZiUyVyvrBK7knerNgmgvcV/KLVyuma/SC+TQN167GrMRciANTz09+k3zW8L8t60jWO1GpfkZdjTaw==}
 
   ts-api-utils@1.0.3:
-    resolution:
-      {
-        integrity: sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==,
-      }
-    engines: { node: '>=16.13.0' }
+    resolution: {integrity: sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==}
+    engines: {node: '>=16.13.0'}
     peerDependencies:
       typescript: '>=4.2.0'
 
   ts-interface-checker@0.1.13:
-    resolution:
-      {
-        integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==,
-      }
-
-  tslib@1.14.1:
-    resolution:
-      {
-        integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==,
-      }
+    resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==}
 
   tslib@2.6.2:
-    resolution:
-      {
-        integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==,
-      }
-
-  tsutils@3.21.0:
-    resolution:
-      {
-        integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==,
-      }
-    engines: { node: '>= 6' }
-    peerDependencies:
-      typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta'
+    resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==}
 
   tty-browserify@0.0.1:
-    resolution:
-      {
-        integrity: sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==,
-      }
+    resolution: {integrity: sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==}
 
   type-check@0.4.0:
-    resolution:
-      {
-        integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==,
-      }
-    engines: { node: '>= 0.8.0' }
+    resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
+    engines: {node: '>= 0.8.0'}
 
   type-detect@4.0.8:
-    resolution:
-      {
-        integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==,
-      }
-    engines: { node: '>=4' }
+    resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==}
+    engines: {node: '>=4'}
 
   type-fest@0.20.2:
-    resolution:
-      {
-        integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==}
+    engines: {node: '>=10'}
 
   typescript@4.9.5:
-    resolution:
-      {
-        integrity: sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==,
-      }
-    engines: { node: '>=4.2.0' }
+    resolution: {integrity: sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==}
+    engines: {node: '>=4.2.0'}
     hasBin: true
 
   typescript@5.3.3:
-    resolution:
-      {
-        integrity: sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==,
-      }
-    engines: { node: '>=14.17' }
+    resolution: {integrity: sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==}
+    engines: {node: '>=14.17'}
     hasBin: true
 
   typescript@5.4.2:
-    resolution:
-      {
-        integrity: sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==,
-      }
-    engines: { node: '>=14.17' }
+    resolution: {integrity: sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==}
+    engines: {node: '>=14.17'}
     hasBin: true
 
   typescript@5.5.2:
-    resolution:
-      {
-        integrity: sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==,
-      }
-    engines: { node: '>=14.17' }
+    resolution: {integrity: sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==}
+    engines: {node: '>=14.17'}
     hasBin: true
 
   undici-types@5.26.5:
-    resolution:
-      {
-        integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==,
-      }
+    resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==}
 
   unicorn-magic@0.1.0:
-    resolution:
-      {
-        integrity: sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==,
-      }
-    engines: { node: '>=18' }
+    resolution: {integrity: sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==}
+    engines: {node: '>=18'}
 
   unified@11.0.4:
-    resolution:
-      {
-        integrity: sha512-apMPnyLjAX+ty4OrNap7yumyVAMlKx5IWU2wlzzUdYJO9A8f1p9m/gywF/GM2ZDFcjQPrx59Mc90KwmxsoklxQ==,
-      }
+    resolution: {integrity: sha512-apMPnyLjAX+ty4OrNap7yumyVAMlKx5IWU2wlzzUdYJO9A8f1p9m/gywF/GM2ZDFcjQPrx59Mc90KwmxsoklxQ==}
 
   unist-util-is@6.0.0:
-    resolution:
-      {
-        integrity: sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw==,
-      }
+    resolution: {integrity: sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw==}
 
   unist-util-position@5.0.0:
-    resolution:
-      {
-        integrity: sha512-fucsC7HjXvkB5R3kTCO7kUjRdrS0BJt3M/FPxmHMBOm8JQi2BsHAHFsy27E0EolP8rp0NzXsJ+jNPyDWvOJZPA==,
-      }
+    resolution: {integrity: sha512-fucsC7HjXvkB5R3kTCO7kUjRdrS0BJt3M/FPxmHMBOm8JQi2BsHAHFsy27E0EolP8rp0NzXsJ+jNPyDWvOJZPA==}
 
   unist-util-remove-position@5.0.0:
-    resolution:
-      {
-        integrity: sha512-Hp5Kh3wLxv0PHj9m2yZhhLt58KzPtEYKQQ4yxfYFEO7EvHwzyDYnduhHnY1mDxoqr7VUwVuHXk9RXKIiYS1N8Q==,
-      }
+    resolution: {integrity: sha512-Hp5Kh3wLxv0PHj9m2yZhhLt58KzPtEYKQQ4yxfYFEO7EvHwzyDYnduhHnY1mDxoqr7VUwVuHXk9RXKIiYS1N8Q==}
 
   unist-util-stringify-position@4.0.0:
-    resolution:
-      {
-        integrity: sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==,
-      }
+    resolution: {integrity: sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==}
 
   unist-util-visit-parents@6.0.1:
-    resolution:
-      {
-        integrity: sha512-L/PqWzfTP9lzzEa6CKs0k2nARxTdZduw3zyh8d2NVBnsyvHjSX4TWse388YrrQKbvI8w20fGjGlhgT96WwKykw==,
-      }
+    resolution: {integrity: sha512-L/PqWzfTP9lzzEa6CKs0k2nARxTdZduw3zyh8d2NVBnsyvHjSX4TWse388YrrQKbvI8w20fGjGlhgT96WwKykw==}
 
   unist-util-visit@5.0.0:
-    resolution:
-      {
-        integrity: sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==,
-      }
+    resolution: {integrity: sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==}
 
   universalify@0.1.2:
-    resolution:
-      {
-        integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==,
-      }
-    engines: { node: '>= 4.0.0' }
+    resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==}
+    engines: {node: '>= 4.0.0'}
 
   universalify@2.0.1:
-    resolution:
-      {
-        integrity: sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==,
-      }
-    engines: { node: '>= 10.0.0' }
+    resolution: {integrity: sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==}
+    engines: {node: '>= 10.0.0'}
 
   update-browserslist-db@1.0.13:
-    resolution:
-      {
-        integrity: sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==,
-      }
+    resolution: {integrity: sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==}
     hasBin: true
     peerDependencies:
       browserslist: '>= 4.21.0'
 
   uri-js@4.4.1:
-    resolution:
-      {
-        integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==,
-      }
+    resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
 
   url-join@4.0.1:
-    resolution:
-      {
-        integrity: sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==,
-      }
+    resolution: {integrity: sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==}
 
   url@0.11.3:
-    resolution:
-      {
-        integrity: sha512-6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw==,
-      }
+    resolution: {integrity: sha512-6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw==}
 
   use-callback-ref@1.3.1:
-    resolution:
-      {
-        integrity: sha512-Lg4Vx1XZQauB42Hw3kK7JM6yjVjgFmFC5/Ab797s79aARomD2nEErc4mCgM8EZrARLmmbWpi5DGCadmK50DcAQ==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-Lg4Vx1XZQauB42Hw3kK7JM6yjVjgFmFC5/Ab797s79aARomD2nEErc4mCgM8EZrARLmmbWpi5DGCadmK50DcAQ==}
+    engines: {node: '>=10'}
     peerDependencies:
       '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -6302,20 +3621,14 @@ packages:
         optional: true
 
   use-deep-compare-effect@1.8.1:
-    resolution:
-      {
-        integrity: sha512-kbeNVZ9Zkc0RFGpfMN3MNfaKNvcLNyxOAAd9O4CBZ+kCBXXscn9s/4I+8ytUER4RDpEYs5+O6Rs4PqiZ+rHr5Q==,
-      }
-    engines: { node: '>=10', npm: '>=6' }
+    resolution: {integrity: sha512-kbeNVZ9Zkc0RFGpfMN3MNfaKNvcLNyxOAAd9O4CBZ+kCBXXscn9s/4I+8ytUER4RDpEYs5+O6Rs4PqiZ+rHr5Q==}
+    engines: {node: '>=10', npm: '>=6'}
     peerDependencies:
       react: '>=16.13'
 
   use-sidecar@1.1.2:
-    resolution:
-      {
-        integrity: sha512-epTbsLuzZ7lPClpz2TyryBfztm7m+28DlEv2ZCQ3MDr5ssiwyOwGH/e5F9CkfWjJ1t4clvI58yF822/GUkjjhw==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-epTbsLuzZ7lPClpz2TyryBfztm7m+28DlEv2ZCQ3MDr5ssiwyOwGH/e5F9CkfWjJ1t4clvI58yF822/GUkjjhw==}
+    engines: {node: '>=10'}
     peerDependencies:
       '@types/react': ^16.9.0 || ^17.0.0 || ^18.0.0
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -6324,64 +3637,37 @@ packages:
         optional: true
 
   use-sync-external-store@1.2.0:
-    resolution:
-      {
-        integrity: sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==,
-      }
+    resolution: {integrity: sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
 
   util-deprecate@1.0.2:
-    resolution:
-      {
-        integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==,
-      }
+    resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
 
   util@0.12.5:
-    resolution:
-      {
-        integrity: sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==,
-      }
+    resolution: {integrity: sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==}
 
   uuid@8.3.2:
-    resolution:
-      {
-        integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==,
-      }
+    resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==}
     hasBin: true
 
   uuid@9.0.1:
-    resolution:
-      {
-        integrity: sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==,
-      }
+    resolution: {integrity: sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==}
     hasBin: true
 
   validator@13.11.0:
-    resolution:
-      {
-        integrity: sha512-Ii+sehpSfZy+At5nPdnyMhx78fEoPDkR2XW/zimHEL3MyGJQOCQ7WeP20jPYRz7ZCpcKLB21NxuXHF3bxjStBQ==,
-      }
-    engines: { node: '>= 0.10' }
+    resolution: {integrity: sha512-Ii+sehpSfZy+At5nPdnyMhx78fEoPDkR2XW/zimHEL3MyGJQOCQ7WeP20jPYRz7ZCpcKLB21NxuXHF3bxjStBQ==}
+    engines: {node: '>= 0.10'}
 
   vfile-message@4.0.2:
-    resolution:
-      {
-        integrity: sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw==,
-      }
+    resolution: {integrity: sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw==}
 
   vfile@6.0.1:
-    resolution:
-      {
-        integrity: sha512-1bYqc7pt6NIADBJ98UiG0Bn/CHIVOoZ/IyEkqIruLg0mE1BKzkOXY2D6CSqQIcKqgadppE5lrxgWXJmXd7zZJw==,
-      }
+    resolution: {integrity: sha512-1bYqc7pt6NIADBJ98UiG0Bn/CHIVOoZ/IyEkqIruLg0mE1BKzkOXY2D6CSqQIcKqgadppE5lrxgWXJmXd7zZJw==}
 
   vite-plugin-dts@3.8.1:
-    resolution:
-      {
-        integrity: sha512-zEYyQxH7lKto1VTKZHF3ZZeOPkkJgnMrePY4VxDHfDSvDjmYMMfWjZxYmNwW8QxbaItWJQhhXY+geAbyNphI7g==,
-      }
-    engines: { node: ^14.18.0 || >=16.0.0 }
+    resolution: {integrity: sha512-zEYyQxH7lKto1VTKZHF3ZZeOPkkJgnMrePY4VxDHfDSvDjmYMMfWjZxYmNwW8QxbaItWJQhhXY+geAbyNphI7g==}
+    engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
       typescript: '*'
       vite: '*'
@@ -6390,19 +3676,13 @@ packages:
         optional: true
 
   vite-plugin-node-polyfills@0.17.0:
-    resolution:
-      {
-        integrity: sha512-iPmPn7376e5u6QvoTSJa16hf5Q0DFwHFXJk2uYpsNlmI3JdPms7hWyh55o+OysJ5jo9J5XPhLC9sMOYifwFd1w==,
-      }
+    resolution: {integrity: sha512-iPmPn7376e5u6QvoTSJa16hf5Q0DFwHFXJk2uYpsNlmI3JdPms7hWyh55o+OysJ5jo9J5XPhLC9sMOYifwFd1w==}
     peerDependencies:
       vite: ^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0
 
-  vite@5.0.6:
-    resolution:
-      {
-        integrity: sha512-MD3joyAEBtV7QZPl2JVVUai6zHms3YOmLR+BpMzLlX2Yzjfcc4gTgNi09d/Rua3F4EtC8zdwPU8eQYyib4vVMQ==,
-      }
-    engines: { node: ^18.0.0 || >=20.0.0 }
+  vite@5.2.8:
+    resolution: {integrity: sha512-OyZR+c1CE8yeHw5V5t59aXsUPPVTHMDjEZz8MgguLL/Q7NblxhZUlTu9xSPqlsUO/y+X7dlU05jdhvyycD55DA==}
+    engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
     peerDependencies:
       '@types/node': ^18.0.0 || >=20.0.0
@@ -6428,12 +3708,9 @@ packages:
       terser:
         optional: true
 
-  vite@5.2.8:
-    resolution:
-      {
-        integrity: sha512-OyZR+c1CE8yeHw5V5t59aXsUPPVTHMDjEZz8MgguLL/Q7NblxhZUlTu9xSPqlsUO/y+X7dlU05jdhvyycD55DA==,
-      }
-    engines: { node: ^18.0.0 || >=20.0.0 }
+  vite@5.3.5:
+    resolution: {integrity: sha512-MdjglKR6AQXQb9JGiS7Rc2wC6uMjcm7Go/NHNO63EwiJXfuk9PgqiP/n5IDJCziMkfw9n4Ubp7lttNwz+8ZVKA==}
+    engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
     peerDependencies:
       '@types/node': ^18.0.0 || >=20.0.0
@@ -6460,85 +3737,49 @@ packages:
         optional: true
 
   vm-browserify@1.1.2:
-    resolution:
-      {
-        integrity: sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==,
-      }
+    resolution: {integrity: sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==}
 
   vue-template-compiler@2.7.16:
-    resolution:
-      {
-        integrity: sha512-AYbUWAJHLGGQM7+cNTELw+KsOG9nl2CnSv467WobS5Cv9uk3wFcnr1Etsz2sEIHEZvw1U+o9mRlEO6QbZvUPGQ==,
-      }
+    resolution: {integrity: sha512-AYbUWAJHLGGQM7+cNTELw+KsOG9nl2CnSv467WobS5Cv9uk3wFcnr1Etsz2sEIHEZvw1U+o9mRlEO6QbZvUPGQ==}
 
   vue-tsc@1.8.27:
-    resolution:
-      {
-        integrity: sha512-WesKCAZCRAbmmhuGl3+VrdWItEvfoFIPXOvUJkjULi+x+6G/Dy69yO3TBRJDr9eUlmsNAwVmxsNZxvHKzbkKdg==,
-      }
+    resolution: {integrity: sha512-WesKCAZCRAbmmhuGl3+VrdWItEvfoFIPXOvUJkjULi+x+6G/Dy69yO3TBRJDr9eUlmsNAwVmxsNZxvHKzbkKdg==}
     hasBin: true
     peerDependencies:
       typescript: '*'
 
   wasmbuilder@0.0.16:
-    resolution:
-      {
-        integrity: sha512-Qx3lEFqaVvp1cEYW7Bfi+ebRJrOiwz2Ieu7ZG2l7YyeSJIok/reEQCQCuicj/Y32ITIJuGIM9xZQppGx5LrQdA==,
-      }
+    resolution: {integrity: sha512-Qx3lEFqaVvp1cEYW7Bfi+ebRJrOiwz2Ieu7ZG2l7YyeSJIok/reEQCQCuicj/Y32ITIJuGIM9xZQppGx5LrQdA==}
 
   wasmcurves@0.2.2:
-    resolution:
-      {
-        integrity: sha512-JRY908NkmKjFl4ytnTu5ED6AwPD+8VJ9oc94kdq7h5bIwbj0L4TDJ69mG+2aLs2SoCmGfqIesMWTEJjtYsoQXQ==,
-      }
+    resolution: {integrity: sha512-JRY908NkmKjFl4ytnTu5ED6AwPD+8VJ9oc94kdq7h5bIwbj0L4TDJ69mG+2aLs2SoCmGfqIesMWTEJjtYsoQXQ==}
 
   web-worker@1.2.0:
-    resolution:
-      {
-        integrity: sha512-PgF341avzqyx60neE9DD+XS26MMNMoUQRz9NOZwW32nPQrF6p77f1htcnjBSEV8BGMKZ16choqUG4hyI0Hx7mA==,
-      }
+    resolution: {integrity: sha512-PgF341avzqyx60neE9DD+XS26MMNMoUQRz9NOZwW32nPQrF6p77f1htcnjBSEV8BGMKZ16choqUG4hyI0Hx7mA==}
 
   which-typed-array@1.1.13:
-    resolution:
-      {
-        integrity: sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==}
+    engines: {node: '>= 0.4'}
 
   which@2.0.2:
-    resolution:
-      {
-        integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==,
-      }
-    engines: { node: '>= 8' }
+    resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
+    engines: {node: '>= 8'}
     hasBin: true
 
   wrap-ansi@7.0.0:
-    resolution:
-      {
-        integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
+    engines: {node: '>=10'}
 
   wrap-ansi@8.1.0:
-    resolution:
-      {
-        integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==,
-      }
-    engines: { node: '>=12' }
+    resolution: {integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==}
+    engines: {node: '>=12'}
 
   wrappy@1.0.2:
-    resolution:
-      {
-        integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==,
-      }
+    resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
 
   ws@7.4.6:
-    resolution:
-      {
-        integrity: sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==,
-      }
-    engines: { node: '>=8.3.0' }
+    resolution: {integrity: sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==}
+    engines: {node: '>=8.3.0'}
     peerDependencies:
       bufferutil: ^4.0.1
       utf-8-validate: ^5.0.2
@@ -6549,87 +3790,51 @@ packages:
         optional: true
 
   xtend@4.0.2:
-    resolution:
-      {
-        integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==,
-      }
-    engines: { node: '>=0.4' }
+    resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==}
+    engines: {node: '>=0.4'}
 
   y18n@5.0.8:
-    resolution:
-      {
-        integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
+    engines: {node: '>=10'}
 
   yallist@3.1.1:
-    resolution:
-      {
-        integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==,
-      }
+    resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==}
 
   yallist@4.0.0:
-    resolution:
-      {
-        integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==,
-      }
+    resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==}
 
   yaml@1.10.2:
-    resolution:
-      {
-        integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==,
-      }
-    engines: { node: '>= 6' }
+    resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==}
+    engines: {node: '>= 6'}
 
   yaml@2.4.1:
-    resolution:
-      {
-        integrity: sha512-pIXzoImaqmfOrL7teGUBt/T7ZDnyeGBWyXQBvOVhLkWLN37GXv8NMLK406UY6dS51JfcQHsmcW5cJ441bHg6Lg==,
-      }
-    engines: { node: '>= 14' }
+    resolution: {integrity: sha512-pIXzoImaqmfOrL7teGUBt/T7ZDnyeGBWyXQBvOVhLkWLN37GXv8NMLK406UY6dS51JfcQHsmcW5cJ441bHg6Lg==}
+    engines: {node: '>= 14'}
     hasBin: true
 
   yargs-parser@21.1.1:
-    resolution:
-      {
-        integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==,
-      }
-    engines: { node: '>=12' }
+    resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==}
+    engines: {node: '>=12'}
 
   yargs@17.7.2:
-    resolution:
-      {
-        integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==,
-      }
-    engines: { node: '>=12' }
+    resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==}
+    engines: {node: '>=12'}
 
   yocto-queue@0.1.0:
-    resolution:
-      {
-        integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
+    engines: {node: '>=10'}
 
   z-schema@5.0.5:
-    resolution:
-      {
-        integrity: sha512-D7eujBWkLa3p2sIpJA0d1pr7es+a7m0vFAnZLlCEKq/Ij2k0MLi9Br2UPxoxdYystm5K1yeBGzub0FlYUEWj2Q==,
-      }
-    engines: { node: '>=8.0.0' }
+    resolution: {integrity: sha512-D7eujBWkLa3p2sIpJA0d1pr7es+a7m0vFAnZLlCEKq/Ij2k0MLi9Br2UPxoxdYystm5K1yeBGzub0FlYUEWj2Q==}
+    engines: {node: '>=8.0.0'}
     hasBin: true
 
   zod@3.22.4:
-    resolution:
-      {
-        integrity: sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==,
-      }
+    resolution: {integrity: sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==}
 
   zustand@4.4.7:
-    resolution:
-      {
-        integrity: sha512-QFJWJMdlETcI69paJwhSMJz7PPWjVP8Sjhclxmxmxv/RYI7ZOvR5BHX+ktH0we9gTWQMxcne8q1OY8xxz604gw==,
-      }
-    engines: { node: '>=12.7.0' }
+    resolution: {integrity: sha512-QFJWJMdlETcI69paJwhSMJz7PPWjVP8Sjhclxmxmxv/RYI7ZOvR5BHX+ktH0we9gTWQMxcne8q1OY8xxz604gw==}
+    engines: {node: '>=12.7.0'}
     peerDependencies:
       '@types/react': '>=16.8'
       immer: '>=9.0'
@@ -6643,12 +3848,10 @@ packages:
         optional: true
 
   zwitch@2.0.4:
-    resolution:
-      {
-        integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==,
-      }
+    resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
 
 snapshots:
+
   '@aashutoshrathi/word-wrap@1.2.6': {}
 
   '@alloc/quick-lru@5.2.0': {}
@@ -6819,7 +4022,7 @@ snapshots:
   '@emotion/babel-plugin@11.11.0':
     dependencies:
       '@babel/helper-module-imports': 7.22.15
-      '@babel/runtime': 7.23.9
+      '@babel/runtime': 7.24.4
       '@emotion/hash': 0.9.1
       '@emotion/memoize': 0.8.1
       '@emotion/serialize': 1.1.3
@@ -6846,9 +4049,9 @@ snapshots:
 
   '@emotion/memoize@0.8.1': {}
 
-  '@emotion/react@11.11.3(@types/react@18.2.42)(react@18.2.0)':
+  '@emotion/react@11.11.3(@types/react@18.3.3)(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.23.9
+      '@babel/runtime': 7.24.4
       '@emotion/babel-plugin': 11.11.0
       '@emotion/cache': 11.11.0
       '@emotion/serialize': 1.1.3
@@ -6858,7 +4061,7 @@ snapshots:
       hoist-non-react-statics: 3.3.2
       react: 18.2.0
     optionalDependencies:
-      '@types/react': 18.2.42
+      '@types/react': 18.3.3
 
   '@emotion/serialize@1.1.3':
     dependencies:
@@ -6870,18 +4073,18 @@ snapshots:
 
   '@emotion/sheet@1.2.2': {}
 
-  '@emotion/styled@11.11.0(@emotion/react@11.11.3(@types/react@18.2.42)(react@18.2.0))(@types/react@18.2.42)(react@18.2.0)':
+  '@emotion/styled@11.11.0(@emotion/react@11.11.3(@types/react@18.3.3)(react@18.2.0))(@types/react@18.3.3)(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.23.9
+      '@babel/runtime': 7.24.4
       '@emotion/babel-plugin': 11.11.0
       '@emotion/is-prop-valid': 1.2.1
-      '@emotion/react': 11.11.3(@types/react@18.2.42)(react@18.2.0)
+      '@emotion/react': 11.11.3(@types/react@18.3.3)(react@18.2.0)
       '@emotion/serialize': 1.1.3
       '@emotion/use-insertion-effect-with-fallbacks': 1.0.1(react@18.2.0)
       '@emotion/utils': 1.2.1
       react: 18.2.0
     optionalDependencies:
-      '@types/react': 18.2.42
+      '@types/react': 18.3.3
 
   '@emotion/stylis@0.8.5': {}
 
@@ -6900,142 +4103,140 @@ snapshots:
   '@esbuild/aix-ppc64@0.20.2':
     optional: true
 
-  '@esbuild/android-arm64@0.19.8':
+  '@esbuild/aix-ppc64@0.21.5':
     optional: true
 
   '@esbuild/android-arm64@0.20.2':
     optional: true
 
-  '@esbuild/android-arm@0.19.8':
+  '@esbuild/android-arm64@0.21.5':
     optional: true
 
   '@esbuild/android-arm@0.20.2':
     optional: true
 
-  '@esbuild/android-x64@0.19.8':
+  '@esbuild/android-arm@0.21.5':
     optional: true
 
   '@esbuild/android-x64@0.20.2':
     optional: true
 
-  '@esbuild/darwin-arm64@0.19.8':
+  '@esbuild/android-x64@0.21.5':
     optional: true
 
   '@esbuild/darwin-arm64@0.20.2':
     optional: true
 
-  '@esbuild/darwin-x64@0.19.8':
+  '@esbuild/darwin-arm64@0.21.5':
     optional: true
 
   '@esbuild/darwin-x64@0.20.2':
     optional: true
 
-  '@esbuild/freebsd-arm64@0.19.8':
+  '@esbuild/darwin-x64@0.21.5':
     optional: true
 
   '@esbuild/freebsd-arm64@0.20.2':
     optional: true
 
-  '@esbuild/freebsd-x64@0.19.8':
+  '@esbuild/freebsd-arm64@0.21.5':
     optional: true
 
   '@esbuild/freebsd-x64@0.20.2':
     optional: true
 
-  '@esbuild/linux-arm64@0.19.8':
+  '@esbuild/freebsd-x64@0.21.5':
     optional: true
 
   '@esbuild/linux-arm64@0.20.2':
     optional: true
 
-  '@esbuild/linux-arm@0.19.8':
+  '@esbuild/linux-arm64@0.21.5':
     optional: true
 
   '@esbuild/linux-arm@0.20.2':
     optional: true
 
-  '@esbuild/linux-ia32@0.19.8':
+  '@esbuild/linux-arm@0.21.5':
     optional: true
 
   '@esbuild/linux-ia32@0.20.2':
     optional: true
 
-  '@esbuild/linux-loong64@0.19.8':
+  '@esbuild/linux-ia32@0.21.5':
     optional: true
 
   '@esbuild/linux-loong64@0.20.2':
     optional: true
 
-  '@esbuild/linux-mips64el@0.19.8':
+  '@esbuild/linux-loong64@0.21.5':
     optional: true
 
   '@esbuild/linux-mips64el@0.20.2':
     optional: true
 
-  '@esbuild/linux-ppc64@0.19.8':
+  '@esbuild/linux-mips64el@0.21.5':
     optional: true
 
   '@esbuild/linux-ppc64@0.20.2':
     optional: true
 
-  '@esbuild/linux-riscv64@0.19.8':
+  '@esbuild/linux-ppc64@0.21.5':
     optional: true
 
   '@esbuild/linux-riscv64@0.20.2':
     optional: true
 
-  '@esbuild/linux-s390x@0.19.8':
+  '@esbuild/linux-riscv64@0.21.5':
     optional: true
 
   '@esbuild/linux-s390x@0.20.2':
     optional: true
 
-  '@esbuild/linux-x64@0.19.8':
+  '@esbuild/linux-s390x@0.21.5':
     optional: true
 
   '@esbuild/linux-x64@0.20.2':
     optional: true
 
-  '@esbuild/netbsd-x64@0.19.8':
+  '@esbuild/linux-x64@0.21.5':
     optional: true
 
   '@esbuild/netbsd-x64@0.20.2':
     optional: true
 
-  '@esbuild/openbsd-x64@0.19.8':
+  '@esbuild/netbsd-x64@0.21.5':
     optional: true
 
   '@esbuild/openbsd-x64@0.20.2':
     optional: true
 
-  '@esbuild/sunos-x64@0.19.8':
+  '@esbuild/openbsd-x64@0.21.5':
     optional: true
 
   '@esbuild/sunos-x64@0.20.2':
     optional: true
 
-  '@esbuild/win32-arm64@0.19.8':
+  '@esbuild/sunos-x64@0.21.5':
     optional: true
 
   '@esbuild/win32-arm64@0.20.2':
     optional: true
 
-  '@esbuild/win32-ia32@0.19.8':
+  '@esbuild/win32-arm64@0.21.5':
     optional: true
 
   '@esbuild/win32-ia32@0.20.2':
     optional: true
 
-  '@esbuild/win32-x64@0.19.8':
+  '@esbuild/win32-ia32@0.21.5':
     optional: true
 
   '@esbuild/win32-x64@0.20.2':
     optional: true
 
-  '@eslint-community/eslint-utils@4.4.0(eslint@8.56.0)':
-    dependencies:
-      eslint: 8.56.0
-      eslint-visitor-keys: 3.4.3
+  '@esbuild/win32-x64@0.21.5':
+    optional: true
 
   '@eslint-community/eslint-utils@4.4.0(eslint@8.57.0)':
     dependencies:
@@ -7058,8 +4259,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@eslint/js@8.56.0': {}
-
   '@eslint/js@8.57.0': {}
 
   '@ethersproject/abi@5.7.0':
@@ -7334,10 +4533,10 @@ snapshots:
 
   '@floating-ui/utils@0.2.1': {}
 
-  '@hookform/devtools@4.3.1(@types/react@18.2.42)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+  '@hookform/devtools@4.3.1(@types/react@18.3.3)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
-      '@emotion/react': 11.11.3(@types/react@18.2.42)(react@18.2.0)
-      '@emotion/styled': 11.11.0(@emotion/react@11.11.3(@types/react@18.2.42)(react@18.2.0))(@types/react@18.2.42)(react@18.2.0)
+      '@emotion/react': 11.11.3(@types/react@18.3.3)(react@18.2.0)
+      '@emotion/styled': 11.11.0(@emotion/react@11.11.3(@types/react@18.3.3)(react@18.2.0))(@types/react@18.3.3)(react@18.2.0)
       '@types/lodash': 4.14.202
       little-state-machine: 4.8.0(react@18.2.0)
       lodash: 4.17.21
@@ -7353,14 +4552,6 @@ snapshots:
     dependencies:
       react-hook-form: 7.49.3(react@18.2.0)
 
-  '@humanwhocodes/config-array@0.11.13':
-    dependencies:
-      '@humanwhocodes/object-schema': 2.0.1
-      debug: 4.3.4(supports-color@5.5.0)
-      minimatch: 3.1.2
-    transitivePeerDependencies:
-      - supports-color
-
   '@humanwhocodes/config-array@0.11.14':
     dependencies:
       '@humanwhocodes/object-schema': 2.0.3
@@ -7371,8 +4562,6 @@ snapshots:
 
   '@humanwhocodes/module-importer@1.0.1': {}
 
-  '@humanwhocodes/object-schema@2.0.1': {}
-
   '@humanwhocodes/object-schema@2.0.3': {}
 
   '@isaacs/cliui@8.0.2':
@@ -7728,13 +4917,6 @@ snapshots:
       '@types/react': 18.3.3
       '@types/react-dom': 18.2.24
 
-  '@radix-ui/react-compose-refs@1.0.1(@types/react@18.2.42)(react@18.2.0)':
-    dependencies:
-      '@babel/runtime': 7.24.4
-      react: 18.2.0
-    optionalDependencies:
-      '@types/react': 18.2.42
-
   '@radix-ui/react-compose-refs@1.0.1(@types/react@18.2.74)(react@18.2.0)':
     dependencies:
       '@babel/runtime': 7.24.4
@@ -7755,13 +4937,6 @@ snapshots:
     optionalDependencies:
       '@types/react': 18.3.3
 
-  '@radix-ui/react-context@1.0.1(@types/react@18.2.42)(react@18.2.0)':
-    dependencies:
-      '@babel/runtime': 7.24.4
-      react: 18.2.0
-    optionalDependencies:
-      '@types/react': 18.2.42
-
   '@radix-ui/react-context@1.0.1(@types/react@18.2.74)(react@18.2.0)':
     dependencies:
       '@babel/runtime': 7.24.4
@@ -7782,29 +4957,6 @@ snapshots:
     optionalDependencies:
       '@types/react': 18.3.3
 
-  '@radix-ui/react-dialog@1.0.5(@types/react-dom@18.2.17)(@types/react@18.2.42)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
-    dependencies:
-      '@babel/runtime': 7.23.9
-      '@radix-ui/primitive': 1.0.1
-      '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.42)(react@18.2.0)
-      '@radix-ui/react-context': 1.0.1(@types/react@18.2.42)(react@18.2.0)
-      '@radix-ui/react-dismissable-layer': 1.0.5(@types/react-dom@18.2.17)(@types/react@18.2.42)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@radix-ui/react-focus-guards': 1.0.1(@types/react@18.2.42)(react@18.2.0)
-      '@radix-ui/react-focus-scope': 1.0.4(@types/react-dom@18.2.17)(@types/react@18.2.42)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@radix-ui/react-id': 1.0.1(@types/react@18.2.42)(react@18.2.0)
-      '@radix-ui/react-portal': 1.0.4(@types/react-dom@18.2.17)(@types/react@18.2.42)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.17)(@types/react@18.2.42)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.42)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@radix-ui/react-slot': 1.0.2(@types/react@18.2.42)(react@18.2.0)
-      '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.42)(react@18.2.0)
-      aria-hidden: 1.2.3
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
-      react-remove-scroll: 2.5.5(@types/react@18.2.42)(react@18.2.0)
-    optionalDependencies:
-      '@types/react': 18.2.42
-      '@types/react-dom': 18.2.17
-
   '@radix-ui/react-dialog@1.0.5(@types/react-dom@18.2.24)(@types/react@18.2.74)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@babel/runtime': 7.23.9
@@ -7857,20 +5009,6 @@ snapshots:
     optionalDependencies:
       '@types/react': 18.3.3
 
-  '@radix-ui/react-dismissable-layer@1.0.5(@types/react-dom@18.2.17)(@types/react@18.2.42)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
-    dependencies:
-      '@babel/runtime': 7.24.4
-      '@radix-ui/primitive': 1.0.1
-      '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.42)(react@18.2.0)
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.42)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.42)(react@18.2.0)
-      '@radix-ui/react-use-escape-keydown': 1.0.3(@types/react@18.2.42)(react@18.2.0)
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
-    optionalDependencies:
-      '@types/react': 18.2.42
-      '@types/react-dom': 18.2.17
-
   '@radix-ui/react-dismissable-layer@1.0.5(@types/react-dom@18.2.24)(@types/react@18.2.74)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@babel/runtime': 7.24.4
@@ -7912,13 +5050,6 @@ snapshots:
       '@types/react': 18.3.3
       '@types/react-dom': 18.2.24
 
-  '@radix-ui/react-focus-guards@1.0.1(@types/react@18.2.42)(react@18.2.0)':
-    dependencies:
-      '@babel/runtime': 7.24.4
-      react: 18.2.0
-    optionalDependencies:
-      '@types/react': 18.2.42
-
   '@radix-ui/react-focus-guards@1.0.1(@types/react@18.2.74)(react@18.2.0)':
     dependencies:
       '@babel/runtime': 7.24.4
@@ -7933,18 +5064,6 @@ snapshots:
     optionalDependencies:
       '@types/react': 18.3.3
 
-  '@radix-ui/react-focus-scope@1.0.4(@types/react-dom@18.2.17)(@types/react@18.2.42)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
-    dependencies:
-      '@babel/runtime': 7.24.4
-      '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.42)(react@18.2.0)
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.42)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.42)(react@18.2.0)
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
-    optionalDependencies:
-      '@types/react': 18.2.42
-      '@types/react-dom': 18.2.17
-
   '@radix-ui/react-focus-scope@1.0.4(@types/react-dom@18.2.24)(@types/react@18.2.74)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@babel/runtime': 7.24.4
@@ -7973,14 +5092,6 @@ snapshots:
     dependencies:
       react: 18.2.0
 
-  '@radix-ui/react-id@1.0.1(@types/react@18.2.42)(react@18.2.0)':
-    dependencies:
-      '@babel/runtime': 7.24.4
-      '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.42)(react@18.2.0)
-      react: 18.2.0
-    optionalDependencies:
-      '@types/react': 18.2.42
-
   '@radix-ui/react-id@1.0.1(@types/react@18.2.74)(react@18.2.0)':
     dependencies:
       '@babel/runtime': 7.24.4
@@ -8112,16 +5223,6 @@ snapshots:
       '@types/react': 18.3.3
       '@types/react-dom': 18.2.24
 
-  '@radix-ui/react-portal@1.0.4(@types/react-dom@18.2.17)(@types/react@18.2.42)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
-    dependencies:
-      '@babel/runtime': 7.24.4
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.42)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
-    optionalDependencies:
-      '@types/react': 18.2.42
-      '@types/react-dom': 18.2.17
-
   '@radix-ui/react-portal@1.0.4(@types/react-dom@18.2.24)(@types/react@18.2.74)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@babel/runtime': 7.24.4
@@ -8142,17 +5243,6 @@ snapshots:
       '@types/react': 18.3.3
       '@types/react-dom': 18.2.24
 
-  '@radix-ui/react-presence@1.0.1(@types/react-dom@18.2.17)(@types/react@18.2.42)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
-    dependencies:
-      '@babel/runtime': 7.24.4
-      '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.42)(react@18.2.0)
-      '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.42)(react@18.2.0)
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
-    optionalDependencies:
-      '@types/react': 18.2.42
-      '@types/react-dom': 18.2.17
-
   '@radix-ui/react-presence@1.0.1(@types/react-dom@18.2.24)(@types/react@18.2.74)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@babel/runtime': 7.24.4
@@ -8185,16 +5275,6 @@ snapshots:
       '@types/react': 18.3.3
       '@types/react-dom': 18.2.24
 
-  '@radix-ui/react-primitive@1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.42)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
-    dependencies:
-      '@babel/runtime': 7.24.4
-      '@radix-ui/react-slot': 1.0.2(@types/react@18.2.42)(react@18.2.0)
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
-    optionalDependencies:
-      '@types/react': 18.2.42
-      '@types/react-dom': 18.2.17
-
   '@radix-ui/react-primitive@1.0.3(@types/react-dom@18.2.24)(@types/react@18.2.74)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@babel/runtime': 7.24.4
@@ -8233,14 +5313,6 @@ snapshots:
       '@types/react': 18.3.3
       '@types/react-dom': 18.2.24
 
-  '@radix-ui/react-slot@1.0.2(@types/react@18.2.42)(react@18.2.0)':
-    dependencies:
-      '@babel/runtime': 7.23.9
-      '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.42)(react@18.2.0)
-      react: 18.2.0
-    optionalDependencies:
-      '@types/react': 18.2.42
-
   '@radix-ui/react-slot@1.0.2(@types/react@18.2.74)(react@18.2.0)':
     dependencies:
       '@babel/runtime': 7.23.9
@@ -8264,13 +5336,6 @@ snapshots:
     optionalDependencies:
       '@types/react': 18.3.3
 
-  '@radix-ui/react-use-callback-ref@1.0.1(@types/react@18.2.42)(react@18.2.0)':
-    dependencies:
-      '@babel/runtime': 7.23.9
-      react: 18.2.0
-    optionalDependencies:
-      '@types/react': 18.2.42
-
   '@radix-ui/react-use-callback-ref@1.0.1(@types/react@18.2.74)(react@18.2.0)':
     dependencies:
       '@babel/runtime': 7.23.9
@@ -8291,14 +5356,6 @@ snapshots:
     optionalDependencies:
       '@types/react': 18.3.3
 
-  '@radix-ui/react-use-controllable-state@1.0.1(@types/react@18.2.42)(react@18.2.0)':
-    dependencies:
-      '@babel/runtime': 7.24.4
-      '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.42)(react@18.2.0)
-      react: 18.2.0
-    optionalDependencies:
-      '@types/react': 18.2.42
-
   '@radix-ui/react-use-controllable-state@1.0.1(@types/react@18.2.74)(react@18.2.0)':
     dependencies:
       '@babel/runtime': 7.24.4
@@ -8322,14 +5379,6 @@ snapshots:
     optionalDependencies:
       '@types/react': 18.3.3
 
-  '@radix-ui/react-use-escape-keydown@1.0.3(@types/react@18.2.42)(react@18.2.0)':
-    dependencies:
-      '@babel/runtime': 7.23.9
-      '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.42)(react@18.2.0)
-      react: 18.2.0
-    optionalDependencies:
-      '@types/react': 18.2.42
-
   '@radix-ui/react-use-escape-keydown@1.0.3(@types/react@18.2.74)(react@18.2.0)':
     dependencies:
       '@babel/runtime': 7.23.9
@@ -8353,13 +5402,6 @@ snapshots:
     optionalDependencies:
       '@types/react': 18.3.3
 
-  '@radix-ui/react-use-layout-effect@1.0.1(@types/react@18.2.42)(react@18.2.0)':
-    dependencies:
-      '@babel/runtime': 7.23.9
-      react: 18.2.0
-    optionalDependencies:
-      '@types/react': 18.2.42
-
   '@radix-ui/react-use-layout-effect@1.0.1(@types/react@18.2.74)(react@18.2.0)':
     dependencies:
       '@babel/runtime': 7.23.9
@@ -8437,7 +5479,7 @@ snapshots:
     dependencies:
       '@rollup/pluginutils': 5.1.0(rollup@4.14.0)
       estree-walker: 2.0.2
-      magic-string: 0.30.5
+      magic-string: 0.30.9
     optionalDependencies:
       rollup: 4.14.0
 
@@ -8452,45 +5494,24 @@ snapshots:
   '@rollup/rollup-android-arm-eabi@4.14.0':
     optional: true
 
-  '@rollup/rollup-android-arm-eabi@4.6.1':
-    optional: true
-
   '@rollup/rollup-android-arm64@4.14.0':
     optional: true
 
-  '@rollup/rollup-android-arm64@4.6.1':
-    optional: true
-
-  '@rollup/rollup-darwin-arm64@4.14.0':
-    optional: true
-
-  '@rollup/rollup-darwin-arm64@4.6.1':
+  '@rollup/rollup-darwin-arm64@4.14.0':
     optional: true
 
   '@rollup/rollup-darwin-x64@4.14.0':
     optional: true
 
-  '@rollup/rollup-darwin-x64@4.6.1':
-    optional: true
-
   '@rollup/rollup-linux-arm-gnueabihf@4.14.0':
     optional: true
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.6.1':
-    optional: true
-
   '@rollup/rollup-linux-arm64-gnu@4.14.0':
     optional: true
 
-  '@rollup/rollup-linux-arm64-gnu@4.6.1':
-    optional: true
-
   '@rollup/rollup-linux-arm64-musl@4.14.0':
     optional: true
 
-  '@rollup/rollup-linux-arm64-musl@4.6.1':
-    optional: true
-
   '@rollup/rollup-linux-powerpc64le-gnu@4.14.0':
     optional: true
 
@@ -8503,33 +5524,18 @@ snapshots:
   '@rollup/rollup-linux-x64-gnu@4.14.0':
     optional: true
 
-  '@rollup/rollup-linux-x64-gnu@4.6.1':
-    optional: true
-
   '@rollup/rollup-linux-x64-musl@4.14.0':
     optional: true
 
-  '@rollup/rollup-linux-x64-musl@4.6.1':
-    optional: true
-
   '@rollup/rollup-win32-arm64-msvc@4.14.0':
     optional: true
 
-  '@rollup/rollup-win32-arm64-msvc@4.6.1':
-    optional: true
-
   '@rollup/rollup-win32-ia32-msvc@4.14.0':
     optional: true
 
-  '@rollup/rollup-win32-ia32-msvc@4.6.1':
-    optional: true
-
   '@rollup/rollup-win32-x64-msvc@4.14.0':
     optional: true
 
-  '@rollup/rollup-win32-x64-msvc@4.6.1':
-    optional: true
-
   '@rushstack/node-core-library@4.0.2(@types/node@20.12.4)':
     dependencies:
       fs-extra: 7.0.1
@@ -8590,14 +5596,6 @@ snapshots:
 
   '@sindresorhus/merge-streams@2.3.0': {}
 
-  '@tanstack/eslint-plugin-query@5.18.1(eslint@8.56.0)(typescript@5.5.2)':
-    dependencies:
-      '@typescript-eslint/utils': 5.62.0(eslint@8.56.0)(typescript@5.5.2)
-      eslint: 8.56.0
-    transitivePeerDependencies:
-      - supports-color
-      - typescript
-
   '@tanstack/query-core@5.13.4': {}
 
   '@tanstack/query-devtools@5.13.5': {}
@@ -8668,20 +5666,10 @@ snapshots:
 
   '@types/prop-types@15.7.11': {}
 
-  '@types/react-dom@18.2.17':
-    dependencies:
-      '@types/react': 18.2.74
-
   '@types/react-dom@18.2.24':
     dependencies:
       '@types/react': 18.3.3
 
-  '@types/react@18.2.42':
-    dependencies:
-      '@types/prop-types': 15.7.11
-      '@types/scheduler': 0.16.8
-      csstype: 3.1.2
-
   '@types/react@18.2.74':
     dependencies:
       '@types/prop-types': 15.7.11
@@ -8692,8 +5680,6 @@ snapshots:
       '@types/prop-types': 15.7.11
       csstype: 3.1.2
 
-  '@types/scheduler@0.16.8': {}
-
   '@types/semver@7.5.6': {}
 
   '@types/stylis@4.2.4': {}
@@ -8702,26 +5688,6 @@ snapshots:
 
   '@types/unist@3.0.2': {}
 
-  '@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.5.2))(eslint@8.56.0)(typescript@5.5.2)':
-    dependencies:
-      '@eslint-community/regexpp': 4.10.0
-      '@typescript-eslint/parser': 6.21.0(eslint@8.56.0)(typescript@5.5.2)
-      '@typescript-eslint/scope-manager': 6.21.0
-      '@typescript-eslint/type-utils': 6.21.0(eslint@8.56.0)(typescript@5.5.2)
-      '@typescript-eslint/utils': 6.21.0(eslint@8.56.0)(typescript@5.5.2)
-      '@typescript-eslint/visitor-keys': 6.21.0
-      debug: 4.3.4(supports-color@5.5.0)
-      eslint: 8.56.0
-      graphemer: 1.4.0
-      ignore: 5.3.0
-      natural-compare: 1.4.0
-      semver: 7.5.4
-      ts-api-utils: 1.0.3(typescript@5.5.2)
-    optionalDependencies:
-      typescript: 5.5.2
-    transitivePeerDependencies:
-      - supports-color
-
   '@typescript-eslint/eslint-plugin@7.5.0(@typescript-eslint/parser@7.5.0(eslint@8.57.0)(typescript@5.3.3))(eslint@8.57.0)(typescript@5.3.3)':
     dependencies:
       '@eslint-community/regexpp': 4.10.0
@@ -8762,19 +5728,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.5.2)':
-    dependencies:
-      '@typescript-eslint/scope-manager': 6.21.0
-      '@typescript-eslint/types': 6.21.0
-      '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.5.2)
-      '@typescript-eslint/visitor-keys': 6.21.0
-      debug: 4.3.4(supports-color@5.5.0)
-      eslint: 8.56.0
-    optionalDependencies:
-      typescript: 5.5.2
-    transitivePeerDependencies:
-      - supports-color
-
   '@typescript-eslint/parser@7.5.0(eslint@8.57.0)(typescript@5.3.3)':
     dependencies:
       '@typescript-eslint/scope-manager': 7.5.0
@@ -8801,33 +5754,11 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/scope-manager@5.62.0':
-    dependencies:
-      '@typescript-eslint/types': 5.62.0
-      '@typescript-eslint/visitor-keys': 5.62.0
-
-  '@typescript-eslint/scope-manager@6.21.0':
-    dependencies:
-      '@typescript-eslint/types': 6.21.0
-      '@typescript-eslint/visitor-keys': 6.21.0
-
   '@typescript-eslint/scope-manager@7.5.0':
     dependencies:
       '@typescript-eslint/types': 7.5.0
       '@typescript-eslint/visitor-keys': 7.5.0
 
-  '@typescript-eslint/type-utils@6.21.0(eslint@8.56.0)(typescript@5.5.2)':
-    dependencies:
-      '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.5.2)
-      '@typescript-eslint/utils': 6.21.0(eslint@8.56.0)(typescript@5.5.2)
-      debug: 4.3.4(supports-color@5.5.0)
-      eslint: 8.56.0
-      ts-api-utils: 1.0.3(typescript@5.5.2)
-    optionalDependencies:
-      typescript: 5.5.2
-    transitivePeerDependencies:
-      - supports-color
-
   '@typescript-eslint/type-utils@7.5.0(eslint@8.57.0)(typescript@5.3.3)':
     dependencies:
       '@typescript-eslint/typescript-estree': 7.5.0(typescript@5.3.3)
@@ -8852,41 +5783,8 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/types@5.62.0': {}
-
-  '@typescript-eslint/types@6.21.0': {}
-
   '@typescript-eslint/types@7.5.0': {}
 
-  '@typescript-eslint/typescript-estree@5.62.0(typescript@5.5.2)':
-    dependencies:
-      '@typescript-eslint/types': 5.62.0
-      '@typescript-eslint/visitor-keys': 5.62.0
-      debug: 4.3.4(supports-color@5.5.0)
-      globby: 11.1.0
-      is-glob: 4.0.3
-      semver: 7.5.4
-      tsutils: 3.21.0(typescript@5.5.2)
-    optionalDependencies:
-      typescript: 5.5.2
-    transitivePeerDependencies:
-      - supports-color
-
-  '@typescript-eslint/typescript-estree@6.21.0(typescript@5.5.2)':
-    dependencies:
-      '@typescript-eslint/types': 6.21.0
-      '@typescript-eslint/visitor-keys': 6.21.0
-      debug: 4.3.4(supports-color@5.5.0)
-      globby: 11.1.0
-      is-glob: 4.0.3
-      minimatch: 9.0.3
-      semver: 7.5.4
-      ts-api-utils: 1.0.3(typescript@5.5.2)
-    optionalDependencies:
-      typescript: 5.5.2
-    transitivePeerDependencies:
-      - supports-color
-
   '@typescript-eslint/typescript-estree@7.5.0(typescript@5.3.3)':
     dependencies:
       '@typescript-eslint/types': 7.5.0
@@ -8917,35 +5815,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/utils@5.62.0(eslint@8.56.0)(typescript@5.5.2)':
-    dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0)
-      '@types/json-schema': 7.0.15
-      '@types/semver': 7.5.6
-      '@typescript-eslint/scope-manager': 5.62.0
-      '@typescript-eslint/types': 5.62.0
-      '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.5.2)
-      eslint: 8.56.0
-      eslint-scope: 5.1.1
-      semver: 7.5.4
-    transitivePeerDependencies:
-      - supports-color
-      - typescript
-
-  '@typescript-eslint/utils@6.21.0(eslint@8.56.0)(typescript@5.5.2)':
-    dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0)
-      '@types/json-schema': 7.0.15
-      '@types/semver': 7.5.6
-      '@typescript-eslint/scope-manager': 6.21.0
-      '@typescript-eslint/types': 6.21.0
-      '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.5.2)
-      eslint: 8.56.0
-      semver: 7.5.4
-    transitivePeerDependencies:
-      - supports-color
-      - typescript
-
   '@typescript-eslint/utils@7.5.0(eslint@8.57.0)(typescript@5.3.3)':
     dependencies:
       '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0)
@@ -8974,16 +5843,6 @@ snapshots:
       - supports-color
       - typescript
 
-  '@typescript-eslint/visitor-keys@5.62.0':
-    dependencies:
-      '@typescript-eslint/types': 5.62.0
-      eslint-visitor-keys: 3.4.3
-
-  '@typescript-eslint/visitor-keys@6.21.0':
-    dependencies:
-      '@typescript-eslint/types': 6.21.0
-      eslint-visitor-keys: 3.4.3
-
   '@typescript-eslint/visitor-keys@7.5.0':
     dependencies:
       '@typescript-eslint/types': 7.5.0
@@ -8991,25 +5850,25 @@ snapshots:
 
   '@ungap/structured-clone@1.2.0': {}
 
-  '@vitejs/plugin-react@4.2.1(vite@5.0.6(@types/node@20.12.4))':
+  '@vitejs/plugin-react@4.2.1(vite@5.2.8(@types/node@20.12.4))':
     dependencies:
       '@babel/core': 7.23.5
       '@babel/plugin-transform-react-jsx-self': 7.23.3(@babel/core@7.23.5)
       '@babel/plugin-transform-react-jsx-source': 7.23.3(@babel/core@7.23.5)
       '@types/babel__core': 7.20.5
       react-refresh: 0.14.0
-      vite: 5.0.6(@types/node@20.12.4)
+      vite: 5.2.8(@types/node@20.12.4)
     transitivePeerDependencies:
       - supports-color
 
-  '@vitejs/plugin-react@4.2.1(vite@5.2.8(@types/node@20.12.4))':
+  '@vitejs/plugin-react@4.2.1(vite@5.3.5(@types/node@20.12.4))':
     dependencies:
       '@babel/core': 7.23.5
       '@babel/plugin-transform-react-jsx-self': 7.23.3(@babel/core@7.23.5)
       '@babel/plugin-transform-react-jsx-source': 7.23.3(@babel/core@7.23.5)
       '@types/babel__core': 7.20.5
       react-refresh: 0.14.0
-      vite: 5.2.8(@types/node@20.12.4)
+      vite: 5.3.5(@types/node@20.12.4)
     transitivePeerDependencies:
       - supports-color
 
@@ -9032,7 +5891,7 @@ snapshots:
       '@vue/shared': 3.4.21
       entities: 4.5.0
       estree-walker: 2.0.2
-      source-map-js: 1.0.2
+      source-map-js: 1.2.0
 
   '@vue/compiler-dom@3.4.21':
     dependencies:
@@ -9053,20 +5912,6 @@ snapshots:
     optionalDependencies:
       typescript: 5.3.3
 
-  '@vue/language-core@1.8.27(typescript@5.5.2)':
-    dependencies:
-      '@volar/language-core': 1.11.1
-      '@volar/source-map': 1.11.1
-      '@vue/compiler-dom': 3.4.21
-      '@vue/shared': 3.4.21
-      computeds: 0.0.1
-      minimatch: 9.0.3
-      muggle-string: 0.3.1
-      path-browserify: 1.0.1
-      vue-template-compiler: 2.7.16
-    optionalDependencies:
-      typescript: 5.5.2
-
   '@vue/shared@3.4.21': {}
 
   '@zk-kit/groth16@0.3.0':
@@ -9165,7 +6010,7 @@ snapshots:
 
   babel-plugin-macros@3.1.0:
     dependencies:
-      '@babel/runtime': 7.23.9
+      '@babel/runtime': 7.24.4
       cosmiconfig: 7.1.0
       resolve: 1.22.8
 
@@ -9604,31 +6449,6 @@ snapshots:
     dependencies:
       is-arrayish: 0.2.1
 
-  esbuild@0.19.8:
-    optionalDependencies:
-      '@esbuild/android-arm': 0.19.8
-      '@esbuild/android-arm64': 0.19.8
-      '@esbuild/android-x64': 0.19.8
-      '@esbuild/darwin-arm64': 0.19.8
-      '@esbuild/darwin-x64': 0.19.8
-      '@esbuild/freebsd-arm64': 0.19.8
-      '@esbuild/freebsd-x64': 0.19.8
-      '@esbuild/linux-arm': 0.19.8
-      '@esbuild/linux-arm64': 0.19.8
-      '@esbuild/linux-ia32': 0.19.8
-      '@esbuild/linux-loong64': 0.19.8
-      '@esbuild/linux-mips64el': 0.19.8
-      '@esbuild/linux-ppc64': 0.19.8
-      '@esbuild/linux-riscv64': 0.19.8
-      '@esbuild/linux-s390x': 0.19.8
-      '@esbuild/linux-x64': 0.19.8
-      '@esbuild/netbsd-x64': 0.19.8
-      '@esbuild/openbsd-x64': 0.19.8
-      '@esbuild/sunos-x64': 0.19.8
-      '@esbuild/win32-arm64': 0.19.8
-      '@esbuild/win32-ia32': 0.19.8
-      '@esbuild/win32-x64': 0.19.8
-
   esbuild@0.20.2:
     optionalDependencies:
       '@esbuild/aix-ppc64': 0.20.2
@@ -9655,37 +6475,50 @@ snapshots:
       '@esbuild/win32-ia32': 0.20.2
       '@esbuild/win32-x64': 0.20.2
 
+  esbuild@0.21.5:
+    optionalDependencies:
+      '@esbuild/aix-ppc64': 0.21.5
+      '@esbuild/android-arm': 0.21.5
+      '@esbuild/android-arm64': 0.21.5
+      '@esbuild/android-x64': 0.21.5
+      '@esbuild/darwin-arm64': 0.21.5
+      '@esbuild/darwin-x64': 0.21.5
+      '@esbuild/freebsd-arm64': 0.21.5
+      '@esbuild/freebsd-x64': 0.21.5
+      '@esbuild/linux-arm': 0.21.5
+      '@esbuild/linux-arm64': 0.21.5
+      '@esbuild/linux-ia32': 0.21.5
+      '@esbuild/linux-loong64': 0.21.5
+      '@esbuild/linux-mips64el': 0.21.5
+      '@esbuild/linux-ppc64': 0.21.5
+      '@esbuild/linux-riscv64': 0.21.5
+      '@esbuild/linux-s390x': 0.21.5
+      '@esbuild/linux-x64': 0.21.5
+      '@esbuild/netbsd-x64': 0.21.5
+      '@esbuild/openbsd-x64': 0.21.5
+      '@esbuild/sunos-x64': 0.21.5
+      '@esbuild/win32-arm64': 0.21.5
+      '@esbuild/win32-ia32': 0.21.5
+      '@esbuild/win32-x64': 0.21.5
+
   escalade@3.1.1: {}
 
   escape-string-regexp@1.0.5: {}
 
   escape-string-regexp@4.0.0: {}
 
-  eslint-config-prettier@9.1.0(eslint@8.56.0):
-    dependencies:
-      eslint: 8.56.0
-
-  eslint-plugin-react-hooks@4.6.0(eslint@8.56.0):
+  eslint-config-prettier@9.1.0(eslint@8.57.0):
     dependencies:
-      eslint: 8.56.0
+      eslint: 8.57.0
 
   eslint-plugin-react-hooks@4.6.0(eslint@8.57.0):
     dependencies:
       eslint: 8.57.0
 
-  eslint-plugin-react-refresh@0.4.5(eslint@8.56.0):
-    dependencies:
-      eslint: 8.56.0
-
   eslint-plugin-react-refresh@0.4.6(eslint@8.57.0):
     dependencies:
       eslint: 8.57.0
 
-  eslint-scope@5.1.1:
-    dependencies:
-      esrecurse: 4.3.0
-      estraverse: 4.3.0
-
   eslint-scope@7.2.2:
     dependencies:
       esrecurse: 4.3.0
@@ -9693,49 +6526,6 @@ snapshots:
 
   eslint-visitor-keys@3.4.3: {}
 
-  eslint@8.56.0:
-    dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0)
-      '@eslint-community/regexpp': 4.10.0
-      '@eslint/eslintrc': 2.1.4
-      '@eslint/js': 8.56.0
-      '@humanwhocodes/config-array': 0.11.13
-      '@humanwhocodes/module-importer': 1.0.1
-      '@nodelib/fs.walk': 1.2.8
-      '@ungap/structured-clone': 1.2.0
-      ajv: 6.12.6
-      chalk: 4.1.2
-      cross-spawn: 7.0.3
-      debug: 4.3.4(supports-color@5.5.0)
-      doctrine: 3.0.0
-      escape-string-regexp: 4.0.0
-      eslint-scope: 7.2.2
-      eslint-visitor-keys: 3.4.3
-      espree: 9.6.1
-      esquery: 1.5.0
-      esutils: 2.0.3
-      fast-deep-equal: 3.1.3
-      file-entry-cache: 6.0.1
-      find-up: 5.0.0
-      glob-parent: 6.0.2
-      globals: 13.23.0
-      graphemer: 1.4.0
-      ignore: 5.3.0
-      imurmurhash: 0.1.4
-      is-glob: 4.0.3
-      is-path-inside: 3.0.3
-      js-yaml: 4.1.0
-      json-stable-stringify-without-jsonify: 1.0.1
-      levn: 0.4.1
-      lodash.merge: 4.6.2
-      minimatch: 3.1.2
-      natural-compare: 1.4.0
-      optionator: 0.9.3
-      strip-ansi: 6.0.1
-      text-table: 0.2.0
-    transitivePeerDependencies:
-      - supports-color
-
   eslint@8.57.0:
     dependencies:
       '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0)
@@ -9793,8 +6583,6 @@ snapshots:
     dependencies:
       estraverse: 5.3.0
 
-  estraverse@4.3.0: {}
-
   estraverse@5.3.0: {}
 
   estree-util-is-identifier-name@3.0.0: {}
@@ -10278,10 +7066,6 @@ snapshots:
     dependencies:
       react: 18.2.0
 
-  magic-string@0.30.5:
-    dependencies:
-      '@jridgewell/sourcemap-codec': 1.4.15
-
   magic-string@0.30.9:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.4.15
@@ -10714,6 +7498,8 @@ snapshots:
 
   picocolors@1.0.0: {}
 
+  picocolors@1.0.1: {}
+
   picomatch@2.3.1: {}
 
   pify@2.3.0: {}
@@ -10793,6 +7579,12 @@ snapshots:
       picocolors: 1.0.0
       source-map-js: 1.2.0
 
+  postcss@8.4.40:
+    dependencies:
+      nanoid: 3.3.7
+      picocolors: 1.0.1
+      source-map-js: 1.2.0
+
   prelude-ls@1.2.1: {}
 
   prettier-plugin-tailwindcss@0.6.5(prettier@3.2.5):
@@ -10863,10 +7655,10 @@ snapshots:
 
   react-is@16.13.1: {}
 
-  react-markdown@9.0.1(@types/react@18.2.42)(react@18.2.0):
+  react-markdown@9.0.1(@types/react@18.3.3)(react@18.2.0):
     dependencies:
       '@types/hast': 3.0.4
-      '@types/react': 18.2.42
+      '@types/react': 18.3.3
       devlop: 1.1.0
       hast-util-to-jsx-runtime: 2.3.0
       html-url-attributes: 3.0.0
@@ -10882,14 +7674,6 @@ snapshots:
 
   react-refresh@0.14.0: {}
 
-  react-remove-scroll-bar@2.3.6(@types/react@18.2.42)(react@18.2.0):
-    dependencies:
-      react: 18.2.0
-      react-style-singleton: 2.2.1(@types/react@18.2.42)(react@18.2.0)
-      tslib: 2.6.2
-    optionalDependencies:
-      '@types/react': 18.2.42
-
   react-remove-scroll-bar@2.3.6(@types/react@18.2.74)(react@18.2.0):
     dependencies:
       react: 18.2.0
@@ -10906,17 +7690,6 @@ snapshots:
     optionalDependencies:
       '@types/react': 18.3.3
 
-  react-remove-scroll@2.5.5(@types/react@18.2.42)(react@18.2.0):
-    dependencies:
-      react: 18.2.0
-      react-remove-scroll-bar: 2.3.6(@types/react@18.2.42)(react@18.2.0)
-      react-style-singleton: 2.2.1(@types/react@18.2.42)(react@18.2.0)
-      tslib: 2.6.2
-      use-callback-ref: 1.3.1(@types/react@18.2.42)(react@18.2.0)
-      use-sidecar: 1.1.2(@types/react@18.2.42)(react@18.2.0)
-    optionalDependencies:
-      '@types/react': 18.2.42
-
   react-remove-scroll@2.5.5(@types/react@18.2.74)(react@18.2.0):
     dependencies:
       react: 18.2.0
@@ -10955,15 +7728,6 @@ snapshots:
     dependencies:
       react-dom: 18.2.0(react@18.2.0)
 
-  react-style-singleton@2.2.1(@types/react@18.2.42)(react@18.2.0):
-    dependencies:
-      get-nonce: 1.0.1
-      invariant: 2.2.4
-      react: 18.2.0
-      tslib: 2.6.2
-    optionalDependencies:
-      '@types/react': 18.2.42
-
   react-style-singleton@2.2.1(@types/react@18.2.74)(react@18.2.0):
     dependencies:
       get-nonce: 1.0.1
@@ -11066,22 +7830,6 @@ snapshots:
       '@rollup/rollup-win32-x64-msvc': 4.14.0
       fsevents: 2.3.3
 
-  rollup@4.6.1:
-    optionalDependencies:
-      '@rollup/rollup-android-arm-eabi': 4.6.1
-      '@rollup/rollup-android-arm64': 4.6.1
-      '@rollup/rollup-darwin-arm64': 4.6.1
-      '@rollup/rollup-darwin-x64': 4.6.1
-      '@rollup/rollup-linux-arm-gnueabihf': 4.6.1
-      '@rollup/rollup-linux-arm64-gnu': 4.6.1
-      '@rollup/rollup-linux-arm64-musl': 4.6.1
-      '@rollup/rollup-linux-x64-gnu': 4.6.1
-      '@rollup/rollup-linux-x64-musl': 4.6.1
-      '@rollup/rollup-win32-arm64-msvc': 4.6.1
-      '@rollup/rollup-win32-ia32-msvc': 4.6.1
-      '@rollup/rollup-win32-x64-msvc': 4.6.1
-      fsevents: 2.3.3
-
   run-parallel@1.2.0:
     dependencies:
       queue-microtask: 1.2.3
@@ -11136,8 +7884,6 @@ snapshots:
 
   slash@5.1.0: {}
 
-  source-map-js@1.0.2: {}
-
   source-map-js@1.2.0: {}
 
   source-map@0.5.7: {}
@@ -11222,7 +7968,7 @@ snapshots:
       '@types/stylis': 4.2.4
       css-to-react-native: 3.2.0
       csstype: 3.1.2
-      postcss: 8.4.38
+      postcss: 8.4.40
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
       shallowequal: 1.1.0
@@ -11328,15 +8074,8 @@ snapshots:
 
   ts-interface-checker@0.1.13: {}
 
-  tslib@1.14.1: {}
-
   tslib@2.6.2: {}
 
-  tsutils@3.21.0(typescript@5.5.2):
-    dependencies:
-      tslib: 1.14.1
-      typescript: 5.5.2
-
   tty-browserify@0.0.1: {}
 
   type-check@0.4.0:
@@ -11424,13 +8163,6 @@ snapshots:
       punycode: 1.4.1
       qs: 6.11.2
 
-  use-callback-ref@1.3.1(@types/react@18.2.42)(react@18.2.0):
-    dependencies:
-      react: 18.2.0
-      tslib: 2.6.2
-    optionalDependencies:
-      '@types/react': 18.2.42
-
   use-callback-ref@1.3.1(@types/react@18.2.74)(react@18.2.0):
     dependencies:
       react: 18.2.0
@@ -11447,18 +8179,10 @@ snapshots:
 
   use-deep-compare-effect@1.8.1(react@18.2.0):
     dependencies:
-      '@babel/runtime': 7.23.9
+      '@babel/runtime': 7.24.4
       dequal: 2.0.3
       react: 18.2.0
 
-  use-sidecar@1.1.2(@types/react@18.2.42)(react@18.2.0):
-    dependencies:
-      detect-node-es: 1.1.0
-      react: 18.2.0
-      tslib: 2.6.2
-    optionalDependencies:
-      '@types/react': 18.2.42
-
   use-sidecar@1.1.2(@types/react@18.2.74)(react@18.2.0):
     dependencies:
       detect-node-es: 1.1.0
@@ -11523,46 +8247,29 @@ snapshots:
       - rollup
       - supports-color
 
-  vite-plugin-dts@3.8.1(@types/node@20.12.4)(rollup@4.14.0)(typescript@5.5.2)(vite@5.2.8(@types/node@20.12.4)):
-    dependencies:
-      '@microsoft/api-extractor': 7.43.0(@types/node@20.12.4)
-      '@rollup/pluginutils': 5.1.0(rollup@4.14.0)
-      '@vue/language-core': 1.8.27(typescript@5.5.2)
-      debug: 4.3.4(supports-color@5.5.0)
-      kolorist: 1.8.0
-      magic-string: 0.30.9
-      typescript: 5.5.2
-      vue-tsc: 1.8.27(typescript@5.5.2)
-    optionalDependencies:
-      vite: 5.2.8(@types/node@20.12.4)
-    transitivePeerDependencies:
-      - '@types/node'
-      - rollup
-      - supports-color
-
-  vite-plugin-node-polyfills@0.17.0(rollup@4.14.0)(vite@5.0.6(@types/node@20.12.4)):
+  vite-plugin-node-polyfills@0.17.0(rollup@4.14.0)(vite@5.3.5(@types/node@20.12.4)):
     dependencies:
       '@rollup/plugin-inject': 5.0.5(rollup@4.14.0)
       buffer-polyfill: buffer@6.0.3
       node-stdlib-browser: 1.2.0
       process: 0.11.10
-      vite: 5.0.6(@types/node@20.12.4)
+      vite: 5.3.5(@types/node@20.12.4)
     transitivePeerDependencies:
       - rollup
 
-  vite@5.0.6(@types/node@20.12.4):
+  vite@5.2.8(@types/node@20.12.4):
     dependencies:
-      esbuild: 0.19.8
+      esbuild: 0.20.2
       postcss: 8.4.38
-      rollup: 4.6.1
+      rollup: 4.14.0
     optionalDependencies:
       '@types/node': 20.12.4
       fsevents: 2.3.3
 
-  vite@5.2.8(@types/node@20.12.4):
+  vite@5.3.5(@types/node@20.12.4):
     dependencies:
-      esbuild: 0.20.2
-      postcss: 8.4.38
+      esbuild: 0.21.5
+      postcss: 8.4.40
       rollup: 4.14.0
     optionalDependencies:
       '@types/node': 20.12.4
@@ -11582,13 +8289,6 @@ snapshots:
       semver: 7.5.4
       typescript: 5.3.3
 
-  vue-tsc@1.8.27(typescript@5.5.2):
-    dependencies:
-      '@volar/typescript': 1.11.1
-      '@vue/language-core': 1.8.27(typescript@5.5.2)
-      semver: 7.5.4
-      typescript: 5.5.2
-
   wasmbuilder@0.0.16: {}
 
   wasmcurves@0.2.2:
@@ -11661,11 +8361,11 @@ snapshots:
 
   zod@3.22.4: {}
 
-  zustand@4.4.7(@types/react@18.2.42)(react@18.2.0):
+  zustand@4.4.7(@types/react@18.3.3)(react@18.2.0):
     dependencies:
       use-sync-external-store: 1.2.0(react@18.2.0)
     optionalDependencies:
-      '@types/react': 18.2.42
+      '@types/react': 18.3.3
       react: 18.2.0
 
   zwitch@2.0.4: {}
diff --git a/tsconfig.json b/tsconfig.json
index 688260ad..e14e8583 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -20,6 +20,5 @@
     "noUnusedParameters": true,
     "noFallthroughCasesInSwitch": true
   },
-  "include": ["packages/*/src/**/*.ts", "packages/*/src/**/*.tsx"],
   "references": [{ "path": "./tsconfig.node.json" }]
 }

From 836a001ba008e97ffc15360957c3505227c285e6 Mon Sep 17 00:00:00 2001
From: Camilo Vega <59750365+camilovegag@users.noreply.github.com>
Date: Mon, 29 Jul 2024 09:27:39 -0500
Subject: [PATCH 12/15] 688 add onboarding to next streamline (#700)

* Delete onboarding page

* Remove onboardin from app

* Update store

* Install react joyride

* Create onboarding component

* Fix missing border at cycle component

* Enhance layout

* Modified tabs error message

* Update favicon

* Add classname prop to tabs header

* Create steps and helper function

* Add onboarding to event page

* Add onboarding to cycle page

* Update cycles content

* Adding classNames

* Change text

* Add results steps

* Add onboarding to results & type fixes

* Update classNames

* Update lock file

* Add optional chaining
---
 package.json                                  |   2 +-
 packages/api/src/types/Cycles.ts              |   4 +-
 packages/api/src/types/Questions.ts           |   2 +-
 packages/berlin/package.json                  |   3 +-
 .../columns/cycle-columns/CycleColumns.tsx    |   2 +-
 .../berlin/src/components/cycles/Cycles.tsx   |  18 +-
 .../src/components/onboarding/Onboarding.tsx  |   5 +
 .../src/components/onboarding/Steps.tsx       | 215 ++++++++++++++++++
 .../src/components/option-card/OptionCard.tsx |   6 +-
 .../tables/results-table/ResultsTable.tsx     |  19 +-
 .../berlin/src/components/tabs/TabsHeader.tsx |   5 +-
 packages/berlin/src/pages/Cycle.tsx           |  15 +-
 packages/berlin/src/pages/Event.tsx           |  55 +++--
 packages/berlin/src/pages/Results.tsx         |  73 +++---
 pnpm-lock.yaml                                | 132 +++++++++++
 15 files changed, 465 insertions(+), 91 deletions(-)
 create mode 100644 packages/berlin/src/components/onboarding/Steps.tsx

diff --git a/package.json b/package.json
index 83022304..ad1e00e1 100644
--- a/package.json
+++ b/package.json
@@ -26,4 +26,4 @@
   "engines": {
     "node": "^20"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/api/src/types/Cycles.ts b/packages/api/src/types/Cycles.ts
index 56ff9166..56a80231 100644
--- a/packages/api/src/types/Cycles.ts
+++ b/packages/api/src/types/Cycles.ts
@@ -13,13 +13,13 @@ export type GetCycleResponse = {
     updatedAt: string;
     questionSubTitle: string | null;
     cycleId: string;
-    questionTitle: string;
+    title: string;
     options: {
       id: string;
       createdAt: string;
       updatedAt: string;
       questionId: string;
-      optionTitle: string;
+      title: string;
       optionSubTitle?: string;
       accepted: boolean;
       voteScore?: number;
diff --git a/packages/api/src/types/Questions.ts b/packages/api/src/types/Questions.ts
index 3ce98759..a44ccc38 100644
--- a/packages/api/src/types/Questions.ts
+++ b/packages/api/src/types/Questions.ts
@@ -6,7 +6,7 @@ export type GetQuestionStatisticsResponse = {
   optionStats: Record<
     string,
     {
-      optionTitle: string;
+      title: string;
       pluralityScore: string;
       distinctUsers: string;
       allocatedHearts: string;
diff --git a/packages/berlin/package.json b/packages/berlin/package.json
index 1a307f70..e49e756d 100644
--- a/packages/berlin/package.json
+++ b/packages/berlin/package.json
@@ -28,13 +28,14 @@
     "@pcd/semaphore-identity-pcd": "^0.8.0",
     "@pcd/semaphore-signature-pcd": "^0.9.0",
     "@tanstack/react-query": "^5.13.4",
-    "react": "^18.2.0",
     "react-content-loader": "^7.0.0",
     "react-dom": "^18.2.0",
     "react-hook-form": "^7.49.3",
     "react-hot-toast": "^2.4.1",
+    "react-joyride": "^2.8.2",
     "react-markdown": "^9.0.1",
     "react-router-dom": "^6.20.1",
+    "react": "^18.2.0",
     "styled-components": "^6.1.1",
     "zod": "^3.22.4",
     "zustand": "^4.4.7",
diff --git a/packages/berlin/src/components/columns/cycle-columns/CycleColumns.tsx b/packages/berlin/src/components/columns/cycle-columns/CycleColumns.tsx
index c1161717..615236c6 100644
--- a/packages/berlin/src/components/columns/cycle-columns/CycleColumns.tsx
+++ b/packages/berlin/src/components/columns/cycle-columns/CycleColumns.tsx
@@ -21,7 +21,7 @@ function CycleColumns({ onColumnClick, showScore }: CycleColumnsProps) {
       <Affiliation onClick={() => onColumnClick('affiliation')}>
         <Body>Affiliation</Body>
       </Affiliation>
-      <Hearts onClick={() => onColumnClick('numOfVotes')}>
+      <Hearts onClick={() => onColumnClick('numOfVotes')} className="hearts">
         <Icon>
           <Heart fill="#ff0000" />
         </Icon>
diff --git a/packages/berlin/src/components/cycles/Cycles.tsx b/packages/berlin/src/components/cycles/Cycles.tsx
index 7b29b7e9..5b8c16b3 100644
--- a/packages/berlin/src/components/cycles/Cycles.tsx
+++ b/packages/berlin/src/components/cycles/Cycles.tsx
@@ -1,23 +1,35 @@
 import { GetCycleResponse } from 'api';
 import { Body } from '../typography/Body.styled';
+import { useNavigate } from 'react-router-dom';
 
 type CyclesProps = {
   cycles: GetCycleResponse[] | undefined;
   errorMessage: string;
+  eventId: string | undefined;
 };
 
-function Cycles({ cycles, errorMessage }: CyclesProps) {
+function Cycles({ cycles, errorMessage, eventId }: CyclesProps) {
+  const navigate = useNavigate();
+
   const formatDate = (date: string) => {
     const eventEndDate = new Date(date);
     return new Intl.DateTimeFormat('en-US', { month: 'long', day: 'numeric' }).format(eventEndDate);
   };
 
+  const handleCycleClick = (cycleId: string) => {
+    navigate(`/events/${eventId}/cycles/${cycleId}`);
+  };
+
   return (
     <>
       {cycles?.length ? (
         cycles.map((cycle) => (
-          <div className="border-secondary flex w-full flex-col gap-4 p-4" key={cycle.id}>
-            <Body>{cycle.questions[0]?.questionTitle}</Body>
+          <div
+            className="border-secondary flex w-full flex-col gap-4 border p-4"
+            key={cycle.id}
+            onClick={() => handleCycleClick(cycle.id)}
+          >
+            <Body>{cycle?.questions[0]?.title}</Body>
             <Body>{formatDate(cycle.endAt)}</Body>
           </div>
         ))
diff --git a/packages/berlin/src/components/onboarding/Onboarding.tsx b/packages/berlin/src/components/onboarding/Onboarding.tsx
index 33c9c808..5df2a97c 100644
--- a/packages/berlin/src/components/onboarding/Onboarding.tsx
+++ b/packages/berlin/src/components/onboarding/Onboarding.tsx
@@ -70,4 +70,9 @@ function Onboarding({ steps, type }: OnboardingProps) {
   );
 }
 
+function OnboardingCard({ children }: { children: ReactNode }) {
+  return <article className="bg-primary flex flex-col gap-3 p-0 text-left">{children}</article>;
+}
+
+export { OnboardingCard };
 export default Onboarding;
diff --git a/packages/berlin/src/components/onboarding/Steps.tsx b/packages/berlin/src/components/onboarding/Steps.tsx
new file mode 100644
index 00000000..1f524160
--- /dev/null
+++ b/packages/berlin/src/components/onboarding/Steps.tsx
@@ -0,0 +1,215 @@
+import { Body } from '../typography/Body.styled';
+import { FlexColumn } from '../containers/FlexColumn.styled';
+import { FlexRow } from '../containers/FlexRow.styled';
+import { Heart, Radical } from 'lucide-react';
+import { OnboardingCard } from './Onboarding';
+import { ReactNode } from 'react';
+import { Subtitle } from '../typography/Subtitle.styled';
+import Icon from '../icon';
+import IconButton from '../icon-button';
+import { useAppStore } from '@/store';
+
+export const eventSteps = [
+  createStep({
+    target: 'event',
+    placement: 'center',
+    title: 'Welcome',
+    children: (
+      <>
+        <Body>Welcome to our tool!</Body>
+        <Body>Would you like to take a tour to see how it works?</Body>
+      </>
+    ),
+  }),
+  createStep({
+    target: 'cycles',
+    title: 'Open Votes',
+    children: <Body>Explore current vote items, the vote deadline, and cast your vote.</Body>,
+  }),
+  createStep({
+    target: 'tabs',
+    title: 'Closed Votes',
+    children: <Body>Review past votes and see the results.</Body>,
+  }),
+];
+
+export const cycleSteps = [
+  createStep({
+    target: 'welcome',
+    title: 'Voting Page',
+    placement: 'center',
+    children: <Body>View vote items and allocate your hearts.</Body>,
+  }),
+  createStep({
+    target: 'votes',
+    title: 'Vote',
+
+    children: (
+      <FlexRow>
+        <FlexColumn $gap="-4px" style={{ width: 16 }}>
+          <IconButton
+            $padding={0}
+            $color="secondary"
+            icon={{ src: `/icons/upvote-${useAppStore.getState().theme}.svg`, alt: 'Upvote arrow' }}
+            $width={16}
+            $height={16}
+          />
+          <IconButton
+            $padding={0}
+            $color="secondary"
+            icon={{
+              src: `/icons/downvote-${useAppStore.getState().theme}.svg`,
+              alt: 'Downvote arrow',
+            }}
+            $width={16}
+            $height={16}
+          />
+        </FlexColumn>
+        <Body>Upvote or downvote a vote item.</Body>
+      </FlexRow>
+    ),
+  }),
+  createStep({
+    target: 'save',
+    title: 'Save Your Votes',
+    children: <Body>You must click this button or your votes will not be recorded.</Body>,
+  }),
+  createStep({
+    target: 'hearts',
+    title: 'Information',
+    children: (
+      <>
+        <Body>View vote item.</Body>
+        <FlexRow>
+          <Icon>
+            <Heart fill="#ff0000" />
+          </Icon>
+          <Body>Current number of hearts allocated to this vote item.</Body>
+        </FlexRow>
+      </>
+    ),
+  }),
+  createStep({
+    target: 'plurality',
+    title: 'Voting Mechanisms',
+    placement: 'center',
+    children: (
+      <FlexRow>
+        <IconButton
+          $padding={0}
+          $color="secondary"
+          icon={{ src: `/icons/plurality-score.svg`, alt: 'Plurality score icon' }}
+          $width={24}
+          $height={24}
+        />
+        <Body>
+          Plurality score, unlike quadratic score, considers pre-existing participant relationships
+        </Body>
+      </FlexRow>
+    ),
+  }),
+  createStep({
+    target: 'expand',
+    title: 'Expand a vote item',
+
+    children: (
+      <FlexRow>
+        <IconButton
+          $padding={0}
+          $color="secondary"
+          icon={{
+            src: `/icons/arrow-down-${useAppStore.getState().theme}.svg`,
+            alt: 'Arrow down icon',
+          }}
+          $width={24}
+          $height={24}
+        />
+        <Body>Click to view the vote item description and other useful information.</Body>
+      </FlexRow>
+    ),
+  }),
+];
+
+export const resultsSteps = [
+  createStep({
+    target: 'welcome',
+    placement: 'center',
+    title: 'Results Page',
+    children: <Body>See community decisions.</Body>,
+  }),
+  createStep({
+    target: 'icons',
+    placement: 'center',
+    title: 'Icons',
+    children: (
+      <>
+        <FlexRow>
+          <Icon>
+            <Radical />
+          </Icon>
+          <Body>Quadratic score</Body>
+        </FlexRow>
+        <FlexRow>
+          <Icon>
+            <Heart fill="#ff0000" />
+          </Icon>
+          <Body>Hearts received by a vote item</Body>
+        </FlexRow>
+        <FlexRow>
+          <IconButton
+            $padding={0}
+            $color="secondary"
+            icon={{ src: `/icons/plurality-score.svg`, alt: 'Plurality icon' }}
+            $width={24}
+            $height={24}
+          />
+          <Body>Plurality score</Body>
+        </FlexRow>
+      </>
+    ),
+  }),
+  createStep({
+    target: 'expand',
+    placement: 'center',
+    title: 'Expand a vote item',
+    children: (
+      <>
+        <FlexRow>
+          <IconButton
+            $padding={0}
+            $color="secondary"
+            icon={{
+              src: `/icons/arrow-down-${useAppStore.getState().theme}.svg`,
+              alt: 'Arrow down icon',
+            }}
+            $width={24}
+            $height={24}
+          />
+          <Body>
+            Clicking this icon will display the vote item description and other useful information.
+          </Body>
+        </FlexRow>
+      </>
+    ),
+  }),
+];
+
+type StepProps = {
+  target: string;
+  placement?: string;
+  title: string;
+  children: ReactNode;
+};
+
+function createStep({ target, placement, title, children }: StepProps) {
+  return {
+    target: `.${target}`, // Prefix the target with a dot to use it as a className selector
+    placement,
+    content: (
+      <OnboardingCard>
+        <Subtitle>{title}</Subtitle>
+        {children}
+      </OnboardingCard>
+    ),
+  };
+}
diff --git a/packages/berlin/src/components/option-card/OptionCard.tsx b/packages/berlin/src/components/option-card/OptionCard.tsx
index 6ac20e37..89be1037 100644
--- a/packages/berlin/src/components/option-card/OptionCard.tsx
+++ b/packages/berlin/src/components/option-card/OptionCard.tsx
@@ -82,7 +82,7 @@ function OptionCard({
   }, [optionUsers, option.user?.username]);
 
   return (
-    <Card $expanded={expanded}>
+    <Card $expanded={expanded} className="expand">
       <FlexColumn>
         <Container>
           <Proposal>
@@ -95,7 +95,7 @@ function OptionCard({
                 $flipVertical={expanded}
               />
             </ArrowDownIcon>
-            <Body>{option.optionTitle}</Body>
+            <Body>{option.title}</Body>
           </Proposal>
           <Author>
             <Field>Lead:</Field>
@@ -109,7 +109,7 @@ function OptionCard({
             </Body>
           </Affiliation>
           <Votes $showScore={showScore}>
-            <VotesIcon $gap="-4px">
+            <VotesIcon $gap="-4px" className="votes">
               <IconButton
                 $padding={0}
                 $color="secondary"
diff --git a/packages/berlin/src/components/tables/results-table/ResultsTable.tsx b/packages/berlin/src/components/tables/results-table/ResultsTable.tsx
index c83b948b..67a9012e 100644
--- a/packages/berlin/src/components/tables/results-table/ResultsTable.tsx
+++ b/packages/berlin/src/components/tables/results-table/ResultsTable.tsx
@@ -1,8 +1,7 @@
 // React and third-party libraries
 import { useQuery } from '@tanstack/react-query';
-import { Heart, MessageSquareText, Radical } from 'lucide-react';
+import { Heart, Radical } from 'lucide-react';
 import { useMemo } from 'react';
-import { useNavigate } from 'react-router-dom';
 import Markdown from 'react-markdown';
 
 // API
@@ -18,7 +17,6 @@ import IconButton from '../../icon-button';
 import { Body } from '../../typography/Body.styled';
 import { Bold } from '../../typography/Bold.styled';
 import Link from '../../link';
-import LucideIcon from '@/components/icon';
 
 // Styled Components
 import { Card, Funding, Icon, Plurality, TitleContainer } from './ResultsTable.styled';
@@ -28,7 +26,7 @@ type ResultsTableProps = {
   eventId?: string;
   cycleId?: string;
   option: {
-    optionTitle: string;
+    title: string;
     pluralityScore: string;
     distinctUsers: string;
     allocatedHearts: string;
@@ -42,9 +40,8 @@ type ResultsTableProps = {
   onClick: () => void;
 };
 
-function ResultsTable({ $expanded, option, onClick, cycleId, eventId }: ResultsTableProps) {
+function ResultsTable({ $expanded, option, onClick, eventId }: ResultsTableProps) {
   const theme = useAppStore((state) => state.theme);
-  const navigate = useNavigate();
   const formattedQuadraticScore = useMemo(() => {
     const score = parseFloat(option.quadraticScore);
     return score % 1 === 0 ? score.toFixed(0) : score.toFixed(3);
@@ -98,10 +95,6 @@ function ResultsTable({ $expanded, option, onClick, cycleId, eventId }: ResultsT
     )
     .map((user) => `${user.firstName} ${user.lastName}`);
 
-  const handleCommentsClick = () => {
-    navigate(`/events/${eventId}/cycles/${cycleId}/options/${option.id}`);
-  };
-
   return (
     <Card $expanded={$expanded} $showFunding={option.allocatedFunding !== null} $rowgap="2rem">
       <TitleContainer>
@@ -112,7 +105,7 @@ function ResultsTable({ $expanded, option, onClick, cycleId, eventId }: ResultsT
           $flipVertical={$expanded}
           onClick={onClick}
         />
-        <Body>{option.optionTitle}</Body>
+        <Body>{option.title}</Body>
       </TitleContainer>
       <FlexRow>
         <Icon>
@@ -155,7 +148,6 @@ function ResultsTable({ $expanded, option, onClick, cycleId, eventId }: ResultsT
           />
         </Icon>
         <Body>{option.allocatedFunding} ARB</Body>
-
         <IconButton
           $padding={0}
           $color="secondary"
@@ -200,9 +192,6 @@ function ResultsTable({ $expanded, option, onClick, cycleId, eventId }: ResultsT
         <Body>
           <Bold>Voter affiliations:</Bold> {option.listOfGroupNames.join(', ')}
         </Body>
-        <LucideIcon>
-          <MessageSquareText onClick={handleCommentsClick} />
-        </LucideIcon>
       </FlexColumn>
     </Card>
   );
diff --git a/packages/berlin/src/components/tabs/TabsHeader.tsx b/packages/berlin/src/components/tabs/TabsHeader.tsx
index 53cf930b..1c256e88 100644
--- a/packages/berlin/src/components/tabs/TabsHeader.tsx
+++ b/packages/berlin/src/components/tabs/TabsHeader.tsx
@@ -5,10 +5,11 @@ import { Tab } from './TabsHeader.styled';
 type TabsHeaderProps = {
   tabNames: string[];
   initialTab?: string;
+  className?: string;
   onTabChange?: (tab: string) => void;
 };
 
-export function TabsHeader({ tabNames, initialTab, onTabChange }: TabsHeaderProps) {
+export function TabsHeader({ tabNames, initialTab, className, onTabChange }: TabsHeaderProps) {
   const [activeTab, setActiveTab] = useState<string>(initialTab || tabNames[0]);
 
   const handleTabClick = (tab: string) => {
@@ -19,7 +20,7 @@ export function TabsHeader({ tabNames, initialTab, onTabChange }: TabsHeaderProp
   };
 
   return (
-    <div className="flex gap-2">
+    <div className={`flex gap-2 ${className}`}>
       {tabNames.map((tabName, index) => (
         <Fragment key={tabName}>
           <Tab
diff --git a/packages/berlin/src/pages/Cycle.tsx b/packages/berlin/src/pages/Cycle.tsx
index e1e2eef5..354aecf9 100644
--- a/packages/berlin/src/pages/Cycle.tsx
+++ b/packages/berlin/src/pages/Cycle.tsx
@@ -25,15 +25,17 @@ import { useAppStore } from '../store';
 // Components
 import { Body } from '../components/typography/Body.styled';
 import { Bold } from '../components/typography/Bold.styled';
+import { cycleSteps } from '@/components/onboarding/Steps';
+import { FINAL_QUESTION_TITLE, INITIAL_HEARTS } from '../utils/constants';
 import { FlexColumn } from '../components/containers/FlexColumn.styled';
 import { FlexRow } from '../components/containers/FlexRow.styled';
+import { Heart } from 'lucide-react';
 import { Title } from '../components/typography/Title.styled';
 import BackButton from '../components/back-button';
 import Button from '../components/button';
 import CycleColumns from '../components/columns/cycle-columns';
+import Onboarding from '@/components/onboarding';
 import OptionCard from '../components/option-card';
-import { FINAL_QUESTION_TITLE, INITIAL_HEARTS } from '../utils/constants';
-import { Heart } from 'lucide-react';
 
 type Order = 'asc' | 'desc';
 type LocalUserVotes = { optionId: string; numOfVotes: number }[];
@@ -297,10 +299,11 @@ function Cycle() {
 
   return (
     <>
-      <FlexColumn $gap="2rem">
+      <Onboarding steps={cycleSteps} type="cycle" />
+      <FlexColumn $gap="2rem" className="welcome plurality">
         <FlexColumn>
           <BackButton fallbackRoute={`/events/${eventId}/cycles`} />
-          <Title>{currentCycle?.questionTitle}</Title>
+          <Title>{currentCycle?.title}</Title>
           <Body>{voteInfo}</Body>
           <Body>
             You have <Bold>{availableHearts}</Bold> hearts left to give away:
@@ -310,7 +313,7 @@ function Cycle() {
               <Heart key={id} fill={id < availableHearts ? '#ff0000' : 'none'} />
             ))}
           </FlexRow>
-          <Button onClick={handleSaveVotesWrapper} disabled={!votesAreDifferent}>
+          <Button onClick={handleSaveVotesWrapper} disabled={!votesAreDifferent} className="save">
             Save all votes
           </Button>
         </FlexColumn>
@@ -325,7 +328,7 @@ function Cycle() {
                   key={option.id}
                   option={option}
                   numOfVotes={numOfVotes}
-                  showFundingRequest={currentCycle.questionTitle === FINAL_QUESTION_TITLE}
+                  showFundingRequest={currentCycle.title === FINAL_QUESTION_TITLE}
                   showScore={currentCycle.showScore}
                   onVote={() => handleVoteWrapper(option.id)}
                   onUnVote={() => handleUnVoteWrapper(option.id)}
diff --git a/packages/berlin/src/pages/Event.tsx b/packages/berlin/src/pages/Event.tsx
index 1e83f543..0179b01c 100644
--- a/packages/berlin/src/pages/Event.tsx
+++ b/packages/berlin/src/pages/Event.tsx
@@ -8,13 +8,15 @@ import { fetchEvent, fetchEventCycles } from 'api';
 
 // Components
 import { Body } from '../components/typography/Body.styled';
+import { eventSteps } from '@/components/onboarding/Steps';
 import { FlexColumn } from '../components/containers/FlexColumn.styled';
 import { Subtitle } from '../components/typography/Subtitle.styled';
+import * as Tabs from '../components/tabs';
+import BackButton from '@/components/back-button';
 import Cycles from '../components/cycles';
 import Link from '../components/link';
-import * as Tabs from '../components/tabs';
 import Markdown from 'react-markdown';
-import BackButton from '@/components/back-button';
+import Onboarding from '@/components/onboarding';
 
 function Event() {
   const { eventId } = useParams();
@@ -46,32 +48,37 @@ function Event() {
   const [activeTab, setActiveTab] = useState<string>('upcoming');
 
   const tabs = {
-    upcoming: <Cycles cycles={openCycles} errorMessage="No upcoming events" />,
-    past: <Cycles cycles={closedCycles} errorMessage="No past events" />,
+    upcoming: <Cycles cycles={openCycles} eventId={eventId} errorMessage="No upcoming events..." />,
+    past: <Cycles cycles={closedCycles} eventId={eventId} errorMessage="No past events..." />,
   };
 
   return (
-    <FlexColumn $gap="2rem">
-      <BackButton />
-      <Subtitle>{event?.name}</Subtitle>
-      {event?.description && (
-        <Markdown
-          components={{
-            a: ({ node, ...props }) => <Link to={props.href ?? ''}>{props.children}</Link>,
-            p: ({ node, ...props }) => <Body>{props.children}</Body>,
-          }}
-        >
-          {event.description}
-        </Markdown>
-      )}
-      <div className="flex w-full flex-col justify-between gap-2 md:flex-row md:items-center">
-        <Subtitle>Questions</Subtitle>
-        <Tabs.TabsHeader tabNames={tabNames} onTabChange={setActiveTab} />
-      </div>
-      <FlexColumn>
-        <Tabs.TabsManager tabs={tabs} tab={activeTab} fallback={'Tab not found'} />
+    <>
+      <Onboarding steps={eventSteps} type="event" />
+      <FlexColumn $gap="2rem" className="event">
+        <BackButton />
+        <section className="flex flex-col gap-4">
+          <Subtitle>{event?.name}</Subtitle>
+          {event?.description && (
+            <Markdown
+              components={{
+                a: ({ node, ...props }) => <Link to={props.href ?? ''}>{props.children}</Link>,
+                p: ({ node, ...props }) => <Body>{props.children}</Body>,
+              }}
+            >
+              {event.description}
+            </Markdown>
+          )}
+        </section>
+        <section className="flex w-full flex-col justify-between gap-2 md:flex-row md:items-center">
+          <Subtitle>Questions</Subtitle>
+          <Tabs.TabsHeader className="tabs" tabNames={tabNames} onTabChange={setActiveTab} />
+        </section>
+        <FlexColumn className="cycles">
+          <Tabs.TabsManager tabs={tabs} tab={activeTab} fallback={'Tab not found'} />
+        </FlexColumn>
       </FlexColumn>
-    </FlexColumn>
+    </>
   );
 }
 
diff --git a/packages/berlin/src/pages/Results.tsx b/packages/berlin/src/pages/Results.tsx
index 01ba66b9..a2b98a72 100644
--- a/packages/berlin/src/pages/Results.tsx
+++ b/packages/berlin/src/pages/Results.tsx
@@ -1,17 +1,23 @@
-import { useAppStore } from '@/store';
+// React and third party libraries
+import { useParams } from 'react-router-dom';
 import { useQuery } from '@tanstack/react-query';
-import { fetchCycle, fetchQuestionFunding, fetchQuestionStatistics } from 'api';
 import { useState } from 'react';
-import { useParams } from 'react-router-dom';
+
+// API
+import { fetchCycle, fetchQuestionFunding, fetchQuestionStatistics } from 'api';
+
+// Components
+import { Column } from '../components/tables/results-table/ResultsTable.styled';
+import { FINAL_QUESTION_TITLE } from '../utils/constants';
+import { FlexColumn } from '../components/containers/FlexColumn.styled';
+import { resultsSteps } from '@/components/onboarding/Steps';
+import { Subtitle } from '../components/typography/Subtitle.styled';
 import BackButton from '../components/back-button';
+import Onboarding from '@/components/onboarding';
 import ResultsColumns from '../components/columns/results-columns';
-import StatsColumns from '../components/columns/stats-columns';
-import { FlexColumn } from '../components/containers/FlexColumn.styled';
 import ResultsTable from '../components/tables/results-table';
-import { Column } from '../components/tables/results-table/ResultsTable.styled';
+import StatsColumns from '../components/columns/stats-columns';
 import StatsTable from '../components/tables/stats-table';
-import { Subtitle } from '../components/typography/Subtitle.styled';
-import { FINAL_QUESTION_TITLE } from '../utils/constants';
 
 function Results() {
   const [expandedIndex, setExpandedIndex] = useState<number | null>(null);
@@ -44,7 +50,7 @@ function Results() {
         questionId: cycle?.questions[0].id || '',
         serverUrl: import.meta.env.VITE_SERVER_URL,
       }),
-    enabled: !!cycle?.id && cycle?.questions?.[0].questionTitle === FINAL_QUESTION_TITLE,
+    enabled: !!cycle?.id && cycle?.questions?.[0].title === FINAL_QUESTION_TITLE,
   });
 
   const overallStatistics = [
@@ -80,30 +86,33 @@ function Results() {
     .sort((a, b) => parseFloat(b.pluralityScore) - parseFloat(a.pluralityScore));
 
   return (
-    <FlexColumn $gap="2rem">
-      <BackButton fallbackRoute={`/events/${eventId}/cycles`} />
-      <Subtitle>Results for: {cycle?.questions?.[0].questionTitle}</Subtitle>
-      <Column>
-        <ResultsColumns $showFunding={!!funding} />
-        {optionStatsArray.map((option, index) => (
-          <ResultsTable
-            key={option.id}
-            $expanded={expandedIndex === index}
-            option={option}
-            cycleId={cycleId}
-            eventId={eventId}
-            onClick={() => setExpandedIndex(expandedIndex === index ? null : index)}
-          />
-        ))}
-      </Column>
-      <Subtitle>Overall Statistics</Subtitle>
-      <FlexColumn $gap="0">
-        <StatsColumns />
-        {overallStatistics.map((stat) => (
-          <StatsTable key={stat.id} title={stat.title} number={stat.data} />
-        ))}
+    <>
+      <Onboarding steps={resultsSteps} type="results" />
+      <FlexColumn $gap="2rem" className="welcome icons expand">
+        <BackButton fallbackRoute={`/events/${eventId}/cycles`} />
+        <Subtitle>Results for: {cycle?.questions?.[0].title}</Subtitle>
+        <Column>
+          <ResultsColumns $showFunding={!!funding} />
+          {optionStatsArray.map((option, index) => (
+            <ResultsTable
+              key={option.id}
+              $expanded={expandedIndex === index}
+              option={option}
+              cycleId={cycleId}
+              eventId={eventId}
+              onClick={() => setExpandedIndex(expandedIndex === index ? null : index)}
+            />
+          ))}
+        </Column>
+        <Subtitle>Overall Statistics</Subtitle>
+        <FlexColumn $gap="0">
+          <StatsColumns />
+          {overallStatistics.map((stat) => (
+            <StatsTable key={stat.id} title={stat.title} number={stat.data} />
+          ))}
+        </FlexColumn>
       </FlexColumn>
-    </FlexColumn>
+    </>
   );
 }
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e9808c39..4b497624 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -100,6 +100,9 @@ importers:
       react-hot-toast:
         specifier: ^2.4.1
         version: 2.4.1(csstype@3.1.2)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      react-joyride:
+        specifier: ^2.8.2
+        version: 2.8.2(@types/react@18.3.3)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       react-markdown:
         specifier: ^9.0.1
         version: 9.0.1(@types/react@18.3.3)(react@18.2.0)
@@ -855,6 +858,12 @@ packages:
   '@floating-ui/utils@0.2.1':
     resolution: {integrity: sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q==}
 
+  '@gilbarbara/deep-equal@0.1.2':
+    resolution: {integrity: sha512-jk+qzItoEb0D0xSSmrKDDzf9sheQj/BAPxlgNxgmOaA3mxpUa6ndJLYGZKsJnIVEQSD8zcTbyILz7I0HcnBCRA==}
+
+  '@gilbarbara/deep-equal@0.3.1':
+    resolution: {integrity: sha512-I7xWjLs2YSVMc5gGx1Z3ZG1lgFpITPndpi8Ku55GeEIKpACCPQNS/OTqQbxgTCfq0Ncvcc+CrFov96itVh6Qvw==}
+
   '@hookform/devtools@4.3.1':
     resolution: {integrity: sha512-CrWxEoHQZaOXJZVQ8KBgOuAa8p2LI8M0DAN5GTRTmdCieRwFVjVDEmuTAVazWVRRkpEQSgSt3KYp7VmmqXdEnw==}
     peerDependencies:
@@ -2094,6 +2103,9 @@ packages:
   decode-named-character-reference@1.0.2:
     resolution: {integrity: sha512-O8x12RzrUF8xyVcY0KJowWsmaJxQbmy0/EtnNtHRpsOcT7dFk5W598coHqBVpmWo1oQQfsCqfCmkZN5DJrZVdg==}
 
+  deep-diff@1.0.2:
+    resolution: {integrity: sha512-aWS3UIVH+NPGCD1kki+DCU9Dua032iSsO43LqQpcs4R3+dVv7tX0qBGjiVHJHjplsoUM2XRO/KB92glqc68awg==}
+
   deep-eql@4.1.3:
     resolution: {integrity: sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==}
     engines: {node: '>=6'}
@@ -2101,6 +2113,10 @@ packages:
   deep-is@0.1.4:
     resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
 
+  deepmerge@4.3.1:
+    resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==}
+    engines: {node: '>=0.10.0'}
+
   define-data-property@1.1.1:
     resolution: {integrity: sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==}
     engines: {node: '>= 0.4'}
@@ -2539,6 +2555,12 @@ packages:
   is-hexadecimal@2.0.1:
     resolution: {integrity: sha512-DgZQp241c8oO6cA1SbTEWiXeoxV42vlcJxgH+B3hi1AiqqKruZR3ZGF8In3fj4+/y/7rHvlOZLZtgJ/4ttYGZg==}
 
+  is-lite@0.8.2:
+    resolution: {integrity: sha512-JZfH47qTsslwaAsqbMI3Q6HNNjUuq6Cmzzww50TdP5Esb6e1y2sK2UAaZZuzfAzpoI2AkxoPQapZdlDuP6Vlsw==}
+
+  is-lite@1.2.1:
+    resolution: {integrity: sha512-pgF+L5bxC+10hLBgf6R2P4ZZUBOQIIacbdo8YvuCP8/JvsWxG7aZ9p10DYuLtifFci4l3VITphhMlMV4Y+urPw==}
+
   is-nan@1.3.2:
     resolution: {integrity: sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==}
     engines: {node: '>= 0.4'}
@@ -2995,6 +3017,10 @@ packages:
     resolution: {integrity: sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==}
     engines: {node: '>=10'}
 
+  popper.js@1.16.1:
+    resolution: {integrity: sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==}
+    deprecated: You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1
+
   postcss-cli@11.0.0:
     resolution: {integrity: sha512-xMITAI7M0u1yolVcXJ9XTZiO9aO49mcoKQy6pCDFdMh9kGqhzLVpWxeD/32M/QBmkhcGypZFFOLNLmIW4Pg4RA==}
     engines: {node: '>=18'}
@@ -3134,6 +3160,9 @@ packages:
     resolution: {integrity: sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==}
     engines: {node: '>= 0.6.0'}
 
+  prop-types@15.8.1:
+    resolution: {integrity: sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==}
+
   property-information@6.5.0:
     resolution: {integrity: sha512-PgTgs/BlvHxOu8QuEN7wi5A0OmXaBcHpmCSTehcs6Uuu9IkDIEo13Hy7n898RHfrQ49vKCoGeWZSaAK01nwVig==}
 
@@ -3178,6 +3207,12 @@ packages:
     peerDependencies:
       react: ^18.2.0
 
+  react-floater@0.7.9:
+    resolution: {integrity: sha512-NXqyp9o8FAXOATOEo0ZpyaQ2KPb4cmPMXGWkx377QtJkIXHlHRAGer7ai0r0C1kG5gf+KJ6Gy+gdNIiosvSicg==}
+    peerDependencies:
+      react: 15 - 18
+      react-dom: 15 - 18
+
   react-hook-form@7.49.3:
     resolution: {integrity: sha512-foD6r3juidAT1cOZzpmD/gOKt7fRsDhXXZ0y28+Al1CHgX+AY1qIN9VSIIItXRq1dN68QrRwl1ORFlwjBaAqeQ==}
     engines: {node: '>=18', pnpm: '8'}
@@ -3191,9 +3226,21 @@ packages:
       react: '>=16'
       react-dom: '>=16'
 
+  react-innertext@1.1.5:
+    resolution: {integrity: sha512-PWAqdqhxhHIv80dT9znP2KvS+hfkbRovFp4zFYHFFlOoQLRiawIic81gKb3U1wEyJZgMwgs3JoLtwryASRWP3Q==}
+    peerDependencies:
+      '@types/react': '>=0.0.0 <=99'
+      react: '>=0.0.0 <=99'
+
   react-is@16.13.1:
     resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==}
 
+  react-joyride@2.8.2:
+    resolution: {integrity: sha512-2QY8HB1G0I2OT0PKMUz7gg2HAjdkG2Bqi13r0Bb1V16PAwfb9khn4wWBTOJsGsjulbAWiQ3/0YrgNUHGFmuifw==}
+    peerDependencies:
+      react: 15 - 18
+      react-dom: 15 - 18
+
   react-markdown@9.0.1:
     resolution: {integrity: sha512-186Gw/vF1uRkydbsOIkcGXw7aHq0sZOCRFFjGrr7b9+nVZg4UfA4enXCaxm4fUzecU38sWfrNDitGhshuU7rdg==}
     peerDependencies:
@@ -3320,6 +3367,12 @@ packages:
   scheduler@0.23.0:
     resolution: {integrity: sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==}
 
+  scroll@3.0.1:
+    resolution: {integrity: sha512-pz7y517OVls1maEzlirKO5nPYle9AXsFzTMNJrRGmT951mzpIBy7sNHOg5o/0MQd/NqliCiWnAi0kZneMPFLcg==}
+
+  scrollparent@2.1.0:
+    resolution: {integrity: sha512-bnnvJL28/Rtz/kz2+4wpBjHzWoEzXhVg/TE8BeVGJHUqE8THNIRnDxDWMktwM+qahvlRdvlLdsQfYe+cuqfZeA==}
+
   scrypt-js@3.0.1:
     resolution: {integrity: sha512-cdwTTnqPu0Hyvf5in5asVdZocVDTNRmR7XEcJuIzMjJeSHybHl7vpB66AzwTaIg6CLSbtjcxc8fqcySfnTkccA==}
 
@@ -3506,6 +3559,12 @@ packages:
     resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
     engines: {node: '>=8.0'}
 
+  tree-changes@0.11.2:
+    resolution: {integrity: sha512-4gXlUthrl+RabZw6lLvcCDl6KfJOCmrC16BC5CRdut1EAH509Omgg0BfKLY+ViRlzrvYOTWR0FMS2SQTwzumrw==}
+
+  tree-changes@0.9.3:
+    resolution: {integrity: sha512-vvvS+O6kEeGRzMglTKbc19ltLWNtmNt1cpBoSYLj/iEcPVvpJasemKOlxBrmZaCtDJoF+4bwv3m01UKYi8mukQ==}
+
   trim-lines@3.0.1:
     resolution: {integrity: sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==}
 
@@ -3539,6 +3598,10 @@ packages:
     resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==}
     engines: {node: '>=10'}
 
+  type-fest@4.23.0:
+    resolution: {integrity: sha512-ZiBujro2ohr5+Z/hZWHESLz3g08BBdrdLMieYFULJO+tWc437sn8kQsWLJoZErY8alNhxre9K4p3GURAG11n+w==}
+    engines: {node: '>=16'}
+
   typescript@4.9.5:
     resolution: {integrity: sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==}
     engines: {node: '>=4.2.0'}
@@ -4533,6 +4596,10 @@ snapshots:
 
   '@floating-ui/utils@0.2.1': {}
 
+  '@gilbarbara/deep-equal@0.1.2': {}
+
+  '@gilbarbara/deep-equal@0.3.1': {}
+
   '@hookform/devtools@4.3.1(@types/react@18.3.3)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@emotion/react': 11.11.3(@types/react@18.3.3)(react@18.2.0)
@@ -6370,12 +6437,16 @@ snapshots:
     dependencies:
       character-entities: 2.0.2
 
+  deep-diff@1.0.2: {}
+
   deep-eql@4.1.3:
     dependencies:
       type-detect: 4.0.8
 
   deep-is@0.1.4: {}
 
+  deepmerge@4.3.1: {}
+
   define-data-property@1.1.1:
     dependencies:
       get-intrinsic: 1.2.2
@@ -6934,6 +7005,10 @@ snapshots:
 
   is-hexadecimal@2.0.1: {}
 
+  is-lite@0.8.2: {}
+
+  is-lite@1.2.1: {}
+
   is-nan@1.3.2:
     dependencies:
       call-bind: 1.0.5
@@ -7510,6 +7585,8 @@ snapshots:
     dependencies:
       find-up: 5.0.0
 
+  popper.js@1.16.1: {}
+
   postcss-cli@11.0.0(jiti@1.21.0)(postcss@8.4.38):
     dependencies:
       chokidar: 3.6.0
@@ -7597,6 +7674,12 @@ snapshots:
 
   process@0.11.10: {}
 
+  prop-types@15.8.1:
+    dependencies:
+      loose-envify: 1.4.0
+      object-assign: 4.1.1
+      react-is: 16.13.1
+
   property-information@6.5.0: {}
 
   public-encrypt@4.0.3:
@@ -7641,6 +7724,16 @@ snapshots:
       react: 18.2.0
       scheduler: 0.23.0
 
+  react-floater@0.7.9(react-dom@18.2.0(react@18.2.0))(react@18.2.0):
+    dependencies:
+      deepmerge: 4.3.1
+      is-lite: 0.8.2
+      popper.js: 1.16.1
+      prop-types: 15.8.1
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+      tree-changes: 0.9.3
+
   react-hook-form@7.49.3(react@18.2.0):
     dependencies:
       react: 18.2.0
@@ -7653,8 +7746,31 @@ snapshots:
     transitivePeerDependencies:
       - csstype
 
+  react-innertext@1.1.5(@types/react@18.3.3)(react@18.2.0):
+    dependencies:
+      '@types/react': 18.3.3
+      react: 18.2.0
+
   react-is@16.13.1: {}
 
+  react-joyride@2.8.2(@types/react@18.3.3)(react-dom@18.2.0(react@18.2.0))(react@18.2.0):
+    dependencies:
+      '@gilbarbara/deep-equal': 0.3.1
+      deep-diff: 1.0.2
+      deepmerge: 4.3.1
+      is-lite: 1.2.1
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+      react-floater: 0.7.9(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      react-innertext: 1.1.5(@types/react@18.3.3)(react@18.2.0)
+      react-is: 16.13.1
+      scroll: 3.0.1
+      scrollparent: 2.1.0
+      tree-changes: 0.11.2
+      type-fest: 4.23.0
+    transitivePeerDependencies:
+      - '@types/react'
+
   react-markdown@9.0.1(@types/react@18.3.3)(react@18.2.0):
     dependencies:
       '@types/hast': 3.0.4
@@ -7842,6 +7958,10 @@ snapshots:
     dependencies:
       loose-envify: 1.4.0
 
+  scroll@3.0.1: {}
+
+  scrollparent@2.1.0: {}
+
   scrypt-js@3.0.1: {}
 
   semver@6.3.1: {}
@@ -8060,6 +8180,16 @@ snapshots:
     dependencies:
       is-number: 7.0.0
 
+  tree-changes@0.11.2:
+    dependencies:
+      '@gilbarbara/deep-equal': 0.3.1
+      is-lite: 1.2.1
+
+  tree-changes@0.9.3:
+    dependencies:
+      '@gilbarbara/deep-equal': 0.1.2
+      is-lite: 0.8.2
+
   trim-lines@3.0.1: {}
 
   trough@2.2.0: {}
@@ -8086,6 +8216,8 @@ snapshots:
 
   type-fest@0.20.2: {}
 
+  type-fest@4.23.0: {}
+
   typescript@4.9.5: {}
 
   typescript@5.3.3: {}

From 91443d0ca5228737efcbc8ea415f689d45ce4399 Mon Sep 17 00:00:00 2001
From: Diego Alzate <diego35.da@gmail.com>
Date: Tue, 30 Jul 2024 14:42:29 +0100
Subject: [PATCH 13/15] v2.6.0 data and fields for registration (#701)

* unify onboarding states to one

* add initial login flow for account page

* add simple registration

* format fix

* fix nested li error

* fix logout error

* rework form structure for values

* handle server errors

* fix initial registration not being considered clean

* revert navlink to link change
---
 packages/api/src/fetchOption.ts               |   6 +-
 packages/api/src/postRegistration.ts          |   6 +-
 packages/api/src/putRegistration.ts           |   6 +-
 packages/api/src/types/Events.ts              |   1 +
 packages/api/src/types/Options.ts             |   7 +-
 packages/api/src/types/Questions.ts           |   1 +
 packages/api/src/types/RegistrationData.ts    |  46 +-
 packages/api/src/types/Registrations.ts       |   1 +
 packages/berlin/package.json                  |   2 +-
 packages/berlin/src/App.tsx                   | 244 ++++---
 .../berlin/src/_components/ui/command.tsx     |  14 +-
 packages/berlin/src/_components/ui/dialog.tsx |   8 +-
 .../berlin/src/_components/ui/popover.tsx     |   2 +-
 .../berlin/src/_components/ui/separator.tsx   |   2 +-
 .../src/components/form/AccountForm.tsx       |   2 +-
 .../berlin/src/components/header/Header.tsx   |   6 +-
 packages/berlin/src/pages/Account.tsx         |  25 +-
 packages/berlin/src/pages/Register.tsx        | 620 ++++--------------
 packages/berlin/src/store/index.ts            |   7 -
 packages/berlin/src/utils/form-validation.ts  |  46 ++
 packages/berlin/src/utils/formatGroups.ts     |  21 -
 .../{validation.ts => zod-error-handler.ts}   |   0
 22 files changed, 383 insertions(+), 690 deletions(-)
 create mode 100644 packages/berlin/src/utils/form-validation.ts
 delete mode 100644 packages/berlin/src/utils/formatGroups.ts
 rename packages/berlin/src/utils/{validation.ts => zod-error-handler.ts} (100%)

diff --git a/packages/api/src/fetchOption.ts b/packages/api/src/fetchOption.ts
index 138d29af..9feccc95 100644
--- a/packages/api/src/fetchOption.ts
+++ b/packages/api/src/fetchOption.ts
@@ -1,9 +1,9 @@
-import { ApiRequest, GetQuestionOptionResponse } from './types';
+import { ApiRequest, GetOptionResponse } from './types';
 
 export async function fetchOption({
   serverUrl,
   optionId,
-}: ApiRequest<{ optionId: string }>): Promise<GetQuestionOptionResponse | null> {
+}: ApiRequest<{ optionId: string }>): Promise<GetOptionResponse | null> {
   try {
     const response = await fetch(`${serverUrl}/api/options/${optionId}`, {
       credentials: 'include',
@@ -15,7 +15,7 @@ export async function fetchOption({
       throw new Error(`HTTP Error!, Status: ${response.status}`);
     }
 
-    const option = (await response.json()) as { data: GetQuestionOptionResponse };
+    const option = (await response.json()) as { data: GetOptionResponse };
     return option.data;
   } catch (error) {
     console.error('Error fetching option:', error);
diff --git a/packages/api/src/postRegistration.ts b/packages/api/src/postRegistration.ts
index 365eed51..11d2b267 100644
--- a/packages/api/src/postRegistration.ts
+++ b/packages/api/src/postRegistration.ts
@@ -5,7 +5,7 @@ export async function postRegistration({
   serverUrl,
 }: ApiRequest<{
   body: PostRegistrationRequest;
-}>): Promise<PostRegistrationResponse | null> {
+}>): Promise<PostRegistrationResponse | { errors: string[] } | null> {
   try {
     const response = await fetch(`${serverUrl}/api/registrations`, {
       method: 'POST',
@@ -17,6 +17,10 @@ export async function postRegistration({
     });
 
     if (!response.ok) {
+      if (response.status < 500) {
+        const errors = (await response.json()) as { errors: string[] };
+        return errors;
+      }
       throw new Error(`HTTP error! Status: ${response.status}`);
     }
 
diff --git a/packages/api/src/putRegistration.ts b/packages/api/src/putRegistration.ts
index 9ddbf0e5..2a658c07 100644
--- a/packages/api/src/putRegistration.ts
+++ b/packages/api/src/putRegistration.ts
@@ -7,7 +7,7 @@ export async function putRegistration({
 }: ApiRequest<{
   registrationId: string;
   body: PutRegistrationRequest;
-}>): Promise<PutRegistrationResponse | null> {
+}>): Promise<PutRegistrationResponse | { errors: string[] } | null> {
   try {
     const response = await fetch(`${serverUrl}/api/registrations/${registrationId}`, {
       method: 'PUT',
@@ -19,6 +19,10 @@ export async function putRegistration({
     });
 
     if (!response.ok) {
+      if (response.status < 500) {
+        const errors = (await response.json()) as { errors: string[] };
+        return errors;
+      }
       throw new Error(`HTTP error! Status: ${response.status}`);
     }
 
diff --git a/packages/api/src/types/Events.ts b/packages/api/src/types/Events.ts
index 7cd41f4e..6eac2d97 100644
--- a/packages/api/src/types/Events.ts
+++ b/packages/api/src/types/Events.ts
@@ -7,6 +7,7 @@ export type GetEventResponse = {
   createdAt: string;
   updatedAt: string;
   description: string | null;
+  fields: unknown;
 };
 
 export type GetEventsResponse = GetEventResponse[];
diff --git a/packages/api/src/types/Options.ts b/packages/api/src/types/Options.ts
index 659b519a..8c0dbfe6 100644
--- a/packages/api/src/types/Options.ts
+++ b/packages/api/src/types/Options.ts
@@ -1,4 +1,4 @@
-export type QuestionOption = {
+export type Option = {
   id: string;
   createdAt: string;
   updatedAt: string;
@@ -7,11 +7,12 @@ export type QuestionOption = {
   userId?: string;
   optionSubTitle?: string;
   accepted: boolean;
+  data: unknown;
   fundingRequest: string;
 };
 
-export type GetQuestionOptionRequest = {
+export type GetOptionRequest = {
   optionId: string;
 };
 
-export type GetQuestionOptionResponse = QuestionOption;
+export type GetOptionResponse = Option;
diff --git a/packages/api/src/types/Questions.ts b/packages/api/src/types/Questions.ts
index a44ccc38..3e9b1805 100644
--- a/packages/api/src/types/Questions.ts
+++ b/packages/api/src/types/Questions.ts
@@ -25,4 +25,5 @@ export type Question = {
   description: string | null;
   cycleId: string;
   title: string;
+  fields: unknown;
 };
diff --git a/packages/api/src/types/RegistrationData.ts b/packages/api/src/types/RegistrationData.ts
index f6d8168f..033f17c7 100644
--- a/packages/api/src/types/RegistrationData.ts
+++ b/packages/api/src/types/RegistrationData.ts
@@ -13,33 +13,32 @@ export type PostRegistrationRequest = {
   eventId: string;
   groupId: string | null;
   status: RegistrationStatus;
-  registrationData: {
-    registrationFieldId: string;
-    value: string;
-  }[];
+  data: Record<
+    string,
+    {
+      value: string | number | boolean | string[] | null;
+      type: 'TEXT' | 'TEXTAREA' | 'SELECT' | 'CHECKBOX' | 'MULTI_SELECT' | 'NUMBER';
+      fieldId: string;
+    }
+  >;
 };
 
 export type PutRegistrationRequest = {
   eventId: string;
   groupId: string | null;
   status: RegistrationStatus;
-  registrationData: {
-    registrationFieldId: string;
-    value: string;
-  }[];
+  data: Record<
+    string,
+    {
+      value: string | number | boolean | string[] | null;
+      type: 'TEXT' | 'TEXTAREA' | 'SELECT' | 'CHECKBOX' | 'MULTI_SELECT' | 'NUMBER';
+      fieldId: string;
+    }
+  >;
 };
 
 export type PostRegistrationResponse = {
-  registrationData:
-    | {
-        id: string;
-        createdAt: string;
-        updatedAt: string;
-        registrationId: string;
-        registrationFieldId: string;
-        value: string;
-      }[]
-    | null;
+  data: unknown | null;
   id: string;
   createdAt: string;
   updatedAt: string;
@@ -49,16 +48,7 @@ export type PostRegistrationResponse = {
 };
 
 export type PutRegistrationResponse = {
-  registrationData:
-    | {
-        id: string;
-        createdAt: string;
-        updatedAt: string;
-        registrationId: string;
-        registrationFieldId: string;
-        value: string;
-      }[]
-    | null;
+  registrationData: unknown | null;
   id: string;
   createdAt: string;
   updatedAt: string;
diff --git a/packages/api/src/types/Registrations.ts b/packages/api/src/types/Registrations.ts
index 768e7645..c3495ba6 100644
--- a/packages/api/src/types/Registrations.ts
+++ b/packages/api/src/types/Registrations.ts
@@ -7,6 +7,7 @@ export type GetRegistrationResponseType = {
   groupId: string | null;
   eventId?: string | undefined;
   createdAt: string;
+  data: unknown;
   updatedAt: string;
   event?: {
     id: string;
diff --git a/packages/berlin/package.json b/packages/berlin/package.json
index e49e756d..954f5118 100644
--- a/packages/berlin/package.json
+++ b/packages/berlin/package.json
@@ -62,4 +62,4 @@
   "engines": {
     "node": "^20"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/berlin/src/App.tsx b/packages/berlin/src/App.tsx
index 6b4a3e15..29a6e2da 100644
--- a/packages/berlin/src/App.tsx
+++ b/packages/berlin/src/App.tsx
@@ -1,9 +1,6 @@
 // React and third-party libraries
-import { QueryClient } from '@tanstack/react-query';
-import { RouterProvider, createBrowserRouter, redirect } from 'react-router-dom';
-
-// Store
-import { useAppStore } from './store';
+import { CancelledError, QueryClient } from '@tanstack/react-query';
+import { RouterProvider, createBrowserRouter, redirect, useRouteError } from 'react-router-dom';
 
 // API
 import { fetchCycle, fetchEvents, fetchRegistrations, fetchUser } from 'api';
@@ -28,94 +25,103 @@ import SecretGroupRegistration from './pages/SecretGroupRegistration.tsx';
  * Redirects the user to the landing page if they are not logged in
  */
 async function redirectToLandingLoader(queryClient: QueryClient) {
-  const user = await queryClient.fetchQuery({
-    queryKey: ['user'],
-    queryFn: () => fetchUser({ serverUrl: import.meta.env.VITE_SERVER_URL }),
-    staleTime: 10000,
-  });
-
-  if (!user) {
-    return redirect('/');
-  }
-  return null;
-}
+  try {
+    const user = await queryClient.fetchQuery({
+      queryKey: ['user'],
+      queryFn: () => fetchUser({ serverUrl: import.meta.env.VITE_SERVER_URL }),
+      staleTime: 10000,
+    });
 
-/**
- * Redirects the user to the account page if they have not completed their profile
- */
-async function redirectToAccount(queryClient: QueryClient) {
-  const user = await queryClient.fetchQuery({
-    queryKey: ['user'],
-    queryFn: () => fetchUser({ serverUrl: import.meta.env.VITE_SERVER_URL }),
-  });
-
-  if (user?.username) {
-    useAppStore.setState({ userStatus: 'COMPLETE' });
+    if (!user) {
+      return redirect('/');
+    }
     return null;
-  }
+  } catch (e) {
+    if (e instanceof CancelledError) {
+      console.log('Tanstack cancelled error:', e);
+    }
 
-  useAppStore.setState({ userStatus: 'INCOMPLETE' });
-  return redirect('/account');
+    return redirect('/');
+  }
 }
 
 /**
- * Redirects the user to the landing page to cycles or account page
+ * Redirects the user after successful login
  */
-async function redirectOnLandingLoader(queryClient: QueryClient) {
-  const user = await queryClient.fetchQuery({
-    queryKey: ['user'],
-    queryFn: () => fetchUser({ serverUrl: import.meta.env.VITE_SERVER_URL }),
-  });
-
-  if (!user) {
-    return null;
-  }
-
-  const events = await queryClient.fetchQuery({
-    queryKey: ['events'],
-    queryFn: () => fetchEvents({ serverUrl: import.meta.env.VITE_SERVER_URL }),
-  });
+async function redirectAfterLogin(queryClient: QueryClient) {
+  try {
+    const user = await queryClient.fetchQuery({
+      queryKey: ['user'],
+      queryFn: () => fetchUser({ serverUrl: import.meta.env.VITE_SERVER_URL }),
+    });
 
-  const userIsComplete = await redirectToAccount(queryClient);
+    if (!user) {
+      return null;
+    }
 
-  if (userIsComplete) {
-    return userIsComplete;
-  }
+    if (!user.username) {
+      return redirect('/account');
+    }
 
-  if (events?.length === 1) {
-    const registrations = await queryClient.fetchQuery({
-      queryKey: ['event', events?.[0].id, 'registrations'],
-      queryFn: () =>
-        fetchRegistrations({
-          eventId: events?.[0].id || '',
-          serverUrl: import.meta.env.VITE_SERVER_URL,
-        }),
+    const events = await queryClient.fetchQuery({
+      queryKey: ['events'],
+      queryFn: () => fetchEvents({ serverUrl: import.meta.env.VITE_SERVER_URL }),
     });
 
-    if (registrations && registrations.some((registration) => registration.status === 'APPROVED')) {
-      return redirect(`/events/${events?.[0].id}/register`);
+    // if there is only one event, redirect to the cycles page
+    if (events?.length === 1) {
+      const registrations = await queryClient.fetchQuery({
+        queryKey: ['event', events?.[0].id, 'registrations'],
+        queryFn: () =>
+          fetchRegistrations({
+            eventId: events?.[0].id || '',
+            serverUrl: import.meta.env.VITE_SERVER_URL,
+          }),
+      });
+
+      if (
+        registrations &&
+        registrations.every((registration) => registration.status !== 'APPROVED')
+      ) {
+        return redirect(`/events/${events?.[0].id}/register`);
+      }
+
+      return redirect(`/events/${events?.[0].id}/cycles`);
     }
 
-    return redirect(`/events/${events?.[0].id}/cycles`);
-  }
+    // if there are multiple events, redirect to the events page
+    return redirect('/events');
+  } catch (e) {
+    if (e instanceof CancelledError) {
+      console.log('Tanstack cancelled error:', e);
+    }
 
-  return null;
+    return null;
+  }
 }
 
 /**
  * Redirects the user to the only event if there is only one event
  */
 async function redirectToOnlyOneEventLoader(queryClient: QueryClient) {
-  const events = await queryClient.fetchQuery({
-    queryKey: ['events'],
-    queryFn: () => fetchEvents({ serverUrl: import.meta.env.VITE_SERVER_URL }),
-  });
+  try {
+    const events = await queryClient.fetchQuery({
+      queryKey: ['events'],
+      queryFn: () => fetchEvents({ serverUrl: import.meta.env.VITE_SERVER_URL }),
+    });
 
-  if (events?.length === 1) {
-    return redirect(`/events/${events?.[0].id}/cycles`);
-  }
+    if (events?.length === 1) {
+      return redirect(`/events/${events?.[0].id}/cycles`);
+    }
 
-  return null;
+    return null;
+  } catch (e) {
+    if (e instanceof CancelledError) {
+      console.log('Tanstack cancelled error:', e);
+    }
+
+    return redirect('/');
+  }
 }
 
 /**
@@ -123,21 +129,28 @@ async function redirectToOnlyOneEventLoader(queryClient: QueryClient) {
  * Redirects the user to the holding page if they don't have any approved registrations
  */
 async function redirectToEventHoldingOrRegister(queryClient: QueryClient, eventId?: string) {
-  const registrations = await queryClient.fetchQuery({
-    queryKey: ['event', eventId, 'registrations'],
-    queryFn: () =>
-      fetchRegistrations({ eventId: eventId || '', serverUrl: import.meta.env.VITE_SERVER_URL }),
-  });
-
-  if (!registrations || !registrations.length) {
-    return redirect(`/events/${eventId}/register`);
-  }
+  try {
+    const registrations = await queryClient.fetchQuery({
+      queryKey: ['event', eventId, 'registrations'],
+      queryFn: () =>
+        fetchRegistrations({ eventId: eventId || '', serverUrl: import.meta.env.VITE_SERVER_URL }),
+    });
 
-  if (!registrations.some((registration) => registration.status === 'APPROVED')) {
-    return redirect(`/events/${eventId}/holding`);
-  }
+    if (!registrations || !registrations.length) {
+      return redirect(`/events/${eventId}/register`);
+    }
+
+    if (!registrations.some((registration) => registration.status === 'APPROVED')) {
+      return redirect(`/events/${eventId}/holding`);
+    }
 
-  return null;
+    return null;
+  } catch (e) {
+    if (e instanceof CancelledError) {
+      console.log('Tanstack cancelled error:', e);
+    }
+    return redirect('/');
+  }
 }
 
 /**
@@ -148,34 +161,48 @@ async function redirectToCycleResultsLoader(
   eventId?: string,
   cycleId?: string,
 ) {
-  const cycle = await queryClient.fetchQuery({
-    queryKey: ['cycles', cycleId],
-    queryFn: () =>
-      fetchCycle({ cycleId: cycleId || '', serverUrl: import.meta.env.VITE_SERVER_URL }),
-  });
-
-  if (cycle?.status === 'CLOSED') {
-    return redirect(`/events/${eventId}/cycles/${cycleId}/results`);
-  }
+  try {
+    const cycle = await queryClient.fetchQuery({
+      queryKey: ['cycles', cycleId],
+      queryFn: () =>
+        fetchCycle({ cycleId: cycleId || '', serverUrl: import.meta.env.VITE_SERVER_URL }),
+    });
 
-  return null;
+    if (cycle?.status === 'CLOSED') {
+      return redirect(`/events/${eventId}/cycles/${cycleId}/results`);
+    }
+
+    return null;
+  } catch (e) {
+    if (e instanceof CancelledError) {
+      console.log('Tanstack cancelled error:', e);
+    }
+    return redirect('/');
+  }
 }
 
 /**
  * Redirects the user to the cycle page if the cycle is open
  */
 async function redirectToCycleIfOpen(queryClient: QueryClient, eventId?: string, cycleId?: string) {
-  const cycle = await queryClient.fetchQuery({
-    queryKey: ['cycles', cycleId],
-    queryFn: () =>
-      fetchCycle({ cycleId: cycleId || '', serverUrl: import.meta.env.VITE_SERVER_URL }),
-  });
-
-  if (cycle?.status === 'OPEN') {
-    return redirect(`/events/${eventId}/cycles/${cycleId}`);
-  }
+  try {
+    const cycle = await queryClient.fetchQuery({
+      queryKey: ['cycles', cycleId],
+      queryFn: () =>
+        fetchCycle({ cycleId: cycleId || '', serverUrl: import.meta.env.VITE_SERVER_URL }),
+    });
 
-  return null;
+    if (cycle?.status === 'OPEN') {
+      return redirect(`/events/${eventId}/cycles/${cycleId}`);
+    }
+
+    return null;
+  } catch (e) {
+    if (e instanceof CancelledError) {
+      console.log('Tanstack cancelled error:', e);
+    }
+    return redirect('/');
+  }
 }
 
 const router = (queryClient: QueryClient) =>
@@ -186,10 +213,11 @@ const router = (queryClient: QueryClient) =>
     },
     {
       element: <BerlinLayout />,
+      errorElement: <ErrorBoundary />,
       children: [
         {
           path: '/',
-          loader: () => redirectOnLandingLoader(queryClient),
+          loader: () => redirectAfterLogin(queryClient),
           element: <Landing />,
         },
         {
@@ -212,7 +240,6 @@ const router = (queryClient: QueryClient) =>
               Component: PublicGroupRegistration,
             },
             {
-              loader: () => redirectToAccount(queryClient),
               path: '/events',
               children: [
                 {
@@ -263,6 +290,13 @@ const router = (queryClient: QueryClient) =>
     },
   ]);
 
+function ErrorBoundary() {
+  const error = useRouteError();
+  console.log('@ErrorBoundary error', error);
+  // Uncaught ReferenceError: path is not defined
+  return <div>Dang!</div>;
+}
+
 function App({ queryClient }: { queryClient: QueryClient }) {
   return <RouterProvider router={router(queryClient)} />;
 }
diff --git a/packages/berlin/src/_components/ui/command.tsx b/packages/berlin/src/_components/ui/command.tsx
index 265ce7c6..f19ed548 100644
--- a/packages/berlin/src/_components/ui/command.tsx
+++ b/packages/berlin/src/_components/ui/command.tsx
@@ -15,7 +15,7 @@ const Command = React.forwardRef<
   <CommandPrimitive
     ref={ref}
     className={cn(
-      'flex h-full w-full flex-col overflow-hidden rounded-md bg-popover text-popover-foreground',
+      'bg-popover text-popover-foreground flex h-full w-full flex-col overflow-hidden rounded-md',
       className,
     )}
     {...props}
@@ -29,7 +29,7 @@ const CommandDialog = ({ children, ...props }: CommandDialogProps) => {
   return (
     <Dialog {...props}>
       <DialogContent className="overflow-hidden p-0">
-        <Command className="[&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group-heading]]:text-muted-foreground [&_[cmdk-group]:not([hidden])_~[cmdk-group]]:pt-0 [&_[cmdk-group]]:px-2 [&_[cmdk-input-wrapper]_svg]:h-5 [&_[cmdk-input-wrapper]_svg]:w-5 [&_[cmdk-input]]:h-12 [&_[cmdk-item]]:px-2 [&_[cmdk-item]]:py-3 [&_[cmdk-item]_svg]:h-5 [&_[cmdk-item]_svg]:w-5">
+        <Command className="[&_[cmdk-group-heading]]:text-muted-foreground [&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group]:not([hidden])_~[cmdk-group]]:pt-0 [&_[cmdk-group]]:px-2 [&_[cmdk-input-wrapper]_svg]:h-5 [&_[cmdk-input-wrapper]_svg]:w-5 [&_[cmdk-input]]:h-12 [&_[cmdk-item]]:px-2 [&_[cmdk-item]]:py-3 [&_[cmdk-item]_svg]:h-5 [&_[cmdk-item]_svg]:w-5">
           {children}
         </Command>
       </DialogContent>
@@ -46,7 +46,7 @@ const CommandInput = React.forwardRef<
     <CommandPrimitive.Input
       ref={ref}
       className={cn(
-        'flex h-10 w-full rounded-md bg-transparent py-3 text-sm outline-none placeholder:text-muted-foreground disabled:cursor-not-allowed disabled:opacity-50',
+        'placeholder:text-muted-foreground flex h-10 w-full rounded-md bg-transparent py-3 text-sm outline-none disabled:cursor-not-allowed disabled:opacity-50',
         className,
       )}
       {...props}
@@ -85,7 +85,7 @@ const CommandGroup = React.forwardRef<
   <CommandPrimitive.Group
     ref={ref}
     className={cn(
-      'overflow-hidden p-1 text-foreground [&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:py-1.5 [&_[cmdk-group-heading]]:text-xs [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group-heading]]:text-muted-foreground',
+      'text-foreground [&_[cmdk-group-heading]]:text-muted-foreground overflow-hidden p-1 [&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:py-1.5 [&_[cmdk-group-heading]]:text-xs [&_[cmdk-group-heading]]:font-medium',
       className,
     )}
     {...props}
@@ -100,7 +100,7 @@ const CommandSeparator = React.forwardRef<
 >(({ className, ...props }, ref) => (
   <CommandPrimitive.Separator
     ref={ref}
-    className={cn('-mx-1 h-px bg-border', className)}
+    className={cn('bg-border -mx-1 h-px', className)}
     {...props}
   />
 ));
@@ -113,7 +113,7 @@ const CommandItem = React.forwardRef<
   <CommandPrimitive.Item
     ref={ref}
     className={cn(
-      'relative flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none aria-selected:bg-accent aria-selected:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
+      'aria-selected:bg-accent aria-selected:text-accent-foreground relative flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
       className,
     )}
     {...props}
@@ -125,7 +125,7 @@ CommandItem.displayName = CommandPrimitive.Item.displayName;
 const CommandShortcut = ({ className, ...props }: React.HTMLAttributes<HTMLSpanElement>) => {
   return (
     <span
-      className={cn('ml-auto text-xs tracking-widest text-muted-foreground', className)}
+      className={cn('text-muted-foreground ml-auto text-xs tracking-widest', className)}
       {...props}
     />
   );
diff --git a/packages/berlin/src/_components/ui/dialog.tsx b/packages/berlin/src/_components/ui/dialog.tsx
index 828ac9de..44994afe 100644
--- a/packages/berlin/src/_components/ui/dialog.tsx
+++ b/packages/berlin/src/_components/ui/dialog.tsx
@@ -21,7 +21,7 @@ const DialogOverlay = React.forwardRef<
   <DialogPrimitive.Overlay
     ref={ref}
     className={cn(
-      'fixed inset-0 z-50 bg-black/80  data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0',
+      'data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/80',
       className,
     )}
     {...props}
@@ -38,13 +38,13 @@ const DialogContent = React.forwardRef<
     <DialogPrimitive.Content
       ref={ref}
       className={cn(
-        'fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg',
+        'bg-background data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border p-6 shadow-lg duration-200 sm:rounded-lg',
         className,
       )}
       {...props}
     >
       {children}
-      <DialogPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-muted-foreground">
+      <DialogPrimitive.Close className="ring-offset-background focus:ring-ring data-[state=open]:bg-accent data-[state=open]:text-muted-foreground absolute right-4 top-4 rounded-sm opacity-70 transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-offset-2 disabled:pointer-events-none">
         <Cross2Icon className="h-4 w-4" />
         <span className="sr-only">Close</span>
       </DialogPrimitive.Close>
@@ -84,7 +84,7 @@ const DialogDescription = React.forwardRef<
 >(({ className, ...props }, ref) => (
   <DialogPrimitive.Description
     ref={ref}
-    className={cn('text-sm text-muted-foreground', className)}
+    className={cn('text-muted-foreground text-sm', className)}
     {...props}
   />
 ));
diff --git a/packages/berlin/src/_components/ui/popover.tsx b/packages/berlin/src/_components/ui/popover.tsx
index ebbaafc5..6783ddf7 100644
--- a/packages/berlin/src/_components/ui/popover.tsx
+++ b/packages/berlin/src/_components/ui/popover.tsx
@@ -21,7 +21,7 @@ const PopoverContent = React.forwardRef<
       align={align}
       sideOffset={sideOffset}
       className={cn(
-        'z-50 w-72 rounded-md border bg-popover p-4 text-popover-foreground shadow-md outline-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2',
+        'bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-72 rounded-md border p-4 shadow-md outline-none',
         className,
       )}
       {...props}
diff --git a/packages/berlin/src/_components/ui/separator.tsx b/packages/berlin/src/_components/ui/separator.tsx
index 41062d43..97d71cfe 100644
--- a/packages/berlin/src/_components/ui/separator.tsx
+++ b/packages/berlin/src/_components/ui/separator.tsx
@@ -14,7 +14,7 @@ const Separator = React.forwardRef<
     decorative={decorative}
     orientation={orientation}
     className={cn(
-      'shrink-0 bg-border',
+      'bg-border shrink-0',
       orientation === 'horizontal' ? 'h-[1px] w-full' : 'h-full w-[1px]',
       className,
     )}
diff --git a/packages/berlin/src/components/form/AccountForm.tsx b/packages/berlin/src/components/form/AccountForm.tsx
index da9b6c24..2174fe68 100644
--- a/packages/berlin/src/components/form/AccountForm.tsx
+++ b/packages/berlin/src/components/form/AccountForm.tsx
@@ -15,7 +15,7 @@ import { Subtitle } from '../typography/Subtitle.styled';
 import { FlexRowToColumn } from '../containers/FlexRowToColumn.styled';
 import { FormTextInput } from '../form-input';
 import { z } from 'zod';
-import { returnZodError } from '../../utils/validation';
+import { returnZodError } from '../../utils/zod-error-handler';
 
 type InitialUser = {
   username: string;
diff --git a/packages/berlin/src/components/header/Header.tsx b/packages/berlin/src/components/header/Header.tsx
index 7acf0a19..85ac3353 100644
--- a/packages/berlin/src/components/header/Header.tsx
+++ b/packages/berlin/src/components/header/Header.tsx
@@ -143,8 +143,10 @@ const UserMenu = () => {
           <User />
         </Icon>
       </NavigationMenuTrigger>
-      <NavigationMenuContent className="flex flex-col gap-4 p-4">
-        <UserMenuLinks />
+      <NavigationMenuContent>
+        <NavigationMenuList className="flex flex-col gap-4 p-4">
+          <UserMenuLinks />
+        </NavigationMenuList>
       </NavigationMenuContent>
     </NavigationMenuItem>
   );
diff --git a/packages/berlin/src/pages/Account.tsx b/packages/berlin/src/pages/Account.tsx
index e9a2524a..782a522d 100644
--- a/packages/berlin/src/pages/Account.tsx
+++ b/packages/berlin/src/pages/Account.tsx
@@ -19,10 +19,13 @@ import { Body } from '../components/typography/Body.styled';
 import { useQueries, useQuery } from '@tanstack/react-query';
 import Link from '../components/link';
 import { Underline } from '../components/typography/Underline.styled';
+import { useNavigate } from 'react-router-dom';
 
 function Account() {
-  const { user, isLoading: userIsLoading } = useUser();
-  const [tab, setTab] = useState<'view' | 'edit'>('view');
+  const { user: initialUser, isLoading: userIsLoading } = useUser();
+  const isFirstLogin = !initialUser?.username;
+  const [tab, setTab] = useState<'view' | 'edit'>(isFirstLogin ? 'edit' : 'view');
+  const navigate = useNavigate();
 
   if (userIsLoading) {
     return <Title>Loading...</Title>;
@@ -31,20 +34,24 @@ function Account() {
   const tabs = {
     edit: (
       <AccountForm
-        user={user}
+        user={initialUser}
         initialUser={{
-          email: user?.email ?? '',
-          firstName: user?.firstName ?? '',
-          lastName: user?.lastName ?? '',
-          username: user?.username ?? '',
+          email: initialUser?.email ?? '',
+          firstName: initialUser?.firstName ?? '',
+          lastName: initialUser?.lastName ?? '',
+          username: initialUser?.username ?? '',
         }}
-        title="Edit Account"
+        title={isFirstLogin ? 'Complete Account' : 'Edit Account'}
         afterSubmit={() => {
+          if (isFirstLogin) {
+            navigate('/events');
+          }
+
           setTab('view');
         }}
       />
     ),
-    view: <AccountHub user={user} />,
+    view: <AccountHub user={initialUser} />,
   };
 
   return (
diff --git a/packages/berlin/src/pages/Register.tsx b/packages/berlin/src/pages/Register.tsx
index d30c2229..6ecd7b7b 100644
--- a/packages/berlin/src/pages/Register.tsx
+++ b/packages/berlin/src/pages/Register.tsx
@@ -1,7 +1,6 @@
 // React and third-party libraries
-import { useMutation, useQueries, useQuery, useQueryClient } from '@tanstack/react-query';
-import { useEffect, useMemo, useState } from 'react';
-import ContentLoader from 'react-content-loader';
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { useMemo, useState } from 'react';
 import { UseFormReturn, useForm } from 'react-hook-form';
 import toast from 'react-hot-toast';
 import { useNavigate, useParams } from 'react-router-dom';
@@ -16,16 +15,11 @@ import {
   fetchEvent,
   fetchEventGroupCategories,
   fetchGroups,
-  fetchRegistrationData,
-  fetchRegistrationFields,
   fetchRegistrations,
   fetchUsersToGroups,
   postRegistration,
   postUsersToGroups,
   putRegistration,
-  type GetRegistrationDataResponse,
-  type GetRegistrationFieldsResponse,
-  type GetRegistrationResponseType,
   type GetUserResponse,
 } from 'api';
 
@@ -33,22 +27,21 @@ import {
 import useUser from '../hooks/useUser';
 
 // Components
+import { dataSchema, fieldsSchema } from '@/utils/form-validation';
+import { z } from 'zod';
 import Button from '../components/button';
 import { Carousel } from '../components/carousel';
 import { FlexColumn } from '../components/containers/FlexColumn.styled';
 import { Form } from '../components/containers/Form.styled';
+import { FormInput, FormSelectInput } from '../components/form-input';
 import Select from '../components/select';
 import Label from '../components/typography/Label';
 import { Subtitle } from '../components/typography/Subtitle.styled';
 import { SafeArea } from '../layout/Layout.styled';
-import { FormInput, FormSelectInput } from '../components/form-input';
 
 function Register() {
   const { user, isLoading } = useUser();
   const { eventId } = useParams();
-  const [selectedRegistrationFormKey, setSelectedRegistrationFormKey] = useState<
-    string | undefined
-  >();
 
   const { data: event } = useQuery({
     queryKey: ['event', eventId],
@@ -64,16 +57,6 @@ function Register() {
     enabled: !!eventId,
   });
 
-  const { data: registrationFields } = useQuery({
-    queryKey: ['event', eventId, 'registrations', 'fields'],
-    queryFn: () =>
-      fetchRegistrationFields({
-        eventId: eventId || '',
-        serverUrl: import.meta.env.VITE_SERVER_URL,
-      }),
-    enabled: !!eventId,
-  });
-
   const { data: usersToGroups } = useQuery({
     queryKey: ['user', user?.id, 'users-to-groups'],
     queryFn: () =>
@@ -107,42 +90,6 @@ function Register() {
     return 0;
   }, [groupCategories, usersToGroups]);
 
-  const multipleRegistrationData = useQueries({
-    queries:
-      registrations?.map((registration) => ({
-        queryKey: ['registrations', registration.id, 'registration-data'],
-        queryFn: () =>
-          fetchRegistrationData({
-            registrationId: registration.id || '',
-            serverUrl: import.meta.env.VITE_SERVER_URL,
-          }),
-        enabled: !!registration.id,
-      })) ?? [],
-    combine: (results) => {
-      // return a map of registration id to { data, loading }
-      return results.reduce(
-        (acc, result, idx) => {
-          if (registrations && registrations[idx] && result.data) {
-            acc[registrations[idx].id || ''] = {
-              data: result.data,
-              loading: result.isLoading,
-            };
-          }
-          return acc;
-        },
-        {} as Record<
-          string,
-          { data: GetRegistrationDataResponse | null | undefined; loading: boolean }
-        >,
-      );
-    },
-  });
-
-  const onRegistrationFormCreate = (newRegistrationId: string) => {
-    // select the newly created registration form
-    setSelectedRegistrationFormKey(newRegistrationId);
-  };
-
   if (isLoading) {
     return <Subtitle>Loading...</Subtitle>;
   }
@@ -155,12 +102,7 @@ function Register() {
         usersToGroups={usersToGroups}
         user={user}
         registrations={registrations}
-        selectedRegistrationFormKey={selectedRegistrationFormKey}
-        multipleRegistrationData={multipleRegistrationData}
-        registrationFields={registrationFields}
         event={event}
-        onRegistrationFormCreate={onRegistrationFormCreate}
-        setSelectedRegistrationFormKey={setSelectedRegistrationFormKey}
       />
     </SafeArea>
   );
@@ -171,30 +113,15 @@ const CarouselWrapper = ({
   usersToGroups,
   user,
   registrations,
-  selectedRegistrationFormKey,
-  multipleRegistrationData,
-  registrationFields,
   event,
-  onRegistrationFormCreate,
-  setSelectedRegistrationFormKey,
+  defaultStep,
 }: {
   defaultStep: number;
   groupCategories: GetGroupCategoriesResponse | null | undefined;
   usersToGroups: GetUsersToGroupsResponse | null | undefined;
   user: GetUserResponse | null | undefined;
   registrations: GetRegistrationsResponseType | undefined | null;
-  selectedRegistrationFormKey: string | undefined;
-  multipleRegistrationData: Record<
-    string,
-    {
-      data: GetRegistrationDataResponse | null | undefined;
-      loading: boolean;
-    }
-  >;
-  registrationFields: GetRegistrationFieldsResponse | null | undefined;
   event: GetEventResponse | null | undefined;
-  onRegistrationFormCreate: (newRegistrationId: string) => void;
-  setSelectedRegistrationFormKey: (key: string) => void;
 }) => {
   const navigate = useNavigate();
 
@@ -212,20 +139,26 @@ const CarouselWrapper = ({
     useMutation({
       mutationFn: postRegistration,
       onSuccess: async (body) => {
-        if (body) {
-          toast.success('Registration saved successfully!');
-          await queryClient.invalidateQueries({
-            queryKey: ['event', body.eventId, 'registrations'],
-          });
-
-          // invalidate user registrations, this is for the 1 event use case
-          // where the authentication is because you are approved to the event
-          await queryClient.invalidateQueries({
-            queryKey: [user?.id, 'registrations'],
-          });
-        } else {
+        if (!body) {
           toast.error('Failed to save registration, please try again');
+          return;
+        }
+
+        if ('errors' in body) {
+          toast.error(body.errors[0]);
+          return;
         }
+
+        toast.success('Registration saved successfully!');
+        await queryClient.invalidateQueries({
+          queryKey: ['event', body.eventId, 'registrations'],
+        });
+
+        // invalidate user registrations, this is for the 1 event use case
+        // where the authentication is because you are approved to the event
+        await queryClient.invalidateQueries({
+          queryKey: [user?.id, 'registrations'],
+        });
       },
       onError: (error) => {
         console.error('Error saving registration:', error);
@@ -263,7 +196,7 @@ const CarouselWrapper = ({
           eventId: event?.id || '',
           groupId: null,
           status: 'DRAFT',
-          registrationData: [],
+          data: {},
         },
         serverUrl: import.meta.env.VITE_SERVER_URL,
       });
@@ -273,7 +206,7 @@ const CarouselWrapper = ({
           eventId: event?.id || '',
           groupId: null,
           status: 'DRAFT',
-          registrationData: [],
+          data: {},
         },
         serverUrl: import.meta.env.VITE_SERVER_URL,
       });
@@ -282,6 +215,7 @@ const CarouselWrapper = ({
 
   return (
     <Carousel
+      initialStep={defaultStep}
       onComplete={async () => {
         // query registration to check if it is approved
         const registrations = await queryClient.fetchQuery({
@@ -323,18 +257,19 @@ const CarouselWrapper = ({
           ),
         },
         {
-          isEnabled: (registrationFields?.length ?? 0) > 0,
+          isEnabled:
+            (fieldsSchema.safeParse(event?.fields).success
+              ? Object.values(fieldsSchema.parse(event?.fields)).length
+              : 0) > 0,
           render: ({ handleStepComplete }) => (
             <RegistrationForm
-              registrations={registrations}
               usersToGroups={usersToGroups}
-              selectedRegistrationFormKey={selectedRegistrationFormKey}
-              multipleRegistrationData={multipleRegistrationData}
-              registrationFields={registrationFields}
               user={user}
+              groupId={registrations?.at(0)?.groupId}
+              registrationId={registrations?.at(0)?.id}
+              mode={registrations?.at(0) ? 'edit' : 'create'}
+              data={registrations?.at(0)?.data}
               event={event}
-              onRegistrationFormCreate={onRegistrationFormCreate}
-              onSelectedRegistrationFormKeyChange={setSelectedRegistrationFormKey}
               onStepComplete={handleStepComplete}
             />
           ),
@@ -344,210 +279,6 @@ const CarouselWrapper = ({
   );
 };
 
-const sortRegistrationsByCreationDate = (registrations: GetRegistrationResponseType[]) => {
-  return [
-    ...registrations.sort((a, b) => {
-      return new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime();
-    }),
-  ];
-};
-
-const createRegistrationForms = ({
-  registrations,
-  usersToGroups,
-}: {
-  registrations: GetRegistrationsResponseType | undefined | null;
-  usersToGroups: GetUsersToGroupsResponse | undefined | null;
-}) => {
-  const sortedRegistrationsByCreationDate = sortRegistrationsByCreationDate(registrations || []);
-
-  const registrationForms: {
-    key: string | 'create';
-    registration?: GetRegistrationResponseType;
-    group?: GetUsersToGroupsResponse[number]['group'];
-    mode: 'edit' | 'create';
-  }[] = sortedRegistrationsByCreationDate.map((reg) => {
-    return {
-      key: reg.id || '',
-      registration: reg,
-      group: usersToGroups?.find((userToGroup) => userToGroup.group.id === reg.groupId)?.group,
-      mode: 'edit',
-    };
-  });
-
-  registrationForms.push({
-    key: 'create',
-    mode: 'create',
-  });
-
-  return registrationForms;
-};
-
-function SelectRegistrationDropdown({
-  usersToGroups,
-  selectedRegistrationFormKey,
-  registrations,
-  onSelectedRegistrationFormKeyChange,
-  multipleRegistrationData,
-  registrationFields,
-}: {
-  selectedRegistrationFormKey: string | undefined;
-  registrations: GetRegistrationsResponseType | undefined | null;
-  usersToGroups: GetUsersToGroupsResponse | undefined | null;
-  onSelectedRegistrationFormKeyChange: (key: string) => void;
-  multipleRegistrationData: Record<
-    string,
-    {
-      data: GetRegistrationDataResponse | null | undefined;
-      loading: boolean;
-    }
-  >;
-  registrationFields: GetRegistrationFieldsResponse | null | undefined;
-}) {
-  useEffect(() => {
-    // select the first registration if it exists
-    // and no registration form is selected
-    if (
-      registrations &&
-      registrations.length &&
-      registrations[0].id &&
-      !selectedRegistrationFormKey
-    ) {
-      const firstRegistrationId = sortRegistrationsByCreationDate(registrations)[0].id;
-
-      if (firstRegistrationId) {
-        onSelectedRegistrationFormKeyChange(firstRegistrationId);
-      }
-    }
-  }, [onSelectedRegistrationFormKeyChange, registrations, selectedRegistrationFormKey]);
-
-  const showRegistrationsSelect = (
-    registrations: GetRegistrationsResponseType | null | undefined,
-  ): boolean => {
-    // only show select when user has previously registered
-    return !!registrations && registrations.length > 0;
-  };
-
-  const getRegistrationTitle = ({
-    multipleRegistrationData,
-    registration,
-    registrationFields,
-  }: {
-    multipleRegistrationData: Record<
-      string,
-      {
-        data: GetRegistrationDataResponse | null | undefined;
-        loading: boolean;
-      }
-    >;
-    registration: GetRegistrationResponseType | null | undefined;
-    registrationFields: GetRegistrationFieldsResponse | null | undefined;
-  }) => {
-    const firstField = filterRegistrationFields(
-      registrationFields,
-      registration?.groupId ? 'group' : 'user',
-    )?.sort((a, b) => (a.fieldDisplayRank ?? 0) - (b.fieldDisplayRank ?? 0))[0];
-
-    if (!firstField) {
-      return '';
-    }
-
-    const registrationData = multipleRegistrationData[registration?.id || '']?.data;
-
-    if (!registrationData) {
-      return '';
-    }
-
-    return (
-      registrationData.find((data) => data.registrationFieldId === firstField.id)?.value ??
-      'Untitled'
-    );
-  };
-
-  const createOptionName = ({
-    index,
-    mode,
-    groupName,
-    multipleRegistrationData,
-    registration,
-    registrationFields,
-  }: {
-    multipleRegistrationData: Record<
-      string,
-      {
-        data: GetRegistrationDataResponse | null | undefined;
-        loading: boolean;
-      }
-    >;
-    registration: GetRegistrationResponseType | null | undefined;
-    registrationFields: GetRegistrationFieldsResponse | null | undefined;
-    mode: 'edit' | 'create';
-    index: number;
-    groupName?: string;
-  }) => {
-    if (mode === 'create') {
-      return 'Create a new proposal';
-    }
-
-    return `${index}. ${getRegistrationTitle({
-      multipleRegistrationData,
-      registration,
-      registrationFields,
-    })} ${groupName ? `[${groupName}]` : ''}`;
-  };
-
-  return (
-    showRegistrationsSelect(registrations) && (
-      <FlexColumn $gap="0.5rem">
-        <Label>Select Proposal</Label>
-        <Select
-          value={selectedRegistrationFormKey ?? ''}
-          options={createRegistrationForms({ registrations, usersToGroups }).map((form, idx) => ({
-            id: form.key,
-            name: createOptionName({
-              multipleRegistrationData,
-              registration: form.registration,
-              registrationFields,
-              mode: form.mode,
-              index: idx + 1,
-              groupName: form.group?.name,
-            }),
-          }))}
-          placeholder="Select a Proposal"
-          onChange={onSelectedRegistrationFormKeyChange}
-        />
-      </FlexColumn>
-    )
-  );
-}
-
-const getDefaultValues = (registrationData: GetRegistrationDataResponse | null | undefined) => {
-  return registrationData?.reduce(
-    (acc, curr) => {
-      acc[curr.registrationFieldId] = curr.value;
-      return acc;
-    },
-    {} as Record<string, string>,
-  );
-};
-
-const filterRegistrationFields = (
-  registrationFields: GetRegistrationFieldsResponse | null | undefined,
-  client: 'user' | 'group',
-) => {
-  return registrationFields?.filter((field) => {
-    if (field.forGroup && client == 'group') {
-      return true;
-    }
-
-    if (field.forUser && client == 'user') {
-      return true;
-    }
-
-    return false;
-  });
-};
-
 function EventGroupsForm({
   groupCategories,
   usersToGroups,
@@ -696,162 +427,77 @@ function SelectEventGroup({
   );
 }
 
-function RegistrationForm({
-  registrationFields,
-  event,
-  multipleRegistrationData,
-  registrations,
-  selectedRegistrationFormKey,
-  user,
-  usersToGroups,
-  onRegistrationFormCreate,
-  onSelectedRegistrationFormKeyChange,
-  onStepComplete,
-}: {
-  registrations: GetRegistrationsResponseType | undefined | null;
-  usersToGroups: GetUsersToGroupsResponse | undefined | null;
-  selectedRegistrationFormKey: string | undefined;
-  multipleRegistrationData: Record<
-    string,
-    {
-      data: GetRegistrationDataResponse | null | undefined;
-      loading: boolean;
-    }
-  >;
-  registrationFields: GetRegistrationFieldsResponse | null | undefined;
-  user: GetUserResponse | null | undefined;
-  event: GetEventResponse | null | undefined;
-  onRegistrationFormCreate?: (newRegistrationId: string) => void;
-  onSelectedRegistrationFormKeyChange: (key: string) => void;
-  onStepComplete?: () => void;
-}) {
-  const showRegistrationForm = ({
-    registrationId,
-    selectedRegistrationFormKey,
-  }: {
-    registrationId?: string;
-    selectedRegistrationFormKey?: string;
-  }) => {
-    if (selectedRegistrationFormKey === 'create' && !registrationId) {
-      // show create registration form
-      return true;
-    }
-
-    return registrationId === selectedRegistrationFormKey;
-  };
-
-  return (
-    <>
-      <SelectRegistrationDropdown
-        onSelectedRegistrationFormKeyChange={onSelectedRegistrationFormKeyChange}
-        registrations={registrations}
-        usersToGroups={usersToGroups}
-        selectedRegistrationFormKey={selectedRegistrationFormKey}
-        multipleRegistrationData={multipleRegistrationData}
-        registrationFields={registrationFields}
-      />
-      {createRegistrationForms({ registrations, usersToGroups }).map((form, idx) => {
-        return (
-          <DynamicRegistrationFieldsForm
-            show={showRegistrationForm({
-              selectedRegistrationFormKey,
-              registrationId: form.registration?.id,
-            })}
-            usersToGroups={usersToGroups}
-            registrationData={multipleRegistrationData[form.registration?.id || '']?.data}
-            key={idx}
-            user={user}
-            groupId={form.group?.id}
-            registrationFields={registrationFields}
-            registrationId={form.registration?.id}
-            mode={form.mode}
-            isLoading={multipleRegistrationData[form.registration?.id || '']?.loading}
-            event={event}
-            onRegistrationFormCreate={onRegistrationFormCreate}
-            onStepComplete={onStepComplete}
-          />
-        );
-      })}
-    </>
-  );
-}
-
-function DynamicRegistrationFieldsForm(props: {
+function RegistrationForm(props: {
   user: GetUserResponse | null | undefined;
   usersToGroups: GetUsersToGroupsResponse | null | undefined;
-  registrationFields: GetRegistrationFieldsResponse | null | undefined;
   registrationId: string | null | undefined;
   groupId: string | null | undefined;
   event: GetEventResponse | null | undefined;
-  show: boolean;
+  data: GetRegistrationsResponseType[number]['data'] | null | undefined;
   mode: 'edit' | 'create';
-  isLoading: boolean;
-  onRegistrationFormCreate?: (newRegistrationId: string) => void;
-  registrationData: GetRegistrationDataResponse | null | undefined;
   onStepComplete?: () => void;
 }) {
   const queryClient = useQueryClient();
-
-  // i want to differentiate between when a group is selected and it is not
-  // so i can show the correct registration fields
-  // i will use the selectedGroupId to do this
   const [selectedGroupId, setSelectedGroupId] = useState<string>('');
   const prevSelectGroupId = props.groupId ?? 'none';
+  const registrationData = dataSchema.safeParse(props.data ?? {});
+  const eventFields = fieldsSchema.safeParse(props.event?.fields);
+  const dataIsClean = registrationData.success && eventFields.success;
 
   const form = useForm({
-    defaultValues: useMemo(
-      () => getDefaultValues(props.registrationData),
-      [props.registrationData],
-    ),
+    defaultValues: dataIsClean
+      ? Object.entries(eventFields.data).reduce(
+          (acc, [key]) => {
+            acc[key] = registrationData.data[key]?.value?.toString() ?? '';
+            return acc;
+          },
+          {} as Record<string, string>,
+        )
+      : {},
     mode: 'all',
   });
 
   const {
     formState: { isSubmitting },
     handleSubmit,
-    reset,
   } = form;
 
-  useEffect(() => {
-    reset(getDefaultValues(props.registrationData));
-  }, [props.registrationData, reset]);
-
   const sortedRegistrationFields = useMemo(() => {
-    const regGroupId = selectedGroupId || prevSelectGroupId;
-    const client = regGroupId === 'none' ? 'user' : 'group';
-
-    const sortedFields = filterRegistrationFields(props.registrationFields || [], client);
-
-    // Sort by field_display_rank in ascending order
-    sortedFields?.sort((a, b) => (a.fieldDisplayRank || 0) - (b.fieldDisplayRank || 0));
+    if (!eventFields.success) {
+      return [];
+    }
 
-    return sortedFields;
-  }, [props.registrationFields, selectedGroupId, prevSelectGroupId]);
+    return Object.values(eventFields.data)?.sort((a, b) => (a.position || 0) - (b.position || 0));
+  }, [eventFields]);
 
-  const { mutate: mutateRegistrationData, isPending } = useMutation({
+  const { mutate: mutateRegistration, isPending } = useMutation({
     mutationFn: postRegistration,
     onSuccess: async (body) => {
-      if (body) {
-        toast.success('Registration saved successfully!');
-        await queryClient.invalidateQueries({
-          queryKey: ['event', body.eventId, 'registrations'],
-        });
-        await queryClient.invalidateQueries({
-          queryKey: ['registrations', body.id, 'registration-data'],
-        });
+      if (!body) {
+        toast.error('Failed to save registration, please try again');
+        return;
+      }
 
-        // invalidate user registrations, this is for the 1 event use case
-        // where the authentication is because you are approved to the event
-        await queryClient.invalidateQueries({
-          queryKey: [props.user?.id, 'registrations'],
-        });
+      if ('errors' in body) {
+        toast.error(body.errors[0]);
+        return;
+      }
 
-        props.onRegistrationFormCreate?.(body.id);
+      toast.success('Registration saved successfully!');
+      await queryClient.invalidateQueries({
+        queryKey: ['event', body.eventId, 'registrations'],
+      });
+      await queryClient.invalidateQueries({
+        queryKey: ['registrations', body.id, 'registration-data'],
+      });
 
-        props.onStepComplete?.();
-      } else {
-        toast.error('Failed to save registration, please try again');
-      }
+      // invalidate user registrations, this is for the 1 event use case
+      // where the authentication is because you are approved to the event
+      await queryClient.invalidateQueries({
+        queryKey: [props.user?.id, 'registrations'],
+      });
+
+      props.onStepComplete?.();
     },
     onError: (error) => {
       console.error('Error saving registration:', error);
@@ -859,23 +505,29 @@ function DynamicRegistrationFieldsForm(props: {
     },
   });
 
-  const { mutate: updateRegistrationData } = useMutation({
+  const { mutate: updateRegistration } = useMutation({
     mutationFn: putRegistration,
     onSuccess: async (body) => {
-      if (body) {
-        toast.success('Registration updated successfully!');
-
-        await queryClient.invalidateQueries({
-          queryKey: ['event', props.event?.id, 'registrations'],
-        });
-        await queryClient.invalidateQueries({
-          queryKey: ['registrations', props.registrationId, 'registration-data'],
-        });
-
-        props.onStepComplete?.();
-      } else {
+      if (!body) {
         toast.error('Failed to update registration, please try again');
+        return;
       }
+
+      if ('errors' in body) {
+        toast.error(body.errors[0]);
+        return;
+      }
+
+      toast.success('Registration updated successfully!');
+
+      await queryClient.invalidateQueries({
+        queryKey: ['event', props.event?.id, 'registrations'],
+      });
+      await queryClient.invalidateQueries({
+        queryKey: ['registrations', props.registrationId, 'registration-data'],
+      });
+
+      props.onStepComplete?.();
     },
     onError: (error) => {
       console.error('Error updating registration:', error);
@@ -884,86 +536,66 @@ function DynamicRegistrationFieldsForm(props: {
   });
 
   const onSubmit = (values: Record<string, string>) => {
+    if (!dataIsClean) {
+      console.log('Data is not clean');
+      return;
+    }
+
     const regGroupId = selectedGroupId || prevSelectGroupId;
     const client = regGroupId === 'none' ? 'user' : 'group';
 
     // Filter out empty values
     const filteredValues = Object.entries(values).reduce(
       (acc, [key, value]) => {
-        if (value.trim() !== '') {
-          acc[key] = value.trim();
+        if (value !== '') {
+          acc[key] = value;
         }
         return acc;
       },
       {} as Record<string, string>,
     );
 
-    const registrationData = Object.entries(filteredValues).map(([key, value]) => ({
-      registrationFieldId: key,
-      value: value || '',
-    }));
+    const formattedData = Object.entries(filteredValues).reduce(
+      (acc, [key, value]) => {
+        acc[key] = {
+          value,
+          type: eventFields.data[key].type,
+          fieldId: eventFields.data[key].id,
+        };
+        return acc;
+      },
+      {} as z.infer<typeof dataSchema>,
+    );
 
     if (props.mode === 'edit') {
-      updateRegistrationData({
+      updateRegistration({
         registrationId: props.registrationId || '',
         body: {
           eventId: props.event?.id || '',
           groupId: client === 'user' ? null : regGroupId,
           status: 'DRAFT',
-          registrationData: registrationData,
+          data: formattedData,
         },
         serverUrl: import.meta.env.VITE_SERVER_URL,
       });
     } else {
-      mutateRegistrationData({
+      mutateRegistration({
         body: {
           eventId: props.event?.id || '',
           groupId: client === 'user' ? null : regGroupId,
           status: 'DRAFT',
-          registrationData: registrationData,
+          data: formattedData,
         },
         serverUrl: import.meta.env.VITE_SERVER_URL,
       });
     }
   };
 
-  if (props.isLoading) {
-    return (
-      props.show && (
-        <>
-          {sortedRegistrationFields?.map((_, idx) => (
-            <ContentLoader
-              key={idx}
-              speed={1.75}
-              width={'100%'}
-              height={80}
-              viewBox="0 0 100% 80"
-              backgroundColor="var(--color-gray)"
-              foregroundColor="var(--color-darkgray)"
-              {...props}
-            >
-              <rect x="0" y="0" rx="0" ry="0" width="100" height="22" />
-              <rect x="0" y="30" rx="4" ry="4" width="100%" height="50" />
-            </ContentLoader>
-          ))}
-          <ContentLoader
-            speed={1.75}
-            width={'100%'}
-            height={80}
-            viewBox="0 0 100% 80"
-            backgroundColor="var(--color-gray)"
-            foregroundColor="var(--color-darkgray)"
-            {...props}
-          >
-            <rect x="0" y="0" rx="8" ry="8" width="72" height="36" />
-            <rect x="0" y="52" rx="0" ry="0" width="100%" height="28" />
-          </ContentLoader>
-        </>
-      )
-    );
+  if (!eventFields.success) {
+    return <Subtitle>Failed to load registration fields</Subtitle>;
   }
 
-  return props.show ? (
+  return (
     <FlexColumn>
       <RegisterGroupSelect
         usersToGroups={props.usersToGroups}
@@ -978,11 +610,11 @@ function DynamicRegistrationFieldsForm(props: {
             form={form}
             name={regField.id}
             label={regField.name}
-            required={regField.required}
+            required={regField.validation.required}
             type={regField.type.toLocaleUpperCase()}
-            options={regField.registrationFieldOptions?.map((option) => ({
-              name: option.value,
-              value: option.value,
+            options={regField.options?.map((value) => ({
+              name: value,
+              value: value,
             }))}
           />
         ))}
@@ -991,8 +623,6 @@ function DynamicRegistrationFieldsForm(props: {
         Save
       </Button>
     </FlexColumn>
-  ) : (
-    <></>
   );
 }
 
diff --git a/packages/berlin/src/store/index.ts b/packages/berlin/src/store/index.ts
index 39d526d1..01653e5e 100644
--- a/packages/berlin/src/store/index.ts
+++ b/packages/berlin/src/store/index.ts
@@ -4,7 +4,6 @@ import { devtools, persist } from 'zustand/middleware';
 type COMPLETION_STATUS = 'COMPLETE' | 'INCOMPLETE';
 
 interface AppState {
-  userStatus: COMPLETION_STATUS;
   theme: 'light' | 'dark';
   availableHearts: {
     [questionId: string]: number;
@@ -14,7 +13,6 @@ interface AppState {
     cycle: COMPLETION_STATUS;
     results: COMPLETION_STATUS;
   };
-  setUserStatus: (status: COMPLETION_STATUS) => void;
   setAvailableHearts: ({ hearts, questionId }: { questionId: string; hearts: number }) => void;
   setOnboardingStatus: (
     type: keyof AppState['onboardingStatus'],
@@ -28,7 +26,6 @@ export const useAppStore = create<AppState>()(
   devtools(
     persist(
       (set) => ({
-        userStatus: 'INCOMPLETE',
         onboardingStatus: {
           event: 'INCOMPLETE',
           cycle: 'INCOMPLETE',
@@ -36,7 +33,6 @@ export const useAppStore = create<AppState>()(
         },
         theme: 'dark', // Default theme is dark
         availableHearts: {}, // Set the initial hearts value
-        setUserStatus: (status: COMPLETION_STATUS) => set(() => ({ userStatus: status })),
         setOnboardingStatus: (type, status) =>
           set((state) => ({
             onboardingStatus: {
@@ -49,8 +45,6 @@ export const useAppStore = create<AppState>()(
         toggleTheme: () => set((state) => ({ theme: state.theme === 'light' ? 'dark' : 'light' })),
         reset: () =>
           set(() => ({
-            userStatus: 'INCOMPLETE',
-            eventRegistrationStatus: 'INCOMPLETE',
             availableHearts: {},
           })),
       }),
@@ -59,7 +53,6 @@ export const useAppStore = create<AppState>()(
         // Partialize the store to only persist the required keys
         partialize: (state) => ({
           onboardingStatus: state.onboardingStatus,
-          userStatus: state.userStatus,
           theme: state.theme,
         }),
       },
diff --git a/packages/berlin/src/utils/form-validation.ts b/packages/berlin/src/utils/form-validation.ts
new file mode 100644
index 00000000..5a0b47fa
--- /dev/null
+++ b/packages/berlin/src/utils/form-validation.ts
@@ -0,0 +1,46 @@
+import { z } from 'zod';
+
+/**
+ * Fields schema
+ */
+
+const fieldType = z.enum(['TEXT', 'TEXTAREA', 'SELECT', 'CHECKBOX', 'MULTI_SELECT', 'NUMBER']);
+
+export const fieldSchema = z.object({
+  id: z.string().uuid(),
+  name: z.string(),
+  description: z.string().optional(),
+  type: fieldType,
+  position: z.coerce.number(),
+  options: z.array(z.string()).optional(),
+  validation: z.object({
+    required: z.boolean(),
+    minLength: z.coerce.number().optional().nullable(),
+    maxLength: z.coerce.number().optional().nullable(),
+  }),
+});
+
+// [fieldId] => { ...fieldSchema }
+export const fieldsSchema = z.record(z.string().uuid(), fieldSchema);
+
+/**
+ * Data Schema
+ */
+
+const dataValueSchema = z.union([
+  z.string(),
+  z.number(),
+  z.boolean(),
+  z.array(z.string()), // For multi-select fields
+  z.null(), // In case of optional fields
+]);
+
+// Define a schema for a single field
+const dataForOneFieldSchema = z.object({
+  value: dataValueSchema,
+  fieldId: z.string().uuid(),
+  type: fieldType,
+});
+
+// [fieldId] => { value: [value], fieldId: [fieldId] }
+export const dataSchema = z.record(z.string().uuid(), dataForOneFieldSchema);
diff --git a/packages/berlin/src/utils/formatGroups.ts b/packages/berlin/src/utils/formatGroups.ts
deleted file mode 100644
index f045b78a..00000000
--- a/packages/berlin/src/utils/formatGroups.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { GetGroupsResponse } from 'api';
-
-/**
- * Formats an array of group objects by sorting alphabetically and placing "Other" and "None" at the beginning.
- * @param groups An array of group objects.
- * @returns An array of formatted group objects with "Other" and "None" placed at the beginning.
- */
-export const formatGroups = (groups: GetGroupsResponse[] | null | undefined) => {
-  return (
-    groups
-      ?.sort((a, b) => a.name.localeCompare(b.name))
-      ?.reduce((acc: { name: string; id: string }[], group) => {
-        if (group.name === 'Other' || group.name === 'None') {
-          acc.unshift({ name: group.name, id: group.id });
-        } else {
-          acc.push({ name: group.name, id: group.id });
-        }
-        return acc;
-      }, []) || []
-  );
-};
diff --git a/packages/berlin/src/utils/validation.ts b/packages/berlin/src/utils/zod-error-handler.ts
similarity index 100%
rename from packages/berlin/src/utils/validation.ts
rename to packages/berlin/src/utils/zod-error-handler.ts

From 337753b9b817aab30a9eb31a46b74b9fa5d3b21f Mon Sep 17 00:00:00 2001
From: Camilo Vega <59750365+camilovegag@users.noreply.github.com>
Date: Tue, 30 Jul 2024 08:43:21 -0500
Subject: [PATCH 14/15] 702 new cycles page (#703)

* Create new option component

* Naming changes

* Add max height transition to tailwind

* Add expanded and animation

* Update option card

* Install dropdown menu

* Add sorting menu

* Make button boxy
---
 packages/api/src/types/Cycles.ts              |   2 +-
 packages/berlin/package.json                  |  33 ++-
 .../src/_components/ui/dropdown-menu.tsx      | 188 ++++++++++++
 .../src/components/button/Button.styled.tsx   |   1 -
 .../cycle-columns/CycleColumns.styled.tsx     |  63 ----
 .../columns/cycle-columns/CycleColumns.tsx    |  42 ---
 .../components/columns/cycle-columns/index.ts |   1 -
 .../option-card/OptionCard.styled.tsx         | 141 ---------
 .../src/components/option-card/OptionCard.tsx | 197 -------------
 .../src/components/option-card/index.ts       |   1 -
 .../berlin/src/components/option/Option.tsx   | 166 +++++++++++
 .../berlin/src/components/option/index.ts     |   1 +
 packages/berlin/src/pages/Cycle.tsx           |  62 +++-
 packages/berlin/tailwind.config.js            |   3 +
 pnpm-lock.yaml                                | 273 ++++++++++++++++++
 15 files changed, 697 insertions(+), 477 deletions(-)
 create mode 100644 packages/berlin/src/_components/ui/dropdown-menu.tsx
 delete mode 100644 packages/berlin/src/components/columns/cycle-columns/CycleColumns.styled.tsx
 delete mode 100644 packages/berlin/src/components/columns/cycle-columns/CycleColumns.tsx
 delete mode 100644 packages/berlin/src/components/columns/cycle-columns/index.ts
 delete mode 100644 packages/berlin/src/components/option-card/OptionCard.styled.tsx
 delete mode 100644 packages/berlin/src/components/option-card/OptionCard.tsx
 delete mode 100644 packages/berlin/src/components/option-card/index.ts
 create mode 100644 packages/berlin/src/components/option/Option.tsx
 create mode 100644 packages/berlin/src/components/option/index.ts

diff --git a/packages/api/src/types/Cycles.ts b/packages/api/src/types/Cycles.ts
index 56a80231..f9952921 100644
--- a/packages/api/src/types/Cycles.ts
+++ b/packages/api/src/types/Cycles.ts
@@ -20,7 +20,7 @@ export type GetCycleResponse = {
       updatedAt: string;
       questionId: string;
       title: string;
-      optionSubTitle?: string;
+      subTitle?: string;
       accepted: boolean;
       voteScore?: number;
       fundingRequest: string;
diff --git a/packages/berlin/package.json b/packages/berlin/package.json
index 954f5118..879af783 100644
--- a/packages/berlin/package.json
+++ b/packages/berlin/package.json
@@ -11,23 +11,24 @@
     "preview": "pnpm exec vite preview"
   },
   "dependencies": {
+    "@hookform/resolvers": "^3.3.4",
+    "@pcd/passport-interface": "^0.8.0",
+    "@pcd/semaphore-identity-pcd": "^0.8.0",
+    "@pcd/semaphore-signature-pcd": "^0.9.0",
     "@radix-ui/react-dialog": "^1.0.5",
+    "@radix-ui/react-dropdown-menu": "^2.1.1",
     "@radix-ui/react-icons": "^1.3.0",
     "@radix-ui/react-navigation-menu": "^1.2.0",
     "@radix-ui/react-popover": "^1.0.7",
     "@radix-ui/react-separator": "^1.1.0",
     "@radix-ui/react-slot": "^1.0.2",
+    "@tanstack/react-query": "^5.13.4",
+    "api": "workspace:*",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.0",
     "cmdk": "^1.0.0",
     "lucide-react": "^0.397.0",
-    "tailwind-merge": "^2.2.2",
-    "tailwindcss-animate": "^1.0.7",
-    "@hookform/resolvers": "^3.3.4",
-    "@pcd/passport-interface": "^0.8.0",
-    "@pcd/semaphore-identity-pcd": "^0.8.0",
-    "@pcd/semaphore-signature-pcd": "^0.9.0",
-    "@tanstack/react-query": "^5.13.4",
+    "react": "^18.2.0",
     "react-content-loader": "^7.0.0",
     "react-dom": "^18.2.0",
     "react-hook-form": "^7.49.3",
@@ -35,29 +36,29 @@
     "react-joyride": "^2.8.2",
     "react-markdown": "^9.0.1",
     "react-router-dom": "^6.20.1",
-    "react": "^18.2.0",
     "styled-components": "^6.1.1",
-    "zod": "^3.22.4",
-    "zustand": "^4.4.7",
+    "tailwind-merge": "^2.2.2",
+    "tailwindcss-animate": "^1.0.7",
     "ui": "workspace:*",
-    "api": "workspace:*"
+    "zod": "^3.22.4",
+    "zustand": "^4.4.7"
   },
   "devDependencies": {
+    "@hookform/devtools": "^4.3.1",
+    "@pcd/pcd-types": "^0.8.0",
+    "@tanstack/react-query-devtools": "^5.13.5",
     "@types/node": "^20.12.4",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.2.22",
     "@typescript-eslint/eslint-plugin": "^7.2.0",
-    "@pcd/pcd-types": "^0.8.0",
-    "@tanstack/react-query-devtools": "^5.13.5",
     "@vitejs/plugin-react": "^4.2.1",
     "autoprefixer": "^10.4.19",
     "postcss": "^8.4.38",
     "postcss-cli": "^11.0.0",
     "tailwindcss": "^3.4.3",
+    "typescript": "^5.5.2",
     "vite": "^5.3.5",
-    "vite-plugin-node-polyfills": "^0.17.0",
-    "@hookform/devtools": "^4.3.1",
-    "typescript": "^5.5.2"
+    "vite-plugin-node-polyfills": "^0.17.0"
   },
   "engines": {
     "node": "^20"
diff --git a/packages/berlin/src/_components/ui/dropdown-menu.tsx b/packages/berlin/src/_components/ui/dropdown-menu.tsx
new file mode 100644
index 00000000..01a23898
--- /dev/null
+++ b/packages/berlin/src/_components/ui/dropdown-menu.tsx
@@ -0,0 +1,188 @@
+'use client';
+
+import * as React from 'react';
+import * as DropdownMenuPrimitive from '@radix-ui/react-dropdown-menu';
+import { CheckIcon, ChevronRightIcon, DotFilledIcon } from '@radix-ui/react-icons';
+
+import { cn } from '@/lib/utils';
+
+const DropdownMenu = DropdownMenuPrimitive.Root;
+
+const DropdownMenuTrigger = DropdownMenuPrimitive.Trigger;
+
+const DropdownMenuGroup = DropdownMenuPrimitive.Group;
+
+const DropdownMenuPortal = DropdownMenuPrimitive.Portal;
+
+const DropdownMenuSub = DropdownMenuPrimitive.Sub;
+
+const DropdownMenuRadioGroup = DropdownMenuPrimitive.RadioGroup;
+
+const DropdownMenuSubTrigger = React.forwardRef<
+  React.ElementRef<typeof DropdownMenuPrimitive.SubTrigger>,
+  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.SubTrigger> & {
+    inset?: boolean;
+  }
+>(({ className, inset, children, ...props }, ref) => (
+  <DropdownMenuPrimitive.SubTrigger
+    ref={ref}
+    className={cn(
+      'focus:bg-accent data-[state=open]:bg-accent flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none',
+      inset && 'pl-8',
+      className,
+    )}
+    {...props}
+  >
+    {children}
+    <ChevronRightIcon className="ml-auto h-4 w-4" />
+  </DropdownMenuPrimitive.SubTrigger>
+));
+DropdownMenuSubTrigger.displayName = DropdownMenuPrimitive.SubTrigger.displayName;
+
+const DropdownMenuSubContent = React.forwardRef<
+  React.ElementRef<typeof DropdownMenuPrimitive.SubContent>,
+  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.SubContent>
+>(({ className, ...props }, ref) => (
+  <DropdownMenuPrimitive.SubContent
+    ref={ref}
+    className={cn(
+      'bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 min-w-[8rem] overflow-hidden rounded-md border p-1 shadow-lg',
+      className,
+    )}
+    {...props}
+  />
+));
+DropdownMenuSubContent.displayName = DropdownMenuPrimitive.SubContent.displayName;
+
+const DropdownMenuContent = React.forwardRef<
+  React.ElementRef<typeof DropdownMenuPrimitive.Content>,
+  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Content>
+>(({ className, sideOffset = 4, ...props }, ref) => (
+  <DropdownMenuPrimitive.Portal>
+    <DropdownMenuPrimitive.Content
+      ref={ref}
+      sideOffset={sideOffset}
+      className={cn(
+        'bg-popover text-popover-foreground z-50 min-w-[8rem] overflow-hidden border p-1 shadow-md',
+        'data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2',
+        className,
+      )}
+      {...props}
+    />
+  </DropdownMenuPrimitive.Portal>
+));
+DropdownMenuContent.displayName = DropdownMenuPrimitive.Content.displayName;
+
+const DropdownMenuItem = React.forwardRef<
+  React.ElementRef<typeof DropdownMenuPrimitive.Item>,
+  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Item> & {
+    inset?: boolean;
+  }
+>(({ className, inset, ...props }, ref) => (
+  <DropdownMenuPrimitive.Item
+    ref={ref}
+    className={cn(
+      'focus:bg-secondary focus:text-primary relative flex cursor-default select-none items-center px-2 py-1.5 text-sm outline-none transition-colors data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
+      inset && 'pl-8',
+      className,
+    )}
+    {...props}
+  />
+));
+DropdownMenuItem.displayName = DropdownMenuPrimitive.Item.displayName;
+
+const DropdownMenuCheckboxItem = React.forwardRef<
+  React.ElementRef<typeof DropdownMenuPrimitive.CheckboxItem>,
+  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.CheckboxItem>
+>(({ className, children, checked, ...props }, ref) => (
+  <DropdownMenuPrimitive.CheckboxItem
+    ref={ref}
+    className={cn(
+      'focus:bg-accent focus:text-accent-foreground relative flex cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none transition-colors data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
+      className,
+    )}
+    checked={checked}
+    {...props}
+  >
+    <span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
+      <DropdownMenuPrimitive.ItemIndicator>
+        <CheckIcon className="h-4 w-4" />
+      </DropdownMenuPrimitive.ItemIndicator>
+    </span>
+    {children}
+  </DropdownMenuPrimitive.CheckboxItem>
+));
+DropdownMenuCheckboxItem.displayName = DropdownMenuPrimitive.CheckboxItem.displayName;
+
+const DropdownMenuRadioItem = React.forwardRef<
+  React.ElementRef<typeof DropdownMenuPrimitive.RadioItem>,
+  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.RadioItem>
+>(({ className, children, ...props }, ref) => (
+  <DropdownMenuPrimitive.RadioItem
+    ref={ref}
+    className={cn(
+      'focus:bg-accent focus:text-accent-foreground relative flex cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none transition-colors data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
+      className,
+    )}
+    {...props}
+  >
+    <span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
+      <DropdownMenuPrimitive.ItemIndicator>
+        <DotFilledIcon className="h-4 w-4 fill-current" />
+      </DropdownMenuPrimitive.ItemIndicator>
+    </span>
+    {children}
+  </DropdownMenuPrimitive.RadioItem>
+));
+DropdownMenuRadioItem.displayName = DropdownMenuPrimitive.RadioItem.displayName;
+
+const DropdownMenuLabel = React.forwardRef<
+  React.ElementRef<typeof DropdownMenuPrimitive.Label>,
+  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Label> & {
+    inset?: boolean;
+  }
+>(({ className, inset, ...props }, ref) => (
+  <DropdownMenuPrimitive.Label
+    ref={ref}
+    className={cn('px-2 py-1.5 text-sm font-semibold', inset && 'pl-8', className)}
+    {...props}
+  />
+));
+DropdownMenuLabel.displayName = DropdownMenuPrimitive.Label.displayName;
+
+const DropdownMenuSeparator = React.forwardRef<
+  React.ElementRef<typeof DropdownMenuPrimitive.Separator>,
+  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Separator>
+>(({ className, ...props }, ref) => (
+  <DropdownMenuPrimitive.Separator
+    ref={ref}
+    className={cn('bg-muted -mx-1 my-1 h-px', className)}
+    {...props}
+  />
+));
+DropdownMenuSeparator.displayName = DropdownMenuPrimitive.Separator.displayName;
+
+const DropdownMenuShortcut = ({ className, ...props }: React.HTMLAttributes<HTMLSpanElement>) => {
+  return (
+    <span className={cn('ml-auto text-xs tracking-widest opacity-60', className)} {...props} />
+  );
+};
+DropdownMenuShortcut.displayName = 'DropdownMenuShortcut';
+
+export {
+  DropdownMenu,
+  DropdownMenuTrigger,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuCheckboxItem,
+  DropdownMenuRadioItem,
+  DropdownMenuLabel,
+  DropdownMenuSeparator,
+  DropdownMenuShortcut,
+  DropdownMenuGroup,
+  DropdownMenuPortal,
+  DropdownMenuSub,
+  DropdownMenuSubContent,
+  DropdownMenuSubTrigger,
+  DropdownMenuRadioGroup,
+};
diff --git a/packages/berlin/src/components/button/Button.styled.tsx b/packages/berlin/src/components/button/Button.styled.tsx
index 3d5fa449..ad00dbbb 100644
--- a/packages/berlin/src/components/button/Button.styled.tsx
+++ b/packages/berlin/src/components/button/Button.styled.tsx
@@ -2,7 +2,6 @@ import styled, { css } from 'styled-components';
 import { StyledButtonProps } from './Button.types';
 
 export const StyledButton = styled.button<StyledButtonProps>`
-  border-radius: 0.5rem;
   border: none;
   font-family: var(--font-family-button);
   font-size: 1rem;
diff --git a/packages/berlin/src/components/columns/cycle-columns/CycleColumns.styled.tsx b/packages/berlin/src/components/columns/cycle-columns/CycleColumns.styled.tsx
deleted file mode 100644
index 9ddf80a7..00000000
--- a/packages/berlin/src/components/columns/cycle-columns/CycleColumns.styled.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-import styled from 'styled-components';
-import { FlexRow } from '../../containers/FlexRow.styled';
-
-export const Card = styled(FlexRow)`
-  display: none;
-  @media (min-width: 600px) {
-    display: flex;
-    border-bottom: 2px solid var(--color-black);
-    gap: 0;
-    width: 100%;
-  }
-`;
-
-export const Proposal = styled(FlexRow)`
-  flex: 1;
-  font-weight: bold;
-  min-width: 11rem;
-  padding: 1.5rem;
-  p {
-    cursor: pointer;
-  }
-`;
-
-export const Lead = styled(FlexRow)`
-  display: none;
-  @media (min-width: 600px) {
-    display: flex;
-    font-weight: bold;
-    max-width: 10rem;
-    min-width: 8rem;
-    padding: 1.5rem;
-
-    p {
-      cursor: pointer;
-    }
-  }
-`;
-
-export const Affiliation = styled(FlexRow)`
-  display: none;
-  @media (min-width: 600px) {
-    display: flex;
-    font-weight: bold;
-    max-width: 10rem;
-    min-width: 8rem;
-    padding: 1.5rem;
-
-    p {
-      cursor: pointer;
-    }
-  }
-`;
-
-export const Hearts = styled(FlexRow)`
-  gap: 0.5rem;
-  max-width: 5rem;
-  padding: 1.5rem;
-`;
-
-export const Plurality = styled(FlexRow)`
-  max-width: 5rem;
-  padding: 1.5rem;
-`;
diff --git a/packages/berlin/src/components/columns/cycle-columns/CycleColumns.tsx b/packages/berlin/src/components/columns/cycle-columns/CycleColumns.tsx
deleted file mode 100644
index 615236c6..00000000
--- a/packages/berlin/src/components/columns/cycle-columns/CycleColumns.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import { Heart } from 'lucide-react';
-import IconButton from '../../icon-button';
-import { Body } from '../../typography/Body.styled';
-import { Affiliation, Lead, Card, Hearts, Proposal, Plurality } from './CycleColumns.styled';
-import Icon from '../../icon';
-
-type CycleColumnsProps = {
-  onColumnClick: (column: string) => void;
-  showScore?: boolean;
-};
-
-function CycleColumns({ onColumnClick, showScore }: CycleColumnsProps) {
-  return (
-    <Card>
-      <Proposal>
-        <Body>Proposal</Body>
-      </Proposal>
-      <Lead onClick={() => onColumnClick('lead')}>
-        <Body>Lead</Body>
-      </Lead>
-      <Affiliation onClick={() => onColumnClick('affiliation')}>
-        <Body>Affiliation</Body>
-      </Affiliation>
-      <Hearts onClick={() => onColumnClick('numOfVotes')} className="hearts">
-        <Icon>
-          <Heart fill="#ff0000" />
-        </Icon>
-      </Hearts>
-      {showScore && (
-        <Plurality onClick={() => onColumnClick('voteScore')}>
-          <IconButton
-            $padding={0}
-            $color="secondary"
-            icon={{ src: `/icons/plurality-score.svg`, alt: 'Plurality score' }}
-          />
-        </Plurality>
-      )}
-    </Card>
-  );
-}
-
-export default CycleColumns;
diff --git a/packages/berlin/src/components/columns/cycle-columns/index.ts b/packages/berlin/src/components/columns/cycle-columns/index.ts
deleted file mode 100644
index d1ec6baa..00000000
--- a/packages/berlin/src/components/columns/cycle-columns/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './CycleColumns';
diff --git a/packages/berlin/src/components/option-card/OptionCard.styled.tsx b/packages/berlin/src/components/option-card/OptionCard.styled.tsx
deleted file mode 100644
index 5a48ff92..00000000
--- a/packages/berlin/src/components/option-card/OptionCard.styled.tsx
+++ /dev/null
@@ -1,141 +0,0 @@
-import styled, { css } from 'styled-components';
-import { FlexRow } from '../containers/FlexRow.styled';
-import { FlexRowToColumn } from '../containers/FlexRowToColumn.styled';
-import { FlexColumn } from '../containers/FlexColumn.styled';
-import { Bold } from '../typography/Bold.styled';
-
-export const Card = styled.div<{ $expanded: boolean }>`
-  border-radius: 0.5rem;
-  border: 1px solid var(--color-black);
-  display: flex;
-  flex-direction: column;
-  gap: 1rem;
-  margin-block: 0.5rem;
-  padding: 2rem;
-  width: 100%;
-
-  @media (min-width: 600px) {
-    margin: 0;
-    border: none;
-    border-radius: 0;
-    border-bottom: 1px solid var(--color-black);
-    flex-direction: row;
-    gap: 0;
-    padding: 0;
-  }
-
-  .description {
-    display: ${(props) => (props.$expanded ? 'flex' : 'none')};
-    @media (min-width: 600px) {
-      padding: 1.5rem;
-      padding-top: 0;
-    }
-  }
-`;
-
-export const Container = styled(FlexRowToColumn)`
-  gap: 1rem;
-  @media (min-width: 600px) {
-    gap: 0;
-  }
-`;
-
-export const Proposal = styled(FlexRow)`
-  @media (min-width: 600px) {
-    flex: 1;
-    min-width: 11rem;
-    padding: 1.5rem;
-  }
-`;
-
-export const Author = styled(FlexRow)`
-  gap: 0.25rem;
-  @media (min-width: 600px) {
-    display: flex;
-    max-width: 10rem;
-    min-width: 8rem;
-    padding: 1.5rem;
-  }
-`;
-
-export const Affiliation = styled(FlexRow)`
-  gap: 0.25rem;
-  @media (min-width: 600px) {
-    display: flex;
-    max-width: 10rem;
-    min-width: 8rem;
-    padding: 1.5rem;
-  }
-`;
-
-export const Votes = styled(FlexRow)<{ $showScore: boolean | undefined }>`
-  @media (min-width: 600px) {
-    gap: 0.5rem;
-    max-width: 5rem;
-    padding: 1.5rem;
-  }
-
-  ${(props) =>
-    !props.$showScore &&
-    css`
-      border-bottom: 1px solid var(--color-black);
-      padding-bottom: 0.75rem;
-      @media (min-width: 600px) {
-        border: none;
-        padding: 1.5rem;
-      }
-    `}
-`;
-export const VotesIcon = styled(FlexColumn)`
-  width: 1.25rem;
-  :first-child {
-    height: 1.25rem;
-    width: 1.25rem;
-  }
-  @media (min-width: 600px) {
-    width: 1.5rem;
-    :first-child {
-      height: 1rem;
-      width: 1rem;
-    }
-  }
-`;
-
-export const Plurality = styled(FlexRow)`
-  border-bottom: 1px solid var(--color-black);
-  padding-bottom: 0.75rem;
-
-  @media (min-width: 600px) {
-    border: none;
-    gap: 0.5rem;
-    max-width: 5rem;
-    padding-bottom: 0;
-    padding: 1.5rem;
-  }
-`;
-
-export const PluralityIcon = styled.div`
-  display: block;
-  @media (min-width: 600px) {
-    display: none;
-  }
-`;
-
-export const ArrowIcon = styled(PluralityIcon)`
-  margin-left: auto;
-`;
-
-export const Field = styled(Bold)`
-  display: inline;
-  font-size: 1.125rem;
-  @media (min-width: 600px) {
-    display: none;
-  }
-`;
-
-export const ArrowDownIcon = styled.div`
-  display: none;
-  @media (min-width: 600px) {
-    display: block;
-  }
-`;
diff --git a/packages/berlin/src/components/option-card/OptionCard.tsx b/packages/berlin/src/components/option-card/OptionCard.tsx
deleted file mode 100644
index 89be1037..00000000
--- a/packages/berlin/src/components/option-card/OptionCard.tsx
+++ /dev/null
@@ -1,197 +0,0 @@
-// React and third-party libraries
-import { MessageSquareText } from 'lucide-react';
-import { useMemo, useState } from 'react';
-import { useNavigate, useParams } from 'react-router-dom';
-import { useQuery } from '@tanstack/react-query';
-import Markdown from 'react-markdown';
-
-// Store
-import { useAppStore } from '../../store';
-
-// API
-import { fetchOptionUsers, GetCycleResponse } from 'api';
-
-// Components
-import { Body } from '../typography/Body.styled';
-import { Bold } from '../typography/Bold.styled';
-import { FlexColumn } from '../containers/FlexColumn.styled';
-import IconButton from '../icon-button';
-import Link from '../link';
-import Icon from '../icon';
-
-// Styled Components
-import {
-  Affiliation,
-  ArrowDownIcon,
-  ArrowIcon,
-  Author,
-  Card,
-  Container,
-  Field,
-  Plurality,
-  PluralityIcon,
-  Proposal,
-  Votes,
-  VotesIcon,
-} from './OptionCard.styled';
-
-type OptionCardProps = {
-  option: GetCycleResponse['questions'][number]['options'][number];
-  showFundingRequest?: boolean;
-  showScore?: boolean;
-  numOfVotes: number;
-  onVote: () => void;
-  onUnVote: () => void;
-};
-
-function OptionCard({
-  option,
-  numOfVotes,
-  onVote,
-  onUnVote,
-  showFundingRequest = false,
-  showScore,
-}: OptionCardProps) {
-  const { eventId, cycleId } = useParams();
-  const theme = useAppStore((state) => state.theme);
-  const navigate = useNavigate();
-  const { data: optionUsers } = useQuery({
-    queryKey: ['option', option.id, 'users'],
-    queryFn: () =>
-      fetchOptionUsers({ optionId: option.id || '', serverUrl: import.meta.env.VITE_SERVER_URL }),
-    enabled: !!option.id,
-  });
-
-  const formattedPluralityScore = useMemo(() => {
-    const score = parseFloat(String(option.voteScore));
-    return score % 1 === 0 ? score.toFixed(0) : score.toFixed(1);
-  }, [option.voteScore]);
-
-  const [expanded, setExpanded] = useState(false);
-
-  const author = option.user ? `${option.user?.firstName} ${option.user?.lastName}` : 'Anonymous';
-
-  const handleCommentsClick = () => {
-    navigate(`/events/${eventId}/cycles/${cycleId}/options/${option.id}`);
-  };
-
-  const coauthors = useMemo(() => {
-    return optionUsers?.group?.users?.filter(
-      (optionUser) => optionUser.username !== option.user?.username,
-    );
-  }, [optionUsers, option.user?.username]);
-
-  return (
-    <Card $expanded={expanded} className="expand">
-      <FlexColumn>
-        <Container>
-          <Proposal>
-            <ArrowDownIcon>
-              <IconButton
-                $padding={4}
-                $color="secondary"
-                onClick={() => setExpanded((e) => !e)}
-                icon={{ src: `/icons/arrow-down-${theme}.svg`, alt: 'Arrow down' }}
-                $flipVertical={expanded}
-              />
-            </ArrowDownIcon>
-            <Body>{option.title}</Body>
-          </Proposal>
-          <Author>
-            <Field>Lead:</Field>
-            <Body>{author}</Body>
-          </Author>
-          <Affiliation>
-            <Field>Affiliation:</Field>
-            <Body>
-              {option.user?.groups?.find((group) => group.groupCategory?.required)?.name ??
-                'No affiliation'}
-            </Body>
-          </Affiliation>
-          <Votes $showScore={showScore}>
-            <VotesIcon $gap="-4px" className="votes">
-              <IconButton
-                $padding={0}
-                $color="secondary"
-                icon={{ src: `/icons/upvote-${theme}.svg`, alt: 'Upvote arrow' }}
-                onClick={onVote}
-                $width={16}
-                $height={16}
-              />
-              <IconButton
-                $padding={0}
-                $color="secondary"
-                icon={{ src: `/icons/downvote-${theme}.svg`, alt: 'Downvote arrow' }}
-                onClick={onUnVote}
-                $width={16}
-                $height={16}
-                disabled={numOfVotes === 0}
-              />
-            </VotesIcon>
-            <Body>{numOfVotes}</Body>
-            {!showScore && (
-              <ArrowIcon>
-                <IconButton
-                  $padding={4}
-                  $color="secondary"
-                  onClick={() => setExpanded((e) => !e)}
-                  icon={{ src: `/icons/arrow-down-${theme}.svg`, alt: 'Arrow down' }}
-                  $flipVertical={expanded}
-                />
-              </ArrowIcon>
-            )}
-          </Votes>
-          {showScore && (
-            <Plurality>
-              <PluralityIcon>
-                <IconButton
-                  $padding={0}
-                  $color="secondary"
-                  icon={{ src: `/icons/plurality-score.svg`, alt: 'Plurality score' }}
-                />
-              </PluralityIcon>
-              {formattedPluralityScore}
-              <ArrowIcon>
-                <IconButton
-                  $padding={4}
-                  $color="secondary"
-                  onClick={() => setExpanded((e) => !e)}
-                  icon={{ src: `/icons/arrow-down-${theme}.svg`, alt: 'Arrow down' }}
-                  $flipVertical={expanded}
-                />
-              </ArrowIcon>
-            </Plurality>
-          )}
-        </Container>
-        <FlexColumn className="description" $gap="1.5rem">
-          {coauthors && coauthors.length > 0 && (
-            <Body>
-              <Bold>Co-authors:</Bold>{' '}
-              {coauthors.map((coauthor) => `${coauthor.firstName} ${coauthor.lastName}`).join(', ')}
-            </Body>
-          )}
-          {showFundingRequest && option.fundingRequest && (
-            <Body>
-              <Bold>Funding request:</Bold> {option.fundingRequest}
-            </Body>
-          )}
-          {option.optionSubTitle && (
-            <Markdown
-              components={{
-                a: ({ node, ...props }) => <Link to={props.href ?? ''}>{props.children}</Link>,
-                p: ({ node, ...props }) => <Body>{props.children}</Body>,
-              }}
-            >
-              {option.optionSubTitle}
-            </Markdown>
-          )}
-          <Icon>
-            <MessageSquareText onClick={handleCommentsClick} />
-          </Icon>
-        </FlexColumn>
-      </FlexColumn>
-    </Card>
-  );
-}
-
-export default OptionCard;
diff --git a/packages/berlin/src/components/option-card/index.ts b/packages/berlin/src/components/option-card/index.ts
deleted file mode 100644
index 271290b3..00000000
--- a/packages/berlin/src/components/option-card/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './OptionCard';
diff --git a/packages/berlin/src/components/option/Option.tsx b/packages/berlin/src/components/option/Option.tsx
new file mode 100644
index 00000000..cacd7ead
--- /dev/null
+++ b/packages/berlin/src/components/option/Option.tsx
@@ -0,0 +1,166 @@
+// React and third-party libraries
+import { useLayoutEffect, useMemo, useRef, useState } from 'react';
+import { useNavigate, useParams } from 'react-router-dom';
+import { useQuery } from '@tanstack/react-query';
+import Markdown from 'react-markdown';
+
+// API
+import { fetchOptionUsers, GetCycleResponse } from 'api';
+
+// Components
+import { Body } from '../typography/Body.styled';
+import { Bold } from '../typography/Bold.styled';
+import { ChevronDown, MessageSquareText, Minus, Plus } from 'lucide-react';
+import Button from '../button';
+import Link from '../link';
+
+type OptionProps = {
+  option: GetCycleResponse['questions'][number]['options'][number];
+  showFundingRequest?: boolean;
+  showScore?: boolean;
+  numOfVotes: number;
+  onVote: () => void;
+  onUnVote: () => void;
+};
+
+export default function Option({
+  option,
+  showFundingRequest,
+  showScore,
+  numOfVotes,
+  onVote,
+  onUnVote,
+}: OptionProps) {
+  const [isExpanded, setIsExpanded] = useState(false);
+  const [expandedHeight, setExpandedHeight] = useState(0);
+  const expandedRef = useRef<HTMLDivElement>(null);
+  const { eventId, cycleId } = useParams();
+  const navigate = useNavigate();
+
+  const { data: optionUsers } = useQuery({
+    queryKey: ['option', option.id, 'users'],
+    queryFn: () =>
+      fetchOptionUsers({ optionId: option.id || '', serverUrl: import.meta.env.VITE_SERVER_URL }),
+    enabled: !!option.id,
+  });
+
+  useLayoutEffect(() => {
+    if (expandedRef.current) {
+      setExpandedHeight(isExpanded ? expandedRef.current.scrollHeight : 0);
+    }
+  }, [isExpanded]);
+
+  const handleChevronClick = () => {
+    setIsExpanded(!isExpanded);
+  };
+
+  const handleCommentsClick = () => {
+    navigate(`/events/${eventId}/cycles/${cycleId}/options/${option.id}`);
+  };
+
+  const pluralityScore = useMemo(() => {
+    const score = parseFloat(String(option.voteScore));
+    return score % 1 === 0 ? score.toFixed(0) : score.toFixed(1);
+  }, [option.voteScore]);
+
+  const author = useMemo(() => {
+    if (option.user) {
+      return `${option.user.firstName} ${option.user.lastName}`;
+    }
+    return null;
+  }, [option.user]);
+
+  const affiliation = useMemo(() => {
+    return option.user?.groups?.find((group) => group.groupCategory?.required)?.name || null;
+  }, [option.user]);
+
+  const coauthors = useMemo(() => {
+    return (
+      optionUsers?.group?.users?.filter(
+        (optionUser) => optionUser.username !== option.user?.username,
+      ) || []
+    );
+  }, [optionUsers, option.user?.username]);
+
+  const fundingRequest = useMemo(() => {
+    if (showFundingRequest) {
+      return option.fundingRequest;
+    }
+    return null;
+  }, [option.fundingRequest, showFundingRequest]);
+
+  return (
+    <article className="border-secondary grid w-full grid-cols-[1fr_auto] gap-4 border p-4">
+      <section className="col-span-1 flex flex-col gap-4">
+        <Body>{option.title}</Body>
+        {author && (
+          <Body>
+            <Bold>Creator: </Bold>
+            {author}
+          </Body>
+        )}
+        {affiliation && (
+          <Body>
+            <Bold>Affiliation: </Bold>
+            {affiliation} {/* should render `no affiliation` if its not found? */}
+          </Body>
+        )}
+        {showScore && (
+          <span className="flex items-center gap-2">
+            <img src="/icons/plurality-score.svg" width={24} height={24} />
+            <Body>{pluralityScore}</Body>
+          </span>
+        )}
+      </section>
+      <section className="col-start-1 col-end-3 flex flex-col justify-between md:col-start-2">
+        <section className="flex gap-1">
+          <Button
+            style={{ padding: '4px 4px', borderRadius: 0 }}
+            onClick={onUnVote}
+            disabled={numOfVotes === 0}
+          >
+            <Minus height={16} width={16} strokeWidth={3} />
+          </Button>
+          <Body className="min-w-8 text-center">{numOfVotes}</Body>
+          <Button style={{ padding: '4px 4px', borderRadius: 0 }} onClick={onVote}>
+            <Plus height={16} width={16} strokeWidth={3} />
+          </Button>
+        </section>
+        <section className="flex w-full justify-end" onClick={handleChevronClick}>
+          <ChevronDown
+            className={`cursor-pointer transition-transform duration-300 ${isExpanded ? 'rotate-180' : ''}`}
+          />
+        </section>
+      </section>
+      <section
+        ref={expandedRef}
+        style={{ maxHeight: expandedHeight }}
+        className="transition-max-height col-span-2 overflow-hidden duration-300"
+      >
+        {coauthors.length > 0 && (
+          <Body>
+            <Bold>Co-authors:</Bold>{' '}
+            {coauthors.map((coauthor) => `${coauthor.firstName} ${coauthor.lastName}`).join(', ')}
+          </Body>
+        )}
+        {fundingRequest && (
+          <Body>
+            <Bold>Funding request: </Bold>
+            {fundingRequest}
+          </Body>
+        )}
+        {option.subTitle && (
+          <Markdown
+            components={{
+              a: ({ node, ...props }) => <Link to={props.href ?? ''}>{props.children}</Link>,
+              p: ({ node, ...props }) => <Body>{props.children}</Body>,
+            }}
+          >
+            {option.subTitle}
+          </Markdown>
+        )}
+        <MessageSquareText onClick={handleCommentsClick} />
+      </section>
+    </article>
+  );
+}
diff --git a/packages/berlin/src/components/option/index.ts b/packages/berlin/src/components/option/index.ts
new file mode 100644
index 00000000..0d128782
--- /dev/null
+++ b/packages/berlin/src/components/option/index.ts
@@ -0,0 +1 @@
+export { default } from './Option';
diff --git a/packages/berlin/src/pages/Cycle.tsx b/packages/berlin/src/pages/Cycle.tsx
index 354aecf9..109aaea0 100644
--- a/packages/berlin/src/pages/Cycle.tsx
+++ b/packages/berlin/src/pages/Cycle.tsx
@@ -29,13 +29,19 @@ import { cycleSteps } from '@/components/onboarding/Steps';
 import { FINAL_QUESTION_TITLE, INITIAL_HEARTS } from '../utils/constants';
 import { FlexColumn } from '../components/containers/FlexColumn.styled';
 import { FlexRow } from '../components/containers/FlexRow.styled';
-import { Heart } from 'lucide-react';
+import { Heart, SlidersHorizontal } from 'lucide-react';
+import { Subtitle } from '@/components/typography/Subtitle.styled';
 import { Title } from '../components/typography/Title.styled';
 import BackButton from '../components/back-button';
 import Button from '../components/button';
-import CycleColumns from '../components/columns/cycle-columns';
 import Onboarding from '@/components/onboarding';
-import OptionCard from '../components/option-card';
+import Option from '@/components/option';
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from '@/_components/ui/dropdown-menu';
 
 type Order = 'asc' | 'desc';
 type LocalUserVotes = { optionId: string; numOfVotes: number }[];
@@ -318,21 +324,49 @@ function Cycle() {
           </Button>
         </FlexColumn>
         {currentCycle?.options.length ? (
-          <FlexColumn $gap="0">
-            <CycleColumns onColumnClick={handleColumnClick} showScore={currentCycle.showScore} />
+          <FlexColumn>
+            <div className="flex w-full items-center justify-between">
+              <Subtitle>Vote items</Subtitle>
+              <div className="flex cursor-pointer items-center gap-2">
+                <Body>Sort</Body>
+                <DropdownMenu>
+                  <DropdownMenuTrigger>
+                    <SlidersHorizontal />
+                  </DropdownMenuTrigger>
+                  <DropdownMenuContent className="bg-primary border-secondary">
+                    <DropdownMenuItem onClick={() => handleColumnClick('lead')}>
+                      <label>Creator</label>
+                    </DropdownMenuItem>
+                    <DropdownMenuItem onClick={() => handleColumnClick('affiliation')}>
+                      <label>Affiliation</label>
+                    </DropdownMenuItem>
+                    <DropdownMenuItem onClick={() => handleColumnClick('numOfVotes')}>
+                      <label>Votes</label>
+                    </DropdownMenuItem>
+                    {currentCycle.showScore && (
+                      <DropdownMenuItem onClick={() => handleColumnClick('voteScore')}>
+                        <label>Plurality Score</label>
+                      </DropdownMenuItem>
+                    )}
+                  </DropdownMenuContent>
+                </DropdownMenu>
+              </div>
+            </div>
             {sortedOptions.options.map((option) => {
               const userVote = localUserVotes.find((vote) => vote.optionId === option.id);
               const numOfVotes = userVote ? userVote.numOfVotes : 0;
               return (
-                <OptionCard
-                  key={option.id}
-                  option={option}
-                  numOfVotes={numOfVotes}
-                  showFundingRequest={currentCycle.title === FINAL_QUESTION_TITLE}
-                  showScore={currentCycle.showScore}
-                  onVote={() => handleVoteWrapper(option.id)}
-                  onUnVote={() => handleUnVoteWrapper(option.id)}
-                />
+                <>
+                  <Option
+                    key={option.id}
+                    option={option}
+                    numOfVotes={numOfVotes}
+                    showFundingRequest={currentCycle.title === FINAL_QUESTION_TITLE}
+                    showScore={currentCycle.showScore}
+                    onVote={() => handleVoteWrapper(option.id)}
+                    onUnVote={() => handleUnVoteWrapper(option.id)}
+                  />
+                </>
               );
             })}
           </FlexColumn>
diff --git a/packages/berlin/tailwind.config.js b/packages/berlin/tailwind.config.js
index eb76aef6..5486c5a4 100644
--- a/packages/berlin/tailwind.config.js
+++ b/packages/berlin/tailwind.config.js
@@ -20,6 +20,9 @@ module.exports = {
       fontFamily: {
         raleway: ["'Raleway'", 'sans-serif'],
       },
+      transitionProperty: {
+        'max-height': 'max-height',
+      },
       colors: {
         border: 'hsl(var(--border))',
         input: 'hsl(var(--input))',
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4b497624..39a20b75 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -52,6 +52,9 @@ importers:
       '@radix-ui/react-dialog':
         specifier: ^1.0.5
         version: 1.0.5(@types/react-dom@18.2.24)(@types/react@18.3.3)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@radix-ui/react-dropdown-menu':
+        specifier: ^2.1.1
+        version: 2.1.1(@types/react-dom@18.2.24)(@types/react@18.3.3)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-icons':
         specifier: ^1.3.0
         version: 1.3.0(react@18.2.0)
@@ -1021,6 +1024,19 @@ packages:
       '@types/react-dom':
         optional: true
 
+  '@radix-ui/react-arrow@1.1.0':
+    resolution: {integrity: sha512-FmlW1rCg7hBpEBwFbjHwCW6AmWLQM6g/v0Sn8XbP9NvmSZ2San1FpQeyPtufzOMSIx7Y4dzjlHoifhp+7NkZhw==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
   '@radix-ui/react-collection@1.1.0':
     resolution: {integrity: sha512-GZsZslMJEyo1VKm5L1ZJY8tGDxZNPAoUeQUIbKeJfoi7Q4kmig5AsgLMYYuyYbfjd8fBmFORAIwYAkXMnXZgZw==}
     peerDependencies:
@@ -1118,6 +1134,19 @@ packages:
       '@types/react-dom':
         optional: true
 
+  '@radix-ui/react-dropdown-menu@2.1.1':
+    resolution: {integrity: sha512-y8E+x9fBq9qvteD2Zwa4397pUVhYsh9iq44b5RD5qu1GMJWBCBuVg1hMyItbc6+zH00TxGRqd9Iot4wzf3OoBQ==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
   '@radix-ui/react-focus-guards@1.0.1':
     resolution: {integrity: sha512-Rect2dWbQ8waGzhMavsIbmSVCgYxkXLxxR3ZvCX79JOglzdEy4JXMb98lq4hPxUbLr77nP0UOGf4rcMU+s1pUA==}
     peerDependencies:
@@ -1127,6 +1156,15 @@ packages:
       '@types/react':
         optional: true
 
+  '@radix-ui/react-focus-guards@1.1.0':
+    resolution: {integrity: sha512-w6XZNUPVv6xCpZUqb/yN9DL6auvpGX3C/ee6Hdi16v2UUy25HV2Q5bcflsiDyT/g5RwbPQ/GIT1vLkeRb+ITBw==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
   '@radix-ui/react-focus-scope@1.0.4':
     resolution: {integrity: sha512-sL04Mgvf+FmyvZeYfNu1EPAaaxD+aw7cYeIB9L9Fvq8+urhltTRaEo5ysKOpHuKPclsZcSUMKlN05x4u+CINpA==}
     peerDependencies:
@@ -1140,6 +1178,19 @@ packages:
       '@types/react-dom':
         optional: true
 
+  '@radix-ui/react-focus-scope@1.1.0':
+    resolution: {integrity: sha512-200UD8zylvEyL8Bx+z76RJnASR2gRMuxlgFCPAe/Q/679a/r0eK3MBVYMb7vZODZcffZBdob1EGnky78xmVvcA==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
   '@radix-ui/react-icons@1.3.0':
     resolution: {integrity: sha512-jQxj/0LKgp+j9BiTXz3O3sgs26RNet2iLWmsPyRz2SIcR4q/4SbazXfnYwbAr+vLYKSfc7qxzyGQA1HLlYiuNw==}
     peerDependencies:
@@ -1163,6 +1214,19 @@ packages:
       '@types/react':
         optional: true
 
+  '@radix-ui/react-menu@2.1.1':
+    resolution: {integrity: sha512-oa3mXRRVjHi6DZu/ghuzdylyjaMXLymx83irM7hTxutQbD+7IhPKdMdRHD26Rm+kHRrWcrUkkRPv5pd47a2xFQ==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
   '@radix-ui/react-navigation-menu@1.2.0':
     resolution: {integrity: sha512-OQ8tcwAOR0DhPlSY3e4VMXeHiol7la4PPdJWhhwJiJA+NLX0SaCaonOkRnI3gCDHoZ7Fo7bb/G6q25fRM2Y+3Q==}
     peerDependencies:
@@ -1202,6 +1266,19 @@ packages:
       '@types/react-dom':
         optional: true
 
+  '@radix-ui/react-popper@1.2.0':
+    resolution: {integrity: sha512-ZnRMshKF43aBxVWPWvbj21+7TQCvhuULWJ4gNIKYpRlQt5xGRhLx66tMp8pya2UkGHTSlhpXwmjqltDYHhw7Vg==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
   '@radix-ui/react-portal@1.0.4':
     resolution: {integrity: sha512-Qki+C/EuGUVCQTOTD5vzJzJuMUlewbzuKyUy+/iHM2uwGiru9gZeBJtHAPKAEkB5KWGi9mP/CHKcY0wt1aW45Q==}
     peerDependencies:
@@ -1215,6 +1292,19 @@ packages:
       '@types/react-dom':
         optional: true
 
+  '@radix-ui/react-portal@1.1.1':
+    resolution: {integrity: sha512-A3UtLk85UtqhzFqtoC8Q0KvR2GbXF3mtPgACSazajqq6A41mEQgo53iPzY4i6BwDxlIFqWIhiQ2G729n+2aw/g==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
   '@radix-ui/react-presence@1.0.1':
     resolution: {integrity: sha512-UXLW4UAbIY5ZjcvzjfRFo5gxva8QirC9hF7wRE4U5gz+TP0DbRk+//qyuAQ1McDxBt1xNMBTaciFGvEmJvAZCg==}
     peerDependencies:
@@ -1267,6 +1357,19 @@ packages:
       '@types/react-dom':
         optional: true
 
+  '@radix-ui/react-roving-focus@1.1.0':
+    resolution: {integrity: sha512-EA6AMGeq9AEeQDeSH0aZgG198qkfHSbvWTf1HvoDmOB5bBG/qTxjYMWUKMnYiV6J/iP/J8MEFSuB2zRU2n7ODA==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
   '@radix-ui/react-separator@1.1.0':
     resolution: {integrity: sha512-3uBAs+egzvJBDZAzvb/n4NxxOYpnspmWxO2u5NbZ8Y6FM/NdrGSF9bop3Cf6F6C71z1rTSn8KV0Fo2ZVd79lGA==}
     peerDependencies:
@@ -1388,6 +1491,15 @@ packages:
       '@types/react':
         optional: true
 
+  '@radix-ui/react-use-rect@1.1.0':
+    resolution: {integrity: sha512-0Fmkebhr6PiseyZlYAOtLS+nb7jLmpqTrJyv61Pe68MKYW6OWdRE2kI70TaYY27u7H0lajqM3hSMMLFq18Z7nQ==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
   '@radix-ui/react-use-size@1.0.1':
     resolution: {integrity: sha512-ibay+VqrgcaI6veAojjofPATwledXiSmX+C0KrBk/xgpX9rBzPV3OsfwlhQdUOFbh+LKQorLYT+xTXW9V8yd0g==}
     peerDependencies:
@@ -1397,6 +1509,15 @@ packages:
       '@types/react':
         optional: true
 
+  '@radix-ui/react-use-size@1.1.0':
+    resolution: {integrity: sha512-XW3/vWuIXHa+2Uwcc2ABSfcCledmXhhQPlGbfcRXbiUQI5Icjcg19BGCZVKKInYbvUCut/ufbbLLPFC5cbb1hw==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
   '@radix-ui/react-visually-hidden@1.1.0':
     resolution: {integrity: sha512-N8MDZqtgCgG5S3aV60INAB475osJousYpZ4cTJ2cFbMpdHS5Y6loLTH8LPtkj2QN0x93J30HT/M3qJXM0+lyeQ==}
     peerDependencies:
@@ -1413,6 +1534,9 @@ packages:
   '@radix-ui/rect@1.0.1':
     resolution: {integrity: sha512-fyrgCaedtvMg9NK3en0pnOYJdtfwxUcNolezkNPUsoX57X8oQk+NkqcvzHXD2uKNij6GXmWU9NDru2IWjrO4BQ==}
 
+  '@radix-ui/rect@1.1.0':
+    resolution: {integrity: sha512-A9+lCBZoaMJlVKcRBz2YByCG+Cp2t6nAnMnNba+XiWxnj6r4JUFqfsgwocMBZU9LPtdxC6wB56ySYpc7LQIoJg==}
+
   '@remix-run/router@1.13.1':
     resolution: {integrity: sha512-so+DHzZKsoOcoXrILB4rqDkMDy7NLMErRdOxvzvOKb507YINKUP4Di+shbTZDhSE/pBZ+vr7XGIpcOO0VLSA+Q==}
     engines: {node: '>=14.0.0'}
@@ -3271,6 +3395,16 @@ packages:
       '@types/react':
         optional: true
 
+  react-remove-scroll@2.5.7:
+    resolution: {integrity: sha512-FnrTWO4L7/Bhhf3CYBNArEG/yROV0tKmTv7/3h9QCFvH6sndeFf1wPqOcbFVu5VAulS5dV1wGT3GZZ/1GawqiA==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
   react-router-dom@6.20.1:
     resolution: {integrity: sha512-npzfPWcxfQN35psS7rJgi/EW0Gx6EsNjfdJSAk73U/HqMEJZ2k/8puxfwHFgDQhBGmS3+sjnGbMdMSV45axPQw==}
     engines: {node: '>=14.0.0'}
@@ -4972,6 +5106,15 @@ snapshots:
       '@types/react': 18.3.3
       '@types/react-dom': 18.2.24
 
+  '@radix-ui/react-arrow@1.1.0(@types/react-dom@18.2.24)(@types/react@18.3.3)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+    dependencies:
+      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.2.24)(@types/react@18.3.3)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+    optionalDependencies:
+      '@types/react': 18.3.3
+      '@types/react-dom': 18.2.24
+
   '@radix-ui/react-collection@1.1.0(@types/react-dom@18.2.24)(@types/react@18.3.3)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.3)(react@18.2.0)
@@ -5117,6 +5260,21 @@ snapshots:
       '@types/react': 18.3.3
       '@types/react-dom': 18.2.24
 
+  '@radix-ui/react-dropdown-menu@2.1.1(@types/react-dom@18.2.24)(@types/react@18.3.3)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+    dependencies:
+      '@radix-ui/primitive': 1.1.0
+      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.3)(react@18.2.0)
+      '@radix-ui/react-context': 1.1.0(@types/react@18.3.3)(react@18.2.0)
+      '@radix-ui/react-id': 1.1.0(@types/react@18.3.3)(react@18.2.0)
+      '@radix-ui/react-menu': 2.1.1(@types/react-dom@18.2.24)(@types/react@18.3.3)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.2.24)(@types/react@18.3.3)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.3)(react@18.2.0)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+    optionalDependencies:
+      '@types/react': 18.3.3
+      '@types/react-dom': 18.2.24
+
   '@radix-ui/react-focus-guards@1.0.1(@types/react@18.2.74)(react@18.2.0)':
     dependencies:
       '@babel/runtime': 7.24.4
@@ -5131,6 +5289,12 @@ snapshots:
     optionalDependencies:
       '@types/react': 18.3.3
 
+  '@radix-ui/react-focus-guards@1.1.0(@types/react@18.3.3)(react@18.2.0)':
+    dependencies:
+      react: 18.2.0
+    optionalDependencies:
+      '@types/react': 18.3.3
+
   '@radix-ui/react-focus-scope@1.0.4(@types/react-dom@18.2.24)(@types/react@18.2.74)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@babel/runtime': 7.24.4
@@ -5155,6 +5319,17 @@ snapshots:
       '@types/react': 18.3.3
       '@types/react-dom': 18.2.24
 
+  '@radix-ui/react-focus-scope@1.1.0(@types/react-dom@18.2.24)(@types/react@18.3.3)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+    dependencies:
+      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.3)(react@18.2.0)
+      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.2.24)(@types/react@18.3.3)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.3)(react@18.2.0)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+    optionalDependencies:
+      '@types/react': 18.3.3
+      '@types/react-dom': 18.2.24
+
   '@radix-ui/react-icons@1.3.0(react@18.2.0)':
     dependencies:
       react: 18.2.0
@@ -5182,6 +5357,32 @@ snapshots:
     optionalDependencies:
       '@types/react': 18.3.3
 
+  '@radix-ui/react-menu@2.1.1(@types/react-dom@18.2.24)(@types/react@18.3.3)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+    dependencies:
+      '@radix-ui/primitive': 1.1.0
+      '@radix-ui/react-collection': 1.1.0(@types/react-dom@18.2.24)(@types/react@18.3.3)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.3)(react@18.2.0)
+      '@radix-ui/react-context': 1.1.0(@types/react@18.3.3)(react@18.2.0)
+      '@radix-ui/react-direction': 1.1.0(@types/react@18.3.3)(react@18.2.0)
+      '@radix-ui/react-dismissable-layer': 1.1.0(@types/react-dom@18.2.24)(@types/react@18.3.3)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@radix-ui/react-focus-guards': 1.1.0(@types/react@18.3.3)(react@18.2.0)
+      '@radix-ui/react-focus-scope': 1.1.0(@types/react-dom@18.2.24)(@types/react@18.3.3)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@radix-ui/react-id': 1.1.0(@types/react@18.3.3)(react@18.2.0)
+      '@radix-ui/react-popper': 1.2.0(@types/react-dom@18.2.24)(@types/react@18.3.3)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@radix-ui/react-portal': 1.1.1(@types/react-dom@18.2.24)(@types/react@18.3.3)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@radix-ui/react-presence': 1.1.0(@types/react-dom@18.2.24)(@types/react@18.3.3)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.2.24)(@types/react@18.3.3)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@radix-ui/react-roving-focus': 1.1.0(@types/react-dom@18.2.24)(@types/react@18.3.3)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@radix-ui/react-slot': 1.1.0(@types/react@18.3.3)(react@18.2.0)
+      '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.3)(react@18.2.0)
+      aria-hidden: 1.2.3
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+      react-remove-scroll: 2.5.7(@types/react@18.3.3)(react@18.2.0)
+    optionalDependencies:
+      '@types/react': 18.3.3
+      '@types/react-dom': 18.2.24
+
   '@radix-ui/react-navigation-menu@1.2.0(@types/react-dom@18.2.24)(@types/react@18.3.3)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@radix-ui/primitive': 1.1.0
@@ -5290,6 +5491,24 @@ snapshots:
       '@types/react': 18.3.3
       '@types/react-dom': 18.2.24
 
+  '@radix-ui/react-popper@1.2.0(@types/react-dom@18.2.24)(@types/react@18.3.3)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+    dependencies:
+      '@floating-ui/react-dom': 2.0.8(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@radix-ui/react-arrow': 1.1.0(@types/react-dom@18.2.24)(@types/react@18.3.3)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.3)(react@18.2.0)
+      '@radix-ui/react-context': 1.1.0(@types/react@18.3.3)(react@18.2.0)
+      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.2.24)(@types/react@18.3.3)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.3)(react@18.2.0)
+      '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.3)(react@18.2.0)
+      '@radix-ui/react-use-rect': 1.1.0(@types/react@18.3.3)(react@18.2.0)
+      '@radix-ui/react-use-size': 1.1.0(@types/react@18.3.3)(react@18.2.0)
+      '@radix-ui/rect': 1.1.0
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+    optionalDependencies:
+      '@types/react': 18.3.3
+      '@types/react-dom': 18.2.24
+
   '@radix-ui/react-portal@1.0.4(@types/react-dom@18.2.24)(@types/react@18.2.74)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@babel/runtime': 7.24.4
@@ -5310,6 +5529,16 @@ snapshots:
       '@types/react': 18.3.3
       '@types/react-dom': 18.2.24
 
+  '@radix-ui/react-portal@1.1.1(@types/react-dom@18.2.24)(@types/react@18.3.3)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+    dependencies:
+      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.2.24)(@types/react@18.3.3)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.3)(react@18.2.0)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+    optionalDependencies:
+      '@types/react': 18.3.3
+      '@types/react-dom': 18.2.24
+
   '@radix-ui/react-presence@1.0.1(@types/react-dom@18.2.24)(@types/react@18.2.74)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@babel/runtime': 7.24.4
@@ -5371,6 +5600,23 @@ snapshots:
       '@types/react': 18.3.3
       '@types/react-dom': 18.2.24
 
+  '@radix-ui/react-roving-focus@1.1.0(@types/react-dom@18.2.24)(@types/react@18.3.3)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+    dependencies:
+      '@radix-ui/primitive': 1.1.0
+      '@radix-ui/react-collection': 1.1.0(@types/react-dom@18.2.24)(@types/react@18.3.3)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.3)(react@18.2.0)
+      '@radix-ui/react-context': 1.1.0(@types/react@18.3.3)(react@18.2.0)
+      '@radix-ui/react-direction': 1.1.0(@types/react@18.3.3)(react@18.2.0)
+      '@radix-ui/react-id': 1.1.0(@types/react@18.3.3)(react@18.2.0)
+      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.2.24)(@types/react@18.3.3)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.3)(react@18.2.0)
+      '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.3)(react@18.2.0)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+    optionalDependencies:
+      '@types/react': 18.3.3
+      '@types/react-dom': 18.2.24
+
   '@radix-ui/react-separator@1.1.0(@types/react-dom@18.2.24)(@types/react@18.3.3)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.2.24)(@types/react@18.3.3)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
@@ -5511,6 +5757,13 @@ snapshots:
     optionalDependencies:
       '@types/react': 18.3.3
 
+  '@radix-ui/react-use-rect@1.1.0(@types/react@18.3.3)(react@18.2.0)':
+    dependencies:
+      '@radix-ui/rect': 1.1.0
+      react: 18.2.0
+    optionalDependencies:
+      '@types/react': 18.3.3
+
   '@radix-ui/react-use-size@1.0.1(@types/react@18.2.74)(react@18.2.0)':
     dependencies:
       '@babel/runtime': 7.24.4
@@ -5527,6 +5780,13 @@ snapshots:
     optionalDependencies:
       '@types/react': 18.3.3
 
+  '@radix-ui/react-use-size@1.1.0(@types/react@18.3.3)(react@18.2.0)':
+    dependencies:
+      '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.3)(react@18.2.0)
+      react: 18.2.0
+    optionalDependencies:
+      '@types/react': 18.3.3
+
   '@radix-ui/react-visually-hidden@1.1.0(@types/react-dom@18.2.24)(@types/react@18.3.3)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.2.24)(@types/react@18.3.3)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
@@ -5540,6 +5800,8 @@ snapshots:
     dependencies:
       '@babel/runtime': 7.24.4
 
+  '@radix-ui/rect@1.1.0': {}
+
   '@remix-run/router@1.13.1': {}
 
   '@rollup/plugin-inject@5.0.5(rollup@4.14.0)':
@@ -7828,6 +8090,17 @@ snapshots:
     optionalDependencies:
       '@types/react': 18.3.3
 
+  react-remove-scroll@2.5.7(@types/react@18.3.3)(react@18.2.0):
+    dependencies:
+      react: 18.2.0
+      react-remove-scroll-bar: 2.3.6(@types/react@18.3.3)(react@18.2.0)
+      react-style-singleton: 2.2.1(@types/react@18.3.3)(react@18.2.0)
+      tslib: 2.6.2
+      use-callback-ref: 1.3.1(@types/react@18.3.3)(react@18.2.0)
+      use-sidecar: 1.1.2(@types/react@18.3.3)(react@18.2.0)
+    optionalDependencies:
+      '@types/react': 18.3.3
+
   react-router-dom@6.20.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0):
     dependencies:
       '@remix-run/router': 1.13.1

From 085e80424798f735fe5355e8345b6db795886a29 Mon Sep 17 00:00:00 2001
From: Camilo Vega <59750365+camilovegag@users.noreply.github.com>
Date: Tue, 30 Jul 2024 09:53:37 -0500
Subject: [PATCH 15/15] 704 add events page (#705)

* Create new option component

* Naming changes

* Add max height transition to tailwind

* Add expanded and animation

* Update option card

* Install dropdown menu

* Add sorting menu

* Make button boxy

* Current changes

* Add new App.tsx from origin

* Update type

* Add event cards
---
 packages/api/src/types/Events.ts              |  1 +
 .../berlin/src/components/cycles/Cycles.tsx   |  4 +-
 .../event-card/EventCard.styled.tsx           |  7 +--
 .../src/components/event-card/EventCard.tsx   | 11 ++--
 .../berlin/src/components/events/Events.tsx   | 60 +++++++++++++++++++
 .../berlin/src/components/events/index.ts     |  1 +
 packages/berlin/src/pages/Events.tsx          | 30 +++++++---
 7 files changed, 93 insertions(+), 21 deletions(-)
 create mode 100644 packages/berlin/src/components/events/Events.tsx
 create mode 100644 packages/berlin/src/components/events/index.ts

diff --git a/packages/api/src/types/Events.ts b/packages/api/src/types/Events.ts
index 6eac2d97..2ea07899 100644
--- a/packages/api/src/types/Events.ts
+++ b/packages/api/src/types/Events.ts
@@ -8,6 +8,7 @@ export type GetEventResponse = {
   updatedAt: string;
   description: string | null;
   fields: unknown;
+  status: 'OPEN' | 'CLOSED' | 'UPCOMING' | null;
 };
 
 export type GetEventsResponse = GetEventResponse[];
diff --git a/packages/berlin/src/components/cycles/Cycles.tsx b/packages/berlin/src/components/cycles/Cycles.tsx
index 5b8c16b3..a8b138b1 100644
--- a/packages/berlin/src/components/cycles/Cycles.tsx
+++ b/packages/berlin/src/components/cycles/Cycles.tsx
@@ -24,14 +24,14 @@ function Cycles({ cycles, errorMessage, eventId }: CyclesProps) {
     <>
       {cycles?.length ? (
         cycles.map((cycle) => (
-          <div
+          <article
             className="border-secondary flex w-full flex-col gap-4 border p-4"
             key={cycle.id}
             onClick={() => handleCycleClick(cycle.id)}
           >
             <Body>{cycle?.questions[0]?.title}</Body>
             <Body>{formatDate(cycle.endAt)}</Body>
-          </div>
+          </article>
         ))
       ) : (
         <Body>{errorMessage}</Body>
diff --git a/packages/berlin/src/components/event-card/EventCard.styled.tsx b/packages/berlin/src/components/event-card/EventCard.styled.tsx
index 14382b84..85457c22 100644
--- a/packages/berlin/src/components/event-card/EventCard.styled.tsx
+++ b/packages/berlin/src/components/event-card/EventCard.styled.tsx
@@ -1,9 +1,7 @@
 import styled from 'styled-components';
 import { FlexColumn } from '../containers/FlexColumn.styled';
-import { FlexRowToColumn } from '../containers/FlexRowToColumn.styled';
 
-export const Card = styled(FlexRowToColumn)`
-  border-radius: 0.5rem;
+export const Card = styled(FlexColumn)`
   border: 1px solid var(--color-black);
   overflow: hidden;
   width: 100%;
@@ -12,7 +10,7 @@ export const Card = styled(FlexRowToColumn)`
 export const ImageContainer = styled.div`
   background-color: var(--color-gray);
   width: 100%;
-  height: 300px;
+  height: 160px;
 
   img {
     height: 100%;
@@ -24,4 +22,5 @@ export const ImageContainer = styled.div`
 
 export const CardContent = styled(FlexColumn)`
   padding: 2rem;
+  max-height: 170px;
 `;
diff --git a/packages/berlin/src/components/event-card/EventCard.tsx b/packages/berlin/src/components/event-card/EventCard.tsx
index e08c61aa..a9513aca 100644
--- a/packages/berlin/src/components/event-card/EventCard.tsx
+++ b/packages/berlin/src/components/event-card/EventCard.tsx
@@ -2,7 +2,6 @@ import { GetEventResponse } from 'api';
 import { Subtitle } from '../typography/Subtitle.styled';
 import { Body } from '../typography/Body.styled';
 import { Card, CardContent, ImageContainer } from './EventCard.styled';
-import Button from '../button';
 import Link from '../link';
 
 // Third-party libraries
@@ -15,14 +14,12 @@ type EventCardProps = {
 
 function EventCard({ event, onClick }: EventCardProps) {
   return (
-    <Card $gap="0">
-      <ImageContainer>
-        <img src={event.imageUrl} alt={`${event.name} image`} />
-      </ImageContainer>
+    <Card className="cursor-pointer" $gap="0" onClick={onClick}>
       <CardContent $gap="1.25rem">
         <Subtitle>{event.name}</Subtitle>
         {event.description && (
           <Markdown
+            className="max-w-[100ch] truncate"
             components={{
               a: ({ node, ...props }) => <Link to={props.href ?? ''}>{props.children}</Link>,
               p: ({ node, ...props }) => <Body>{props.children}</Body>,
@@ -31,8 +28,10 @@ function EventCard({ event, onClick }: EventCardProps) {
             {event.description}
           </Markdown>
         )}
-        {onClick && <Button onClick={onClick}>Go</Button>}
       </CardContent>
+      <ImageContainer>
+        <img src={event.imageUrl} alt={`${event.name} image`} />
+      </ImageContainer>
     </Card>
   );
 }
diff --git a/packages/berlin/src/components/events/Events.tsx b/packages/berlin/src/components/events/Events.tsx
new file mode 100644
index 00000000..953c53b7
--- /dev/null
+++ b/packages/berlin/src/components/events/Events.tsx
@@ -0,0 +1,60 @@
+import Markdown from 'react-markdown';
+
+import { GetEventResponse } from 'api';
+
+import { Body } from '../typography/Body.styled';
+import { Subtitle } from '../typography/Subtitle.styled';
+import Link from '../link';
+import { useNavigate } from 'react-router-dom';
+
+type EventsProps = {
+  events: GetEventResponse[] | undefined;
+  errorMessage: string;
+};
+
+export default function Events({ events, errorMessage }: EventsProps) {
+  const navigate = useNavigate();
+
+  const handleClick = (eventId: string) => {
+    navigate(`/events/${eventId}/cycles`);
+  };
+
+  return events?.length ? (
+    events.map((event) => {
+      return (
+        <article
+          key={event.id}
+          className="border-secondary flex w-full cursor-pointer flex-col border"
+          onClick={() => handleClick(event.id)}
+        >
+          <section className="flex flex-col gap-4 p-4">
+            <Subtitle>{event.name}</Subtitle>
+            {event.description && (
+              <Markdown
+                components={{
+                  a: ({ node, ...props }) => <Link to={props.href ?? ''}>{props.children}</Link>,
+                  p: ({ node, ...props }) => (
+                    <Body className="truncate" style={{ whiteSpace: 'nowrap' }}>
+                      {props.children}
+                    </Body>
+                  ),
+                }}
+              >
+                {event.description}
+              </Markdown>
+            )}
+          </section>
+          <section className="h-40 w-full">
+            <img
+              className="h-full w-full object-cover object-center"
+              src={event.imageUrl}
+              alt={`${event.name} image`}
+            />
+          </section>
+        </article>
+      );
+    })
+  ) : (
+    <Body>{errorMessage}</Body>
+  );
+}
diff --git a/packages/berlin/src/components/events/index.ts b/packages/berlin/src/components/events/index.ts
new file mode 100644
index 00000000..92337cbd
--- /dev/null
+++ b/packages/berlin/src/components/events/index.ts
@@ -0,0 +1 @@
+export { default } from './Events';
diff --git a/packages/berlin/src/pages/Events.tsx b/packages/berlin/src/pages/Events.tsx
index 8d153202..685ca579 100644
--- a/packages/berlin/src/pages/Events.tsx
+++ b/packages/berlin/src/pages/Events.tsx
@@ -1,5 +1,5 @@
 // React and third-party libraries
-import { useNavigate } from 'react-router-dom';
+import { useMemo, useState } from 'react';
 import { useQuery } from '@tanstack/react-query';
 
 // API
@@ -11,10 +11,11 @@ import useUser from '../hooks/useUser';
 // Components
 import { FlexColumn } from '../components/containers/FlexColumn.styled';
 import { Title } from '../components/typography/Title.styled';
-import EventCard from '../components/event-card';
+import * as Tabs from '../components/tabs';
+import EventsCards from '../components/events';
 
 function Events() {
-  const navigate = useNavigate();
+  const [activeTab, setActiveTab] = useState<string>('upcoming');
   const { user } = useUser();
   const { data: events } = useQuery({
     queryKey: ['events'],
@@ -22,16 +23,27 @@ function Events() {
     enabled: !!user?.id,
   });
 
-  const handleClick = (eventId: string) => {
-    navigate(`/events/${eventId}/cycles`);
+  const openEvents = useMemo(() => events?.filter((event) => event.status === 'OPEN'), [events]);
+  const closedEvents = useMemo(
+    () => events?.filter((events) => events.status === 'CLOSED'),
+    [events],
+  );
+
+  const tabNames = ['upcoming', 'past'];
+  const tabs = {
+    upcoming: <EventsCards events={openEvents} errorMessage="No upcoming events..." />,
+    past: <EventsCards events={closedEvents} errorMessage="No past events..." />,
   };
 
   return (
     <FlexColumn $gap="2rem">
-      <Title>Welcome, {user?.username ?? 'User'}</Title>
-      {events?.map((event) => {
-        return <EventCard key={event.id} event={event} onClick={() => handleClick(event.id)} />;
-      })}
+      <section className="flex w-full flex-col justify-between gap-2 md:flex-row md:items-center">
+        <Title>Events</Title>
+        <Tabs.TabsHeader className="tabs" tabNames={tabNames} onTabChange={setActiveTab} />
+      </section>
+      <section className="grid grid-cols-2 gap-4">
+        <Tabs.TabsManager tabs={tabs} tab={activeTab} fallback={'Tab not found'} />
+      </section>
     </FlexColumn>
   );
 }