packages/client/package.json

@@ -13,7 +13,6 @@
   "dependencies": {
     "@radix-ui/react-icons": "^1.3.0",
     "@radix-ui/react-label": "^2.0.2",
-    "@radix-ui/react-popover": "^1.0.7",
     "@radix-ui/react-radio-group": "^1.1.3",
     "@radix-ui/react-separator": "^1.0.3",
     "@radix-ui/react-slot": "^1.0.2",

packages/client/src/components/gallery/DescItem.tsx

@@ -1,26 +0,0 @@
-import StyledLink from "@/components/gallery/StyledLink";
-import { cn } from "@/lib/utils";
-
-export function DescItem({ name, children, className }: {
-    name: string;
-    className?: string;
-    children?: React.ReactNode;
-}) {
-    return <div className={cn("grid content-start", className)}>
-        <span className="text-muted-foreground text-sm">{name}</span>
-        <span className="text-primary leading-4 font-medium">{children}</span>
-    </div>;
-}
-export function DescTagItem({
-    items, name, className,
-}: {
-    name: string;
-    items: string[];
-    className?: string;
-}) {
-    return <DescItem name={name} className={className}>
-        {items.length === 0 ? "N/A" : items.map(
-            (x) => <StyledLink key={x} to={`/search?allow_tag=${name}:${x}`}>{x}</StyledLink>
-        )}
-    </DescItem>;
-}

packages/client/src/components/gallery/TagInput.tsx

@@ -155,7 +155,7 @@ export default function TagInput({
             {
                 openInfo && <div
                     ref={autocompleteRef}
-                    className="absolute z-20 shadow-md bg-popover text-popover-foreground
+                    className="absolute z-10 shadow-md bg-popover text-popover-foreground
                     border
                     rounded-sm p-2 w-[200px]"
                     style={{ top: openInfo.top, left: openInfo.left }}

packages/client/src/components/layout/nav.tsx

@@ -1,10 +1,8 @@
 import { Link } from "wouter"
 import { MagnifyingGlassIcon, GearIcon, ActivityLogIcon, ArchiveIcon, PersonIcon } from "@radix-ui/react-icons"
-import { Button, buttonVariants } from "@/components/ui/button.tsx"
+import { buttonVariants } from "@/components/ui/button.tsx"
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip.tsx"
 import { useLogin } from "@/state/user.ts";
-import { useNavItems } from "./navAtom";
-import { Separator } from "../ui/separator";
 
 interface NavItemProps {
     icon: React.ReactNode;
@@ -31,41 +29,11 @@ export function NavItem({
     </Tooltip>
 }
 
-interface NavItemButtonProps {
-    icon: React.ReactNode;
-    onClick: () => void;
-    name: string;
-    className?: string;
-}
-
-export function NavItemButton({
-    icon,
-    onClick,
-    name,
-    className
-}: NavItemButtonProps) {
-    return <Tooltip>
-        <TooltipTrigger asChild>
-            <Button
-                onClick={onClick}
-                variant="ghost"
-                className={className}
-            >
-                {icon}
-                <span className="sr-only">{name}</span>
-            </Button>
-        </TooltipTrigger>
-        <TooltipContent side="right">{name}</TooltipContent>
-    </Tooltip>
-}
-
 export function NavList() {
     const loginInfo = useLogin();
-    const navItems = useNavItems();
 
     return <aside className="h-dvh flex flex-col">
         <nav className="flex flex-col items-center gap-4 px-2 sm:py-5 flex-1">
-            {navItems && <>{navItems} <Separator/> </>}
             <NavItem icon={<MagnifyingGlassIcon className="h-5 w-5" />} to="/search" name="Search" />
             <NavItem icon={<ActivityLogIcon className="h-5 w-5" />} to="/tags" name="Tags" />
             <NavItem icon={<ArchiveIcon className="h-5 w-5" />} to="/difference" name="Difference" />

packages/client/src/components/layout/navAtom.tsx

@@ -1,23 +0,0 @@
-import { atom, useAtomValue, setAtomValue, getAtomState } from "@/lib/atom";
-import { useLayoutEffect } from "react";
-
-const NavItems = atom<React.ReactNode>("NavItems", null);
-
-// eslint-disable-next-line react-refresh/only-export-components
-export function useNavItems() {
-    return useAtomValue(NavItems);
-}
-
-export function PageNavItem({items, children}:{items: React.ReactNode, children: React.ReactNode}) {
-    useLayoutEffect(() => {
-        const prev = getAtomState(NavItems).value;
-        const setter = setAtomValue(NavItems);
-        setter(items);
-        return () => {
-            setter(prev);
-        };
-    }, [items]);
-
-    return children;
-}
-

packages/client/src/components/ui/popover.tsx

@@ -1,31 +0,0 @@
-import * as React from "react"
-import * as PopoverPrimitive from "@radix-ui/react-popover"
-
-import { cn } from "@/lib/utils"
-
-const Popover = PopoverPrimitive.Root
-
-const PopoverTrigger = PopoverPrimitive.Trigger
-
-const PopoverAnchor = PopoverPrimitive.Anchor
-
-const PopoverContent = React.forwardRef<
-  React.ElementRef<typeof PopoverPrimitive.Content>,
-  React.ComponentPropsWithoutRef<typeof PopoverPrimitive.Content>
->(({ className, align = "center", sideOffset = 4, ...props }, ref) => (
-  <PopoverPrimitive.Portal>
-    <PopoverPrimitive.Content
-      ref={ref}
-      align={align}
-      sideOffset={sideOffset}
-      className={cn(
-        "z-50 w-72 rounded-md border bg-popover p-4 text-popover-foreground shadow-md outline-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
-        className
-      )}
-      {...props}
-    />
-  </PopoverPrimitive.Portal>
-))
-PopoverContent.displayName = PopoverPrimitive.Content.displayName
-
-export { Popover, PopoverTrigger, PopoverContent, PopoverAnchor }

packages/client/src/hook/useSearchGallery.ts

@@ -5,7 +5,7 @@ import useSWR from "swr";
 
 interface SearchParams {
     word?: string;
-    tags?: string[];
+    tags?: string;
     limit?: number;
     cursor?: number;
 }
@@ -15,11 +15,7 @@ function makeSearchParams({
 }: SearchParams){
     const search = new URLSearchParams();
     if (word) search.set("word", word);
-    if (tags) {
+    if (tags) search.set("allow_tag", tags);
-        for (const tag of tags){
-            search.append("allow_tag", tag);
-        }
-    }
     if (limit) search.set("limit", limit.toString());
     if (cursor) search.set("cursor", cursor.toString());
     return search;

packages/client/src/lib/atom.ts

@@ -15,7 +15,7 @@ export function atom<T>(key: string, defaultVal: T): Atom<T> {
     return { key, default: defaultVal };
 }
 
-export function getAtomState<T>(atom: Atom<T>): AtomState<T> {
+function getAtomState<T>(atom: Atom<T>): AtomState<T> {
     let atomState = atomStateMap.get(atom);
     if (!atomState) {
         atomState = {

packages/client/src/lib/classifyTags.tsx

@@ -1,33 +0,0 @@
-interface TagClassifyResult {
-    artist: string[];
-    group: string[];
-    series: string[];
-    type: string[];
-    character: string[];
-    rest: string[];
-}
-
-export function classifyTags(tags: string[]): TagClassifyResult {
-    const result = {
-        artist: [],
-        group: [],
-        series: [],
-        type: [],
-        character: [],
-        rest: [],
-    } as TagClassifyResult;
-    const tagKind = new Set(["artist", "group", "series", "type", "character"]);
-    for (const tag of tags) {
-        const split = tag.split(":");
-        if (split.length !== 2) {
-            continue;
-        }
-        const [prefix, name] = split;
-        if (tagKind.has(prefix)) {
-            result[prefix as keyof TagClassifyResult].push(name);
-        } else {
-            result.rest.push(tag);
-        }
-    }
-    return result;
-}

packages/client/src/page/contentInfoPage.tsx

@@ -2,9 +2,8 @@ import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/com
 import { useGalleryDoc } from "../hook/useGalleryDoc.ts";
 import TagBadge from "@/components/gallery/TagBadge";
 import StyledLink from "@/components/gallery/StyledLink";
+import { cn } from "@/lib/utils";
 import { Link } from "wouter";
-import { classifyTags } from "../lib/classifyTags.tsx";
-import { DescTagItem, DescItem } from "../components/gallery/DescItem.tsx";
 
 export interface ContentInfoPageProps {
     params: {
@@ -12,6 +11,40 @@ export interface ContentInfoPageProps {
     };
 }
 
+interface TagClassifyResult {
+    artist: string[];
+    group: string[];
+    series: string[];
+    type: string[];
+    character: string[];
+    rest: string[];
+}
+
+function classifyTags(tags: string[]): TagClassifyResult {
+    const result = {
+        artist: [],
+        group: [],
+        series: [],
+        type: [],
+        character: [],
+        rest: [],
+    } as TagClassifyResult;
+    const tagKind = new Set(["artist", "group", "series", "type", "character"]);
+    for (const tag of tags) {
+        const split = tag.split(":");
+        if (split.length !== 2) {
+            continue;
+        }
+        const [prefix, name] = split;
+        if (tagKind.has(prefix)) {
+            result[prefix as keyof TagClassifyResult].push(name);
+        } else {
+            result.rest.push(tag);
+        }
+    }
+    return result;
+}
+
 export function ContentInfoPage({ params }: ContentInfoPageProps) {
     const { data, error, isLoading } = useGalleryDoc(params.id);
 
@@ -33,7 +66,7 @@ export function ContentInfoPage({ params }: ContentInfoPageProps) {
     const contentLocation = `/doc/${params.id}/reader`;
 
     return (
-        <div className="p-4 h-dvh overflow-auto">
+        <div className="p-4">
             <Link to={contentLocation}>
                 <div className="m-auto h-[400px] mb-4 flex justify-center items-center flex-none bg-[#272733]
             rounded-xl shadow-lg overflow-hidden">
@@ -57,7 +90,7 @@ export function ContentInfoPage({ params }: ContentInfoPageProps) {
                     </CardDescription>
                 </CardHeader>
                 <CardContent>
-                    <div className="grid gap-4 grid-cols-[repeat(auto_fill_300px)]">
+                    <div className="grid gap-y-4 gap-x-3 lg:grid-cols-2">
                         <DescTagItem name="artist" items={classifiedTags.artist} />
                         <DescTagItem name="group" items={classifiedTags.group} />
                         <DescTagItem name="series" items={classifiedTags.series} />
@@ -79,4 +112,31 @@ export function ContentInfoPage({ params }: ContentInfoPageProps) {
     );
 }
 
-export default ContentInfoPage;
+export default ContentInfoPage;
+
+function DescItem({ name, children, className }: {
+    name: string,
+    className?: string,
+    children?: React.ReactNode
+}) {
+    return <div className={cn("grid content-start", className)}>
+        <span className="text-muted-foreground text-sm">{name}</span>
+        <span className="text-primary leading-4 font-medium">{children}</span>
+    </div>;
+}
+
+function DescTagItem({
+    items,
+    name,
+    className,
+}: {
+    name: string;
+    items: string[];
+    className?: string;
+}) {
+    return <DescItem name={name} className={className}>
+        {items.length === 0 ? "N/A" : items.map(
+            (x) => <StyledLink key={x} to={`/search?allow_tag=${name}:${x}`}>{x}</StyledLink>
+        )}
+    </DescItem>
+}

packages/client/src/page/galleryPage.tsx

@@ -13,7 +13,7 @@ export default function Gallery() {
     const search = useSearch();
     const searchParams = new URLSearchParams(search);
     const word = searchParams.get("word") ?? undefined;
-    const tags = searchParams.getAll("allow_tag") ?? undefined;
+    const tags = searchParams.get("allow_tag") ?? undefined;
     const limit = searchParams.get("limit");
     const cursor = searchParams.get("cursor");
     const { data, error, isLoading, size, setSize } = useSearchGalleryInfinite({
@@ -27,7 +27,6 @@ export default function Gallery() {
         // biome-ignore lint/style/noNonNullAssertion: <explanation>
         getScrollElement: () => parentRef.current!,
         estimateSize: (index) => {
-            if (!data) return 8;
             const docs = data?.[index];
             if (!docs) return 8;
             return docs.data.length * (200 + 8) + 37 + 8;
@@ -35,11 +34,10 @@ export default function Gallery() {
         overscan: 1,
     });
 
-    
-
     const virtualItems = virtualizer.getVirtualItems();
     useEffect(() => {
         const lastItems = virtualItems.slice(-1);
+        // console.log(virtualItems);
         if (lastItems.some(x => x.index >= size - 1)) {
             const last = lastItems[0];
             const docs = data?.[last.index];
@@ -49,10 +47,6 @@ export default function Gallery() {
         }
     }, [virtualItems, setSize, size, data]);
 
-    useEffect(() => {
-        virtualizer.measure();
-    }, [virtualizer, data]);
-
     if (isLoading) {
         return <div className="p-4">Loading...</div>
     }
@@ -68,10 +62,10 @@ export default function Gallery() {
     return (<div className="p-4 grid gap-2 overflow-auto h-dvh items-start content-start" ref={parentRef}>
         <Search />
         {(word || tags) &&
-            <div className="bg-primary rounded-full p-1 sticky top-0 shadow-md z-10">
+            <div className="bg-primary rounded-full p-1 sticky top-0 shadow-md z-20">
                 {word && <span className="text-primary-foreground ml-4">Search: {word}</span>}
-                {tags && <span className="text-primary-foreground ml-4">Tags: <ul className="inline-flex gap-1">{
+                {tags && <span className="text-primary-foreground ml-4">Tags: <ul className="inline-flex">{
-                    tags.map(x => <TagBadge tagname={x} key={x} />)}
+                    tags.split(",").map(x => <TagBadge tagname={x} key={x} />)}
                 </ul></span>}
             </div>
         }

packages/client/src/page/reader/comicPage.tsx

@@ -1,10 +1,5 @@
-import { NavItem, NavItemButton } from "@/components/layout/nav";
-import { PageNavItem } from "@/components/layout/navAtom";
-import { Input } from "@/components/ui/input";
-import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
 import { useGalleryDoc } from "@/hook/useGalleryDoc.ts";
 import { cn } from "@/lib/utils";
-import { EnterFullScreenIcon, ExitIcon } from "@radix-ui/react-icons";
 import type { Document } from "dbtype/api";
 import { useCallback, useEffect, useRef, useState } from "react";
 
@@ -17,17 +12,14 @@ interface ComicPageProps {
 function ComicViewer({
     doc,
     totalPage,
-    curPage,
-    onChangePage: setCurPage,
 }: {
     doc: Document;
     totalPage: number;
-    curPage: number;
-    onChangePage: (page: number) => void;
 }) {
+    const [curPage, setCurPage] = useState(0);
     const [fade, setFade] = useState(false);
-    const PageDown = useCallback((step: number) => setCurPage(Math.max(curPage - step, 0)), [curPage, setCurPage]);
+    const PageDown = useCallback((step: number) => setCurPage(Math.max(curPage - step, 0)), [curPage]);
-    const PageUp = useCallback((step: number) => setCurPage(Math.min(curPage + step, totalPage - 1)), [curPage, setCurPage, totalPage]);
+    const PageUp = useCallback((step: number) => setCurPage(Math.min(curPage + step, totalPage - 1)), [curPage, totalPage]);
     const currentImageRef = useRef<HTMLImageElement>(null);
 
     useEffect(() => {
@@ -88,15 +80,10 @@ function ComicViewer({
     );
 }
 
-function clip(val: number, min: number, max: number): number {
-    return Math.max(min, Math.min(max, val));
-}
-
 export default function ComicPage({
     params
 }: ComicPageProps) {
     const { data, error, isLoading } = useGalleryDoc(params.id);
-    const [curPage, setCurPage] = useState(0);
 
     if (isLoading) {
         // TODO: Add a loading spinner
@@ -120,32 +107,6 @@ export default function ComicPage({
     }
 
     return (
-        <PageNavItem items={<>
+        <ComicViewer doc={data} totalPage={data.additional.page as number} />
-            <NavItem to={`/doc/${params.id}`} name="Back" icon={<ExitIcon />}/>
-            <NavItemButton name="fullscreen" icon={<EnterFullScreenIcon/>} onClick={()=>{
-                const elem = document.documentElement;
-                if (elem.requestFullscreen) {
-                    elem.requestFullscreen();
-                }
-            }}  />
-            <Popover>
-                <PopoverTrigger>
-                    <span className="text-sm text-ellipsis" >{curPage + 1}/{data.additional.page as number}</span>
-                </PopoverTrigger>
-                <PopoverContent className="w-28">
-                        <Input type="number" value={curPage + 1} onChange={(e) => 
-                            setCurPage(clip(Number.parseInt(e.target.value) - 1, 
-                            0, 
-                            (data.additional.page as number) - 1))} />
-                    <div className="flex">
-                    </div>
-                </PopoverContent>
-            </Popover>
-        </>}>
-            <ComicViewer
-            curPage={curPage}
-            onChangePage={setCurPage}
-            doc={data} totalPage={data.additional.page as number} />
-        </PageNavItem>
     )
 }

packages/client/vite.config.ts

@@ -12,7 +12,7 @@ export default defineConfig({
   },
   server: {
     proxy: {
-      '/api': "https://aeolian.prelude.duckdns.org"
+      '/api': "http://127.0.0.1:8080"
     }
   }
 })

pnpm-lock.yaml

@@ -20,9 +20,6 @@ importers:
       '@radix-ui/react-label':
         specifier: ^2.0.2
         version: 2.0.2(@types/react-dom@18.2.22)(@types/react@18.2.71)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-popover':
-        specifier: ^1.0.7
-        version: 1.0.7(@types/react-dom@18.2.22)(@types/react@18.2.71)(react-dom@18.2.0)(react@18.2.0)
       '@radix-ui/react-radio-group':
         specifier: ^1.1.3
         version: 1.1.3(@types/react-dom@18.2.22)(@types/react@18.2.71)(react-dom@18.2.0)(react@18.2.0)
@@ -1096,43 +1093,6 @@ packages:
       react-dom: 18.2.0(react@18.2.0)
     dev: false
 
-  /@radix-ui/react-focus-guards@1.0.1(@types/react@18.2.71)(react@18.2.0):
-    resolution: {integrity: sha512-Rect2dWbQ8waGzhMavsIbmSVCgYxkXLxxR3ZvCX79JOglzdEy4JXMb98lq4hPxUbLr77nP0UOGf4rcMU+s1pUA==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-    dependencies:
-      '@babel/runtime': 7.24.1
-      '@types/react': 18.2.71
-      react: 18.2.0
-    dev: false
-
-  /@radix-ui/react-focus-scope@1.0.4(@types/react-dom@18.2.22)(@types/react@18.2.71)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-sL04Mgvf+FmyvZeYfNu1EPAaaxD+aw7cYeIB9L9Fvq8+urhltTRaEo5ysKOpHuKPclsZcSUMKlN05x4u+CINpA==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-    dependencies:
-      '@babel/runtime': 7.24.1
-      '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.71)(react@18.2.0)
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.22)(@types/react@18.2.71)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.71)(react@18.2.0)
-      '@types/react': 18.2.71
-      '@types/react-dom': 18.2.22
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
-    dev: false
-
   /@radix-ui/react-icons@1.3.0(react@18.2.0):
     resolution: {integrity: sha512-jQxj/0LKgp+j9BiTXz3O3sgs26RNet2iLWmsPyRz2SIcR4q/4SbazXfnYwbAr+vLYKSfc7qxzyGQA1HLlYiuNw==}
     peerDependencies:
@@ -1177,41 +1137,6 @@ packages:
       react-dom: 18.2.0(react@18.2.0)
     dev: false
 
-  /@radix-ui/react-popover@1.0.7(@types/react-dom@18.2.22)(@types/react@18.2.71)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-shtvVnlsxT6faMnK/a7n0wptwBD23xc1Z5mdrtKLwVEfsEMXodS0r5s0/g5P0hX//EKYZS2sxUjqfzlg52ZSnQ==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-    dependencies:
-      '@babel/runtime': 7.24.1
-      '@radix-ui/primitive': 1.0.1
-      '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.71)(react@18.2.0)
-      '@radix-ui/react-context': 1.0.1(@types/react@18.2.71)(react@18.2.0)
-      '@radix-ui/react-dismissable-layer': 1.0.5(@types/react-dom@18.2.22)(@types/react@18.2.71)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-focus-guards': 1.0.1(@types/react@18.2.71)(react@18.2.0)
-      '@radix-ui/react-focus-scope': 1.0.4(@types/react-dom@18.2.22)(@types/react@18.2.71)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-id': 1.0.1(@types/react@18.2.71)(react@18.2.0)
-      '@radix-ui/react-popper': 1.1.3(@types/react-dom@18.2.22)(@types/react@18.2.71)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-portal': 1.0.4(@types/react-dom@18.2.22)(@types/react@18.2.71)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.22)(@types/react@18.2.71)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.22)(@types/react@18.2.71)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-slot': 1.0.2(@types/react@18.2.71)(react@18.2.0)
-      '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.71)(react@18.2.0)
-      '@types/react': 18.2.71
-      '@types/react-dom': 18.2.22
-      aria-hidden: 1.2.4
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
-      react-remove-scroll: 2.5.5(@types/react@18.2.71)(react@18.2.0)
-    dev: false
-
   /@radix-ui/react-popper@1.1.3(@types/react-dom@18.2.22)(@types/react@18.2.71)(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-cKpopj/5RHZWjrbF2846jBNacjQVwkP068DfmgrNJXpvVWrOvlAmE9xSiy5OqeE+Gi8D9fP+oDhUnPqNMY8/5w==}
     peerDependencies:
@@ -2335,13 +2260,6 @@ packages:
     resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
     dev: true
 
-  /aria-hidden@1.2.4:
-    resolution: {integrity: sha512-y+CcFFwelSXpLZk/7fMB2mUbGtX9lKycf1MWJ7CaTIERyitVlyQx6C+sxcROU2BAJ24OiZyK+8wj2i8AlBoS3A==}
-    engines: {node: '>=10'}
-    dependencies:
-      tslib: 2.6.2
-    dev: false
-
   /array-union@2.1.0:
     resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}
     engines: {node: '>=8'}
@@ -2823,10 +2741,6 @@ packages:
     resolution: {integrity: sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==}
     engines: {node: '>=8'}
 
-  /detect-node-es@1.1.0:
-    resolution: {integrity: sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==}
-    dev: false
-
   /didyoumean@1.2.2:
     resolution: {integrity: sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==}
 
@@ -3326,11 +3240,6 @@ packages:
       hasown: 2.0.2
     dev: false
 
-  /get-nonce@1.0.1:
-    resolution: {integrity: sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q==}
-    engines: {node: '>=6'}
-    dev: false
-
   /get-stream@3.0.0:
     resolution: {integrity: sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==}
     engines: {node: '>=4'}
@@ -3606,12 +3515,6 @@ packages:
     engines: {node: '>= 0.10'}
     dev: true
 
-  /invariant@2.2.4:
-    resolution: {integrity: sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==}
-    dependencies:
-      loose-envify: 1.4.0
-    dev: false
-
   /is-arrayish@0.2.1:
     resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==}
     dev: true
@@ -4637,41 +4540,6 @@ packages:
       scheduler: 0.23.0
     dev: false
 
-  /react-remove-scroll-bar@2.3.6(@types/react@18.2.71)(react@18.2.0):
-    resolution: {integrity: sha512-DtSYaao4mBmX+HDo5YWYdBWQwYIQQshUV/dVxFxK+KM26Wjwp1gZ6rv6OC3oujI6Bfu6Xyg3TwK533AQutsn/g==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-    dependencies:
-      '@types/react': 18.2.71
-      react: 18.2.0
-      react-style-singleton: 2.2.1(@types/react@18.2.71)(react@18.2.0)
-      tslib: 2.6.2
-    dev: false
-
-  /react-remove-scroll@2.5.5(@types/react@18.2.71)(react@18.2.0):
-    resolution: {integrity: sha512-ImKhrzJJsyXJfBZ4bzu8Bwpka14c/fQt0k+cyFp/PBhTfyDnU5hjOtM4AG/0AMyy8oKzOTR0lDgJIM7pYXI0kw==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-    dependencies:
-      '@types/react': 18.2.71
-      react: 18.2.0
-      react-remove-scroll-bar: 2.3.6(@types/react@18.2.71)(react@18.2.0)
-      react-style-singleton: 2.2.1(@types/react@18.2.71)(react@18.2.0)
-      tslib: 2.6.2
-      use-callback-ref: 1.3.2(@types/react@18.2.71)(react@18.2.0)
-      use-sidecar: 1.1.2(@types/react@18.2.71)(react@18.2.0)
-    dev: false
-
   /react-resizable-panels@2.0.16(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-UrnxmTZaTnbCl/xIOX38ig35RicqGfLuqt2x5fytpNlQvCRuxyXZwIBEhmF+pmrEGxfajyXFBoCplNxLvhF0CQ==}
     peerDependencies:
@@ -4682,23 +4550,6 @@ packages:
       react-dom: 18.2.0(react@18.2.0)
     dev: false
 
-  /react-style-singleton@2.2.1(@types/react@18.2.71)(react@18.2.0):
-    resolution: {integrity: sha512-ZWj0fHEMyWkHzKYUr2Bs/4zU6XLmq9HsgBURm7g5pAVfyn49DgUiNgY2d4lXRlYSiCif9YBGpQleewkcqddc7g==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-    dependencies:
-      '@types/react': 18.2.71
-      get-nonce: 1.0.1
-      invariant: 2.2.4
-      react: 18.2.0
-      tslib: 2.6.2
-    dev: false
-
   /react@18.2.0:
     resolution: {integrity: sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==}
     engines: {node: '>=0.10.0'}
@@ -5319,6 +5170,7 @@ packages:
 
   /tslib@2.6.2:
     resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==}
+    dev: true
 
   /tsscmp@1.0.6:
     resolution: {integrity: sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==}
@@ -5391,37 +5243,6 @@ packages:
       punycode: 2.3.1
     dev: true
 
-  /use-callback-ref@1.3.2(@types/react@18.2.71)(react@18.2.0):
-    resolution: {integrity: sha512-elOQwe6Q8gqZgDA8mrh44qRTQqpIHDcZ3hXTLjBe1i4ph8XpNJnO+aQf3NaG+lriLopI4HMx9VjQLfPQ6vhnoA==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-    dependencies:
-      '@types/react': 18.2.71
-      react: 18.2.0
-      tslib: 2.6.2
-    dev: false
-
-  /use-sidecar@1.1.2(@types/react@18.2.71)(react@18.2.0):
-    resolution: {integrity: sha512-epTbsLuzZ7lPClpz2TyryBfztm7m+28DlEv2ZCQ3MDr5ssiwyOwGH/e5F9CkfWjJ1t4clvI58yF822/GUkjjhw==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      '@types/react': ^16.9.0 || ^17.0.0 || ^18.0.0
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-    dependencies:
-      '@types/react': 18.2.71
-      detect-node-es: 1.1.0
-      react: 18.2.0
-      tslib: 2.6.2
-    dev: false
-
   /use-sync-external-store@1.2.0(react@18.2.0):
     resolution: {integrity: sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==}
     peerDependencies: