From 7b132f97c1d2c97bbeaee519677524d7ee3dab42 Mon Sep 17 00:00:00 2001
From: McPizza <gh@l1.io>
Date: Fri, 19 Jan 2024 17:13:39 +0000
Subject: [PATCH 01/36] fix user redirect link

---
 apps/web-app/components/layout/navbar.vue | 2 +-
 apps/web-app/plugins/trpcClient.ts        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/web-app/components/layout/navbar.vue b/apps/web-app/components/layout/navbar.vue
index 1011fec0..d67c81ee 100644
--- a/apps/web-app/components/layout/navbar.vue
+++ b/apps/web-app/components/layout/navbar.vue
@@ -97,7 +97,7 @@
     }
 
     if (!userOrgSlugs?.includes(orgSlug)) {
-      navigateTo(`/login`);
+      navigateTo(`/redirect`);
     }
   });
 
diff --git a/apps/web-app/plugins/trpcClient.ts b/apps/web-app/plugins/trpcClient.ts
index 215f0c15..6906a6ca 100644
--- a/apps/web-app/plugins/trpcClient.ts
+++ b/apps/web-app/plugins/trpcClient.ts
@@ -18,7 +18,7 @@ export const errorHandler: TRPCLink<TrpcWebAppRouter> = () => {
             err.message ===
               'You are not a member of this organization, redirecting...'
           ) {
-            navigateTo('/login');
+            navigateTo('/redirect');
             return;
           }
 

From 170a6e5d8945151d1043617e708117a27db2a865 Mon Sep 17 00:00:00 2001
From: McPizza <gh@l1.io>
Date: Wed, 24 Jan 2024 21:33:11 +0000
Subject: [PATCH 02/36] update avatar component

---
 apps/web-app/components/un/ui-avatar.vue  | 51 ++++++++++++++++++++---
 apps/web-app/components/un/ui-tooltip.vue |  3 ++
 2 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/apps/web-app/components/un/ui-avatar.vue b/apps/web-app/components/un/ui-avatar.vue
index edbe3461..077ffb2f 100644
--- a/apps/web-app/components/un/ui-avatar.vue
+++ b/apps/web-app/components/un/ui-avatar.vue
@@ -8,7 +8,11 @@
           color?: string;
           publicId: string;
           type: 'user' | 'org' | 'group' | 'contact';
+          tooltip?: string;
           avatarUrl?: string | undefined;
+          tooltipText?: string | undefined;
+          showIcon?: boolean | undefined;
+          tooltipIcon?: string | undefined;
         }
       : never
   >({
@@ -32,6 +36,16 @@
           // It must be one of these values
           return ['user', 'org', 'group', 'contact'].includes(value);
         }
+      },
+      tooltip: {
+        type: String,
+        required: false,
+        default: null
+      },
+      showIcon: {
+        type: Boolean,
+        required: false,
+        default: false
       }
     },
     setup(props: any) {
@@ -44,25 +58,50 @@
               useUtils().generateAvatarUrl(props.type, props.publicId, size)
             : null;
       });
+      const tooltipText = computed(() => {
+        return props.tooltip ? props.tooltip : props.alt;
+      });
+      const tooltipIcon = computed(() => {
+        switch (props.type) {
+          case 'user':
+            return 'i-ph-user';
+          case 'org':
+            return 'i-ph-buildings';
+          case 'group':
+            return 'i-ph-users-three';
+          case 'contact':
+            return 'i-ph-at';
+          default:
+            return 'i-ph-user';
+        }
+      });
 
-      return { avatarUrl };
+      return { avatarUrl, tooltipText, tooltipIcon };
     }
   });
   //TODO: Ensure that the color prop is a pre-defined color so tailwindcss correctly generates it for the css
 </script>
 <template>
-  <UnUiTooltip :text="$props.alt">
+  <UnUiTooltip>
+    <template #text>
+      <div class="flex flex-row items-center gap-1">
+        <UnUiIcon
+          v-if="$props.showIcon && tooltipIcon"
+          :name="tooltipIcon" />
+        <span>{{ tooltipText }}</span>
+      </div>
+    </template>
     <NuxtUiAvatar
       v-bind="$props"
       :src="avatarUrl"
       :ui="{
-        text: 'font-display text-gray-950',
-        placeholder: 'font-display text-gray-950 dark:text-gray-800'
+        text: 'font-display text-gray-900 dark:text-white',
+        placeholder: 'font-display text-gray-600 dark:text-gray-400'
       }"
       :class="
         $props.color
-          ? `bg-${$props.color}-400 dark:bg-${$props.color}-300`
-          : `bg-gray-400 dark:bg-gray-300`
+          ? `bg-${$props.color}-200 dark:bg-${$props.color}-700`
+          : `bg-gray-100 dark:bg-gray-800`
       " />
   </UnUiTooltip>
 </template>
diff --git a/apps/web-app/components/un/ui-tooltip.vue b/apps/web-app/components/un/ui-tooltip.vue
index 14401a56..ca3e9f21 100644
--- a/apps/web-app/components/un/ui-tooltip.vue
+++ b/apps/web-app/components/un/ui-tooltip.vue
@@ -14,6 +14,9 @@
 </script>
 <template>
   <NuxtUiTooltip v-bind="$props">
+    <template #text>
+      <slot name="text"> </slot>
+    </template>
     <slot />
   </NuxtUiTooltip>
 </template>

From 3f7953b1d70b158cdd153bc3daefbebc188708d6 Mon Sep 17 00:00:00 2001
From: McPizza <gh@l1.io>
Date: Wed, 24 Jan 2024 21:33:32 +0000
Subject: [PATCH 03/36] new convo redirect

---
 apps/web-app/pages/[orgSlug]/convo/new.vue | 27 ++++++++++++++--------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/apps/web-app/pages/[orgSlug]/convo/new.vue b/apps/web-app/pages/[orgSlug]/convo/new.vue
index fceec464..e72ad1bd 100644
--- a/apps/web-app/pages/[orgSlug]/convo/new.vue
+++ b/apps/web-app/pages/[orgSlug]/convo/new.vue
@@ -412,7 +412,7 @@
             publicId: firstParticipantPublicId
           };
     const createNewConvoTrpc = $trpc.convos.createNewConvo.useMutation();
-    await createNewConvoTrpc.mutate({
+    const createNewConvo = await createNewConvoTrpc.mutate({
       firstMessageType: type,
       to: convoToValue,
       participantsOrgMembersPublicIds: convoParticipantsOrgMembersPublicIds,
@@ -424,20 +424,27 @@
       message: stringify(messageEditorData.value)
     });
 
-    if (createNewConvoTrpc.error) {
+    if (createNewConvoTrpc.status.value === 'error') {
       actionLoading.value = false;
-    } else {
       toast.add({
-        title: 'Conversation created',
-        icon: 'i-ph-thumbs-up',
+        id: 'create_new_convo_fail',
+        title: 'Conversation creation failed',
+        description: `Conversation could not be created.`,
+        color: 'red',
+        icon: 'i-ph-warning-circle',
         timeout: 5000
       });
-      setTimeout(() => {
-        navigateTo(
-          `/${orgSlug}/convo/${createNewConvoTrpc.data.value?.publicId}`
-        );
-      }, 1500);
+      return;
     }
+    toast.add({
+      title: 'Conversation created',
+      description: `Redirecting to new conversation...`,
+      icon: 'i-ph-thumbs-up',
+      timeout: 5000
+    });
+    setTimeout(() => {
+      navigateTo(`/${orgSlug}/convo/${createNewConvo?.publicId}`);
+    }, 1500);
   }
 </script>
 <template>

From dbcee16165004fc55f2f1550424e823f337b5838 Mon Sep 17 00:00:00 2001
From: McPizza <gh@l1.io>
Date: Thu, 25 Jan 2024 15:12:26 +0000
Subject: [PATCH 04/36] fix navbar avatar bug

---
 apps/web-app/components/layout/navbar.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/web-app/components/layout/navbar.vue b/apps/web-app/components/layout/navbar.vue
index d67c81ee..05a052bb 100644
--- a/apps/web-app/components/layout/navbar.vue
+++ b/apps/web-app/components/layout/navbar.vue
@@ -70,10 +70,11 @@
 
   const { $trpc } = useNuxtApp();
 
-  const { data: userProfile } = $trpc.user.profile.getUserOrgProfile.useQuery(
-    { orgSlug: orgSlug },
-    { server: false, queryKey: 'getUserSingleProfileNav', lazy: true }
-  );
+  const { data: userProfile } =
+    $trpc.user.profile.getUserOrgProfile.useLazyQuery(
+      { orgSlug: orgSlug },
+      { server: false, queryKey: 'getUserSingleProfileNav' }
+    );
 
   const {
     data: userOrgs,
@@ -323,7 +324,6 @@
             :public-id="item.publicId"
             :type="'org'"
             :alt="item.label"
-            color="gray"
             size="sm" />
           <div class="text-left">
             <p class="truncate font-medium">

From 110bc2d7d4ccbd837a59e6d815f1e49fbe749e9e Mon Sep 17 00:00:00 2001
From: McPizza <gh@l1.io>
Date: Thu, 25 Jan 2024 15:12:59 +0000
Subject: [PATCH 05/36] update UnUiAvatar to accept correct colors

---
 apps/web-app/components/un/ui-avatar.vue | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/apps/web-app/components/un/ui-avatar.vue b/apps/web-app/components/un/ui-avatar.vue
index 077ffb2f..6cbfeb34 100644
--- a/apps/web-app/components/un/ui-avatar.vue
+++ b/apps/web-app/components/un/ui-avatar.vue
@@ -1,11 +1,14 @@
 <script lang="ts">
   import type { DefineComponent } from 'vue';
   import { NuxtUiAvatar } from '#components';
+  import { uiColors } from '@uninbox/types/ui';
+
+  type UiColors = (typeof uiColors)[number] | null;
 
   export default defineComponent<
     typeof NuxtUiAvatar extends DefineComponent<infer Props, any, any>
       ? Props & {
-          color?: string;
+          color?: UiColors;
           publicId: string;
           type: 'user' | 'org' | 'group' | 'contact';
           tooltip?: string;
@@ -19,9 +22,9 @@
     props: {
       ...NuxtUiAvatar.props,
       color: {
-        type: String,
+        type: uiColors || null || undefined,
         required: false,
-        default: null
+        default: () => null
       },
       publicId: {
         type: String,

From 8fdc5672f9664b623947d3b227df6455cd7b2b0c Mon Sep 17 00:00:00 2001
From: McPizza <gh@l1.io>
Date: Thu, 25 Jan 2024 15:13:21 +0000
Subject: [PATCH 06/36] DB update convo relationships to use "participants"

---
 packages/database/schema.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/database/schema.ts b/packages/database/schema.ts
index 08b95e7e..e823bf2e 100644
--- a/packages/database/schema.ts
+++ b/packages/database/schema.ts
@@ -1080,7 +1080,7 @@ export const convosRelations = relations(convos, ({ one, many }) => ({
     fields: [convos.orgId],
     references: [orgs.id]
   }),
-  members: many(convoParticipants),
+  participants: many(convoParticipants),
   attachments: many(convoAttachments),
   entries: many(convoEntries),
   subjects: many(convoSubjects)
@@ -1196,7 +1196,7 @@ export const convoAttachments = mysqlTable(
     fileName: varchar('fileName', { length: 256 }).notNull(),
     type: varchar('type', { length: 256 }).notNull(),
     storageId: varchar('storageId', { length: 256 }).notNull(),
-    convoMemberId: foreignKey('convo_members').notNull(),
+    convoParticipantId: foreignKey('convo_participant_id').notNull(),
     createdAt: timestamp('created_at')
       .default(sql`CURRENT_TIMESTAMP`)
       .notNull()
@@ -1224,7 +1224,7 @@ export const convoAttachmentsRelations = relations(
       references: [convoEntries.id]
     }),
     uploader: one(convoParticipants, {
-      fields: [convoAttachments.convoMemberId],
+      fields: [convoAttachments.convoParticipantId],
       references: [convoParticipants.id]
     })
   })

From c6497a3cbee198cd07602de6467ce4711eccf9c6 Mon Sep 17 00:00:00 2001
From: McPizza <gh@l1.io>
Date: Fri, 26 Jan 2024 15:37:56 +0000
Subject: [PATCH 07/36] dedicated convo avatar

---
 .../web-app/components/convos/convoAvatar.vue | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 apps/web-app/components/convos/convoAvatar.vue

diff --git a/apps/web-app/components/convos/convoAvatar.vue b/apps/web-app/components/convos/convoAvatar.vue
new file mode 100644
index 00000000..3f4cad53
--- /dev/null
+++ b/apps/web-app/components/convos/convoAvatar.vue
@@ -0,0 +1,26 @@
+<script setup lang="ts">
+  import type { ConvoParticipantEntry } from '~/composables/types';
+  type Props = {
+    participantPublicId: string;
+    participants: ConvoParticipantEntry[];
+    size?: 'xs' | 'sm' | 'md' | 'lg';
+  };
+
+  const props = defineProps<Props>();
+  const participant = computed(() => {
+    return props.participants.find(
+      (participant) =>
+        participant.participantPublicId === props.participantPublicId
+    );
+  });
+</script>
+<template>
+  <UnUiAvatar
+    v-if="participant"
+    :public-id="participant.avatarPublicId"
+    :alt="participant.name"
+    :type="participant.type"
+    :color="participant.color"
+    :show-icon="true"
+    :size="props.size ? props.size : 'sm'" />
+</template>

From bd1e82040d5eb9b41504ad1875cfc8353e951e65 Mon Sep 17 00:00:00 2001
From: McPizza <gh@l1.io>
Date: Fri, 26 Jan 2024 15:38:25 +0000
Subject: [PATCH 08/36] inital convo messages components

---
 .../components/convos/convoMessageItem.vue    | 186 ++++++++++--------
 .../components/convos/convoMessages.vue       |  45 ++---
 apps/web-app/composables/types.ts             |  12 ++
 3 files changed, 136 insertions(+), 107 deletions(-)

diff --git a/apps/web-app/components/convos/convoMessageItem.vue b/apps/web-app/components/convos/convoMessageItem.vue
index cd0f3eb2..e411fceb 100644
--- a/apps/web-app/components/convos/convoMessageItem.vue
+++ b/apps/web-app/components/convos/convoMessageItem.vue
@@ -1,106 +1,126 @@
 <script setup lang="ts">
   import { useTimeAgo } from '@vueuse/core';
+  import { generateHTML } from '@tiptap/html';
+  import { tipTapExtensions } from '../../shared/editorConfig';
   const { $trpc } = useNuxtApp();
 
   type PromiseType<T> = T extends Promise<infer U> ? U : never;
-  type ConvoMessageDataType = PromiseType<
-    ReturnType<typeof $trpc.convos.getConvoMessages.query>
-  >['messages'];
+  type ConvoEntryDataType = PromiseType<
+    ReturnType<typeof $trpc.convos.entries.getConvoEntries.query>
+  >['entries'];
 
-  type ConvoMessageItem = NonNullable<ConvoMessageDataType>[number];
+  type ConvoEntryItem = NonNullable<ConvoEntryDataType>[number];
   type Props = {
-    message: ConvoMessageItem;
+    entry: ConvoEntryItem;
   };
 
   const props = defineProps<Props>();
+  const participantPublicId = inject('participantPublicId');
+  const convoParticipants = inject('convoParticipants');
 
-  const timeAgo = useTimeAgo(props.message.createdAt || new Date());
-  // const authorName = computed(() => {
-  //   if (
-  //     props.convo.messages[0].author.userProfile?.firstName &&
-  //     props.convo.messages[0].author.userProfile?.lastName
-  //   ) {
-  //     return (
-  //       props.convo.messages[0].author.userProfile.firstName +
-  //       ' ' +
-  //       props.convo.messages[0].author.userProfile.lastName
-  //     );
-  //   }
-  //   if (props.convo.messages[0].author.userGroup?.name) {
-  //     return props.convo.messages[0].author.userGroup.name + ' Team';
-  //   }
+  const timeAgo = useTimeAgo(props.entry.createdAt || new Date());
 
-  //   if (props.convo.messages[0].author.foreignEmailIdentity?.senderName) {
-  //     return props.convo.messages[0].author.foreignEmailIdentity.senderName;
-  //   }
-  //   return '';
-  // });
-
-  // const authorAvatar = computed(() => {
-  //   if (props.convo.messages[0].author.userProfile?.avatarId) {
-  //     return props.convo.messages[0].author.userProfile.avatarId;
-  //   }
-  //   if (props.convo.messages[0].author.userGroup?.avatarId) {
-  //     return props.convo.messages[0].author.userGroup.avatarId;
-  //   }
+  const convoEntryBody = computed(() => {
+    if (props.entry.body) {
+      return generateHTML(props.entry.body, tipTapExtensions);
+    }
+    return '';
+  });
 
-  //   if (props.convo.messages[0].author.foreignEmailIdentity?.avatarId) {
-  //     return props.convo.messages[0].author.foreignEmailIdentity.avatarId;
-  //   }
-  //   return '';
-  // });
+  const author = computed(() => {
+    //@ts-expect-error vue3 provide/inject types are whack to set up: https://vuejs.org/guide/typescript/composition-api#typing-provide-inject
+    return convoParticipants.value.find(
+      //@ts-expect-error ts dosnt know the type of this reactive string
+      (participant) =>
+        participant.participantPublicId == props.entry.author.publicId
+    );
+  });
+  const userIsAuthor = computed(() => {
+    //@ts-expect-error ts dosnt know the type of this reactive string
+    return props.entry.author.publicId == participantPublicId.value;
+  });
 
-  // const authorColor = computed(() => {
-  //   if (props.convo.messages[0].author.userGroup?.color) {
-  //     return props.convo.messages[0].author.userGroup.color;
-  //   }
-  //   return '';
+  const tempColor = 'message';
+  const typeClasses = computed(() => {
+    // switch (props.entry.type) {
+    switch (tempColor) {
+      case 'message':
+        return 'bg-white dark:bg-black';
+      default:
+        return 'bg-gray-100 dark:bg-gray-900';
+    }
+  });
+  const containerClasses = computed(() => {
+    return userIsAuthor.value ? 'items-end' : 'items-start';
+  });
+  // const authorClasses = computed(() => {
+  //   return userIsAuthor.value ? 'rounded-br-none' : 'rounded-bl-none';
   // });
 
-  // type AuthorEntry = {
-  //   avatarId: string;
-  //   name: string;
-  //   type: string;
-  //   color: string;
-  // };
-  // const avatarArray = ref<AuthorEntry[]>([]);
-  // for (const author of props.convo.members) {
-  //   avatarArray.value.push({
-  //     avatarId: author.foreignEmailIdentity?.avatarId
-  //       ? author.foreignEmailIdentity?.avatarId
-  //       : author.userGroup?.avatarId
-  //       ? author.userGroup?.avatarId
-  //       : author.userProfile?.avatarId
-  //       ? author.userProfile?.avatarId
-  //       : '',
-  //     name: author.foreignEmailIdentity?.senderName
-  //       ? author.foreignEmailIdentity?.senderName
-  //       : author.userGroup?.name
-  //       ? author.userGroup?.name
-  //       : author.userProfile?.firstName
-  //       ? author.userProfile?.firstName + ' ' + author.userProfile?.lastName
-  //       : '',
-  //     type: author.foreignEmailIdentity?.senderName
-  //       ? 'External'
-  //       : author.userGroup?.name
-  //       ? 'Group'
-  //       : 'User',
-  //     color: author.userGroup?.color ? author.userGroup?.color : 'base'
-  //   });
-  // }
+  const convoBubbleClasses = computed(() => {
+    // return `${typeClasses.value} ${authorClasses.value}`;
+    return `${typeClasses.value}`;
+  });
 </script>
 <template>
-  <div class="flex flex-row gap-4">
-    <div
-      class="p-4 rounded flex flex-col justify-between bg-base-3 hover:bg-base-4 gap-2 overflow-hidden max-w-[80%] w-full">
-      <div class="flex flex-row gap-6 items-center w-full">
-        {{ props.message.body }}
+  <!-- <div
+    class="w-full flex flex-col gap-2"
+    :class="containerClasses">
+    <div class="max-w-[80%] w-full flex flex-col gap-1 border-2 rounded-xl p-0">
+      <div class="w-full flex flex-row items-end justify-between p-2">
+        <div
+          v-if="author"
+          class="flex flex-row items-center gap-1">
+          <UnUiAvatar
+            :public-id="author.avatarPublicId"
+            :alt="author.name"
+            :type="author.type"
+            :color="author.color"
+            class="rounded-full" />
+          <span>{{ author.name }}</span>
+        </div>
+        <UnUiTooltip :text="props.entry.createdAt.toLocaleString()">
+          <span class="text-gray-500 text-xs uppercase">{{ timeAgo }}</span>
+        </UnUiTooltip>
       </div>
-      <div class="flex flex-row w-full justify-end items-center gap-1">
-        {{ props.message.author }}
+      <div
+        class="bg-gray-100 dark:bg-gray-900 w-full overflow-hidden p-2"
+        :class="convoBubbleClasses"
+        v-html="convoEntryBody"></div>
+    </div>
+  </div> -->
+  <div
+    class="w-full flex flex-col gap-2"
+    :class="containerClasses">
+    <div class="w-full flex flex-row items-start gap-2">
+      <div
+        v-if="author"
+        class="flex flex-row items-center gap-1">
+        <UnUiAvatar
+          :public-id="author.avatarPublicId"
+          :alt="author.name"
+          :type="author.type"
+          :color="author.color"
+          size="lg"
+          class="rounded-full" />
       </div>
-      <div class="flex flex-row w-full justify-end items-center gap-1">
-        {{ timeAgo }} {{ props.message.createdAt }}
+      <div class="w-full flex flex-col gap-2 p-0">
+        <div class="w-full flex flex-row items-end gap-2 pl-2">
+          <span
+            v-if="author"
+            class="text-sm leading-none">
+            {{ author.name }}
+          </span>
+          <UnUiTooltip :text="props.entry.createdAt.toLocaleString()">
+            <span class="text-gray-500 text-xs leading-none">
+              {{ timeAgo }}
+            </span>
+          </UnUiTooltip>
+        </div>
+        <div
+          class="bg-gray-100 dark:bg-gray-900 w-full overflow-hidden rounded-bl-xl rounded-br-xl p-2"
+          :class="convoBubbleClasses"
+          v-html="convoEntryBody"></div>
       </div>
     </div>
   </div>
diff --git a/apps/web-app/components/convos/convoMessages.vue b/apps/web-app/components/convos/convoMessages.vue
index 977d20e7..1ee0d7a2 100644
--- a/apps/web-app/components/convos/convoMessages.vue
+++ b/apps/web-app/components/convos/convoMessages.vue
@@ -2,14 +2,12 @@
   import { useVirtualList, useInfiniteScroll, useTimeAgo } from '@vueuse/core';
   const { $trpc } = useNuxtApp();
   type PromiseType<T> = T extends Promise<infer U> ? U : never;
-  type ConvoMessageDataType = PromiseType<
-    ReturnType<typeof $trpc.convos.getConvoMessages.query>
-  >['messages'];
-
-  const noMessagesError = ref(false);
+  type ConvoEntriesDataType = PromiseType<
+    ReturnType<typeof $trpc.convos.entries.getConvoEntries.query>
+  >['entries'];
   //@ts-expect-error
   const el = ref<HTMLElement>(null);
-  const messagesArray = ref<ConvoMessageDataType>([]);
+  const entriesArray = ref<ConvoEntriesDataType>([]);
 
   type Props = {
     convoPublicId: string;
@@ -17,23 +15,21 @@
 
   const props = defineProps<Props>();
 
-  const convoMessagesReturn = await $trpc.convos.getConvoMessages.query({
-    convoPublicId: props.convoPublicId
-  });
+  const { data: convoEntries } =
+    await $trpc.convos.entries.getConvoEntries.useQuery(
+      {
+        convoPublicId: props.convoPublicId
+      },
+      { server: false }
+    );
 
-  if (convoMessagesReturn.error || !convoMessagesReturn.messages) {
-    noMessagesError.value = true;
-  } else {
-    if (messagesArray.value) {
-      for (const message of convoMessagesReturn.messages) {
-        messagesArray.value.push({
-          ...message
-        });
-      }
+  watch(convoEntries, () => {
+    if (convoEntries.value?.entries) {
+      entriesArray.value.push(...convoEntries.value.entries);
     }
-  }
+  });
 
-  // const { list, containerProps, wrapperProps } = useVirtualList(messages, {
+  // const { list, containerProps, wrapperProps } = useVirtualList(entriesArray, {
   //   itemHeight: 152,
   //   overscan: 3
   // });
@@ -47,13 +43,14 @@
 </script>
 <template>
   <div
-    class="max-w-full w-full h-full max-h-full overflow-y-scroll flex flex-col-reverse">
+    class="h-full max-h-full max-w-full w-full flex flex-col-reverse overflow-y-scroll">
     <div
-      class="flex flex-col-reverse items-start gap-4 mb-[24px] mt-[24px] w-full">
+      class="mb-[24px] mt-[24px] w-full flex flex-col-reverse items-start gap-4">
       <div
-        v-for="message of messagesArray"
+        v-for="entry of entriesArray"
+        :key="entry.publicId"
         class="max-w-full w-full">
-        <convos-convo-message-item :message="message" />
+        <convos-convo-message-item :entry="entry" />
       </div>
     </div>
   </div>
diff --git a/apps/web-app/composables/types.ts b/apps/web-app/composables/types.ts
index 095a63be..eb343739 100644
--- a/apps/web-app/composables/types.ts
+++ b/apps/web-app/composables/types.ts
@@ -1,5 +1,17 @@
+import { uiColors } from '@uninbox/types/ui';
+
 const { $trpc } = useNuxtApp();
 type PromiseType<T> = T extends Promise<infer U> ? U : never;
 export type UserConvosDataType = PromiseType<
   ReturnType<typeof $trpc.convos.getUserConvos.query>
 >['data'];
+
+export type ConvoParticipantEntry = {
+  participantPublicId: string;
+  typePublicId: string;
+  avatarPublicId: string;
+  name: string;
+  type: 'user' | 'group' | 'contact';
+  role: 'assigned' | 'contributor' | 'commenter' | 'watcher' | 'guest';
+  color: (typeof uiColors)[number] | null;
+};

From 792beab925bed0a9e2842da45eaf0036de2365b9 Mon Sep 17 00:00:00 2001
From: McPizza <gh@l1.io>
Date: Fri, 26 Jan 2024 15:38:39 +0000
Subject: [PATCH 09/36] update convo page

---
 apps/web-app/pages/[orgSlug]/convo/[id].vue | 562 +++++++++++++++-----
 1 file changed, 437 insertions(+), 125 deletions(-)

diff --git a/apps/web-app/pages/[orgSlug]/convo/[id].vue b/apps/web-app/pages/[orgSlug]/convo/[id].vue
index b5913978..0a3a8c38 100644
--- a/apps/web-app/pages/[orgSlug]/convo/[id].vue
+++ b/apps/web-app/pages/[orgSlug]/convo/[id].vue
@@ -1,160 +1,472 @@
 <script setup lang="ts">
   import { useTimeAgo } from '@vueuse/core';
+  import type { ConvoParticipantEntry } from '~/composables/types';
+
   const { $trpc } = useNuxtApp();
   definePageMeta({
     layout: 'convos'
   });
 
-  const convoPublicId = useRoute().params.id as string;
-  const { data: convoDetails, pending } =
-    await $trpc.convos.getConvo.useLazyQuery({
-      convoPublicId: convoPublicId
-    });
-
-  if (!convoDetails.value?.data) navigateTo('/h/convo/404');
-  const createDate = useTimeAgo(
-    convoDetails.value?.data?.createdAt || new Date()
-  );
-  const updateDate = useTimeAgo(
-    convoDetails.value?.data?.lastUpdatedAt || new Date()
-  );
-
-  type memberEntry = {
-    avatarId: string;
-    name: string;
-    type: string;
-    color:
-      | 'red'
-      | 'pink'
-      | 'purple'
-      | 'blue'
-      | 'green'
-      | 'orange'
-      | 'yellow'
-      | 'base';
-  };
-
-  const memberArray = ref<memberEntry[]>([]);
-  if (!convoDetails.value?.data?.members) navigateTo('/h/convo/404');
-  const convoMembers = convoDetails.value?.data?.members || [];
-  for (const member of convoMembers) {
-    memberArray.value.push({
-      avatarId: member.foreignEmailIdentity?.avatarId
-        ? member.foreignEmailIdentity?.avatarId
-        : member.userGroup?.avatarId
-          ? member.userGroup?.avatarId
-          : member.userProfile?.avatarId
-            ? member.userProfile?.avatarId
-            : '',
-      name: member.foreignEmailIdentity?.senderName
-        ? member.foreignEmailIdentity?.senderName
-        : member.userGroup?.name
-          ? member.userGroup?.name
-          : member.userProfile?.firstName
-            ? member.userProfile?.firstName + ' ' + member.userProfile?.lastName
-            : '',
-      type: member.foreignEmailIdentity?.senderName
-        ? 'External'
-        : member.userGroup?.name
-          ? 'Group'
-          : 'User',
-      color: member.userGroup?.color ? member.userGroup?.color : 'base'
-    });
-  }
-
   type AttachmentEntry = {
     name: string;
     publicId: string;
     type: string;
     url: string;
   };
+
+  const convoParticiapntsCollapsed = ref(true);
+  const attachmentsCollapsed = ref(true);
+  const participantPublicId = ref('');
+  const participantArray = ref<ConvoParticipantEntry[]>([]);
+  const participantsAssignedPublicIds = ref<string[]>([]);
+  const participantContributorsPublicIds = ref<string[]>([]);
+  const participantCommentersPublicIds = ref<string[]>([]);
+  const participantWatchersPublicIds = ref<string[]>([]);
+  const participantGuestsPublicIds = ref<string[]>([]);
   const attachments = ref<AttachmentEntry[]>([]);
-  if (convoDetails.value?.data?.attachments) {
-    for (const attachment of convoDetails.value?.data?.attachments) {
-      const splitFileName = attachment.fileName.split('.');
-      const newFileName =
-        splitFileName[0].substring(0, 10) +
-        '...' +
-        splitFileName[splitFileName.length - 1];
-      attachments.value.push({
-        name: newFileName,
-        publicId: attachment.publicId,
-        type: attachment.type,
-        url: attachment.storageId
-      });
+  const subjectsArray = ref<string[]>([]);
+  const createDate = ref<Date | null>(null);
+  const updateDate = ref<Date | null>(null);
+  const createdAgo = ref('');
+  const updatedAgo = ref('');
+
+  const orgSlug = useRoute().params.orgSlug as string;
+  const convoPublicId = useRoute().params.id as string;
+  const { data: convoDetails, pending: convoDetailsPending } =
+    await $trpc.convos.getConvo.useLazyQuery(
+      {
+        convoPublicId: convoPublicId
+      },
+      { server: false }
+    );
+
+  watch(convoDetailsPending, () => {
+    if (!convoDetailsPending.value) {
+      if (!convoDetails.value?.data) navigateTo(`/${orgSlug}/convo/404`);
+      if (!convoDetails.value?.data?.participants)
+        navigateTo(`/${orgSlug}/convo/404`);
+    }
+
+    createDate.value = convoDetails.value?.data?.createdAt || new Date();
+    updateDate.value =
+      convoDetails.value?.data?.lastUpdatedAt ||
+      convoDetails.value?.data?.createdAt ||
+      new Date();
+    createdAgo.value = useTimeAgo(createDate.value).value;
+    updatedAgo.value = useTimeAgo(updateDate.value).value;
+
+    const convoParticipants = convoDetails.value?.data?.participants || [];
+    for (const participant of convoParticipants) {
+      const participantPublicId = participant.publicId;
+      const participantTypePublicId =
+        participant.contact?.publicId ||
+        participant.userGroup?.publicId ||
+        participant.orgMember?.publicId ||
+        '';
+      const avatarPublicId =
+        participant.contact?.publicId ||
+        participant.userGroup?.publicId ||
+        participant.orgMember?.profile.publicId ||
+        '';
+      const participantName =
+        participant.contact?.name || participant.contact?.emailUsername
+          ? participant.contact?.emailUsername +
+            '@' +
+            participant.contact?.emailDomain
+          : participant.userGroup?.name ||
+            participant.orgMember?.profile?.firstName +
+              ' ' +
+              participant.orgMember?.profile?.lastName ||
+            '';
+      const participantType = participant.contact?.publicId
+        ? 'contact'
+        : participant.userGroup?.name
+          ? 'group'
+          : 'user';
+      const participantColor = participant.userGroup?.color || null;
+      const participantData: ConvoParticipantEntry = {
+        participantPublicId: participantPublicId,
+        typePublicId: participantTypePublicId,
+        avatarPublicId: avatarPublicId,
+        name: participantName,
+        type: participantType,
+        role: participant.role,
+        color: participantColor
+      };
+
+      participantArray.value.push(participantData);
+      if (participant.role === 'assigned')
+        participantsAssignedPublicIds.value.push(
+          participantData.participantPublicId
+        );
+      if (participant.role === 'contributor')
+        participantContributorsPublicIds.value.push(
+          participantData.participantPublicId
+        );
+      if (participant.role === 'commenter')
+        participantCommentersPublicIds.value.push(
+          participantData.participantPublicId
+        );
+      if (participant.role === 'watcher')
+        participantWatchersPublicIds.value.push(
+          participantData.participantPublicId
+        );
+      if (participant.role === 'guest')
+        participantGuestsPublicIds.value.push(
+          participantData.participantPublicId
+        );
+    }
+
+    if (
+      convoDetails.value &&
+      convoDetails.value.data &&
+      convoDetails.value.data.attachments
+    ) {
+      for (const attachment of convoDetails.value.data.attachments) {
+        const splitFileName = attachment.fileName.split('.');
+        const newFileName =
+          splitFileName[0].substring(0, 10) +
+          '...' +
+          splitFileName[splitFileName.length - 1];
+        attachments.value.push({
+          name: newFileName,
+          publicId: attachment.publicId,
+          type: attachment.type,
+          url: attachment.storageId
+        });
+      }
     }
-  }
+    participantPublicId.value = convoDetails.value?.participantPublicId || '';
+  });
+  provide('convoParticipants', participantArray);
+  provide('participantPublicId', participantPublicId);
+
+  const findParticipant = (participantPublicId: string) => {
+    return participantArray.value.find(
+      (participant) => participant.participantPublicId === participantPublicId
+    );
+  };
 
-  // New Data
-  const editorData = ref('');
+  // // New Data
+  const editorData = ref({});
 </script>
 <template>
-  <div class="h-full max-h-full max-w-full w-full flex flex-col gap-2">
+  <div
+    class="h-full max-h-full max-w-full w-full flex flex-col gap-2 overflow-hidden">
     <div
-      class="max-w-full w-full flex flex-col justify-between gap-2 border-b-1 border-b-base-6 rounded rounded-tr-xl bg-base-3 p-4 pb-2">
-      <div class="w-full flex flex-row items-center gap-2 overflow-hidden">
-        <span class="text-sm">
-          {{
-            convoDetails?.data?.subjects.length !== 1 ? 'Subjects' : 'Subject'
-          }}:
-        </span>
-        <div class="w-full flex flex-col gap-0 overflow-hidden">
+      class="max-w-full w-full flex flex-row items-center justify-between gap-2">
+      <div class="flex flex-row gap-2">
+        <template
+          v-for="subject of convoDetails?.data?.subjects"
+          :key="subject.publicId">
           <span
-            v-for="subject of convoDetails?.data?.subjects"
-            class="truncate">
+            class="bg-gray-100 dark:bg-gray-800 truncate rounded-xl px-4 py-2 text-lg">
             {{ subject.subject }}
           </span>
-        </div>
+        </template>
+        <!-- <span>TAGS</span> -->
       </div>
+
+      <div class="h-fit flex flex-row gap-2 overflow-hidden">
+        <UnUiButton
+          icon="i-heroicons-pencil-square"
+          size="sm"
+          square
+          variant="outline" />
+        <UnUiButton
+          icon="i-ph-bell-simple-slash"
+          size="sm"
+          square
+          variant="outline" />
+        <UnUiButton
+          icon="i-ph-alarm"
+          size="sm"
+          square
+          variant="outline" />
+        <UnUiButton
+          icon="i-ph-trash"
+          size="sm"
+          square
+          variant="outline" />
+      </div>
+    </div>
+    <div
+      class="h-full max-h-full max-w-full w-full flex flex-row gap-2 overflow-hidden">
       <div
-        v-if="attachments.length > 0"
-        class="max-w-full flex flex-row flex-wrap gap-2 overflow-hidden">
-        <div v-for="attachment of attachments">
+        class="h-full max-h-full min-w-[600px] w-[600px] flex flex-col gap-2">
+        <div class="h-full max-h-full flex grow flex-col gap-0 overflow-hidden">
           <div
-            class="flex flex-row gap-1 border border-1 border-base-5 rounded bg-base-2 px-2 py-1">
-            <UnUiIcon
-              name="i-ph-paperclip"
-              size="16" />
-            <span class="truncate text-xs"> {{ attachment.name }}</span>
+            class="from-gray-100 z-20000 mb-[-12px] h-[12px] bg-gradient-to-b" />
+          <ConvosConvoMessages
+            :convo-public-id="convoPublicId"
+            :participant-public-id="convoDetails?.participantPublicId || ''" />
+          <div class="from-gray-100 mt-[-12px] h-[12px] bg-gradient-to-t" />
+        </div>
+        <div class="w-full flex flex-col justify-items-end gap-2">
+          replyingToBanner
+          <UnEditor v-model:modelValue="editorData" />
+          <div class="min-w-fit flex flex-row justify-end gap-2">
+            <UnUiButton
+              label="Send"
+              icon="ph-envelope"
+              variant="outline" />
+            <UnUiButton
+              label="Note"
+              color="orange"
+              icon="ph-note"
+              variant="outline" />
           </div>
         </div>
       </div>
-
-      <div class="w-full flex flex-row items-center justify-between gap-4">
-        <div class="min-w-fit flex flex-row items-center gap-2">
-          <div v-for="member of memberArray">
-            <UnUiAvatar
-              :avatar-id="member.avatarId"
-              :name="member.name"
-              :type="member.type"
-              :color="member.color"
-              size="sm" />
+      <div
+        class="border-gray-200 dark:border-gray-800 h-full max-w-full w-full flex flex-col justify-between gap-8 overflow-hidden border border-b-0 border-l-1 border-r-0 border-t-0 px-4 py-0">
+        <div class="max-w-full w-full flex flex-col gap-8 overflow-hidden">
+          <div class="max-w-full w-full flex flex-col gap-4 overflow-hidden">
+            <div
+              class="max-w-full w-full flex flex-row items-center justify-between overflow-hidden"
+              @click="convoParticiapntsCollapsed = !convoParticiapntsCollapsed">
+              <span
+                class="text-gray-600 dark:text-gray-400 cursor-pointer text-sm font-medium">
+                PARTICIPANTS
+              </span>
+              <UnUiButton
+                :icon="
+                  convoParticiapntsCollapsed
+                    ? 'i-heroicons-chevron-down'
+                    : 'i-heroicons-chevron-up'
+                "
+                size="2xs"
+                square
+                variant="ghost" />
+            </div>
+            <div
+              v-if="convoParticiapntsCollapsed"
+              class="max-w-full w-full flex flex-row gap-2 overflow-hidden"
+              @click="convoParticiapntsCollapsed = !convoParticiapntsCollapsed">
+              <NuxtUiAvatarGroup>
+                <template
+                  v-for="participantPublicId of participantsAssignedPublicIds"
+                  :key="participantPublicId">
+                  <ConvosConvoAvatar
+                    :participant-public-id="participantPublicId"
+                    :participants="participantArray"
+                    size="sm" />
+                </template>
+                <template
+                  v-for="participantPublicId of participantContributorsPublicIds"
+                  :key="participantPublicId">
+                  <ConvosConvoAvatar
+                    :participant-public-id="participantPublicId"
+                    :participants="participantArray"
+                    size="sm" />
+                </template>
+                <template
+                  v-for="participantPublicId of participantCommentersPublicIds"
+                  :key="participantPublicId">
+                  <ConvosConvoAvatar
+                    :participant-public-id="participantPublicId"
+                    :participants="participantArray"
+                    size="sm" />
+                </template>
+                <template
+                  v-for="participantPublicId of participantGuestsPublicIds"
+                  :key="participantPublicId">
+                  <ConvosConvoAvatar
+                    :participant-public-id="participantPublicId"
+                    :participants="participantArray"
+                    size="sm" />
+                </template>
+              </NuxtUiAvatarGroup>
+            </div>
+            <div
+              v-if="!convoParticiapntsCollapsed"
+              class="h-fit max-w-full w-full flex flex-col gap-4 overflow-hidden"
+              @click="convoParticiapntsCollapsed = !convoParticiapntsCollapsed">
+              <div
+                v-if="participantsAssignedPublicIds.length"
+                class="max-w-full w-full flex flex-col gap-2 overflow-hidden">
+                <span class="text-gray-600 dark:text-gray-400 text-xs">
+                  ASSIGNED
+                </span>
+                <div
+                  class="max-w-full w-full flex flex-col gap-2 overflow-hidden">
+                  <template
+                    v-for="participantPublicId of participantsAssignedPublicIds"
+                    :key="participantPublicId">
+                    <div
+                      class="max-w-full w-full flex flex-row items-center gap-2 overflow-hidden">
+                      <ConvosConvoAvatar
+                        :participant-public-id="participantPublicId"
+                        :participants="participantArray"
+                        size="md" />
+                      <span>{{
+                        findParticipant(participantPublicId)?.name
+                      }}</span>
+                    </div>
+                  </template>
+                </div>
+              </div>
+              <div
+                v-if="participantContributorsPublicIds.length"
+                class="max-w-full w-full flex flex-col gap-2 overflow-hidden">
+                <span
+                  class="text-gray-600 dark:text-gray-400 max-w-full w-full overflow-hidden text-xs">
+                  CONTRIBUTORS
+                </span>
+                <div
+                  class="max-w-full w-full flex flex-col gap-2 overflow-hidden">
+                  <template
+                    v-for="participantPublicId of participantContributorsPublicIds"
+                    :key="participantPublicId">
+                    <div class="flex flex-row items-center gap-2">
+                      <ConvosConvoAvatar
+                        :participant-public-id="participantPublicId"
+                        :participants="participantArray"
+                        size="md" />
+                      <span class="truncate">{{
+                        findParticipant(participantPublicId)?.name
+                      }}</span>
+                    </div>
+                  </template>
+                </div>
+              </div>
+              <div
+                v-if="participantCommentersPublicIds.length"
+                class="flex flex-col gap-2">
+                <span class="text-gray-600 dark:text-gray-400 text-xs">
+                  COMMENTERS
+                </span>
+                <div class="flex flex-col gap-2">
+                  <template
+                    v-for="participantPublicId of participantCommentersPublicIds"
+                    :key="participantPublicId">
+                    <div class="flex flex-row items-center gap-2">
+                      <ConvosConvoAvatar
+                        :participant-public-id="participantPublicId"
+                        :participants="participantArray"
+                        size="md" />
+                      <span>{{
+                        findParticipant(participantPublicId)?.name
+                      }}</span>
+                    </div>
+                  </template>
+                </div>
+              </div>
+              <div
+                v-if="participantWatchersPublicIds.length"
+                class="flex flex-col gap-2">
+                <span class="text-gray-600 dark:text-gray-400 text-xs">
+                  WATCHERS
+                </span>
+                <div class="flex flex-col gap-2">
+                  <template
+                    v-for="participantPublicId of participantWatchersPublicIds"
+                    :key="participantPublicId">
+                    <div class="flex flex-row items-center gap-2">
+                      <ConvosConvoAvatar
+                        :participant-public-id="participantPublicId"
+                        :participants="participantArray"
+                        size="md" />
+                      <span>{{
+                        findParticipant(participantPublicId)?.name
+                      }}</span>
+                    </div>
+                  </template>
+                </div>
+              </div>
+              <div
+                v-if="participantGuestsPublicIds.length"
+                class="flex flex-col gap-2">
+                <span class="text-gray-600 dark:text-gray-400 text-xs">
+                  GUEST
+                </span>
+                <div class="flex flex-col gap-2">
+                  <template
+                    v-for="participantPublicId of participantGuestsPublicIds"
+                    :key="participantPublicId">
+                    <div class="flex flex-row items-center gap-2">
+                      <ConvosConvoAvatar
+                        :participant-public-id="participantPublicId"
+                        :participants="participantArray"
+                        size="md" />
+                      <span>{{
+                        findParticipant(participantPublicId)?.name
+                      }}</span>
+                    </div>
+                  </template>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="max-w-full w-full flex flex-col gap-4 overflow-hidden">
+            <div
+              class="max-w-full w-full flex flex-row items-center justify-between overflow-hidden"
+              @click="attachmentsCollapsed = !attachmentsCollapsed">
+              <span
+                class="text-gray-600 dark:text-gray-400 cursor-pointer text-sm font-medium">
+                ATTACHMENTS
+              </span>
+              <UnUiButton
+                :icon="
+                  attachmentsCollapsed
+                    ? 'i-heroicons-chevron-down'
+                    : 'i-heroicons-chevron-up'
+                "
+                size="2xs"
+                square
+                variant="ghost" />
+            </div>
+            <div
+              v-if="attachments.length && attachmentsCollapsed"
+              class="max-w-full flex flex-row flex-wrap gap-2 overflow-hidden">
+              <div
+                v-for="attachment of attachments"
+                :key="attachment.publicId">
+                <div
+                  class="flex flex-row gap-1 border border-1 border-base-5 rounded bg-base-2 px-2 py-1">
+                  <UnUiIcon
+                    name="i-ph-paperclip"
+                    size="16" />
+                  <span class="truncate text-xs"> {{ attachment.name }}</span>
+                </div>
+              </div>
+            </div>
+            <div
+              v-if="attachments.length && !attachmentsCollapsed"
+              class="max-w-full flex flex-row flex-wrap gap-2 overflow-hidden">
+              <div
+                v-for="attachment of attachments"
+                :key="attachment.publicId">
+                <div
+                  class="flex flex-row gap-1 border border-1 border-base-5 rounded bg-base-2 px-2 py-1">
+                  <UnUiIcon
+                    name="i-ph-paperclip"
+                    size="16" />
+                  <span class="truncate text-xs"> {{ attachment.name }}</span>
+                </div>
+              </div>
+            </div>
+            <div
+              v-if="!attachments.length"
+              class="max-w-full flex flex-row flex-wrap gap-2 overflow-hidden">
+              <span class="text-gray-500 text-xs">No attachments</span>
+            </div>
           </div>
         </div>
-        <div class="min-w-fit flex flex-col">
-          <span class="text-xs text-base-11">Started: {{ createDate }}</span>
-          <span class="text-xs text-base-11">Updated: {{ updateDate }}</span>
+
+        <div class="min-w-fit flex flex-col justify-self-end">
+          <UnUiTooltip :text="createDate?.toLocaleString()">
+            <span class="text-xs text-base-11">
+              Started: {{ createdAgo }}
+            </span>
+          </UnUiTooltip>
+          <UnUiTooltip :text="updateDate?.toLocaleString()">
+            <span class="text-xs text-base-11">
+              Updated: {{ updatedAgo }}
+            </span>
+          </UnUiTooltip>
         </div>
       </div>
     </div>
-    <div class="h-full max-h-full flex grow flex-col gap-0 overflow-hidden">
-      <div class="z-20000 mb-[-24px] h-[24px] from-base-1 bg-gradient-to-b" />
-      <convos-convo-messages :convo-public-id="convoPublicId" />
-      <div class="mt-[-24px] h-[24px] from-base-1 bg-gradient-to-t" />
-    </div>
-    <div class="max-h-[350px] w-full flex flex-row justify-items-end gap-2">
-      <UnEditor v-model:modelValue="editorData" />
-      <div class="min-w-fit flex flex-col justify-end gap-2">
-        <UnUiButton
-          label="Send"
-          icon="ph-envelope"
-          variant="outline" />
-        <UnUiButton
-          label="Note"
-          color="orange"
-          icon="ph-note"
-          variant="outline" />
-      </div>
-    </div>
   </div>
 </template>

From 09487c9fc85a106fc01857bd177770cd36f6cc97 Mon Sep 17 00:00:00 2001
From: McPizza <gh@l1.io>
Date: Fri, 26 Jan 2024 15:38:55 +0000
Subject: [PATCH 10/36] newConvo page update types

---
 apps/web-app/pages/[orgSlug]/convo/new.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web-app/pages/[orgSlug]/convo/new.vue b/apps/web-app/pages/[orgSlug]/convo/new.vue
index e72ad1bd..f640976d 100644
--- a/apps/web-app/pages/[orgSlug]/convo/new.vue
+++ b/apps/web-app/pages/[orgSlug]/convo/new.vue
@@ -541,7 +541,7 @@
                         :public-id="participant.publicId?.toString()"
                         :type="'group'"
                         :alt="participant.name.toString()"
-                        :color="participant.color?.toString()"
+                        :color="participant.color as UiColor"
                         size="xs" />
                       <span>
                         {{ participant.name }}

From c73e72e42d0aa3baf210dae06eefc1894d06a03c Mon Sep 17 00:00:00 2001
From: McPizza <gh@l1.io>
Date: Fri, 26 Jan 2024 15:39:28 +0000
Subject: [PATCH 11/36] trpc update convo + entries endpoints

---
 apps/web-app/server/trpc/index.ts             |   4 -
 .../trpc/routers/convoRouter/convoRouter.ts   | 388 +++++++++++-------
 .../trpc/routers/convoRouter/entryRouter.ts   | 167 ++++++++
 .../trpc/routers/convoRouter/messageRouter.ts | 144 -------
 4 files changed, 408 insertions(+), 295 deletions(-)
 create mode 100644 apps/web-app/server/trpc/routers/convoRouter/entryRouter.ts
 delete mode 100644 apps/web-app/server/trpc/routers/convoRouter/messageRouter.ts

diff --git a/apps/web-app/server/trpc/index.ts b/apps/web-app/server/trpc/index.ts
index 8cda4b36..e61147b7 100644
--- a/apps/web-app/server/trpc/index.ts
+++ b/apps/web-app/server/trpc/index.ts
@@ -46,10 +46,6 @@ const trpcWebAppOrgRouter = router({
   mail: trpcWebAppOrgMailRouter
 });
 
-const trpcWebAppConvoRouter = router({
-  convos: convoRouter
-});
-
 export const trpcWebAppRouter = router({
   signup: signupRouter,
   auth: authRouter,
diff --git a/apps/web-app/server/trpc/routers/convoRouter/convoRouter.ts b/apps/web-app/server/trpc/routers/convoRouter/convoRouter.ts
index 03149604..d793a2b0 100644
--- a/apps/web-app/server/trpc/routers/convoRouter/convoRouter.ts
+++ b/apps/web-app/server/trpc/routers/convoRouter/convoRouter.ts
@@ -14,27 +14,34 @@ import {
   convoEntries,
   emailIdentitiesAuthorizedUsers
 } from '@uninbox/database/schema';
-import { nanoId, nanoIdLength, nanoIdToken } from '@uninbox/utils';
+import {
+  nanoId,
+  nanoIdLength,
+  nanoIdSchema,
+  nanoIdToken
+} from '@uninbox/utils';
 import { TRPCError } from '@trpc/server';
 import type { JSONContent } from '@tiptap/vue-3';
 import { generateText } from '@tiptap/core';
 import { generateHTML } from '@tiptap/html';
 import { tipTapExtensions } from '~/shared/editorConfig';
+import { convoEntryRouter } from './entryRouter';
 
 export const convoRouter = router({
+  entries: convoEntryRouter,
   createNewConvo: orgProcedure
     .input(
       z.object({
         participantsOrgMembersPublicIds: z.array(
           z.string().min(3).max(nanoIdLength)
         ),
-        participantsGroupsPublicIds: z
-          .array(z.string().min(3).max(nanoIdLength))
-          .optional(),
-        participantsContactsPublicIds: z
-          .array(z.string().min(3).max(nanoIdLength))
-          .optional(),
-        participantsEmails: z.array(z.string()).optional(),
+        participantsGroupsPublicIds: z.array(
+          z.string().min(3).max(nanoIdLength)
+        ),
+        participantsContactsPublicIds: z.array(
+          z.string().min(3).max(nanoIdLength)
+        ),
+        participantsEmails: z.array(z.string()),
         sendAsEmailIdentityPublicId: z
           .string()
           .min(3)
@@ -217,7 +224,7 @@ export const convoRouter = router({
         }
       }
       let newConvoToEmailAddress: string;
-      if (participantsContactsPublicIds || participantsEmails) {
+      if (participantsContactsPublicIds.length || participantsEmails.length) {
         newConvoToEmailAddress = await getConvoToAddress();
       } else {
         newConvoToEmailAddress = '';
@@ -381,12 +388,12 @@ export const convoRouter = router({
 
       // create conversationParticipants Entries
       if (orgMemberIds.length) {
-        const convoMembersDbInsertValuesArray: InferInsertModel<
+        const convoParticipantsDbInsertValuesArray: InferInsertModel<
           typeof convoParticipants
         >[] = [];
         orgMemberIds.forEach((orgMemberId) => {
           const convoMemberPublicId = nanoId();
-          convoMembersDbInsertValuesArray.push({
+          convoParticipantsDbInsertValuesArray.push({
             orgId: orgId,
             convoId: +insertConvoResponse.insertId,
             publicId: convoMemberPublicId,
@@ -395,16 +402,16 @@ export const convoRouter = router({
         });
         await db
           .insert(convoParticipants)
-          .values(convoMembersDbInsertValuesArray);
+          .values(convoParticipantsDbInsertValuesArray);
       }
 
       if (orgGroupIds.length) {
-        const convoMembersDbInsertValuesArray: InferInsertModel<
+        const convoParticipantsDbInsertValuesArray: InferInsertModel<
           typeof convoParticipants
         >[] = [];
         orgGroupIds.forEach((groupId) => {
           const convoMemberPublicId = nanoId();
-          convoMembersDbInsertValuesArray.push({
+          convoParticipantsDbInsertValuesArray.push({
             orgId: orgId,
             convoId: +insertConvoResponse.insertId,
             publicId: convoMemberPublicId,
@@ -413,16 +420,16 @@ export const convoRouter = router({
         });
         await db
           .insert(convoParticipants)
-          .values(convoMembersDbInsertValuesArray);
+          .values(convoParticipantsDbInsertValuesArray);
       }
 
       if (orgContactIds.length) {
-        const convoMembersDbInsertValuesArray: InferInsertModel<
+        const convoParticipantsDbInsertValuesArray: InferInsertModel<
           typeof convoParticipants
         >[] = [];
         orgContactIds.forEach((contactId) => {
           const convoMemberPublicId = nanoId();
-          convoMembersDbInsertValuesArray.push({
+          convoParticipantsDbInsertValuesArray.push({
             orgId: orgId,
             convoId: +insertConvoResponse.insertId,
             publicId: convoMemberPublicId,
@@ -431,7 +438,7 @@ export const convoRouter = router({
         });
         await db
           .insert(convoParticipants)
-          .values(convoMembersDbInsertValuesArray);
+          .values(convoParticipantsDbInsertValuesArray);
       }
       const authorConvoParticipantPublicId = nanoId();
       const insertAuthorConvoParticipantResponse = await db
@@ -620,7 +627,222 @@ export const convoRouter = router({
         publicId: newConvoPublicId,
         missingEmailIdentities: missingEmailIdentitiesWarnings
       };
-    })
+    }),
+
+  //* get a specific conversation
+  getConvo: orgProcedure
+    .input(
+      z.object({
+        convoPublicId: nanoIdSchema
+      })
+    )
+    .query(async ({ ctx, input }) => {
+      const { db, user, org } = ctx;
+
+      if (!ctx.user || !ctx.org) {
+        throw new TRPCError({
+          code: 'UNPROCESSABLE_CONTENT',
+          message: 'User or Organization is not defined'
+        });
+      }
+      if (!org?.memberId) {
+        throw new TRPCError({
+          code: 'UNPROCESSABLE_CONTENT',
+          message: 'User is not a member of the organization'
+        });
+      }
+
+      const userId = user.id;
+      const orgId = org.id;
+      const userOrgMemberId = org.memberId;
+
+      const { convoPublicId } = input;
+
+      // check if the conversation belongs to the same org, early return if not before multiple db selects
+      const convoResponse = await db.query.convos.findFirst({
+        where: eq(convos.publicId, convoPublicId),
+        columns: {
+          id: true,
+          orgId: true
+        }
+      });
+      if (!convoResponse) {
+        throw new TRPCError({
+          code: 'NOT_FOUND',
+          message: 'Conversation not found'
+        });
+      }
+      if (Number(convoResponse.orgId) !== orgId) {
+        const convoOrgOwnerMembersIds = await db.query.orgMembers.findMany({
+          where: eq(orgMembers.orgId, convoResponse.orgId),
+          columns: {
+            userId: true
+          },
+          with: {
+            org: {
+              columns: {
+                name: true
+              }
+            }
+          }
+        });
+        const convoOrgOwnerUserIds = convoOrgOwnerMembersIds.map((member) =>
+          Number(member?.userId ?? 0)
+        );
+        if (!convoOrgOwnerUserIds.includes(userId)) {
+          throw new TRPCError({
+            code: 'NOT_FOUND',
+            message: 'Conversation not found'
+          });
+        }
+        throw new TRPCError({
+          code: 'UNAUTHORIZED',
+          message: `Conversation is owned by ${convoOrgOwnerMembersIds[0].org.name} organization.`
+        });
+      }
+
+      // TODO: Add filtering for org based on input.filterOrgPublicId
+      const convoDetails = await db.query.convos.findFirst({
+        columns: {
+          publicId: true,
+          lastUpdatedAt: true,
+          createdAt: true
+        },
+        where: eq(convos.id, convoResponse.id),
+        with: {
+          subjects: {
+            columns: {
+              publicId: true,
+              subject: true
+            }
+          },
+          participants: {
+            columns: {
+              publicId: true,
+              orgMemberId: true,
+              userGroupId: true,
+              contactId: true,
+              lastReadAt: true,
+              notifications: true,
+              active: true,
+              role: true
+            },
+            with: {
+              orgMember: {
+                columns: {
+                  id: true,
+                  publicId: true
+                },
+                with: {
+                  profile: {
+                    columns: {
+                      firstName: true,
+                      lastName: true,
+                      publicId: true,
+                      handle: true,
+                      title: true
+                    }
+                  }
+                }
+              },
+              userGroup: {
+                columns: {
+                  id: true,
+                  name: true,
+                  color: true,
+                  publicId: true,
+                  description: true
+                },
+                with: {
+                  members: {
+                    columns: {
+                      orgMemberId: true
+                    }
+                  }
+                }
+              },
+              contact: {
+                columns: {
+                  publicId: true,
+                  name: true,
+                  emailUsername: true,
+                  emailDomain: true,
+                  setName: true,
+                  signature: true
+                }
+              }
+            }
+          },
+          attachments: {
+            columns: {
+              publicId: true,
+              fileName: true,
+              type: true,
+              storageId: true
+            }
+          }
+        }
+      });
+      if (!convoDetails) {
+        throw new TRPCError({
+          code: 'NOT_FOUND',
+          message: 'Conversation not found'
+        });
+      }
+
+      // Find the participant.publicId for the userOrgMemberId
+      let participantPublicId: string | undefined;
+
+      // Check if the user's orgMemberId is in the conversation participants
+      convoDetails?.participants.forEach((participant) => {
+        if (participant.orgMember?.id === userOrgMemberId) {
+          participantPublicId = participant.publicId;
+        }
+      });
+
+      // If not found, check if the user's orgMemberId is in any participant's userGroup members
+      if (!participantPublicId) {
+        convoDetails?.participants.forEach((participant) => {
+          participant.userGroup?.members.forEach((groupMember) => {
+            if (groupMember.orgMemberId === userOrgMemberId) {
+              participantPublicId = participant.publicId;
+            }
+          });
+        });
+      }
+
+      // If participantPublicId is still not found, the user is not a participant of this conversation
+      if (!participantPublicId) {
+        throw new TRPCError({
+          code: 'UNAUTHORIZED',
+          message: 'You are not a participant of this conversation'
+        });
+      }
+
+      // strip the user IDs from the response
+      convoDetails.participants.forEach((participant) => {
+        if (participant.orgMember?.id) participant.orgMember.id = 0;
+        participant.userGroup?.members.forEach((groupMember) => {
+          if (groupMember.orgMemberId) groupMember.orgMemberId = 0;
+        });
+      });
+      return {
+        data: convoDetails,
+        participantPublicId: participantPublicId
+      };
+    }),
+
+  //* get convo entries
+  getConvoEntries: orgProcedure
+    .input(
+      z.object({
+        convoPublicId: nanoIdSchema,
+        cursorLastUpdatedAt: z.date().optional(),
+        cursorLastPublicId: z.string().min(3).max(nanoIdLength).optional()
+      })
+    )
+    .query(async ({ ctx, input }) => {})
+
   // getUserConvos: orgProcedure
   //   .input(
   //     z.object({
@@ -774,132 +996,4 @@ export const convoRouter = router({
   //       }
   //     };
   //   }),
-  // getConvo: orgProcedure
-  //   .input(
-  //     z.object({
-  //       convoPublicId: z.string().min(3).max(nanoIdLength)
-  //     })
-  //   )
-  //   .query(async ({ ctx, input }) => {
-  //     const { db, user, org } = ctx;
-  //     const { convoPublicId } = input;
-  //     const userId = user?.id || 0;
-  //     const orgId = org?.id || 0;
-  //     // TODO: Add filtering for org based on input.filterOrgPublicId
-  //     const convoDetails = await db.query.convos.findFirst({
-  //       columns: {
-  //         publicId: true,
-  //         lastUpdatedAt: true,
-  //         createdAt: true
-  //       },
-  //       where: eq(convos.publicId, convoPublicId),
-  //       with: {
-  //         org: {
-  //           columns: {
-  //             publicId: true,
-  //             name: true,
-  //             avatarId: true
-  //           }
-  //         },
-  //         subjects: {
-  //           columns: {
-  //             subject: true
-  //           }
-  //         },
-  //         members: {
-  //           with: {
-  //             orgMember: {
-  //               with: {
-  //                 profile: {
-  //                   columns: {
-  //                     userId: true,
-  //                     firstName: true,
-  //                     lastName: true,
-  //                     avatarId: true,
-  //                     publicId: true,
-  //                     handle: true
-  //                   }
-  //                 }
-  //               }
-  //             },
-  //             userGroup: {
-  //               columns: {
-  //                 name: true,
-  //                 color: true,
-  //                 avatarId: true,
-  //                 publicId: true
-  //               },
-  //               with: {
-  //                 members: {
-  //                   columns: {
-  //                     userId: true
-  //                   }
-  //                 }
-  //               }
-  //             },
-  //             foreignEmailIdentity: {
-  //               columns: {
-  //                 senderName: true,
-  //                 avatarId: true,
-  //                 username: true,
-  //                 rootDomain: true,
-  //                 publicId: true
-  //               }
-  //             }
-  //           },
-  //           columns: {
-  //             orgMemberId: true,
-  //             userGroupId: true,
-  //             foreignEmailIdentityId: true,
-  //             role: true
-  //           }
-  //         },
-  //         attachments: {
-  //           columns: {
-  //             publicId: true,
-  //             fileName: true,
-  //             type: true,
-  //             storageId: true
-  //           }
-  //         }
-  //       }
-  //     });
-  //     if (!convoDetails) {
-  //       console.log('Convo not found');
-  //       return {
-  //         data: null
-  //       };
-  //     }
-  //     //Check if the user is in the conversation
-  //     const convoParticipantsUserIds: number[] = [];
-  //     convoDetails?.members.forEach((member) => {
-  //       member.orgMember?.userId &&
-  //         convoParticipantsUserIds.push(member.orgMember?.userId);
-  //       member.orgMember?.profile?.userId &&
-  //         convoParticipantsUserIds.push(member.orgMember?.profile.userId);
-  //       member.userGroup?.members.forEach((groupMember) => {
-  //         groupMember.userId &&
-  //           convoParticipantsUserIds.push(groupMember.userId);
-  //       });
-  //     });
-  //     if (!convoParticipantsUserIds.includes(+userId)) {
-  //       console.log('User not in convo');
-  //       console.log({ userId, convoParticipantsUserIds });
-  //       return {
-  //         data: null
-  //       };
-  //     }
-  //     // strip the user IDs from the response
-  //     convoDetails.members.forEach((member) => {
-  //       if (member.orgMember?.userId) member.orgMember.userId = 0;
-  //       if (member.orgMember?.profile?.userId)
-  //         member.orgMember.profile.userId = 0;
-  //       member.userGroup?.members.forEach((groupMember) => {
-  //         if (groupMember.userId) groupMember.userId = 0;
-  //       });
-  //     });
-  //     return {
-  //       data: convoDetails
-  //     };
-  //   }),
 });
diff --git a/apps/web-app/server/trpc/routers/convoRouter/entryRouter.ts b/apps/web-app/server/trpc/routers/convoRouter/entryRouter.ts
new file mode 100644
index 00000000..a9ed878e
--- /dev/null
+++ b/apps/web-app/server/trpc/routers/convoRouter/entryRouter.ts
@@ -0,0 +1,167 @@
+import { z } from 'zod';
+import { router, orgProcedure, limitedProcedure } from '../../trpc';
+import { and, desc, eq, inArray, lt, or } from '@uninbox/database/orm';
+import { convos, convoEntries } from '@uninbox/database/schema';
+import {
+  nanoId,
+  nanoIdLength,
+  nanoIdToken,
+  nanoIdSchema
+} from '@uninbox/utils';
+import { TRPCError } from '@trpc/server';
+
+export const convoEntryRouter = router({
+  getConvoEntries: orgProcedure
+    .input(
+      z.object({
+        convoPublicId: nanoIdSchema,
+        cursorLastCreatedAt: z.date().optional(),
+        cursorLastPublicId: nanoIdSchema.optional()
+      })
+    )
+    .query(async ({ ctx, input }) => {
+      const { db, user, org } = ctx;
+
+      if (!ctx.user || !ctx.org) {
+        throw new TRPCError({
+          code: 'UNPROCESSABLE_CONTENT',
+          message: 'User or Organization is not defined'
+        });
+      }
+      if (!org?.memberId) {
+        throw new TRPCError({
+          code: 'UNPROCESSABLE_CONTENT',
+          message: 'User is not a member of the organization'
+        });
+      }
+
+      const userId = user.id;
+      const orgId = org.id;
+      const userOrgMemberId = org.memberId;
+
+      const { convoPublicId, cursorLastCreatedAt, cursorLastPublicId } = input;
+      const inputLastCreatedAt = cursorLastCreatedAt
+        ? new Date(cursorLastCreatedAt)
+        : new Date();
+      const inputLastPublicId = cursorLastPublicId || '';
+
+      // check if the conversation belongs to the same org, early return if not before multiple db selects
+      const convoResponse = await db.query.convos.findFirst({
+        where: and(eq(convos.publicId, convoPublicId), eq(convos.orgId, orgId)),
+        columns: {
+          id: true
+        }
+      });
+      if (!convoResponse) {
+        throw new TRPCError({
+          code: 'NOT_FOUND',
+          message: 'Conversation not found or not in this organization'
+        });
+      }
+
+      // TODO: Add filtering for org based on input.filterOrgPublicId
+      const convoDetails = await db.query.convos.findFirst({
+        columns: {
+          id: true
+        },
+        where: eq(convos.id, convoResponse.id),
+        with: {
+          participants: {
+            columns: {
+              id: true
+            },
+            with: {
+              orgMember: {
+                columns: {
+                  id: true
+                }
+              },
+              userGroup: {
+                columns: {
+                  id: true
+                },
+                with: {
+                  members: {
+                    columns: {
+                      orgMemberId: true
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      });
+      if (!convoDetails) {
+        throw new TRPCError({
+          code: 'NOT_FOUND',
+          message: 'Conversation not found'
+        });
+      }
+
+      //Check if the user's orgMemberId is in the conversation
+      const convoParticipantsOrgMemberIds: number[] = [];
+      convoDetails?.participants.forEach((participant) => {
+        participant.orgMember?.id &&
+          convoParticipantsOrgMemberIds.push(participant.orgMember?.id);
+        participant.userGroup?.members.forEach((groupMember) => {
+          groupMember.orgMemberId &&
+            convoParticipantsOrgMemberIds.push(groupMember.orgMemberId);
+        });
+      });
+
+      if (!convoParticipantsOrgMemberIds.includes(userOrgMemberId)) {
+        throw new TRPCError({
+          code: 'UNAUTHORIZED',
+          message: 'You are not a participant of this conversation'
+        });
+      }
+
+      // get the entries
+      const convoEntriesQuery = await db.query.convoEntries.findMany({
+        where: and(
+          or(
+            and(
+              eq(convoEntries.createdAt, inputLastCreatedAt),
+              lt(convoEntries.publicId, inputLastPublicId)
+            ),
+            lt(convoEntries.createdAt, inputLastCreatedAt)
+          ),
+          eq(convoEntries.convoId, convoDetails.id)
+        ),
+        orderBy: [desc(convoEntries.createdAt), desc(convoEntries.publicId)],
+        limit: 15,
+        columns: {
+          publicId: true,
+          createdAt: true,
+          body: true,
+          type: true
+        },
+        with: {
+          subject: {
+            columns: {
+              publicId: true,
+              subject: true
+            }
+          },
+          attachments: {
+            columns: {
+              publicId: true,
+              fileName: true,
+              type: true,
+              storageId: true
+            }
+          },
+          author: {
+            columns: {
+              publicId: true
+            }
+          }
+        }
+      });
+
+      return {
+        entries: convoEntriesQuery
+      };
+    })
+});
diff --git a/apps/web-app/server/trpc/routers/convoRouter/messageRouter.ts b/apps/web-app/server/trpc/routers/convoRouter/messageRouter.ts
deleted file mode 100644
index 20f616da..00000000
--- a/apps/web-app/server/trpc/routers/convoRouter/messageRouter.ts
+++ /dev/null
@@ -1,144 +0,0 @@
-import { z } from 'zod';
-import { router, orgProcedure, limitedProcedure } from '../../trpc';
-import { and, desc, eq, inArray, lt, or } from '@uninbox/database/orm';
-import {
-  convos,
-  convoMembers,
-  convoSubjects,
-  userProfiles,
-  foreignEmailIdentities,
-  userGroups,
-  userGroupMembers,
-  convoMessages
-} from '@uninbox/database/schema';
-import { nanoId, nanoIdLength, nanoIdToken, nanoIdSchema } from '@uninbox/utils';
-
-export const messageRouter = router({
-  getConvoMessages: orgProcedure
-    .input(
-      z.object({
-        convoPublicId: nanoIdSchema,
-        cursorLastCreatedAt: z.date().optional(),
-        cursorLastPublicId: nanoIdSchema.optional()
-      })
-    )
-    .query(async ({ ctx, input }) => {
-      if (!ctx.user || !ctx.org) {
-        throw new TRPCError({
-          code: 'UNPROCESSABLE_CONTENT',
-          message: 'User or Organization is not defined'
-        });
-      }
-      const { db, user, org } = ctx;
-      const userId = +user?.id;
-      const orgId = +org?.id;
-      const { convoPublicId, cursorLastCreatedAt, cursorLastPublicId } = input;
-
-      const inputLastCreatedAt = cursorLastCreatedAt
-        ? new Date(cursorLastCreatedAt)
-        : new Date();
-      const inputLastPublicId = cursorLastPublicId || '';
-
-      // TODO: Find a better way to do this
-      // Verify the user is in the convo
-      const convoDetails = await db.query.convos.findFirst({
-        where: eq(convos.publicId, convoPublicId),
-        columns: {
-          id: true
-        },
-        with: {
-          members: {
-            with: {
-              userProfile: {
-                columns: {
-                  userId: true,
-                  firstName: true,
-                  lastName: true,
-                  publicId: true,
-                  handle: true
-                }
-              },
-              userGroup: {
-                columns: {
-                  name: true,
-                  color: true,
-                  publicId: true
-                },
-                with: {
-                  members: {
-                    columns: {
-                      userId: true
-                    }
-                  }
-                }
-              },
-              foreignEmailIdentity: {
-                columns: {
-                  senderName: true,
-                  username: true,
-                  rootDomain: true,
-                  publicId: true
-                }
-              }
-            },
-            columns: {
-              userId: true,
-              userGroupId: true,
-              foreignEmailIdentityId: true,
-              role: true
-            }
-          }
-        }
-      });
-
-      if (!convoDetails) {
-        console.log('Convo not found');
-        return {
-          error: 'Convo not found'
-        };
-      }
-      //Check if the user is in the conversation
-      const convoMembersUserIds: number[] = [];
-      convoDetails?.members.forEach((member) => {
-        member.userId && convoMembersUserIds.push(member.userId);
-        member.userProfile?.userId &&
-          convoMembersUserIds.push(member.userProfile.userId);
-        member.userGroup?.members.forEach((groupMember) => {
-          groupMember.userId && convoMembersUserIds.push(groupMember.userId);
-        });
-      });
-
-      if (!convoMembersUserIds.includes(+userId)) {
-        console.log('User not in convo');
-        console.log({ userId, convoMembersUserIds });
-        return {
-          error: 'User not in convo'
-        };
-      }
-
-      const convoMessagesReturn = await db.query.convoMessages.findMany({
-        orderBy: [desc(convoMessages.createdAt), desc(convoMessages.publicId)],
-        limit: 15,
-        columns: {
-          publicId: true,
-          createdAt: true,
-          author: true,
-          body: true
-        },
-        where: and(
-          or(
-            and(
-              eq(convoMessages.createdAt, inputLastCreatedAt),
-              lt(convoMessages.publicId, inputLastPublicId)
-            ),
-            lt(convoMessages.createdAt, inputLastCreatedAt)
-          ),
-          eq(convoMessages.convoId, convoDetails.id)
-        )
-      });
-
-      return {
-        messages: convoMessagesReturn
-      };
-    })
-});

From 584471827a16e85634688534a42706538e40a486 Mon Sep 17 00:00:00 2001
From: McPizza <gh@l1.io>
Date: Fri, 26 Jan 2024 15:39:37 +0000
Subject: [PATCH 12/36] remove misc

---
 apps/web-app/emails/vercel-template.vue | 117 ------------------------
 1 file changed, 117 deletions(-)
 delete mode 100644 apps/web-app/emails/vercel-template.vue

diff --git a/apps/web-app/emails/vercel-template.vue b/apps/web-app/emails/vercel-template.vue
deleted file mode 100644
index 1e55f567..00000000
--- a/apps/web-app/emails/vercel-template.vue
+++ /dev/null
@@ -1,117 +0,0 @@
-<script setup lang="ts">
-  import { defineProps, withDefaults } from 'vue';
-
-  interface Props {
-    invitedByUsername?: string;
-    teamName?: string;
-    username?: string;
-    invitedByEmail?: string;
-    inviteLink?: string;
-    inviteFromIp?: string;
-    inviteFromLocation?: string;
-  }
-
-  const props = withDefaults(defineProps<Props>(), {
-    teamName: 'My project',
-    username: 'John Doe',
-    invitedByEmail: 'anpch@example.com',
-    inviteLink: 'https://vercel.com/teams/invite/foo',
-    inviteFromIp: '172.0.0.1',
-    inviteFromLocation: 'San Francisco, CA'
-  });
-
-  const previewText = `Join ${props.invitedByUsername} on Vercel`;
-</script>
-
-<template>
-  <ETailwind>
-    <EHtml>
-      <EHead />
-      <EPreview>{{ previewText }}</EPreview>
-      <EBody class="mx-auto my-auto bg-white font-sans">
-        <EContainer
-          class="mx-auto my-[40px] max-w-[465px] border border-[#eaeaea] rounded border-solid p-[20px] md:p-7">
-          <ESection class="mt-[32px]">
-            <EImg
-              src="/static/vercel-logo.png"
-              width="40"
-              height="37"
-              alt="Vercel"
-              class="mx-auto my-0" />
-          </ESection>
-          <Hello />
-          <EHeading
-            class="mx-0 my-[30px] p-0 text-center text-[24px] text-black font-normal">
-            Join <strong>{{ teamName }}</strong> on <strong>Vercel</strong>
-          </EHeading>
-          <EText class="text-[14px] text-black leading-[24px]">
-            Hello {{ username }},
-          </EText>
-          <EText class="text-[14px] text-black leading-[24px]">
-            <strong>bukinoshita</strong> (
-            <ELink
-              :href="`mailto:${invitedByEmail}`"
-              class="text-blue-600 no-underline">
-              {{ invitedByEmail }}
-            </ELink>
-            ) has invited you to the <strong>{{ teamName }}</strong> team on
-            <strong>Vercel</strong>.
-          </EText>
-          <ESection>
-            <ERow>
-              <EColumn align="right">
-                <EImg
-                  class="rounded-full"
-                  src="/static/vercel-user.png"
-                  width="64"
-                  height="64" />
-              </EColumn>
-              <EColumn align="center">
-                <EImg
-                  src="/static/vercel-arrow.png"
-                  width="12"
-                  height="9"
-                  alt="invited you to" />
-              </EColumn>
-              <EColumn align="left">
-                <EImg
-                  class="rounded-full"
-                  src="/static/vercel-team.png"
-                  width="64"
-                  height="64" />
-              </EColumn>
-            </ERow>
-          </ESection>
-          <ESection class="mb-[32px] mt-[32px] text-center">
-            <EButton
-              px="20"
-              py="12"
-              class="rounded bg-[#000000] text-center text-[12px] text-white font-semibold no-underline"
-              :href="inviteLink">
-              Join the team
-            </EButton>
-          </ESection>
-          <EText class="text-[14px] text-black leading-[24px]">
-            or copy and paste this URL into your browser:
-            <ELink
-              :href="inviteLink"
-              class="text-blue-600 no-underline">
-              {{ inviteLink }}
-            </ELink>
-          </EText>
-          <EHr
-            class="mx-0 my-[26px] w-full border border-[#eaeaea] border-solid" />
-          <EText class="text-[12px] text-[#666666] leading-[24px]">
-            This invitation was intended for
-            <span class="text-black">{{ username }} </span>.This invite was sent
-            from <span class="text-black">{{ inviteFromIp }}</span> located in
-            <span class="text-black">{{ inviteFromLocation }}</span
-            >. If you were not expecting this invitation, you can ignore this
-            email. If you are concerned about your account's safety, please
-            reply to this email to get in touch with us.
-          </EText>
-        </EContainer>
-      </EBody>
-    </EHtml>
-  </ETailwind>
-</template>

From d51bdd38440c824ef8143aae32cdf291f3bf9c54 Mon Sep 17 00:00:00 2001
From: McPizza <gh@l1.io>
Date: Fri, 26 Jan 2024 15:39:48 +0000
Subject: [PATCH 13/36] update tailwind safelist

---
 apps/web-app/tailwind.config.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/web-app/tailwind.config.ts b/apps/web-app/tailwind.config.ts
index f96b517c..da49fd47 100644
--- a/apps/web-app/tailwind.config.ts
+++ b/apps/web-app/tailwind.config.ts
@@ -9,6 +9,7 @@ export default <Partial<Config>>{
   darkMode: 'class',
   plugins: [colors.plugin],
   content: ['docs/content/**/*.md'],
+  safeList: ['items-end', 'items-start', 'rounded-br-none', 'rounded-bl-none'],
   theme: {
     extend: {
       fontFamily: {

From 9ae3f2ef01d87ec4e361340f21a5a1d26ee4d953 Mon Sep 17 00:00:00 2001
From: McPizza <gh@l1.io>
Date: Mon, 29 Jan 2024 13:50:53 +0000
Subject: [PATCH 14/36] Merge branch 'main' into feat/convoViewer

---
 apps/landing-page/package.json                |    2 +-
 apps/mail-bridge/trpc/routers/domainRouter.ts |   39 +-
 apps/storage/package.json                     |    6 +-
 apps/web-app/components/layout/navbar.vue     |   16 +-
 .../components/settings/domainDnsItem.vue     |   82 +-
 .../components/settings/invitesItem.vue       |   14 +-
 apps/web-app/components/un/ui-copy.vue        |   26 +
 apps/web-app/package.json                     |   10 +-
 .../settings/org/mail/domains/[domainId].vue  |  636 +++---
 .../settings/org/mail/domains/index.vue       |    2 +-
 .../settings/org/users/invites/index.vue      |   13 +-
 .../[orgSlug]/settings/user/addresses.vue     |   25 +-
 apps/web-app/pages/index.vue                  |   58 +-
 apps/web-app/pages/join/org.vue               |   24 +-
 apps/web-app/pages/join/passkey.vue           |   12 +-
 apps/web-app/pages/redirect.vue               |   20 +-
 apps/web-app/server/api/logout.post.ts        |   12 -
 .../routers/orgRouter/mail/domainsRouter.ts   |   24 +-
 packages/postal-puppet/package.json           |    4 +-
 packages/postal-puppet/src/index.ts           |    2 +
 .../src/puppets/domainRefreshDns.ts           |   27 +
 pnpm-lock.yaml                                | 1847 ++++++++---------
 22 files changed, 1435 insertions(+), 1466 deletions(-)
 create mode 100644 apps/web-app/components/un/ui-copy.vue
 delete mode 100644 apps/web-app/server/api/logout.post.ts
 create mode 100644 packages/postal-puppet/src/puppets/domainRefreshDns.ts

diff --git a/apps/landing-page/package.json b/apps/landing-page/package.json
index 2cce8ab6..d7d0fa08 100644
--- a/apps/landing-page/package.json
+++ b/apps/landing-page/package.json
@@ -9,7 +9,7 @@
     "postinstall": "nuxt prepare"
   },
   "devDependencies": {
-    "@nuxt/content": "^2.10.0",
+    "@nuxt/content": "^2.11.0",
     "@nuxt/devtools": "1.0.8",
     "@nuxtjs/color-mode": "^3.3.2",
     "@types/node": "^20.11.5",
diff --git a/apps/mail-bridge/trpc/routers/domainRouter.ts b/apps/mail-bridge/trpc/routers/domainRouter.ts
index 6095d108..821b41f2 100644
--- a/apps/mail-bridge/trpc/routers/domainRouter.ts
+++ b/apps/mail-bridge/trpc/routers/domainRouter.ts
@@ -7,7 +7,7 @@ import {
   orgPostalConfigs,
   domains
 } from '@uninbox/database/schema';
-import { nanoId, nanoIdLength,nanoIdSchema } from '@uninbox/utils';
+import { nanoId, nanoIdLength, nanoIdSchema } from '@uninbox/utils';
 import { postalPuppet } from '@uninbox/postal-puppet';
 
 export const domainRouter = router({
@@ -88,5 +88,42 @@ export const domainRouter = router({
         dkimValue: puppetDomainResponse.dkimValue,
         forwardingAddress: setMailServerRouteResult.forwardingAddress
       };
+    }),
+  refreshDomainDns: protectedProcedure
+    .input(
+      z.object({
+        orgId: z.number().min(1),
+        orgPublicId: nanoIdSchema,
+        postalDomainId: z.string().min(3).max(255)
+      })
+    )
+    .query(async ({ ctx, input }) => {
+      const { config, db } = ctx;
+      const { orgId, orgPublicId, postalDomainId } = input;
+      const postalOrgId = orgPublicId;
+
+      const localMode = config.localMode;
+      if (localMode) {
+        return {
+          success: true
+        };
+      }
+
+      const { puppetInstance } = await postalPuppet.initPuppet({
+        postalControlPanel: config.postalControlPanel,
+        postalUrl: config.postalUrl,
+        postalUser: config.postalUser,
+        postalPass: config.postalPass
+      });
+
+      await postalPuppet.refreshDomainDns({
+        puppetInstance: puppetInstance,
+        orgId: orgId,
+        orgPublicId: postalOrgId,
+        domainId: postalDomainId
+      });
+      await postalPuppet.closePuppet(puppetInstance);
+
+      return;
     })
 });
diff --git a/apps/storage/package.json b/apps/storage/package.json
index bd116910..030999d4 100644
--- a/apps/storage/package.json
+++ b/apps/storage/package.json
@@ -8,12 +8,12 @@
     "preview": "node .output/server/index.mjs"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.495.0",
-    "@aws-sdk/s3-request-presigner": "^3.495.0",
+    "@aws-sdk/client-s3": "^3.496.0",
+    "@aws-sdk/s3-request-presigner": "^3.496.0",
     "@uninbox/database": "workspace:*",
     "@uninbox/types": "workspace:*",
     "@uninbox/utils": "workspace:*",
-    "@upstash/redis": "1.20.0",
+    "@upstash/redis": "1.28.2",
     "nitropack": "latest",
     "sharp": "^0.33.2",
     "superjson": "^2.2.1"
diff --git a/apps/web-app/components/layout/navbar.vue b/apps/web-app/components/layout/navbar.vue
index 05a052bb..9a13f226 100644
--- a/apps/web-app/components/layout/navbar.vue
+++ b/apps/web-app/components/layout/navbar.vue
@@ -221,15 +221,19 @@
   const closeModal = () => {
     showLogoutModal.value = false;
   };
+
   async function useLogout() {
+    const toast = useToast();
     if (process.server) {
       return null;
     }
-    // useHanko()?.session._cookie.removeAuthCookie();
-    await useFetch('/api/logout', {
-      method: 'POST'
+    await useAuth().signOut();
+    toast.add({
+      title: 'Logged out',
+      description: 'You have been logged out',
+      color: 'green',
+      timeout: 5000
     });
-    navigateTo('/');
   }
 </script>
 <template>
@@ -241,17 +245,15 @@
       </template>
       <div class="w-full flex flex-col gap-8">
         <p>Are you sure you want to logout?</p>
-        <div class="flex flex-row gap-4">
+        <div class="w-full flex flex-row justify-end gap-4">
           <UnUiButton
             label="Cancel"
             size="xl"
-            block
             @click="closeModal" />
           <UnUiButton
             label="Logout"
             size="xl"
             color="red"
-            block
             @click="useLogout()" />
         </div>
       </div>
diff --git a/apps/web-app/components/settings/domainDnsItem.vue b/apps/web-app/components/settings/domainDnsItem.vue
index 67ea6f79..f58bb103 100644
--- a/apps/web-app/components/settings/domainDnsItem.vue
+++ b/apps/web-app/components/settings/domainDnsItem.vue
@@ -1,6 +1,4 @@
 <script setup lang="ts">
-  const { copy, copied } = useClipboard();
-
   type DnsItemBlockProps = {
     title: string;
     value: string;
@@ -8,69 +6,35 @@
   };
 
   const props = defineProps({
-    title: { type: String, required: true },
-    valid: { type: Boolean, required: true },
     text: { type: String, required: true },
-    blocks: { type: Array as PropType<DnsItemBlockProps[]>, required: true },
-    expanded: { type: Boolean, required: false, default: true }
-  });
-
-  const badgeColor = computed(() => {
-    switch (props.valid) {
-      case true:
-        return 'bg-green-9';
-      case false:
-        return 'bg-red-9';
-      default:
-        return 'bg-base-9';
-    }
+    blocks: { type: Array as PropType<DnsItemBlockProps[]>, required: true }
   });
 </script>
 <template>
-  <div
-    class="h-fit w-full flex flex-col justify-center gap-4 rounded-2xl bg-base-2 p-8">
-    <div
-      class="flex flex-row cursor-pointer items-center justify-between"
-      @click="$emit('clicked')">
-      <span class="text-lg font-display">{{ props.title }}</span>
-      <span
-        class="rounded-full px-4 py-1 text-xs font-semibold uppercase text-base-1"
-        :class="badgeColor">
-        {{ props.valid ? 'Valid' : 'Invalid' }}
-      </span>
+  <div class="mr-10 h-fit w-full flex flex-col justify-center gap-4 p-3.5">
+    <div>
+      <span class="">{{ props.text }}</span>
     </div>
-    <div
-      v-show="props.expanded"
-      class="flex flex-col justify-center gap-4">
-      <div>
-        <span class="">{{ props.text }}</span>
-      </div>
-      <div class="flex flex-row flex-wrap gap-4">
-        <div
-          v-for="block of props.blocks"
-          :key="block.value">
-          <div class="flex flex-col gap-1">
-            <span class="overflow-hidden text-xs uppercase text-base-11">
-              {{ block.title }}
-            </span>
-            <div class="flex flex-row items-center gap-2">
-              <div
-                class="min-w-[50px] w-fit flex flex-col items-center rounded-lg bg-base-3 p-4">
-                <span
-                  class="w-fit break-anywhere text-left text-sm font-mono"
-                  :class="block.title === 'Type' ? 'uppercase' : 'lowercase'">
-                  {{ block.value }}
-                </span>
-              </div>
-              <UnUiTooltip
-                v-if="block.hasCopyButton"
-                text="Copy to clipboard">
-                <UnUiIcon
-                  name="i-ph-clipboard"
-                  size="20"
-                  @click="copy(block.value)" />
-              </UnUiTooltip>
+    <div class="flex flex-row flex-wrap gap-4">
+      <div
+        v-for="block of props.blocks"
+        :key="block.value">
+        <div class="flex flex-col gap-1">
+          <span class="overflow-hidden text-xs text-base-11 uppercase">
+            {{ block.title }}
+          </span>
+          <div class="flex flex-row items-center gap-2">
+            <div
+              class="min-w-[50px] w-fit flex flex-col items-center rounded-lg bg-base-3 p-4">
+              <span
+                class="w-fit break-anywhere text-left text-sm font-mono"
+                :class="block.title === 'Type' ? 'uppercase' : 'lowercase'">
+                {{ block.value }}
+              </span>
             </div>
+            <UnUiCopy
+              v-if="block.hasCopyButton"
+              :text="block.value" />
           </div>
         </div>
       </div>
diff --git a/apps/web-app/components/settings/invitesItem.vue b/apps/web-app/components/settings/invitesItem.vue
index 69e5a850..a74b1423 100644
--- a/apps/web-app/components/settings/invitesItem.vue
+++ b/apps/web-app/components/settings/invitesItem.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
   import { useTimeAgo } from '@vueuse/core';
   import { useClipboard } from '@vueuse/core';
-  const { copy, copied } = useClipboard();
 
   const { $trpc } = useNuxtApp();
 
@@ -49,18 +48,7 @@
         <span class="text-sm text-base-11 font-semibold uppercase"> Code </span>
         <div class="flex flex-row gap-4">
           <span class="font-mono">{{ props.inviteData.inviteToken }}</span>
-          <button
-            v-if="props.inviteData.inviteToken"
-            class="flex flex-row items-center justify-center gap-1 rounded bg-base-3 p-1 text-xs hover:bg-base-4"
-            @click="copy(props.inviteData.inviteToken)">
-            <!-- by default, `copied` will be reset in 1.5s -->
-            <UnUiIcon
-              name="i-ph-clipboard"
-              size="16"
-              :class="copied ? 'text-green-500' : 'text-base-11'" />
-            <span v-if="!copied">Copy</span>
-            <span v-else>Copied!</span>
-          </button>
+          <UnUiCopy :text="props.inviteData.inviteToken" />
         </div>
       </div>
       <div
diff --git a/apps/web-app/components/un/ui-copy.vue b/apps/web-app/components/un/ui-copy.vue
new file mode 100644
index 00000000..b9aad6ae
--- /dev/null
+++ b/apps/web-app/components/un/ui-copy.vue
@@ -0,0 +1,26 @@
+<script setup lang="ts">
+  const { copy } = useClipboard();
+  const props = defineProps({
+    text: { type: String, required: true }
+  });
+  const copiedString = ref('');
+
+  async function copyString(value: string) {
+    await copy(value);
+    copiedString.value = value;
+    setTimeout(() => {
+      copiedString.value = '';
+    }, 1500);
+  }
+</script>
+<template>
+  <UnUiTooltip
+    :text="copiedString === props.text ? 'Copied' : 'Copy to clipboard'">
+    <UnUiButton
+      square
+      :icon="copiedString === props.text ? 'i-ph-check' : 'i-ph-clipboard'"
+      variant="soft"
+      :color="copiedString === props.text ? 'green' : 'gray'"
+      @click="copyString(props.text)" />
+  </UnUiTooltip>
+</template>
diff --git a/apps/web-app/package.json b/apps/web-app/package.json
index a4f9c646..fba635ea 100644
--- a/apps/web-app/package.json
+++ b/apps/web-app/package.json
@@ -23,7 +23,7 @@
     "@unocss/transformer-variant-group": "^0.58.3",
     "nuxt": "^3.9.3",
     "nuxt-icon": "^0.6.8",
-    "nuxt-prepare": "^0.2.2",
+    "nuxt-prepare": "^1.0.0",
     "nuxt-security": "1.0.1",
     "uncrypto": "^0.1.3",
     "unocss-preset-radix": "^2.5.5",
@@ -49,17 +49,17 @@
     "@uninbox/types": "workspace:*",
     "@uninbox/utils": "workspace:*",
     "@unocss/reset": "^0.58.3",
-    "@upstash/redis": "1.20.0",
-    "@vue-email/nuxt": "^0.8.9",
+    "@upstash/redis": "1.28.2",
+    "@vue-email/nuxt": "^0.8.11",
     "@vueuse/nuxt": "^10.7.2",
     "argon2": "^0.31.2",
     "class-variance-authority": "^0.7.0",
-    "fakefilter": "^0.1.721",
+    "fakefilter": "^0.1.727",
     "jose": "^5.2.0",
     "pinia": "^2.1.7",
     "pinia-shared-state": "^0.5.1",
     "preact-render-to-string": "^6.3.1",
-    "radix-vue": "^1.2.5",
+    "radix-vue": "^1.3.2",
     "superjson": "^2.2.1",
     "trpc-nuxt": "^0.10.17",
     "zod": "^3.22.4"
diff --git a/apps/web-app/pages/[orgSlug]/settings/org/mail/domains/[domainId].vue b/apps/web-app/pages/[orgSlug]/settings/org/mail/domains/[domainId].vue
index 59ec0ad8..4308f97b 100644
--- a/apps/web-app/pages/[orgSlug]/settings/org/mail/domains/[domainId].vue
+++ b/apps/web-app/pages/[orgSlug]/settings/org/mail/domains/[domainId].vue
@@ -9,7 +9,7 @@
   const { $trpc, $i18n } = useNuxtApp();
   const inviteEmailValid = ref<boolean | 'remote' | null>(null);
   const dnsRecordsExpanded = ref(false);
-  const mailMethodsExpanded = ref(false);
+  const mailMethodsExpanded = ref(true);
   const showDnsRefreshMessage = ref(false);
   const dnsRefreshLoading = ref(false);
 
@@ -25,23 +25,6 @@
     return '';
   });
 
-  const incomingForwardingModeEnabled = computed(() => {
-    return domainQuery.value?.domainData?.receivingMode === 'forwarding' ||
-      domainQuery.value?.domainData?.receivingMode === 'native'
-      ? true
-      : false;
-  });
-  const incomingNativeModeEnabled = computed(() => {
-    return domainQuery.value?.domainData?.receivingMode === 'native'
-      ? true
-      : false;
-  });
-  const outgoingNativeModeEnabled = computed(() => {
-    return domainQuery.value?.domainData?.sendingMode === 'native'
-      ? true
-      : false;
-  });
-
   const {
     data: domainQuery,
     pending: domainPending,
@@ -67,6 +50,72 @@
     { server: false }
   );
 
+  const domainStatus = ref('pending');
+  const incomingForwardingModeEnabled = ref(false);
+  const incomingNativeModeEnabled = ref(false);
+  const outgoingNativeModeEnabled = ref(false);
+  const incomingStatus = ref<'disabled' | 'native' | 'forwarding'>('disabled');
+  const outgoingStatus = ref<'disabled' | 'native' | 'external'>('disabled');
+
+  watch(
+    domainQuery,
+    (data) => {
+      console.log(data.domainData);
+      domainStatus.value = data.domainData?.domainStatus || 'pending';
+      incomingForwardingModeEnabled.value =
+        data.domainData?.receivingMode === 'forwarding' ||
+        data.domainData?.receivingMode === 'native'
+          ? true
+          : false;
+      incomingNativeModeEnabled.value =
+        data.domainData?.receivingMode === 'native' ? true : false;
+      outgoingNativeModeEnabled.value =
+        data.domainData?.sendingMode === 'native' ? true : false;
+    },
+    { deep: true }
+  );
+
+  const mail = computed(() => {
+    const mailStatus = [
+      {
+        label: 'Incoming',
+        slot: 'incoming',
+        status: domainQuery.value?.domainData?.receivingMode || 'disabled'
+      },
+      {
+        label: 'Outgoing',
+        slot: 'outgoing',
+        status: domainQuery.value?.domainData?.sendingMode || 'disabled'
+      }
+    ];
+    return mailStatus;
+  });
+
+  const dns = computed(() => {
+    return [
+      {
+        label: 'MX-Records',
+        slot: 'mx-records',
+        status: domainDnsQuery.value?.dns?.mx.valid || false
+      },
+      {
+        label: 'DKIM-Record',
+        slot: 'dkim-records',
+        status: domainDnsQuery.value?.dns?.dkim.valid || false
+      },
+      {
+        label: 'SPF-Record',
+        slot: 'spf-record',
+        status: domainDnsQuery.value?.dns?.spf.valid || false
+      },
+      {
+        label: 'Return Path',
+        slot: 'return-path',
+        status: domainDnsQuery.value?.dns?.returnPath.valid || false
+      }
+    ];
+  });
+
   async function recheckDns() {
     dnsRefreshLoading.value = true;
     await domainDnsRefresh();
@@ -85,9 +134,9 @@
     <div class="w-full flex flex-row items-center justify-between">
       <div class="flex flex-row items-center gap-4">
         <UnUiTooltip text="Back to domains">
-          <UnUicon
+          <UnUiIcon
             name="i-ph-arrow-left"
-            size="32"
+            class="text-2xl"
             @click="navigateTo('./')" />
         </UnUiTooltip>
         <div class="flex flex-col gap-1">
@@ -103,18 +152,16 @@
           </span>
         </div>
       </div>
-      <span
-        v-if="!domainPending"
-        class="rounded-full px-4 py-1 font-semibold uppercase text-base-1"
-        :class="
-          domainQuery?.domainData?.domainStatus === 'disabled'
-            ? 'bg-red-9'
-            : domainQuery?.domainData?.domainStatus === 'pending'
-              ? 'bg-orange-9'
-              : 'bg-green-9'
-        ">
-        {{ domainQuery?.domainData?.domainStatus }}
-      </span>
+      <UnUiBadge
+        :color="
+          domainStatus === 'disabled'
+            ? 'red'
+            : domainStatus === 'pending'
+              ? 'orange'
+              : 'green'
+        "
+        :label="domainStatus.toUpperCase()"
+        size="lg" />
     </div>
     <div class="w-full flex flex-col gap-8 overflow-y-scroll">
       <div
@@ -143,12 +190,12 @@
         class="w-full flex flex-col gap-8">
         <div class="flex flex-col gap-4">
           <div class="w-full border-b-1 border-base-5 pb-2">
-            <span class="text-sm font-semibold uppercase text-base-11">
+            <span class="text-sm text-base-11 font-semibold uppercase">
               Status
             </span>
           </div>
           <div
-            v-if="domainQuery?.domainData?.domainStatus === 'pending'"
+            v-if="domainStatus === 'pending'"
             class="flex flex-col gap-0">
             <span class=""> Your domain is unverified. </span>
             <span class="">
@@ -164,7 +211,7 @@
             </span>
           </div>
           <div
-            v-if="domainQuery?.domainData?.domainStatus === 'active'"
+            v-if="domainStatus === 'active'"
             class="flex flex-col gap-0">
             <span class="">
               Your domain has been activated and can be used to send and receive
@@ -172,7 +219,7 @@
             </span>
           </div>
           <div
-            v-if="domainQuery?.domainData?.domainStatus === 'disabled'"
+            v-if="domainStatus === 'disabled'"
             class="flex flex-col gap-0">
             <span class="">
               Your domain has been disabled and can not be used to send or
@@ -190,196 +237,173 @@
         </div>
         <div class="flex flex-col gap-4">
           <div class="w-full border-b-1 border-base-5 pb-2">
-            <span class="text-sm font-semibold uppercase text-base-11">
+            <span class="text-sm text-base-11 font-semibold uppercase">
               Mail
             </span>
           </div>
-          <div class="flex flex-col gap-4">
-            <div
-              class="h-fit w-full flex flex-col justify-center gap-4 rounded-2xl bg-base-2 p-8">
-              <div
-                class="flex flex-row cursor-pointer items-center justify-between"
-                @click="mailMethodsExpanded = !mailMethodsExpanded">
-                <span class="text-lg font-display">Incoming</span>
-                <span
-                  v-if="domainQuery.domainData.receivingMode === 'disabled'"
-                  class="rounded-full bg-red-9 px-4 py-1 text-xs font-semibold uppercase text-base-1">
-                  Disabled
-                </span>
-                <span
-                  v-if="
-                    domainQuery.domainData.receivingMode === 'forwarding' ||
-                    domainQuery.domainData.receivingMode === 'native'
-                  "
-                  class="rounded-full bg-orange-9 px-4 py-1 text-xs font-semibold uppercase text-base-1">
-                  Forwarding
-                </span>
-                <span
-                  v-if="domainQuery.domainData.receivingMode === 'native'"
-                  class="rounded-full bg-green-9 px-4 py-1 text-xs font-semibold uppercase text-base-1">
-                  Native
-                </span>
-              </div>
-              <div
-                v-show="mailMethodsExpanded"
-                class="flex flex-col justify-center gap-8">
-                <div v-if="domainQuery.domainData.receivingMode === 'disabled'">
-                  <span class=""
-                    >Incoming mail is disabled for this domain. Please verify
-                    the domain by adding a DNS record to start sending
-                    messages.</span
-                  >
-                </div>
-                <div class="flex flex-col gap-2">
-                  <div class="flex flex-row items-center justify-between">
-                    <span class="font-semibold"> Native Mode </span>
-                    <span
-                      class="rounded-full bg-red-5 px-4 py-1 text-xs font-semibold uppercase text-base-1"
-                      :class="
-                        incomingNativeModeEnabled ? 'bg-green-9' : 'bg-red-9'
-                      ">
-                      {{ incomingNativeModeEnabled ? 'enabled' : 'disabled' }}
-                    </span>
-                  </div>
-                  <span class="">
-                    All your incoming email is sent directly to UnInbox.
-                  </span>
-                  <span class="">
-                    You can still forward in emails using the address below
-                  </span>
+          <NuxtUiAccordion
+            multiple
+            :items="mail">
+            <template #default="{ item, open }">
+              <UnUiButton
+                variant="soft"
+                class="mb-1.5"
+                :class="
+                  open
+                    ? 'bg-blue-50 dark:bg-blue-900'
+                    : 'bg-gray-100 dark:bg-gray-900'
+                ">
+                <div
+                  class="mr-4 w-full flex flex-row items-center justify-between">
+                  <span class="truncate">{{ item.label }}</span>
+                  <UnUiBadge
+                    :color="
+                      item.status === 'disabled'
+                        ? 'red'
+                        : item.status === 'pending'
+                          ? 'orange'
+                          : item.status === 'forwarding'
+                            ? 'yellow'
+                            : 'green'
+                    "
+                    :label="item.status.toUpperCase()" />
                 </div>
-                <div class="flex flex-col gap-2">
-                  <div class="flex flex-row items-center justify-between">
-                    <span class="font-semibold"> Forwarding Mode </span>
-                    <span
-                      class="rounded-full bg-red-5 px-4 py-1 text-xs font-semibold uppercase text-base-1"
-                      :class="
-                        incomingForwardingModeEnabled
-                          ? 'bg-green-9'
-                          : 'bg-red-9'
-                      ">
-                      {{
-                        incomingForwardingModeEnabled ? 'enabled' : 'disabled'
-                      }}
-                    </span>
-                  </div>
-                  <span class="">
-                    You can forward emails from any external email system to be
-                    processed in UnInbox.
-                  </span>
-                  <span class="">
-                    A single forwarding address can be used for all your
-                    domain's email accounts.
-                  </span>
-                  <div class="mt-[8px] flex flex-col gap-1">
-                    <span
-                      class="overflow-hidden text-xs uppercase text-base-11">
-                      Forwarding Address
-                    </span>
-                    <div class="flex flex-row items-center gap-2">
-                      <div
-                        class="min-w-[50px] w-fit flex flex-col items-center rounded-lg bg-base-3 p-4">
+                <UnUiIcon
+                  name="i-heroicons-chevron-down-20-solid"
+                  class="ms-auto h-5 w-5 transform transition-transform duration-200"
+                  :class="[open && 'rotate-90']" />
+              </UnUiButton>
+            </template>
+            <template #incoming>
+              <div class="mr-10 flex flex-col gap-4">
+                <div class="h-fit w-full flex flex-col gap-4 p-3">
+                  <div class="flex flex-col justify-center gap-8">
+                    <div v-if="incomingStatus === 'disabled'">
+                      <span class=""
+                        >Incoming mail is disabled for this domain. Please
+                        verify the domain by adding a DNS record to start
+                        sending messages.</span
+                      >
+                    </div>
+                    <div class="flex flex-col gap-2">
+                      <div class="flex flex-row items-center justify-between">
+                        <span class="font-semibold"> Native Mode </span>
+                        <UnUiBadge
+                          :color="incomingNativeModeEnabled ? 'green' : 'red'"
+                          :label="
+                            incomingNativeModeEnabled ? 'ENABLED' : 'DISABLED'
+                          " />
+                      </div>
+                      <span class="">
+                        All your incoming email is sent directly to UnInbox.
+                      </span>
+                      <span class="">
+                        You can still forward in emails using the address below
+                      </span>
+                    </div>
+                    <div class="flex flex-col gap-2">
+                      <div class="flex flex-row items-center justify-between">
+                        <span class="font-semibold"> Forwarding Mode </span>
+                        <UnUiBadge
+                          :color="
+                            incomingForwardingModeEnabled ? 'green' : 'red'
+                          "
+                          :label="
+                            incomingForwardingModeEnabled
+                              ? 'ENABLED'
+                              : 'DISABLED'
+                          " />
+                      </div>
+                      <span class="">
+                        You can forward emails from any external email system to
+                        be processed in UnInbox.
+                      </span>
+                      <span class="">
+                        A single forwarding address can be used for all your
+                        domain's email accounts.
+                      </span>
+                      <div class="mt-[8px] flex flex-col gap-1">
                         <span
-                          class="w-fit break-anywhere text-left text-sm font-mono">
-                          {{ domainQuery?.domainData?.forwardingAddress }}
+                          class="overflow-hidden text-xs text-base-11 uppercase">
+                          Forwarding Address
                         </span>
-                      </div>
-                      <UnUiTooltip text="Copy to clipboard">
-                        <UnUiIcon
-                          name="i-ph-clipboard"
-                          size="20"
-                          @click="
-                            copy(
+                        <div class="flex flex-row items-center gap-2">
+                          <div
+                            class="min-w-[50px] w-fit flex flex-col items-center rounded-lg bg-base-3 p-4">
+                            <span
+                              class="w-fit break-anywhere text-left text-sm font-mono">
+                              {{ domainQuery?.domainData?.forwardingAddress }}
+                            </span>
+                          </div>
+                          <UnUiCopy
+                            :text="
                               domainQuery?.domainData?.forwardingAddress || ''
-                            )
-                          " />
-                      </UnUiTooltip>
+                            " />
+                        </div>
+                      </div>
                     </div>
                   </div>
                 </div>
               </div>
-            </div>
-            <div
-              class="h-fit w-full flex flex-col justify-center gap-4 rounded-2xl bg-base-2 p-8">
-              <div
-                class="flex flex-row cursor-pointer items-center justify-between"
-                @click="mailMethodsExpanded = !mailMethodsExpanded">
-                <span class="text-lg font-display">Outgoing</span>
-                <span
-                  v-if="domainQuery.domainData.sendingMode === 'disabled'"
-                  class="rounded-full bg-red-9 px-4 py-1 text-xs font-semibold uppercase text-base-1">
-                  Disabled
-                </span>
-                <span
-                  v-if="domainQuery.domainData.sendingMode === 'external'"
-                  class="rounded-full bg-orange-9 px-4 py-1 text-xs font-semibold uppercase text-base-1">
-                  External
-                </span>
-                <span
-                  v-if="domainQuery.domainData.sendingMode === 'native'"
-                  class="rounded-full bg-green-9 px-4 py-1 text-xs font-semibold uppercase text-base-1">
-                  Native
-                </span>
-              </div>
-              <div
-                v-show="mailMethodsExpanded"
-                class="flex flex-col justify-center gap-8">
-                <div v-if="domainQuery.domainData.sendingMode === 'disabled'">
-                  <span class="">
-                    Outgoing mail is disabled for this domain. Please add the
-                    SPF, DKIM and Return Path DNS records listed below.
-                  </span>
-                </div>
-                <div class="flex flex-col gap-2">
-                  <div class="flex flex-row items-center justify-between">
-                    <span class="font-semibold"> Native Mode </span>
-                    <span
-                      class="rounded-full bg-red-5 px-4 py-1 text-xs font-semibold uppercase text-base-1"
-                      :class="
-                        outgoingNativeModeEnabled ? 'bg-green-9' : 'bg-red-9'
-                      ">
-                      {{ outgoingNativeModeEnabled ? 'enabled' : 'disabled' }}
+            </template>
+
+            <template #outgoing>
+              <div class="h-fit w-full flex flex-col justify-center gap-4 p-3">
+                <div class="mr-10 flex flex-col justify-center gap-8">
+                  <div v-if="outgoingStatus === 'disabled'">
+                    <span class="">
+                      Outgoing mail is disabled for this domain. Please add the
+                      SPF, DKIM and Return Path DNS records listed below.
                     </span>
                   </div>
-                  <span class="">
-                    Your outgoing mail can be sent directly by UnInbox.
-                  </span>
-                  <span class="">
-                    Receivers will be able to verify that the message came from
-                    an authorized sender.
-                  </span>
-                </div>
-                <div class="flex flex-col gap-2">
-                  <div class="flex flex-row items-center justify-between">
-                    <span class="font-semibold"> External Mode </span>
-                    <span
-                      class="rounded-full bg-red-5 bg-red-9 px-4 py-1 text-xs font-semibold uppercase text-base-1">
-                      disabled
+                  <div class="flex flex-col gap-2">
+                    <div class="flex flex-row items-center justify-between">
+                      <span class="font-semibold"> Native Mode </span>
+                      <UnUiBadge
+                        :color="outgoingNativeModeEnabled ? 'green' : 'red'"
+                        :label="
+                          outgoingNativeModeEnabled ? 'ENABLED' : 'DISABLED'
+                        " />
+                    </div>
+                    <span class="">
+                      Your outgoing mail can be sent directly by UnInbox.
+                    </span>
+                    <span class="">
+                      Receivers will be able to verify that the message came
+                      from an authorized sender.
+                    </span>
+                  </div>
+                  <div class="flex flex-col gap-2">
+                    <div class="flex flex-row items-center justify-between">
+                      <span class="font-semibold"> External Mode </span>
+                      <UnUiBadge
+                        color="red"
+                        label="DISABLED" />
+                    </div>
+                    <span class="">
+                      Outgoing emails sent through UnInbox will be passed onto
+                      separate email system for sending.
+                    </span>
+                    <span class="">
+                      In this mode you must ensure that the sender can be
+                      verified by the receiving email system.
                     </span>
                   </div>
-                  <span class="">
-                    Outgoing emails sent through UnInbox will be passed onto
-                    separate email system for sending.
-                  </span>
-                  <span class="">
-                    In this mode you must ensure that the sender can be verified
-                    by the receiving email system.
-                  </span>
                 </div>
               </div>
-            </div>
-          </div>
+            </template>
+          </NuxtUiAccordion>
         </div>
         <div class="flex flex-col gap-4">
           <div
             class="w-full flex flex-row justify-between border-b-1 border-base-5 pb-2">
-            <span class="text-md font-semibold uppercase text-base-11">
+            <span class="text-md text-base-11 font-semibold uppercase">
               DNS Records
             </span>
           </div>
           <div class="flex flex-col gap-4">
             <div class="flex flex-row items-center justify-between">
-              <span class="text-xs font-semibold uppercase text-base-11">
+              <span class="text-xs text-base-11 font-semibold uppercase">
                 Last check: {{ timeSinceLastDnsCheck }}
               </span>
               <UnUiButton
@@ -396,104 +420,122 @@
               DNS records have been rechecked. If the records are still invalid,
               please recheck your DNS settings.
             </span>
-            <SettingsDomainDnsItem
-              title="MX Records"
-              :valid="domainDnsQuery?.dns?.mx.valid || false"
-              text="To receive email natively into UnInbox without another mail system, add an MX record with the following values. This should be the only MX record for this domain. MX records tell other email servers where to send email for your domain."
-              :blocks="[
-                {
-                  title: 'Type',
-                  value: 'MX'
-                },
-                {
-                  title: 'Name',
-                  value: '@'
-                },
-                {
-                  title: 'Priority',
-                  value: '1'
-                },
-                {
-                  title: 'Hostname/content',
-                  value: domainDnsQuery?.dns?.mx.value || '',
-                  hasCopyButton: true
-                }
-              ]"
-              :expanded="dnsRecordsExpanded"
-              @clicked="dnsRecordsExpanded = !dnsRecordsExpanded" />
-            <SettingsDomainDnsItem
-              title="DKIM Record"
-              :valid="domainDnsQuery?.dns?.dkim.valid || false"
-              text="To ensure email sent via UnInbox is delivered properly, add a TXT record with the following value. DKIM records help receivers verify the signature of an authorized sender."
-              :blocks="[
-                {
-                  title: 'Type',
-                  value: 'TXT'
-                },
-                {
-                  title: 'Name',
-                  value: domainDnsQuery?.dns?.dkim.key || '',
-                  hasCopyButton: true
-                },
-                {
-                  title: 'Value/Content',
-                  value: domainDnsQuery?.dns?.dkim.value || '',
-                  hasCopyButton: true
-                }
-              ]"
-              :expanded="dnsRecordsExpanded"
-              @clicked="dnsRecordsExpanded = !dnsRecordsExpanded" />
-
-            <SettingsDomainDnsItem
-              title="SPF Record"
-              :valid="domainDnsQuery?.dns?.spf.valid || false"
-              :text="
-                domainDnsQuery?.dns?.spf.otherSenders &&
-                domainDnsQuery?.dns?.spf.otherSenders.length > 0
-                  ? ' We have detected existing email senders for your domain, to ensure email sent via UnInbox is delivered properly, modify your TXT record to the following value. We have included existing senders to make your life easier. '
-                  : 'To ensure email sent via UnInbox is delivered properly, add a TXT record with the following value. SPF records help receivers verify the email came from an authorized sender.'
-              "
-              :blocks="[
-                {
-                  title: 'Type',
-                  value: 'TXT'
-                },
-                {
-                  title: 'Name',
-                  value: '@'
-                },
-                {
-                  title: 'Value/Content',
-                  value: domainDnsQuery?.dns?.spf.value || '',
-                  hasCopyButton: true
-                }
-              ]"
-              :expanded="dnsRecordsExpanded"
-              @clicked="dnsRecordsExpanded = !dnsRecordsExpanded" />
-
-            <SettingsDomainDnsItem
-              title="Return Path"
-              :valid="domainDnsQuery?.dns?.returnPath.valid || false"
-              text="To add a layer of reliability for sending emails, add a CNAME record with the following values. Adding a return path record helps stop undelivered emails from spamming external services. Make sure to disable any proxy settings."
-              :blocks="[
-                {
-                  title: 'Type',
-                  value: 'CNAME'
-                },
-                {
-                  title: 'Name',
-                  value: domainDnsQuery?.dns?.returnPath.value || '',
-                  hasCopyButton: true
-                },
-                {
-                  title: 'Target',
-                  value: domainDnsQuery?.dns?.returnPath.destination || '',
-                  hasCopyButton: true
-                }
-              ]"
-              :expanded="dnsRecordsExpanded"
-              @clicked="dnsRecordsExpanded = !dnsRecordsExpanded" />
+            <NuxtUiAccordion
+              multiple
+              :items="dns">
+              <template #default="{ item, open }">
+                <UnUiButton
+                  variant="soft"
+                  class="mb-1.5"
+                  :class="
+                    open
+                      ? 'bg-blue-50 dark:bg-blue-900'
+                      : 'bg-gray-100 dark:bg-gray-900'
+                  ">
+                  <div
+                    class="mr-4 w-full flex flex-row items-center justify-between">
+                    <span class="truncate">{{ item.label }}</span>
+                    <UnUiBadge
+                      :color="item.status ? 'green' : 'red'"
+                      :label="item.status ? 'VALID' : 'INVALID'" />
+                  </div>
+                  <UnUiIcon
+                    name="i-heroicons-chevron-down-20-solid"
+                    class="ms-auto h-5 w-5 transform transition-transform duration-200"
+                    :class="[open && 'rotate-90']" />
+                </UnUiButton>
+              </template>
+              <template #mx-records>
+                <SettingsDomainDnsItem
+                  text="To receive email natively into UnInbox without another mail system, add an MX record with the following values. This should be the only MX record for this domain. MX records tell other email servers where to send email for your domain."
+                  :blocks="[
+                    {
+                      title: 'Type',
+                      value: 'MX'
+                    },
+                    {
+                      title: 'Name',
+                      value: '@'
+                    },
+                    {
+                      title: 'Priority',
+                      value: '1'
+                    },
+                    {
+                      title: 'Hostname/content',
+                      value: domainDnsQuery?.dns?.mx.value || '',
+                      hasCopyButton: true
+                    }
+                  ]" />
+              </template>
+              <template #dkim-records>
+                <SettingsDomainDnsItem
+                  text="To ensure email sent via UnInbox is delivered properly, add a TXT record with the following value. DKIM records help receivers verify the signature of an authorized sender."
+                  :blocks="[
+                    {
+                      title: 'Type',
+                      value: 'TXT'
+                    },
+                    {
+                      title: 'Name',
+                      value: domainDnsQuery?.dns?.dkim.key || '',
+                      hasCopyButton: true
+                    },
+                    {
+                      title: 'Value/Content',
+                      value: domainDnsQuery?.dns?.dkim.value || '',
+                      hasCopyButton: true
+                    }
+                  ]" />
+              </template>
+              <template #spf-record>
+                <SettingsDomainDnsItem
+                  :text="
+                    domainDnsQuery?.dns?.spf.otherSenders &&
+                    domainDnsQuery?.dns?.spf.otherSenders.length > 0
+                      ? ' We have detected existing email senders for your domain, to ensure email sent via UnInbox is delivered properly, modify your TXT record to the following value. We have included existing senders to make your life easier. '
+                      : 'To ensure email sent via UnInbox is delivered properly, add a TXT record with the following value. SPF records help receivers verify the email came from an authorized sender.'
+                  "
+                  :blocks="[
+                    {
+                      title: 'Type',
+                      value: 'TXT'
+                    },
+                    {
+                      title: 'Name',
+                      value: '@'
+                    },
+                    {
+                      title: 'Value/Content',
+                      value: domainDnsQuery?.dns?.spf.value || '',
+                      hasCopyButton: true
+                    }
+                  ]" />
+              </template>
+              <template #return-path>
+                <SettingsDomainDnsItem
+                  text="To add a layer of reliability for sending emails, add a CNAME record with the following values. Adding a return path record helps stop undelivered emails from spamming external services. Make sure to disable any proxy settings."
+                  :blocks="[
+                    {
+                      title: 'Type',
+                      value: 'CNAME'
+                    },
+                    {
+                      title: 'Name',
+                      value: domainDnsQuery?.dns?.returnPath.value || '',
+                      hasCopyButton: true
+                    },
+                    {
+                      title: 'Target',
+                      value: domainDnsQuery?.dns?.returnPath.destination || '',
+                      hasCopyButton: true
+                    }
+                  ]" />
+              </template>
+            </NuxtUiAccordion>
           </div>
+          {{ mail }}
+          {{ incomingStatus }}
         </div>
       </div>
     </div>
diff --git a/apps/web-app/pages/[orgSlug]/settings/org/mail/domains/index.vue b/apps/web-app/pages/[orgSlug]/settings/org/mail/domains/index.vue
index d777b88e..94a13799 100644
--- a/apps/web-app/pages/[orgSlug]/settings/org/mail/domains/index.vue
+++ b/apps/web-app/pages/[orgSlug]/settings/org/mail/domains/index.vue
@@ -132,7 +132,7 @@
           <template #sendingMode-data="{ row }">
             <UnUiBadge
               :label="row.sendingMode.toUpperCase()"
-              :color="row.status === 'native' ? 'green' : 'red'" />
+              :color="row.sendingMode === 'native' ? 'green' : 'red'" />
           </template>
 
           <template #receivingMode-data="{ row }">
diff --git a/apps/web-app/pages/[orgSlug]/settings/org/users/invites/index.vue b/apps/web-app/pages/[orgSlug]/settings/org/users/invites/index.vue
index c69ea7f5..dcfe80b0 100644
--- a/apps/web-app/pages/[orgSlug]/settings/org/users/invites/index.vue
+++ b/apps/web-app/pages/[orgSlug]/settings/org/users/invites/index.vue
@@ -194,18 +194,9 @@
               <UnUiTooltip :text="row.code">
                 <span class="">{{ row.truncatedCode }}</span>
               </UnUiTooltip>
-              <button
+              <UnUiCopy
                 v-if="row.code"
-                class="flex flex-row items-center justify-center gap-1 rounded bg-base-3 p-1 text-xs hover:bg-base-4"
-                @click="copy(row.code)">
-                <!-- by default, `copied` will be reset in 1.5s -->
-                <UnUiIcon
-                  name="i-ph-clipboard"
-                  size="16"
-                  :class="copied ? 'text-green-500' : 'text-base-11'" />
-                <span v-if="text !== row.code">Copy</span>
-                <span v-else>Copied!</span>
-              </button>
+                :text="row.code" />
             </div>
           </template>
           <template #email-data="{ row }">
diff --git a/apps/web-app/pages/[orgSlug]/settings/user/addresses.vue b/apps/web-app/pages/[orgSlug]/settings/user/addresses.vue
index 7aaa9958..fa94e985 100644
--- a/apps/web-app/pages/[orgSlug]/settings/user/addresses.vue
+++ b/apps/web-app/pages/[orgSlug]/settings/user/addresses.vue
@@ -396,16 +396,7 @@
             :loading="pending"
             class="w-full overflow-x-scroll">
             <template #address-data="{ row }">
-              <UnUiTooltip text="Copy to clipboard">
-                <button
-                  class="flex flex-row cursor-pointer items-center gap-2"
-                  @click="copy(row.address)">
-                  <span class="truncate">{{ row.address }}</span>
-                  <UnUiIcon
-                    name="i-ph-clipboard"
-                    size="20" />
-                </button>
-              </UnUiTooltip>
+              <UnUiCopy :text="row.address" />
             </template>
             <template #sendName-data="{ row }">
               <UnUiTooltip text="Click to edit">
@@ -420,19 +411,7 @@
               </UnUiTooltip>
             </template>
             <template #forwarding-data="{ row }">
-              <UnUiTooltip
-                :text="`${row.forwarding.address} - Copy to clipboard`">
-                <button
-                  class="flex flex-row cursor-pointer items-center gap-2"
-                  @click="copy(row.address)">
-                  <span class="uppercase">
-                    {{ row.forwarding.truncated }}...
-                  </span>
-                  <UnUiIcon
-                    name="i-ph-clipboard"
-                    size="20" />
-                </button>
-              </UnUiTooltip>
+              <UnUiCopy :text="row.forwarding.address" />
             </template>
             <template #org-data="{ row }">
               <div class="flex flex-row items-center gap-2">
diff --git a/apps/web-app/pages/index.vue b/apps/web-app/pages/index.vue
index e2a1c60c..f7788341 100644
--- a/apps/web-app/pages/index.vue
+++ b/apps/web-app/pages/index.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
   import { startAuthentication } from '@simplewebauthn/browser';
+  import type { PublicKeyCredentialRequestOptionsJSON } from '@simplewebauthn/typescript-types';
   definePageMeta({ guest: true });
   const turnstileToken = ref();
   const errorMessage = ref(false);
   const passkeyLocation = ref('');
   const immediatePasskeyPrompt = ref(false);
-  const passkeyLocationDialogOpen = ref(false);
 
   const turnstileEnabled = useRuntimeConfig().public.turnstileEnabled;
   if (!turnstileEnabled) {
@@ -54,7 +54,7 @@
     // }
     // immediatePasskeyPrompt.value && promptForPasskey();
 
-    promptForPasskey();
+    await promptForPasskey();
   }
 
   async function promptForPasskey() {
@@ -64,13 +64,13 @@
       timeoutId = null;
     }
 
-    const { data } = await useFetch('/api/auth/passkey-options', {
-      transform: (value) => {
-        // @ts-ignore - not sure why this errors
-        return JSON.parse(value);
-      }
+    const data = await $fetch<{
+      options?: PublicKeyCredentialRequestOptionsJSON;
+    }>('/api/auth/passkey-options', {
+      parseResponse: JSON.parse
     });
-    if (!data.value.options) {
+
+    if (!data?.options) {
       toast.add({
         title: 'Server error',
         description:
@@ -81,9 +81,35 @@
       });
       return;
     }
-    const passkeyData = await startAuthentication(data.value.options);
+    try {
+      const passkeyData = await startAuthentication(data.options);
+
+      if (!passkeyData) {
+        throw new Error('No passkey data returned');
+      }
+
+      const formData = new FormData();
+      formData.append('action', 'authenticate');
+      formData.append('data', JSON.stringify(passkeyData));
+      const res = await fetch('/api/auth/callback/passkey', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json'
+        },
+        body: JSON.stringify({
+          action: 'authenticate',
+          data: passkeyData
+        }),
+        redirect: 'manual'
+      });
 
-    if (!passkeyData) {
+      // we know that the passkey is correct if we get an opaque redirect
+      if (res.type !== 'opaqueredirect') {
+        throw new Error('Passkey error');
+      }
+
+      window.location.assign('/redirect');
+    } catch (e) {
       toast.add({
         title: 'Passkey error',
         description:
@@ -92,19 +118,7 @@
         timeout: 5000,
         icon: 'i-ph-warning-circle'
       });
-      return;
     }
-
-    const formData = new FormData();
-    formData.append('action', 'authenticate');
-    formData.append('data', JSON.stringify(passkeyData));
-    await useFetch('/api/auth/callback/passkey', {
-      method: 'post',
-      body: {
-        action: 'authenticate',
-        data: passkeyData
-      }
-    });
   }
 </script>
 
diff --git a/apps/web-app/pages/join/org.vue b/apps/web-app/pages/join/org.vue
index 0f21fd3a..0b045d06 100644
--- a/apps/web-app/pages/join/org.vue
+++ b/apps/web-app/pages/join/org.vue
@@ -84,6 +84,13 @@
     newButtonLoading.value = true;
 
     newButtonLabel.value = 'Creating your organization';
+    toast.add({
+      id: 'creating_org',
+      title: 'Creating your organization',
+      description: `This may take a few seconds`,
+      icon: 'i-ph-clock-clockwise',
+      timeout: 20000
+    });
     const createNewOrgTrpc = $trpc.org.crud.createNewOrg.useMutation();
     await createNewOrgTrpc.mutate({
       orgName: orgNameValue.value,
@@ -107,7 +114,14 @@
       expires: new Date(Date.now() + 7 * 24 * 60 * 60 * 1000)
     });
     orgSlugCookie.value = orgSlugValue.value as string;
-    newButtonLabel.value = 'Creating a @uninbox email';
+    toast.remove('creating_org');
+    toast.add({
+      id: 'created_org',
+      title: 'Organization created',
+      description: `🎉`,
+      icon: 'i-ph-check',
+      timeout: 5000
+    });
     newButtonLoading.value = false;
     newButtonLabel.value = 'All Done!';
     navigateTo('/join/profile');
@@ -136,7 +150,13 @@
       expires: new Date(Date.now() + 7 * 24 * 60 * 60 * 1000)
     });
     orgSlugCookie.value = joinOrgResponse!.orgSlug as string;
-
+    toast.add({
+      id: 'joined_org',
+      title: 'Organization joined',
+      description: `🎉`,
+      icon: 'i-ph-check',
+      timeout: 5000
+    });
     joinButtonLoading.value = false;
     joinButtonLabel.value = 'All Done!';
     navigateTo('/join/profile');
diff --git a/apps/web-app/pages/join/passkey.vue b/apps/web-app/pages/join/passkey.vue
index 28b81074..409bc7e0 100644
--- a/apps/web-app/pages/join/passkey.vue
+++ b/apps/web-app/pages/join/passkey.vue
@@ -151,10 +151,8 @@
       timeout: 5000,
       icon: 'i-ph-check-circle'
     });
-    useCookie('un-redirect', { maxAge: 120 }).value = '/join/org';
-    setTimeout(() => {
-      reloadNuxtApp({ persistState: true, force: true });
-    }, 2500);
+    useAuth().status.value = 'authenticated';
+    navigateTo('/join/org');
   }
 
   watchDebounced(
@@ -293,12 +291,6 @@
       <template #header>
         <div class="flex items-center justify-between">
           <p>How to add a passkey?</p>
-          <UnUiButton
-            color="gray"
-            variant="ghost"
-            icon="i-ph-x"
-            class="-my-1"
-            @click="howToAddPasskeyDialogOpen = false" />
         </div>
       </template>
       <div class="w-full flex flex-col items-center gap-4">
diff --git a/apps/web-app/pages/redirect.vue b/apps/web-app/pages/redirect.vue
index 735d17fc..1dfcd033 100644
--- a/apps/web-app/pages/redirect.vue
+++ b/apps/web-app/pages/redirect.vue
@@ -1,12 +1,16 @@
 <script setup lang="ts">
-  const { $trpc, $i18n } = useNuxtApp();
+  const { $trpc } = useNuxtApp();
 
-  const { data: userOrgSlug, execute } =
-    await $trpc.auth.getUserDefaultOrgSlug.useLazyQuery({}, { server: false });
-  watch(userOrgSlug, () => {
-    if (!userOrgSlug.value) return;
-    const orgSlug = userOrgSlug.value?.slug;
-    navigateTo(`/${orgSlug}`);
+  onMounted(async () => {
+    const { slug } = await $trpc.auth.getUserDefaultOrgSlug.query({});
+    if (!slug) {
+      return navigateTo(`/`);
+    }
+    navigateTo(`/${slug}`);
   });
 </script>
-<template><div>Redirecting...</div></template>
+<template>
+  <div class="h-full w-full flex items-center justify-center">
+    <span class="text-3xl font-display">Redirecting...</span>
+  </div>
+</template>
diff --git a/apps/web-app/server/api/logout.post.ts b/apps/web-app/server/api/logout.post.ts
deleted file mode 100644
index 7db23677..00000000
--- a/apps/web-app/server/api/logout.post.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-export default eventHandler(async (event) => {
-  const session = await useAuthSession(event);
-  const sessionId = session.id;
-  if (sessionId) {
-    await useStorage('sessions').removeItem(sessionId);
-  }
-  await session.clear();
-
-  return {
-    message: 'Successfully logged out!'
-  };
-});
diff --git a/apps/web-app/server/trpc/routers/orgRouter/mail/domainsRouter.ts b/apps/web-app/server/trpc/routers/orgRouter/mail/domainsRouter.ts
index f2ba6941..b718d4ee 100644
--- a/apps/web-app/server/trpc/routers/orgRouter/mail/domainsRouter.ts
+++ b/apps/web-app/server/trpc/routers/orgRouter/mail/domainsRouter.ts
@@ -211,6 +211,7 @@ export const domainsRouter = router({
           dkimKey: true,
           dkimValue: true,
           postalHost: true,
+          postalId: true,
           lastDnsCheckAt: true,
           sendingMode: true,
           receivingMode: true,
@@ -281,6 +282,7 @@ export const domainsRouter = router({
           dnsResult.returnPath.valid ||
           dnsResult.mx.valid;
 
+        console.log({ anyValidRecords });
         !validSendingRecords
           ? (domainSendingMode = 'disabled')
           : (domainSendingMode = 'native');
@@ -293,9 +295,9 @@ export const domainsRouter = router({
           domainReceivingMode = 'native';
         }
 
-        domainStatus === 'pending' && anyValidRecords
-          ? (domainStatus = 'active')
-          : (domainStatus = 'pending');
+        if (anyValidRecords && domainStatus === 'pending') {
+          domainStatus = 'active';
+        }
 
         await db
           .update(domains)
@@ -325,6 +327,22 @@ export const domainsRouter = router({
           .where(eq(domains.id, domainResponse.id));
       }
 
+      if (domainResponse.postalId) {
+        mailBridgeTrpcClient.postal.domains.refreshDomainDns.query({
+          orgId: +orgId,
+          orgPublicId: org.publicId,
+          postalDomainId: domainResponse.postalId
+        });
+      }
+
+      console.log({
+        dns: dnsResult,
+        domainStatus: domainStatus,
+        domainSendingMode: domainSendingMode,
+        domainReceivingMode: domainReceivingMode,
+        forwardingAddress: domainResponse.forwardingAddress,
+        checked: new Date()
+      });
       return {
         dns: dnsResult,
         domainStatus: domainStatus,
diff --git a/packages/postal-puppet/package.json b/packages/postal-puppet/package.json
index ca1d13d4..483c90eb 100644
--- a/packages/postal-puppet/package.json
+++ b/packages/postal-puppet/package.json
@@ -48,13 +48,13 @@
     "eslint": "^8.56.0",
     "esno": "^4.0.0",
     "lint-staged": "^15.2.0",
-    "pnpm": "^8.14.1",
+    "pnpm": "^8.14.3",
     "rimraf": "^5.0.5",
     "simple-git-hooks": "^2.9.0",
     "tsx": "^4.7.0",
     "typescript": "^5.3.3",
     "unbuild": "^2.0.0",
-    "vite": "^5.0.11",
+    "vite": "^5.0.12",
     "vitest": "^1.2.1"
   },
   "simple-git-hooks": {
diff --git a/packages/postal-puppet/src/index.ts b/packages/postal-puppet/src/index.ts
index 395f79f5..d8bafbbe 100644
--- a/packages/postal-puppet/src/index.ts
+++ b/packages/postal-puppet/src/index.ts
@@ -2,6 +2,7 @@ import type { Browser, Page } from 'puppeteer';
 import { initPuppet } from './puppets/initPuppet';
 import { closePuppet } from './puppets/closePuppet';
 import { addDomain } from './puppets/addDomain';
+import { refreshDomainDns } from './puppets/domainRefreshDns';
 import { addMailServer } from './puppets/addMailServer';
 import { createOrg } from './puppets/createOrg';
 import { setMailServerApiKey } from './puppets/setMailServerApiKey';
@@ -23,6 +24,7 @@ export const postalPuppet = {
   addDomain,
   addMailServer,
   createOrg,
+  refreshDomainDns,
   setMailServerApiKey,
   setMailServerSmtpKey,
   setMailServerConfig,
diff --git a/packages/postal-puppet/src/puppets/domainRefreshDns.ts b/packages/postal-puppet/src/puppets/domainRefreshDns.ts
new file mode 100644
index 00000000..518cf662
--- /dev/null
+++ b/packages/postal-puppet/src/puppets/domainRefreshDns.ts
@@ -0,0 +1,27 @@
+import type { PuppetInstance } from '../index';
+
+export async function refreshDomainDns(options: {
+  puppetInstance: PuppetInstance;
+  orgId: number;
+  domainId: string;
+  orgPublicId: string;
+}): Promise<{
+  success: boolean;
+}> {
+  try {
+    await options.puppetInstance.page.goto(
+      `${options.puppetInstance.url}/org/${options.orgPublicId}/domains/${options.domainId}/setup` as string
+    );
+    await options.puppetInstance.page.waitForNetworkIdle();
+    const refreshButton = await options.puppetInstance.page.waitForSelector(
+      'a ::-p-text(Check my records are correct)'
+    );
+    if (!refreshButton) throw new Error('Refresh button not found');
+    refreshButton.click();
+    await options.puppetInstance.page.waitForNetworkIdle();
+    return { success: true };
+  } catch (error: any) {
+    console.log('Postal: refreshDomainDns Error:', error);
+    throw new Error(error);
+  }
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c57b1368..5d8994b3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -45,11 +45,11 @@ importers:
         version: 1.1.3(vue@3.4.15)
     devDependencies:
       '@nuxt/content':
-        specifier: ^2.10.0
-        version: 2.10.0(nuxt@3.9.3)(vue@3.4.15)
+        specifier: ^2.11.0
+        version: 2.11.0(nuxt@3.9.3)(vue@3.4.15)
       '@nuxt/devtools':
         specifier: 1.0.8
-        version: 1.0.8(nuxt@3.9.3)(vite@5.0.11)
+        version: 1.0.8(nuxt@3.9.3)(vite@5.0.12)
       '@nuxtjs/color-mode':
         specifier: ^3.3.2
         version: 3.3.2
@@ -58,7 +58,7 @@ importers:
         version: 20.11.5
       nuxt:
         specifier: ^3.9.3
-        version: 3.9.3(@types/node@20.11.5)(@upstash/redis@1.20.0)(typescript@5.3.3)(vite@5.0.11)(vue-tsc@1.8.27)
+        version: 3.9.3(@types/node@20.11.5)(@upstash/redis@1.28.2)(eslint@8.56.0)(typescript@5.3.3)(vite@5.0.12)(vue-tsc@1.8.27)
       nuxt-security:
         specifier: 1.0.1
         version: 1.0.1
@@ -88,7 +88,7 @@ importers:
         version: 9.0.5
       nitropack:
         specifier: ^2.8.1
-        version: 2.8.1(@upstash/redis@1.20.0)
+        version: 2.8.1(@upstash/redis@1.28.2)
       superjson:
         specifier: ^2.2.1
         version: 2.2.1
@@ -102,11 +102,11 @@ importers:
   apps/storage:
     dependencies:
       '@aws-sdk/client-s3':
-        specifier: ^3.495.0
-        version: 3.495.0
+        specifier: ^3.496.0
+        version: 3.496.0
       '@aws-sdk/s3-request-presigner':
-        specifier: ^3.495.0
-        version: 3.495.0
+        specifier: ^3.496.0
+        version: 3.496.0
       '@uninbox/database':
         specifier: workspace:*
         version: link:../../packages/database
@@ -117,11 +117,11 @@ importers:
         specifier: workspace:*
         version: link:../../packages/utils
       '@upstash/redis':
-        specifier: 1.20.0
-        version: 1.20.0
+        specifier: 1.28.2
+        version: 1.28.2
       nitropack:
         specifier: latest
-        version: 2.8.1(@upstash/redis@1.20.0)
+        version: 2.8.1(@upstash/redis@1.28.2)
       sharp:
         specifier: ^0.33.2
         version: 0.33.2
@@ -139,7 +139,7 @@ importers:
         version: 0.3.5(@auth/core@packages+authjs)(nuxt@3.9.3)
       '@nuxt/ui':
         specifier: ^2.12.3
-        version: 2.12.3(nuxt@3.9.3)(vite@5.0.11)(vue@3.4.15)
+        version: 2.12.3(nuxt@3.9.3)(vite@5.0.12)(vue@3.4.15)
       '@pinia/nuxt':
         specifier: ^0.5.1
         version: 0.5.1(typescript@5.3.3)(vue@3.4.15)
@@ -186,11 +186,11 @@ importers:
         specifier: ^0.58.3
         version: 0.58.3
       '@upstash/redis':
-        specifier: 1.20.0
-        version: 1.20.0
+        specifier: 1.28.2
+        version: 1.28.2
       '@vue-email/nuxt':
-        specifier: ^0.8.9
-        version: 0.8.9(typescript@5.3.3)(vue@3.4.15)
+        specifier: ^0.8.11
+        version: 0.8.11(typescript@5.3.3)(vue@3.4.15)
       '@vueuse/nuxt':
         specifier: ^10.7.2
         version: 10.7.2(nuxt@3.9.3)(vue@3.4.15)
@@ -201,8 +201,8 @@ importers:
         specifier: ^0.7.0
         version: 0.7.0
       fakefilter:
-        specifier: ^0.1.721
-        version: 0.1.721
+        specifier: ^0.1.727
+        version: 0.1.727
       jose:
         specifier: ^5.2.0
         version: 5.2.0
@@ -216,8 +216,8 @@ importers:
         specifier: ^6.3.1
         version: 6.3.1(preact@10.19.3)
       radix-vue:
-        specifier: ^1.2.5
-        version: 1.2.5(vue@3.4.15)
+        specifier: ^1.3.2
+        version: 1.3.2(vue@3.4.15)
       superjson:
         specifier: ^2.2.1
         version: 2.2.1
@@ -239,7 +239,7 @@ importers:
         version: 1.1.2
       '@nuxt/devtools':
         specifier: 1.0.8
-        version: 1.0.8(nuxt@3.9.3)(vite@5.0.11)
+        version: 1.0.8(nuxt@3.9.3)(vite@5.0.12)
       '@nuxtjs/color-mode':
         specifier: ^3.3.2
         version: 3.3.2
@@ -257,7 +257,7 @@ importers:
         version: 20.11.5
       '@unocss/nuxt':
         specifier: ^0.58.3
-        version: 0.58.3(postcss@8.4.33)(vite@5.0.11)(webpack@5.89.0)
+        version: 0.58.3(postcss@8.4.33)(vite@5.0.12)(webpack@5.89.0)
       '@unocss/preset-uno':
         specifier: ^0.58.3
         version: 0.58.3
@@ -266,13 +266,13 @@ importers:
         version: 0.58.3
       nuxt:
         specifier: ^3.9.3
-        version: 3.9.3(@types/node@20.11.5)(@upstash/redis@1.20.0)(typescript@5.3.3)(vite@5.0.11)(vue-tsc@1.8.27)
+        version: 3.9.3(@types/node@20.11.5)(@upstash/redis@1.28.2)(eslint@8.56.0)(typescript@5.3.3)(vite@5.0.12)(vue-tsc@1.8.27)
       nuxt-icon:
         specifier: ^0.6.8
-        version: 0.6.8(nuxt@3.9.3)(vite@5.0.11)(vue@3.4.15)
+        version: 0.6.8(nuxt@3.9.3)(vite@5.0.12)(vue@3.4.15)
       nuxt-prepare:
-        specifier: ^0.2.2
-        version: 0.2.2
+        specifier: ^1.0.0
+        version: 1.0.0
       nuxt-security:
         specifier: 1.0.1
         version: 1.0.1
@@ -305,7 +305,7 @@ importers:
         version: link:../../../packages/utils
       nitropack:
         specifier: ^2.8.1
-        version: 2.8.1(@upstash/redis@1.20.0)
+        version: 2.8.1(@upstash/redis@1.28.2)
       stripe:
         specifier: ^14.10.0
         version: 14.10.0
@@ -441,8 +441,8 @@ importers:
         specifier: ^15.2.0
         version: 15.2.0
       pnpm:
-        specifier: ^8.14.1
-        version: 8.14.1
+        specifier: ^8.14.3
+        version: 8.14.3
       rimraf:
         specifier: ^5.0.5
         version: 5.0.5
@@ -459,8 +459,8 @@ importers:
         specifier: ^2.0.0
         version: 2.0.0(typescript@5.3.3)
       vite:
-        specifier: ^5.0.11
-        version: 5.0.11(@types/node@20.11.5)
+        specifier: ^5.0.12
+        version: 5.0.12(@types/node@20.11.5)
       vitest:
         specifier: ^1.2.1
         version: 1.2.1(@types/node@20.11.5)
@@ -491,7 +491,6 @@ packages:
   /@aashutoshrathi/word-wrap@1.2.6:
     resolution: {integrity: sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /@alloc/quick-lru@5.2.0:
     resolution: {integrity: sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==}
@@ -502,7 +501,7 @@ packages:
     engines: {node: '>=6.0.0'}
     dependencies:
       '@jridgewell/gen-mapping': 0.3.3
-      '@jridgewell/trace-mapping': 0.3.21
+      '@jridgewell/trace-mapping': 0.3.22
 
   /@antfu/eslint-config@2.6.3(@vue/compiler-sfc@3.4.15)(eslint@8.56.0)(typescript@5.3.3)(vitest@1.2.1):
     resolution: {integrity: sha512-sfkamrOatMwMZkp14mBerHKIw8FY0SD1iCb5UZ6Y5hgb+FeDpNQPlVA0i2PN95TQ8NSYyPC1QnoM+UA5NSl0Kg==}
@@ -605,19 +604,11 @@ packages:
   /@antfu/utils@0.7.7:
     resolution: {integrity: sha512-gFPqTG7otEJ8uP6wrhDv6mqwGWYZKNvAcCq6u9hOj0c+IKCEsY4L1oC9trPq2SaWIzAfHvqfBDxF591JkMf+kg==}
 
-  /@asamuzakjp/dom-selector@2.0.2:
-    resolution: {integrity: sha512-x1KXOatwofR6ZAYzXRBL5wrdV0vwNxlTCK9NCuLqAzQYARqGcvFwiJA6A1ERuh+dgeA4Dxm3JBYictIes+SqUQ==}
-    dependencies:
-      bidi-js: 1.0.3
-      css-tree: 2.3.1
-      is-potential-custom-element-name: 1.0.1
-    dev: false
-
   /@aws-crypto/crc32@3.0.0:
     resolution: {integrity: sha512-IzSgsrxUcsrejQbPVilIKy16kAT52EwB6zSaI+M3xxIhKh5+aldEyvI+z6erM7TCLB2BJsFrtHjp6/4/sr+3dA==}
     dependencies:
       '@aws-crypto/util': 3.0.0
-      '@aws-sdk/types': 3.495.0
+      '@aws-sdk/types': 3.496.0
       tslib: 1.14.1
     dev: false
 
@@ -625,7 +616,7 @@ packages:
     resolution: {integrity: sha512-ENNPPManmnVJ4BTXlOjAgD7URidbAznURqD0KvfREyc4o20DPYdEldU1f5cQ7Jbj0CJJSPaMIk/9ZshdB3210w==}
     dependencies:
       '@aws-crypto/util': 3.0.0
-      '@aws-sdk/types': 3.495.0
+      '@aws-sdk/types': 3.496.0
       tslib: 1.14.1
     dev: false
 
@@ -641,7 +632,7 @@ packages:
       '@aws-crypto/ie11-detection': 3.0.0
       '@aws-crypto/supports-web-crypto': 3.0.0
       '@aws-crypto/util': 3.0.0
-      '@aws-sdk/types': 3.495.0
+      '@aws-sdk/types': 3.496.0
       '@aws-sdk/util-locate-window': 3.495.0
       '@aws-sdk/util-utf8-browser': 3.259.0
       tslib: 1.14.1
@@ -654,7 +645,7 @@ packages:
       '@aws-crypto/sha256-js': 3.0.0
       '@aws-crypto/supports-web-crypto': 3.0.0
       '@aws-crypto/util': 3.0.0
-      '@aws-sdk/types': 3.495.0
+      '@aws-sdk/types': 3.496.0
       '@aws-sdk/util-locate-window': 3.495.0
       '@aws-sdk/util-utf8-browser': 3.259.0
       tslib: 1.14.1
@@ -664,7 +655,7 @@ packages:
     resolution: {integrity: sha512-PnNN7os0+yd1XvXAy23CFOmTbMaDxgxXtTKHybrJ39Y8kGzBATgBFibWJKH6BhytLI/Zyszs87xCOBNyBig6vQ==}
     dependencies:
       '@aws-crypto/util': 3.0.0
-      '@aws-sdk/types': 3.495.0
+      '@aws-sdk/types': 3.496.0
       tslib: 1.14.1
     dev: false
 
@@ -677,476 +668,476 @@ packages:
   /@aws-crypto/util@3.0.0:
     resolution: {integrity: sha512-2OJlpeJpCR48CC8r+uKVChzs9Iungj9wkZrl8Z041DWEWvyIHILYKCPNzJghKsivj+S3mLo6BVc7mBNzdxA46w==}
     dependencies:
-      '@aws-sdk/types': 3.495.0
+      '@aws-sdk/types': 3.496.0
       '@aws-sdk/util-utf8-browser': 3.259.0
       tslib: 1.14.1
     dev: false
 
-  /@aws-sdk/client-s3@3.495.0:
-    resolution: {integrity: sha512-Lr08ygmesFScyF7TK70uS4O9YLTaKHH4O/FGNKw17DpI5XyyS/Aje9yVqn6Yi3OUrsKChxGK1n0gc6ipyUGsjQ==}
+  /@aws-sdk/client-s3@3.496.0:
+    resolution: {integrity: sha512-Q16iIP8SmM/7uWHbTCRnvXgM+RxgEDHQmkKL1bvdPLhfu4q1+RwWwJ/WS+1amwQtwvWc8Z51W4XEsokJmqOYUA==}
     engines: {node: '>=14.0.0'}
     dependencies:
       '@aws-crypto/sha1-browser': 3.0.0
       '@aws-crypto/sha256-browser': 3.0.0
       '@aws-crypto/sha256-js': 3.0.0
-      '@aws-sdk/client-sts': 3.495.0
-      '@aws-sdk/core': 3.495.0
-      '@aws-sdk/credential-provider-node': 3.495.0
-      '@aws-sdk/middleware-bucket-endpoint': 3.495.0
-      '@aws-sdk/middleware-expect-continue': 3.495.0
-      '@aws-sdk/middleware-flexible-checksums': 3.495.0
-      '@aws-sdk/middleware-host-header': 3.495.0
-      '@aws-sdk/middleware-location-constraint': 3.495.0
-      '@aws-sdk/middleware-logger': 3.495.0
-      '@aws-sdk/middleware-recursion-detection': 3.495.0
-      '@aws-sdk/middleware-sdk-s3': 3.495.0
-      '@aws-sdk/middleware-signing': 3.495.0
-      '@aws-sdk/middleware-ssec': 3.495.0
-      '@aws-sdk/middleware-user-agent': 3.495.0
-      '@aws-sdk/region-config-resolver': 3.495.0
-      '@aws-sdk/signature-v4-multi-region': 3.495.0
-      '@aws-sdk/types': 3.495.0
-      '@aws-sdk/util-endpoints': 3.495.0
-      '@aws-sdk/util-user-agent-browser': 3.495.0
-      '@aws-sdk/util-user-agent-node': 3.495.0
-      '@aws-sdk/xml-builder': 3.495.0
-      '@smithy/config-resolver': 2.1.0
-      '@smithy/core': 1.3.0
-      '@smithy/eventstream-serde-browser': 2.1.0
-      '@smithy/eventstream-serde-config-resolver': 2.1.0
-      '@smithy/eventstream-serde-node': 2.1.0
-      '@smithy/fetch-http-handler': 2.4.0
-      '@smithy/hash-blob-browser': 2.1.0
-      '@smithy/hash-node': 2.1.0
-      '@smithy/hash-stream-node': 2.1.0
-      '@smithy/invalid-dependency': 2.1.0
-      '@smithy/md5-js': 2.1.0
-      '@smithy/middleware-content-length': 2.1.0
-      '@smithy/middleware-endpoint': 2.4.0
-      '@smithy/middleware-retry': 2.1.0
-      '@smithy/middleware-serde': 2.1.0
-      '@smithy/middleware-stack': 2.1.0
-      '@smithy/node-config-provider': 2.2.0
-      '@smithy/node-http-handler': 2.3.0
-      '@smithy/protocol-http': 3.1.0
-      '@smithy/smithy-client': 2.3.0
-      '@smithy/types': 2.9.0
-      '@smithy/url-parser': 2.1.0
-      '@smithy/util-base64': 2.1.0
-      '@smithy/util-body-length-browser': 2.1.0
-      '@smithy/util-body-length-node': 2.2.0
-      '@smithy/util-defaults-mode-browser': 2.1.0
-      '@smithy/util-defaults-mode-node': 2.1.0
-      '@smithy/util-endpoints': 1.1.0
-      '@smithy/util-retry': 2.1.0
-      '@smithy/util-stream': 2.1.0
-      '@smithy/util-utf8': 2.1.0
-      '@smithy/util-waiter': 2.1.0
+      '@aws-sdk/client-sts': 3.496.0
+      '@aws-sdk/core': 3.496.0
+      '@aws-sdk/credential-provider-node': 3.496.0
+      '@aws-sdk/middleware-bucket-endpoint': 3.496.0
+      '@aws-sdk/middleware-expect-continue': 3.496.0
+      '@aws-sdk/middleware-flexible-checksums': 3.496.0
+      '@aws-sdk/middleware-host-header': 3.496.0
+      '@aws-sdk/middleware-location-constraint': 3.496.0
+      '@aws-sdk/middleware-logger': 3.496.0
+      '@aws-sdk/middleware-recursion-detection': 3.496.0
+      '@aws-sdk/middleware-sdk-s3': 3.496.0
+      '@aws-sdk/middleware-signing': 3.496.0
+      '@aws-sdk/middleware-ssec': 3.496.0
+      '@aws-sdk/middleware-user-agent': 3.496.0
+      '@aws-sdk/region-config-resolver': 3.496.0
+      '@aws-sdk/signature-v4-multi-region': 3.496.0
+      '@aws-sdk/types': 3.496.0
+      '@aws-sdk/util-endpoints': 3.496.0
+      '@aws-sdk/util-user-agent-browser': 3.496.0
+      '@aws-sdk/util-user-agent-node': 3.496.0
+      '@aws-sdk/xml-builder': 3.496.0
+      '@smithy/config-resolver': 2.1.1
+      '@smithy/core': 1.3.1
+      '@smithy/eventstream-serde-browser': 2.1.1
+      '@smithy/eventstream-serde-config-resolver': 2.1.1
+      '@smithy/eventstream-serde-node': 2.1.1
+      '@smithy/fetch-http-handler': 2.4.1
+      '@smithy/hash-blob-browser': 2.1.1
+      '@smithy/hash-node': 2.1.1
+      '@smithy/hash-stream-node': 2.1.1
+      '@smithy/invalid-dependency': 2.1.1
+      '@smithy/md5-js': 2.1.1
+      '@smithy/middleware-content-length': 2.1.1
+      '@smithy/middleware-endpoint': 2.4.1
+      '@smithy/middleware-retry': 2.1.1
+      '@smithy/middleware-serde': 2.1.1
+      '@smithy/middleware-stack': 2.1.1
+      '@smithy/node-config-provider': 2.2.1
+      '@smithy/node-http-handler': 2.3.1
+      '@smithy/protocol-http': 3.1.1
+      '@smithy/smithy-client': 2.3.1
+      '@smithy/types': 2.9.1
+      '@smithy/url-parser': 2.1.1
+      '@smithy/util-base64': 2.1.1
+      '@smithy/util-body-length-browser': 2.1.1
+      '@smithy/util-body-length-node': 2.2.1
+      '@smithy/util-defaults-mode-browser': 2.1.1
+      '@smithy/util-defaults-mode-node': 2.1.1
+      '@smithy/util-endpoints': 1.1.1
+      '@smithy/util-retry': 2.1.1
+      '@smithy/util-stream': 2.1.1
+      '@smithy/util-utf8': 2.1.1
+      '@smithy/util-waiter': 2.1.1
       fast-xml-parser: 4.2.5
       tslib: 2.6.2
     transitivePeerDependencies:
       - aws-crt
     dev: false
 
-  /@aws-sdk/client-sso@3.495.0:
-    resolution: {integrity: sha512-Uerh3aDe/JeQNjcyXKI+8VuKPOAB6mCUKlScD0AIca1Kdyk8PsQTq4rDzFCYAQsNS5/BuPN+Ak0NqwsJM0agYA==}
+  /@aws-sdk/client-sso@3.496.0:
+    resolution: {integrity: sha512-fuaMuxKg7CMUsP9l3kxYWCOxFsBjdA0xj5nlikaDm1661/gB4KkAiGqRY8LsQkpNXvXU8Nj+f7oCFADFyGYzyw==}
     engines: {node: '>=14.0.0'}
     dependencies:
       '@aws-crypto/sha256-browser': 3.0.0
       '@aws-crypto/sha256-js': 3.0.0
-      '@aws-sdk/core': 3.495.0
-      '@aws-sdk/middleware-host-header': 3.495.0
-      '@aws-sdk/middleware-logger': 3.495.0
-      '@aws-sdk/middleware-recursion-detection': 3.495.0
-      '@aws-sdk/middleware-user-agent': 3.495.0
-      '@aws-sdk/region-config-resolver': 3.495.0
-      '@aws-sdk/types': 3.495.0
-      '@aws-sdk/util-endpoints': 3.495.0
-      '@aws-sdk/util-user-agent-browser': 3.495.0
-      '@aws-sdk/util-user-agent-node': 3.495.0
-      '@smithy/config-resolver': 2.1.0
-      '@smithy/core': 1.3.0
-      '@smithy/fetch-http-handler': 2.4.0
-      '@smithy/hash-node': 2.1.0
-      '@smithy/invalid-dependency': 2.1.0
-      '@smithy/middleware-content-length': 2.1.0
-      '@smithy/middleware-endpoint': 2.4.0
-      '@smithy/middleware-retry': 2.1.0
-      '@smithy/middleware-serde': 2.1.0
-      '@smithy/middleware-stack': 2.1.0
-      '@smithy/node-config-provider': 2.2.0
-      '@smithy/node-http-handler': 2.3.0
-      '@smithy/protocol-http': 3.1.0
-      '@smithy/smithy-client': 2.3.0
-      '@smithy/types': 2.9.0
-      '@smithy/url-parser': 2.1.0
-      '@smithy/util-base64': 2.1.0
-      '@smithy/util-body-length-browser': 2.1.0
-      '@smithy/util-body-length-node': 2.2.0
-      '@smithy/util-defaults-mode-browser': 2.1.0
-      '@smithy/util-defaults-mode-node': 2.1.0
-      '@smithy/util-endpoints': 1.1.0
-      '@smithy/util-retry': 2.1.0
-      '@smithy/util-utf8': 2.1.0
+      '@aws-sdk/core': 3.496.0
+      '@aws-sdk/middleware-host-header': 3.496.0
+      '@aws-sdk/middleware-logger': 3.496.0
+      '@aws-sdk/middleware-recursion-detection': 3.496.0
+      '@aws-sdk/middleware-user-agent': 3.496.0
+      '@aws-sdk/region-config-resolver': 3.496.0
+      '@aws-sdk/types': 3.496.0
+      '@aws-sdk/util-endpoints': 3.496.0
+      '@aws-sdk/util-user-agent-browser': 3.496.0
+      '@aws-sdk/util-user-agent-node': 3.496.0
+      '@smithy/config-resolver': 2.1.1
+      '@smithy/core': 1.3.1
+      '@smithy/fetch-http-handler': 2.4.1
+      '@smithy/hash-node': 2.1.1
+      '@smithy/invalid-dependency': 2.1.1
+      '@smithy/middleware-content-length': 2.1.1
+      '@smithy/middleware-endpoint': 2.4.1
+      '@smithy/middleware-retry': 2.1.1
+      '@smithy/middleware-serde': 2.1.1
+      '@smithy/middleware-stack': 2.1.1
+      '@smithy/node-config-provider': 2.2.1
+      '@smithy/node-http-handler': 2.3.1
+      '@smithy/protocol-http': 3.1.1
+      '@smithy/smithy-client': 2.3.1
+      '@smithy/types': 2.9.1
+      '@smithy/url-parser': 2.1.1
+      '@smithy/util-base64': 2.1.1
+      '@smithy/util-body-length-browser': 2.1.1
+      '@smithy/util-body-length-node': 2.2.1
+      '@smithy/util-defaults-mode-browser': 2.1.1
+      '@smithy/util-defaults-mode-node': 2.1.1
+      '@smithy/util-endpoints': 1.1.1
+      '@smithy/util-retry': 2.1.1
+      '@smithy/util-utf8': 2.1.1
       tslib: 2.6.2
     transitivePeerDependencies:
       - aws-crt
     dev: false
 
-  /@aws-sdk/client-sts@3.495.0:
-    resolution: {integrity: sha512-lXQIx7D1MQ5+F8PaSYV7UiSxgP9M5ba/YFx1rcxi5l1GlbAWuHWhrk15qKe9d6vLxa2eTjJFiVzbO7pJqRBEWw==}
+  /@aws-sdk/client-sts@3.496.0:
+    resolution: {integrity: sha512-3pSdqgegdwbK3CT1WvGHhA+Bf91R9cr8G1Ynp+iU2wZvy8ueJfMUk0NYfjo3EEv0YhSbMLKuduzZfvQHFHXYhw==}
     engines: {node: '>=14.0.0'}
     dependencies:
       '@aws-crypto/sha256-browser': 3.0.0
       '@aws-crypto/sha256-js': 3.0.0
-      '@aws-sdk/core': 3.495.0
-      '@aws-sdk/credential-provider-node': 3.495.0
-      '@aws-sdk/middleware-host-header': 3.495.0
-      '@aws-sdk/middleware-logger': 3.495.0
-      '@aws-sdk/middleware-recursion-detection': 3.495.0
-      '@aws-sdk/middleware-user-agent': 3.495.0
-      '@aws-sdk/region-config-resolver': 3.495.0
-      '@aws-sdk/types': 3.495.0
-      '@aws-sdk/util-endpoints': 3.495.0
-      '@aws-sdk/util-user-agent-browser': 3.495.0
-      '@aws-sdk/util-user-agent-node': 3.495.0
-      '@smithy/config-resolver': 2.1.0
-      '@smithy/core': 1.3.0
-      '@smithy/fetch-http-handler': 2.4.0
-      '@smithy/hash-node': 2.1.0
-      '@smithy/invalid-dependency': 2.1.0
-      '@smithy/middleware-content-length': 2.1.0
-      '@smithy/middleware-endpoint': 2.4.0
-      '@smithy/middleware-retry': 2.1.0
-      '@smithy/middleware-serde': 2.1.0
-      '@smithy/middleware-stack': 2.1.0
-      '@smithy/node-config-provider': 2.2.0
-      '@smithy/node-http-handler': 2.3.0
-      '@smithy/protocol-http': 3.1.0
-      '@smithy/smithy-client': 2.3.0
-      '@smithy/types': 2.9.0
-      '@smithy/url-parser': 2.1.0
-      '@smithy/util-base64': 2.1.0
-      '@smithy/util-body-length-browser': 2.1.0
-      '@smithy/util-body-length-node': 2.2.0
-      '@smithy/util-defaults-mode-browser': 2.1.0
-      '@smithy/util-defaults-mode-node': 2.1.0
-      '@smithy/util-endpoints': 1.1.0
-      '@smithy/util-middleware': 2.1.0
-      '@smithy/util-retry': 2.1.0
-      '@smithy/util-utf8': 2.1.0
+      '@aws-sdk/core': 3.496.0
+      '@aws-sdk/credential-provider-node': 3.496.0
+      '@aws-sdk/middleware-host-header': 3.496.0
+      '@aws-sdk/middleware-logger': 3.496.0
+      '@aws-sdk/middleware-recursion-detection': 3.496.0
+      '@aws-sdk/middleware-user-agent': 3.496.0
+      '@aws-sdk/region-config-resolver': 3.496.0
+      '@aws-sdk/types': 3.496.0
+      '@aws-sdk/util-endpoints': 3.496.0
+      '@aws-sdk/util-user-agent-browser': 3.496.0
+      '@aws-sdk/util-user-agent-node': 3.496.0
+      '@smithy/config-resolver': 2.1.1
+      '@smithy/core': 1.3.1
+      '@smithy/fetch-http-handler': 2.4.1
+      '@smithy/hash-node': 2.1.1
+      '@smithy/invalid-dependency': 2.1.1
+      '@smithy/middleware-content-length': 2.1.1
+      '@smithy/middleware-endpoint': 2.4.1
+      '@smithy/middleware-retry': 2.1.1
+      '@smithy/middleware-serde': 2.1.1
+      '@smithy/middleware-stack': 2.1.1
+      '@smithy/node-config-provider': 2.2.1
+      '@smithy/node-http-handler': 2.3.1
+      '@smithy/protocol-http': 3.1.1
+      '@smithy/smithy-client': 2.3.1
+      '@smithy/types': 2.9.1
+      '@smithy/url-parser': 2.1.1
+      '@smithy/util-base64': 2.1.1
+      '@smithy/util-body-length-browser': 2.1.1
+      '@smithy/util-body-length-node': 2.2.1
+      '@smithy/util-defaults-mode-browser': 2.1.1
+      '@smithy/util-defaults-mode-node': 2.1.1
+      '@smithy/util-endpoints': 1.1.1
+      '@smithy/util-middleware': 2.1.1
+      '@smithy/util-retry': 2.1.1
+      '@smithy/util-utf8': 2.1.1
       fast-xml-parser: 4.2.5
       tslib: 2.6.2
     transitivePeerDependencies:
       - aws-crt
     dev: false
 
-  /@aws-sdk/core@3.495.0:
-    resolution: {integrity: sha512-TI/jq1cSUR+r1prJ9xXtxMO0u2/jXrWjf3Z2ekForsCObPtR9qkJCYyezargupoSJqZA60KUpOhxrKW/dFJ1rw==}
+  /@aws-sdk/core@3.496.0:
+    resolution: {integrity: sha512-yT+ug7Cw/3eJi7x2es0+46x12+cIJm5Xv+GPWsrTFD1TKgqO/VPEgfDtHFagDNbFmjNQA65Ygc/kEdIX9ICX/A==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/core': 1.3.0
-      '@smithy/protocol-http': 3.1.0
-      '@smithy/signature-v4': 2.1.0
-      '@smithy/smithy-client': 2.3.0
-      '@smithy/types': 2.9.0
+      '@smithy/core': 1.3.1
+      '@smithy/protocol-http': 3.1.1
+      '@smithy/signature-v4': 2.1.1
+      '@smithy/smithy-client': 2.3.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/credential-provider-env@3.495.0:
-    resolution: {integrity: sha512-2CKlHiQRXyVA7t3VGXo39a/UwRrZs/VG0jYZFu60dK9afxesRkA4XOJto765VenT/eR3LkeVW+RBzOISHUFg0Q==}
+  /@aws-sdk/credential-provider-env@3.496.0:
+    resolution: {integrity: sha512-lukQMJ8SWWP5RqkRNOHi/H+WMhRvSWa3Fc5Jf/VP6xHiPLfF1XafcvthtV91e0VwPCiseI+HqChrcGq8pvnxHw==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@aws-sdk/types': 3.495.0
-      '@smithy/property-provider': 2.1.0
-      '@smithy/types': 2.9.0
+      '@aws-sdk/types': 3.496.0
+      '@smithy/property-provider': 2.1.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/credential-provider-ini@3.495.0:
-    resolution: {integrity: sha512-DGRfND+FIacuQQNozMa8fS4yUrWZgkB6CEH4ghiqUvtE7h2sGMMVEerlaCGgTnQlpWWvDS656orzwEO3vuMTVw==}
+  /@aws-sdk/credential-provider-ini@3.496.0:
+    resolution: {integrity: sha512-2nD1jp1sIwcQaWK1y/9ruQOkW16RUxZpzgjbW/gnK3iiUXwx+/FNQWxshud+GTSx3Q4x6eIhqsbjtP4VVPPuUA==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@aws-sdk/credential-provider-env': 3.495.0
-      '@aws-sdk/credential-provider-process': 3.495.0
-      '@aws-sdk/credential-provider-sso': 3.495.0
-      '@aws-sdk/credential-provider-web-identity': 3.495.0
-      '@aws-sdk/types': 3.495.0
-      '@smithy/credential-provider-imds': 2.2.0
-      '@smithy/property-provider': 2.1.0
-      '@smithy/shared-ini-file-loader': 2.3.0
-      '@smithy/types': 2.9.0
+      '@aws-sdk/credential-provider-env': 3.496.0
+      '@aws-sdk/credential-provider-process': 3.496.0
+      '@aws-sdk/credential-provider-sso': 3.496.0
+      '@aws-sdk/credential-provider-web-identity': 3.496.0
+      '@aws-sdk/types': 3.496.0
+      '@smithy/credential-provider-imds': 2.2.1
+      '@smithy/property-provider': 2.1.1
+      '@smithy/shared-ini-file-loader': 2.3.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     transitivePeerDependencies:
       - aws-crt
     dev: false
 
-  /@aws-sdk/credential-provider-node@3.495.0:
-    resolution: {integrity: sha512-OH3lV7erPLNxkZQ+QBEgX353mseelBaHutyJNFKdgCYMZUhENu2DNTvkasGtwA24TqG0sRiuO2yNhpqP8IF+LA==}
+  /@aws-sdk/credential-provider-node@3.496.0:
+    resolution: {integrity: sha512-IVF9RvLePfRa5S5/eBIRChJCWOzQkGwM8P/L79Gl84u/cH2oSG4NtUI/YTDlrtmnYn7YsGhINSV0WnzfF2twfQ==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@aws-sdk/credential-provider-env': 3.495.0
-      '@aws-sdk/credential-provider-ini': 3.495.0
-      '@aws-sdk/credential-provider-process': 3.495.0
-      '@aws-sdk/credential-provider-sso': 3.495.0
-      '@aws-sdk/credential-provider-web-identity': 3.495.0
-      '@aws-sdk/types': 3.495.0
-      '@smithy/credential-provider-imds': 2.2.0
-      '@smithy/property-provider': 2.1.0
-      '@smithy/shared-ini-file-loader': 2.3.0
-      '@smithy/types': 2.9.0
+      '@aws-sdk/credential-provider-env': 3.496.0
+      '@aws-sdk/credential-provider-ini': 3.496.0
+      '@aws-sdk/credential-provider-process': 3.496.0
+      '@aws-sdk/credential-provider-sso': 3.496.0
+      '@aws-sdk/credential-provider-web-identity': 3.496.0
+      '@aws-sdk/types': 3.496.0
+      '@smithy/credential-provider-imds': 2.2.1
+      '@smithy/property-provider': 2.1.1
+      '@smithy/shared-ini-file-loader': 2.3.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     transitivePeerDependencies:
       - aws-crt
     dev: false
 
-  /@aws-sdk/credential-provider-process@3.495.0:
-    resolution: {integrity: sha512-AouHJtg5qXeqzlY5plqbBkQPea1Kd3/tz9wfN+d5gbTUsDBlV7R6IinzhJWWgniS0jsaEOronlCXLIEOWUzTsw==}
+  /@aws-sdk/credential-provider-process@3.496.0:
+    resolution: {integrity: sha512-/YZscCTGOKVmGr916Th4XF8Sz6JDtZ/n2loHG9exok9iy/qIbACsTRNLP9zexPxhPoue/oZqecY5xbVljfY34A==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@aws-sdk/types': 3.495.0
-      '@smithy/property-provider': 2.1.0
-      '@smithy/shared-ini-file-loader': 2.3.0
-      '@smithy/types': 2.9.0
+      '@aws-sdk/types': 3.496.0
+      '@smithy/property-provider': 2.1.1
+      '@smithy/shared-ini-file-loader': 2.3.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/credential-provider-sso@3.495.0:
-    resolution: {integrity: sha512-brbgLtws+jmBPm6FrQ0CT2mHCgFKdopwxJj/4+j//OH0aAgzBH5gOztoDu1R556KU9K8Co220J79gJWV3s40zQ==}
+  /@aws-sdk/credential-provider-sso@3.496.0:
+    resolution: {integrity: sha512-eP7GxpT2QYubSDG7uk1GJW4eNymZCq65IxDyEFCXOP/kfqkxriCY+iVEFG6/Mo3LxvgrgHXU4jxrCAXMAWN43g==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@aws-sdk/client-sso': 3.495.0
-      '@aws-sdk/token-providers': 3.495.0
-      '@aws-sdk/types': 3.495.0
-      '@smithy/property-provider': 2.1.0
-      '@smithy/shared-ini-file-loader': 2.3.0
-      '@smithy/types': 2.9.0
+      '@aws-sdk/client-sso': 3.496.0
+      '@aws-sdk/token-providers': 3.496.0
+      '@aws-sdk/types': 3.496.0
+      '@smithy/property-provider': 2.1.1
+      '@smithy/shared-ini-file-loader': 2.3.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     transitivePeerDependencies:
       - aws-crt
     dev: false
 
-  /@aws-sdk/credential-provider-web-identity@3.495.0:
-    resolution: {integrity: sha512-w4S01mdQZ8kQn4J6CM2Fgral9xtNBh8h5i4DWSOwFxfiokott59zDoFMWJRUdUHzXsnAGULC8+wJ4VeiZZBq1Q==}
+  /@aws-sdk/credential-provider-web-identity@3.496.0:
+    resolution: {integrity: sha512-IbP+qLlvJSpNPj+zW6TtFuLRTK5Tf0hW+2pom4vFyi5YSH4pn8UOC136UdewX8vhXGS9BJQ5zBDMasIyl5VeGQ==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@aws-sdk/types': 3.495.0
-      '@smithy/property-provider': 2.1.0
-      '@smithy/types': 2.9.0
+      '@aws-sdk/types': 3.496.0
+      '@smithy/property-provider': 2.1.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/middleware-bucket-endpoint@3.495.0:
-    resolution: {integrity: sha512-KJ9hvVFsDIavaUWwT+nDcbyHNNYx0GQ9W0HQ136VR0Uuy3srHrIU2QivmhUi2n8SaDptm4t2K4osSKqgfxH3cQ==}
+  /@aws-sdk/middleware-bucket-endpoint@3.496.0:
+    resolution: {integrity: sha512-B+ilBMSs3+LJuo2bl2KB8GFdu+8PPVtYEWtwhNkmnaU8iMisgMBp5uuM8sUDvJX7I4iSF0WbgnhguX4cJqfAew==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@aws-sdk/types': 3.495.0
+      '@aws-sdk/types': 3.496.0
       '@aws-sdk/util-arn-parser': 3.495.0
-      '@smithy/node-config-provider': 2.2.0
-      '@smithy/protocol-http': 3.1.0
-      '@smithy/types': 2.9.0
-      '@smithy/util-config-provider': 2.2.0
+      '@smithy/node-config-provider': 2.2.1
+      '@smithy/protocol-http': 3.1.1
+      '@smithy/types': 2.9.1
+      '@smithy/util-config-provider': 2.2.1
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/middleware-expect-continue@3.495.0:
-    resolution: {integrity: sha512-WbSZ2AquYb6Wfdr3CZRO37dOSFhE2pnR7GuST+kWEYL+sLnNN3Ms85Bf2YUHNqnTNwD/R7KWw6I5CkyDRxLnkw==}
+  /@aws-sdk/middleware-expect-continue@3.496.0:
+    resolution: {integrity: sha512-+exo5DVc+BeDus2iI6Fz1thefHGDXxUhHZ+4VHQ6HkStMy3Y22HugyEGHSQZmtRL86Hjr7dFbEWFsC47a2ItGA==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@aws-sdk/types': 3.495.0
-      '@smithy/protocol-http': 3.1.0
-      '@smithy/types': 2.9.0
+      '@aws-sdk/types': 3.496.0
+      '@smithy/protocol-http': 3.1.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/middleware-flexible-checksums@3.495.0:
-    resolution: {integrity: sha512-9pgwS4oLi0DhVo8V2dk6JB5HH5FOyLmnwBABWXDy3ASR6L7Rs+y/y3+jiS/wl7nUNOEFXbBfvdaQ1bI1t6+MDA==}
+  /@aws-sdk/middleware-flexible-checksums@3.496.0:
+    resolution: {integrity: sha512-yQIWfjEMvgsAJ7ku224vXDjXPD+f9zfKZFialJva8VUlEr7hQp4CQ0rxV3YThSaixKEDDs5k6kOjWAd2BPGr2A==}
     engines: {node: '>=14.0.0'}
     dependencies:
       '@aws-crypto/crc32': 3.0.0
       '@aws-crypto/crc32c': 3.0.0
-      '@aws-sdk/types': 3.495.0
-      '@smithy/is-array-buffer': 2.1.0
-      '@smithy/protocol-http': 3.1.0
-      '@smithy/types': 2.9.0
-      '@smithy/util-utf8': 2.1.0
+      '@aws-sdk/types': 3.496.0
+      '@smithy/is-array-buffer': 2.1.1
+      '@smithy/protocol-http': 3.1.1
+      '@smithy/types': 2.9.1
+      '@smithy/util-utf8': 2.1.1
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/middleware-host-header@3.495.0:
-    resolution: {integrity: sha512-qqE6mVxbyJwn59NQMvtYyaZT3GEZnmsvBUry3sDtU7Be1g9w5OKhY4CnAAQyXZI288iQUtyxxDh+hnSLy6RFjA==}
+  /@aws-sdk/middleware-host-header@3.496.0:
+    resolution: {integrity: sha512-jUdPpSJeqCYXf6hSjfwsfHway7peIV8Vz51w/BN91bF4vB/bYwAC5o9/iJiK/EoByp5asxA8fg9wFOyGjzdbLg==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@aws-sdk/types': 3.495.0
-      '@smithy/protocol-http': 3.1.0
-      '@smithy/types': 2.9.0
+      '@aws-sdk/types': 3.496.0
+      '@smithy/protocol-http': 3.1.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/middleware-location-constraint@3.495.0:
-    resolution: {integrity: sha512-XFgoK+Pr4olMo6VqUnffwi7XvnoJv7Lm8qlZ5LiijcQGl7ZJZ9FOwYzrbGX8CuTXwfydOKrxyPNywUsS5LDeDw==}
+  /@aws-sdk/middleware-location-constraint@3.496.0:
+    resolution: {integrity: sha512-i4ocJ2Zs86OtPREbB18InFukhqg2qtBxb5gywv79IHDPVmpOYE4m/3v3yGUrkjfF2GTlUL0k5FskNNqw41yfng==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@aws-sdk/types': 3.495.0
-      '@smithy/types': 2.9.0
+      '@aws-sdk/types': 3.496.0
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/middleware-logger@3.495.0:
-    resolution: {integrity: sha512-sgmr9fpCSg3rFvMnvfKeN7dhY+AmUpZPPWyc+s1kgQONeLUUxQkbdqR2/V+tz2ZPxUBD2dToTG/JhtMcIKmt4Q==}
+  /@aws-sdk/middleware-logger@3.496.0:
+    resolution: {integrity: sha512-EwMVSY6iBMeGbVnvwdaFl/ClMS/YWtxCAo+bcEtgk8ltRuo7qgbJem8Km/fvWC1vdWvIbe4ArdJ8iGzq62ffAw==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@aws-sdk/types': 3.495.0
-      '@smithy/types': 2.9.0
+      '@aws-sdk/types': 3.496.0
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/middleware-recursion-detection@3.495.0:
-    resolution: {integrity: sha512-jhuOcLsMrHengJy/oz6Waumwx/vtSMKnEbROR7qZ7CaTDHRUbriPYXGen7CHCs/6aWN0UeI3JBAqwlnSW5tpIg==}
+  /@aws-sdk/middleware-recursion-detection@3.496.0:
+    resolution: {integrity: sha512-+IuOcFsfqg2WAnaEzH6KhVbicqCxtOq9w3DH2jwTpddRlCx2Kqf6wCzg8luhHRGyjBZdsbIS+OXwyMevoppawA==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@aws-sdk/types': 3.495.0
-      '@smithy/protocol-http': 3.1.0
-      '@smithy/types': 2.9.0
+      '@aws-sdk/types': 3.496.0
+      '@smithy/protocol-http': 3.1.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/middleware-sdk-s3@3.495.0:
-    resolution: {integrity: sha512-H6DPpRKJZaaElLo60nyZNGcZHrCVMq8tErEQPD/g5v4ZrAjLJlxJ1N/hVhw5IP3Q6ZXVNB2PhNi6pp9Lzd1kqQ==}
+  /@aws-sdk/middleware-sdk-s3@3.496.0:
+    resolution: {integrity: sha512-OKrTPzubisQCQzPuF4G7jmbYt71o6W7oefmW9zm1MpGokRSJeC9zv4aT1gkMglpXEHgvL0S5fUVGi0AtF/F8Kw==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@aws-sdk/types': 3.495.0
+      '@aws-sdk/types': 3.496.0
       '@aws-sdk/util-arn-parser': 3.495.0
-      '@smithy/node-config-provider': 2.2.0
-      '@smithy/protocol-http': 3.1.0
-      '@smithy/signature-v4': 2.1.0
-      '@smithy/smithy-client': 2.3.0
-      '@smithy/types': 2.9.0
-      '@smithy/util-config-provider': 2.2.0
+      '@smithy/node-config-provider': 2.2.1
+      '@smithy/protocol-http': 3.1.1
+      '@smithy/signature-v4': 2.1.1
+      '@smithy/smithy-client': 2.3.1
+      '@smithy/types': 2.9.1
+      '@smithy/util-config-provider': 2.2.1
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/middleware-signing@3.495.0:
-    resolution: {integrity: sha512-QZuWRo6JQ7UKeHzqqnP/qmUXirVKXSMXSEFtpOHio/JkQPASVlD1TNs5L6RL7dKrnqLrg/jpTiw4b0UdAU8kOw==}
+  /@aws-sdk/middleware-signing@3.496.0:
+    resolution: {integrity: sha512-Oq73Brs4IConvWnRlh8jM1V7LHoTw9SVQklu/QW2FPlNrB3B8fuTdWHHYIWv7ybw1bykXoCY99v865Mmq/Or/g==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@aws-sdk/types': 3.495.0
-      '@smithy/property-provider': 2.1.0
-      '@smithy/protocol-http': 3.1.0
-      '@smithy/signature-v4': 2.1.0
-      '@smithy/types': 2.9.0
-      '@smithy/util-middleware': 2.1.0
+      '@aws-sdk/types': 3.496.0
+      '@smithy/property-provider': 2.1.1
+      '@smithy/protocol-http': 3.1.1
+      '@smithy/signature-v4': 2.1.1
+      '@smithy/types': 2.9.1
+      '@smithy/util-middleware': 2.1.1
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/middleware-ssec@3.495.0:
-    resolution: {integrity: sha512-obXxHpCY8NPFgCkiqANLgTa0T1bAlEJCgXVsmCWasKLW1rrMrtVuJBNyOtk0NPx2XCJodsKJc+/9Mz8ByEOd5A==}
+  /@aws-sdk/middleware-ssec@3.496.0:
+    resolution: {integrity: sha512-6RUFEgGqKGq8N8W9tsctS8KRlYnmD/yiExb/LvblCJqV1DWoD0psRFWNz8TQZtujHklG5dHjuq+aN/qicjBNdw==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@aws-sdk/types': 3.495.0
-      '@smithy/types': 2.9.0
+      '@aws-sdk/types': 3.496.0
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/middleware-user-agent@3.495.0:
-    resolution: {integrity: sha512-n+lC43Z7+LyAF7b63bR+e5pBmBqPaqh4gupEmrORc4wKsX7U4OncDPiVn5jPD7ZC3IZbLeTuDsjQOK8Ev+Hraw==}
+  /@aws-sdk/middleware-user-agent@3.496.0:
+    resolution: {integrity: sha512-+iMtRxFk0GmFWNUF4ilxylOQd9PZdR4ZC9jkcPIh1PZlvKtpCyFywKlk5RRZKklSoJ/CttcqwhMvOXTNbWm/0w==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@aws-sdk/types': 3.495.0
-      '@aws-sdk/util-endpoints': 3.495.0
-      '@smithy/protocol-http': 3.1.0
-      '@smithy/types': 2.9.0
+      '@aws-sdk/types': 3.496.0
+      '@aws-sdk/util-endpoints': 3.496.0
+      '@smithy/protocol-http': 3.1.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/region-config-resolver@3.495.0:
-    resolution: {integrity: sha512-ZgixNb+8dWUvc42Uso2fh38U7W7wW4OESUmQIFQzYW58B1ylZ4xuq/mo0xSY5b5j6u/+pJadvlIpx/QYBafVHg==}
+  /@aws-sdk/region-config-resolver@3.496.0:
+    resolution: {integrity: sha512-URrNVOPHPgEDm6QFu6lDC2cUFs+Jx23mA3jEwCvoKlXiEY/ZoWjH8wlX3OMUlLrF1qoUTuD03jjrJzF6zoCgug==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@aws-sdk/types': 3.495.0
-      '@smithy/node-config-provider': 2.2.0
-      '@smithy/types': 2.9.0
-      '@smithy/util-config-provider': 2.2.0
-      '@smithy/util-middleware': 2.1.0
+      '@aws-sdk/types': 3.496.0
+      '@smithy/node-config-provider': 2.2.1
+      '@smithy/types': 2.9.1
+      '@smithy/util-config-provider': 2.2.1
+      '@smithy/util-middleware': 2.1.1
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/s3-request-presigner@3.495.0:
-    resolution: {integrity: sha512-k/m4DhDiNRbp6nz8Mf+OMnL8p9tHdUVsekMpwiBg9VuunhwHI9tw+kBrvN14C1iMpw6VEUUbYNGeoqT9hdd/Zg==}
+  /@aws-sdk/s3-request-presigner@3.496.0:
+    resolution: {integrity: sha512-l4FMNKYjEDRwjry5zG0TAmfKY/COh/ZoGiUGfTUXaL92NzNqv8NpREHVvL7Rp6YeGzF1/j6/1LeVzDct94lc/Q==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@aws-sdk/signature-v4-multi-region': 3.495.0
-      '@aws-sdk/types': 3.495.0
-      '@aws-sdk/util-format-url': 3.495.0
-      '@smithy/middleware-endpoint': 2.4.0
-      '@smithy/protocol-http': 3.1.0
-      '@smithy/smithy-client': 2.3.0
-      '@smithy/types': 2.9.0
+      '@aws-sdk/signature-v4-multi-region': 3.496.0
+      '@aws-sdk/types': 3.496.0
+      '@aws-sdk/util-format-url': 3.496.0
+      '@smithy/middleware-endpoint': 2.4.1
+      '@smithy/protocol-http': 3.1.1
+      '@smithy/smithy-client': 2.3.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/signature-v4-multi-region@3.495.0:
-    resolution: {integrity: sha512-+U9Gpdafo8MYp98eRTx5flIazRdHWWv3UJVSteOaJRA1yErdM0IlwJRZAF1Q1E7sqzDP6ed4OkzcMLkpVG/clA==}
+  /@aws-sdk/signature-v4-multi-region@3.496.0:
+    resolution: {integrity: sha512-zi3cL8+dRVSvC0PA6votwEHF4l9uxOyQTiRfgpFgzJ9iiPbsrtWCalGCwN0UyzmeDv7eViU6FK1YTHH/OgDJ4A==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@aws-sdk/middleware-sdk-s3': 3.495.0
-      '@aws-sdk/types': 3.495.0
-      '@smithy/protocol-http': 3.1.0
-      '@smithy/signature-v4': 2.1.0
-      '@smithy/types': 2.9.0
+      '@aws-sdk/middleware-sdk-s3': 3.496.0
+      '@aws-sdk/types': 3.496.0
+      '@smithy/protocol-http': 3.1.1
+      '@smithy/signature-v4': 2.1.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/token-providers@3.495.0:
-    resolution: {integrity: sha512-1JSEx82FMKNNtPoV5NRpFxi0XHgfvonCKb4+2lR/k4nljqeysZPnOaIW/7C1eAwhoJ6buEIVxoHscemBtdKo+A==}
+  /@aws-sdk/token-providers@3.496.0:
+    resolution: {integrity: sha512-fyi8RcObEa1jNETJdc2H6q9VHrrdKCj/b6+fbLvymb7mUVRd0aWUn+24SNUImnSOnrwYnwaMfyyEC388X4MbFQ==}
     engines: {node: '>=14.0.0'}
     dependencies:
       '@aws-crypto/sha256-browser': 3.0.0
       '@aws-crypto/sha256-js': 3.0.0
-      '@aws-sdk/middleware-host-header': 3.495.0
-      '@aws-sdk/middleware-logger': 3.495.0
-      '@aws-sdk/middleware-recursion-detection': 3.495.0
-      '@aws-sdk/middleware-user-agent': 3.495.0
-      '@aws-sdk/region-config-resolver': 3.495.0
-      '@aws-sdk/types': 3.495.0
-      '@aws-sdk/util-endpoints': 3.495.0
-      '@aws-sdk/util-user-agent-browser': 3.495.0
-      '@aws-sdk/util-user-agent-node': 3.495.0
-      '@smithy/config-resolver': 2.1.0
-      '@smithy/fetch-http-handler': 2.4.0
-      '@smithy/hash-node': 2.1.0
-      '@smithy/invalid-dependency': 2.1.0
-      '@smithy/middleware-content-length': 2.1.0
-      '@smithy/middleware-endpoint': 2.4.0
-      '@smithy/middleware-retry': 2.1.0
-      '@smithy/middleware-serde': 2.1.0
-      '@smithy/middleware-stack': 2.1.0
-      '@smithy/node-config-provider': 2.2.0
-      '@smithy/node-http-handler': 2.3.0
-      '@smithy/property-provider': 2.1.0
-      '@smithy/protocol-http': 3.1.0
-      '@smithy/shared-ini-file-loader': 2.3.0
-      '@smithy/smithy-client': 2.3.0
-      '@smithy/types': 2.9.0
-      '@smithy/url-parser': 2.1.0
-      '@smithy/util-base64': 2.1.0
-      '@smithy/util-body-length-browser': 2.1.0
-      '@smithy/util-body-length-node': 2.2.0
-      '@smithy/util-defaults-mode-browser': 2.1.0
-      '@smithy/util-defaults-mode-node': 2.1.0
-      '@smithy/util-endpoints': 1.1.0
-      '@smithy/util-retry': 2.1.0
-      '@smithy/util-utf8': 2.1.0
+      '@aws-sdk/middleware-host-header': 3.496.0
+      '@aws-sdk/middleware-logger': 3.496.0
+      '@aws-sdk/middleware-recursion-detection': 3.496.0
+      '@aws-sdk/middleware-user-agent': 3.496.0
+      '@aws-sdk/region-config-resolver': 3.496.0
+      '@aws-sdk/types': 3.496.0
+      '@aws-sdk/util-endpoints': 3.496.0
+      '@aws-sdk/util-user-agent-browser': 3.496.0
+      '@aws-sdk/util-user-agent-node': 3.496.0
+      '@smithy/config-resolver': 2.1.1
+      '@smithy/fetch-http-handler': 2.4.1
+      '@smithy/hash-node': 2.1.1
+      '@smithy/invalid-dependency': 2.1.1
+      '@smithy/middleware-content-length': 2.1.1
+      '@smithy/middleware-endpoint': 2.4.1
+      '@smithy/middleware-retry': 2.1.1
+      '@smithy/middleware-serde': 2.1.1
+      '@smithy/middleware-stack': 2.1.1
+      '@smithy/node-config-provider': 2.2.1
+      '@smithy/node-http-handler': 2.3.1
+      '@smithy/property-provider': 2.1.1
+      '@smithy/protocol-http': 3.1.1
+      '@smithy/shared-ini-file-loader': 2.3.1
+      '@smithy/smithy-client': 2.3.1
+      '@smithy/types': 2.9.1
+      '@smithy/url-parser': 2.1.1
+      '@smithy/util-base64': 2.1.1
+      '@smithy/util-body-length-browser': 2.1.1
+      '@smithy/util-body-length-node': 2.2.1
+      '@smithy/util-defaults-mode-browser': 2.1.1
+      '@smithy/util-defaults-mode-node': 2.1.1
+      '@smithy/util-endpoints': 1.1.1
+      '@smithy/util-retry': 2.1.1
+      '@smithy/util-utf8': 2.1.1
       tslib: 2.6.2
     transitivePeerDependencies:
       - aws-crt
     dev: false
 
-  /@aws-sdk/types@3.495.0:
-    resolution: {integrity: sha512-KUpo2U1rD4U6gT1QNPUJGmbQnruvIJmPeuyKndil6h2zkCpG5I0AHE8ixpfuBbizIZQOIA/26pArQivDChOD9A==}
+  /@aws-sdk/types@3.496.0:
+    resolution: {integrity: sha512-umkGadK4QuNQaMoDICMm7NKRI/mYSXiyPjcn3d53BhsuArYU/52CebGQKdt4At7SwwsiVJZw9RNBHyN5Mm0HVw==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/types': 2.9.0
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
@@ -1157,23 +1148,23 @@ packages:
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/util-endpoints@3.495.0:
-    resolution: {integrity: sha512-pMJ6rb16y51I4G33xtinkXAXH/2mQ0WZCwoh1sNkCM2MUfZDw9zAyP+PvB2tpEytQX8Fc7bR4qIP+td+pPEXAg==}
+  /@aws-sdk/util-endpoints@3.496.0:
+    resolution: {integrity: sha512-1QzOiWHi383ZwqSi/R2KgKCd7M+6DxkxI5acqLPm8mvDRDP2jRjrnVaC0g9/tlttWousGEemDUWStwrD2mVYSw==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@aws-sdk/types': 3.495.0
-      '@smithy/types': 2.9.0
-      '@smithy/util-endpoints': 1.1.0
+      '@aws-sdk/types': 3.496.0
+      '@smithy/types': 2.9.1
+      '@smithy/util-endpoints': 1.1.1
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/util-format-url@3.495.0:
-    resolution: {integrity: sha512-CmZcUoD2C+VSVvhAOpezkTyEiaGS31zJH8QNCvuKb/QA4yaZSdUrq4FUS9oxsVQr04MxjXVEfPZ427l0LTH1ow==}
+  /@aws-sdk/util-format-url@3.496.0:
+    resolution: {integrity: sha512-GYRqLEUVoIkD8+ULliODFWWRHGyjlanLCnj8faahZXUke6Ey32MG40RgPTu/2eFkUyS6U7sVdt7oLY8MIHShPQ==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@aws-sdk/types': 3.495.0
-      '@smithy/querystring-builder': 2.1.0
-      '@smithy/types': 2.9.0
+      '@aws-sdk/types': 3.496.0
+      '@smithy/querystring-builder': 2.1.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
@@ -1184,17 +1175,17 @@ packages:
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/util-user-agent-browser@3.495.0:
-    resolution: {integrity: sha512-CIlY54aKahUqF4kygbMkDkFRc9t+8Km/r+IWapy91h0Exy84V+S47MJdAelsMg8Id6hZ47jWmuuzz5UcjU/+sQ==}
+  /@aws-sdk/util-user-agent-browser@3.496.0:
+    resolution: {integrity: sha512-4j2spN+h0I0qfSMsGvJXTfQBu1e18rPdekKvzsGJxhaAE1tNgUfUT4nbvc5uVn0sNjZmirskmJ3kfbzVOrqIFg==}
     dependencies:
-      '@aws-sdk/types': 3.495.0
-      '@smithy/types': 2.9.0
+      '@aws-sdk/types': 3.496.0
+      '@smithy/types': 2.9.1
       bowser: 2.11.0
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/util-user-agent-node@3.495.0:
-    resolution: {integrity: sha512-BbEwwh9SCtMrcNES0u4q5/8BjAKkOiHGia0gDSlQHOmEzXxYvhx0ByRMaPeprL06iESFa6HcleJWenWktfxk3g==}
+  /@aws-sdk/util-user-agent-node@3.496.0:
+    resolution: {integrity: sha512-h0Ax0jlDc7UIo3KoSI4C4tVLBFoiAdx3+DhTVfgLS7x93d41dMlziPoBX2RgdcFn37qnzw6AQKTVTMwDbRCGpg==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
       aws-crt: '>=1.0.0'
@@ -1202,9 +1193,9 @@ packages:
       aws-crt:
         optional: true
     dependencies:
-      '@aws-sdk/types': 3.495.0
-      '@smithy/node-config-provider': 2.2.0
-      '@smithy/types': 2.9.0
+      '@aws-sdk/types': 3.496.0
+      '@smithy/node-config-provider': 2.2.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
@@ -1214,11 +1205,11 @@ packages:
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/xml-builder@3.495.0:
-    resolution: {integrity: sha512-bBrVLuldAnv53E9XvZD9MtW1dIWJXFswP8/JZuMdDQCyJh9ObjvUe/lFhTJ/AuNqEdujyE1nD4O1R7stzyBqOA==}
+  /@aws-sdk/xml-builder@3.496.0:
+    resolution: {integrity: sha512-GvEjh537IIeOw1ZkZuB37sV12u+ipS5Z1dwjEC/HAvhl5ac23ULtTr1/n+U1gLNN+BAKSWjKiQ2ksj8DiUzeyw==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/types': 2.9.0
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
@@ -1261,7 +1252,7 @@ packages:
     dependencies:
       '@babel/types': 7.23.6
       '@jridgewell/gen-mapping': 0.3.3
-      '@jridgewell/trace-mapping': 0.3.21
+      '@jridgewell/trace-mapping': 0.3.22
       jsesc: 2.5.2
 
   /@babel/helper-annotate-as-pure@7.22.5:
@@ -2102,12 +2093,10 @@ packages:
     dependencies:
       eslint: 8.56.0
       eslint-visitor-keys: 3.4.3
-    dev: true
 
   /@eslint-community/regexpp@4.10.0:
     resolution: {integrity: sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==}
     engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
-    dev: true
 
   /@eslint-types/jsdoc@46.8.2-1:
     resolution: {integrity: sha512-FwD7V0xX0jyaqj8Ul5ZY+TAAPohDfVqtbuXJNHb+OIv1aTIqZi5+Zn3F2UwQ5O3BnQd2mTduyK0+HjGx3/AMFg==}
@@ -2136,12 +2125,10 @@ packages:
       strip-json-comments: 3.1.1
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
   /@eslint/js@8.56.0:
     resolution: {integrity: sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dev: true
 
   /@faker-js/faker@8.3.1:
     resolution: {integrity: sha512-FdgpFxY6V6rLZE9mmIBb9hM0xpfvQOSNOLnzolzKwsE1DH+gC7lEKV1p1IbR0lAYyvYd5a4u3qWJzowUkw1bIw==}
@@ -2212,7 +2199,7 @@ packages:
       defu: 6.1.4
       immer: 10.0.3
       jose: 4.15.4
-      nuxt: 3.9.3(@types/node@20.11.5)(@upstash/redis@1.20.0)(typescript@5.3.3)(vite@5.0.11)(vue-tsc@1.8.27)
+      nuxt: 3.9.3(@types/node@20.11.5)(@upstash/redis@1.28.2)(eslint@8.56.0)(typescript@5.3.3)(vite@5.0.12)(vue-tsc@1.8.27)
       unctx: 2.3.1
     transitivePeerDependencies:
       - rollup
@@ -2232,16 +2219,13 @@ packages:
       minimatch: 3.1.2
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
   /@humanwhocodes/module-importer@1.0.1:
     resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==}
     engines: {node: '>=12.22'}
-    dev: true
 
   /@humanwhocodes/object-schema@2.0.2:
     resolution: {integrity: sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==}
-    dev: true
 
   /@iconify-json/heroicons@1.1.19:
     resolution: {integrity: sha512-uW2F9vdGll59W21ocBl+wR4Ve+/1CsmzBqPTuOaR3CbKzqnJKwzGASvC4Op0uTieFVWfBaevnzcRxwNo73J29g==}
@@ -2531,7 +2515,7 @@ packages:
     dependencies:
       '@jridgewell/set-array': 1.1.2
       '@jridgewell/sourcemap-codec': 1.4.15
-      '@jridgewell/trace-mapping': 0.3.21
+      '@jridgewell/trace-mapping': 0.3.22
 
   /@jridgewell/resolve-uri@3.1.1:
     resolution: {integrity: sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==}
@@ -2545,13 +2529,13 @@ packages:
     resolution: {integrity: sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==}
     dependencies:
       '@jridgewell/gen-mapping': 0.3.3
-      '@jridgewell/trace-mapping': 0.3.21
+      '@jridgewell/trace-mapping': 0.3.22
 
   /@jridgewell/sourcemap-codec@1.4.15:
     resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==}
 
-  /@jridgewell/trace-mapping@0.3.21:
-    resolution: {integrity: sha512-SRfKmRe1KvYnxjEMtxEr+J4HIeMX5YBg/qhRHpxEIGjhX1rshcHlnFUE9K0GazhVKWM7B+nARSkV8LuvJdJ5/g==}
+  /@jridgewell/trace-mapping@0.3.22:
+    resolution: {integrity: sha512-Wf963MzWtA2sjrNt+g18IAln9lKnlRp+K2eH4jjIoF1wYeq3aMREpG09xhlhdzS0EjwU7qmUJYangWa+151vZw==}
     dependencies:
       '@jridgewell/resolve-uri': 3.1.1
       '@jridgewell/sourcemap-codec': 1.4.15
@@ -2710,11 +2694,11 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /@nuxt/content@2.10.0(nuxt@3.9.3)(vue@3.4.15):
-    resolution: {integrity: sha512-HZ+1RJJc2SZc/FPYvbsME7b8++a2uf6g9JlMm+qUMDjnCWJaF38pbrsmYq2b9whXx/3WjpBmCRkWCJy6bjSP+g==}
+  /@nuxt/content@2.11.0(nuxt@3.9.3)(vue@3.4.15):
+    resolution: {integrity: sha512-bHk4Vs+9k94z9WDdQcjTKWeXEkHiRsatTPx/914okegKaWz3yntt3x6NUPv6Ch3zI5JJZvepqbVPoWxuySFmmQ==}
     dependencies:
       '@nuxt/kit': 3.9.3
-      '@nuxtjs/mdc': 0.3.0
+      '@nuxtjs/mdc': 0.3.2
       '@vueuse/core': 10.7.2(vue@3.4.15)
       '@vueuse/head': 2.0.0(vue@3.4.15)
       '@vueuse/nuxt': 10.7.2(nuxt@3.9.3)(vue@3.4.15)
@@ -2733,12 +2717,12 @@ packages:
       ohash: 1.1.3
       pathe: 1.1.2
       scule: 1.2.0
-      shiki-es: 0.14.0
+      shikiji: 0.9.19
       slugify: 1.6.6
       socket.io-client: 4.7.4
       ufo: 1.3.2
       unist-util-stringify-position: 4.0.0
-      unstorage: 1.10.1(@upstash/redis@1.20.0)
+      unstorage: 1.10.1(@upstash/redis@1.28.2)
       ws: 8.16.0
     transitivePeerDependencies:
       - '@azure/app-configuration'
@@ -2765,7 +2749,7 @@ packages:
   /@nuxt/devalue@2.0.2:
     resolution: {integrity: sha512-GBzP8zOc7CGWyFQS6dv1lQz8VVpz5C2yRszbXufwG/9zhStTIH50EtD87NmWbTMwXDvZLNg8GIpb1UFdH93JCA==}
 
-  /@nuxt/devtools-kit@1.0.8(nuxt@3.9.3)(vite@5.0.11):
+  /@nuxt/devtools-kit@1.0.8(nuxt@3.9.3)(vite@5.0.12):
     resolution: {integrity: sha512-j7bNZmoAXQ1a8qv6j6zk4c/aekrxYqYVQM21o/Hy4XHCUq4fajSgpoc8mjyWJSTfpkOmuLyEzMexpDWiIVSr6A==}
     peerDependencies:
       nuxt: ^3.9.0
@@ -2774,8 +2758,8 @@ packages:
       '@nuxt/kit': 3.9.3
       '@nuxt/schema': 3.9.3
       execa: 7.2.0
-      nuxt: 3.9.3(@types/node@20.11.5)(@upstash/redis@1.20.0)(typescript@5.3.3)(vite@5.0.11)(vue-tsc@1.8.27)
-      vite: 5.0.11(@types/node@20.11.5)
+      nuxt: 3.9.3(@types/node@20.11.5)(@upstash/redis@1.28.2)(eslint@8.56.0)(typescript@5.3.3)(vite@5.0.12)(vue-tsc@1.8.27)
+      vite: 5.0.12(@types/node@20.11.5)
     transitivePeerDependencies:
       - rollup
       - supports-color
@@ -2795,7 +2779,7 @@ packages:
       rc9: 2.1.1
       semver: 7.5.4
 
-  /@nuxt/devtools@1.0.8(nuxt@3.9.3)(vite@5.0.11):
+  /@nuxt/devtools@1.0.8(nuxt@3.9.3)(vite@5.0.12):
     resolution: {integrity: sha512-o6aBFEBxc8OgVHV4OPe2g0q9tFIe9HiTxRiJnlTJ+jHvOQsBLS651ArdVtwLChf9UdMouFlpLLJ1HteZqTbtsQ==}
     hasBin: true
     peerDependencies:
@@ -2803,7 +2787,7 @@ packages:
       vite: '*'
     dependencies:
       '@antfu/utils': 0.7.7
-      '@nuxt/devtools-kit': 1.0.8(nuxt@3.9.3)(vite@5.0.11)
+      '@nuxt/devtools-kit': 1.0.8(nuxt@3.9.3)(vite@5.0.12)
       '@nuxt/devtools-wizard': 1.0.8
       '@nuxt/kit': 3.9.3
       birpc: 0.2.14
@@ -2820,7 +2804,7 @@ packages:
       launch-editor: 2.6.1
       local-pkg: 0.5.0
       magicast: 0.3.3
-      nuxt: 3.9.3(@types/node@20.11.5)(@upstash/redis@1.20.0)(typescript@5.3.3)(vite@5.0.11)(vue-tsc@1.8.27)
+      nuxt: 3.9.3(@types/node@20.11.5)(@upstash/redis@1.28.2)(eslint@8.56.0)(typescript@5.3.3)(vite@5.0.12)(vue-tsc@1.8.27)
       nypm: 0.3.4
       ohash: 1.1.3
       pacote: 17.0.6
@@ -2832,10 +2816,10 @@ packages:
       semver: 7.5.4
       simple-git: 3.22.0
       sirv: 2.0.4
-      unimport: 3.7.1(rollup@4.9.5)
-      vite: 5.0.11(@types/node@20.11.5)
-      vite-plugin-inspect: 0.8.1(@nuxt/kit@3.9.3)(vite@5.0.11)
-      vite-plugin-vue-inspector: 4.0.2(vite@5.0.11)
+      unimport: 3.7.1(rollup@4.9.6)
+      vite: 5.0.12(@types/node@20.11.5)
+      vite-plugin-inspect: 0.8.1(@nuxt/kit@3.9.3)(vite@5.0.12)
+      vite-plugin-vue-inspector: 4.0.2(vite@5.0.12)
       which: 3.0.1
       ws: 8.16.0
     transitivePeerDependencies:
@@ -2880,7 +2864,7 @@ packages:
       semver: 7.5.4
       ufo: 1.3.2
       unctx: 2.3.1
-      unimport: 3.7.1(rollup@4.9.5)
+      unimport: 3.7.1(rollup@4.9.6)
       untyped: 1.4.0
     transitivePeerDependencies:
       - rollup
@@ -2899,7 +2883,7 @@ packages:
       scule: 1.2.0
       std-env: 3.7.0
       ufo: 1.3.2
-      unimport: 3.7.1(rollup@4.9.5)
+      unimport: 3.7.1(rollup@4.9.6)
       untyped: 1.4.0
     transitivePeerDependencies:
       - rollup
@@ -2933,7 +2917,7 @@ packages:
   /@nuxt/ui-templates@1.3.1:
     resolution: {integrity: sha512-5gc02Pu1HycOVUWJ8aYsWeeXcSTPe8iX8+KIrhyEtEoOSkY0eMBuo0ssljB8wALuEmepv31DlYe5gpiRwkjESA==}
 
-  /@nuxt/ui@2.12.3(nuxt@3.9.3)(vite@5.0.11)(vue@3.4.15):
+  /@nuxt/ui@2.12.3(nuxt@3.9.3)(vite@5.0.12)(vue@3.4.15):
     resolution: {integrity: sha512-F/eoqU8pTBVCdJ1QHvWKZjXHVNNV6Q1SCgPRWJyNnfbnIi97a50/aiHVJZfvr0zp3FQKa/ogWTITF5Vxss5TtA==}
     engines: {node: '>=v16.20.2'}
     dependencies:
@@ -2954,7 +2938,7 @@ packages:
       '@vueuse/math': 10.7.2(vue@3.4.15)
       defu: 6.1.4
       fuse.js: 6.6.2
-      nuxt-icon: 0.6.8(nuxt@3.9.3)(vite@5.0.11)(vue@3.4.15)
+      nuxt-icon: 0.6.8(nuxt@3.9.3)(vite@5.0.12)(vue@3.4.15)
       ohash: 1.1.3
       pathe: 1.1.2
       scule: 1.2.0
@@ -2981,7 +2965,7 @@ packages:
       - vue
     dev: false
 
-  /@nuxt/vite-builder@3.9.3(@types/node@20.11.5)(typescript@5.3.3)(vue-tsc@1.8.27)(vue@3.4.14):
+  /@nuxt/vite-builder@3.9.3(@types/node@20.11.5)(eslint@8.56.0)(typescript@5.3.3)(vue-tsc@1.8.27)(vue@3.4.15):
     resolution: {integrity: sha512-HruOrxn0g6TS31j3jycJvGZ7pt3JNEbcXNByVh7YJwQx6ToFX8kPWRu4LPeMhrLYvZzeUr2w3iELBECFxbDmvw==}
     engines: {node: ^14.18.0 || >=16.10.0}
     peerDependencies:
@@ -2989,8 +2973,8 @@ packages:
     dependencies:
       '@nuxt/kit': 3.9.3
       '@rollup/plugin-replace': 5.0.5(rollup@3.29.4)
-      '@vitejs/plugin-vue': 5.0.3(vite@5.0.11)(vue@3.4.14)
-      '@vitejs/plugin-vue-jsx': 3.1.0(vite@5.0.11)(vue@3.4.14)
+      '@vitejs/plugin-vue': 5.0.3(vite@5.0.11)(vue@3.4.15)
+      '@vitejs/plugin-vue-jsx': 3.1.0(vite@5.0.11)(vue@3.4.15)
       autoprefixer: 10.4.16(postcss@8.4.33)
       clear: 0.1.0
       consola: 3.2.3
@@ -3011,15 +2995,15 @@ packages:
       perfect-debounce: 1.0.0
       pkg-types: 1.0.3
       postcss: 8.4.33
-      rollup-plugin-visualizer: 5.12.0(rollup@4.9.5)
+      rollup-plugin-visualizer: 5.12.0(rollup@4.9.6)
       std-env: 3.7.0
       strip-literal: 2.0.0
       ufo: 1.3.2
       unplugin: 1.6.0
       vite: 5.0.11(@types/node@20.11.5)
       vite-node: 1.2.1(@types/node@20.11.5)
-      vite-plugin-checker: 0.6.2(typescript@5.3.3)(vite@5.0.11)(vue-tsc@1.8.27)
-      vue: 3.4.14(typescript@5.3.3)
+      vite-plugin-checker: 0.6.2(eslint@8.56.0)(typescript@5.3.3)(vite@5.0.11)(vue-tsc@1.8.27)
+      vue: 3.4.15(typescript@5.3.3)
       vue-bundle-renderer: 2.0.0
     transitivePeerDependencies:
       - '@types/node'
@@ -3050,13 +3034,13 @@ packages:
       - rollup
       - supports-color
 
-  /@nuxtjs/mdc@0.3.0:
-    resolution: {integrity: sha512-WN/5OuudZwsBPBRJNHIfkJF/sPtww5ThDva7Fcs2PMl+TdDA+M38L+AeONIn7Sl2CHU7O9rf1kMHl8p7MrUZeA==}
+  /@nuxtjs/mdc@0.3.2:
+    resolution: {integrity: sha512-iSepiwfNCh5dgO3ETqSdBHWdendRuRIZ7OsgIpEQXX2J9ubHK5XvRsK3DSUOqZZ8PHbRZ3eSr/9ZF9+IeZ0GFw==}
     dependencies:
       '@nuxt/kit': 3.9.3
       '@types/hast': 3.0.3
       '@types/mdast': 4.0.3
-      '@vue/compiler-core': 3.4.14
+      '@vue/compiler-core': 3.4.15
       consola: 3.2.3
       defu: 6.1.4
       destr: 2.0.2
@@ -3074,7 +3058,7 @@ packages:
       rehype-sort-attributes: 5.0.0
       remark-emoji: 4.0.1
       remark-gfm: 4.0.0
-      remark-mdc: 3.0.0
+      remark-mdc: 3.0.2
       remark-parse: 11.0.0
       remark-rehype: 11.1.0
       scule: 1.2.0
@@ -3084,6 +3068,7 @@ packages:
       unified: 11.0.4
       unist-builder: 4.0.0
       unist-util-visit: 5.0.0
+      unwasm: 0.3.7
     transitivePeerDependencies:
       - rollup
       - supports-color
@@ -3093,7 +3078,7 @@ packages:
     resolution: {integrity: sha512-MG2HYTOH4iJjdfxpfgQ5dDQD/FV+MzqhKk6pYDKkZnTtb7HiKz7B4Yujnqvj5tSwV+kanbU9n++BFuAOJZop4w==}
     dependencies:
       '@nuxt/kit': 3.9.3
-      autoprefixer: 10.4.17(postcss@8.4.33)
+      autoprefixer: 10.4.16(postcss@8.4.33)
       chokidar: 3.5.3
       clear-module: 4.1.2
       colorette: 2.0.20
@@ -3217,7 +3202,6 @@ packages:
     dependencies:
       is-glob: 4.0.3
       micromatch: 4.0.5
-      napi-wasm: 1.1.0
     bundledDependencies:
       - napi-wasm
 
@@ -3431,7 +3415,7 @@ packages:
       slash: 4.0.0
     dev: true
 
-  /@rollup/plugin-alias@5.1.0(rollup@4.9.5):
+  /@rollup/plugin-alias@5.1.0(rollup@4.9.6):
     resolution: {integrity: sha512-lpA3RZ9PdIG7qqhEfv79tBffNaoDuukFDrmhLqg9ifv99u/ehn+lOg30x2zmhf8AQqQUZaMk/B9fZraQ6/acDQ==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
@@ -3440,7 +3424,7 @@ packages:
       rollup:
         optional: true
     dependencies:
-      rollup: 4.9.5
+      rollup: 4.9.6
       slash: 4.0.0
 
   /@rollup/plugin-commonjs@25.0.7(rollup@3.29.4):
@@ -3461,7 +3445,7 @@ packages:
       rollup: 3.29.4
     dev: true
 
-  /@rollup/plugin-commonjs@25.0.7(rollup@4.9.5):
+  /@rollup/plugin-commonjs@25.0.7(rollup@4.9.6):
     resolution: {integrity: sha512-nEvcR+LRjEjsaSsc4x3XZfCCvZIaSMenZu/OiwOKGN2UhQpAYI7ru7czFvyWbErlpoGjnSX3D5Ch5FcMA3kRWQ==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
@@ -3470,15 +3454,15 @@ packages:
       rollup:
         optional: true
     dependencies:
-      '@rollup/pluginutils': 5.1.0(rollup@4.9.5)
+      '@rollup/pluginutils': 5.1.0(rollup@4.9.6)
       commondir: 1.0.1
       estree-walker: 2.0.2
       glob: 8.1.0
       is-reference: 1.2.1
       magic-string: 0.30.5
-      rollup: 4.9.5
+      rollup: 4.9.6
 
-  /@rollup/plugin-inject@5.0.5(rollup@4.9.5):
+  /@rollup/plugin-inject@5.0.5(rollup@4.9.6):
     resolution: {integrity: sha512-2+DEJbNBoPROPkgTDNe8/1YXWcqxbN5DTjASVIOx8HS+pITXushyNiBV56RB08zuptzz8gT3YfkqriTBVycepg==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
@@ -3487,10 +3471,10 @@ packages:
       rollup:
         optional: true
     dependencies:
-      '@rollup/pluginutils': 5.1.0(rollup@4.9.5)
+      '@rollup/pluginutils': 5.1.0(rollup@4.9.6)
       estree-walker: 2.0.2
       magic-string: 0.30.5
-      rollup: 4.9.5
+      rollup: 4.9.6
 
   /@rollup/plugin-json@6.1.0(rollup@3.29.4):
     resolution: {integrity: sha512-EGI2te5ENk1coGeADSIwZ7G2Q8CJS2sF120T7jLw4xFw9n7wIOXHo+kIYRAoVpJAN+kmqZSoO3Fp4JtoNF4ReA==}
@@ -3505,7 +3489,7 @@ packages:
       rollup: 3.29.4
     dev: true
 
-  /@rollup/plugin-json@6.1.0(rollup@4.9.5):
+  /@rollup/plugin-json@6.1.0(rollup@4.9.6):
     resolution: {integrity: sha512-EGI2te5ENk1coGeADSIwZ7G2Q8CJS2sF120T7jLw4xFw9n7wIOXHo+kIYRAoVpJAN+kmqZSoO3Fp4JtoNF4ReA==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
@@ -3514,8 +3498,8 @@ packages:
       rollup:
         optional: true
     dependencies:
-      '@rollup/pluginutils': 5.1.0(rollup@4.9.5)
-      rollup: 4.9.5
+      '@rollup/pluginutils': 5.1.0(rollup@4.9.6)
+      rollup: 4.9.6
 
   /@rollup/plugin-node-resolve@15.2.3(rollup@3.29.4):
     resolution: {integrity: sha512-j/lym8nf5E21LwBT4Df1VD6hRO2L2iwUeUmP7litikRsVp1H6NWx20NEp0Y7su+7XGc476GnXXc4kFeZNGmaSQ==}
@@ -3535,7 +3519,7 @@ packages:
       rollup: 3.29.4
     dev: true
 
-  /@rollup/plugin-node-resolve@15.2.3(rollup@4.9.5):
+  /@rollup/plugin-node-resolve@15.2.3(rollup@4.9.6):
     resolution: {integrity: sha512-j/lym8nf5E21LwBT4Df1VD6hRO2L2iwUeUmP7litikRsVp1H6NWx20NEp0Y7su+7XGc476GnXXc4kFeZNGmaSQ==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
@@ -3544,13 +3528,13 @@ packages:
       rollup:
         optional: true
     dependencies:
-      '@rollup/pluginutils': 5.1.0(rollup@4.9.5)
+      '@rollup/pluginutils': 5.1.0(rollup@4.9.6)
       '@types/resolve': 1.20.2
       deepmerge: 4.3.1
       is-builtin-module: 3.2.1
       is-module: 1.0.0
       resolve: 1.22.8
-      rollup: 4.9.5
+      rollup: 4.9.6
 
   /@rollup/plugin-replace@5.0.5(rollup@3.29.4):
     resolution: {integrity: sha512-rYO4fOi8lMaTg/z5Jb+hKnrHHVn8j2lwkqwyS4kTRhKyWOLf2wST2sWXr4WzWiTcoHTp2sTjqUbqIj2E39slKQ==}
@@ -3565,7 +3549,7 @@ packages:
       magic-string: 0.30.5
       rollup: 3.29.4
 
-  /@rollup/plugin-replace@5.0.5(rollup@4.9.5):
+  /@rollup/plugin-replace@5.0.5(rollup@4.9.6):
     resolution: {integrity: sha512-rYO4fOi8lMaTg/z5Jb+hKnrHHVn8j2lwkqwyS4kTRhKyWOLf2wST2sWXr4WzWiTcoHTp2sTjqUbqIj2E39slKQ==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
@@ -3574,11 +3558,11 @@ packages:
       rollup:
         optional: true
     dependencies:
-      '@rollup/pluginutils': 5.1.0(rollup@4.9.5)
+      '@rollup/pluginutils': 5.1.0(rollup@4.9.6)
       magic-string: 0.30.5
-      rollup: 4.9.5
+      rollup: 4.9.6
 
-  /@rollup/plugin-terser@0.4.4(rollup@4.9.5):
+  /@rollup/plugin-terser@0.4.4(rollup@4.9.6):
     resolution: {integrity: sha512-XHeJC5Bgvs8LfukDwWZp7yeqin6ns8RTl2B9avbejt6tZqsqvVoWI7ZTQrcNsfKEDWBTnTxM8nMDkO2IFFbd0A==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
@@ -3587,12 +3571,12 @@ packages:
       rollup:
         optional: true
     dependencies:
-      rollup: 4.9.5
+      rollup: 4.9.6
       serialize-javascript: 6.0.2
       smob: 1.4.1
       terser: 5.27.0
 
-  /@rollup/plugin-wasm@6.2.2(rollup@4.9.5):
+  /@rollup/plugin-wasm@6.2.2(rollup@4.9.6):
     resolution: {integrity: sha512-gpC4R1G9Ni92ZIRTexqbhX7U+9estZrbhP+9SRb0DW9xpB9g7j34r+J2hqrcW/lRI7dJaU84MxZM0Rt82tqYPQ==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
@@ -3601,8 +3585,8 @@ packages:
       rollup:
         optional: true
     dependencies:
-      '@rollup/pluginutils': 5.1.0(rollup@4.9.5)
-      rollup: 4.9.5
+      '@rollup/pluginutils': 5.1.0(rollup@4.9.6)
+      rollup: 4.9.6
 
   /@rollup/pluginutils@4.2.1:
     resolution: {integrity: sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==}
@@ -3625,7 +3609,7 @@ packages:
       picomatch: 2.3.1
       rollup: 3.29.4
 
-  /@rollup/pluginutils@5.1.0(rollup@4.9.5):
+  /@rollup/pluginutils@5.1.0(rollup@4.9.6):
     resolution: {integrity: sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
@@ -3637,94 +3621,94 @@ packages:
       '@types/estree': 1.0.5
       estree-walker: 2.0.2
       picomatch: 2.3.1
-      rollup: 4.9.5
+      rollup: 4.9.6
 
-  /@rollup/rollup-android-arm-eabi@4.9.5:
-    resolution: {integrity: sha512-idWaG8xeSRCfRq9KpRysDHJ/rEHBEXcHuJ82XY0yYFIWnLMjZv9vF/7DOq8djQ2n3Lk6+3qfSH8AqlmHlmi1MA==}
+  /@rollup/rollup-android-arm-eabi@4.9.6:
+    resolution: {integrity: sha512-MVNXSSYN6QXOulbHpLMKYi60ppyO13W9my1qogeiAqtjb2yR4LSmfU2+POvDkLzhjYLXz9Rf9+9a3zFHW1Lecg==}
     cpu: [arm]
     os: [android]
     requiresBuild: true
     optional: true
 
-  /@rollup/rollup-android-arm64@4.9.5:
-    resolution: {integrity: sha512-f14d7uhAMtsCGjAYwZGv6TwuS3IFaM4ZnGMUn3aCBgkcHAYErhV1Ad97WzBvS2o0aaDv4mVz+syiN0ElMyfBPg==}
+  /@rollup/rollup-android-arm64@4.9.6:
+    resolution: {integrity: sha512-T14aNLpqJ5wzKNf5jEDpv5zgyIqcpn1MlwCrUXLrwoADr2RkWA0vOWP4XxbO9aiO3dvMCQICZdKeDrFl7UMClw==}
     cpu: [arm64]
     os: [android]
     requiresBuild: true
     optional: true
 
-  /@rollup/rollup-darwin-arm64@4.9.5:
-    resolution: {integrity: sha512-ndoXeLx455FffL68OIUrVr89Xu1WLzAG4n65R8roDlCoYiQcGGg6MALvs2Ap9zs7AHg8mpHtMpwC8jBBjZrT/w==}
+  /@rollup/rollup-darwin-arm64@4.9.6:
+    resolution: {integrity: sha512-CqNNAyhRkTbo8VVZ5R85X73H3R5NX9ONnKbXuHisGWC0qRbTTxnF1U4V9NafzJbgGM0sHZpdO83pLPzq8uOZFw==}
     cpu: [arm64]
     os: [darwin]
     requiresBuild: true
     optional: true
 
-  /@rollup/rollup-darwin-x64@4.9.5:
-    resolution: {integrity: sha512-UmElV1OY2m/1KEEqTlIjieKfVwRg0Zwg4PLgNf0s3glAHXBN99KLpw5A5lrSYCa1Kp63czTpVll2MAqbZYIHoA==}
+  /@rollup/rollup-darwin-x64@4.9.6:
+    resolution: {integrity: sha512-zRDtdJuRvA1dc9Mp6BWYqAsU5oeLixdfUvkTHuiYOHwqYuQ4YgSmi6+/lPvSsqc/I0Omw3DdICx4Tfacdzmhog==}
     cpu: [x64]
     os: [darwin]
     requiresBuild: true
     optional: true
 
-  /@rollup/rollup-linux-arm-gnueabihf@4.9.5:
-    resolution: {integrity: sha512-Q0LcU61v92tQB6ae+udZvOyZ0wfpGojtAKrrpAaIqmJ7+psq4cMIhT/9lfV6UQIpeItnq/2QDROhNLo00lOD1g==}
+  /@rollup/rollup-linux-arm-gnueabihf@4.9.6:
+    resolution: {integrity: sha512-oNk8YXDDnNyG4qlNb6is1ojTOGL/tRhbbKeE/YuccItzerEZT68Z9gHrY3ROh7axDc974+zYAPxK5SH0j/G+QQ==}
     cpu: [arm]
     os: [linux]
     requiresBuild: true
     optional: true
 
-  /@rollup/rollup-linux-arm64-gnu@4.9.5:
-    resolution: {integrity: sha512-dkRscpM+RrR2Ee3eOQmRWFjmV/payHEOrjyq1VZegRUa5OrZJ2MAxBNs05bZuY0YCtpqETDy1Ix4i/hRqX98cA==}
+  /@rollup/rollup-linux-arm64-gnu@4.9.6:
+    resolution: {integrity: sha512-Z3O60yxPtuCYobrtzjo0wlmvDdx2qZfeAWTyfOjEDqd08kthDKexLpV97KfAeUXPosENKd8uyJMRDfFMxcYkDQ==}
     cpu: [arm64]
     os: [linux]
     requiresBuild: true
     optional: true
 
-  /@rollup/rollup-linux-arm64-musl@4.9.5:
-    resolution: {integrity: sha512-QaKFVOzzST2xzY4MAmiDmURagWLFh+zZtttuEnuNn19AiZ0T3fhPyjPPGwLNdiDT82ZE91hnfJsUiDwF9DClIQ==}
+  /@rollup/rollup-linux-arm64-musl@4.9.6:
+    resolution: {integrity: sha512-gpiG0qQJNdYEVad+1iAsGAbgAnZ8j07FapmnIAQgODKcOTjLEWM9sRb+MbQyVsYCnA0Im6M6QIq6ax7liws6eQ==}
     cpu: [arm64]
     os: [linux]
     requiresBuild: true
     optional: true
 
-  /@rollup/rollup-linux-riscv64-gnu@4.9.5:
-    resolution: {integrity: sha512-HeGqmRJuyVg6/X6MpE2ur7GbymBPS8Np0S/vQFHDmocfORT+Zt76qu+69NUoxXzGqVP1pzaY6QIi0FJWLC3OPA==}
+  /@rollup/rollup-linux-riscv64-gnu@4.9.6:
+    resolution: {integrity: sha512-+uCOcvVmFUYvVDr27aiyun9WgZk0tXe7ThuzoUTAukZJOwS5MrGbmSlNOhx1j80GdpqbOty05XqSl5w4dQvcOA==}
     cpu: [riscv64]
     os: [linux]
     requiresBuild: true
     optional: true
 
-  /@rollup/rollup-linux-x64-gnu@4.9.5:
-    resolution: {integrity: sha512-Dq1bqBdLaZ1Gb/l2e5/+o3B18+8TI9ANlA1SkejZqDgdU/jK/ThYaMPMJpVMMXy2uRHvGKbkz9vheVGdq3cJfA==}
+  /@rollup/rollup-linux-x64-gnu@4.9.6:
+    resolution: {integrity: sha512-HUNqM32dGzfBKuaDUBqFB7tP6VMN74eLZ33Q9Y1TBqRDn+qDonkAUyKWwF9BR9unV7QUzffLnz9GrnKvMqC/fw==}
     cpu: [x64]
     os: [linux]
     requiresBuild: true
     optional: true
 
-  /@rollup/rollup-linux-x64-musl@4.9.5:
-    resolution: {integrity: sha512-ezyFUOwldYpj7AbkwyW9AJ203peub81CaAIVvckdkyH8EvhEIoKzaMFJj0G4qYJ5sw3BpqhFrsCc30t54HV8vg==}
+  /@rollup/rollup-linux-x64-musl@4.9.6:
+    resolution: {integrity: sha512-ch7M+9Tr5R4FK40FHQk8VnML0Szi2KRujUgHXd/HjuH9ifH72GUmw6lStZBo3c3GB82vHa0ZoUfjfcM7JiiMrQ==}
     cpu: [x64]
     os: [linux]
     requiresBuild: true
     optional: true
 
-  /@rollup/rollup-win32-arm64-msvc@4.9.5:
-    resolution: {integrity: sha512-aHSsMnUw+0UETB0Hlv7B/ZHOGY5bQdwMKJSzGfDfvyhnpmVxLMGnQPGNE9wgqkLUs3+gbG1Qx02S2LLfJ5GaRQ==}
+  /@rollup/rollup-win32-arm64-msvc@4.9.6:
+    resolution: {integrity: sha512-VD6qnR99dhmTQ1mJhIzXsRcTBvTjbfbGGwKAHcu+52cVl15AC/kplkhxzW/uT0Xl62Y/meBKDZvoJSJN+vTeGA==}
     cpu: [arm64]
     os: [win32]
     requiresBuild: true
     optional: true
 
-  /@rollup/rollup-win32-ia32-msvc@4.9.5:
-    resolution: {integrity: sha512-AiqiLkb9KSf7Lj/o1U3SEP9Zn+5NuVKgFdRIZkvd4N0+bYrTOovVd0+LmYCPQGbocT4kvFyK+LXCDiXPBF3fyA==}
+  /@rollup/rollup-win32-ia32-msvc@4.9.6:
+    resolution: {integrity: sha512-J9AFDq/xiRI58eR2NIDfyVmTYGyIZmRcvcAoJ48oDld/NTR8wyiPUu2X/v1navJ+N/FGg68LEbX3Ejd6l8B7MQ==}
     cpu: [ia32]
     os: [win32]
     requiresBuild: true
     optional: true
 
-  /@rollup/rollup-win32-x64-msvc@4.9.5:
-    resolution: {integrity: sha512-1q+mykKE3Vot1kaFJIDoUFv5TuW+QQVaf2FmTT9krg86pQrGStOSJJ0Zil7CFagyxDuouTepzt5Y5TVzyajOdQ==}
+  /@rollup/rollup-win32-x64-msvc@4.9.6:
+    resolution: {integrity: sha512-jqzNLhNDvIZOrt69Ce4UjGRpXJBzhUBzawMwnaDAwyHriki3XollsewxWzOzz+4yOFDkuJHtTsZFwMxhYJWmLQ==}
     cpu: [x64]
     os: [win32]
     requiresBuild: true
@@ -3808,6 +3792,7 @@ packages:
 
   /@simplewebauthn/typescript-types@8.3.4:
     resolution: {integrity: sha512-38xtca0OqfRVNloKBrFB5LEM6PN5vzFbJG6rAutPVrtGHFYxPdiV3btYWq0eAZAZmP+dqFPYJxJWeJrGfmYHng==}
+    deprecated: This package has been renamed to @simplewebauthn/types. Please install @simplewebauthn/types instead to ensure you receive future updates.
     dev: false
 
   /@sinclair/typebox@0.27.8:
@@ -3823,458 +3808,458 @@ packages:
     resolution: {integrity: sha512-rUV5WyJrJLoloD4NDN1V1+LDMDWOa4OTsT4yYJwQNpTU6FWxkxHpL7eu4w+DmiH8x/EAM1otkPE1+LaspIbplw==}
     engines: {node: '>=18'}
 
-  /@smithy/abort-controller@2.1.0:
-    resolution: {integrity: sha512-fyPlWpzXyKzDVRRMUbsfH7AV/2xX+dyZ5RqeEo6Hjz9YUvDMGVSnm88iHH0zqZ+XmH4+sH4+mhwRL76HXX65uw==}
+  /@smithy/abort-controller@2.1.1:
+    resolution: {integrity: sha512-1+qdrUqLhaALYL0iOcN43EP6yAXXQ2wWZ6taf4S2pNGowmOc5gx+iMQv+E42JizNJjB0+gEadOXeV1Bf7JWL1Q==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/types': 2.9.0
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/chunked-blob-reader-native@2.1.0:
-    resolution: {integrity: sha512-r9fRVRvQXpuWZtHX3VNAP4PQoCXvRDqcwr15TbaKSdtEJ/f0IPHDQ+M2MOEsYt2234FkNqCzAqtmeJrjpNak2g==}
+  /@smithy/chunked-blob-reader-native@2.1.1:
+    resolution: {integrity: sha512-zNW+43dltfNMUrBEYLMWgI8lQr0uhtTcUyxkgC9EP4j17WREzgSFMPUFVrVV6Rc2+QtWERYjb4tzZnQGa7R9fQ==}
     dependencies:
-      '@smithy/util-base64': 2.1.0
+      '@smithy/util-base64': 2.1.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/chunked-blob-reader@2.1.0:
-    resolution: {integrity: sha512-meKoKCIXxixSGzUGVXGc1lnn6cEM21XzknDfUmHopPCaYSgt86w3gaJSua8Gr3VYcSkkMTW2MyAygTXprLEOZQ==}
+  /@smithy/chunked-blob-reader@2.1.1:
+    resolution: {integrity: sha512-NjNFCKxC4jVvn+lUr3Yo4/PmUJj3tbyqH6GNHueyTGS5Q27vlEJ1MkNhUDV8QGxJI7Bodnc2pD18lU2zRfhHlQ==}
     dependencies:
       tslib: 2.6.2
     dev: false
 
-  /@smithy/config-resolver@2.1.0:
-    resolution: {integrity: sha512-NcR1Hw2uZgwHT7/KFsQH76YHb/mNGLFu+hS0ODnoFUpViE8ddIVOXm/8sgwdh0QvFPtWGzPn0Wcp19Cm31wv2A==}
+  /@smithy/config-resolver@2.1.1:
+    resolution: {integrity: sha512-lxfLDpZm+AWAHPFZps5JfDoO9Ux1764fOgvRUBpHIO8HWHcSN1dkgsago1qLRVgm1BZ8RCm8cgv99QvtaOWIhw==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/node-config-provider': 2.2.0
-      '@smithy/types': 2.9.0
-      '@smithy/util-config-provider': 2.2.0
-      '@smithy/util-middleware': 2.1.0
+      '@smithy/node-config-provider': 2.2.1
+      '@smithy/types': 2.9.1
+      '@smithy/util-config-provider': 2.2.1
+      '@smithy/util-middleware': 2.1.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/core@1.3.0:
-    resolution: {integrity: sha512-XoU9eiICwhxZIyAdugijyD/YqsumDQ3FgGyFSJibO60qoUkdfMGSjnIvrTemjFBdnDsj4B26F/ZRxSR3PUJbJQ==}
+  /@smithy/core@1.3.1:
+    resolution: {integrity: sha512-tf+NIu9FkOh312b6M9G4D68is4Xr7qptzaZGZUREELF8ysE1yLKphqt7nsomjKZVwW7WE5pDDex9idowNGRQ/Q==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/middleware-endpoint': 2.4.0
-      '@smithy/middleware-retry': 2.1.0
-      '@smithy/middleware-serde': 2.1.0
-      '@smithy/protocol-http': 3.1.0
-      '@smithy/smithy-client': 2.3.0
-      '@smithy/types': 2.9.0
-      '@smithy/util-middleware': 2.1.0
+      '@smithy/middleware-endpoint': 2.4.1
+      '@smithy/middleware-retry': 2.1.1
+      '@smithy/middleware-serde': 2.1.1
+      '@smithy/protocol-http': 3.1.1
+      '@smithy/smithy-client': 2.3.1
+      '@smithy/types': 2.9.1
+      '@smithy/util-middleware': 2.1.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/credential-provider-imds@2.2.0:
-    resolution: {integrity: sha512-uqoRizHR8rKih6SuWcJRSv46tdqZk1zPEk6r909O87XO85j21MfUcxRKzbkORM2JOlaFhCH4geRcvlvYfK6EyQ==}
+  /@smithy/credential-provider-imds@2.2.1:
+    resolution: {integrity: sha512-7XHjZUxmZYnONheVQL7j5zvZXga+EWNgwEAP6OPZTi7l8J4JTeNh9aIOfE5fKHZ/ee2IeNOh54ZrSna+Vc6TFA==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/node-config-provider': 2.2.0
-      '@smithy/property-provider': 2.1.0
-      '@smithy/types': 2.9.0
-      '@smithy/url-parser': 2.1.0
+      '@smithy/node-config-provider': 2.2.1
+      '@smithy/property-provider': 2.1.1
+      '@smithy/types': 2.9.1
+      '@smithy/url-parser': 2.1.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/eventstream-codec@2.1.0:
-    resolution: {integrity: sha512-1yQnf8bSycsZ5ICXVMf8pEj1DQSUsw6/3H4nEdzH2+E3RZdNGPjVecQEm9kWPW7fvXvNvzT8MvZOQdk1IWoVTg==}
+  /@smithy/eventstream-codec@2.1.1:
+    resolution: {integrity: sha512-E8KYBxBIuU4c+zrpR22VsVrOPoEDzk35bQR3E+xm4k6Pa6JqzkDOdMyf9Atac5GPNKHJBdVaQ4JtjdWX2rl/nw==}
     dependencies:
       '@aws-crypto/crc32': 3.0.0
-      '@smithy/types': 2.9.0
-      '@smithy/util-hex-encoding': 2.1.0
+      '@smithy/types': 2.9.1
+      '@smithy/util-hex-encoding': 2.1.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/eventstream-serde-browser@2.1.0:
-    resolution: {integrity: sha512-pMw3HGN8yTGGoAO8z/fOMSSsfJxdtEwQ9p4/Y1eYw07sMlgQUPadwYFtxTMPDDzYvNmTWFjspR/nTBxYiUe8nA==}
+  /@smithy/eventstream-serde-browser@2.1.1:
+    resolution: {integrity: sha512-JvEdCmGlZUay5VtlT8/kdR6FlvqTDUiJecMjXsBb0+k1H/qc9ME5n2XKPo8q/MZwEIA1GmGgYMokKGjVvMiDow==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/eventstream-serde-universal': 2.1.0
-      '@smithy/types': 2.9.0
+      '@smithy/eventstream-serde-universal': 2.1.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/eventstream-serde-config-resolver@2.1.0:
-    resolution: {integrity: sha512-tFhaEiJtitNmdyW6yLteh0EV+93EsV+CIb4yduwpL/WyMy7Hy7DLbRW5ImypA4auqebjWYBven876RjhpY6XLg==}
+  /@smithy/eventstream-serde-config-resolver@2.1.1:
+    resolution: {integrity: sha512-EqNqXYp3+dk//NmW3NAgQr9bEQ7fsu/CcxQmTiq07JlaIcne/CBWpMZETyXm9w5LXkhduBsdXdlMscfDUDn2fA==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/types': 2.9.0
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/eventstream-serde-node@2.1.0:
-    resolution: {integrity: sha512-/asga1STbTgxQ+ma/VfsjXlUHTH/Fofor4RZLhPAMpQ6lfVxJTRjm28ONSczcsnRPTWwOoiFBiXutM68WgK6IQ==}
+  /@smithy/eventstream-serde-node@2.1.1:
+    resolution: {integrity: sha512-LF882q/aFidFNDX7uROAGxq3H0B7rjyPkV6QDn6/KDQ+CG7AFkRccjxRf1xqajq/Pe4bMGGr+VKAaoF6lELIQw==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/eventstream-serde-universal': 2.1.0
-      '@smithy/types': 2.9.0
+      '@smithy/eventstream-serde-universal': 2.1.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/eventstream-serde-universal@2.1.0:
-    resolution: {integrity: sha512-kZtTF0llc5pZ2QLMOrLttA2Cde/DXanfMqBhtJ0VZaQHdntPon+d7Gx7GhOkCxDP4lz1u0wMLdiIZNduaA4Qbg==}
+  /@smithy/eventstream-serde-universal@2.1.1:
+    resolution: {integrity: sha512-LR0mMT+XIYTxk4k2fIxEA1BPtW3685QlqufUEUAX1AJcfFfxNDKEvuCRZbO8ntJb10DrIFVJR9vb0MhDCi0sAQ==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/eventstream-codec': 2.1.0
-      '@smithy/types': 2.9.0
+      '@smithy/eventstream-codec': 2.1.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/fetch-http-handler@2.4.0:
-    resolution: {integrity: sha512-fLhPNfbWG8vTcS9PsR1wjHaA54kDcSiAZKVuVAfjHleS7QDWjrCr1SDUqCB2yAc9NBLe2lIDbDL8+i9yoYhxoQ==}
+  /@smithy/fetch-http-handler@2.4.1:
+    resolution: {integrity: sha512-VYGLinPsFqH68lxfRhjQaSkjXM7JysUOJDTNjHBuN/ykyRb2f1gyavN9+VhhPTWCy32L4yZ2fdhpCs/nStEicg==}
     dependencies:
-      '@smithy/protocol-http': 3.1.0
-      '@smithy/querystring-builder': 2.1.0
-      '@smithy/types': 2.9.0
-      '@smithy/util-base64': 2.1.0
+      '@smithy/protocol-http': 3.1.1
+      '@smithy/querystring-builder': 2.1.1
+      '@smithy/types': 2.9.1
+      '@smithy/util-base64': 2.1.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/hash-blob-browser@2.1.0:
-    resolution: {integrity: sha512-MVlH6algsOuEaK745oSoymk7Tusny7AqP2bQ1yPzxJiWpHirHnzEzYP/aqZaZ4gWdSLMFF65WOwL6q2ijuKVgA==}
+  /@smithy/hash-blob-browser@2.1.1:
+    resolution: {integrity: sha512-jizu1+2PAUjiGIfRtlPEU8Yo6zn+d78ti/ZHDesdf1SUn2BuZW433JlPoCOLH3dBoEEvTgLvQ8tUGSoTTALA+A==}
     dependencies:
-      '@smithy/chunked-blob-reader': 2.1.0
-      '@smithy/chunked-blob-reader-native': 2.1.0
-      '@smithy/types': 2.9.0
+      '@smithy/chunked-blob-reader': 2.1.1
+      '@smithy/chunked-blob-reader-native': 2.1.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/hash-node@2.1.0:
-    resolution: {integrity: sha512-/B7b6NNjw+i4PlwsrYHmxmmrTxp2oRejgZH26HhXE77XWwAiPEI9iHu7GZR9fYhm7Fsj66Z9Bk6JA9aEvUC9/w==}
+  /@smithy/hash-node@2.1.1:
+    resolution: {integrity: sha512-Qhoq0N8f2OtCnvUpCf+g1vSyhYQrZjhSwvJ9qvR8BUGOtTXiyv2x1OD2e6jVGmlpC4E4ax1USHoyGfV9JFsACg==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/types': 2.9.0
-      '@smithy/util-buffer-from': 2.1.0
-      '@smithy/util-utf8': 2.1.0
+      '@smithy/types': 2.9.1
+      '@smithy/util-buffer-from': 2.1.1
+      '@smithy/util-utf8': 2.1.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/hash-stream-node@2.1.0:
-    resolution: {integrity: sha512-qhgWuXt8sVcDKrFNBRQmcIo6wfzONdeKlKDLsau4kKZ7xlEHScgUFtsAHvspV8sVREJIeMbOq4oSFSVmzvOikQ==}
+  /@smithy/hash-stream-node@2.1.1:
+    resolution: {integrity: sha512-VgDaKcfCy0iHcmtAZgZ3Yw9g37Gkn2JsQiMtFQXUh8Wmo3GfNgDwLOtdhJ272pOT7DStzpe9cNr+eV5Au8KfQA==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/types': 2.9.0
-      '@smithy/util-utf8': 2.1.0
+      '@smithy/types': 2.9.1
+      '@smithy/util-utf8': 2.1.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/invalid-dependency@2.1.0:
-    resolution: {integrity: sha512-hvryGI0KChV4jMgK/kwr6U4/HaYldzjiQAZ+c//QAMDoCp0KkP0Xt94XqAkr7Uq08577mAMW5U70YCaAx+KjSQ==}
+  /@smithy/invalid-dependency@2.1.1:
+    resolution: {integrity: sha512-7WTgnKw+VPg8fxu2v9AlNOQ5yaz6RA54zOVB4f6vQuR0xFKd+RzlCpt0WidYTsye7F+FYDIaS/RnJW4pxjNInw==}
     dependencies:
-      '@smithy/types': 2.9.0
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/is-array-buffer@2.1.0:
-    resolution: {integrity: sha512-XnQvn/6ie5kjFyeW94NqSjGGOdMuB2WnNmDWKHHLVMCR/Emu7B8pcAZX4k8H3tjDujXAQvfBrEgmPRq6FgqmZg==}
+  /@smithy/is-array-buffer@2.1.1:
+    resolution: {integrity: sha512-xozSQrcUinPpNPNPds4S7z/FakDTh1MZWtRP/2vQtYB/u3HYrX2UXuZs+VhaKBd6Vc7g2XPr2ZtwGBNDN6fNKQ==}
     engines: {node: '>=14.0.0'}
     dependencies:
       tslib: 2.6.2
     dev: false
 
-  /@smithy/md5-js@2.1.0:
-    resolution: {integrity: sha512-pl0lDIn4i+J2aI2gqlCIsOczPRi+YtXS9noQ/KXMUCqapb6AWomRDAloBBxRTClBFHIV6ife9UQrOhLT/Y+Yrw==}
+  /@smithy/md5-js@2.1.1:
+    resolution: {integrity: sha512-L3MbIYBIdLlT+MWTYrdVSv/dow1+6iZ1Ad7xS0OHxTTs17d753ZcpOV4Ro7M7tRAVWML/sg2IAp/zzCb6aAttg==}
     dependencies:
-      '@smithy/types': 2.9.0
-      '@smithy/util-utf8': 2.1.0
+      '@smithy/types': 2.9.1
+      '@smithy/util-utf8': 2.1.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/middleware-content-length@2.1.0:
-    resolution: {integrity: sha512-XYhKZPuS8nnecdx0IGGUt1Nt2/ekoVOw1zal4c0ARRaLJEw+umFLxwHUelIeBocbdOcPCeZRE6pdk35Y2T2wpw==}
+  /@smithy/middleware-content-length@2.1.1:
+    resolution: {integrity: sha512-rSr9ezUl9qMgiJR0UVtVOGEZElMdGFyl8FzWEF5iEKTlcWxGr2wTqGfDwtH3LAB7h+FPkxqv4ZU4cpuCN9Kf/g==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/protocol-http': 3.1.0
-      '@smithy/types': 2.9.0
+      '@smithy/protocol-http': 3.1.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/middleware-endpoint@2.4.0:
-    resolution: {integrity: sha512-GMebLCihCxIlbPdA/l6WDpNJppIgW5OeTJkIAbqVArg1vFxZ92XhW+UwN12av5OAXswySGJ80/fpDFP7HmSyYg==}
+  /@smithy/middleware-endpoint@2.4.1:
+    resolution: {integrity: sha512-XPZTb1E2Oav60Ven3n2PFx+rX9EDsU/jSTA8VDamt7FXks67ekjPY/XrmmPDQaFJOTUHJNKjd8+kZxVO5Ael4Q==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/middleware-serde': 2.1.0
-      '@smithy/node-config-provider': 2.2.0
-      '@smithy/shared-ini-file-loader': 2.3.0
-      '@smithy/types': 2.9.0
-      '@smithy/url-parser': 2.1.0
-      '@smithy/util-middleware': 2.1.0
+      '@smithy/middleware-serde': 2.1.1
+      '@smithy/node-config-provider': 2.2.1
+      '@smithy/shared-ini-file-loader': 2.3.1
+      '@smithy/types': 2.9.1
+      '@smithy/url-parser': 2.1.1
+      '@smithy/util-middleware': 2.1.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/middleware-retry@2.1.0:
-    resolution: {integrity: sha512-lGEVds90hFyIAvypH58rwC6j9mrCR2ZwYbcxow7AgW6sWCCoBppz5FtLpgSg6QV/CTRh8K7w4kxGVx8LqINQBg==}
+  /@smithy/middleware-retry@2.1.1:
+    resolution: {integrity: sha512-eMIHOBTXro6JZ+WWzZWd/8fS8ht5nS5KDQjzhNMHNRcG5FkNTqcKpYhw7TETMYzbLfhO5FYghHy1vqDWM4FLDA==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/node-config-provider': 2.2.0
-      '@smithy/protocol-http': 3.1.0
-      '@smithy/service-error-classification': 2.1.0
-      '@smithy/smithy-client': 2.3.0
-      '@smithy/types': 2.9.0
-      '@smithy/util-middleware': 2.1.0
-      '@smithy/util-retry': 2.1.0
+      '@smithy/node-config-provider': 2.2.1
+      '@smithy/protocol-http': 3.1.1
+      '@smithy/service-error-classification': 2.1.1
+      '@smithy/smithy-client': 2.3.1
+      '@smithy/types': 2.9.1
+      '@smithy/util-middleware': 2.1.1
+      '@smithy/util-retry': 2.1.1
       tslib: 2.6.2
       uuid: 8.3.2
     dev: false
 
-  /@smithy/middleware-serde@2.1.0:
-    resolution: {integrity: sha512-iysAUIDKsc354HMnYVQxMJEzNaOrQQvE86b1oSl2fRwcFqn+9TTi028a37PLFE+ccAiyVGjBjB8PBsAz9plUug==}
+  /@smithy/middleware-serde@2.1.1:
+    resolution: {integrity: sha512-D8Gq0aQBeE1pxf3cjWVkRr2W54t+cdM2zx78tNrVhqrDykRA7asq8yVJij1u5NDtKzKqzBSPYh7iW0svUKg76g==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/types': 2.9.0
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/middleware-stack@2.1.0:
-    resolution: {integrity: sha512-y5Ph/TWfO7oTfxNqKU+uAK5cFRTYeP16ReOmDweq+zQ8NQODDg7LSxsfQT4Wp0mhIvm0bt3pZp66T1YMtnihWw==}
+  /@smithy/middleware-stack@2.1.1:
+    resolution: {integrity: sha512-KPJhRlhsl8CjgGXK/DoDcrFGfAqoqvuwlbxy+uOO4g2Azn1dhH+GVfC3RAp+6PoL5PWPb+vt6Z23FP+Mr6qeCw==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/types': 2.9.0
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/node-config-provider@2.2.0:
-    resolution: {integrity: sha512-rU82PFR32Bxo4EMGUJ2BGG+K97zUp9j6SWjG83T2itmbXwA/+DoCc4xCON8kcmdej822x1yLcSzFiTeg0b472w==}
+  /@smithy/node-config-provider@2.2.1:
+    resolution: {integrity: sha512-epzK3x1xNxA9oJgHQ5nz+2j6DsJKdHfieb+YgJ7ATWxzNcB7Hc+Uya2TUck5MicOPhDV8HZImND7ZOecVr+OWg==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/property-provider': 2.1.0
-      '@smithy/shared-ini-file-loader': 2.3.0
-      '@smithy/types': 2.9.0
+      '@smithy/property-provider': 2.1.1
+      '@smithy/shared-ini-file-loader': 2.3.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/node-http-handler@2.3.0:
-    resolution: {integrity: sha512-8jcQaOdrD/X0VihhM2W/KtJ5fvKaT8UpNf/pl/epvLQ6MkAttIMaCLex6xk31BpFSPvS2+q65ZdBBjQ3cMOSiA==}
+  /@smithy/node-http-handler@2.3.1:
+    resolution: {integrity: sha512-gLA8qK2nL9J0Rk/WEZSvgin4AppvuCYRYg61dcUo/uKxvMZsMInL5I5ZdJTogOvdfVug3N2dgI5ffcUfS4S9PA==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/abort-controller': 2.1.0
-      '@smithy/protocol-http': 3.1.0
-      '@smithy/querystring-builder': 2.1.0
-      '@smithy/types': 2.9.0
+      '@smithy/abort-controller': 2.1.1
+      '@smithy/protocol-http': 3.1.1
+      '@smithy/querystring-builder': 2.1.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/property-provider@2.1.0:
-    resolution: {integrity: sha512-6cpCSsgwbKHnl567SrthpqLgZ7e5jc7qPHG6wz9U2T24vcUp2yiG0vdAlH1QdTH20+/PGamKR0ZM35a08X1Tbg==}
+  /@smithy/property-provider@2.1.1:
+    resolution: {integrity: sha512-FX7JhhD/o5HwSwg6GLK9zxrMUrGnb3PzNBrcthqHKBc3dH0UfgEAU24xnJ8F0uow5mj17UeBEOI6o3CF2k7Mhw==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/types': 2.9.0
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/protocol-http@3.1.0:
-    resolution: {integrity: sha512-CGNzkKza1yUga7sv+U4gx3jbwSh5x42/9vy0E/NoR2HTFken2MuMc/bClxXAO0Z6EQoTYHHA6FMCREXwSP04lg==}
+  /@smithy/protocol-http@3.1.1:
+    resolution: {integrity: sha512-6ZRTSsaXuSL9++qEwH851hJjUA0OgXdQFCs+VDw4tGH256jQ3TjYY/i34N4vd24RV3nrjNsgd1yhb57uMoKbzQ==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/types': 2.9.0
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/querystring-builder@2.1.0:
-    resolution: {integrity: sha512-8QColSkqn9TbvpX40zW0T8IrKcLXg7Um4bczm9qIYDRPh8T873WNIOWzYBw8chI8SWizMXbsSR95PFCP/YlgYw==}
+  /@smithy/querystring-builder@2.1.1:
+    resolution: {integrity: sha512-C/ko/CeEa8jdYE4gt6nHO5XDrlSJ3vdCG0ZAc6nD5ZIE7LBp0jCx4qoqp7eoutBu7VrGMXERSRoPqwi1WjCPbg==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/types': 2.9.0
-      '@smithy/util-uri-escape': 2.1.0
+      '@smithy/types': 2.9.1
+      '@smithy/util-uri-escape': 2.1.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/querystring-parser@2.1.0:
-    resolution: {integrity: sha512-+l17LQQxelslo5CHsLXwSw2F1J6Qmf64OgByreNnLR82gHkJ91ZbMFhxZeLTo2qXxEu0uqraMc4uNw8qE9A6bw==}
+  /@smithy/querystring-parser@2.1.1:
+    resolution: {integrity: sha512-H4+6jKGVhG1W4CIxfBaSsbm98lOO88tpDWmZLgkJpt8Zkk/+uG0FmmqMuCAc3HNM2ZDV+JbErxr0l5BcuIf/XQ==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/types': 2.9.0
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/service-error-classification@2.1.0:
-    resolution: {integrity: sha512-yBMJk4IfYqUxsPmc8P0YtWHd/Kbd0PP+kU0dgFksH6eiE2ZQJl7478xNtkUKp2QJLcooYEbA3gBFUza6ukXMiA==}
+  /@smithy/service-error-classification@2.1.1:
+    resolution: {integrity: sha512-txEdZxPUgM1PwGvDvHzqhXisrc5LlRWYCf2yyHfvITWioAKat7srQvpjMAvgzf0t6t7j8yHrryXU9xt7RZqFpw==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/types': 2.9.0
+      '@smithy/types': 2.9.1
     dev: false
 
-  /@smithy/shared-ini-file-loader@2.3.0:
-    resolution: {integrity: sha512-jgm7cjj0d08jIB9cp4idtpIUY590Twecv4xpijgl2IzkrPfBddzKTH4Zk+Zwfyk8ecz2T/7ihqtnNcq7Qdj9lw==}
+  /@smithy/shared-ini-file-loader@2.3.1:
+    resolution: {integrity: sha512-2E2kh24igmIznHLB6H05Na4OgIEilRu0oQpYXo3LCNRrawHAcfDKq9004zJs+sAMt2X5AbY87CUCJ7IpqpSgdw==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/types': 2.9.0
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/signature-v4@2.1.0:
-    resolution: {integrity: sha512-ONi89MBjxNtl497obaO/qGixsOedikTV3CAj3ZBPGY3IKykS8wQ2Wkctsx2T1J5B9OnynH0KuGGmgG91utX/7w==}
+  /@smithy/signature-v4@2.1.1:
+    resolution: {integrity: sha512-Hb7xub0NHuvvQD3YwDSdanBmYukoEkhqBjqoxo+bSdC0ryV9cTfgmNjuAQhTPYB6yeU7hTR+sPRiFMlxqv6kmg==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/eventstream-codec': 2.1.0
-      '@smithy/is-array-buffer': 2.1.0
-      '@smithy/types': 2.9.0
-      '@smithy/util-hex-encoding': 2.1.0
-      '@smithy/util-middleware': 2.1.0
-      '@smithy/util-uri-escape': 2.1.0
-      '@smithy/util-utf8': 2.1.0
+      '@smithy/eventstream-codec': 2.1.1
+      '@smithy/is-array-buffer': 2.1.1
+      '@smithy/types': 2.9.1
+      '@smithy/util-hex-encoding': 2.1.1
+      '@smithy/util-middleware': 2.1.1
+      '@smithy/util-uri-escape': 2.1.1
+      '@smithy/util-utf8': 2.1.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/smithy-client@2.3.0:
-    resolution: {integrity: sha512-oEaLdVmHcbdK8IHQ4yE7xOYK2nSkF2xXp6nRr5NhfKB5QTKNzpNsXLiGJgfmm7j0ol1S6BhjyBhi7tZ8M0JJtg==}
+  /@smithy/smithy-client@2.3.1:
+    resolution: {integrity: sha512-YsTdU8xVD64r2pLEwmltrNvZV6XIAC50LN6ivDopdt+YiF/jGH6PY9zUOu0CXD/d8GMB8gbhnpPsdrjAXHS9QA==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/middleware-endpoint': 2.4.0
-      '@smithy/middleware-stack': 2.1.0
-      '@smithy/protocol-http': 3.1.0
-      '@smithy/types': 2.9.0
-      '@smithy/util-stream': 2.1.0
+      '@smithy/middleware-endpoint': 2.4.1
+      '@smithy/middleware-stack': 2.1.1
+      '@smithy/protocol-http': 3.1.1
+      '@smithy/types': 2.9.1
+      '@smithy/util-stream': 2.1.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/types@2.9.0:
-    resolution: {integrity: sha512-ST1M87Lf2cLHRI+irEFRIHXGY08HHTAUbiRFYkmFyJdTMg3VDxkcm7DwW9/EgV3X8M6wDPrbIkx/RXONyttrQg==}
+  /@smithy/types@2.9.1:
+    resolution: {integrity: sha512-vjXlKNXyprDYDuJ7UW5iobdmyDm6g8dDG+BFUncAg/3XJaN45Gy5RWWWUVgrzIK7S4R1KWgIX5LeJcfvSI24bw==}
     engines: {node: '>=14.0.0'}
     dependencies:
       tslib: 2.6.2
     dev: false
 
-  /@smithy/url-parser@2.1.0:
-    resolution: {integrity: sha512-V3FMzNFCDwQNAgJdxI6Gj48qP9WAyvK59WE90hOoya3m8ey02uLDhWjZkl+505s7iTVVmJ7Mr7nKwG5vU2NIMQ==}
+  /@smithy/url-parser@2.1.1:
+    resolution: {integrity: sha512-qC9Bv8f/vvFIEkHsiNrUKYNl8uKQnn4BdhXl7VzQRP774AwIjiSMMwkbT+L7Fk8W8rzYVifzJNYxv1HwvfBo3Q==}
     dependencies:
-      '@smithy/querystring-parser': 2.1.0
-      '@smithy/types': 2.9.0
+      '@smithy/querystring-parser': 2.1.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/util-base64@2.1.0:
-    resolution: {integrity: sha512-zjXlHFm7S+TEDVA3j1rWGpuNDTlTxIWDqzwIfWUENT0VqCGDAdJITd8RYVjduf3u8HWMlgALkrY6B62UTESQ5w==}
+  /@smithy/util-base64@2.1.1:
+    resolution: {integrity: sha512-UfHVpY7qfF/MrgndI5PexSKVTxSZIdz9InghTFa49QOvuu9I52zLPLUHXvHpNuMb1iD2vmc6R+zbv/bdMipR/g==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/util-buffer-from': 2.1.0
+      '@smithy/util-buffer-from': 2.1.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/util-body-length-browser@2.1.0:
-    resolution: {integrity: sha512-fkLY8W+jXGSkymLNe9NB7u6lGflHz6w1R+a3RxLOK6UrtwU4LBLskAP5Ag/zVPUNd5tmfv3/W6cTVzk8IBJuiw==}
+  /@smithy/util-body-length-browser@2.1.1:
+    resolution: {integrity: sha512-ekOGBLvs1VS2d1zM2ER4JEeBWAvIOUKeaFch29UjjJsxmZ/f0L3K3x0dEETgh3Q9bkZNHgT+rkdl/J/VUqSRag==}
     dependencies:
       tslib: 2.6.2
     dev: false
 
-  /@smithy/util-body-length-node@2.2.0:
-    resolution: {integrity: sha512-ZLsqYH+s71y6Oc2Auws6zYI4LzsSi6N8+W+Gq7CwXaZm7QIKGiCeEunEwxo50OGAqJs0g6F9kCIwNxhlK1s4Aw==}
+  /@smithy/util-body-length-node@2.2.1:
+    resolution: {integrity: sha512-/ggJG+ta3IDtpNVq4ktmEUtOkH1LW64RHB5B0hcr5ZaWBmo96UX2cIOVbjCqqDickTXqBWZ4ZO0APuaPrD7Abg==}
     engines: {node: '>=14.0.0'}
     dependencies:
       tslib: 2.6.2
     dev: false
 
-  /@smithy/util-buffer-from@2.1.0:
-    resolution: {integrity: sha512-3w7AM0moGyBmr9gMBGE7+pqG3cjboRvmMyRhpesbJoOUHO0BV1Qrk00M/wQ3EHJAQXM3dehQfFNUf7sR6nT6+Q==}
+  /@smithy/util-buffer-from@2.1.1:
+    resolution: {integrity: sha512-clhNjbyfqIv9Md2Mg6FffGVrJxw7bgK7s3Iax36xnfVj6cg0fUG7I4RH0XgXJF8bxi+saY5HR21g2UPKSxVCXg==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/is-array-buffer': 2.1.0
+      '@smithy/is-array-buffer': 2.1.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/util-config-provider@2.2.0:
-    resolution: {integrity: sha512-D3Gx0BWXjsn1E25ikUt0+yc8oZnViTa5IHZ1JvD9J1NyyVS4c3IgHqbG64XRverEMnhzUb0EhqMTwQTY12in+w==}
+  /@smithy/util-config-provider@2.2.1:
+    resolution: {integrity: sha512-50VL/tx9oYYcjJn/qKqNy7sCtpD0+s8XEBamIFo4mFFTclKMNp+rsnymD796uybjiIquB7VCB/DeafduL0y2kw==}
     engines: {node: '>=14.0.0'}
     dependencies:
       tslib: 2.6.2
     dev: false
 
-  /@smithy/util-defaults-mode-browser@2.1.0:
-    resolution: {integrity: sha512-zmXL4aKeBGBz02kDZdks2QfG+HGq99Tp4/ICPmu2OvSbwTOLjmlCnUrtZJTmLhX4etP3o0voOL9gFEa2PSjlJg==}
+  /@smithy/util-defaults-mode-browser@2.1.1:
+    resolution: {integrity: sha512-lqLz/9aWRO6mosnXkArtRuQqqZBhNpgI65YDpww4rVQBuUT7qzKbDLG5AmnQTCiU4rOquaZO/Kt0J7q9Uic7MA==}
     engines: {node: '>= 10.0.0'}
     dependencies:
-      '@smithy/property-provider': 2.1.0
-      '@smithy/smithy-client': 2.3.0
-      '@smithy/types': 2.9.0
+      '@smithy/property-provider': 2.1.1
+      '@smithy/smithy-client': 2.3.1
+      '@smithy/types': 2.9.1
       bowser: 2.11.0
       tslib: 2.6.2
     dev: false
 
-  /@smithy/util-defaults-mode-node@2.1.0:
-    resolution: {integrity: sha512-pVBaw2fBJMjjJj+AR69xQhjzYLZ5u9azdKyaAAjR16dthdBOcnczBClBVCfhb/Moj0ivIHnaXJ5AXCdbDok94g==}
+  /@smithy/util-defaults-mode-node@2.1.1:
+    resolution: {integrity: sha512-tYVrc+w+jSBfBd267KDnvSGOh4NMz+wVH7v4CClDbkdPfnjvImBZsOURncT5jsFwR9KCuDyPoSZq4Pa6+eCUrA==}
     engines: {node: '>= 10.0.0'}
     dependencies:
-      '@smithy/config-resolver': 2.1.0
-      '@smithy/credential-provider-imds': 2.2.0
-      '@smithy/node-config-provider': 2.2.0
-      '@smithy/property-provider': 2.1.0
-      '@smithy/smithy-client': 2.3.0
-      '@smithy/types': 2.9.0
+      '@smithy/config-resolver': 2.1.1
+      '@smithy/credential-provider-imds': 2.2.1
+      '@smithy/node-config-provider': 2.2.1
+      '@smithy/property-provider': 2.1.1
+      '@smithy/smithy-client': 2.3.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/util-endpoints@1.1.0:
-    resolution: {integrity: sha512-gKzfdj5pyEOg1fVOsZVpVPRWAXbWqt9JgZdwU4cjKlJ57Fuccfk0ui5twh1TYvuJWtR2Tw3GwUmUuBM3qRWJJg==}
+  /@smithy/util-endpoints@1.1.1:
+    resolution: {integrity: sha512-sI4d9rjoaekSGEtq3xSb2nMjHMx8QXcz2cexnVyRWsy4yQ9z3kbDpX+7fN0jnbdOp0b3KSTZJZ2Yb92JWSanLw==}
     engines: {node: '>= 14.0.0'}
     dependencies:
-      '@smithy/node-config-provider': 2.2.0
-      '@smithy/types': 2.9.0
+      '@smithy/node-config-provider': 2.2.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/util-hex-encoding@2.1.0:
-    resolution: {integrity: sha512-haxSIaBxn3p/lK+bEyqC32myHffacBLD61/HHzBGcG1Vo8dFTm5y0vhdR5R4wakW7H8Tr/czx+uckDOWZ1Km9Q==}
+  /@smithy/util-hex-encoding@2.1.1:
+    resolution: {integrity: sha512-3UNdP2pkYUUBGEXzQI9ODTDK+Tcu1BlCyDBaRHwyxhA+8xLP8agEKQq4MGmpjqb4VQAjq9TwlCQX0kP6XDKYLg==}
     engines: {node: '>=14.0.0'}
     dependencies:
       tslib: 2.6.2
     dev: false
 
-  /@smithy/util-middleware@2.1.0:
-    resolution: {integrity: sha512-bKfhAsdjRyGmYDsJUW5hPsL3qofgPgLPsuV+V6nNGyD/kjMobwstiIpA3ddGFT+XDwVOIUHElg7I06/wOpwKiQ==}
+  /@smithy/util-middleware@2.1.1:
+    resolution: {integrity: sha512-mKNrk8oz5zqkNcbcgAAepeJbmfUW6ogrT2Z2gDbIUzVzNAHKJQTYmH9jcy0jbWb+m7ubrvXKb6uMjkSgAqqsFA==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/types': 2.9.0
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/util-retry@2.1.0:
-    resolution: {integrity: sha512-igJw+/olhAUtocMbEMBjy8SKRTHfefS+qcgmMUVEBLFgLjqMfpc8EDVB1BebNBQ1rre5yLDbi2UHUz48eZNkPQ==}
+  /@smithy/util-retry@2.1.1:
+    resolution: {integrity: sha512-Mg+xxWPTeSPrthpC5WAamJ6PW4Kbo01Fm7lWM1jmGRvmrRdsd3192Gz2fBXAMURyXpaNxyZf6Hr/nQ4q70oVEA==}
     engines: {node: '>= 14.0.0'}
     dependencies:
-      '@smithy/service-error-classification': 2.1.0
-      '@smithy/types': 2.9.0
+      '@smithy/service-error-classification': 2.1.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/util-stream@2.1.0:
-    resolution: {integrity: sha512-lcw9JVXLHvRawaXnfxdnGRw5pQM5c9XMEkBuMec+fIhGuPHIezqhQq7oO0jJcj0xwupJzW6HAvinktr9ozdKyg==}
+  /@smithy/util-stream@2.1.1:
+    resolution: {integrity: sha512-J7SMIpUYvU4DQN55KmBtvaMc7NM3CZ2iWICdcgaovtLzseVhAqFRYqloT3mh0esrFw+3VEK6nQFteFsTqZSECQ==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/fetch-http-handler': 2.4.0
-      '@smithy/node-http-handler': 2.3.0
-      '@smithy/types': 2.9.0
-      '@smithy/util-base64': 2.1.0
-      '@smithy/util-buffer-from': 2.1.0
-      '@smithy/util-hex-encoding': 2.1.0
-      '@smithy/util-utf8': 2.1.0
+      '@smithy/fetch-http-handler': 2.4.1
+      '@smithy/node-http-handler': 2.3.1
+      '@smithy/types': 2.9.1
+      '@smithy/util-base64': 2.1.1
+      '@smithy/util-buffer-from': 2.1.1
+      '@smithy/util-hex-encoding': 2.1.1
+      '@smithy/util-utf8': 2.1.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/util-uri-escape@2.1.0:
-    resolution: {integrity: sha512-ZHYFGyF9o/MHGMGtsHfkxnn2DhGRZlDIFGNgipu4K3x8jMEVahQ+tGnlkFVMM2QrSQHCcjICbBTJ5JEgaD5+Jg==}
+  /@smithy/util-uri-escape@2.1.1:
+    resolution: {integrity: sha512-saVzI1h6iRBUVSqtnlOnc9ssU09ypo7n+shdQ8hBTZno/9rZ3AuRYvoHInV57VF7Qn7B+pFJG7qTzFiHxWlWBw==}
     engines: {node: '>=14.0.0'}
     dependencies:
       tslib: 2.6.2
     dev: false
 
-  /@smithy/util-utf8@2.1.0:
-    resolution: {integrity: sha512-RnNNedYLpsNPQocMhr0nGEz0mGKdzI5dBi0h7vvmimULtBlyElgX1/hXozlkurIgx8R3bSy14/oRtmDsFClifg==}
+  /@smithy/util-utf8@2.1.1:
+    resolution: {integrity: sha512-BqTpzYEcUMDwAKr7/mVRUtHDhs6ZoXDi9NypMvMfOr/+u1NW7JgqodPDECiiLboEm6bobcPcECxzjtQh865e9A==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/util-buffer-from': 2.1.0
+      '@smithy/util-buffer-from': 2.1.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/util-waiter@2.1.0:
-    resolution: {integrity: sha512-BqfpYb4oNsQn6hhd4zDk8X6srVmiNOXHBFQz0vQSScS8Zliam7oLjlf/gHw02ewwxzi9229UQZF+UnG2jV6JGw==}
+  /@smithy/util-waiter@2.1.1:
+    resolution: {integrity: sha512-kYy6BLJJNif+uqNENtJqWdXcpqo1LS+nj1AfXcDhOpqpSHJSAkVySLyZV9fkmuVO21lzGoxjvd1imGGJHph/IA==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/abort-controller': 2.1.0
-      '@smithy/types': 2.9.0
+      '@smithy/abort-controller': 2.1.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
@@ -4348,8 +4333,8 @@ packages:
       - typescript
     dev: true
 
-  /@swc/wasm@1.3.104:
-    resolution: {integrity: sha512-NtJscObQuMsYIeRV5YhUPI0SCWeMgPBHekbEJUtogxx6UYGiyVYeaX2k2ez0k3fFmY4/644tYVKOAlLs59g9Ww==}
+  /@swc/wasm@1.3.105:
+    resolution: {integrity: sha512-I65R/dXLbSqPJ+9FZ4/aWCMPhHsrROE/8E9ASTlDyBNLEBOmCKO2x+TZCg9yGhH9HNVPucx+k0dNlyzXlSWTDA==}
     dev: false
 
   /@tailwindcss/aspect-ratio@0.4.2(tailwindcss@3.4.1):
@@ -4959,7 +4944,6 @@ packages:
 
   /@ungap/structured-clone@1.2.0:
     resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==}
-    dev: true
 
   /@unhead/dom@1.8.10:
     resolution: {integrity: sha512-dBeDbHrBjeU+eVgMsD91TGEazb1dwLrY0x/ve01CldMCmm+WcRu++SUW7s1QX84mzGH2EgFz78o1OPn6jpV3zw==}
@@ -4984,17 +4968,6 @@ packages:
       '@unhead/schema': 1.8.10
       '@unhead/shared': 1.8.10
 
-  /@unhead/vue@1.8.10(vue@3.4.14):
-    resolution: {integrity: sha512-KF8pftHnxnlBlgNpKXWLTg3ZUtkuDCxRPUFSDBy9CtqRSX/qvAhLZ26mbqRVmHj8KigiRHP/wnPWNyGnUx20Bg==}
-    peerDependencies:
-      vue: '>=2.7 || >=3'
-    dependencies:
-      '@unhead/schema': 1.8.10
-      '@unhead/shared': 1.8.10
-      hookable: 5.5.3
-      unhead: 1.8.10
-      vue: 3.4.14(typescript@5.3.3)
-
   /@unhead/vue@1.8.10(vue@3.4.15):
     resolution: {integrity: sha512-KF8pftHnxnlBlgNpKXWLTg3ZUtkuDCxRPUFSDBy9CtqRSX/qvAhLZ26mbqRVmHj8KigiRHP/wnPWNyGnUx20Bg==}
     peerDependencies:
@@ -5005,9 +4978,8 @@ packages:
       hookable: 5.5.3
       unhead: 1.8.10
       vue: 3.4.15(typescript@5.3.3)
-    dev: true
 
-  /@unocss/astro@0.58.3(vite@5.0.11):
+  /@unocss/astro@0.58.3(vite@5.0.12):
     resolution: {integrity: sha512-qJL+XkWYJhEIX4AmOtbfb2Zu4holTDpRscfvVci4T+2VWjyE3mgtsyNzi9ZChe/hdEPRa7g26gSpNQeMhjh/Kw==}
     peerDependencies:
       vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0 || ^5.0.0-0
@@ -5017,8 +4989,8 @@ packages:
     dependencies:
       '@unocss/core': 0.58.3
       '@unocss/reset': 0.58.3
-      '@unocss/vite': 0.58.3(vite@5.0.11)
-      vite: 5.0.11(@types/node@20.11.5)
+      '@unocss/vite': 0.58.3(vite@5.0.12)
+      vite: 5.0.12(@types/node@20.11.5)
     transitivePeerDependencies:
       - rollup
     dev: true
@@ -5102,7 +5074,7 @@ packages:
       sirv: 2.0.4
     dev: true
 
-  /@unocss/nuxt@0.58.3(postcss@8.4.33)(vite@5.0.11)(webpack@5.89.0):
+  /@unocss/nuxt@0.58.3(postcss@8.4.33)(vite@5.0.12)(webpack@5.89.0):
     resolution: {integrity: sha512-dDQVKb8VtJt2/8SE6/vK1foEaqoTXVUUVq/TT7rSRLHdvRSVKE7M2eeoTS+k38RYdeooMx9YCtzwZDxun6caeQ==}
     dependencies:
       '@nuxt/kit': 3.9.3
@@ -5116,9 +5088,9 @@ packages:
       '@unocss/preset-web-fonts': 0.58.3
       '@unocss/preset-wind': 0.58.3
       '@unocss/reset': 0.58.3
-      '@unocss/vite': 0.58.3(vite@5.0.11)
+      '@unocss/vite': 0.58.3(vite@5.0.12)
       '@unocss/webpack': 0.58.3(webpack@5.89.0)
-      unocss: 0.58.3(@unocss/webpack@0.58.3)(postcss@8.4.33)(vite@5.0.11)
+      unocss: 0.58.3(@unocss/webpack@0.58.3)(postcss@8.4.33)(vite@5.0.12)
     transitivePeerDependencies:
       - postcss
       - rollup
@@ -5255,7 +5227,7 @@ packages:
       '@unocss/core': 0.58.3
     dev: true
 
-  /@unocss/vite@0.58.3(vite@5.0.11):
+  /@unocss/vite@0.58.3(vite@5.0.12):
     resolution: {integrity: sha512-gmB2//z7lDEK7Bw5HbHTSQ3abOM0iveAY/W3L3FFXpvduoxMQyuI5dDk0hOCtzhAWeJoynnVN4MBGVmXM4Y/Mg==}
     peerDependencies:
       vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0 || ^5.0.0-0
@@ -5270,7 +5242,7 @@ packages:
       chokidar: 3.5.3
       fast-glob: 3.3.2
       magic-string: 0.30.5
-      vite: 5.0.11(@types/node@20.11.5)
+      vite: 5.0.12(@types/node@20.11.5)
     transitivePeerDependencies:
       - rollup
     dev: true
@@ -5294,12 +5266,10 @@ packages:
       - rollup
     dev: true
 
-  /@upstash/redis@1.20.0:
-    resolution: {integrity: sha512-jhOfwBF/dZpx0Gd139YB2KTXqkBrB1fksK0jzSqep5QZyN1cfcZUy5QfcSen5EEdYyUSmWefBzNqGWSJustsJg==}
+  /@upstash/redis@1.28.2:
+    resolution: {integrity: sha512-e4HmmCji6kE6UnriU92sAVGLQcRYAB4fXSPXls08cjW7zdE/wFaDfhAGi1/T4/wUN50bAy/lpHwW4bMkI2EAcw==}
     dependencies:
-      isomorphic-fetch: 3.0.0
-    transitivePeerDependencies:
-      - encoding
+      crypto-js: 4.2.0
 
   /@vercel/nft@0.24.4:
     resolution: {integrity: sha512-KjYAZty7boH5fi5udp6p+lNu6nawgs++pHW+3koErMgbRkkHuToGX/FwjN5clV1FcaM3udfd4zW/sUapkMgpZw==}
@@ -5321,7 +5291,7 @@ packages:
       - encoding
       - supports-color
 
-  /@vitejs/plugin-vue-jsx@3.1.0(vite@5.0.11)(vue@3.4.14):
+  /@vitejs/plugin-vue-jsx@3.1.0(vite@5.0.11)(vue@3.4.15):
     resolution: {integrity: sha512-w9M6F3LSEU5kszVb9An2/MmXNxocAnUb3WhRr8bHlimhDrXNt6n6D2nJQR3UXpGlZHh/EsgouOHCsM8V3Ln+WA==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
@@ -5332,11 +5302,11 @@ packages:
       '@babel/plugin-transform-typescript': 7.23.6(@babel/core@7.23.7)
       '@vue/babel-plugin-jsx': 1.1.6(@babel/core@7.23.7)
       vite: 5.0.11(@types/node@20.11.5)
-      vue: 3.4.14(typescript@5.3.3)
+      vue: 3.4.15(typescript@5.3.3)
     transitivePeerDependencies:
       - supports-color
 
-  /@vitejs/plugin-vue@5.0.3(vite@5.0.11)(vue@3.4.14):
+  /@vitejs/plugin-vue@5.0.3(vite@5.0.11)(vue@3.4.15):
     resolution: {integrity: sha512-b8S5dVS40rgHdDrw+DQi/xOM9ed+kSRZzfm1T74bMmBDCd8XO87NKlFYInzCtwvtWwXZvo1QxE2OSspTATWrbA==}
     engines: {node: ^18.0.0 || >=20.0.0}
     peerDependencies:
@@ -5344,7 +5314,7 @@ packages:
       vue: ^3.2.25
     dependencies:
       vite: 5.0.11(@types/node@20.11.5)
-      vue: 3.4.14(typescript@5.3.3)
+      vue: 3.4.15(typescript@5.3.3)
 
   /@vitest/expect@1.2.1:
     resolution: {integrity: sha512-/bqGXcHfyKgFWYwIgFr1QYDaR9e64pRKxgBNWNXPefPFRhgm+K3+a/dS0cUGEreWngets3dlr8w8SBRw2fCfFQ==}
@@ -5401,11 +5371,11 @@ packages:
       '@volar/language-core': 1.11.1
       path-browserify: 1.0.1
 
-  /@vue-email/cli@0.0.9(typescript@5.3.3)(vue@3.4.15):
-    resolution: {integrity: sha512-cpowdprs+KPkpChboy27vIdDPVaM/k94OdufO9ldMnLiKTNDx2j89wCwv+J00IKwFaz1KrfgJrkDiCOoPO2pHA==}
+  /@vue-email/cli@0.0.10(typescript@5.3.3)(vue@3.4.15):
+    resolution: {integrity: sha512-F99FOPQ8++SGJ8toAqboiW78o2d9ZDMmh7B9x8OZBvHyq/cH4KZca3VCQ9JaaOX4Rrovu6R3mwdPgJhtfK+l8A==}
     hasBin: true
     dependencies:
-      '@vue-email/compiler': 0.8.7(typescript@5.3.3)(vue@3.4.15)
+      '@vue-email/compiler': 0.8.8(typescript@5.3.3)(vue@3.4.15)
     transitivePeerDependencies:
       - bufferutil
       - canvas
@@ -5416,8 +5386,8 @@ packages:
       - vue
     dev: false
 
-  /@vue-email/compiler@0.8.7(typescript@5.3.3)(vue@3.4.15):
-    resolution: {integrity: sha512-tBeJqDyiiBXvvSx38GJMv9eZo+ZNknP2JKEGm6UztWTH8slljnceRx8Z4Sr3gBlcGBZcyKqVgdY/eTT4mfgyag==}
+  /@vue-email/compiler@0.8.8(typescript@5.3.3)(vue@3.4.15):
+    resolution: {integrity: sha512-oYYFxps8c7KJ1/pg72JfoBAhzq0PJCRx+YsUhv++t062G281vrPcMn36MfDtPPejn3cafBWU5H2P6d2HvrBY1g==}
     peerDependencies:
       vue: ^3.3.8
     dependencies:
@@ -5425,7 +5395,7 @@ packages:
       kolorist: 1.8.0
       scule: 1.2.0
       vue: 3.4.15(typescript@5.3.3)
-      vue-email: 0.8.5(typescript@5.3.3)(vue@3.4.15)
+      vue-email: 0.8.6(typescript@5.3.3)(vue@3.4.15)
     transitivePeerDependencies:
       - bufferutil
       - canvas
@@ -5435,14 +5405,14 @@ packages:
       - utf-8-validate
     dev: false
 
-  /@vue-email/nuxt@0.8.9(typescript@5.3.3)(vue@3.4.15):
-    resolution: {integrity: sha512-pQEWzlrkFGCV84G/pbk5fwNCAj4EAfxNp+pR7D2C6lqxHvJhPi3n7sEl5EVeoS3hPgB/OlRdMLFE+RdokSjt/Q==}
+  /@vue-email/nuxt@0.8.11(typescript@5.3.3)(vue@3.4.15):
+    resolution: {integrity: sha512-IK8AyQ7ZUvQdfBFwm3eTLK163J50CvIKHbZ96IDLN4H1Jd/k3gcRn3+tNhpl4RODqc2rGBOVMAuvn1qR5rxMow==}
     dependencies:
       '@nuxt/kit': 3.9.3
-      '@vue-email/compiler': 0.8.7(typescript@5.3.3)(vue@3.4.15)
+      '@vue-email/compiler': 0.8.8(typescript@5.3.3)(vue@3.4.15)
       defu: 6.1.4
       sirv: 2.0.4
-      vue-email: 0.8.5(typescript@5.3.3)(vue@3.4.15)
+      vue-email: 0.8.6(typescript@5.3.3)(vue@3.4.15)
     transitivePeerDependencies:
       - bufferutil
       - canvas
@@ -5465,7 +5435,7 @@ packages:
       - ts-node
     dev: false
 
-  /@vue-macros/common@1.10.0(vue@3.4.14):
+  /@vue-macros/common@1.10.0(vue@3.4.15):
     resolution: {integrity: sha512-4DZsPeQA/nBQDw2RkYAmH7KrFjJVrMdAhJhO1JCl1bbbFXCGeoGjXfkg9wHPppj47s2HpAB3GrqNwqVGbi12NQ==}
     engines: {node: '>=16.14.0'}
     peerDependencies:
@@ -5476,11 +5446,11 @@ packages:
     dependencies:
       '@babel/types': 7.23.6
       '@rollup/pluginutils': 5.1.0(rollup@3.29.4)
-      '@vue/compiler-sfc': 3.4.14
+      '@vue/compiler-sfc': 3.4.15
       ast-kit: 0.11.3
       local-pkg: 0.5.0
       magic-string-ast: 0.3.0
-      vue: 3.4.14(typescript@5.3.3)
+      vue: 3.4.15(typescript@5.3.3)
     transitivePeerDependencies:
       - rollup
 
@@ -5508,15 +5478,6 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /@vue/compiler-core@3.4.14:
-    resolution: {integrity: sha512-ro4Zzl/MPdWs7XwxT7omHRxAjMbDFRZEEjD+2m3NBf8YzAe3HuoSEZosXQo+m1GQ1G3LQ1LdmNh1RKTYe+ssEg==}
-    dependencies:
-      '@babel/parser': 7.23.6
-      '@vue/shared': 3.4.14
-      entities: 4.5.0
-      estree-walker: 2.0.2
-      source-map-js: 1.0.2
-
   /@vue/compiler-core@3.4.15:
     resolution: {integrity: sha512-XcJQVOaxTKCnth1vCxEChteGuwG6wqnUHxAm1DO3gCz0+uXKaJNx8/digSz4dLALCy8n2lKq24jSUs8segoqIw==}
     dependencies:
@@ -5526,31 +5487,12 @@ packages:
       estree-walker: 2.0.2
       source-map-js: 1.0.2
 
-  /@vue/compiler-dom@3.4.14:
-    resolution: {integrity: sha512-nOZTY+veWNa0DKAceNWxorAbWm0INHdQq7cejFaWM1WYnoNSJbSEKYtE7Ir6lR/+mo9fttZpPVI9ZFGJ1juUEQ==}
-    dependencies:
-      '@vue/compiler-core': 3.4.14
-      '@vue/shared': 3.4.14
-
   /@vue/compiler-dom@3.4.15:
     resolution: {integrity: sha512-wox0aasVV74zoXyblarOM3AZQz/Z+OunYcIHe1OsGclCHt8RsRm04DObjefaI82u6XDzv+qGWZ24tIsRAIi5MQ==}
     dependencies:
       '@vue/compiler-core': 3.4.15
       '@vue/shared': 3.4.15
 
-  /@vue/compiler-sfc@3.4.14:
-    resolution: {integrity: sha512-1vHc9Kv1jV+YBZC/RJxQJ9JCxildTI+qrhtDh6tPkR1O8S+olBUekimY0km0ZNn8nG1wjtFAe9XHij+YLR8cRQ==}
-    dependencies:
-      '@babel/parser': 7.23.6
-      '@vue/compiler-core': 3.4.14
-      '@vue/compiler-dom': 3.4.14
-      '@vue/compiler-ssr': 3.4.14
-      '@vue/shared': 3.4.14
-      estree-walker: 2.0.2
-      magic-string: 0.30.5
-      postcss: 8.4.33
-      source-map-js: 1.0.2
-
   /@vue/compiler-sfc@3.4.15:
     resolution: {integrity: sha512-LCn5M6QpkpFsh3GQvs2mJUOAlBQcCco8D60Bcqmf3O3w5a+KWS5GvYbrrJBkgvL1BDnTp+e8q0lXCLgHhKguBA==}
     dependencies:
@@ -5564,12 +5506,6 @@ packages:
       postcss: 8.4.33
       source-map-js: 1.0.2
 
-  /@vue/compiler-ssr@3.4.14:
-    resolution: {integrity: sha512-bXT6+oAGlFjTYVOTtFJ4l4Jab1wjsC0cfSfOe2B4Z0N2vD2zOBSQ9w694RsCfhjk+bC2DY5Gubb1rHZVii107Q==}
-    dependencies:
-      '@vue/compiler-dom': 3.4.14
-      '@vue/shared': 3.4.14
-
   /@vue/compiler-ssr@3.4.15:
     resolution: {integrity: sha512-1jdeQyiGznr8gjFDadVmOJqZiLNSsMa5ZgqavkPZ8O2wjHv0tVuAEsw5hTdUoUW4232vpBbL/wJhzVW/JwY1Uw==}
     dependencies:
@@ -5589,8 +5525,8 @@ packages:
     dependencies:
       '@volar/language-core': 1.11.1
       '@volar/source-map': 1.11.1
-      '@vue/compiler-dom': 3.4.14
-      '@vue/shared': 3.4.14
+      '@vue/compiler-dom': 3.4.15
+      '@vue/shared': 3.4.15
       computeds: 0.0.1
       minimatch: 9.0.3
       muggle-string: 0.3.1
@@ -5598,35 +5534,17 @@ packages:
       typescript: 5.3.3
       vue-template-compiler: 2.7.16
 
-  /@vue/reactivity@3.4.14:
-    resolution: {integrity: sha512-xRYwze5Q4tK7tT2J4uy4XLhK/AIXdU5EBUu9PLnIHcOKXO0uyXpNNMzlQKuq7B+zwtq6K2wuUL39pHA6ZQzObw==}
-    dependencies:
-      '@vue/shared': 3.4.14
-
   /@vue/reactivity@3.4.15:
     resolution: {integrity: sha512-55yJh2bsff20K5O84MxSvXKPHHt17I2EomHznvFiJCAZpJTNW8IuLj1xZWMLELRhBK3kkFV/1ErZGHJfah7i7w==}
     dependencies:
       '@vue/shared': 3.4.15
 
-  /@vue/runtime-core@3.4.14:
-    resolution: {integrity: sha512-qu+NMkfujCoZL6cfqK5NOfxgXJROSlP2ZPs4CTcVR+mLrwl4TtycF5Tgo0QupkdBL+2kigc6EsJlTcuuZC1NaQ==}
-    dependencies:
-      '@vue/reactivity': 3.4.14
-      '@vue/shared': 3.4.14
-
   /@vue/runtime-core@3.4.15:
     resolution: {integrity: sha512-6E3by5m6v1AkW0McCeAyhHTw+3y17YCOKG0U0HDKDscV4Hs0kgNT5G+GCHak16jKgcCDHpI9xe5NKb8sdLCLdw==}
     dependencies:
       '@vue/reactivity': 3.4.15
       '@vue/shared': 3.4.15
 
-  /@vue/runtime-dom@3.4.14:
-    resolution: {integrity: sha512-B85XmcR4E7XsirEHVqhmy4HPbRT9WLFWV9Uhie3OapV9m1MEN9+Er6hmUIE6d8/l2sUygpK9RstFM2bmHEUigA==}
-    dependencies:
-      '@vue/runtime-core': 3.4.14
-      '@vue/shared': 3.4.14
-      csstype: 3.1.3
-
   /@vue/runtime-dom@3.4.15:
     resolution: {integrity: sha512-EVW8D6vfFVq3V/yDKNPBFkZKGMFSvZrUQmx196o/v2tHKdwWdiZjYUBS+0Ez3+ohRyF8Njwy/6FH5gYJ75liUw==}
     dependencies:
@@ -5634,15 +5552,6 @@ packages:
       '@vue/shared': 3.4.15
       csstype: 3.1.3
 
-  /@vue/server-renderer@3.4.14(vue@3.4.14):
-    resolution: {integrity: sha512-pwSKXQfYdJBTpvWHGEYI+akDE18TXAiLcGn+Q/2Fj8wQSHWztoo7PSvfMNqu6NDhp309QXXbPFEGCU5p85HqkA==}
-    peerDependencies:
-      vue: 3.4.14
-    dependencies:
-      '@vue/compiler-ssr': 3.4.14
-      '@vue/shared': 3.4.14
-      vue: 3.4.14(typescript@5.3.3)
-
   /@vue/server-renderer@3.4.15(vue@3.4.15):
     resolution: {integrity: sha512-3HYzaidu9cHjrT+qGUuDhFYvF/j643bHC6uUN9BgM11DVy+pM6ATsG6uPBLnkwOgs7BpJABReLmpL3ZPAsUaqw==}
     peerDependencies:
@@ -5652,9 +5561,6 @@ packages:
       '@vue/shared': 3.4.15
       vue: 3.4.15(typescript@5.3.3)
 
-  /@vue/shared@3.4.14:
-    resolution: {integrity: sha512-nmi3BtLpvqXAWoRZ6HQ+pFJOHBU4UnH3vD3opgmwXac7vhaHKA9nj1VeGjMggdB9eLtW83eHyPCmOU1qzdsC7Q==}
-
   /@vue/shared@3.4.15:
     resolution: {integrity: sha512-KzfPTxVaWfB+eGcGdbSf4CWdaXcGDqckoeXUh7SB3fZdEtzPCK2Vq9B/lRRL3yutax/LWITz+SwvgyOxz5V75g==}
 
@@ -5753,7 +5659,7 @@ packages:
       '@vueuse/core': 10.7.2(vue@3.4.15)
       '@vueuse/metadata': 10.7.2
       local-pkg: 0.5.0
-      nuxt: 3.9.3(@types/node@20.11.5)(@upstash/redis@1.20.0)(typescript@5.3.3)(vite@5.0.11)(vue-tsc@1.8.27)
+      nuxt: 3.9.3(@types/node@20.11.5)(@upstash/redis@1.28.2)(eslint@8.56.0)(typescript@5.3.3)(vite@5.0.12)(vue-tsc@1.8.27)
       vue-demi: 0.14.6(vue@3.4.15)
     transitivePeerDependencies:
       - '@vue/composition-api'
@@ -5912,7 +5818,6 @@ packages:
       acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
     dependencies:
       acorn: 8.11.3
-    dev: true
 
   /acorn-walk@8.3.2:
     resolution: {integrity: sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==}
@@ -5962,7 +5867,6 @@ packages:
       fast-json-stable-stringify: 2.1.0
       json-schema-traverse: 0.4.1
       uri-js: 4.4.1
-    dev: true
 
   /ansi-colors@4.1.3:
     resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==}
@@ -6156,21 +6060,6 @@ packages:
     resolution: {integrity: sha512-7vd3UC6xKp0HLfua5IjZlcXvGAGy7cBAXTg2lyQ/8WpNhd6SiZ8Be+xm3FyBSYJx5GKcpRCzBh7RH4/0dnY+uQ==}
     engines: {node: ^10 || ^12 || >=14}
     hasBin: true
-    peerDependencies:
-      postcss: ^8.1.0
-    dependencies:
-      browserslist: 4.22.2
-      caniuse-lite: 1.0.30001578
-      fraction.js: 4.3.7
-      normalize-range: 0.1.2
-      picocolors: 1.0.0
-      postcss: 8.4.33
-      postcss-value-parser: 4.2.0
-
-  /autoprefixer@10.4.17(postcss@8.4.33):
-    resolution: {integrity: sha512-/cpVNRLSfhOtcGflT13P2794gVSgmPgTR+erw5ifnMLZb0UnSlkK4tquLmkd3BhA+nLo5tX8Cu0upUsGKvKbmg==}
-    engines: {node: ^10 || ^12 || >=14}
-    hasBin: true
     peerDependencies:
       postcss: ^8.1.0
     dependencies:
@@ -6181,7 +6070,6 @@ packages:
       picocolors: 1.0.0
       postcss: 8.4.33
       postcss-value-parser: 4.2.0
-    dev: false
 
   /b4a@1.6.4:
     resolution: {integrity: sha512-fpWrvyVHEKyeEvbKZTVOeZF3VSKKWtJxFIxX/jaVPf+cLbGUSitjb49pHLqPV2BUNNZ0LcoeEGfE/YCpyDYHIw==}
@@ -6209,12 +6097,6 @@ packages:
     engines: {node: '>=10.0.0'}
     dev: false
 
-  /bidi-js@1.0.3:
-    resolution: {integrity: sha512-RKshQI1R3YQ+n9YJz2QQ147P66ELpa1FQEg20Dk8oW9t2KgLbpDLLp9aGZ7y8WHSshDknG0bknqGw5/tyCs5tw==}
-    dependencies:
-      require-from-string: 2.0.2
-    dev: false
-
   /big-integer@1.6.52:
     resolution: {integrity: sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg==}
     engines: {node: '>=0.6'}
@@ -6275,7 +6157,7 @@ packages:
     engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
     hasBin: true
     dependencies:
-      caniuse-lite: 1.0.30001578
+      caniuse-lite: 1.0.30001579
       electron-to-chromium: 1.4.635
       node-releases: 2.0.14
       update-browserslist-db: 1.0.13(browserslist@4.22.2)
@@ -6399,16 +6281,12 @@ packages:
     resolution: {integrity: sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==}
     dependencies:
       browserslist: 4.22.2
-      caniuse-lite: 1.0.30001578
+      caniuse-lite: 1.0.30001579
       lodash.memoize: 4.1.2
       lodash.uniq: 4.5.0
 
-  /caniuse-lite@1.0.30001578:
-    resolution: {integrity: sha512-J/jkFgsQ3NEl4w2lCoM9ZPxrD+FoBNJ7uJUpGVjIg/j0OwJosWM36EPDv+Yyi0V4twBk9pPmlFS+PLykgEvUmg==}
-
   /caniuse-lite@1.0.30001579:
     resolution: {integrity: sha512-u5AUVkixruKHJjw/pj9wISlcMpgFWzSrczLZbrqBSxukQixmg0SJ5sZTpvaFvxU0HoQKd4yoyAogyrAz9pzJnA==}
-    dev: false
 
   /case-anything@2.1.13:
     resolution: {integrity: sha512-zlOQ80VrQ2Ue+ymH5OuM/DlDq64mEm+B9UTdHULv5osUMD6HalNTblf2b1u/m6QecjsnOkBpqVZ+XPwIVsy7Ng==}
@@ -6877,6 +6755,9 @@ packages:
       shebang-command: 2.0.0
       which: 2.0.2
 
+  /crypto-js@4.2.0:
+    resolution: {integrity: sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==}
+
   /css-declaration-sorter@7.1.1(postcss@8.4.33):
     resolution: {integrity: sha512-dZ3bVTEEc1vxr3Bek9vGwfB5Z6ESPULhcRvO472mfjVnj8jRcTnKO8/JTczlvxM10Myb+wBM++1MtdO76eWcaQ==}
     engines: {node: ^14 || ^16 || >=18}
@@ -7073,7 +6954,6 @@ packages:
 
   /deep-is@0.1.4:
     resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
-    dev: true
 
   /deepmerge@4.3.1:
     resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==}
@@ -7216,7 +7096,6 @@ packages:
     engines: {node: '>=6.0.0'}
     dependencies:
       esutils: 2.0.3
-    dev: true
 
   /dom-serializer@2.0.0:
     resolution: {integrity: sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==}
@@ -8218,12 +8097,10 @@ packages:
     dependencies:
       esrecurse: 4.3.0
       estraverse: 5.3.0
-    dev: true
 
   /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}
-    dev: true
 
   /eslint@8.56.0:
     resolution: {integrity: sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==}
@@ -8270,7 +8147,6 @@ packages:
       text-table: 0.2.0
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
   /esno@4.0.0:
     resolution: {integrity: sha512-tmaM9gfnSWqzePVJ5FJLYX9mMyE6ZevvOIvd1CMoMk2Fn1F3aKI/OQPjubS5wCIKlPpWfDfKFEtoslCNCiZJpQ==}
@@ -8286,7 +8162,6 @@ packages:
       acorn: 8.11.3
       acorn-jsx: 5.3.2(acorn@8.11.3)
       eslint-visitor-keys: 3.4.3
-    dev: true
 
   /esprima@4.0.1:
     resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}
@@ -8299,14 +8174,12 @@ packages:
     engines: {node: '>=0.10'}
     dependencies:
       estraverse: 5.3.0
-    dev: true
 
   /esrecurse@4.3.0:
     resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
     engines: {node: '>=4.0'}
     dependencies:
       estraverse: 5.3.0
-    dev: true
 
   /estraverse@4.3.0:
     resolution: {integrity: sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==}
@@ -8429,8 +8302,8 @@ packages:
       - supports-color
     dev: false
 
-  /fakefilter@0.1.721:
-    resolution: {integrity: sha512-XAbRk9UiW7t+ASwogv5fC1tMGeEQ+kuhCYr7ocarb53xIjf4XXMe7J1EF9Y2gIdOXJ1AX5tJFsNKzikYJlJyFQ==}
+  /fakefilter@0.1.727:
+    resolution: {integrity: sha512-nWfYHUl3Po3ZmhRKVgB3Hobf5QYWrPVPJeCy5X1R/2kbQi4mo+O6czhatsAkch9/d1ZqIXzDUVBHclJ0YRNT1A==}
     dev: false
 
   /fast-deep-equal@3.1.3:
@@ -8455,11 +8328,9 @@ packages:
 
   /fast-json-stable-stringify@2.1.0:
     resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==}
-    dev: true
 
   /fast-levenshtein@2.0.6:
     resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
-    dev: true
 
   /fast-xml-parser@4.2.5:
     resolution: {integrity: sha512-B9/wizE4WngqQftFPmdaMYlXoJlJOYxGQOanC77fq9k8+Z0v5dDSVh+3glErdIROP//s/jgb7ZuxKfB8nVyo0g==}
@@ -8484,7 +8355,6 @@ packages:
     engines: {node: ^10.12.0 || >=12.0.0}
     dependencies:
       flat-cache: 3.2.0
-    dev: true
 
   /file-uri-to-path@1.0.0:
     resolution: {integrity: sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==}
@@ -8517,7 +8387,6 @@ packages:
       flatted: 3.2.9
       keyv: 4.5.4
       rimraf: 3.0.2
-    dev: true
 
   /flat@5.0.2:
     resolution: {integrity: sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==}
@@ -8788,7 +8657,6 @@ packages:
     engines: {node: '>=8'}
     dependencies:
       type-fest: 0.20.2
-    dev: true
 
   /globby@11.1.0:
     resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==}
@@ -8835,7 +8703,6 @@ packages:
 
   /graphemer@1.4.0:
     resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==}
-    dev: true
 
   /gzip-size@6.0.0:
     resolution: {integrity: sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==}
@@ -8943,8 +8810,8 @@ packages:
       '@types/hast': 3.0.3
     dev: true
 
-  /hast-util-raw@9.0.1:
-    resolution: {integrity: sha512-5m1gmba658Q+lO5uqL5YNGQWeh1MYWZbZmWrM5lncdcuiXuo5E2HT/CIOp0rLF8ksfSwiCVJ3twlgVRyTGThGA==}
+  /hast-util-raw@9.0.2:
+    resolution: {integrity: sha512-PldBy71wO9Uq1kyaMch9AHIghtQvIwxBUkv823pKmkTM3oV1JxtsTNYdevMxvUHqcnOAuO65JKU2+0NOxc2ksA==}
     dependencies:
       '@types/hast': 3.0.3
       '@types/unist': 3.0.2
@@ -9171,7 +9038,7 @@ packages:
     peerDependencies:
       typescript: ^5.0.0
     dependencies:
-      '@swc/wasm': 1.3.104
+      '@swc/wasm': 1.3.105
       module-from-string: 3.3.0
       typescript: 5.3.3
     dev: false
@@ -9379,7 +9246,6 @@ packages:
   /is-path-inside@3.0.3:
     resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==}
     engines: {node: '>=8'}
-    dev: true
 
   /is-path-inside@4.0.0:
     resolution: {integrity: sha512-lJJV/5dYS+RcL8uQdBDW9c9uWFLLBNRyFhnAKXw5tVqLlKZ4RMGZKv+YQ/IA3OhD+RpbJa1LLFM1FQPGyIXvOA==}
@@ -9471,13 +9337,13 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: false
 
-  /isomorphic-dompurify@1.13.0:
-    resolution: {integrity: sha512-9qOYGngy9ZR9JB/iLmr7SViPSZ7uWGvepdnLaXYznbTxvJOCuONneKajJ54f+IRQpvL8608ylUy9EK1iPtL3Ag==}
+  /isomorphic-dompurify@2.3.0:
+    resolution: {integrity: sha512-FCoKY4/mW/jnn/+VgE7wXGC2D/RXzVCAmGYuGWEuZXtyWnwmE2100caciIv+RbHk90q9LA0OW5IBn2f+ywHtww==}
     engines: {node: '>=18'}
     dependencies:
       '@types/dompurify': 3.0.5
       dompurify: 3.0.8
-      jsdom: 23.2.0
+      jsdom: 24.0.0
     transitivePeerDependencies:
       - bufferutil
       - canvas
@@ -9485,14 +9351,6 @@ packages:
       - utf-8-validate
     dev: false
 
-  /isomorphic-fetch@3.0.0:
-    resolution: {integrity: sha512-qvUtwJ3j6qwsF3jLxkZ72qCgjMysPzDfeV240JHiGZsANBYd+EEuu35v7dfrJ9Up0Ak07D7GGSkGhCHTqg/5wA==}
-    dependencies:
-      node-fetch: 2.7.0
-      whatwg-fetch: 3.6.20
-    transitivePeerDependencies:
-      - encoding
-
   /jackspeak@2.3.6:
     resolution: {integrity: sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==}
     engines: {node: '>=14'}
@@ -9539,8 +9397,8 @@ packages:
     engines: {node: '>=12.0.0'}
     dev: true
 
-  /jsdom@23.2.0:
-    resolution: {integrity: sha512-L88oL7D/8ufIES+Zjz7v0aes+oBMh2Xnh3ygWvL0OaICOomKEPKuPnIfBJekiXr+BHbbMjrWn/xqrDQuxFTeyA==}
+  /jsdom@24.0.0:
+    resolution: {integrity: sha512-UDS2NayCvmXSXVP6mpTj+73JnNQadZlr9N68189xib2tx5Mls7swlTNao26IoHv46BZJFvXygyRtyXd1feAk1A==}
     engines: {node: '>=18'}
     peerDependencies:
       canvas: ^2.11.2
@@ -9548,7 +9406,6 @@ packages:
       canvas:
         optional: true
     dependencies:
-      '@asamuzakjp/dom-selector': 2.0.2
       cssstyle: 4.0.1
       data-urls: 5.0.0
       decimal.js: 10.4.3
@@ -9557,6 +9414,7 @@ packages:
       http-proxy-agent: 7.0.0
       https-proxy-agent: 7.0.2
       is-potential-custom-element-name: 1.0.1
+      nwsapi: 2.2.7
       parse5: 7.1.2
       rrweb-cssom: 0.6.0
       saxes: 6.0.0
@@ -9593,7 +9451,6 @@ packages:
 
   /json-buffer@3.0.1:
     resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==}
-    dev: true
 
   /json-diff@0.9.0:
     resolution: {integrity: sha512-cVnggDrVkAAA3OvFfHpFEhOnmcsUpleEKq4d4O8sQWWSH40MBrWstKigVB1kGrgLWzuom+7rRdaCsnBD6VyObQ==}
@@ -9613,11 +9470,9 @@ packages:
 
   /json-schema-traverse@0.4.1:
     resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
-    dev: true
 
   /json-stable-stringify-without-jsonify@1.0.1:
     resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
-    dev: true
 
   /json5@2.2.3:
     resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==}
@@ -9665,7 +9520,6 @@ packages:
     resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==}
     dependencies:
       json-buffer: 3.0.1
-    dev: true
 
   /kleur@3.0.3:
     resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==}
@@ -9767,7 +9621,6 @@ packages:
     dependencies:
       prelude-ls: 1.2.1
       type-check: 0.4.0
-    dev: true
 
   /lilconfig@2.1.0:
     resolution: {integrity: sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==}
@@ -10750,16 +10603,12 @@ packages:
     hasBin: true
     dev: false
 
-  /napi-wasm@1.1.0:
-    resolution: {integrity: sha512-lHwIAJbmLSjF9VDRm9GoVOy9AGp3aIvkjv+Kvz9h16QR3uSVYH78PNQUnT2U4X53mhlnV2M7wrhibQ3GHicDmg==}
-
   /natural-compare-lite@1.4.0:
     resolution: {integrity: sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==}
     dev: true
 
   /natural-compare@1.4.0:
     resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
-    dev: true
 
   /negotiator@0.6.3:
     resolution: {integrity: sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==}
@@ -10778,7 +10627,7 @@ packages:
     resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
     dev: true
 
-  /nitropack@2.8.1(@upstash/redis@1.20.0):
+  /nitropack@2.8.1(@upstash/redis@1.28.2):
     resolution: {integrity: sha512-pODv2kEEzZSDQR+1UMXbGyNgMedUDq/qUomtiAnQKQvLy52VGlecXO1xDfH3i0kP1yKEcKTnWsx1TAF5gHM7xQ==}
     engines: {node: ^16.11.0 || >=17.0.0}
     hasBin: true
@@ -10790,15 +10639,15 @@ packages:
     dependencies:
       '@cloudflare/kv-asset-handler': 0.3.1
       '@netlify/functions': 2.5.1
-      '@rollup/plugin-alias': 5.1.0(rollup@4.9.5)
-      '@rollup/plugin-commonjs': 25.0.7(rollup@4.9.5)
-      '@rollup/plugin-inject': 5.0.5(rollup@4.9.5)
-      '@rollup/plugin-json': 6.1.0(rollup@4.9.5)
-      '@rollup/plugin-node-resolve': 15.2.3(rollup@4.9.5)
-      '@rollup/plugin-replace': 5.0.5(rollup@4.9.5)
-      '@rollup/plugin-terser': 0.4.4(rollup@4.9.5)
-      '@rollup/plugin-wasm': 6.2.2(rollup@4.9.5)
-      '@rollup/pluginutils': 5.1.0(rollup@4.9.5)
+      '@rollup/plugin-alias': 5.1.0(rollup@4.9.6)
+      '@rollup/plugin-commonjs': 25.0.7(rollup@4.9.6)
+      '@rollup/plugin-inject': 5.0.5(rollup@4.9.6)
+      '@rollup/plugin-json': 6.1.0(rollup@4.9.6)
+      '@rollup/plugin-node-resolve': 15.2.3(rollup@4.9.6)
+      '@rollup/plugin-replace': 5.0.5(rollup@4.9.6)
+      '@rollup/plugin-terser': 0.4.4(rollup@4.9.6)
+      '@rollup/plugin-wasm': 6.2.2(rollup@4.9.6)
+      '@rollup/pluginutils': 5.1.0(rollup@4.9.6)
       '@types/http-proxy': 1.17.14
       '@vercel/nft': 0.24.4
       archiver: 6.0.1
@@ -10839,8 +10688,8 @@ packages:
       pkg-types: 1.0.3
       pretty-bytes: 6.1.1
       radix3: 1.1.0
-      rollup: 4.9.5
-      rollup-plugin-visualizer: 5.12.0(rollup@4.9.5)
+      rollup: 4.9.6
+      rollup-plugin-visualizer: 5.12.0(rollup@4.9.6)
       scule: 1.2.0
       semver: 7.5.4
       serve-placeholder: 2.0.1
@@ -10850,8 +10699,8 @@ packages:
       uncrypto: 0.1.3
       unctx: 2.3.1
       unenv: 1.9.0
-      unimport: 3.7.1(rollup@4.9.5)
-      unstorage: 1.10.1(@upstash/redis@1.20.0)
+      unimport: 3.7.1(rollup@4.9.6)
+      unstorage: 1.10.1(@upstash/redis@1.28.2)
     transitivePeerDependencies:
       - '@azure/app-configuration'
       - '@azure/cosmos'
@@ -11075,12 +10924,12 @@ packages:
       - supports-color
     dev: true
 
-  /nuxt-icon@0.6.8(nuxt@3.9.3)(vite@5.0.11)(vue@3.4.15):
+  /nuxt-icon@0.6.8(nuxt@3.9.3)(vite@5.0.12)(vue@3.4.15):
     resolution: {integrity: sha512-6eWlNOb6Uvp63uXFdhcmsB1JlubDv76Pot/VwmIu0yJxDYhwytbnv3WAjw2khl2l7W/65V4eMGIEeX9C5Ahxng==}
     dependencies:
       '@iconify/collections': 1.0.382
       '@iconify/vue': 4.1.1(vue@3.4.15)
-      '@nuxt/devtools-kit': 1.0.8(nuxt@3.9.3)(vite@5.0.11)
+      '@nuxt/devtools-kit': 1.0.8(nuxt@3.9.3)(vite@5.0.12)
       '@nuxt/kit': 3.9.3
     transitivePeerDependencies:
       - nuxt
@@ -11089,15 +10938,15 @@ packages:
       - vite
       - vue
 
-  /nuxt-prepare@0.2.2:
-    resolution: {integrity: sha512-OakMxXJdH7OpoLG3mM1QpWvifq0g8UCN+1x1jzI7J7+5Z4SbTLCN9HBYd8A6fvWYlyUvrIzzt8pK1mvkr7kIhg==}
+  /nuxt-prepare@1.0.0:
+    resolution: {integrity: sha512-G/p9sTOx2Oqnf25igoZi6n5jpZrykwBhsF8E6VKjNtUbcN0Z2sm+gK4DWHelfgZAFWY72eXzwr3/xtNA15cCzg==}
     dependencies:
       '@nuxt/kit': 3.9.3
       defu: 6.1.4
       jiti: 1.21.0
       pathe: 1.1.2
       scule: 1.2.0
-      type-fest: 4.9.0
+      type-fest: 4.10.0
     transitivePeerDependencies:
       - rollup
       - supports-color
@@ -11119,7 +10968,7 @@ packages:
       - supports-color
     dev: true
 
-  /nuxt@3.9.3(@types/node@20.11.5)(@upstash/redis@1.20.0)(typescript@5.3.3)(vite@5.0.11)(vue-tsc@1.8.27):
+  /nuxt@3.9.3(@types/node@20.11.5)(@upstash/redis@1.28.2)(eslint@8.56.0)(typescript@5.3.3)(vite@5.0.12)(vue-tsc@1.8.27):
     resolution: {integrity: sha512-IzBJAJImqCGfspVZzvznrALnFIJ5rPe+VJvY8OiccwRzWT8sEygVRjh3Mc64yWV6P59rz497wp9RBBBhuV2MVA==}
     engines: {node: ^14.18.0 || >=16.10.0}
     hasBin: true
@@ -11133,17 +10982,17 @@ packages:
         optional: true
     dependencies:
       '@nuxt/devalue': 2.0.2
-      '@nuxt/devtools': 1.0.8(nuxt@3.9.3)(vite@5.0.11)
+      '@nuxt/devtools': 1.0.8(nuxt@3.9.3)(vite@5.0.12)
       '@nuxt/kit': 3.9.3
       '@nuxt/schema': 3.9.3
       '@nuxt/telemetry': 2.5.3
       '@nuxt/ui-templates': 1.3.1
-      '@nuxt/vite-builder': 3.9.3(@types/node@20.11.5)(typescript@5.3.3)(vue-tsc@1.8.27)(vue@3.4.14)
+      '@nuxt/vite-builder': 3.9.3(@types/node@20.11.5)(eslint@8.56.0)(typescript@5.3.3)(vue-tsc@1.8.27)(vue@3.4.15)
       '@types/node': 20.11.5
       '@unhead/dom': 1.8.10
       '@unhead/ssr': 1.8.10
-      '@unhead/vue': 1.8.10(vue@3.4.14)
-      '@vue/shared': 3.4.14
+      '@unhead/vue': 1.8.10(vue@3.4.15)
+      '@vue/shared': 3.4.15
       acorn: 8.11.3
       c12: 1.6.1
       chokidar: 3.5.3
@@ -11163,7 +11012,7 @@ packages:
       knitwork: 1.0.0
       magic-string: 0.30.5
       mlly: 1.5.0
-      nitropack: 2.8.1(@upstash/redis@1.20.0)
+      nitropack: 2.8.1(@upstash/redis@1.28.2)
       nuxi: 3.10.0
       nypm: 0.3.4
       ofetch: 1.3.3
@@ -11180,14 +11029,14 @@ packages:
       uncrypto: 0.1.3
       unctx: 2.3.1
       unenv: 1.9.0
-      unimport: 3.7.1(rollup@4.9.5)
+      unimport: 3.7.1(rollup@4.9.6)
       unplugin: 1.6.0
-      unplugin-vue-router: 0.7.0(vue-router@4.2.5)(vue@3.4.14)
+      unplugin-vue-router: 0.7.0(vue-router@4.2.5)(vue@3.4.15)
       untyped: 1.4.0
-      vue: 3.4.14(typescript@5.3.3)
+      vue: 3.4.15(typescript@5.3.3)
       vue-bundle-renderer: 2.0.0
       vue-devtools-stub: 0.1.0
-      vue-router: 4.2.5(vue@3.4.14)
+      vue-router: 4.2.5(vue@3.4.15)
     transitivePeerDependencies:
       - '@azure/app-configuration'
       - '@azure/cosmos'
@@ -11224,6 +11073,10 @@ packages:
       - vue-tsc
       - xml2js
 
+  /nwsapi@2.2.7:
+    resolution: {integrity: sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==}
+    dev: false
+
   /nypm@0.3.4:
     resolution: {integrity: sha512-1JLkp/zHBrkS3pZ692IqOaIKSYHmQXgqfELk6YTOfVBnwealAmPA1q2kKK7PHJAHSMBozerThEFZXP3G6o7Ukg==}
     engines: {node: ^14.16.0 || >=16.10.0}
@@ -11352,7 +11205,6 @@ packages:
       levn: 0.4.1
       prelude-ls: 1.2.1
       type-check: 0.4.0
-    dev: true
 
   /orderedmap@2.1.1:
     resolution: {integrity: sha512-TvAWxi0nDe1j/rtMcWcIj94+Ffe6n7zhow33h40SKxmsmozs6dz/e+EajymfoFcHd7sxNn8yHM8839uixMOV6g==}
@@ -11696,8 +11548,8 @@ packages:
     engines: {node: '>=4'}
     dev: true
 
-  /pnpm@8.14.1:
-    resolution: {integrity: sha512-hWxOzZfF0/MDVOvDc80y+zcnQpXEidstD2E6HmDwEMrfuxUDbVJfOgbewYl+QhmzxPbTvo8vYvsKNmvuaqp1Mw==}
+  /pnpm@8.14.3:
+    resolution: {integrity: sha512-w+2A61g74+K37zHrlri5z6oFA+XUTscXUUEgtRh7L5M3NukDjFGlojrVgnkLpB1Kt4RhjIn6fiNl9mZWhdYS7g==}
     engines: {node: '>=16.14'}
     hasBin: true
     dev: true
@@ -12090,7 +11942,6 @@ packages:
   /prelude-ls@1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
-    dev: true
 
   /prettier-linter-helpers@1.0.0:
     resolution: {integrity: sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==}
@@ -12460,8 +12311,8 @@ packages:
   /queue-tick@1.0.1:
     resolution: {integrity: sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==}
 
-  /radix-vue@1.2.5(vue@3.4.15):
-    resolution: {integrity: sha512-m4OIGmq5MFvRwzS841vKiX0jYVC6bIRH+MYk/cJTQC0feY7aifppjfqh7XV9FtDsjEetSrDnm1JSd0YIKh3kwQ==}
+  /radix-vue@1.3.2(vue@3.4.15):
+    resolution: {integrity: sha512-XhY1Cs6AvRgb1DvTisrY4XfX4aLWj9S1u/u/NCqOjfEHYaJsZ61Fbo66xB5EC22TV258Eu4njYI2CBpwV0dVxg==}
     dependencies:
       '@floating-ui/dom': 1.5.4
       '@floating-ui/vue': 1.0.4(vue@3.4.15)
@@ -12605,7 +12456,7 @@ packages:
     resolution: {integrity: sha512-/aE8hCfKlQeA8LmyeyQvQF3eBiLRGNlfBJEvWH7ivp9sBqs7TNqBL5X3v157rM4IFETqDnIOO+z5M/biZbo9Ww==}
     dependencies:
       '@types/hast': 3.0.3
-      hast-util-raw: 9.0.1
+      hast-util-raw: 9.0.2
       vfile: 6.0.1
     dev: true
 
@@ -12658,8 +12509,8 @@ packages:
       - supports-color
     dev: true
 
-  /remark-mdc@3.0.0:
-    resolution: {integrity: sha512-VbCe8w416KRFDJy9Nz7r+tRm2O2o8dIHBwnzrSSU2ZSqwMf9EAh/TMU79piTEdajOMElHYtpM3n2EkccCuceeg==}
+  /remark-mdc@3.0.2:
+    resolution: {integrity: sha512-HoCaTwIkvYp1Kj9EiKMNpfAjLO53PwiaeA5J2o+uIBfCHjcOWai3oDmCkEZVCIHbHgU/qSZ8JeiQftksnVKTeQ==}
     dependencies:
       '@types/mdast': 4.0.3
       '@types/unist': 3.0.2
@@ -12726,11 +12577,6 @@ packages:
     resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
     engines: {node: '>=0.10.0'}
 
-  /require-from-string@2.0.2:
-    resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
-    engines: {node: '>=0.10.0'}
-    dev: false
-
   /requires-port@1.0.0:
     resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==}
     dev: false
@@ -12811,7 +12657,7 @@ packages:
       '@babel/code-frame': 7.23.5
     dev: true
 
-  /rollup-plugin-visualizer@5.12.0(rollup@4.9.5):
+  /rollup-plugin-visualizer@5.12.0(rollup@4.9.6):
     resolution: {integrity: sha512-8/NU9jXcHRs7Nnj07PF2o4gjxmm9lXIrZ8r175bT9dK8qoLlvKTwRMArRCMgpMGlq8CTLugRvEmyMeMXIU2pNQ==}
     engines: {node: '>=14'}
     hasBin: true
@@ -12823,7 +12669,7 @@ packages:
     dependencies:
       open: 8.4.2
       picomatch: 2.3.1
-      rollup: 4.9.5
+      rollup: 4.9.6
       source-map: 0.7.4
       yargs: 17.7.2
 
@@ -12834,26 +12680,26 @@ packages:
     optionalDependencies:
       fsevents: 2.3.3
 
-  /rollup@4.9.5:
-    resolution: {integrity: sha512-E4vQW0H/mbNMw2yLSqJyjtkHY9dslf/p0zuT1xehNRqUTBOFMqEjguDvqhXr7N7r/4ttb2jr4T41d3dncmIgbQ==}
+  /rollup@4.9.6:
+    resolution: {integrity: sha512-05lzkCS2uASX0CiLFybYfVkwNbKZG5NFQ6Go0VWyogFTXXbR039UVsegViTntkk4OglHBdF54ccApXRRuXRbsg==}
     engines: {node: '>=18.0.0', npm: '>=8.0.0'}
     hasBin: true
     dependencies:
       '@types/estree': 1.0.5
     optionalDependencies:
-      '@rollup/rollup-android-arm-eabi': 4.9.5
-      '@rollup/rollup-android-arm64': 4.9.5
-      '@rollup/rollup-darwin-arm64': 4.9.5
-      '@rollup/rollup-darwin-x64': 4.9.5
-      '@rollup/rollup-linux-arm-gnueabihf': 4.9.5
-      '@rollup/rollup-linux-arm64-gnu': 4.9.5
-      '@rollup/rollup-linux-arm64-musl': 4.9.5
-      '@rollup/rollup-linux-riscv64-gnu': 4.9.5
-      '@rollup/rollup-linux-x64-gnu': 4.9.5
-      '@rollup/rollup-linux-x64-musl': 4.9.5
-      '@rollup/rollup-win32-arm64-msvc': 4.9.5
-      '@rollup/rollup-win32-ia32-msvc': 4.9.5
-      '@rollup/rollup-win32-x64-msvc': 4.9.5
+      '@rollup/rollup-android-arm-eabi': 4.9.6
+      '@rollup/rollup-android-arm64': 4.9.6
+      '@rollup/rollup-darwin-arm64': 4.9.6
+      '@rollup/rollup-darwin-x64': 4.9.6
+      '@rollup/rollup-linux-arm-gnueabihf': 4.9.6
+      '@rollup/rollup-linux-arm64-gnu': 4.9.6
+      '@rollup/rollup-linux-arm64-musl': 4.9.6
+      '@rollup/rollup-linux-riscv64-gnu': 4.9.6
+      '@rollup/rollup-linux-x64-gnu': 4.9.6
+      '@rollup/rollup-linux-x64-musl': 4.9.6
+      '@rollup/rollup-win32-arm64-msvc': 4.9.6
+      '@rollup/rollup-win32-ia32-msvc': 4.9.6
+      '@rollup/rollup-win32-x64-msvc': 4.9.6
       fsevents: 2.3.3
 
   /rope-sequence@1.3.4:
@@ -13034,10 +12880,9 @@ packages:
   /shell-quote@1.8.1:
     resolution: {integrity: sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==}
 
-  /shiki-es@0.14.0:
-    resolution: {integrity: sha512-e+/aueHx0YeIEut6RXC6K8gSf0PykwZiHD7q7AHtpTW8Kd8TpFUIWqTwhAnrGjOyOMyrwv+syr5WPagMpDpVYQ==}
-    deprecated: Please migrate to https://github.com/antfu/shikiji
-    dev: true
+  /shikiji-core@0.10.0-beta.9:
+    resolution: {integrity: sha512-7dgwTyN9PeKyc4KJeyKo/qW8gi8XbR//c1CO+0B5GaeozWexNTpEL/tSohyIKkj0Z+7spfm2REmAaS39NlC4Lw==}
+    dev: false
 
   /shikiji-core@0.9.19:
     resolution: {integrity: sha512-AFJu/vcNT21t0e6YrfadZ+9q86gvPum6iywRyt1OtIPjPFe25RQnYJyxHQPMLKCCWA992TPxmEmbNcOZCAJclw==}
@@ -13049,6 +12894,12 @@ packages:
       shikiji: 0.9.19
     dev: true
 
+  /shikiji@0.10.0-beta.9:
+    resolution: {integrity: sha512-I+sv642n9M7/FK/dVcXp9vMv7v5Wa8gU2UuKwkIWKQFvyo+qKB8eV1zNNtRYas+jC7BLwdAaflc5BFUozAonFQ==}
+    dependencies:
+      shikiji-core: 0.10.0-beta.9
+    dev: false
+
   /shikiji@0.9.19:
     resolution: {integrity: sha512-Kw2NHWktdcdypCj1GkKpXH4o6Vxz8B8TykPlPuLHOGSV8VkhoCLcFOH4k19K4LXAQYRQmxg+0X/eM+m2sLhAkg==}
     dependencies:
@@ -13368,7 +13219,6 @@ packages:
   /strip-json-comments@3.1.1:
     resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
     engines: {node: '>=8'}
-    dev: true
 
   /strip-literal@1.3.0:
     resolution: {integrity: sha512-PugKzOsyXpArk0yWmUwqOZecSO0GH0bPoctLcqNDH9J04pVW3lflYE0ujElBGTloevcxF5MofAOZ7C5l2b+wLg==}
@@ -13582,7 +13432,7 @@ packages:
       uglify-js:
         optional: true
     dependencies:
-      '@jridgewell/trace-mapping': 0.3.21
+      '@jridgewell/trace-mapping': 0.3.22
       jest-worker: 27.5.1
       schema-utils: 3.3.0
       serialize-javascript: 6.0.2
@@ -13602,7 +13452,6 @@ packages:
 
   /text-table@0.2.0:
     resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
-    dev: true
 
   /thenify-all@1.6.0:
     resolution: {integrity: sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==}
@@ -13834,7 +13683,6 @@ packages:
     engines: {node: '>= 0.8.0'}
     dependencies:
       prelude-ls: 1.2.1
-    dev: true
 
   /type-detect@4.0.8:
     resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==}
@@ -13844,7 +13692,6 @@ packages:
   /type-fest@0.20.2:
     resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==}
     engines: {node: '>=10'}
-    dev: true
 
   /type-fest@0.21.3:
     resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==}
@@ -13869,8 +13716,8 @@ packages:
     resolution: {integrity: sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==}
     engines: {node: '>=14.16'}
 
-  /type-fest@4.9.0:
-    resolution: {integrity: sha512-KS/6lh/ynPGiHD/LnAobrEFq3Ad4pBzOlJ1wAnJx9N4EYoqFhMfLIBjUT2UEx4wg5ZE+cC1ob6DCSpppVo+rtg==}
+  /type-fest@4.10.0:
+    resolution: {integrity: sha512-NPaKJsb4wyJ16qc8zBQrWswLKv/YirgBFykvUQ1Iajt2wd+twC8E4hFXdlIXqiMl6kWA0zY8tUJ9ELVAdu5h7w==}
     engines: {node: '>=16'}
     dev: true
 
@@ -14022,10 +13869,10 @@ packages:
       vfile: 6.0.1
     dev: true
 
-  /unimport@3.7.1(rollup@4.9.5):
+  /unimport@3.7.1(rollup@4.9.6):
     resolution: {integrity: sha512-V9HpXYfsZye5bPPYUgs0Otn3ODS1mDUciaBlXljI4C2fTwfFpvFZRywmlOu943puN9sncxROMZhsZCjNXEpzEQ==}
     dependencies:
-      '@rollup/pluginutils': 5.1.0(rollup@4.9.5)
+      '@rollup/pluginutils': 5.1.0(rollup@4.9.6)
       acorn: 8.11.3
       escape-string-regexp: 5.0.0
       estree-walker: 3.0.3
@@ -14123,7 +13970,7 @@ packages:
       '@unocss/core': 0.55.7
     dev: true
 
-  /unocss@0.58.3(@unocss/webpack@0.58.3)(postcss@8.4.33)(vite@5.0.11):
+  /unocss@0.58.3(@unocss/webpack@0.58.3)(postcss@8.4.33)(vite@5.0.12):
     resolution: {integrity: sha512-2rnvghfiIDRQ2cOrmN4P7J7xV2p3yBK+bPAt1aoUxCXcszkLczAnQzh9c7IZ+p70kSVstK45cJTYV6TMzOLF7Q==}
     engines: {node: '>=14'}
     peerDependencies:
@@ -14135,7 +13982,7 @@ packages:
       vite:
         optional: true
     dependencies:
-      '@unocss/astro': 0.58.3(vite@5.0.11)
+      '@unocss/astro': 0.58.3(vite@5.0.12)
       '@unocss/cli': 0.58.3
       '@unocss/core': 0.58.3
       '@unocss/extractor-arbitrary-variants': 0.58.3
@@ -14154,9 +14001,9 @@ packages:
       '@unocss/transformer-compile-class': 0.58.3
       '@unocss/transformer-directives': 0.58.3
       '@unocss/transformer-variant-group': 0.58.3
-      '@unocss/vite': 0.58.3(vite@5.0.11)
+      '@unocss/vite': 0.58.3(vite@5.0.12)
       '@unocss/webpack': 0.58.3(webpack@5.89.0)
-      vite: 5.0.11(@types/node@20.11.5)
+      vite: 5.0.12(@types/node@20.11.5)
     transitivePeerDependencies:
       - postcss
       - rollup
@@ -14173,7 +14020,7 @@ packages:
       - rollup
     dev: true
 
-  /unplugin-vue-router@0.7.0(vue-router@4.2.5)(vue@3.4.14):
+  /unplugin-vue-router@0.7.0(vue-router@4.2.5)(vue@3.4.15):
     resolution: {integrity: sha512-ddRreGq0t5vlSB7OMy4e4cfU1w2AwBQCwmvW3oP/0IHQiokzbx4hd3TpwBu3eIAFVuhX2cwNQwp1U32UybTVCw==}
     peerDependencies:
       vue-router: ^4.1.0
@@ -14183,7 +14030,7 @@ packages:
     dependencies:
       '@babel/types': 7.23.6
       '@rollup/pluginutils': 5.1.0(rollup@3.29.4)
-      '@vue-macros/common': 1.10.0(vue@3.4.14)
+      '@vue-macros/common': 1.10.0(vue@3.4.15)
       ast-walker-scope: 0.5.0
       chokidar: 3.5.3
       fast-glob: 3.3.2
@@ -14193,7 +14040,7 @@ packages:
       pathe: 1.1.2
       scule: 1.2.0
       unplugin: 1.6.0
-      vue-router: 4.2.5(vue@3.4.14)
+      vue-router: 4.2.5(vue@3.4.15)
       yaml: 2.3.4
     transitivePeerDependencies:
       - rollup
@@ -14207,7 +14054,7 @@ packages:
       webpack-sources: 3.2.3
       webpack-virtual-modules: 0.6.1
 
-  /unstorage@1.10.1(@upstash/redis@1.20.0):
+  /unstorage@1.10.1(@upstash/redis@1.28.2):
     resolution: {integrity: sha512-rWQvLRfZNBpF+x8D3/gda5nUCQL2PgXy2jNG4U7/Rc9BGEv9+CAJd0YyGCROUBKs9v49Hg8huw3aih5Bf5TAVw==}
     peerDependencies:
       '@azure/app-configuration': ^1.4.1
@@ -14248,7 +14095,7 @@ packages:
       idb-keyval:
         optional: true
     dependencies:
-      '@upstash/redis': 1.20.0
+      '@upstash/redis': 1.28.2
       anymatch: 3.1.3
       chokidar: 3.5.3
       destr: 2.0.2
@@ -14289,6 +14136,16 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /unwasm@0.3.7:
+    resolution: {integrity: sha512-+s4iWvHHYnLuwNo+9mqVFLBmBzGc3gIuzkVZ8fdMN9K/kWopCnfaUVnDagd2OX3It5nRR5EenI5nSQb8FOd0fA==}
+    dependencies:
+      magic-string: 0.30.5
+      mlly: 1.5.0
+      pathe: 1.1.2
+      pkg-types: 1.0.3
+      unplugin: 1.6.0
+    dev: true
+
   /update-browserslist-db@1.0.13(browserslist@4.22.2):
     resolution: {integrity: sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==}
     hasBin: true
@@ -14306,7 +14163,6 @@ packages:
     resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
     dependencies:
       punycode: 2.3.1
-    dev: true
 
   /url-parse@1.5.10:
     resolution: {integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==}
@@ -14378,7 +14234,7 @@ packages:
       debug: 4.3.4
       pathe: 1.1.2
       picocolors: 1.0.0
-      vite: 5.0.11(@types/node@20.11.5)
+      vite: 5.0.12(@types/node@20.11.5)
     transitivePeerDependencies:
       - '@types/node'
       - less
@@ -14389,7 +14245,7 @@ packages:
       - supports-color
       - terser
 
-  /vite-plugin-checker@0.6.2(typescript@5.3.3)(vite@5.0.11)(vue-tsc@1.8.27):
+  /vite-plugin-checker@0.6.2(eslint@8.56.0)(typescript@5.3.3)(vite@5.0.11)(vue-tsc@1.8.27):
     resolution: {integrity: sha512-YvvvQ+IjY09BX7Ab+1pjxkELQsBd4rPhWNw8WLBeFVxu/E7O+n6VYAqNsKdK/a2luFlX/sMpoWdGFfg4HvwdJQ==}
     engines: {node: '>=14.16'}
     peerDependencies:
@@ -14425,6 +14281,7 @@ packages:
       chalk: 4.1.2
       chokidar: 3.5.3
       commander: 8.3.0
+      eslint: 8.56.0
       fast-glob: 3.3.2
       fs-extra: 11.2.0
       lodash.debounce: 4.0.8
@@ -14441,7 +14298,7 @@ packages:
       vscode-uri: 3.0.8
       vue-tsc: 1.8.27(typescript@5.3.3)
 
-  /vite-plugin-inspect@0.8.1(@nuxt/kit@3.9.3)(vite@5.0.11):
+  /vite-plugin-inspect@0.8.1(@nuxt/kit@3.9.3)(vite@5.0.12):
     resolution: {integrity: sha512-oPBPVGp6tBd5KdY/qY6lrbLXqrbHRG0hZLvEaJfiZ/GQfDB+szRuLHblQh1oi1Hhh8GeLit/50l4xfs2SA+TCA==}
     engines: {node: '>=14'}
     peerDependencies:
@@ -14460,12 +14317,12 @@ packages:
       open: 9.1.0
       picocolors: 1.0.0
       sirv: 2.0.4
-      vite: 5.0.11(@types/node@20.11.5)
+      vite: 5.0.12(@types/node@20.11.5)
     transitivePeerDependencies:
       - rollup
       - supports-color
 
-  /vite-plugin-vue-inspector@4.0.2(vite@5.0.11):
+  /vite-plugin-vue-inspector@4.0.2(vite@5.0.12):
     resolution: {integrity: sha512-KPvLEuafPG13T7JJuQbSm5PwSxKFnVS965+MP1we2xGw9BPkkc/+LPix5MMWenpKWqtjr0ws8THrR+KuoDC8hg==}
     peerDependencies:
       vite: ^3.0.0-0 || ^4.0.0-0 || ^5.0.0-0
@@ -14476,10 +14333,10 @@ packages:
       '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.23.7)
       '@babel/plugin-transform-typescript': 7.23.6(@babel/core@7.23.7)
       '@vue/babel-plugin-jsx': 1.1.6(@babel/core@7.23.7)
-      '@vue/compiler-dom': 3.4.14
+      '@vue/compiler-dom': 3.4.15
       kolorist: 1.8.0
       magic-string: 0.30.5
-      vite: 5.0.11(@types/node@20.11.5)
+      vite: 5.0.12(@types/node@20.11.5)
     transitivePeerDependencies:
       - supports-color
 
@@ -14514,7 +14371,42 @@ packages:
       '@types/node': 20.11.5
       esbuild: 0.19.11
       postcss: 8.4.33
-      rollup: 4.9.5
+      rollup: 4.9.6
+    optionalDependencies:
+      fsevents: 2.3.3
+
+  /vite@5.0.12(@types/node@20.11.5):
+    resolution: {integrity: sha512-4hsnEkG3q0N4Tzf1+t6NdN9dg/L3BM+q8SWgbSPnJvrgH2kgdyzfVJwbR1ic69/4uMJJ/3dqDZZE5/WwqW8U1w==}
+    engines: {node: ^18.0.0 || >=20.0.0}
+    hasBin: true
+    peerDependencies:
+      '@types/node': ^18.0.0 || >=20.0.0
+      less: '*'
+      lightningcss: ^1.21.0
+      sass: '*'
+      stylus: '*'
+      sugarss: '*'
+      terser: ^5.4.0
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+      less:
+        optional: true
+      lightningcss:
+        optional: true
+      sass:
+        optional: true
+      stylus:
+        optional: true
+      sugarss:
+        optional: true
+      terser:
+        optional: true
+    dependencies:
+      '@types/node': 20.11.5
+      esbuild: 0.19.11
+      postcss: 8.4.33
+      rollup: 4.9.6
     optionalDependencies:
       fsevents: 2.3.3
 
@@ -14562,7 +14454,7 @@ packages:
       strip-literal: 1.3.0
       tinybench: 2.6.0
       tinypool: 0.8.2
-      vite: 5.0.11(@types/node@20.11.5)
+      vite: 5.0.12(@types/node@20.11.5)
       vite-node: 1.2.1(@types/node@20.11.5)
       why-is-node-running: 2.2.2
     transitivePeerDependencies:
@@ -14630,15 +14522,16 @@ packages:
   /vue-devtools-stub@0.1.0:
     resolution: {integrity: sha512-RutnB7X8c5hjq39NceArgXg28WZtZpGc3+J16ljMiYnFhKvd8hITxSWQSQ5bvldxMDU6gG5mkxl1MTQLXckVSQ==}
 
-  /vue-email@0.8.5(typescript@5.3.3)(vue@3.4.15):
-    resolution: {integrity: sha512-NE3o2H6jcZNFdQJvtYlsCWxfNDRQl2xNdBcVhpLI9K7IkLMhhrbbMmeIGdPbx4ChncQjA1z8Oe/a4+8VYzcIRw==}
+  /vue-email@0.8.6(typescript@5.3.3)(vue@3.4.15):
+    resolution: {integrity: sha512-1U7xUdBcBn0ava2hz5gXPe7/6vL3Zts/8XBIVzhjfG9nuNYMKOvfRacLSeQ5lIfUvNhXvdv6NSQNOELLkdoMAQ==}
     hasBin: true
     peerDependencies:
       vue: ^3.3.8
     dependencies:
-      '@vue-email/cli': 0.0.9(typescript@5.3.3)(vue@3.4.15)
+      '@vue-email/cli': 0.0.10(typescript@5.3.3)(vue@3.4.15)
       '@vue-email/tailwind': 0.0.6
-      isomorphic-dompurify: 1.13.0
+      isomorphic-dompurify: 2.3.0
+      shikiji: 0.10.0-beta.9
       ufo: 1.3.2
       vue: 3.4.15(typescript@5.3.3)
       vue-i18n: 9.9.0(vue@3.4.15)
@@ -14681,13 +14574,13 @@ packages:
       vue: 3.4.15(typescript@5.3.3)
     dev: false
 
-  /vue-router@4.2.5(vue@3.4.14):
+  /vue-router@4.2.5(vue@3.4.15):
     resolution: {integrity: sha512-DIUpKcyg4+PTQKfFPX88UWhlagBEBEfJ5A8XDXRJLUnZOvcpMF8o/dnL90vpVkGaPbjvXazV/rC1qBKrZlFugw==}
     peerDependencies:
       vue: ^3.2.0
     dependencies:
       '@vue/devtools-api': 6.5.1
-      vue: 3.4.14(typescript@5.3.3)
+      vue: 3.4.15(typescript@5.3.3)
 
   /vue-template-compiler@2.7.16:
     resolution: {integrity: sha512-AYbUWAJHLGGQM7+cNTELw+KsOG9nl2CnSv467WobS5Cv9uk3wFcnr1Etsz2sEIHEZvw1U+o9mRlEO6QbZvUPGQ==}
@@ -14715,21 +14608,6 @@ packages:
       vue: 3.4.15(typescript@5.3.3)
     dev: false
 
-  /vue@3.4.14(typescript@5.3.3):
-    resolution: {integrity: sha512-Rop5Al/ZcBbBz+KjPZaZDgHDX0kUP4duEzDbm+1o91uxYUNmJrZSBuegsNIJvUGy+epLevNRNhLjm08VKTgGyw==}
-    peerDependencies:
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-    dependencies:
-      '@vue/compiler-dom': 3.4.14
-      '@vue/compiler-sfc': 3.4.14
-      '@vue/runtime-dom': 3.4.14
-      '@vue/server-renderer': 3.4.14(vue@3.4.14)
-      '@vue/shared': 3.4.14
-      typescript: 5.3.3
-
   /vue@3.4.15(typescript@5.3.3):
     resolution: {integrity: sha512-jC0GH4KkWLWJOEQjOpkqU1bQsBwf4R1rsFtw5GQJbjHVKWDzO6P0nWWBTmjp1xSemAioDFj1jdaK1qa3DnMQoQ==}
     peerDependencies:
@@ -14830,9 +14708,6 @@ packages:
       iconv-lite: 0.6.3
     dev: false
 
-  /whatwg-fetch@3.6.20:
-    resolution: {integrity: sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg==}
-
   /whatwg-mimetype@4.0.0:
     resolution: {integrity: sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==}
     engines: {node: '>=18'}

From cb4d76663010e5f530ff87587efdb7cf382c7d9c Mon Sep 17 00:00:00 2001
From: McPizza <gh@l1.io>
Date: Tue, 30 Jan 2024 15:01:06 +0000
Subject: [PATCH 15/36] fix(db): :bug: set convo lastUpdatedAt to notNull

---
 packages/database/schema.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/database/schema.ts b/packages/database/schema.ts
index 661755dd..2595d7d5 100644
--- a/packages/database/schema.ts
+++ b/packages/database/schema.ts
@@ -1074,7 +1074,7 @@ export const convos = mysqlTable(
     id: serial('id').primaryKey(),
     orgId: foreignKey('org_id').notNull(),
     publicId: nanoId('public_id').notNull(),
-    lastUpdatedAt: timestamp('last_updated_at'),
+    lastUpdatedAt: timestamp('last_updated_at').notNull(),
     createdAt: timestamp('created_at')
       .default(sql`CURRENT_TIMESTAMP`)
       .notNull()

From 1ebcd96bf82f566bf9676f33679d659f5354769a Mon Sep 17 00:00:00 2001
From: McPizza <gh@l1.io>
Date: Tue, 30 Jan 2024 15:01:36 +0000
Subject: [PATCH 16/36] feat(web): :sparkles: add getUserQuery trpc endpoint

---
 .../trpc/routers/convoRouter/convoRouter.ts   | 339 ++++++++++--------
 1 file changed, 181 insertions(+), 158 deletions(-)

diff --git a/apps/web-app/server/trpc/routers/convoRouter/convoRouter.ts b/apps/web-app/server/trpc/routers/convoRouter/convoRouter.ts
index d793a2b0..35311832 100644
--- a/apps/web-app/server/trpc/routers/convoRouter/convoRouter.ts
+++ b/apps/web-app/server/trpc/routers/convoRouter/convoRouter.ts
@@ -1,7 +1,15 @@
 import { z } from 'zod';
 import { parse } from 'superjson';
 import { router, orgProcedure } from '../../trpc';
-import { type InferInsertModel, and, eq, inArray } from '@uninbox/database/orm';
+import {
+  type InferInsertModel,
+  and,
+  eq,
+  inArray,
+  desc,
+  or,
+  lt
+} from '@uninbox/database/orm';
 import {
   convos,
   convoParticipants,
@@ -12,7 +20,8 @@ import {
   contacts,
   contactGlobalReputations,
   convoEntries,
-  emailIdentitiesAuthorizedUsers
+  emailIdentitiesAuthorizedUsers,
+  userGroupMembers
 } from '@uninbox/database/schema';
 import {
   nanoId,
@@ -374,7 +383,8 @@ export const convoRouter = router({
       const newConvoPublicId = nanoId();
       const insertConvoResponse = await db.insert(convos).values({
         publicId: newConvoPublicId,
-        orgId: orgId
+        orgId: orgId,
+        lastUpdatedAt: new Date()
       });
 
       // create conversationSubject entry
@@ -841,159 +851,172 @@ export const convoRouter = router({
         cursorLastPublicId: z.string().min(3).max(nanoIdLength).optional()
       })
     )
-    .query(async ({ ctx, input }) => {})
-
-  // getUserConvos: orgProcedure
-  //   .input(
-  //     z.object({
-  //       cursorLastUpdatedAt: z.date().optional(),
-  //       cursorLastPublicId: z.string().min(3).max(nanoIdLength).optional()
-  //     })
-  //   )
-  //   .query(async ({ ctx, input }) => {
-  //     const { db, user, org } = ctx;
-  //     const { cursorLastUpdatedAt, cursorLastPublicId } = input;
-  //     const userId = user?.id || 0;
-  //     const orgId = org?.id || 0;
-  //     const inputLastUpdatedAt = cursorLastUpdatedAt
-  //       ? new Date(cursorLastUpdatedAt)
-  //       : new Date();
-  //     const inputLastPublicId = cursorLastPublicId || '';
-  //     // TODO: Add filtering for org based on input.filterOrgPublicId
-  //     const convoQuery = await db.query.convos.findMany({
-  //       orderBy: [desc(convos.lastUpdatedAt), desc(convos.publicId)],
-  //       limit: 15,
-  //       columns: {
-  //         publicId: true,
-  //         lastUpdatedAt: true
-  //       },
-  //       where: and(
-  //         or(
-  //           and(
-  //             eq(convos.lastUpdatedAt, inputLastUpdatedAt),
-  //             lt(convos.publicId, inputLastPublicId)
-  //           ),
-  //           lt(convos.lastUpdatedAt, inputLastUpdatedAt)
-  //         ),
-  //         inArray(
-  //           convos.id,
-  //           db
-  //             .select({ id: convoParticipants.convoId })
-  //             .from(convoParticipants)
-  //             .where(
-  //               or(
-  //                 eq(convoParticipants.userId, userId),
-  //                 inArray(
-  //                   convoParticipants.userGroupId,
-  //                   db
-  //                     .select({ id: userGroupMembers.groupId })
-  //                     .from(userGroupMembers)
-  //                     .where(eq(userGroupMembers.userId, userId))
-  //                 )
-  //               )
-  //             )
-  //         )
-  //       ),
-  //       with: {
-  //         org: {
-  //           columns: {
-  //             publicId: true,
-  //             name: true,
-  //             avatarId: true
-  //           }
-  //         },
-  //         subjects: {
-  //           columns: {
-  //             subject: true
-  //           }
-  //         },
-  //         members: {
-  //           with: {
-  //             orgMember: {
-  //               with: {
-  //                 profile: {
-  //                   columns: {
-  //                     firstName: true,
-  //                     lastName: true,
-  //                     avatarId: true,
-  //                     handle: true
-  //                   }
-  //                 }
-  //               }
-  //             },
-  //             userGroup: {
-  //               columns: {
-  //                 name: true,
-  //                 color: true,
-  //                 avatarId: true
-  //               }
-  //             },
-  //             foreignEmailIdentity: {
-  //               columns: {
-  //                 senderName: true,
-  //                 avatarId: true,
-  //                 username: true,
-  //                 rootDomain: true
-  //               }
-  //             }
-  //           },
-  //           columns: {
-  //             id: true,
-  //             orgMemberId: true,
-  //             userGroupId: true,
-  //             foreignEmailIdentityId: true,
-  //             role: true
-  //           }
-  //         },
-  //         messages: {
-  //           orderBy: [desc(convoMessages.createdAt)],
-  //           limit: 1,
-  //           columns: {
-  //             body: true
-  //           },
-  //           with: {
-  //             author: {
-  //               with: {
-  //                 orgMember: {
-  //                   with: {
-  //                     profile: {
-  //                       columns: {
-  //                         firstName: true,
-  //                         lastName: true,
-  //                         avatarId: true,
-  //                         handle: true
-  //                       }
-  //                     }
-  //                   }
-  //                 },
-  //                 userGroup: {
-  //                   columns: {
-  //                     name: true,
-  //                     color: true,
-  //                     avatarId: true
-  //                   }
-  //                 },
-  //                 foreignEmailIdentity: {
-  //                   columns: {
-  //                     senderName: true,
-  //                     avatarId: true
-  //                   }
-  //                 }
-  //               }
-  //             }
-  //           }
-  //         }
-  //       }
-  //     });
-  //     const newCursorLastUpdatedAt =
-  //       convoQuery[convoQuery.length - 1].lastUpdatedAt;
-  //     const newCursorLastPublicId = convoQuery[convoQuery.length - 1].publicId;
-  //     return {
-  //       data: convoQuery,
-  //       cursor: {
-  //         lastUpdatedAt: newCursorLastUpdatedAt,
-  //         lastPublicId: newCursorLastPublicId
-  //       }
-  //     };
-  //   }),
+    .query(async ({ ctx, input }) => {}),
+
+  getUserConvos: orgProcedure
+    .input(
+      z.object({
+        cursorLastUpdatedAt: z.date().optional(),
+        cursorLastPublicId: z.string().min(3).max(nanoIdLength).optional()
+      })
+    )
+    .query(async ({ ctx, input }) => {
+      const { db, user, org } = ctx;
+      const { cursorLastUpdatedAt, cursorLastPublicId } = input;
+
+      const userId = user.id;
+      const orgId = org.id;
+      const orgMemberId = org.memberId;
+
+      const inputLastUpdatedAt = cursorLastUpdatedAt
+        ? new Date(cursorLastUpdatedAt)
+        : new Date();
+
+      console.log('🔥', { inputLastUpdatedAt });
+      const inputLastPublicId = cursorLastPublicId || '';
+
+      const convoQuery = await db.query.convos.findMany({
+        orderBy: [desc(convos.lastUpdatedAt), desc(convos.publicId)],
+        limit: 15,
+        columns: {
+          publicId: true,
+          lastUpdatedAt: true
+        },
+        where: and(
+          or(
+            and(
+              eq(convos.lastUpdatedAt, inputLastUpdatedAt),
+              lt(convos.publicId, inputLastPublicId)
+            ),
+            lt(convos.lastUpdatedAt, inputLastUpdatedAt)
+          ),
+          inArray(
+            convos.id,
+            db
+              .select({ id: convoParticipants.convoId })
+              .from(convoParticipants)
+              .where(
+                or(
+                  eq(convoParticipants.orgMemberId, orgMemberId),
+                  inArray(
+                    convoParticipants.userGroupId,
+                    db
+                      .select({ id: userGroupMembers.groupId })
+                      .from(userGroupMembers)
+                      .where(eq(userGroupMembers.orgMemberId, orgMemberId))
+                  )
+                )
+              )
+          )
+        ),
+        with: {
+          subjects: {
+            columns: {
+              subject: true
+            }
+          },
+          participants: {
+            columns: {
+              role: true
+            },
+            with: {
+              orgMember: {
+                columns: {},
+                with: {
+                  profile: {
+                    columns: {
+                      firstName: true,
+                      lastName: true,
+                      avatarId: true,
+                      handle: true
+                    }
+                  }
+                }
+              },
+              userGroup: {
+                columns: {
+                  name: true,
+                  color: true,
+                  avatarId: true
+                }
+              },
+              contact: {
+                columns: {
+                  name: true,
+                  avatarId: true,
+                  setName: true,
+                  emailUsername: true,
+                  emailDomain: true,
+                  type: true
+                }
+              }
+            }
+          },
+          entries: {
+            orderBy: [desc(convoEntries.createdAt)],
+            limit: 1,
+            columns: {
+              bodyPlainText: true,
+              type: true
+            },
+            with: {
+              author: {
+                columns: {},
+                with: {
+                  orgMember: {
+                    columns: {},
+                    with: {
+                      profile: {
+                        columns: {
+                          firstName: true,
+                          lastName: true,
+                          avatarId: true,
+                          handle: true
+                        }
+                      }
+                    }
+                  },
+                  userGroup: {
+                    columns: {
+                      name: true,
+                      color: true,
+                      avatarId: true
+                    }
+                  },
+                  contact: {
+                    columns: {
+                      name: true,
+                      avatarId: true,
+                      setName: true,
+                      emailUsername: true,
+                      emailDomain: true,
+                      type: true
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      });
+
+      if (!convoQuery.length) {
+        return {
+          data: [],
+          cursor: null
+        };
+      }
+
+      const newCursorLastUpdatedAt =
+        convoQuery[convoQuery.length - 1].lastUpdatedAt;
+      const newCursorLastPublicId = convoQuery[convoQuery.length - 1].publicId;
+
+      return {
+        data: convoQuery,
+        cursor: {
+          lastUpdatedAt: newCursorLastUpdatedAt,
+          lastPublicId: newCursorLastPublicId
+        }
+      };
+    })
 });

From 181e111c4d04de3a390057e3edcc6bdd38a1986f Mon Sep 17 00:00:00 2001
From: McPizza <gh@l1.io>
Date: Tue, 30 Jan 2024 17:10:29 +0000
Subject: [PATCH 17/36] remove avatar list

---
 apps/web-app/components/un/ui-avatar-list.vue | 119 ------------------
 1 file changed, 119 deletions(-)
 delete mode 100644 apps/web-app/components/un/ui-avatar-list.vue

diff --git a/apps/web-app/components/un/ui-avatar-list.vue b/apps/web-app/components/un/ui-avatar-list.vue
deleted file mode 100644
index 4a6f9164..00000000
--- a/apps/web-app/components/un/ui-avatar-list.vue
+++ /dev/null
@@ -1,119 +0,0 @@
-<script setup lang="ts">
-  import type { AvatarSize } from '@nuxt/ui/dist/runtime/types/avatar';
-  import type { VariantProps } from 'class-variance-authority';
-  import {
-    TooltipArrow,
-    TooltipContent,
-    TooltipProvider,
-    TooltipRoot,
-    TooltipTrigger
-  } from 'radix-vue';
-
-  type AuthorEntry = {
-    publicId: string;
-    avatarId: string;
-    name: string;
-    type: 'user' | 'org' | 'group' | 'contact';
-    color: string;
-  };
-  type Props = {
-    avatars: AuthorEntry[];
-    size: 'tiny' | 'xs' | 'sm' | 'md' | 'lg' | 'xl';
-    limit?: number;
-  };
-
-  const props = withDefaults(defineProps<Props>(), {
-    size: 'md',
-    limit: 1
-  });
-
-  const avatarClasses = useUtils().cva('', {
-    variants: {
-      image: {
-        tiny: '32x32',
-        xs: '32x32',
-        sm: '48x48',
-        md: '56x56',
-        lg: '64x64',
-        xl: '80x80',
-        '2xl': '128x128'
-      },
-      container: {
-        tiny: 'w-[16px] h-[16px] text-xs',
-        xs: 'w-[32px] h-[32px] text-sm',
-        sm: 'w-[48px] h-[48px] text-base',
-        md: 'w-[56px] h-[56px] text-lg',
-        lg: 'w-[64px] h-[64px] text-xl',
-        xl: 'w-[80px] h-[80px] text-2xl',
-        '2xl': 'w-[128px] h-[128px] text-3xl'
-      },
-      color: {
-        base: 'bg-base-3',
-        red: 'bg-red-9',
-        purple: 'bg-purple-9',
-        green: 'bg-green-9',
-        yellow: 'bg-yellow-9',
-        pink: 'bg-pink-9',
-        blue: 'bg-blue-9'
-      }
-    }
-  });
-
-  const expanded = ref(false);
-  const toggleState = ref(false);
-
-  const avatarArray = computed(() => {
-    if (props.avatars.length + 1 > props.limit) {
-      return props.avatars.slice(0, props.limit - 1);
-    }
-    return props.avatars;
-  });
-</script>
-<template>
-  <div class="flex flex-row gap-2">
-    <div
-      v-for="avatar in avatarArray"
-      :key="avatar.publicId">
-      <UnUiAvatar
-        :public-id="avatar.publicId"
-        :avatar-id="avatar.avatarId"
-        :name="avatar.name"
-        :type="avatar.type"
-        :size="props.size as AvatarSize"
-        :color="avatar.color" />
-    </div>
-
-    <TooltipProvider v-if="props.avatars.length + 1 > props.limit">
-      <TooltipRoot v-model:open="toggleState">
-        <TooltipTrigger @click="toggleState = !toggleState">
-          <div
-            class="flex items-center justify-center rounded-2 bg-base-5 bg-cover bg-center text-base-12 font-display"
-            :class="avatarClasses({ container: props.size })">
-            + {{ props.avatars.length - props.limit + 1 }}
-          </div>
-        </TooltipTrigger>
-        <Teleport to="body">
-          <TooltipContent
-            :side-offset="5"
-            :avoid-collisions="true"
-            class="data-[state=delayed-open]:data-[side=top]:animate-slideDownAndFade data-[state=delayed-open]:data-[side=right]:animate-slideLeftAndFade data-[state=delayed-open]:data-[side=left]:animate-slideRightAndFade data-[state=delayed-open]:data-[side=bottom]:animate-slideUpAndFade max-w-80 border border-base-6 rounded-lg bg-base-2 p-4 text-sm">
-            <div class="flex flex-row gap-2">
-              <div
-                v-for="avatar in props.avatars"
-                :key="avatar.publicId">
-                <UnUiAvatar
-                  :public-id="avatar.publicId"
-                  :avatar-id="avatar.avatarId"
-                  :name="avatar.name"
-                  :type="avatar.type"
-                  :color="avatar.color"
-                  size="sm" />
-              </div>
-              <TooltipArrow class="fill-base-11" />
-            </div>
-          </TooltipContent>
-        </Teleport>
-      </TooltipRoot>
-    </TooltipProvider>
-  </div>
-</template>

From b2d03c26f5258826ce569279eea88443857e285c Mon Sep 17 00:00:00 2001
From: McPizza <gh@l1.io>
Date: Tue, 30 Jan 2024 17:10:39 +0000
Subject: [PATCH 18/36] add popover component

---
 apps/web-app/components/un/ui-popover.vue | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 apps/web-app/components/un/ui-popover.vue

diff --git a/apps/web-app/components/un/ui-popover.vue b/apps/web-app/components/un/ui-popover.vue
new file mode 100644
index 00000000..e14e917c
--- /dev/null
+++ b/apps/web-app/components/un/ui-popover.vue
@@ -0,0 +1,22 @@
+<script lang="ts">
+  import type { DefineComponent } from 'vue';
+  import { NuxtUiPopover } from '#components';
+
+  export default defineComponent<
+    typeof NuxtUiPopover extends DefineComponent<infer Props, any, any>
+      ? Props
+      : never
+  >({
+    props: {
+      ...NuxtUiPopover.props
+    }
+  });
+</script>
+<template>
+  <NuxtUiPopover v-bind="$props">
+    <template #panel>
+      <slot name="panel"> </slot>
+    </template>
+    <slot />
+  </NuxtUiPopover>
+</template>

From 6222f7657eaeb2b32188fb03ef9ba9e6d16e221c Mon Sep 17 00:00:00 2001
From: McPizza <gh@l1.io>
Date: Tue, 30 Jan 2024 17:10:57 +0000
Subject: [PATCH 19/36] add virtualScroller component plugin

---
 apps/web-app/package.json                |  1 +
 apps/web-app/plugins/ virtualScroller.ts | 12 ++++++++
 pnpm-lock.yaml                           | 38 ++++++++++++++++++++++++
 3 files changed, 51 insertions(+)
 create mode 100644 apps/web-app/plugins/ virtualScroller.ts

diff --git a/apps/web-app/package.json b/apps/web-app/package.json
index fba635ea..ce890dd5 100644
--- a/apps/web-app/package.json
+++ b/apps/web-app/package.json
@@ -62,6 +62,7 @@
     "radix-vue": "^1.3.2",
     "superjson": "^2.2.1",
     "trpc-nuxt": "^0.10.17",
+    "vue-virtual-scroller": "2.0.0-beta.8",
     "zod": "^3.22.4"
   },
   "packageManager": "pnpm@8.5.1"
diff --git a/apps/web-app/plugins/ virtualScroller.ts b/apps/web-app/plugins/ virtualScroller.ts
new file mode 100644
index 00000000..e98ad5a4
--- /dev/null
+++ b/apps/web-app/plugins/ virtualScroller.ts	
@@ -0,0 +1,12 @@
+import 'vue-virtual-scroller/dist/vue-virtual-scroller.css';
+import {
+  DynamicScroller,
+  DynamicScrollerItem,
+  RecycleScroller
+} from 'vue-virtual-scroller';
+
+export default defineNuxtPlugin((nuxtApp) => {
+  nuxtApp.vueApp.component('RecycleScroller', RecycleScroller);
+  nuxtApp.vueApp.component('DynamicScroller', DynamicScroller);
+  nuxtApp.vueApp.component('DynamicScrollerItem', DynamicScrollerItem);
+});
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5d8994b3..8af1cce8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -224,6 +224,9 @@ importers:
       trpc-nuxt:
         specifier: ^0.10.17
         version: 0.10.17(@trpc/client@10.45.0)(@trpc/server@10.45.0)
+      vue-virtual-scroller:
+        specifier: 2.0.0-beta.8
+        version: 2.0.0-beta.8(vue@3.4.15)
       zod:
         specifier: ^3.22.4
         version: 3.22.4
@@ -3202,6 +3205,7 @@ packages:
     dependencies:
       is-glob: 4.0.3
       micromatch: 4.0.5
+      napi-wasm: 1.1.0
     bundledDependencies:
       - napi-wasm
 
@@ -10475,6 +10479,10 @@ packages:
       minipass: 3.3.6
       yallist: 4.0.0
 
+  /mitt@2.1.0:
+    resolution: {integrity: sha512-ILj2TpLiysu2wkBbWjAmww7TkZb65aiQO+DkVdUTBpBXq+MHYiETENkKFMtsJZX1Lf4pe4QOrTSjIfUwN5lRdg==}
+    dev: false
+
   /mitt@3.0.1:
     resolution: {integrity: sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==}
     dev: false
@@ -10603,6 +10611,9 @@ packages:
     hasBin: true
     dev: false
 
+  /napi-wasm@1.1.0:
+    resolution: {integrity: sha512-lHwIAJbmLSjF9VDRm9GoVOy9AGp3aIvkjv+Kvz9h16QR3uSVYH78PNQUnT2U4X53mhlnV2M7wrhibQ3GHicDmg==}
+
   /natural-compare-lite@1.4.0:
     resolution: {integrity: sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==}
     dev: true
@@ -14574,6 +14585,22 @@ packages:
       vue: 3.4.15(typescript@5.3.3)
     dev: false
 
+  /vue-observe-visibility@2.0.0-alpha.1(vue@3.4.15):
+    resolution: {integrity: sha512-flFbp/gs9pZniXR6fans8smv1kDScJ8RS7rEpMjhVabiKeq7Qz3D9+eGsypncjfIyyU84saU88XZ0zjbD6Gq/g==}
+    peerDependencies:
+      vue: ^3.0.0
+    dependencies:
+      vue: 3.4.15(typescript@5.3.3)
+    dev: false
+
+  /vue-resize@2.0.0-alpha.1(vue@3.4.15):
+    resolution: {integrity: sha512-7+iqOueLU7uc9NrMfrzbG8hwMqchfVfSzpVlCMeJQe4pyibqyoifDNbKTZvwxZKDvGkB+PdFeKvnGZMoEb8esg==}
+    peerDependencies:
+      vue: ^3.0.0
+    dependencies:
+      vue: 3.4.15(typescript@5.3.3)
+    dev: false
+
   /vue-router@4.2.5(vue@3.4.15):
     resolution: {integrity: sha512-DIUpKcyg4+PTQKfFPX88UWhlagBEBEfJ5A8XDXRJLUnZOvcpMF8o/dnL90vpVkGaPbjvXazV/rC1qBKrZlFugw==}
     peerDependencies:
@@ -14599,6 +14626,17 @@ packages:
       semver: 7.5.4
       typescript: 5.3.3
 
+  /vue-virtual-scroller@2.0.0-beta.8(vue@3.4.15):
+    resolution: {integrity: sha512-b8/f5NQ5nIEBRTNi6GcPItE4s7kxNHw2AIHLtDp+2QvqdTjVN0FgONwX9cr53jWRgnu+HRLPaWDOR2JPI5MTfQ==}
+    peerDependencies:
+      vue: ^3.2.0
+    dependencies:
+      mitt: 2.1.0
+      vue: 3.4.15(typescript@5.3.3)
+      vue-observe-visibility: 2.0.0-alpha.1(vue@3.4.15)
+      vue-resize: 2.0.0-alpha.1(vue@3.4.15)
+    dev: false
+
   /vue-wrap-balancer@1.1.3(vue@3.4.15):
     resolution: {integrity: sha512-9kTRwYIveWxV1FdaCJfRjIIRZOtwgnxypGS5mlAiXnih5+Cfaby9YDh3APMW1jWp0oCvL+gep0XCbcjBb7/ZXQ==}
     peerDependencies:

From 4cfc55c9106a4ff48755a477c6249878a59dd6e6 Mon Sep 17 00:00:00 2001
From: McPizza <gh@l1.io>
Date: Tue, 30 Jan 2024 17:13:24 +0000
Subject: [PATCH 20/36] fix load avatarId

---
 .../web-app/components/convos/convoAvatar.vue |   1 +
 apps/web-app/components/convos/convoList.vue  | 165 +++++++++-------
 .../components/convos/convoListItem.vue       | 182 ++++++++----------
 apps/web-app/components/un/ui-avatar-plus.vue | 162 +++++-----------
 apps/web-app/pages/[orgSlug]/convo/[id].vue   |   6 +-
 .../trpc/routers/convoRouter/convoRouter.ts   |  18 +-
 6 files changed, 236 insertions(+), 298 deletions(-)

diff --git a/apps/web-app/components/convos/convoAvatar.vue b/apps/web-app/components/convos/convoAvatar.vue
index 3f4cad53..c888b55f 100644
--- a/apps/web-app/components/convos/convoAvatar.vue
+++ b/apps/web-app/components/convos/convoAvatar.vue
@@ -17,6 +17,7 @@
 <template>
   <UnUiAvatar
     v-if="participant"
+    :avatar-id="participant.avatarPublicId"
     :public-id="participant.avatarPublicId"
     :alt="participant.name"
     :type="participant.type"
diff --git a/apps/web-app/components/convos/convoList.vue b/apps/web-app/components/convos/convoList.vue
index 35c74e2f..8c6e8bf4 100644
--- a/apps/web-app/components/convos/convoList.vue
+++ b/apps/web-app/components/convos/convoList.vue
@@ -3,86 +3,93 @@
   import { useConvoStore } from '@/stores/convoStore';
   const { $trpc } = useNuxtApp();
 
+  type PromiseType<T> = T extends Promise<infer U> ? U : never;
+  type UserConvosDataType = PromiseType<
+    ReturnType<typeof $trpc.convos.getUserConvos.query>
+  >['data'];
   // const convoStore = useConvoStore();
   // if (process.client && convoStore.convos.length === 0) {
   //   await convoStore.getInitialConvos();
   // }
   // console.log(convoStore.convos.length);
 
-  const convosPending = ref(true);
-  const convos = ref<UserConvosDataType>([]);
-  const convoCursor = {
+  const orgSlug = useRoute().params.orgSlug as string;
+
+  const convoCursor = ref({
     lastUpdatedAt: null as Date | null,
     lastPublicId: null as string | null
-  };
-  const getInitialConvos = async () => {
-    convos.value = [];
-    if (convos.value.length !== 0) return;
-    const { data: userConvos } = await $trpc.convos.getUserConvos.useLazyQuery(
-      {}
-    );
-    if (!userConvos.value) {
-      convosPending.value = false;
-      return;
-    }
-    convos.value.push(...userConvos.value.data);
-    convoCursor.lastUpdatedAt = userConvos.value.cursor.lastUpdatedAt;
-    convoCursor.lastPublicId = userConvos.value.cursor.lastPublicId;
-    convosPending.value = false;
-    return;
-  };
-  const getNextConvos = async () => {
-    if (
-      convoCursor.lastUpdatedAt !== null &&
-      convoCursor.lastPublicId !== null
-    ) {
-      const { data: userConvos } =
-        await $trpc.convos.getUserConvos.useLazyQuery({
-          cursorLastUpdatedAt: convoCursor.lastUpdatedAt,
-          cursorLastPublicId: convoCursor.lastPublicId
-        });
-      if (!userConvos.value) return;
-      convos.value.push(...userConvos.value.data);
-      convoCursor.lastUpdatedAt = userConvos.value.cursor.lastUpdatedAt;
-      convoCursor.lastPublicId = userConvos.value.cursor.lastPublicId;
-    }
-  };
+  });
+  const userHasMoreConvos = ref(true);
+  const convos = ref<{}[]>([]);
+  // const convos = ref<UserConvosDataType[]>([]);
 
-  const { list, containerProps, wrapperProps } = useVirtualList(convos.value, {
-    itemHeight: 127 + 16,
-    overscan: 3
+  const userConvoQueryParams = computed(() => {
+    if (!convoCursor.value.lastUpdatedAt || !convoCursor.value.lastPublicId)
+      return {};
+    return {
+      cursorLastUpdatedAt: convoCursor.value.lastUpdatedAt,
+      cursorLastPublicId: convoCursor.value.lastPublicId
+    };
   });
-  useInfiniteScroll(
-    containerProps.ref,
-    () => {
-      getNextConvos();
-    },
-    { distance: 300 }
+  const userConvoQueryPending = computed(() => {
+    return userConvosStatus.value === 'idle';
+  });
+  const userHasConvos = computed(() => {
+    return convos.value.length > 0;
+  });
+
+  const {
+    data: userConvosData,
+    status: userConvosStatus,
+    execute: userConvosFetch
+  } = await $trpc.convos.getUserConvos.useLazyQuery(
+    userConvoQueryParams.value,
+    {
+      server: false
+    }
   );
-  onMounted(async () => {
-    if (process.client) {
-      await getInitialConvos();
+
+  watch(
+    userConvosData,
+    (newVal) => {
+      if (!newVal) return;
+      if (!newVal.data || !newVal.cursor || newVal.data.length === 0) {
+        userHasMoreConvos.value = false;
+        return;
+      }
+      convos.value.push(...newVal.data);
+      convoCursor.value.lastUpdatedAt = newVal.cursor.lastUpdatedAt;
+      convoCursor.value.lastPublicId = newVal.cursor.lastPublicId;
+    },
+    {
+      immediate: true,
+      deep: true
     }
-  });
+  );
+
+  // useInfiniteScroll(
+  //   containerProps.ref,
+  //   () => {
+  //     getNextConvos();
+  //   },
+  //   { distance: 300, canLoadMore: () => userHasMoreConvos.value }
+  // );
 </script>
 <template>
-  <div
-    class="h-full max-h-full max-w-full w-full overflow-y-scroll"
-    v-bind="containerProps">
+  <div class="h-full max-h-full max-w-full w-full overflow-y-scroll">
     <div
-      v-if="!convosPending"
-      class="mb-[48px] flex flex-col items-start gap-4"
-      v-bind="wrapperProps">
-      <div
-        v-if="convosPending"
-        class="w-full flex flex-row justify-center gap-4 rounded-xl rounded-tl-2xl bg-base-3 p-8">
-        <UnUiIcon
-          name="i-svg-spinners:3-dots-fade"
-          size="24" />
-        <span>Loading conversations</span>
-      </div>
+      v-if="userConvoQueryPending"
+      class="w-full flex flex-row justify-center gap-4 rounded-xl rounded-tl-2xl bg-base-3 p-8">
+      <UnUiIcon
+        name="i-svg-spinners:3-dots-fade"
+        size="24" />
+      <span>Loading conversations</span>
+    </div>
+    <div
+      v-if="!userConvoQueryPending"
+      class="mb-[48px] flex flex-col items-start gap-4">
       <div
-        v-if="!convosPending && convos.length === 0"
+        v-if="!userHasConvos"
         class="w-full flex flex-row justify-center gap-4 rounded-xl rounded-tl-2xl bg-base-3 p-8">
         <UnUiIcon
           name="i-ph-chat-circle"
@@ -90,16 +97,28 @@
         <span>No conversations found</span>
       </div>
       <div
-        v-if="!convosPending && convos.length !== 0"
+        v-if="userHasConvos"
         class="max-w-full">
-        <div
-          v-for="convo of list"
-          :id="convo.data.publicId"
-          :key="convo.index"
-          class="max-w-full"
-          @click="navigateTo(`/h/convo/${convo.data.publicId}`)">
-          <convos-convo-list-item :convo="convo.data" />
-        </div>
+        <DynamicScroller
+          :items="convos"
+          key-field="publicId"
+          :min-item-size="48">
+          <template #default="{ item, index, active }">
+            <DynamicScrollerItem
+              :item="item"
+              :active="active"
+              :size-dependacies="[item.data]"
+              :data-index="index"
+              class="pb-4"
+              @click="navigateTo(`/${orgSlug}/convo/${item.publicId}`)">
+              <convos-convo-list-item :convo="item" />
+            </DynamicScrollerItem>
+          </template>
+        </DynamicScroller>
+        <div>convos exist</div>
+        <div>{{ convos.length }}</div>
+        <div>{{ convoCursor }}</div>
+        <div>{{ convos[0] }}</div>
       </div>
     </div>
   </div>
diff --git a/apps/web-app/components/convos/convoListItem.vue b/apps/web-app/components/convos/convoListItem.vue
index a101d87d..317eeba6 100644
--- a/apps/web-app/components/convos/convoListItem.vue
+++ b/apps/web-app/components/convos/convoListItem.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
   import { useTimeAgo } from '@vueuse/core';
   import { string } from 'zod';
+  import type { ConvoParticipantEntry } from '~/composables/types';
   const { $trpc } = useNuxtApp();
 
   type PromiseType<T> = T extends Promise<infer U> ? U : never;
@@ -11,128 +12,109 @@
   type Props = {
     convo: UserConvosDataType[number];
   };
-
   const props = defineProps<Props>();
 
   const timeAgo = useTimeAgo(props.convo.lastUpdatedAt || new Date());
-  const authorName = computed(() => {
-    if (
-      props.convo.messages[0].author.userProfile?.firstName &&
-      props.convo.messages[0].author.userProfile?.lastName
-    ) {
-      return (
-        props.convo.messages[0].author.userProfile.firstName +
-        ' ' +
-        props.convo.messages[0].author.userProfile.lastName
-      );
-    }
-    if (props.convo.messages[0].author.userGroup?.name) {
-      return props.convo.messages[0].author.userGroup.name + ' Team';
-    }
 
-    if (props.convo.messages[0].author.foreignEmailIdentity?.senderName) {
-      return props.convo.messages[0].author.foreignEmailIdentity.senderName;
-    }
-    return '';
+  const participantArray = ref<ConvoParticipantEntry[]>([]);
+  const author = ref<ConvoParticipantEntry>();
+  const authorEntryPublicId = computed(() => {
+    const entryAuthor = props.convo.entries[0].author;
+    return (
+      entryAuthor.orgMember?.publicId ||
+      entryAuthor.userGroup?.publicId ||
+      entryAuthor.contact?.publicId
+    );
   });
-
-  const authorAvatar = computed(() => {
-    if (props.convo.messages[0].author.userProfile?.avatarId) {
-      return props.convo.messages[0].author.userProfile.avatarId;
-    }
-    if (props.convo.messages[0].author.userGroup?.avatarId) {
-      return props.convo.messages[0].author.userGroup.avatarId;
-    }
-
-    if (props.convo.messages[0].author.foreignEmailIdentity?.avatarId) {
-      return props.convo.messages[0].author.foreignEmailIdentity.avatarId;
-    }
-    return '';
+  const authorEntryName = computed(() => {
+    const entryAuthor = props.convo.entries[0].author;
+    return (
+      entryAuthor.userGroup?.publicId ||
+      entryAuthor.contact?.publicId ||
+      entryAuthor.orgMember?.profile.firstName +
+        ' ' +
+        entryAuthor.orgMember?.profile.lastName ||
+      'Participant'
+    );
   });
 
-  const authorColor = computed(() => {
-    if (props.convo.messages[0].author.userGroup?.color) {
-      return props.convo.messages[0].author.userGroup.color;
+  for (const participant of props.convo.participants) {
+    const participantPublicId = participant.publicId;
+    const participantTypePublicId =
+      participant.contact?.publicId ||
+      participant.userGroup?.publicId ||
+      participant.orgMember?.publicId ||
+      '';
+    const avatarPublicId =
+      participant.contact?.avatarId ||
+      participant.userGroup?.avatarId ||
+      participant.orgMember?.profile.avatarId ||
+      '';
+    const participantName =
+      participant.contact?.name || participant.contact?.emailUsername
+        ? participant.contact?.emailUsername +
+          '@' +
+          participant.contact?.emailDomain
+        : participant.userGroup?.name ||
+          participant.orgMember?.profile?.firstName +
+            ' ' +
+            participant.orgMember?.profile?.lastName ||
+          '';
+    const participantType = participant.contact?.publicId
+      ? 'contact'
+      : participant.userGroup?.name
+        ? 'group'
+        : 'user';
+    const participantColor = participant.userGroup?.color || null;
+    const participantData: ConvoParticipantEntry = {
+      participantPublicId: participantPublicId,
+      typePublicId: participantTypePublicId,
+      avatarPublicId: avatarPublicId,
+      name: participantName,
+      type: participantType,
+      role: participant.role,
+      color: participantColor
+    };
+    if (participantTypePublicId === authorEntryPublicId.value) {
+      author.value = participantData;
+    } else {
+      participantArray.value.push(participantData);
     }
-    return '';
-  });
-
-  type AuthorEntry = {
-    avatarId: string;
-    name: string;
-    type: string;
-    color: string;
-  };
-  const avatarArray = ref<AuthorEntry[]>([]);
-  for (const author of props.convo.members) {
-    avatarArray.value.push({
-      avatarId: author.foreignEmailIdentity?.avatarId
-        ? author.foreignEmailIdentity?.avatarId
-        : author.userGroup?.avatarId
-        ? author.userGroup?.avatarId
-        : author.userProfile?.avatarId
-        ? author.userProfile?.avatarId
-        : '',
-      name: author.foreignEmailIdentity?.senderName
-        ? author.foreignEmailIdentity?.senderName
-        : author.userGroup?.name
-        ? author.userGroup?.name
-        : author.userProfile?.firstName
-        ? author.userProfile?.firstName + ' ' + author.userProfile?.lastName
-        : '',
-      type: author.foreignEmailIdentity?.senderName
-        ? 'External'
-        : author.userGroup?.name
-        ? 'Group'
-        : 'User',
-      color: author.userGroup?.color ? author.userGroup?.color : 'base'
+    console.log('avatar data', {
+      avatarPublicId,
+      contact: participant.contact?.publicId,
+      group: participant.userGroup?.publicId,
+      user: participant.orgMember?.profile.publicId
     });
   }
 </script>
 <template>
   <button
-    class="p-4 rounded flex flex-col justify-between bg-base-3 hover:bg-base-4 gap-2 overflow-hidden max-w-full">
-    <div class="flex flex-row gap-6 items-center w-full">
+    class="bg-gray-50 hover:bg-gray-100 dark:bg-gray-900 dark:hover:bg-gray-800 max-w-full flex flex-col justify-between gap-0 rounded-lg">
+    <div class="h-fit w-full flex flex-row items-center gap-6">
       <UnUiAvatarPlus
-        :avatars="avatarArray"
-        :primary="{
-          avatarId: authorAvatar,
-          name: authorName,
-          type: 'User',
-          color: authorColor
-        }"
+        :avatars="participantArray"
+        :primary="author"
         size="lg" />
-      <div class="w-full overflow-hidden flex flex-col gap-1">
+      <div class="w-full flex flex-col gap-1 overflow-hidden">
         <!-- <div class="text-base text-left w-full overflow-hidden text-sm">
           <span class="line-clamp-2 font-bold">{{ authorName }}</span>
         </div> -->
-        <div class="text-xs w-full text-left overflow-hidden">
-          <span class="truncate text-xs font-italic"
-            >Re: {{ props.convo.subjects[0].subject }}</span
-          >
+        <div class="w-full overflow-hidden text-left text-xs">
+          <span class="truncate text-xs font-italic">
+            Re: {{ props.convo.subjects[0].subject }}
+          </span>
         </div>
-        <div class="text-base text-left w-full overflow-hidden text-sm">
-          <span class="line-clamp-2"
-            ><span class="font-bold">{{ authorName }}</span
-            >: {{ props.convo.messages[0].body }}</span
-          >
+        <div class="w-full overflow-hidden text-left text-base text-sm">
+          <span class="line-clamp-2">
+            <span class="font-bold">{{ authorEntryName }} </span>
+            : {{ props.convo.entries[0].bodyPlainText }}
+          </span>
         </div>
       </div>
     </div>
-    <div class="flex flex-row w-full justify-end items-center gap-1">
-      <!-- <div class="flex flex-row w-full gap-2 justify-start">
-        <UnUiAvatarList
-          :avatars="avatarArray"
-          size="xs"
-          :limit="2" />
-      </div> -->
-      <span class="text-xs text-base-11">in</span>
-      <UnUiAvatar
-        :avatar-id="props.convo.org.avatarId ? props.convo.org.avatarId : ''"
-        :name="props.convo.org.name"
-        tooltip-pre-text="Organization"
-        size="tiny" />
-      <div class="text-xs text-right min-w-fit overflow-hidden text-base-11">
+    <div class="w-full flex flex-row items-center justify-end gap-1">
+      <div class="min-w-fit overflow-hidden text-right text-xs text-base-11">
         <span class="">{{ timeAgo }}</span>
       </div>
     </div>
diff --git a/apps/web-app/components/un/ui-avatar-plus.vue b/apps/web-app/components/un/ui-avatar-plus.vue
index acd3c97e..5bc1a90a 100644
--- a/apps/web-app/components/un/ui-avatar-plus.vue
+++ b/apps/web-app/components/un/ui-avatar-plus.vue
@@ -1,22 +1,10 @@
 <script setup lang="ts">
-  import type { VariantProps } from 'class-variance-authority';
-  import {
-    TooltipArrow,
-    TooltipContent,
-    TooltipProvider,
-    TooltipRoot,
-    TooltipTrigger
-  } from 'radix-vue';
+  import type { UiColor } from '@uninbox/types/ui';
+  import type { ConvoParticipantEntry } from '~/composables/types';
 
-  type AuthorEntry = {
-    avatarId: string;
-    name: string;
-    type: string;
-    color: string;
-  };
   type Props = {
-    primary: AuthorEntry;
-    avatars: AuthorEntry[];
+    primary: ConvoParticipantEntry | undefined;
+    avatars: ConvoParticipantEntry[];
     size: 'tiny' | 'xs' | 'sm' | 'md' | 'lg' | 'xl';
     limit?: number;
   };
@@ -26,119 +14,55 @@
     limit: 1
   });
 
-  const avatarClasses = useUtils().cva('', {
-    variants: {
-      primaryImage: {
-        tiny: '32x32',
-        xs: '32x32',
-        sm: '48x48',
-        md: '56x56',
-        lg: '64x64',
-        xl: '80x80',
-        '2xl': '128x128'
-      },
-      plusImage: {
-        tiny: '16x16',
-        xs: '16x16',
-        sm: '24x24',
-        md: '28x28',
-        lg: '32x32',
-        xl: '40x40',
-        '2xl': '64x64'
-      },
-      primaryContainer: {
-        tiny: 'w-[16px] h-[16px] text-xs rounded-md',
-        xs: 'w-[32px] h-[32px] text-sm rounded-md',
-        sm: 'w-[48px] h-[48px] text-base rounded-md',
-        md: 'w-[56px] h-[56px] text-lg rounded-lg',
-        lg: 'w-[64px] h-[64px] text-xl rounded-lg',
-        xl: 'w-[80px] h-[80px] text-2xl rounded-lg',
-        '2xl': 'w-[128px] h-[128px] text-3xl rounded-xl'
-      },
-      plusContainer: {
-        tiny: 'w-[16px] h-[16px] text-xs',
-        xs: 'w-[32px] h-[32px] text-sm',
-        sm: 'w-[48px] h-[48px] text-base',
-        md: 'w-[56px] h-[56px] text-lg',
-        lg: 'w-[64px] h-[64px] text-xl',
-        xl: 'w-[80px] h-[80px] text-2xl',
-        '2xl': 'w-[128px] h-[128px] text-3xl'
-      },
-      color: {
-        base: 'bg-base-3',
-        red: 'bg-red-9',
-        purple: 'bg-purple-9',
-        green: 'bg-green-9',
-        yellow: 'bg-yellow-9',
-        pink: 'bg-pink-9',
-        blue: 'bg-blue-9'
-      }
-    }
+  const avatarArray = computed(() => {
+    // if (props.avatars.length + 1 > props.limit) {
+    //   return props.avatars.slice(0, props.limit - 1);
+    // }
+    return props.avatars;
   });
 
-  const expanded = ref(false);
-  const toggleState = ref(false);
-  const imageUrlAccountHash = useRuntimeConfig().public.cfImagesAccountHash;
-
-  const avatarArray = computed(() => {
-    if (props.avatars.length + 1 > props.limit) {
-      return props.avatars.slice(0, props.limit - 1);
+  const primaryAvatar = computed(() => {
+    console.log({ primary: props.primary, avatars: props.avatars });
+    if (props.primary) {
+      return props.primary;
     }
-    return props.avatars;
+    return props.avatars[0];
   });
 </script>
 <template>
-  <div class="">
-    <UnUiTooltip :text="primary.name || ''">
+  <div class="h-fit flex flex-row items-end">
+    <UnUiAvatar
+      :avatar-id="primaryAvatar.avatarPublicId"
+      :public-id="primaryAvatar.participantPublicId"
+      :alt="primaryAvatar.name"
+      :type="primaryAvatar.type"
+      :color="primaryAvatar.color"
+      size="lg" />
+    <NuxtUiPopover
+      v-if="props.avatars.length + 1 > props.limit"
+      class="-mb-4 -ml-4"
+      :popper="{ placement: 'top' }"
+      mode="hover">
       <div
-        class="bg-cover bg-center font-display flex justify-center items-center"
-        :class="
-          avatarClasses({ primaryContainer: props.size, color: primary.color })
-        "
-        :style="
-          primary.avatarId
-            ? `background-image: url(https://imagedelivery.net/${imageUrlAccountHash}/${
-                primary.avatarId
-              }/${avatarClasses({ primaryImage: props.size })})`
-            : ''
-        ">
-        {{
-          primary.avatarId ? '' : primary.name ? primary.name?.charAt(0) : ''
-        }}
+        class="bg-gray-50 h-[32px] w-[32px] flex items-center justify-center rounded-2 text-sm font-display shadow backdrop-blur-2xl">
+        + {{ props.avatars.length - props.limit + 1 }}
       </div>
-    </UnUiTooltip>
 
-    <TooltipProvider v-if="props.avatars.length + 1 > props.limit">
-      <TooltipRoot v-model:open="toggleState">
-        <TooltipTrigger
-          @click="toggleState = !toggleState"
-          class="relative -top-[25px] w-fit -right-[35px] -mb[25px]">
+      <template #panel>
+        <div class="flex flex-row gap-2 p-4">
           <div
-            class="rounded-2 font-display text-base-12 flex justify-center items-center backdrop-blur-2xl w-[32px] h-[32px] text-sm shadow">
-            + {{ props.avatars.length - props.limit + 1 }}
+            v-for="avatar in avatarArray"
+            :key="avatar.participantPublicId">
+            <UnUiAvatar
+              :avatar-id="avatar.avatarPublicId"
+              :public-id="avatar.participantPublicId"
+              :alt="avatar.name"
+              :type="avatar.type"
+              :color="avatar.color"
+              size="lg" />
           </div>
-        </TooltipTrigger>
-        <Teleport to="body">
-          <TooltipContent
-            :side-offset="5"
-            :avoid-collisions="true"
-            class="data-[state=delayed-open]:data-[side=top]:animate-slideDownAndFade data-[state=delayed-open]:data-[side=right]:animate-slideLeftAndFade data-[state=delayed-open]:data-[side=left]:animate-slideRightAndFade data-[state=delayed-open]:data-[side=bottom]:animate-slideUpAndFade max-w-80 border border-base-6 rounded-lg bg-base-2 p-4 text-sm">
-            <div class="flex flex-row gap-2">
-              <div
-                v-for="avatar in props.avatars"
-                :key="avatar.avatarId">
-                <UnUiAvatar
-                  :avatar-id="avatar.avatarId"
-                  :name="avatar.name"
-                  :tooltip-pre-text="avatar.type"
-                  :color="avatar.color"
-                  size="sm" />
-              </div>
-              <TooltipArrow class="fill-base-11" />
-            </div>
-          </TooltipContent>
-        </Teleport>
-      </TooltipRoot>
-    </TooltipProvider>
+        </div>
+      </template>
+    </NuxtUiPopover>
   </div>
 </template>
diff --git a/apps/web-app/pages/[orgSlug]/convo/[id].vue b/apps/web-app/pages/[orgSlug]/convo/[id].vue
index 0a3a8c38..6ae2227f 100644
--- a/apps/web-app/pages/[orgSlug]/convo/[id].vue
+++ b/apps/web-app/pages/[orgSlug]/convo/[id].vue
@@ -64,9 +64,9 @@
         participant.orgMember?.publicId ||
         '';
       const avatarPublicId =
-        participant.contact?.publicId ||
-        participant.userGroup?.publicId ||
-        participant.orgMember?.profile.publicId ||
+        participant.contact?.avatarId ||
+        participant.userGroup?.avatarId ||
+        participant.orgMember?.profile.avatarId ||
         '';
       const participantName =
         participant.contact?.name || participant.contact?.emailUsername
diff --git a/apps/web-app/server/trpc/routers/convoRouter/convoRouter.ts b/apps/web-app/server/trpc/routers/convoRouter/convoRouter.ts
index 35311832..71af297d 100644
--- a/apps/web-app/server/trpc/routers/convoRouter/convoRouter.ts
+++ b/apps/web-app/server/trpc/routers/convoRouter/convoRouter.ts
@@ -746,6 +746,7 @@ export const convoRouter = router({
                 with: {
                   profile: {
                     columns: {
+                      avatarId: true,
                       firstName: true,
                       lastName: true,
                       publicId: true,
@@ -757,6 +758,7 @@ export const convoRouter = router({
               },
               userGroup: {
                 columns: {
+                  avatarId: true,
                   id: true,
                   name: true,
                   color: true,
@@ -773,6 +775,7 @@ export const convoRouter = router({
               },
               contact: {
                 columns: {
+                  avatarId: true,
                   publicId: true,
                   name: true,
                   emailUsername: true,
@@ -917,14 +920,16 @@ export const convoRouter = router({
           },
           participants: {
             columns: {
-              role: true
+              role: true,
+              publicId: true
             },
             with: {
               orgMember: {
-                columns: {},
+                columns: { publicId: true },
                 with: {
                   profile: {
                     columns: {
+                      publicId: true,
                       firstName: true,
                       lastName: true,
                       avatarId: true,
@@ -935,6 +940,7 @@ export const convoRouter = router({
               },
               userGroup: {
                 columns: {
+                  publicId: true,
                   name: true,
                   color: true,
                   avatarId: true
@@ -942,6 +948,7 @@ export const convoRouter = router({
               },
               contact: {
                 columns: {
+                  publicId: true,
                   name: true,
                   avatarId: true,
                   setName: true,
@@ -964,10 +971,13 @@ export const convoRouter = router({
                 columns: {},
                 with: {
                   orgMember: {
-                    columns: {},
+                    columns: {
+                      publicId: true
+                    },
                     with: {
                       profile: {
                         columns: {
+                          publicId: true,
                           firstName: true,
                           lastName: true,
                           avatarId: true,
@@ -978,6 +988,7 @@ export const convoRouter = router({
                   },
                   userGroup: {
                     columns: {
+                      publicId: true,
                       name: true,
                       color: true,
                       avatarId: true
@@ -985,6 +996,7 @@ export const convoRouter = router({
                   },
                   contact: {
                     columns: {
+                      publicId: true,
                       name: true,
                       avatarId: true,
                       setName: true,

From a6215fec698a832d0e7ac8da4288feeeae6379d1 Mon Sep 17 00:00:00 2001
From: McPizza <gh@l1.io>
Date: Tue, 30 Jan 2024 20:21:54 +0000
Subject: [PATCH 21/36] remove sidebar comment hydration error

---
 apps/web-app/components/convos/sidebar.vue | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/apps/web-app/components/convos/sidebar.vue b/apps/web-app/components/convos/sidebar.vue
index c5e17417..7e298295 100644
--- a/apps/web-app/components/convos/sidebar.vue
+++ b/apps/web-app/components/convos/sidebar.vue
@@ -19,12 +19,6 @@
         icon="i-ph-plus"
         variant="outline"
         :to="`/${orgSlug}/convo/new`" />
-      <!-- <UnUiButton
-        class="flex-grow justify-center"
-        label="Filter"
-        icon="i-ph-list-checks"
-        variant="outline"
-        :to="`/${orgSlug}/convo/new`" /> -->
     </div>
   </div>
 </template>

From 14606a548e753834faabd8a26e5faf97181053c9 Mon Sep 17 00:00:00 2001
From: McPizza <gh@l1.io>
Date: Tue, 30 Jan 2024 20:22:38 +0000
Subject: [PATCH 22/36] remove comment

---
 apps/web-app/components/convos/convoListItem.vue | 6 ------
 apps/web-app/components/un/ui-avatar-plus.vue    | 3 +--
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/apps/web-app/components/convos/convoListItem.vue b/apps/web-app/components/convos/convoListItem.vue
index 317eeba6..d94acbb5 100644
--- a/apps/web-app/components/convos/convoListItem.vue
+++ b/apps/web-app/components/convos/convoListItem.vue
@@ -80,12 +80,6 @@
     } else {
       participantArray.value.push(participantData);
     }
-    console.log('avatar data', {
-      avatarPublicId,
-      contact: participant.contact?.publicId,
-      group: participant.userGroup?.publicId,
-      user: participant.orgMember?.profile.publicId
-    });
   }
 </script>
 <template>
diff --git a/apps/web-app/components/un/ui-avatar-plus.vue b/apps/web-app/components/un/ui-avatar-plus.vue
index 5bc1a90a..663c4339 100644
--- a/apps/web-app/components/un/ui-avatar-plus.vue
+++ b/apps/web-app/components/un/ui-avatar-plus.vue
@@ -22,7 +22,6 @@
   });
 
   const primaryAvatar = computed(() => {
-    console.log({ primary: props.primary, avatars: props.avatars });
     if (props.primary) {
       return props.primary;
     }
@@ -41,7 +40,7 @@
     <NuxtUiPopover
       v-if="props.avatars.length + 1 > props.limit"
       class="-mb-4 -ml-4"
-      :popper="{ placement: 'top' }"
+      :popper="{ placement: 'right' }"
       mode="hover">
       <div
         class="bg-gray-50 h-[32px] w-[32px] flex items-center justify-center rounded-2 text-sm font-display shadow backdrop-blur-2xl">

From 1f1f43883b261bd94fd98a069a33bfb0a0f8a8a6 Mon Sep 17 00:00:00 2001
From: McPizza <gh@l1.io>
Date: Tue, 30 Jan 2024 20:23:03 +0000
Subject: [PATCH 23/36] switch convo loading to use status

---
 apps/web-app/pages/[orgSlug]/convo/[id].vue | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/apps/web-app/pages/[orgSlug]/convo/[id].vue b/apps/web-app/pages/[orgSlug]/convo/[id].vue
index 6ae2227f..4d5672f6 100644
--- a/apps/web-app/pages/[orgSlug]/convo/[id].vue
+++ b/apps/web-app/pages/[orgSlug]/convo/[id].vue
@@ -32,19 +32,23 @@
 
   const orgSlug = useRoute().params.orgSlug as string;
   const convoPublicId = useRoute().params.id as string;
-  const { data: convoDetails, pending: convoDetailsPending } =
+  const { data: convoDetails, status: convoDetailsStatus } =
     await $trpc.convos.getConvo.useLazyQuery(
       {
         convoPublicId: convoPublicId
       },
-      { server: false }
+      { server: false, queryKey: `convoDetails-${convoPublicId}` }
     );
 
-  watch(convoDetailsPending, () => {
-    if (!convoDetailsPending.value) {
-      if (!convoDetails.value?.data) navigateTo(`/${orgSlug}/convo/404`);
-      if (!convoDetails.value?.data?.participants)
+  watch(convoDetails, () => {
+    if (convoDetailsStatus.value === 'idle') return;
+    if (convoDetailsStatus.value === 'success') {
+      if (!convoDetails.value?.data) {
         navigateTo(`/${orgSlug}/convo/404`);
+      }
+      if (!convoDetails.value?.data?.participants) {
+        navigateTo(`/${orgSlug}/convo/404`);
+      }
     }
 
     createDate.value = convoDetails.value?.data?.createdAt || new Date();

From 9d25e13b409f885d3a956d44c56c007dfabaa42a Mon Sep 17 00:00:00 2001
From: McPizza <gh@l1.io>
Date: Tue, 30 Jan 2024 20:23:20 +0000
Subject: [PATCH 24/36] add query keys

---
 apps/web-app/components/convos/convoMessages.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/web-app/components/convos/convoMessages.vue b/apps/web-app/components/convos/convoMessages.vue
index 1ee0d7a2..73b92b7d 100644
--- a/apps/web-app/components/convos/convoMessages.vue
+++ b/apps/web-app/components/convos/convoMessages.vue
@@ -16,11 +16,12 @@
   const props = defineProps<Props>();
 
   const { data: convoEntries } =
-    await $trpc.convos.entries.getConvoEntries.useQuery(
+    await $trpc.convos.entries.getConvoEntries.useLazyQuery(
       {
         convoPublicId: props.convoPublicId
       },
-      { server: false }
+      // { server: false }
+      { server: false, queryKey: `convoEntries-${props.convoPublicId}` }
     );
 
   watch(convoEntries, () => {

From e6c1b4f8c3eb1d6013fd17093f3d0bc97b354190 Mon Sep 17 00:00:00 2001
From: McPizza <gh@l1.io>
Date: Tue, 30 Jan 2024 20:23:41 +0000
Subject: [PATCH 25/36] implement convolist

---
 apps/web-app/components/convos/convoList.vue | 89 +++++++++++---------
 1 file changed, 51 insertions(+), 38 deletions(-)

diff --git a/apps/web-app/components/convos/convoList.vue b/apps/web-app/components/convos/convoList.vue
index 8c6e8bf4..3203bf0e 100644
--- a/apps/web-app/components/convos/convoList.vue
+++ b/apps/web-app/components/convos/convoList.vue
@@ -7,30 +7,26 @@
   type UserConvosDataType = PromiseType<
     ReturnType<typeof $trpc.convos.getUserConvos.query>
   >['data'];
-  // const convoStore = useConvoStore();
-  // if (process.client && convoStore.convos.length === 0) {
-  //   await convoStore.getInitialConvos();
-  // }
-  // console.log(convoStore.convos.length);
 
   const orgSlug = useRoute().params.orgSlug as string;
+  const infiniteContainer = ref<HTMLElement | null>(null);
 
   const convoCursor = ref({
-    lastUpdatedAt: null as Date | null,
-    lastPublicId: null as string | null
+    cursorLastUpdatedAt: null as Date | null,
+    cursorLastPublicId: null as string | null
   });
   const userHasMoreConvos = ref(true);
+  const pauseLoading = ref(false);
   const convos = ref<{}[]>([]);
   // const convos = ref<UserConvosDataType[]>([]);
 
-  const userConvoQueryParams = computed(() => {
-    if (!convoCursor.value.lastUpdatedAt || !convoCursor.value.lastPublicId)
-      return {};
-    return {
-      cursorLastUpdatedAt: convoCursor.value.lastUpdatedAt,
-      cursorLastPublicId: convoCursor.value.lastPublicId
-    };
-  });
+  type UserConvoQueryParams =
+    | {
+        cursorLastUpdatedAt: Date;
+        cursorLastPublicId: string;
+      }
+    | {};
+  const userConvoQueryParams = ref<UserConvoQueryParams>({});
   const userConvoQueryPending = computed(() => {
     return userConvosStatus.value === 'idle';
   });
@@ -41,13 +37,13 @@
   const {
     data: userConvosData,
     status: userConvosStatus,
-    execute: userConvosFetch
-  } = await $trpc.convos.getUserConvos.useLazyQuery(
-    userConvoQueryParams.value,
-    {
-      server: false
-    }
-  );
+    execute: getUserConvos
+  } = await $trpc.convos.getUserConvos.useLazyQuery(userConvoQueryParams, {
+    server: false,
+    queryKey: `userConvos-${orgSlug}`,
+    immediate: false,
+    watch: [userConvoQueryParams]
+  });
 
   watch(
     userConvosData,
@@ -58,8 +54,8 @@
         return;
       }
       convos.value.push(...newVal.data);
-      convoCursor.value.lastUpdatedAt = newVal.cursor.lastUpdatedAt;
-      convoCursor.value.lastPublicId = newVal.cursor.lastPublicId;
+      convoCursor.value.cursorLastUpdatedAt = newVal.cursor.lastUpdatedAt;
+      convoCursor.value.cursorLastPublicId = newVal.cursor.lastPublicId;
     },
     {
       immediate: true,
@@ -67,16 +63,28 @@
     }
   );
 
-  // useInfiniteScroll(
-  //   containerProps.ref,
-  //   () => {
-  //     getNextConvos();
-  //   },
-  //   { distance: 300, canLoadMore: () => userHasMoreConvos.value }
-  // );
+  useInfiniteScroll(
+    infiniteContainer,
+    async () => {
+      if (pauseLoading.value) return;
+      if (!userHasMoreConvos.value) return;
+      if (userConvosStatus.value === 'pending') return;
+      pauseLoading.value = true;
+      userConvoQueryParams.value = {
+        cursorLastUpdatedAt: convoCursor.value.cursorLastUpdatedAt,
+        cursorLastPublicId: convoCursor.value.cursorLastPublicId
+      };
+      pauseLoading.value = false;
+    },
+    { distance: 100, canLoadMore: () => userHasMoreConvos.value }
+  );
+
+  onMounted(() => {
+    if (convos.value.length === 0) getUserConvos();
+  });
 </script>
 <template>
-  <div class="h-full max-h-full max-w-full w-full overflow-y-scroll">
+  <div class="h-full max-h-full max-w-full w-full overflow-hidden">
     <div
       v-if="userConvoQueryPending"
       class="w-full flex flex-row justify-center gap-4 rounded-xl rounded-tl-2xl bg-base-3 p-8">
@@ -87,7 +95,7 @@
     </div>
     <div
       v-if="!userConvoQueryPending"
-      class="mb-[48px] flex flex-col items-start gap-4">
+      class="mb-[48px] max-h-full flex flex-col items-start gap-4 overflow-hidden">
       <div
         v-if="!userHasConvos"
         class="w-full flex flex-row justify-center gap-4 rounded-xl rounded-tl-2xl bg-base-3 p-8">
@@ -98,7 +106,8 @@
       </div>
       <div
         v-if="userHasConvos"
-        class="max-w-full">
+        ref="infiniteContainer"
+        class="h-full max-h-full max-w-full w-full overflow-scroll">
         <DynamicScroller
           :items="convos"
           key-field="publicId"
@@ -115,10 +124,14 @@
             </DynamicScrollerItem>
           </template>
         </DynamicScroller>
-        <div>convos exist</div>
-        <div>{{ convos.length }}</div>
-        <div>{{ convoCursor }}</div>
-        <div>{{ convos[0] }}</div>
+        <div
+          v-if="userHasMoreConvos && pauseLoading"
+          class="w-full flex flex-row justify-center gap-4 rounded-xl rounded-tl-2xl bg-base-3 p-8">
+          <UnUiIcon
+            name="i-svg-spinners:3-dots-fade"
+            size="24" />
+          <span>Loading more conversations</span>
+        </div>
       </div>
     </div>
   </div>

From bf7b68ae5e2de9661be8e4e2cea1eabdbd535c35 Mon Sep 17 00:00:00 2001
From: McPizza <gh@l1.io>
Date: Thu, 1 Feb 2024 13:17:17 +0000
Subject: [PATCH 26/36] Update apps/web-app/components/convos/convoList.vue

Co-authored-by: Tim Raderschad <tim.raderschad@gmail.com>
---
 apps/web-app/components/convos/convoList.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/web-app/components/convos/convoList.vue b/apps/web-app/components/convos/convoList.vue
index 3203bf0e..0a16ea9a 100644
--- a/apps/web-app/components/convos/convoList.vue
+++ b/apps/web-app/components/convos/convoList.vue
@@ -11,9 +11,9 @@
   const orgSlug = useRoute().params.orgSlug as string;
   const infiniteContainer = ref<HTMLElement | null>(null);
 
-  const convoCursor = ref({
-    cursorLastUpdatedAt: null as Date | null,
-    cursorLastPublicId: null as string | null
+  const convoCursor = ref<{cursorLastUpdatedAt: Date | null, cursorLastPublicId: string | null}>({
+    cursorLastUpdatedAt: null,
+    cursorLastPublicId: null
   });
   const userHasMoreConvos = ref(true);
   const pauseLoading = ref(false);

From dab24b729ea06c2adcdf3a1e7edb06e6b373713a Mon Sep 17 00:00:00 2001
From: McPizza <gh@l1.io>
Date: Thu, 1 Feb 2024 13:19:12 +0000
Subject: [PATCH 27/36] Update apps/web-app/components/convos/convoMessages.vue

Co-authored-by: Tim Raderschad <tim.raderschad@gmail.com>
---
 apps/web-app/components/convos/convoMessages.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/web-app/components/convos/convoMessages.vue b/apps/web-app/components/convos/convoMessages.vue
index 73b92b7d..3ca3e212 100644
--- a/apps/web-app/components/convos/convoMessages.vue
+++ b/apps/web-app/components/convos/convoMessages.vue
@@ -5,8 +5,7 @@
   type ConvoEntriesDataType = PromiseType<
     ReturnType<typeof $trpc.convos.entries.getConvoEntries.query>
   >['entries'];
-  //@ts-expect-error
-  const el = ref<HTMLElement>(null);
+  const el = ref<HTMLElement | null>(null);
   const entriesArray = ref<ConvoEntriesDataType>([]);
 
   type Props = {

From c7ba605b5b12444305dd7a4d933503ea0042f714 Mon Sep 17 00:00:00 2001
From: McPizza <gh@l1.io>
Date: Thu, 1 Feb 2024 13:19:44 +0000
Subject: [PATCH 28/36] Update apps/web-app/components/convos/convoMessages.vue

Co-authored-by: Tim Raderschad <tim.raderschad@gmail.com>
---
 apps/web-app/components/convos/convoMessages.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/web-app/components/convos/convoMessages.vue b/apps/web-app/components/convos/convoMessages.vue
index 3ca3e212..ac6d21ea 100644
--- a/apps/web-app/components/convos/convoMessages.vue
+++ b/apps/web-app/components/convos/convoMessages.vue
@@ -19,7 +19,6 @@
       {
         convoPublicId: props.convoPublicId
       },
-      // { server: false }
       { server: false, queryKey: `convoEntries-${props.convoPublicId}` }
     );
 

From d2f772cd47e819045594eb59afd0bda99cdc10d1 Mon Sep 17 00:00:00 2001
From: McPizza <gh@l1.io>
Date: Thu, 1 Feb 2024 13:20:00 +0000
Subject: [PATCH 29/36] Update apps/web-app/components/un/ui-avatar-plus.vue

Co-authored-by: Tim Raderschad <tim.raderschad@gmail.com>
---
 apps/web-app/components/un/ui-avatar-plus.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/apps/web-app/components/un/ui-avatar-plus.vue b/apps/web-app/components/un/ui-avatar-plus.vue
index 663c4339..8dd58b0b 100644
--- a/apps/web-app/components/un/ui-avatar-plus.vue
+++ b/apps/web-app/components/un/ui-avatar-plus.vue
@@ -15,9 +15,6 @@
   });
 
   const avatarArray = computed(() => {
-    // if (props.avatars.length + 1 > props.limit) {
-    //   return props.avatars.slice(0, props.limit - 1);
-    // }
     return props.avatars;
   });
 

From 7937232cccc956cf700f7dde2dfdc4d7dd32f885 Mon Sep 17 00:00:00 2001
From: McPizza <gh@l1.io>
Date: Thu, 1 Feb 2024 13:20:16 +0000
Subject: [PATCH 30/36] Update apps/web-app/components/convos/convoMessages.vue

Co-authored-by: Tim Raderschad <tim.raderschad@gmail.com>
---
 apps/web-app/components/convos/convoMessages.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/apps/web-app/components/convos/convoMessages.vue b/apps/web-app/components/convos/convoMessages.vue
index ac6d21ea..d0f64bf5 100644
--- a/apps/web-app/components/convos/convoMessages.vue
+++ b/apps/web-app/components/convos/convoMessages.vue
@@ -28,10 +28,6 @@
     }
   });
 
-  // const { list, containerProps, wrapperProps } = useVirtualList(entriesArray, {
-  //   itemHeight: 152,
-  //   overscan: 3
-  // });
   useInfiniteScroll(
     el,
     () => {

From 224f58b870cbdf38c42a2cd9144f9da7847bae69 Mon Sep 17 00:00:00 2001
From: McPizza <gh@l1.io>
Date: Thu, 1 Feb 2024 13:56:32 +0000
Subject: [PATCH 31/36] add new convo util useParticipantData

---
 apps/web-app/composables/utils.ts | 67 ++++++++++++++++++++++++++++++-
 1 file changed, 66 insertions(+), 1 deletion(-)

diff --git a/apps/web-app/composables/utils.ts b/apps/web-app/composables/utils.ts
index 498269d5..0483d929 100644
--- a/apps/web-app/composables/utils.ts
+++ b/apps/web-app/composables/utils.ts
@@ -1,4 +1,10 @@
 import { cva, type VariantProps } from 'class-variance-authority';
+const { $trpc } = useNuxtApp();
+
+type UserConvosDataType = Awaited<
+  ReturnType<typeof $trpc.convos.getUserConvos.query>
+>['data'];
+
 function generateAvatarUrl(
   type: 'user' | 'org' | 'group' | 'contact',
   avatarId: string,
@@ -34,8 +40,67 @@ function generateAvatarUrl(
   }`;
 }
 
+function useParticipantData(
+  participant: UserConvosDataType[number]['participants'][0]
+) {
+  const {
+    publicId: participantPublicId,
+    contact,
+    userGroup,
+    orgMember,
+    role: participantRole
+  } = participant;
+
+  let participantType: 'user' | 'group' | 'contact',
+    participantTypePublicId,
+    avatarPublicId,
+    participantName,
+    participantColor;
+
+  switch (true) {
+    case !!contact?.publicId:
+      participantType = 'contact';
+      participantTypePublicId = contact.publicId;
+      avatarPublicId = contact.avatarId || '';
+      participantName =
+        contact.name || `${contact.emailUsername}@${contact.emailDomain}`;
+      participantColor = null;
+      break;
+    case !!userGroup?.name:
+      participantType = 'group';
+      participantTypePublicId = userGroup.publicId;
+      avatarPublicId = userGroup.avatarId || '';
+      participantName = userGroup.name;
+      participantColor = userGroup.color;
+      break;
+    case !!orgMember?.publicId:
+      participantType = 'user';
+      participantTypePublicId = orgMember.publicId;
+      avatarPublicId = orgMember.profile.avatarId || '';
+      participantName = `${orgMember.profile.firstName} ${orgMember.profile.lastName}`;
+      participantColor = null;
+      break;
+    default:
+      participantType = 'user';
+      participantTypePublicId = '';
+      avatarPublicId = '';
+      participantName = '';
+      participantColor = null;
+  }
+
+  return {
+    participantPublicId,
+    participantType,
+    participantTypePublicId,
+    avatarPublicId,
+    participantName,
+    participantColor,
+    participantRole
+  };
+}
+
 export const useUtils = () => {
-  return { cva, generateAvatarUrl };
+  return { cva, generateAvatarUrl, convos: { useParticipantData } };
 };
 
 // TODO: Fix exporting types under namespace UseUtilTypes

From f155b4f96d2a6a12092ac1502456f95150596ae3 Mon Sep 17 00:00:00 2001
From: McPizza <gh@l1.io>
Date: Thu, 1 Feb 2024 14:09:16 +0000
Subject: [PATCH 32/36] update convoAvatar component

---
 .../web-app/components/convos/convoAvatar.vue |  21 +--
 apps/web-app/pages/[orgSlug]/convo/[id].vue   | 132 +++++++-----------
 2 files changed, 61 insertions(+), 92 deletions(-)

diff --git a/apps/web-app/components/convos/convoAvatar.vue b/apps/web-app/components/convos/convoAvatar.vue
index c888b55f..bbb7620d 100644
--- a/apps/web-app/components/convos/convoAvatar.vue
+++ b/apps/web-app/components/convos/convoAvatar.vue
@@ -1,27 +1,20 @@
 <script setup lang="ts">
   import type { ConvoParticipantEntry } from '~/composables/types';
   type Props = {
-    participantPublicId: string;
-    participants: ConvoParticipantEntry[];
+    participant: ConvoParticipantEntry;
     size?: 'xs' | 'sm' | 'md' | 'lg';
   };
 
   const props = defineProps<Props>();
-  const participant = computed(() => {
-    return props.participants.find(
-      (participant) =>
-        participant.participantPublicId === props.participantPublicId
-    );
-  });
 </script>
 <template>
   <UnUiAvatar
-    v-if="participant"
-    :avatar-id="participant.avatarPublicId"
-    :public-id="participant.avatarPublicId"
-    :alt="participant.name"
-    :type="participant.type"
-    :color="participant.color"
+    v-if="props.participant"
+    :avatar-id="props.participant.avatarPublicId"
+    :public-id="props.participant.avatarPublicId"
+    :alt="props.participant.name"
+    :type="props.participant.type"
+    :color="props.participant.color"
     :show-icon="true"
     :size="props.size ? props.size : 'sm'" />
 </template>
diff --git a/apps/web-app/pages/[orgSlug]/convo/[id].vue b/apps/web-app/pages/[orgSlug]/convo/[id].vue
index 4d5672f6..7a0c934f 100644
--- a/apps/web-app/pages/[orgSlug]/convo/[id].vue
+++ b/apps/web-app/pages/[orgSlug]/convo/[id].vue
@@ -18,11 +18,11 @@
   const attachmentsCollapsed = ref(true);
   const participantPublicId = ref('');
   const participantArray = ref<ConvoParticipantEntry[]>([]);
-  const participantsAssignedPublicIds = ref<string[]>([]);
-  const participantContributorsPublicIds = ref<string[]>([]);
-  const participantCommentersPublicIds = ref<string[]>([]);
-  const participantWatchersPublicIds = ref<string[]>([]);
-  const participantGuestsPublicIds = ref<string[]>([]);
+  const participantsAssignedArray = ref<ConvoParticipantEntry[]>([]);
+  const participantContributorsArray = ref<ConvoParticipantEntry[]>([]);
+  const participantCommentersArray = ref<ConvoParticipantEntry[]>([]);
+  const participantWatchersArray = ref<ConvoParticipantEntry[]>([]);
+  const participantGuestsArray = ref<ConvoParticipantEntry[]>([]);
   const attachments = ref<AttachmentEntry[]>([]);
   const subjectsArray = ref<string[]>([]);
   const createDate = ref<Date | null>(null);
@@ -56,8 +56,13 @@
       convoDetails.value?.data?.lastUpdatedAt ||
       convoDetails.value?.data?.createdAt ||
       new Date();
-    createdAgo.value = useTimeAgo(createDate.value).value;
-    updatedAgo.value = useTimeAgo(updateDate.value).value;
+    // Ensure createDate and updateDate are always Date objects before passing to useTimeAgo
+    createdAgo.value = useTimeAgo(
+      createDate.value ? createDate.value : new Date()
+    ).value;
+    updatedAgo.value = useTimeAgo(
+      updateDate.value ? updateDate.value : new Date()
+    ).value;
 
     const convoParticipants = convoDetails.value?.data?.participants || [];
     for (const participant of convoParticipants) {
@@ -100,25 +105,15 @@
 
       participantArray.value.push(participantData);
       if (participant.role === 'assigned')
-        participantsAssignedPublicIds.value.push(
-          participantData.participantPublicId
-        );
+        participantsAssignedArray.value.push(participantData);
       if (participant.role === 'contributor')
-        participantContributorsPublicIds.value.push(
-          participantData.participantPublicId
-        );
+        participantContributorsArray.value.push(participantData);
       if (participant.role === 'commenter')
-        participantCommentersPublicIds.value.push(
-          participantData.participantPublicId
-        );
+        participantCommentersArray.value.push(participantData);
       if (participant.role === 'watcher')
-        participantWatchersPublicIds.value.push(
-          participantData.participantPublicId
-        );
+        participantWatchersArray.value.push(participantData);
       if (participant.role === 'guest')
-        participantGuestsPublicIds.value.push(
-          participantData.participantPublicId
-        );
+        participantGuestsArray.value.push(participantData);
     }
 
     if (
@@ -249,35 +244,31 @@
               @click="convoParticiapntsCollapsed = !convoParticiapntsCollapsed">
               <NuxtUiAvatarGroup>
                 <template
-                  v-for="participantPublicId of participantsAssignedPublicIds"
-                  :key="participantPublicId">
+                  v-for="participant of participantsAssignedArray"
+                  :key="participant.participantPublicId">
                   <ConvosConvoAvatar
-                    :participant-public-id="participantPublicId"
-                    :participants="participantArray"
+                    :participant="participant"
                     size="sm" />
                 </template>
                 <template
-                  v-for="participantPublicId of participantContributorsPublicIds"
-                  :key="participantPublicId">
+                  v-for="participant of participantContributorsArray"
+                  :key="participant.participantPublicId">
                   <ConvosConvoAvatar
-                    :participant-public-id="participantPublicId"
-                    :participants="participantArray"
+                    :participant="participant"
                     size="sm" />
                 </template>
                 <template
-                  v-for="participantPublicId of participantCommentersPublicIds"
-                  :key="participantPublicId">
+                  v-for="participant of participantCommentersArray"
+                  :key="participant.participantPublicId">
                   <ConvosConvoAvatar
-                    :participant-public-id="participantPublicId"
-                    :participants="participantArray"
+                    :participant="participant"
                     size="sm" />
                 </template>
                 <template
-                  v-for="participantPublicId of participantGuestsPublicIds"
-                  :key="participantPublicId">
+                  v-for="participant of participantGuestsArray"
+                  :key="participant.participantPublicId">
                   <ConvosConvoAvatar
-                    :participant-public-id="participantPublicId"
-                    :participants="participantArray"
+                    :participant="participant"
                     size="sm" />
                 </template>
               </NuxtUiAvatarGroup>
@@ -287,7 +278,7 @@
               class="h-fit max-w-full w-full flex flex-col gap-4 overflow-hidden"
               @click="convoParticiapntsCollapsed = !convoParticiapntsCollapsed">
               <div
-                v-if="participantsAssignedPublicIds.length"
+                v-if="participantsAssignedArray.length"
                 class="max-w-full w-full flex flex-col gap-2 overflow-hidden">
                 <span class="text-gray-600 dark:text-gray-400 text-xs">
                   ASSIGNED
@@ -295,23 +286,20 @@
                 <div
                   class="max-w-full w-full flex flex-col gap-2 overflow-hidden">
                   <template
-                    v-for="participantPublicId of participantsAssignedPublicIds"
-                    :key="participantPublicId">
+                    v-for="participant of participantsAssignedArray"
+                    :key="participant.participantPublicId">
                     <div
                       class="max-w-full w-full flex flex-row items-center gap-2 overflow-hidden">
                       <ConvosConvoAvatar
-                        :participant-public-id="participantPublicId"
-                        :participants="participantArray"
+                        :participant="participant"
                         size="md" />
-                      <span>{{
-                        findParticipant(participantPublicId)?.name
-                      }}</span>
+                      <span>{{ participant.name }}</span>
                     </div>
                   </template>
                 </div>
               </div>
               <div
-                v-if="participantContributorsPublicIds.length"
+                v-if="participantContributorsArray.length"
                 class="max-w-full w-full flex flex-col gap-2 overflow-hidden">
                 <span
                   class="text-gray-600 dark:text-gray-400 max-w-full w-full overflow-hidden text-xs">
@@ -320,82 +308,70 @@
                 <div
                   class="max-w-full w-full flex flex-col gap-2 overflow-hidden">
                   <template
-                    v-for="participantPublicId of participantContributorsPublicIds"
-                    :key="participantPublicId">
+                    v-for="participant of participantContributorsArray"
+                    :key="participant.participantPublicId">
                     <div class="flex flex-row items-center gap-2">
                       <ConvosConvoAvatar
-                        :participant-public-id="participantPublicId"
-                        :participants="participantArray"
+                        :participant="participant"
                         size="md" />
-                      <span class="truncate">{{
-                        findParticipant(participantPublicId)?.name
-                      }}</span>
+                      <span class="truncate">{{ participant.name }}</span>
                     </div>
                   </template>
                 </div>
               </div>
               <div
-                v-if="participantCommentersPublicIds.length"
+                v-if="participantCommentersArray.length"
                 class="flex flex-col gap-2">
                 <span class="text-gray-600 dark:text-gray-400 text-xs">
                   COMMENTERS
                 </span>
                 <div class="flex flex-col gap-2">
                   <template
-                    v-for="participantPublicId of participantCommentersPublicIds"
-                    :key="participantPublicId">
+                    v-for="participant of participantCommentersArray"
+                    :key="participant.participantPublicId">
                     <div class="flex flex-row items-center gap-2">
                       <ConvosConvoAvatar
-                        :participant-public-id="participantPublicId"
-                        :participants="participantArray"
+                        :participant="participant"
                         size="md" />
-                      <span>{{
-                        findParticipant(participantPublicId)?.name
-                      }}</span>
+                      <span>{{ participant.name }}</span>
                     </div>
                   </template>
                 </div>
               </div>
               <div
-                v-if="participantWatchersPublicIds.length"
+                v-if="participantWatchersArray.length"
                 class="flex flex-col gap-2">
                 <span class="text-gray-600 dark:text-gray-400 text-xs">
                   WATCHERS
                 </span>
                 <div class="flex flex-col gap-2">
                   <template
-                    v-for="participantPublicId of participantWatchersPublicIds"
-                    :key="participantPublicId">
+                    v-for="participant of participantWatchersArray"
+                    :key="participant.participantPublicId">
                     <div class="flex flex-row items-center gap-2">
                       <ConvosConvoAvatar
-                        :participant-public-id="participantPublicId"
-                        :participants="participantArray"
+                        :participant="participant"
                         size="md" />
-                      <span>{{
-                        findParticipant(participantPublicId)?.name
-                      }}</span>
+                      <span>{{ participant.name }}</span>
                     </div>
                   </template>
                 </div>
               </div>
               <div
-                v-if="participantGuestsPublicIds.length"
+                v-if="participantGuestsArray.length"
                 class="flex flex-col gap-2">
                 <span class="text-gray-600 dark:text-gray-400 text-xs">
                   GUEST
                 </span>
                 <div class="flex flex-col gap-2">
                   <template
-                    v-for="participantPublicId of participantGuestsPublicIds"
-                    :key="participantPublicId">
+                    v-for="participant of participantGuestsArray"
+                    :key="participant.participantPublicId">
                     <div class="flex flex-row items-center gap-2">
                       <ConvosConvoAvatar
-                        :participant-public-id="participantPublicId"
-                        :participants="participantArray"
+                        :participant="participant"
                         size="md" />
-                      <span>{{
-                        findParticipant(participantPublicId)?.name
-                      }}</span>
+                      <span>{{ participant.name }}</span>
                     </div>
                   </template>
                 </div>

From 1829d6f9c6293190e8e77b0a6c625788c09cf839 Mon Sep 17 00:00:00 2001
From: McPizza <gh@l1.io>
Date: Thu, 1 Feb 2024 14:18:19 +0000
Subject: [PATCH 33/36] update utils to use types imports

---
 apps/web-app/composables/utils.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/apps/web-app/composables/utils.ts b/apps/web-app/composables/utils.ts
index 0483d929..ca4297a0 100644
--- a/apps/web-app/composables/utils.ts
+++ b/apps/web-app/composables/utils.ts
@@ -1,9 +1,5 @@
 import { cva, type VariantProps } from 'class-variance-authority';
-const { $trpc } = useNuxtApp();
-
-type UserConvosDataType = Awaited<
-  ReturnType<typeof $trpc.convos.getUserConvos.query>
->['data'];
+import type { UserConvosDataType } from '~/composables/types';
 
 function generateAvatarUrl(
   type: 'user' | 'org' | 'group' | 'contact',

From 7a2188dd40ae9d66fcfbf567dfc8853f5a3195ad Mon Sep 17 00:00:00 2001
From: McPizza <gh@l1.io>
Date: Thu, 1 Feb 2024 14:18:43 +0000
Subject: [PATCH 34/36] update convo view to use new util

---
 apps/web-app/pages/[orgSlug]/convo/[id].vue | 36 ++++++---------------
 1 file changed, 9 insertions(+), 27 deletions(-)

diff --git a/apps/web-app/pages/[orgSlug]/convo/[id].vue b/apps/web-app/pages/[orgSlug]/convo/[id].vue
index 7a0c934f..a2a4a5e6 100644
--- a/apps/web-app/pages/[orgSlug]/convo/[id].vue
+++ b/apps/web-app/pages/[orgSlug]/convo/[id].vue
@@ -66,33 +66,15 @@
 
     const convoParticipants = convoDetails.value?.data?.participants || [];
     for (const participant of convoParticipants) {
-      const participantPublicId = participant.publicId;
-      const participantTypePublicId =
-        participant.contact?.publicId ||
-        participant.userGroup?.publicId ||
-        participant.orgMember?.publicId ||
-        '';
-      const avatarPublicId =
-        participant.contact?.avatarId ||
-        participant.userGroup?.avatarId ||
-        participant.orgMember?.profile.avatarId ||
-        '';
-      const participantName =
-        participant.contact?.name || participant.contact?.emailUsername
-          ? participant.contact?.emailUsername +
-            '@' +
-            participant.contact?.emailDomain
-          : participant.userGroup?.name ||
-            participant.orgMember?.profile?.firstName +
-              ' ' +
-              participant.orgMember?.profile?.lastName ||
-            '';
-      const participantType = participant.contact?.publicId
-        ? 'contact'
-        : participant.userGroup?.name
-          ? 'group'
-          : 'user';
-      const participantColor = participant.userGroup?.color || null;
+      const {
+        participantPublicId,
+        participantTypePublicId,
+        avatarPublicId,
+        participantName,
+        participantType,
+        participantColor,
+        participantRole
+      } = useUtils().convos.useParticipantData(participant);
       const participantData: ConvoParticipantEntry = {
         participantPublicId: participantPublicId,
         typePublicId: participantTypePublicId,

From 8413d86a3b35372a484427bcc403345352703eef Mon Sep 17 00:00:00 2001
From: McPizza <gh@l1.io>
Date: Thu, 1 Feb 2024 14:19:29 +0000
Subject: [PATCH 35/36] refactor convoListItem codes

---
 .../components/convos/convoListItem.vue       | 68 +++++++------------
 1 file changed, 23 insertions(+), 45 deletions(-)

diff --git a/apps/web-app/components/convos/convoListItem.vue b/apps/web-app/components/convos/convoListItem.vue
index d94acbb5..4ecdd802 100644
--- a/apps/web-app/components/convos/convoListItem.vue
+++ b/apps/web-app/components/convos/convoListItem.vue
@@ -1,13 +1,9 @@
 <script setup lang="ts">
   import { useTimeAgo } from '@vueuse/core';
-  import { string } from 'zod';
-  import type { ConvoParticipantEntry } from '~/composables/types';
-  const { $trpc } = useNuxtApp();
-
-  type PromiseType<T> = T extends Promise<infer U> ? U : never;
-  type UserConvosDataType = PromiseType<
-    ReturnType<typeof $trpc.convos.getUserConvos.query>
-  >['data'];
+  import type {
+    ConvoParticipantEntry,
+    UserConvosDataType
+  } from '~/composables/types';
 
   type Props = {
     convo: UserConvosDataType[number];
@@ -18,61 +14,43 @@
 
   const participantArray = ref<ConvoParticipantEntry[]>([]);
   const author = ref<ConvoParticipantEntry>();
+  const firstEntryAuthor =
+    props.convo.entries[0].author || props.convo.participants[0];
   const authorEntryPublicId = computed(() => {
-    const entryAuthor = props.convo.entries[0].author;
     return (
-      entryAuthor.orgMember?.publicId ||
-      entryAuthor.userGroup?.publicId ||
-      entryAuthor.contact?.publicId
+      firstEntryAuthor.orgMember?.publicId ||
+      firstEntryAuthor.userGroup?.publicId ||
+      firstEntryAuthor.contact?.publicId
     );
   });
   const authorEntryName = computed(() => {
-    const entryAuthor = props.convo.entries[0].author;
     return (
-      entryAuthor.userGroup?.publicId ||
-      entryAuthor.contact?.publicId ||
-      entryAuthor.orgMember?.profile.firstName +
+      firstEntryAuthor.userGroup?.publicId ||
+      firstEntryAuthor.contact?.publicId ||
+      firstEntryAuthor.orgMember?.profile.firstName +
         ' ' +
-        entryAuthor.orgMember?.profile.lastName ||
+        firstEntryAuthor.orgMember?.profile.lastName ||
       'Participant'
     );
   });
 
   for (const participant of props.convo.participants) {
-    const participantPublicId = participant.publicId;
-    const participantTypePublicId =
-      participant.contact?.publicId ||
-      participant.userGroup?.publicId ||
-      participant.orgMember?.publicId ||
-      '';
-    const avatarPublicId =
-      participant.contact?.avatarId ||
-      participant.userGroup?.avatarId ||
-      participant.orgMember?.profile.avatarId ||
-      '';
-    const participantName =
-      participant.contact?.name || participant.contact?.emailUsername
-        ? participant.contact?.emailUsername +
-          '@' +
-          participant.contact?.emailDomain
-        : participant.userGroup?.name ||
-          participant.orgMember?.profile?.firstName +
-            ' ' +
-            participant.orgMember?.profile?.lastName ||
-          '';
-    const participantType = participant.contact?.publicId
-      ? 'contact'
-      : participant.userGroup?.name
-        ? 'group'
-        : 'user';
-    const participantColor = participant.userGroup?.color || null;
+    const {
+      participantPublicId,
+      participantTypePublicId,
+      avatarPublicId,
+      participantName,
+      participantType,
+      participantColor,
+      participantRole
+    } = useUtils().convos.useParticipantData(participant);
     const participantData: ConvoParticipantEntry = {
       participantPublicId: participantPublicId,
       typePublicId: participantTypePublicId,
       avatarPublicId: avatarPublicId,
       name: participantName,
       type: participantType,
-      role: participant.role,
+      role: participantRole,
       color: participantColor
     };
     if (participantTypePublicId === authorEntryPublicId.value) {

From 83686cffd8ce969d420679846843282c56d26be8 Mon Sep 17 00:00:00 2001
From: McPizza <gh@l1.io>
Date: Thu, 1 Feb 2024 14:19:59 +0000
Subject: [PATCH 36/36] update code/remove comments

---
 apps/web-app/components/convos/convoList.vue  | 14 +++----
 .../components/convos/convoMessageItem.vue    | 37 ++-----------------
 .../components/convos/convoMessages.vue       |  5 +--
 3 files changed, 10 insertions(+), 46 deletions(-)

diff --git a/apps/web-app/components/convos/convoList.vue b/apps/web-app/components/convos/convoList.vue
index 0a16ea9a..bb6dae0d 100644
--- a/apps/web-app/components/convos/convoList.vue
+++ b/apps/web-app/components/convos/convoList.vue
@@ -1,24 +1,20 @@
 <script setup lang="ts">
-  import { useVirtualList, useInfiniteScroll } from '@vueuse/core';
-  import { useConvoStore } from '@/stores/convoStore';
+  import { useInfiniteScroll } from '@vueuse/core';
   const { $trpc } = useNuxtApp();
 
-  type PromiseType<T> = T extends Promise<infer U> ? U : never;
-  type UserConvosDataType = PromiseType<
-    ReturnType<typeof $trpc.convos.getUserConvos.query>
-  >['data'];
-
   const orgSlug = useRoute().params.orgSlug as string;
   const infiniteContainer = ref<HTMLElement | null>(null);
 
-  const convoCursor = ref<{cursorLastUpdatedAt: Date | null, cursorLastPublicId: string | null}>({
+  const convoCursor = ref<{
+    cursorLastUpdatedAt: Date | null;
+    cursorLastPublicId: string | null;
+  }>({
     cursorLastUpdatedAt: null,
     cursorLastPublicId: null
   });
   const userHasMoreConvos = ref(true);
   const pauseLoading = ref(false);
   const convos = ref<{}[]>([]);
-  // const convos = ref<UserConvosDataType[]>([]);
 
   type UserConvoQueryParams =
     | {
diff --git a/apps/web-app/components/convos/convoMessageItem.vue b/apps/web-app/components/convos/convoMessageItem.vue
index e411fceb..64e57faa 100644
--- a/apps/web-app/components/convos/convoMessageItem.vue
+++ b/apps/web-app/components/convos/convoMessageItem.vue
@@ -4,8 +4,7 @@
   import { tipTapExtensions } from '../../shared/editorConfig';
   const { $trpc } = useNuxtApp();
 
-  type PromiseType<T> = T extends Promise<infer U> ? U : never;
-  type ConvoEntryDataType = PromiseType<
+  type ConvoEntryDataType = Awaited<
     ReturnType<typeof $trpc.convos.entries.getConvoEntries.query>
   >['entries'];
 
@@ -42,7 +41,6 @@
 
   const tempColor = 'message';
   const typeClasses = computed(() => {
-    // switch (props.entry.type) {
     switch (tempColor) {
       case 'message':
         return 'bg-white dark:bg-black';
@@ -53,42 +51,12 @@
   const containerClasses = computed(() => {
     return userIsAuthor.value ? 'items-end' : 'items-start';
   });
-  // const authorClasses = computed(() => {
-  //   return userIsAuthor.value ? 'rounded-br-none' : 'rounded-bl-none';
-  // });
 
   const convoBubbleClasses = computed(() => {
-    // return `${typeClasses.value} ${authorClasses.value}`;
     return `${typeClasses.value}`;
   });
 </script>
 <template>
-  <!-- <div
-    class="w-full flex flex-col gap-2"
-    :class="containerClasses">
-    <div class="max-w-[80%] w-full flex flex-col gap-1 border-2 rounded-xl p-0">
-      <div class="w-full flex flex-row items-end justify-between p-2">
-        <div
-          v-if="author"
-          class="flex flex-row items-center gap-1">
-          <UnUiAvatar
-            :public-id="author.avatarPublicId"
-            :alt="author.name"
-            :type="author.type"
-            :color="author.color"
-            class="rounded-full" />
-          <span>{{ author.name }}</span>
-        </div>
-        <UnUiTooltip :text="props.entry.createdAt.toLocaleString()">
-          <span class="text-gray-500 text-xs uppercase">{{ timeAgo }}</span>
-        </UnUiTooltip>
-      </div>
-      <div
-        class="bg-gray-100 dark:bg-gray-900 w-full overflow-hidden p-2"
-        :class="convoBubbleClasses"
-        v-html="convoEntryBody"></div>
-    </div>
-  </div> -->
   <div
     class="w-full flex flex-col gap-2"
     :class="containerClasses">
@@ -97,7 +65,8 @@
         v-if="author"
         class="flex flex-row items-center gap-1">
         <UnUiAvatar
-          :public-id="author.avatarPublicId"
+          :public-id="author.publicId"
+          :avatar-id="author.avatarPublicId"
           :alt="author.name"
           :type="author.type"
           :color="author.color"
diff --git a/apps/web-app/components/convos/convoMessages.vue b/apps/web-app/components/convos/convoMessages.vue
index d0f64bf5..4bc2b072 100644
--- a/apps/web-app/components/convos/convoMessages.vue
+++ b/apps/web-app/components/convos/convoMessages.vue
@@ -1,8 +1,7 @@
 <script setup lang="ts">
-  import { useVirtualList, useInfiniteScroll, useTimeAgo } from '@vueuse/core';
+  import { useInfiniteScroll } from '@vueuse/core';
   const { $trpc } = useNuxtApp();
-  type PromiseType<T> = T extends Promise<infer U> ? U : never;
-  type ConvoEntriesDataType = PromiseType<
+  type ConvoEntriesDataType = Awaited<
     ReturnType<typeof $trpc.convos.entries.getConvoEntries.query>
   >['entries'];
   const el = ref<HTMLElement | null>(null);