⚡️⚡️⚡️ Self-hosted collaborative bookmark manager to collect, read, annotate, and fully preserve what matters, all in one place.
TypeScript bookmarkbookmark-managercollaborationnextjsreact-nativeread-it-laterself-hostedtypescript
improvements
daniel31x13736e98ac7d0b
diff --git a/components/LinkDetails.tsx b/components/LinkDetails.tsxindex e7450553..9139f8be 100644--- a/components/LinkDetails.tsx+++ b/components/LinkDetails.tsx@@ -42,6 +42,7 @@ type Props = {standalone?: boolean;mode?: "view" | "edit";setMode?: Function;+ onUpdateArchive?: Function;};export default function LinkDetails({@@ -50,6 +51,7 @@ export default function LinkDetails({standalone,mode = "view",setMode,+ onUpdateArchive,}: Props) {const [link, setLink] =useState<LinkIncludingShortenedCollectionAndTags>(activeLink);@@ -236,46 +238,50 @@ export default function LinkDetails({<div className="duration-100 h-40 skeleton rounded-none"></div>)}- {!standalone && (permissions === true || permissions?.canUpdate) && (- <div className="absolute top-0 bottom-0 left-0 right-0 opacity-0 group-hover:opacity-100 duration-100 flex justify-end items-end">- <label className="btn btn-xs mb-2 mr-3 opacity-50 hover:opacity-100">- {t("upload_preview_image")}- <input- type="file"- accept="image/jpg, image/jpeg, image/png"- onChange={async (e) => {- const file = e.target.files?.[0];- if (!file) return;-- const load = toast.loading(t("updating"));-- await updatePreview.mutateAsync(- {- linkId: link.id as number,- file,- },- {- onSettled: (data, error) => {- toast.dismiss(load);-- if (error) {- toast.error(error.message);- } else {- toast.success(t("updated"));- setLink({ updatedAt: data.updatedAt, ...link });- }+ {!standalone &&+ (permissions === true || permissions?.canUpdate) &&+ !isPublicRoute && (+ <div className="absolute top-0 bottom-0 left-0 right-0 opacity-0 group-hover:opacity-100 duration-100 flex justify-end items-end">+ <label className="btn btn-xs mb-2 mr-3 opacity-50 hover:opacity-100">+ {t("upload_preview_image")}+ <input+ type="file"+ accept="image/jpg, image/jpeg, image/png"+ onChange={async (e) => {+ const file = e.target.files?.[0];+ if (!file) return;++ const load = toast.loading(t("updating"));++ await updatePreview.mutateAsync(+ {+ linkId: link.id as number,+ file,},- }- );- }}- className="hidden"- />- </label>- </div>- )}+ {+ onSettled: (data, error) => {+ toast.dismiss(load);++ if (error) {+ toast.error(error.message);+ } else {+ toast.success(t("updated"));+ setLink({ updatedAt: data.updatedAt, ...link });+ }+ },+ }+ );+ }}+ className="hidden"+ />+ </label>+ </div>+ )}</div>- {!standalone && (permissions === true || permissions?.canUpdate) ? (+ {!standalone &&+ (permissions === true || permissions?.canUpdate) &&+ !isPublicRoute ? (<div className="-mt-14 ml-8 relative w-fit pb-2"><div className="tooltip tooltip-bottom" data-tip={t("change_icon")}><LinkIcon@@ -505,12 +511,30 @@ export default function LinkDetails({<div><br />- <p- className="text-sm mb-2 text-neutral"- title={t("available_formats")}- >- {link.url ? t("preserved_formats") : t("file")}- </p>+ <div className="flex gap-1 items-center mb-2">+ <p+ className="text-sm text-neutral"+ title={t("available_formats")}+ >+ {link.url ? t("preserved_formats") : t("file")}+ </p>++ {onUpdateArchive &&+ (permissions === true || permissions?.canUpdate) &&+ !isPublicRoute && (+ <div+ className="tooltip tooltip-bottom"+ data-tip={t("refresh_preserved_formats")}+ >+ <button+ className="btn btn-xs btn-ghost btn-square text-neutral"+ onClick={() => onUpdateArchive()}+ >+ <i className="bi-arrow-clockwise text-sm" />+ </button>+ </div>+ )}+ </div><div className={`flex flex-col rounded-md p-3 bg-base-200`}>{monolithAvailable(link) ? (diff --git a/components/LinkViews/LinkComponents/LinkActions.tsx b/components/LinkViews/LinkComponents/LinkActions.tsxindex e444f18f..ac162251 100644--- a/components/LinkViews/LinkComponents/LinkActions.tsx+++ b/components/LinkViews/LinkComponents/LinkActions.tsx@@ -64,7 +64,7 @@ export default function LinkActions({ link, btnStyle }: Props) {onClick={() => setLinkModal(true)}><div className={clsx("btn btn-sm btn-square text-neutral", btnStyle)}>- <i title="More" className="bi-three-dots text-xl" />+ <i title="More" className="bi-info-circle text-xl" /></div></div>) : (@@ -127,22 +127,6 @@ export default function LinkActions({ link, btnStyle }: Props) {</div></li>)}- {link.type === "url" &&- (permissions === true || permissions?.canUpdate) && (- <li>- <div- role="button"- tabIndex={0}- onClick={() => {- (document?.activeElement as HTMLElement)?.blur();- updateArchive();- }}- className="whitespace-nowrap"- >- {t("refresh_preserved_formats")}- </div>- </li>- )}{(permissions === true || permissions?.canDelete) && (<li><divdiff --git a/components/LinkViews/LinkComponents/LinkCard.tsx b/components/LinkViews/LinkComponents/LinkCard.tsxindex abee3664..d92a6877 100644--- a/components/LinkViews/LinkComponents/LinkCard.tsx+++ b/components/LinkViews/LinkComponents/LinkCard.tsx@@ -146,6 +146,8 @@ export default function LinkCard({ link, columns, editMode }: Props) {editMode &&(permissions === true || permissions?.canCreate || permissions?.canDelete);+ const isPublicRoute = router.pathname.startsWith("/public") ? true : false;+return (<divref={ref}@@ -233,7 +235,7 @@ export default function LinkCard({ link, columns, editMode }: Props) {{/* Overlay on hover */}<div className="absolute pointer-events-none top-0 left-0 right-0 bottom-0 bg-base-100 bg-opacity-0 group-hover:bg-opacity-20 group-focus-within:opacity-20 rounded-2xl duration-100"></div><LinkActions link={link} collection={collection} />- <LinkPin link={link} />+ {!isPublicRoute && <LinkPin link={link} />}</div>);}diff --git a/components/LinkViews/LinkComponents/LinkCollection.tsx b/components/LinkViews/LinkComponents/LinkCollection.tsxindex f416ede6..fdc29397 100644--- a/components/LinkViews/LinkComponents/LinkCollection.tsx+++ b/components/LinkViews/LinkComponents/LinkCollection.tsx@@ -14,7 +14,7 @@ export default function LinkCollection({link: LinkIncludingShortenedCollectionAndTags;collection: CollectionIncludingMembersAndLinkCount;}) {- return (+ return collection?.name ? (<><Linkhref={`/collections/${link.collection.id}`}@@ -40,5 +40,7 @@ export default function LinkCollection({<p className="truncate capitalize">{collection?.name}</p></Link></>+ ) : (+ <></>);}diff --git a/components/LinkViews/LinkComponents/LinkList.tsx b/components/LinkViews/LinkComponents/LinkList.tsxindex b43c5957..3b4e46b3 100644--- a/components/LinkViews/LinkComponents/LinkList.tsx+++ b/components/LinkViews/LinkComponents/LinkList.tsx@@ -20,6 +20,7 @@ import { useUser } from "@/hooks/store/user";import { useLinks } from "@/hooks/store/links";import useLocalSettingsStore from "@/store/localSettings";import LinkPin from "./LinkPin";+import { useRouter } from "next/router";type Props = {link: LinkIncludingShortenedCollectionAndTags;@@ -91,6 +92,9 @@ export default function LinkCardCompact({ link, editMode }: Props) {editMode &&(permissions === true || permissions?.canCreate || permissions?.canDelete);+ const router = useRouter();++ let isPublic = router.pathname.startsWith("/public") ? true : undefined;return (<><div@@ -135,7 +139,7 @@ export default function LinkCardCompact({ link, editMode }: Props) {</div></div></div>- <LinkPin link={link} btnStyle="btn-ghost" />+ {!isPublic && <LinkPin link={link} btnStyle="btn-ghost" />}<LinkActions link={link} collection={collection} btnStyle="btn-ghost" /></div><div className="last:hidden rounded-none my-0 mx-1 border-t border-base-300 h-[1px]"></div>diff --git a/components/LinkViews/LinkComponents/LinkMasonry.tsx b/components/LinkViews/LinkComponents/LinkMasonry.tsxindex 529e46ed..eba17792 100644--- a/components/LinkViews/LinkComponents/LinkMasonry.tsx+++ b/components/LinkViews/LinkComponents/LinkMasonry.tsx@@ -25,6 +25,7 @@ import { useGetLink, useLinks } from "@/hooks/store/links";import useLocalSettingsStore from "@/store/localSettings";import clsx from "clsx";import LinkPin from "./LinkPin";+import { useRouter } from "next/router";type Props = {link: LinkIncludingShortenedCollectionAndTags;@@ -108,6 +109,10 @@ export default function LinkMasonry({ link, editMode, columns }: Props) {const isVisible = useOnScreen(ref);const permissions = usePermissions(collection?.id as number);+ const router = useRouter();++ let isPublic = router.pathname.startsWith("/public") ? true : undefined;+useEffect(() => {let interval: NodeJS.Timeout | null = null;@@ -241,7 +246,7 @@ export default function LinkMasonry({ link, editMode, columns }: Props) {{/* Overlay on hover */}<div className="absolute pointer-events-none top-0 left-0 right-0 bottom-0 bg-base-100 bg-opacity-0 group-hover:bg-opacity-20 group-focus-within:opacity-20 rounded-2xl duration-100"></div><LinkActions link={link} collection={collection} />- <LinkPin link={link} />+ {!isPublic && <LinkPin link={link} />}</div>);}diff --git a/components/ModalContent/LinkModal.tsx b/components/ModalContent/LinkModal.tsxindex 41b742e8..c3793ac1 100644--- a/components/ModalContent/LinkModal.tsx+++ b/components/ModalContent/LinkModal.tsx@@ -51,7 +51,7 @@ export default function LinkModal({onClick={() => onClose()}></div>- {(permissions === true || permissions?.canUpdate) && (+ {(permissions === true || permissions?.canUpdate) && !isPublicRoute && (<div className="flex gap-1 h-8 rounded-full bg-neutral-content bg-opacity-50 text-base-content p-1 text-xs duration-100 select-none z-10"><divclassName={clsx(@@ -79,87 +79,89 @@ export default function LinkModal({)}<div className="flex gap-2">- <div className={`dropdown dropdown-end z-20`}>- <div- tabIndex={0}- role="button"- onMouseDown={dropdownTriggerer}- className="btn btn-sm btn-circle text-base-content opacity-50 hover:opacity-100 z-10"- >- <i title="More" className="bi-three-dots text-xl" />- </div>- <ul- className={`dropdown-content z-[20] menu shadow bg-base-200 border border-neutral-content rounded-box`}- >- {- <li>- <div- role="button"- tabIndex={0}- onClick={() => {- (document?.activeElement as HTMLElement)?.blur();- onPin();- }}- className="whitespace-nowrap"- >- {link?.pinnedBy && link.pinnedBy[0]- ? t("unpin")- : t("pin_to_dashboard")}- </div>- </li>- }- {link.type === "url" &&- (permissions === true || permissions?.canUpdate) && (+ {!isPublicRoute && (+ <div className={`dropdown dropdown-end z-20`}>+ <div+ tabIndex={0}+ role="button"+ onMouseDown={dropdownTriggerer}+ className="btn btn-sm btn-circle text-base-content opacity-50 hover:opacity-100 z-10"+ >+ <i title="More" className="bi-three-dots text-xl" />+ </div>+ <ul+ className={`dropdown-content z-[20] menu shadow bg-base-200 border border-neutral-content rounded-box`}+ >+ {<li><divrole="button"tabIndex={0}onClick={() => {(document?.activeElement as HTMLElement)?.blur();- onUpdateArchive();+ onPin();}}className="whitespace-nowrap">- {t("refresh_preserved_formats")}+ {link?.pinnedBy && link.pinnedBy[0]+ ? t("unpin")+ : t("pin_to_dashboard")}</div></li>- )}- {(permissions === true || permissions?.canDelete) && (- <li>- <div- role="button"- tabIndex={0}- onClick={async (e) => {- (document?.activeElement as HTMLElement)?.blur();- console.log(e.shiftKey);- if (e.shiftKey) {- const load = toast.loading(t("deleting"));+ }+ {link.type === "url" &&+ (permissions === true || permissions?.canUpdate) && (+ <li>+ <div+ role="button"+ tabIndex={0}+ onClick={() => {+ (document?.activeElement as HTMLElement)?.blur();+ onUpdateArchive();+ }}+ className="whitespace-nowrap"+ >+ {t("refresh_preserved_formats")}+ </div>+ </li>+ )}+ {(permissions === true || permissions?.canDelete) && (+ <li>+ <div+ role="button"+ tabIndex={0}+ onClick={async (e) => {+ (document?.activeElement as HTMLElement)?.blur();+ console.log(e.shiftKey);+ if (e.shiftKey) {+ const load = toast.loading(t("deleting"));- await deleteLink.mutateAsync(link.id as number, {- onSettled: (data, error) => {- toast.dismiss(load);+ await deleteLink.mutateAsync(link.id as number, {+ onSettled: (data, error) => {+ toast.dismiss(load);- if (error) {- toast.error(error.message);- } else {- toast.success(t("deleted"));- }- },- });- onClose();- } else {- onDelete();- onClose();- }- }}- className="whitespace-nowrap"- >- {t("delete")}- </div>- </li>- )}- </ul>- </div>+ if (error) {+ toast.error(error.message);+ } else {+ toast.success(t("deleted"));+ }+ },+ });+ onClose();+ } else {+ onDelete();+ onClose();+ }+ }}+ className="whitespace-nowrap"+ >+ {t("delete")}+ </div>+ </li>+ )}+ </ul>+ </div>+ )}{link.url && (<Linkhref={link.url}@@ -176,6 +178,7 @@ export default function LinkModal({className="sm:mt-0 -mt-11"mode={mode}setMode={(mode: "view" | "edit") => setMode(mode)}+ onUpdateArchive={onUpdateArchive}/></div></Drawer>diff --git a/package.json b/package.jsonindex b07bbb2b..b82f6b55 100644--- a/package.json+++ b/package.json@@ -80,7 +80,7 @@"socks-proxy-agent": "^8.0.2","stripe": "^12.13.0","tailwind-merge": "^2.3.0",- "vaul": "^0.9.1",+ "vaul": "^1.1.1","zod": "^3.23.8","zustand": "^4.3.8"},diff --git a/public/locales/de/common.json b/public/locales/de/common.jsonindex a35c6c8f..b26dbf48 100644--- a/public/locales/de/common.json+++ b/public/locales/de/common.json@@ -256,7 +256,7 @@"sending_request": "Anfrage senden...","link_being_archived": "Link wird archiviert...","preserved_formats": "Konservierte Formate",- "available_formats": "Die folgenden Formate sind für diesen Link verfügbar:",+ "available_formats": "Die folgenden Formate sind für diesen Link verfügbar","readable": "Leseansicht","preservation_in_queue": "Linkkonservierung ist in der Warteschlange","view_latest_snapshot": "Aktuellen Schnappschuss auf archive.org ansehen",diff --git a/public/locales/en/common.json b/public/locales/en/common.jsonindex 936059d7..33f9cfa7 100644--- a/public/locales/en/common.json+++ b/public/locales/en/common.json@@ -256,7 +256,7 @@"sending_request": "Sending request...","link_being_archived": "Link is being archived...","preserved_formats": "Preserved Formats",- "available_formats": "The following formats are available for this link:",+ "available_formats": "The following formats are available for this link","readable": "Readable","preservation_in_queue": "Link preservation is in the queue","view_latest_snapshot": "View latest snapshot on archive.org",diff --git a/public/locales/es/common.json b/public/locales/es/common.jsonindex 320d3a54..192ed65c 100644--- a/public/locales/es/common.json+++ b/public/locales/es/common.json@@ -255,7 +255,7 @@"sending_request": "Enviando solicitud...","link_being_archived": "El enlace está siendo archivado...","preserved_formats": "Formatos conservados",- "available_formats": "Los siguientes formatos están disponibles para este enlace:",+ "available_formats": "Los siguientes formatos están disponibles para este enlace","readable": "Versión lectura","preservation_in_queue": "La conservación del enlace está en la cola.","view_latest_snapshot": "Ver la última captura en archive.org",diff --git a/public/locales/fr/common.json b/public/locales/fr/common.jsonindex eb789b00..733341f8 100644--- a/public/locales/fr/common.json+++ b/public/locales/fr/common.json@@ -255,7 +255,7 @@"sending_request": "Envoi de la demande...","link_being_archived": "Le lien est en cours d'archivage...","preserved_formats": "Formats conservés",- "available_formats": "Les formats suivants sont disponibles pour ce lien:",+ "available_formats": "Les formats suivants sont disponibles pour ce lien","readable": "Lisible","preservation_in_queue": "La préservation du lien est dans la file d'attente","view_latest_snapshot": "Voir le dernier instantané sur archive.org",diff --git a/public/locales/it/common.json b/public/locales/it/common.jsonindex e3ae5337..3e9543b9 100644--- a/public/locales/it/common.json+++ b/public/locales/it/common.json@@ -256,7 +256,7 @@"sending_request": "Invio richiesta...","link_being_archived": "Il Link è in fase di archiviazione...","preserved_formats": "Formati Preservati",- "available_formats": "I seguenti formati sono disponibili per questo link:",+ "available_formats": "I seguenti formati sono disponibili per questo link","readable": "Leggibile","preservation_in_queue": "La preservazione del Link è in coda","view_latest_snapshot": "Visualizza l'ultimo snapshot su archive.org",diff --git a/public/locales/ja/common.json b/public/locales/ja/common.jsonindex dfc8c337..2dfae1ea 100644--- a/public/locales/ja/common.json+++ b/public/locales/ja/common.json@@ -256,7 +256,7 @@"sending_request": "リクエストを送信中...","link_being_archived": "リンクがアーカイブされています...","preserved_formats": "保存された形式",- "available_formats": "このリンクには以下の形式が利用可能です:",+ "available_formats": "このリンクには以下の形式が利用可能です","readable": "リーダブル","preservation_in_queue": "リンクの保存がキューに追加されています","view_latest_snapshot": "archive.org で最新のスナップショットを見る",diff --git a/public/locales/nl/common.json b/public/locales/nl/common.jsonindex a1d38005..debb65cd 100644--- a/public/locales/nl/common.json+++ b/public/locales/nl/common.json@@ -255,7 +255,7 @@"sending_request": "Verzoek Verzenden...","link_being_archived": "Link wordt gearchiveerd...","preserved_formats": "Bewaarde Formaten",- "available_formats": "De volgende formaten zijn beschikbaar voor deze link:",+ "available_formats": "De volgende formaten zijn beschikbaar voor deze link","readable": "Leesbaar","preservation_in_queue": "Linkbewaring staat in de wachtrij","view_latest_snapshot": "Bekijk de laatste momentopname op archive.org",diff --git a/public/locales/pt-BR/common.json b/public/locales/pt-BR/common.jsonindex 80c77141..c5509c78 100644--- a/public/locales/pt-BR/common.json+++ b/public/locales/pt-BR/common.json@@ -272,7 +272,7 @@"sending_request": "Enviando solicitação...","link_being_archived": "O link está sendo arquivado...","preserved_formats": "Formatos Preservados",- "available_formats": "Os seguintes formatos estão disponíveis para este link:",+ "available_formats": "Os seguintes formatos estão disponíveis para este link","readable": "Legível","preservation_in_queue": "A preservação do link está na fila","view_latest_snapshot": "Ver o último snapshot em archive.org",diff --git a/public/locales/tr/common.json b/public/locales/tr/common.jsonindex 2cc4ef2d..304d3869 100644--- a/public/locales/tr/common.json+++ b/public/locales/tr/common.json@@ -257,7 +257,7 @@"sending_request": "İstek Gönderiliyor...","link_being_archived": "Bağlantı arşivleniyor...","preserved_formats": "Korunan Formatlar",- "available_formats": "Bu bağlantı için kullanılabilir formatlar:",+ "available_formats": "Bu bağlantı için kullanılabilir formatlar","readable": "Okunabilir","preservation_in_queue": "Bağlantı koruma sırada","view_latest_snapshot": "archive.org'da son anlık görüntüyü görüntüle",diff --git a/public/locales/uk/common.json b/public/locales/uk/common.jsonindex a88a1bf1..287a4575 100644--- a/public/locales/uk/common.json+++ b/public/locales/uk/common.json@@ -256,7 +256,7 @@"sending_request": "Надсилання запиту...","link_being_archived": "Посилання архівується...","preserved_formats": "Збережені формати",- "available_formats": "Для цього посилання доступні такі формати:",+ "available_formats": "Для цього посилання доступні такі формати","readable": "Читабельний","preservation_in_queue": "У черзі збереження посилання","view_latest_snapshot": "Перегляньте останній знімок на archive.org",diff --git a/public/locales/zh-TW/common.json b/public/locales/zh-TW/common.jsonindex d3efefc9..30a2db32 100644--- a/public/locales/zh-TW/common.json+++ b/public/locales/zh-TW/common.json@@ -255,7 +255,7 @@"sending_request": "正在發送請求...","link_being_archived": "連結正在封存...","preserved_formats": "保存格式",- "available_formats": "以下格式可用於此連結:",+ "available_formats": "以下格式可用於此連結","readable": "可讀視圖","preservation_in_queue": "連結保存正在處理中...","view_latest_snapshot": "在 archive.org 上查看最新快照",diff --git a/public/locales/zh/common.json b/public/locales/zh/common.jsonindex b5b7977b..3b554d9f 100644--- a/public/locales/zh/common.json+++ b/public/locales/zh/common.json@@ -255,7 +255,7 @@"sending_request": "正在发送请求...","link_being_archived": "链接正在归档...","preserved_formats": "保存格式",- "available_formats": "以下格式可用于此链接:",+ "available_formats": "以下格式可用于此链接","readable": "可读视图","preservation_in_queue": "链接保存正在处理中...","view_latest_snapshot": "在 archive.org 上查看最新快照",diff --git a/yarn.lock b/yarn.lockindex fdf66a1b..71ba16b2 100644--- a/yarn.lock+++ b/yarn.lock@@ -645,13 +645,6 @@dependencies:regenerator-runtime "^0.13.11"-"@babel/runtime@^7.13.10":- version "7.23.8"- resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.8.tgz#8ee6fe1ac47add7122902f257b8ddf55c898f650"- integrity sha512-Y7KbAP984rn1VGMbGqKmBLio9V7y5Je9GvU4rQPCPinCyNfUcToxIXl06d59URp/F3LwinvODxab5N/G6qggkw==- dependencies:- regenerator-runtime "^0.14.0"-"@babel/runtime@^7.15.4", "@babel/runtime@^7.9.2":version "7.23.9"resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.9.tgz#47791a15e4603bb5f905bc0753801cf21d6345f7"@@ -1351,147 +1344,126 @@dependencies:"@prisma/debug" "5.21.1"-"@radix-ui/[email protected]":- version "1.0.1"- resolved "https://registry.yarnpkg.com/@radix-ui/primitive/-/primitive-1.0.1.tgz#e46f9958b35d10e9f6dc71c497305c22e3e55dbd"- integrity sha512-yQ8oGX2GVsEYMWGxcovu1uGWPCxV5BFfeeYxqPmuAzUyLT9qmaMXSAhXpb0WrspIeqYzdJpkh2vHModJPgRIaw==- dependencies:- "@babel/runtime" "^7.13.10"+"@radix-ui/[email protected]":+ version "1.1.0"+ resolved "https://registry.yarnpkg.com/@radix-ui/primitive/-/primitive-1.1.0.tgz#42ef83b3b56dccad5d703ae8c42919a68798bbe2"+ integrity sha512-4Z8dn6Upk0qk4P74xBhZ6Hd/w0mPEzOOLxy4xiPXOXqjF7jZS0VAKk7/x/H6FyY2zCkYJqePf1G5KmkmNJ4RBA==-"@radix-ui/[email protected]":- version "1.0.1"- resolved "https://registry.yarnpkg.com/@radix-ui/react-compose-refs/-/react-compose-refs-1.0.1.tgz#7ed868b66946aa6030e580b1ffca386dd4d21989"- integrity sha512-fDSBgd44FKHa1FRMU59qBMPFcl2PZE+2nmqunj+BWFyYYjnhIDWL2ItDs3rrbJDQOtzt5nIebLCQc4QRfz6LJw==- dependencies:- "@babel/runtime" "^7.13.10"+"@radix-ui/[email protected]":+ version "1.1.0"+ resolved "https://registry.yarnpkg.com/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.0.tgz#656432461fc8283d7b591dcf0d79152fae9ecc74"+ integrity sha512-b4inOtiaOnYf9KWyO3jAeeCG6FeyfY6ldiEPanbUjWd+xIk5wZeHa8yVwmrJ2vderhu/BQvzCrJI0lHd+wIiqw==-"@radix-ui/[email protected]":- version "1.0.1"- resolved "https://registry.yarnpkg.com/@radix-ui/react-context/-/react-context-1.0.1.tgz#fe46e67c96b240de59187dcb7a1a50ce3e2ec00c"- integrity sha512-ebbrdFoYTcuZ0v4wG5tedGnp9tzcV8awzsxYph7gXUyvnNLuTIcCk1q17JEbnVhXAKG9oX3KtchwiMIAYp9NLg==- dependencies:- "@babel/runtime" "^7.13.10"+"@radix-ui/[email protected]":+ version "1.1.1"+ resolved "https://registry.yarnpkg.com/@radix-ui/react-context/-/react-context-1.1.1.tgz#82074aa83a472353bb22e86f11bcbd1c61c4c71a"+ integrity sha512-UASk9zi+crv9WteK/NU4PLvOoL3OuE6BWVKNF6hPRBtYBDXQ2u5iu3O59zUlJiTVvkyuycnqrztsHVJwcK9K+Q==-"@radix-ui/react-dialog@^1.0.4":- version "1.0.5"- resolved "https://registry.yarnpkg.com/@radix-ui/react-dialog/-/react-dialog-1.0.5.tgz#71657b1b116de6c7a0b03242d7d43e01062c7300"- integrity sha512-GjWJX/AUpB703eEBanuBnIWdIXg6NvJFCXcNlSZk4xdszCdhrJgBoUd1cGk67vFO+WdA2pfI/plOpqz/5GUP6Q==- dependencies:- "@babel/runtime" "^7.13.10"- "@radix-ui/primitive" "1.0.1"- "@radix-ui/react-compose-refs" "1.0.1"- "@radix-ui/react-context" "1.0.1"- "@radix-ui/react-dismissable-layer" "1.0.5"- "@radix-ui/react-focus-guards" "1.0.1"- "@radix-ui/react-focus-scope" "1.0.4"- "@radix-ui/react-id" "1.0.1"- "@radix-ui/react-portal" "1.0.4"- "@radix-ui/react-presence" "1.0.1"- "@radix-ui/react-primitive" "1.0.3"- "@radix-ui/react-slot" "1.0.2"- "@radix-ui/react-use-controllable-state" "1.0.1"+"@radix-ui/react-dialog@^1.1.1":+ version "1.1.2"+ resolved "https://registry.yarnpkg.com/@radix-ui/react-dialog/-/react-dialog-1.1.2.tgz#d9345575211d6f2d13e209e84aec9a8584b54d6c"+ integrity sha512-Yj4dZtqa2o+kG61fzB0H2qUvmwBA2oyQroGLyNtBj1beo1khoQ3q1a2AO8rrQYjd8256CO9+N8L9tvsS+bnIyA==+ dependencies:+ "@radix-ui/primitive" "1.1.0"+ "@radix-ui/react-compose-refs" "1.1.0"+ "@radix-ui/react-context" "1.1.1"+ "@radix-ui/react-dismissable-layer" "1.1.1"+ "@radix-ui/react-focus-guards" "1.1.1"+ "@radix-ui/react-focus-scope" "1.1.0"+ "@radix-ui/react-id" "1.1.0"+ "@radix-ui/react-portal" "1.1.2"+ "@radix-ui/react-presence" "1.1.1"+ "@radix-ui/react-primitive" "2.0.0"+ "@radix-ui/react-slot" "1.1.0"+ "@radix-ui/react-use-controllable-state" "1.1.0"aria-hidden "^1.1.1"- react-remove-scroll "2.5.5"+ react-remove-scroll "2.6.0"-"@radix-ui/[email protected]":- version "1.0.5"- resolved "https://registry.yarnpkg.com/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.0.5.tgz#3f98425b82b9068dfbab5db5fff3df6ebf48b9d4"- integrity sha512-aJeDjQhywg9LBu2t/At58hCvr7pEm0o2Ke1x33B+MhjNmmZ17sy4KImo0KPLgsnc/zN7GPdce8Cnn0SWvwZO7g==+"@radix-ui/[email protected]":+ version "1.1.1"+ resolved "https://registry.yarnpkg.com/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.1.tgz#cbdcb739c5403382bdde5f9243042ba643883396"+ integrity sha512-QSxg29lfr/xcev6kSz7MAlmDnzbP1eI/Dwn3Tp1ip0KT5CUELsxkekFEMVBEoykI3oV39hKT4TKZzBNMbcTZYQ==dependencies:- "@babel/runtime" "^7.13.10"- "@radix-ui/primitive" "1.0.1"- "@radix-ui/react-compose-refs" "1.0.1"- "@radix-ui/react-primitive" "1.0.3"- "@radix-ui/react-use-callback-ref" "1.0.1"- "@radix-ui/react-use-escape-keydown" "1.0.3"+ "@radix-ui/primitive" "1.1.0"+ "@radix-ui/react-compose-refs" "1.1.0"+ "@radix-ui/react-primitive" "2.0.0"+ "@radix-ui/react-use-callback-ref" "1.1.0"+ "@radix-ui/react-use-escape-keydown" "1.1.0"-"@radix-ui/[email protected]":- version "1.0.1"- resolved "https://registry.yarnpkg.com/@radix-ui/react-focus-guards/-/react-focus-guards-1.0.1.tgz#1ea7e32092216b946397866199d892f71f7f98ad"- integrity sha512-Rect2dWbQ8waGzhMavsIbmSVCgYxkXLxxR3ZvCX79JOglzdEy4JXMb98lq4hPxUbLr77nP0UOGf4rcMU+s1pUA==- dependencies:- "@babel/runtime" "^7.13.10"+"@radix-ui/[email protected]":+ version "1.1.1"+ resolved "https://registry.yarnpkg.com/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.1.tgz#8635edd346304f8b42cae86b05912b61aef27afe"+ integrity sha512-pSIwfrT1a6sIoDASCSpFwOasEwKTZWDw/iBdtnqKO7v6FeOzYJ7U53cPzYFVR3geGGXgVHaH+CdngrrAzqUGxg==-"@radix-ui/[email protected]":- version "1.0.4"- resolved "https://registry.yarnpkg.com/@radix-ui/react-focus-scope/-/react-focus-scope-1.0.4.tgz#2ac45fce8c5bb33eb18419cdc1905ef4f1906525"- integrity sha512-sL04Mgvf+FmyvZeYfNu1EPAaaxD+aw7cYeIB9L9Fvq8+urhltTRaEo5ysKOpHuKPclsZcSUMKlN05x4u+CINpA==+"@radix-ui/[email protected]":+ version "1.1.0"+ resolved "https://registry.yarnpkg.com/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.0.tgz#ebe2891a298e0a33ad34daab2aad8dea31caf0b2"+ integrity sha512-200UD8zylvEyL8Bx+z76RJnASR2gRMuxlgFCPAe/Q/679a/r0eK3MBVYMb7vZODZcffZBdob1EGnky78xmVvcA==dependencies:- "@babel/runtime" "^7.13.10"- "@radix-ui/react-compose-refs" "1.0.1"- "@radix-ui/react-primitive" "1.0.3"- "@radix-ui/react-use-callback-ref" "1.0.1"+ "@radix-ui/react-compose-refs" "1.1.0"+ "@radix-ui/react-primitive" "2.0.0"+ "@radix-ui/react-use-callback-ref" "1.1.0"-"@radix-ui/[email protected]":- version "1.0.1"- resolved "https://registry.yarnpkg.com/@radix-ui/react-id/-/react-id-1.0.1.tgz#73cdc181f650e4df24f0b6a5b7aa426b912c88c0"- integrity sha512-tI7sT/kqYp8p96yGWY1OAnLHrqDgzHefRBKQ2YAkBS5ja7QLcZ9Z/uY7bEjPUatf8RomoXM8/1sMj1IJaE5UzQ==+"@radix-ui/[email protected]":+ version "1.1.0"+ resolved "https://registry.yarnpkg.com/@radix-ui/react-id/-/react-id-1.1.0.tgz#de47339656594ad722eb87f94a6b25f9cffae0ed"+ integrity sha512-EJUrI8yYh7WOjNOqpoJaf1jlFIH2LvtgAl+YcFqNCa+4hj64ZXmPkAKOFs/ukjz3byN6bdb/AVUqHkI8/uWWMA==dependencies:- "@babel/runtime" "^7.13.10"- "@radix-ui/react-use-layout-effect" "1.0.1"+ "@radix-ui/react-use-layout-effect" "1.1.0"-"@radix-ui/[email protected]":- version "1.0.4"- resolved "https://registry.yarnpkg.com/@radix-ui/react-portal/-/react-portal-1.0.4.tgz#df4bfd353db3b1e84e639e9c63a5f2565fb00e15"- integrity sha512-Qki+C/EuGUVCQTOTD5vzJzJuMUlewbzuKyUy+/iHM2uwGiru9gZeBJtHAPKAEkB5KWGi9mP/CHKcY0wt1aW45Q==+"@radix-ui/[email protected]":+ version "1.1.2"+ resolved "https://registry.yarnpkg.com/@radix-ui/react-portal/-/react-portal-1.1.2.tgz#51eb46dae7505074b306ebcb985bf65cc547d74e"+ integrity sha512-WeDYLGPxJb/5EGBoedyJbT0MpoULmwnIPMJMSldkuiMsBAv7N1cRdsTWZWht9vpPOiN3qyiGAtbK2is47/uMFg==dependencies:- "@babel/runtime" "^7.13.10"- "@radix-ui/react-primitive" "1.0.3"+ "@radix-ui/react-primitive" "2.0.0"+ "@radix-ui/react-use-layout-effect" "1.1.0"-"@radix-ui/[email protected]":- version "1.0.1"- resolved "https://registry.yarnpkg.com/@radix-ui/react-presence/-/react-presence-1.0.1.tgz#491990ba913b8e2a5db1b06b203cb24b5cdef9ba"- integrity sha512-UXLW4UAbIY5ZjcvzjfRFo5gxva8QirC9hF7wRE4U5gz+TP0DbRk+//qyuAQ1McDxBt1xNMBTaciFGvEmJvAZCg==+"@radix-ui/[email protected]":+ version "1.1.1"+ resolved "https://registry.yarnpkg.com/@radix-ui/react-presence/-/react-presence-1.1.1.tgz#98aba423dba5e0c687a782c0669dcd99de17f9b1"+ integrity sha512-IeFXVi4YS1K0wVZzXNrbaaUvIJ3qdY+/Ih4eHFhWA9SwGR9UDX7Ck8abvL57C4cv3wwMvUE0OG69Qc3NCcTe/A==dependencies:- "@babel/runtime" "^7.13.10"- "@radix-ui/react-compose-refs" "1.0.1"- "@radix-ui/react-use-layout-effect" "1.0.1"+ "@radix-ui/react-compose-refs" "1.1.0"+ "@radix-ui/react-use-layout-effect" "1.1.0"-"@radix-ui/[email protected]":- version "1.0.3"- resolved "https://registry.yarnpkg.com/@radix-ui/react-primitive/-/react-primitive-1.0.3.tgz#d49ea0f3f0b2fe3ab1cb5667eb03e8b843b914d0"- integrity sha512-yi58uVyoAcK/Nq1inRY56ZSjKypBNKTa/1mcL8qdl6oJeEaDbOldlzrGn7P6Q3Id5d+SYNGc5AJgc4vGhjs5+g==+"@radix-ui/[email protected]":+ version "2.0.0"+ resolved "https://registry.yarnpkg.com/@radix-ui/react-primitive/-/react-primitive-2.0.0.tgz#fe05715faa9203a223ccc0be15dc44b9f9822884"+ integrity sha512-ZSpFm0/uHa8zTvKBDjLFWLo8dkr4MBsiDLz0g3gMUwqgLHz9rTaRRGYDgvZPtBJgYCBKXkS9fzmoySgr8CO6Cw==dependencies:- "@babel/runtime" "^7.13.10"- "@radix-ui/react-slot" "1.0.2"+ "@radix-ui/react-slot" "1.1.0"-"@radix-ui/[email protected]":- version "1.0.2"- resolved "https://registry.yarnpkg.com/@radix-ui/react-slot/-/react-slot-1.0.2.tgz#a9ff4423eade67f501ffb32ec22064bc9d3099ab"- integrity sha512-YeTpuq4deV+6DusvVUW4ivBgnkHwECUu0BiN43L5UCDFgdhsRUWAghhTF5MbvNTPzmiFOx90asDSUjWuCNapwg==+"@radix-ui/[email protected]":+ version "1.1.0"+ resolved "https://registry.yarnpkg.com/@radix-ui/react-slot/-/react-slot-1.1.0.tgz#7c5e48c36ef5496d97b08f1357bb26ed7c714b84"+ integrity sha512-FUCf5XMfmW4dtYl69pdS4DbxKy8nj4M7SafBgPllysxmdachynNflAdp/gCsnYWNDnge6tI9onzMp5ARYc1KNw==dependencies:- "@babel/runtime" "^7.13.10"- "@radix-ui/react-compose-refs" "1.0.1"+ "@radix-ui/react-compose-refs" "1.1.0"-"@radix-ui/[email protected]":- version "1.0.1"- resolved "https://registry.yarnpkg.com/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.0.1.tgz#f4bb1f27f2023c984e6534317ebc411fc181107a"- integrity sha512-D94LjX4Sp0xJFVaoQOd3OO9k7tpBYNOXdVhkltUbGv2Qb9OXdrg/CpsjlZv7ia14Sylv398LswWBVVu5nqKzAQ==- dependencies:- "@babel/runtime" "^7.13.10"+"@radix-ui/[email protected]":+ version "1.1.0"+ resolved "https://registry.yarnpkg.com/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.0.tgz#bce938ca413675bc937944b0d01ef6f4a6dc5bf1"+ integrity sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw==-"@radix-ui/[email protected]":- version "1.0.1"- resolved "https://registry.yarnpkg.com/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.0.1.tgz#ecd2ced34e6330caf89a82854aa2f77e07440286"- integrity sha512-Svl5GY5FQeN758fWKrjM6Qb7asvXeiZltlT4U2gVfl8Gx5UAv2sMR0LWo8yhsIZh2oQ0eFdZ59aoOOMV7b47VA==+"@radix-ui/[email protected]":+ version "1.1.0"+ resolved "https://registry.yarnpkg.com/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.1.0.tgz#1321446857bb786917df54c0d4d084877aab04b0"+ integrity sha512-MtfMVJiSr2NjzS0Aa90NPTnvTSg6C/JLCV7ma0W6+OMV78vd8OyRpID+Ng9LxzsPbLeuBnWBA1Nq30AtBIDChw==dependencies:- "@babel/runtime" "^7.13.10"- "@radix-ui/react-use-callback-ref" "1.0.1"+ "@radix-ui/react-use-callback-ref" "1.1.0"-"@radix-ui/[email protected]":- version "1.0.3"- resolved "https://registry.yarnpkg.com/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.0.3.tgz#217b840c250541609c66f67ed7bab2b733620755"- integrity sha512-vyL82j40hcFicA+M4Ex7hVkB9vHgSse1ZWomAqV2Je3RleKGO5iM8KMOEtfoSB0PnIelMd2lATjTGMYqN5ylTg==+"@radix-ui/[email protected]":+ version "1.1.0"+ resolved "https://registry.yarnpkg.com/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.1.0.tgz#31a5b87c3b726504b74e05dac1edce7437b98754"+ integrity sha512-L7vwWlR1kTTQ3oh7g1O0CBF3YCyyTj8NmhLR+phShpyA50HCfBFKVJTpshm9PzLiKmehsrQzTYTpX9HvmC9rhw==dependencies:- "@babel/runtime" "^7.13.10"- "@radix-ui/react-use-callback-ref" "1.0.1"+ "@radix-ui/react-use-callback-ref" "1.1.0"-"@radix-ui/[email protected]":- version "1.0.1"- resolved "https://registry.yarnpkg.com/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.0.1.tgz#be8c7bc809b0c8934acf6657b577daf948a75399"- integrity sha512-v/5RegiJWYdoCvMnITBkNNx6bCj20fiaJnWtRkU18yITptraXjffz5Qbn05uOiQnOvi+dbkznkoaMltz1GnszQ==- dependencies:- "@babel/runtime" "^7.13.10"+"@radix-ui/[email protected]":+ version "1.1.0"+ resolved "https://registry.yarnpkg.com/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.0.tgz#3c2c8ce04827b26a39e442ff4888d9212268bd27"+ integrity sha512-+FPE0rOdziWSrH9athwI1R0HDVbWlEhd+FR+aSDk4uWGmSJ9Z54sdZVDQPZAinJhJXwfT+qnj969mCsT2gfm5w=="@rushstack/eslint-patch@^1.1.3":version "1.2.0"@@ -5370,20 +5342,20 @@ react-redux@^7.0.3:prop-types "^15.7.2"react-is "^17.0.2"-react-remove-scroll-bar@^2.3.3:- version "2.3.4"- resolved "https://registry.yarnpkg.com/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.4.tgz#53e272d7a5cb8242990c7f144c44d8bd8ab5afd9"- integrity sha512-63C4YQBUt0m6ALadE9XV56hV8BgJWDmmTPY758iIJjfQKt2nYwoUrPk0LXRXcB/yIj82T1/Ixfdpdk68LwIB0A==+react-remove-scroll-bar@^2.3.6:+ version "2.3.6"+ resolved "https://registry.yarnpkg.com/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.6.tgz#3e585e9d163be84a010180b18721e851ac81a29c"+ integrity sha512-DtSYaao4mBmX+HDo5YWYdBWQwYIQQshUV/dVxFxK+KM26Wjwp1gZ6rv6OC3oujI6Bfu6Xyg3TwK533AQutsn/g==dependencies:react-style-singleton "^2.2.1"tslib "^2.0.0"- version "2.5.5"- resolved "https://registry.yarnpkg.com/react-remove-scroll/-/react-remove-scroll-2.5.5.tgz#1e31a1260df08887a8a0e46d09271b52b3a37e77"- integrity sha512-ImKhrzJJsyXJfBZ4bzu8Bwpka14c/fQt0k+cyFp/PBhTfyDnU5hjOtM4AG/0AMyy8oKzOTR0lDgJIM7pYXI0kw==+ version "2.6.0"+ resolved "https://registry.yarnpkg.com/react-remove-scroll/-/react-remove-scroll-2.6.0.tgz#fb03a0845d7768a4f1519a99fdb84983b793dc07"+ integrity sha512-I2U4JVEsQenxDAKaVa3VZ/JeJZe0/2DxPWL8Tj8yLKctQJQiZM52pn/GWFpSp8dftjM3pSAHVJZscAnC/y+ySQ==dependencies:- react-remove-scroll-bar "^2.3.3"+ react-remove-scroll-bar "^2.3.6"react-style-singleton "^2.2.1"tslib "^2.1.0"use-callback-ref "^1.3.0"@@ -6311,12 +6283,12 @@ v8-compile-cache-lib@^3.0.1:resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==-vaul@^0.9.1:- version "0.9.1"- resolved "https://registry.yarnpkg.com/vaul/-/vaul-0.9.1.tgz#3640198e04636b209b1f907fcf3079bec6ecc66b"- integrity sha512-fAhd7i4RNMinx+WEm6pF3nOl78DFkAazcN04ElLPFF9BMCNGbY/kou8UMhIcicm0rJCNePJP0Yyza60gGOD0Jw==+vaul@^1.1.1:+ version "1.1.1"+ resolved "https://registry.yarnpkg.com/vaul/-/vaul-1.1.1.tgz#93aceaad16f7c53aacf28a2609b2dd43b5a91fa0"+ integrity sha512-+ejzF6ffQKPcfgS7uOrGn017g39F8SO4yLPXbBhpC7a0H+oPqPna8f1BUfXaz8eU4+pxbQcmjxW+jWBSbxjaFg==dependencies:- "@radix-ui/react-dialog" "^1.0.4"+ "@radix-ui/react-dialog" "^1.1.1"version "1.10.0"