Skip to content

⚡️⚡️⚡️ Self-hosted collaborative bookmark manager to collect, read, annotate, and fully preserve what matters, all in one place.

move react-query to the @linkwarden/router package

daniel31x13f3c8647ff21b
diff --git a/apps/web/components/CollectionCard.tsx b/apps/web/components/CollectionCard.tsx
index 498e6f18..4ecfe28a 100644
--- a/apps/web/components/CollectionCard.tsx
+++ b/apps/web/components/CollectionCard.tsx
@@ -13,7 +13,7 @@ import EditCollectionSharingModal from "./ModalContent/EditCollectionSharingModa
import DeleteCollectionModal from "./ModalContent/DeleteCollectionModal";
import { dropdownTriggerer } from "@/lib/client/utils";
import { useTranslation } from "next-i18next";
-import { useUser } from "@/hooks/store/user";
+import { useUser } from "@linkwarden/router/user";
export default function CollectionCard({
collection,
diff --git a/apps/web/components/CollectionListing.tsx b/apps/web/components/CollectionListing.tsx
index f9e52573..315cde17 100644
--- a/apps/web/components/CollectionListing.tsx
+++ b/apps/web/components/CollectionListing.tsx
@@ -15,8 +15,11 @@ import { CollectionIncludingMembersAndLinkCount } from "@linkwarden/types";
import { useRouter } from "next/router";
import toast from "react-hot-toast";
import { useTranslation } from "next-i18next";
-import { useCollections, useUpdateCollection } from "@/hooks/store/collections";
-import { useUpdateUser, useUser } from "@/hooks/store/user";
+import {
+ useCollections,
+ useUpdateCollection,
+} from "@linkwarden/router/collections";
+import { useUpdateUser, useUser } from "@linkwarden/router/user";
import Icon from "./Icon";
import { IconWeight } from "@phosphor-icons/react";
diff --git a/apps/web/components/InputSelect/CollectionSelection.tsx b/apps/web/components/InputSelect/CollectionSelection.tsx
index 1a3e3ac2..82a33bbc 100644
--- a/apps/web/components/InputSelect/CollectionSelection.tsx
+++ b/apps/web/components/InputSelect/CollectionSelection.tsx
@@ -1,10 +1,10 @@
import { useRouter } from "next/router";
import { useEffect, useState } from "react";
import { styles } from "./styles";
-import { Option } from "./types";
+import { Option } from "@linkwarden/types/inputSelect";
import CreatableSelect from "react-select/creatable";
import Select from "react-select";
-import { useCollections } from "@/hooks/store/collections";
+import { useCollections } from "@linkwarden/router/collections";
import clsx from "clsx";
type Props = {
diff --git a/apps/web/components/InputSelect/TagSelection.tsx b/apps/web/components/InputSelect/TagSelection.tsx
index 46042030..3d818f0b 100644
--- a/apps/web/components/InputSelect/TagSelection.tsx
+++ b/apps/web/components/InputSelect/TagSelection.tsx
@@ -1,8 +1,8 @@
import { useEffect, useState } from "react";
import CreatableSelect from "react-select/creatable";
import { styles } from "./styles";
-import { ArchivalTagOption, Option } from "./types";
-import { useTags } from "@/hooks/store/tags";
+import { ArchivalTagOption, Option } from "@linkwarden/types/inputSelect";
+import { useTags } from "@linkwarden/router/tags";
import { useTranslation } from "next-i18next";
type Props = {
diff --git a/apps/web/components/LinkDetails.tsx b/apps/web/components/LinkDetails.tsx
index 07807b8c..a072e229 100644
--- a/apps/web/components/LinkDetails.tsx
+++ b/apps/web/components/LinkDetails.tsx
@@ -12,8 +12,12 @@ import PreservedFormatRow from "@/components/PreserverdFormatRow";
import getPublicUserData from "@/lib/client/getPublicUserData";
import { useTranslation } from "next-i18next";
import { BeatLoader } from "react-spinners";
-import { useUser } from "@/hooks/store/user";
-import { useGetLink, useUpdateLink, useUpdateFile } from "@/hooks/store/links";
+import { useUser } from "@linkwarden/router/user";
+import {
+ useGetLink,
+ useUpdateLink,
+ useUpdateFile,
+} from "@linkwarden/router/links";
import LinkIcon from "./LinkViews/LinkComponents/LinkIcon";
import CopyButton from "./CopyButton";
import { useRouter } from "next/router";
diff --git a/apps/web/components/LinkListOptions.tsx b/apps/web/components/LinkListOptions.tsx
index 49974620..bd2138f0 100644
--- a/apps/web/components/LinkListOptions.tsx
+++ b/apps/web/components/LinkListOptions.tsx
@@ -8,7 +8,7 @@ import useCollectivePermissions from "@/hooks/useCollectivePermissions";
import { useRouter } from "next/router";
import useLinkStore from "@/store/links";
import { Sort, ViewMode } from "@linkwarden/types";
-import { useBulkDeleteLinks, useLinks } from "@/hooks/store/links";
+import { useBulkDeleteLinks, useLinks } from "@linkwarden/router/links";
import toast from "react-hot-toast";
type Props = {
diff --git a/apps/web/components/LinkViews/LinkComponents/LinkActions.tsx b/apps/web/components/LinkViews/LinkComponents/LinkActions.tsx
index 8c08a7de..253c4dfa 100644
--- a/apps/web/components/LinkViews/LinkComponents/LinkActions.tsx
+++ b/apps/web/components/LinkViews/LinkComponents/LinkActions.tsx
@@ -7,7 +7,7 @@ import usePermissions from "@/hooks/usePermissions";
import DeleteLinkModal from "@/components/ModalContent/DeleteLinkModal";
import { dropdownTriggerer } from "@/lib/client/utils";
import { useTranslation } from "next-i18next";
-import { useDeleteLink, useGetLink } from "@/hooks/store/links";
+import { useDeleteLink, useGetLink } from "@linkwarden/router/links";
import toast from "react-hot-toast";
import LinkModal from "@/components/ModalContent/LinkModal";
import { useRouter } from "next/router";
diff --git a/apps/web/components/LinkViews/LinkComponents/LinkCard.tsx b/apps/web/components/LinkViews/LinkComponents/LinkCard.tsx
index bcfed867..9ae5a150 100644
--- a/apps/web/components/LinkViews/LinkComponents/LinkCard.tsx
+++ b/apps/web/components/LinkViews/LinkComponents/LinkCard.tsx
@@ -20,9 +20,9 @@ import usePermissions from "@/hooks/usePermissions";
import toast from "react-hot-toast";
import LinkTypeBadge from "./LinkTypeBadge";
import { useTranslation } from "next-i18next";
-import { useCollections } from "@/hooks/store/collections";
-import { useUser } from "@/hooks/store/user";
-import { useGetLink, useLinks } from "@/hooks/store/links";
+import { useCollections } from "@linkwarden/router/collections";
+import { useUser } from "@linkwarden/router/user";
+import { useGetLink, useLinks } from "@linkwarden/router/links";
import { useRouter } from "next/router";
import useLocalSettingsStore from "@/store/localSettings";
import LinkPin from "./LinkPin";
diff --git a/apps/web/components/LinkViews/LinkComponents/LinkList.tsx b/apps/web/components/LinkViews/LinkComponents/LinkList.tsx
index e4f569fe..6aff4ff2 100644
--- a/apps/web/components/LinkViews/LinkComponents/LinkList.tsx
+++ b/apps/web/components/LinkViews/LinkComponents/LinkList.tsx
@@ -14,9 +14,9 @@ import usePermissions from "@/hooks/usePermissions";
import toast from "react-hot-toast";
import LinkTypeBadge from "./LinkTypeBadge";
import { useTranslation } from "next-i18next";
-import { useCollections } from "@/hooks/store/collections";
-import { useUser } from "@/hooks/store/user";
-import { useLinks } from "@/hooks/store/links";
+import { useCollections } from "@linkwarden/router/collections";
+import { useUser } from "@linkwarden/router/user";
+import { useLinks } from "@linkwarden/router/links";
import useLocalSettingsStore from "@/store/localSettings";
import LinkPin from "./LinkPin";
import { useRouter } from "next/router";
diff --git a/apps/web/components/LinkViews/LinkComponents/LinkMasonry.tsx b/apps/web/components/LinkViews/LinkComponents/LinkMasonry.tsx
index 40ef522f..6eebd481 100644
--- a/apps/web/components/LinkViews/LinkComponents/LinkMasonry.tsx
+++ b/apps/web/components/LinkViews/LinkComponents/LinkMasonry.tsx
@@ -21,9 +21,9 @@ import usePermissions from "@/hooks/usePermissions";
import toast from "react-hot-toast";
import LinkTypeBadge from "./LinkTypeBadge";
import { useTranslation } from "next-i18next";
-import { useCollections } from "@/hooks/store/collections";
-import { useUser } from "@/hooks/store/user";
-import { useGetLink, useLinks } from "@/hooks/store/links";
+import { useCollections } from "@linkwarden/router/collections";
+import { useUser } from "@linkwarden/router/user";
+import { useGetLink, useLinks } from "@linkwarden/router/links";
import useLocalSettingsStore from "@/store/localSettings";
import clsx from "clsx";
import LinkPin from "./LinkPin";
diff --git a/apps/web/components/ModalContent/BulkDeleteLinksModal.tsx b/apps/web/components/ModalContent/BulkDeleteLinksModal.tsx
index 22d402bd..5a2b3e96 100644
--- a/apps/web/components/ModalContent/BulkDeleteLinksModal.tsx
+++ b/apps/web/components/ModalContent/BulkDeleteLinksModal.tsx
@@ -3,7 +3,7 @@ import useLinkStore from "@/store/links";
import Modal from "../Modal";
import Button from "../ui/Button";
import { useTranslation } from "next-i18next";
-import { useBulkDeleteLinks } from "@/hooks/store/links";
+import { useBulkDeleteLinks } from "@linkwarden/router/links";
import toast from "react-hot-toast";
type Props = {
diff --git a/apps/web/components/ModalContent/BulkEditLinksModal.tsx b/apps/web/components/ModalContent/BulkEditLinksModal.tsx
index cac58125..5e7c1f0c 100644
--- a/apps/web/components/ModalContent/BulkEditLinksModal.tsx
+++ b/apps/web/components/ModalContent/BulkEditLinksModal.tsx
@@ -6,7 +6,7 @@ import { LinkIncludingShortenedCollectionAndTags } from "@linkwarden/types";
import toast from "react-hot-toast";
import Modal from "../Modal";
import { useTranslation } from "next-i18next";
-import { useBulkEditLinks } from "@/hooks/store/links";
+import { useBulkEditLinks } from "@linkwarden/router/links";
type Props = {
onClose: Function;
diff --git a/apps/web/components/ModalContent/DeleteCollectionModal.tsx b/apps/web/components/ModalContent/DeleteCollectionModal.tsx
index 1cf7df38..352f6123 100644
--- a/apps/web/components/ModalContent/DeleteCollectionModal.tsx
+++ b/apps/web/components/ModalContent/DeleteCollectionModal.tsx
@@ -6,7 +6,7 @@ import usePermissions from "@/hooks/usePermissions";
import Modal from "../Modal";
import Button from "../ui/Button";
import { useTranslation } from "next-i18next";
-import { useDeleteCollection } from "@/hooks/store/collections";
+import { useDeleteCollection } from "@linkwarden/router/collections";
import toast from "react-hot-toast";
type Props = {
diff --git a/apps/web/components/ModalContent/DeleteLinkModal.tsx b/apps/web/components/ModalContent/DeleteLinkModal.tsx
index 41d7aa6a..b4a4b267 100644
--- a/apps/web/components/ModalContent/DeleteLinkModal.tsx
+++ b/apps/web/components/ModalContent/DeleteLinkModal.tsx
@@ -4,7 +4,7 @@ import Modal from "../Modal";
import { useRouter } from "next/router";
import Button from "../ui/Button";
import { useTranslation } from "next-i18next";
-import { useDeleteLink } from "@/hooks/store/links";
+import { useDeleteLink } from "@linkwarden/router/links";
import toast from "react-hot-toast";
type Props = {
diff --git a/apps/web/components/ModalContent/DeleteRssSubscriptionModal.tsx b/apps/web/components/ModalContent/DeleteRssSubscriptionModal.tsx
index 8068c589..5b49685d 100644
--- a/apps/web/components/ModalContent/DeleteRssSubscriptionModal.tsx
+++ b/apps/web/components/ModalContent/DeleteRssSubscriptionModal.tsx
@@ -4,7 +4,7 @@ import Button from "../ui/Button";
import { useTranslation } from "next-i18next";
import toast from "react-hot-toast";
import { RssSubscription } from "@linkwarden/prisma/client";
-import { useDeleteRssSubscription } from "@/hooks/store/rss";
+import { useDeleteRssSubscription } from "@linkwarden/router/rss";
type Props = {
onClose: Function;
diff --git a/apps/web/components/ModalContent/DeleteUserModal.tsx b/apps/web/components/ModalContent/DeleteUserModal.tsx
index 7bf5489a..118947b3 100644
--- a/apps/web/components/ModalContent/DeleteUserModal.tsx
+++ b/apps/web/components/ModalContent/DeleteUserModal.tsx
@@ -1,10 +1,10 @@
import Modal from "../Modal";
import Button from "../ui/Button";
import { useTranslation } from "next-i18next";
-import { useDeleteUser } from "@/hooks/store/admin/users";
+import { useDeleteUser } from "@linkwarden/router/admin/users";
import { useState } from "react";
import { useSession } from "next-auth/react";
-import { useConfig } from "@/hooks/store/config";
+import { useConfig } from "@linkwarden/router/config";
type Props = {
onClose: Function;
diff --git a/apps/web/components/ModalContent/EditCollectionModal.tsx b/apps/web/components/ModalContent/EditCollectionModal.tsx
index d16ac2a6..d95e00a6 100644
--- a/apps/web/components/ModalContent/EditCollectionModal.tsx
+++ b/apps/web/components/ModalContent/EditCollectionModal.tsx
@@ -3,7 +3,7 @@ import TextInput from "@/components/TextInput";
import { CollectionIncludingMembersAndLinkCount } from "@linkwarden/types";
import Modal from "../Modal";
import { useTranslation } from "next-i18next";
-import { useUpdateCollection } from "@/hooks/store/collections";
+import { useUpdateCollection } from "@linkwarden/router/collections";
import toast from "react-hot-toast";
import IconPicker from "../IconPicker";
import { IconWeight } from "@phosphor-icons/react";
diff --git a/apps/web/components/ModalContent/EditCollectionSharingModal.tsx b/apps/web/components/ModalContent/EditCollectionSharingModal.tsx
index a1141b13..0ceabf8d 100644
--- a/apps/web/components/ModalContent/EditCollectionSharingModal.tsx
+++ b/apps/web/components/ModalContent/EditCollectionSharingModal.tsx
@@ -13,8 +13,8 @@ import addMemberToCollection from "@/lib/client/addMemberToCollection";
import Modal from "../Modal";
import { dropdownTriggerer } from "@/lib/client/utils";
import { useTranslation } from "next-i18next";
-import { useUpdateCollection } from "@/hooks/store/collections";
-import { useUser } from "@/hooks/store/user";
+import { useUpdateCollection } from "@linkwarden/router/collections";
+import { useUser } from "@linkwarden/router/user";
import CopyButton from "../CopyButton";
import { useRouter } from "next/router";
diff --git a/apps/web/components/ModalContent/InviteModal.tsx b/apps/web/components/ModalContent/InviteModal.tsx
index eb488db8..0dba2857 100644
--- a/apps/web/components/ModalContent/InviteModal.tsx
+++ b/apps/web/components/ModalContent/InviteModal.tsx
@@ -3,7 +3,7 @@ import Modal from "../Modal";
import TextInput from "../TextInput";
import { FormEvent, useState } from "react";
import { useTranslation, Trans } from "next-i18next";
-import { useAddUser } from "@/hooks/store/admin/users";
+import { useAddUser } from "@linkwarden/router/admin/users";
import Link from "next/link";
import { signIn } from "next-auth/react";
diff --git a/apps/web/components/ModalContent/LinkModal.tsx b/apps/web/components/ModalContent/LinkModal.tsx
index 304fa546..52b2cd86 100644
--- a/apps/web/components/ModalContent/LinkModal.tsx
+++ b/apps/web/components/ModalContent/LinkModal.tsx
@@ -1,7 +1,7 @@
import React, { useState } from "react";
import { LinkIncludingShortenedCollectionAndTags } from "@linkwarden/types";
import { useTranslation } from "next-i18next";
-import { useDeleteLink } from "@/hooks/store/links";
+import { useDeleteLink } from "@linkwarden/router/links";
import Drawer from "../Drawer";
import LinkDetails from "../LinkDetails";
import Link from "next/link";
diff --git a/apps/web/components/ModalContent/NewCollectionModal.tsx b/apps/web/components/ModalContent/NewCollectionModal.tsx
index 559c56f4..06a1c085 100644
--- a/apps/web/components/ModalContent/NewCollectionModal.tsx
+++ b/apps/web/components/ModalContent/NewCollectionModal.tsx
@@ -4,7 +4,7 @@ import { Collection } from "@linkwarden/prisma/client";
import Modal from "../Modal";
import { CollectionIncludingMembersAndLinkCount } from "@linkwarden/types";
import { useTranslation } from "next-i18next";
-import { useCreateCollection } from "@/hooks/store/collections";
+import { useCreateCollection } from "@linkwarden/router/collections";
import toast from "react-hot-toast";
import IconPicker from "../IconPicker";
import { IconWeight } from "@phosphor-icons/react";
diff --git a/apps/web/components/ModalContent/NewLinkModal.tsx b/apps/web/components/ModalContent/NewLinkModal.tsx
index 0f844a86..232ebfc6 100644
--- a/apps/web/components/ModalContent/NewLinkModal.tsx
+++ b/apps/web/components/ModalContent/NewLinkModal.tsx
@@ -6,10 +6,10 @@ import unescapeString from "@/lib/client/unescapeString";
import { useRouter } from "next/router";
import Modal from "../Modal";
import { useTranslation } from "next-i18next";
-import { useCollections } from "@/hooks/store/collections";
-import { useAddLink } from "@/hooks/store/links";
+import { useCollections } from "@linkwarden/router/collections";
+import { useAddLink } from "@linkwarden/router/links";
import toast from "react-hot-toast";
-import { PostLinkSchemaType } from "@/lib/shared/schemaValidation";
+import { PostLinkSchemaType } from "@linkwarden/lib/schemaValidation";
type Props = {
onClose: Function;
diff --git a/apps/web/components/ModalContent/NewRssSubscriptionModal.tsx b/apps/web/components/ModalContent/NewRssSubscriptionModal.tsx
index 934c53cc..8e700819 100644
--- a/apps/web/components/ModalContent/NewRssSubscriptionModal.tsx
+++ b/apps/web/components/ModalContent/NewRssSubscriptionModal.tsx
@@ -1,7 +1,7 @@
import React, { useState } from "react";
import Modal from "../Modal";
import { useTranslation } from "next-i18next";
-import { useAddRssSubscription } from "@/hooks/store/rss";
+import { useAddRssSubscription } from "@linkwarden/router/rss";
import toast from "react-hot-toast";
import TextInput from "../TextInput";
import CollectionSelection from "../InputSelect/CollectionSelection";
diff --git a/apps/web/components/ModalContent/NewTokenModal.tsx b/apps/web/components/ModalContent/NewTokenModal.tsx
index fa9bd0ce..eba5b5cc 100644
--- a/apps/web/components/ModalContent/NewTokenModal.tsx
+++ b/apps/web/components/ModalContent/NewTokenModal.tsx
@@ -6,7 +6,7 @@ import Modal from "../Modal";
import { dropdownTriggerer } from "@/lib/client/utils";
import Button from "../ui/Button";
import { useTranslation } from "next-i18next";
-import { useAddToken } from "@/hooks/store/tokens";
+import { useAddToken } from "@linkwarden/router/tokens";
import CopyButton from "../CopyButton";
type Props = {
diff --git a/apps/web/components/ModalContent/NewUserModal.tsx b/apps/web/components/ModalContent/NewUserModal.tsx
index 29aa6a9a..060173a5 100644
--- a/apps/web/components/ModalContent/NewUserModal.tsx
+++ b/apps/web/components/ModalContent/NewUserModal.tsx
@@ -3,7 +3,7 @@ import Modal from "../Modal";
import TextInput from "../TextInput";
import { FormEvent, useState } from "react";
import { useTranslation, Trans } from "next-i18next";
-import { useAddUser } from "@/hooks/store/admin/users";
+import { useAddUser } from "@linkwarden/router/admin/users";
type Props = {
onClose: Function;
diff --git a/apps/web/components/ModalContent/RevokeTokenModal.tsx b/apps/web/components/ModalContent/RevokeTokenModal.tsx
index 9574c306..504822b5 100644
--- a/apps/web/components/ModalContent/RevokeTokenModal.tsx
+++ b/apps/web/components/ModalContent/RevokeTokenModal.tsx
@@ -3,7 +3,7 @@ import Modal from "../Modal";
import Button from "../ui/Button";
import { useTranslation } from "next-i18next";
import { AccessToken } from "@linkwarden/prisma/client";
-import { useRevokeToken } from "@/hooks/store/tokens";
+import { useRevokeToken } from "@linkwarden/router/tokens";
import toast from "react-hot-toast";
type Props = {
diff --git a/apps/web/components/ModalContent/UploadFileModal.tsx b/apps/web/components/ModalContent/UploadFileModal.tsx
index d5d83b91..a221020c 100644
--- a/apps/web/components/ModalContent/UploadFileModal.tsx
+++ b/apps/web/components/ModalContent/UploadFileModal.tsx
@@ -7,10 +7,10 @@ import { useRouter } from "next/router";
import toast from "react-hot-toast";
import Modal from "../Modal";
import { useTranslation } from "next-i18next";
-import { useCollections } from "@/hooks/store/collections";
-import { useUploadFile } from "@/hooks/store/links";
-import { PostLinkSchemaType } from "@/lib/shared/schemaValidation";
-import { useConfig } from "@/hooks/store/config";
+import { useCollections } from "@linkwarden/router/collections";
+import { useUploadFile } from "@linkwarden/router/links";
+import { PostLinkSchemaType } from "@linkwarden/lib/schemaValidation";
+import { useConfig } from "@linkwarden/router/config";
type Props = {
onClose: Function;
diff --git a/apps/web/components/Preservation/PreservationPageContent.tsx b/apps/web/components/Preservation/PreservationPageContent.tsx
index bd7e743e..3a281d12 100644
--- a/apps/web/components/Preservation/PreservationPageContent.tsx
+++ b/apps/web/components/Preservation/PreservationPageContent.tsx
@@ -1,6 +1,6 @@
import React, { useEffect } from "react";
import { useRouter } from "next/router";
-import { useGetLink } from "@/hooks/store/links";
+import { useGetLink } from "@linkwarden/router/links";
import { PreservationContent } from "./PreservationContent";
export default function PreservationPageContent() {
diff --git a/apps/web/components/Preservation/ReadableView.tsx b/apps/web/components/Preservation/ReadableView.tsx
index 4034fcf6..d58fe9b3 100644
--- a/apps/web/components/Preservation/ReadableView.tsx
+++ b/apps/web/components/Preservation/ReadableView.tsx
@@ -17,7 +17,7 @@ import {
useGetLinkHighlights,
usePostHighlight,
useRemoveHighlight,
-} from "@/hooks/store/highlights";
+} from "@linkwarden/router/highlights";
import { Highlight } from "@linkwarden/prisma/client";
type Props = {
diff --git a/apps/web/components/ProfileDropdown.tsx b/apps/web/components/ProfileDropdown.tsx
index 609a97e8..2551e470 100644
--- a/apps/web/components/ProfileDropdown.tsx
+++ b/apps/web/components/ProfileDropdown.tsx
@@ -4,8 +4,8 @@ import ProfilePhoto from "./ProfilePhoto";
import Link from "next/link";
import { signOut } from "next-auth/react";
import { useTranslation } from "next-i18next";
-import { useUser } from "@/hooks/store/user";
-import { useConfig } from "@/hooks/store/config";
+import { useUser } from "@linkwarden/router/user";
+import { useConfig } from "@linkwarden/router/config";
export default function ProfileDropdown() {
const { t } = useTranslation();
diff --git a/apps/web/components/SettingsSidebar.tsx b/apps/web/components/SettingsSidebar.tsx
index 0f24b52b..d088748c 100644
--- a/apps/web/components/SettingsSidebar.tsx
+++ b/apps/web/components/SettingsSidebar.tsx
@@ -2,8 +2,8 @@ import Link from "next/link";
import { useRouter } from "next/router";
import React, { useEffect, useState } from "react";
import { useTranslation } from "next-i18next";
-import { useUser } from "@/hooks/store/user";
-import { useConfig } from "@/hooks/store/config";
+import { useUser } from "@linkwarden/router/user";
+import { useConfig } from "@linkwarden/router/config";
export default function SettingsSidebar({ className }: { className?: string }) {
const { t } = useTranslation();
diff --git a/apps/web/components/Sidebar.tsx b/apps/web/components/Sidebar.tsx
index 645fda49..90d6a38e 100644
--- a/apps/web/components/Sidebar.tsx
+++ b/apps/web/components/Sidebar.tsx
@@ -5,8 +5,8 @@ import { Disclosure, Transition } from "@headlessui/react";
import SidebarHighlightLink from "@/components/SidebarHighlightLink";
import CollectionListing from "@/components/CollectionListing";
import { useTranslation } from "next-i18next";
-import { useCollections } from "@/hooks/store/collections";
-import { useTags } from "@/hooks/store/tags";
+import { useCollections } from "@linkwarden/router/collections";
+import { useTags } from "@linkwarden/router/tags";
export default function Sidebar({ className }: { className?: string }) {
const { t } = useTranslation();
diff --git a/apps/web/components/SortDropdown.tsx b/apps/web/components/SortDropdown.tsx
index ff01cbe9..77267676 100644
--- a/apps/web/components/SortDropdown.tsx
+++ b/apps/web/components/SortDropdown.tsx
@@ -3,7 +3,7 @@ import { Sort } from "@linkwarden/types";
import { dropdownTriggerer } from "@/lib/client/utils";
import { TFunction } from "i18next";
import useLocalSettingsStore from "@/store/localSettings";
-import { resetInfiniteQueryPagination } from "@/hooks/store/links";
+import { resetInfiniteQueryPagination } from "@linkwarden/router/links";
import { useQueryClient } from "@tanstack/react-query";
type Props = {
diff --git a/apps/web/components/UserListing.tsx b/apps/web/components/UserListing.tsx
index 626d64da..1d8ee7d5 100644
--- a/apps/web/components/UserListing.tsx
+++ b/apps/web/components/UserListing.tsx
@@ -1,5 +1,5 @@
import DeleteUserModal from "@/components/ModalContent/DeleteUserModal";
-import { useConfig } from "@/hooks/store/config";
+import { useConfig } from "@linkwarden/router/config";
import { User as U } from "@linkwarden/prisma/client";
import { TFunction } from "i18next";
diff --git a/apps/web/hooks/useArchivalTags.ts b/apps/web/hooks/useArchivalTags.ts
index 41a11e34..f3840e3d 100644
--- a/apps/web/hooks/useArchivalTags.ts
+++ b/apps/web/hooks/useArchivalTags.ts
@@ -1,8 +1,5 @@
import { Tag } from "@linkwarden/prisma/client";
-import {
- ArchivalOptionKeys,
- ArchivalTagOption,
-} from "../components/InputSelect/types";
+import { ArchivalOptionKeys, ArchivalTagOption } from "@linkwarden/types/types";
import { useState, useEffect } from "react";
import { useTranslation } from "react-i18next";
import { isArchivalTag } from "@linkwarden/lib";
diff --git a/apps/web/hooks/useCollectivePermissions.ts b/apps/web/hooks/useCollectivePermissions.ts
index 17393543..731169ca 100644
--- a/apps/web/hooks/useCollectivePermissions.ts
+++ b/apps/web/hooks/useCollectivePermissions.ts
@@ -1,7 +1,7 @@
import { Member } from "@linkwarden/types";
import { useEffect, useState } from "react";
-import { useCollections } from "./store/collections";
-import { useUser } from "./store/user";
+import { useCollections } from "@linkwarden/router/collections";
+import { useUser } from "@linkwarden/router/user";
export default function useCollectivePermissions(collectionIds: number[]) {
const { data: collections = [] } = useCollections();
diff --git a/apps/web/hooks/usePermissions.tsx b/apps/web/hooks/usePermissions.tsx
index 5f187e0c..db73a4fc 100644
--- a/apps/web/hooks/usePermissions.tsx
+++ b/apps/web/hooks/usePermissions.tsx
@@ -1,7 +1,7 @@
import { Member } from "@linkwarden/types";
import { useEffect, useState } from "react";
-import { useCollections } from "./store/collections";
-import { useUser } from "./store/user";
+import { useCollections } from "@linkwarden/router/collections";
+import { useUser } from "@linkwarden/router/user";
export default function usePermissions(collectionId: number) {
const { data: collections = [] } = useCollections();
diff --git a/apps/web/layouts/AuthRedirect.tsx b/apps/web/layouts/AuthRedirect.tsx
index 969427e7..54ec082c 100644
--- a/apps/web/layouts/AuthRedirect.tsx
+++ b/apps/web/layouts/AuthRedirect.tsx
@@ -2,7 +2,7 @@ import { ReactNode, useEffect, useState } from "react";
import { useRouter } from "next/router";
import { useSession } from "next-auth/react";
import useInitialData from "@/hooks/useInitialData";
-import { useUser } from "@/hooks/store/user";
+import { useUser } from "@linkwarden/router/user";
interface Props {
children: ReactNode;
diff --git a/apps/web/lib/api/controllers/collections/collectionId/updateCollectionById.ts b/apps/web/lib/api/controllers/collections/collectionId/updateCollectionById.ts
index 4a151dd5..4480da72 100644
--- a/apps/web/lib/api/controllers/collections/collectionId/updateCollectionById.ts
+++ b/apps/web/lib/api/controllers/collections/collectionId/updateCollectionById.ts
@@ -3,7 +3,7 @@ import getPermission from "@/lib/api/getPermission";
import {
UpdateCollectionSchema,
UpdateCollectionSchemaType,
-} from "@/lib/shared/schemaValidation";
+} from "@linkwarden/lib/schemaValidation";
export default async function updateCollection(
userId: number,
diff --git a/apps/web/lib/api/controllers/collections/postCollection.ts b/apps/web/lib/api/controllers/collections/postCollection.ts
index e789c01a..0602dff8 100644
--- a/apps/web/lib/api/controllers/collections/postCollection.ts
+++ b/apps/web/lib/api/controllers/collections/postCollection.ts
@@ -3,7 +3,7 @@ import { createFolder } from "@linkwarden/filesystem";
import {
PostCollectionSchema,
PostCollectionSchemaType,
-} from "@/lib/shared/schemaValidation";
+} from "@linkwarden/lib/schemaValidation";
export default async function postCollection(
body: PostCollectionSchemaType,
diff --git a/apps/web/lib/api/controllers/highlights/postOrUpdateHighlight.ts b/apps/web/lib/api/controllers/highlights/postOrUpdateHighlight.ts
index 04d99c60..bdd0a821 100644
--- a/apps/web/lib/api/controllers/highlights/postOrUpdateHighlight.ts
+++ b/apps/web/lib/api/controllers/highlights/postOrUpdateHighlight.ts
@@ -1,5 +1,5 @@
import { prisma } from "@linkwarden/prisma";
-import { PostHighlightSchemaType } from "@/lib/shared/schemaValidation";
+import { PostHighlightSchemaType } from "@linkwarden/lib/schemaValidation";
export default async function postOrUpdateHighlight(
userId: number,
diff --git a/apps/web/lib/api/controllers/links/bulk/updateLinks.ts b/apps/web/lib/api/controllers/links/bulk/updateLinks.ts
index 25bc0c22..1b0853e9 100644
--- a/apps/web/lib/api/controllers/links/bulk/updateLinks.ts
+++ b/apps/web/lib/api/controllers/links/bulk/updateLinks.ts
@@ -1,6 +1,6 @@
import { LinkIncludingShortenedCollectionAndTags } from "@linkwarden/types";
import updateLinkById from "../linkId/updateLinkById";
-import { UpdateLinkSchemaType } from "@/lib/shared/schemaValidation";
+import { UpdateLinkSchemaType } from "@linkwarden/lib/schemaValidation";
export default async function updateLinks(
userId: number,
diff --git a/apps/web/lib/api/controllers/links/linkId/updateLinkById.ts b/apps/web/lib/api/controllers/links/linkId/updateLinkById.ts
index c04f2308..5a3dabdd 100644
--- a/apps/web/lib/api/controllers/links/linkId/updateLinkById.ts
+++ b/apps/web/lib/api/controllers/links/linkId/updateLinkById.ts
@@ -6,7 +6,7 @@ import isValidUrl from "@/lib/shared/isValidUrl";
import {
UpdateLinkSchema,
UpdateLinkSchemaType,
-} from "@/lib/shared/schemaValidation";
+} from "@linkwarden/lib/schemaValidation";
export default async function updateLinkById(
userId: number,
diff --git a/apps/web/lib/api/controllers/links/postLink.ts b/apps/web/lib/api/controllers/links/postLink.ts
index 62a683dd..044c091b 100644
--- a/apps/web/lib/api/controllers/links/postLink.ts
+++ b/apps/web/lib/api/controllers/links/postLink.ts
@@ -5,7 +5,7 @@ import setCollection from "../../setCollection";
import {
PostLinkSchema,
PostLinkSchemaType,
-} from "@/lib/shared/schemaValidation";
+} from "@linkwarden/lib/schemaValidation";
import { hasPassedLimit } from "@linkwarden/lib";
export default async function postLink(
diff --git a/apps/web/lib/api/controllers/tags/createOrUpdateTags.ts b/apps/web/lib/api/controllers/tags/createOrUpdateTags.ts
index 79c860e9..fb4cabb3 100644
--- a/apps/web/lib/api/controllers/tags/createOrUpdateTags.ts
+++ b/apps/web/lib/api/controllers/tags/createOrUpdateTags.ts
@@ -1,5 +1,5 @@
import { prisma } from "@linkwarden/prisma";
-import { PostTagSchemaType } from "@/lib/shared/schemaValidation";
+import { PostTagSchemaType } from "@linkwarden/lib/schemaValidation";
import { TagIncludingLinkCount } from "@linkwarden/types";
export default async function createOrUpdateTags(
diff --git a/apps/web/lib/api/controllers/tags/tagId/updateTagById.ts b/apps/web/lib/api/controllers/tags/tagId/updateTagById.ts
index 9b184e9e..ae7fb101 100644
--- a/apps/web/lib/api/controllers/tags/tagId/updateTagById.ts
+++ b/apps/web/lib/api/controllers/tags/tagId/updateTagById.ts
@@ -2,7 +2,7 @@ import { prisma } from "@linkwarden/prisma";
import {
UpdateTagSchema,
UpdateTagSchemaType,
-} from "@/lib/shared/schemaValidation";
+} from "@linkwarden/lib/schemaValidation";
export default async function updateTagById(
userId: number,
diff --git a/apps/web/lib/api/controllers/tokens/postToken.ts b/apps/web/lib/api/controllers/tokens/postToken.ts
index dcc1317d..960e1a69 100644
--- a/apps/web/lib/api/controllers/tokens/postToken.ts
+++ b/apps/web/lib/api/controllers/tokens/postToken.ts
@@ -2,7 +2,7 @@ import { prisma } from "@linkwarden/prisma";
import {
PostTokenSchemaType,
PostTokenSchema,
-} from "@/lib/shared/schemaValidation";
+} from "@linkwarden/lib/schemaValidation";
import { TokenExpiry } from "@linkwarden/types";
import crypto from "crypto";
import { decode, encode } from "next-auth/jwt";
diff --git a/apps/web/lib/api/controllers/users/postUser.ts b/apps/web/lib/api/controllers/users/postUser.ts
index 732b99ca..03fefd4e 100644
--- a/apps/web/lib/api/controllers/users/postUser.ts
+++ b/apps/web/lib/api/controllers/users/postUser.ts
@@ -1,7 +1,7 @@
import { prisma } from "@linkwarden/prisma";
import type { NextApiRequest, NextApiResponse } from "next";
import bcrypt from "bcrypt";
-import { PostUserSchema } from "@/lib/shared/schemaValidation";
+import { PostUserSchema } from "@linkwarden/lib/schemaValidation";
import isAuthenticatedRequest from "../../isAuthenticatedRequest";
import { Subscription, User } from "@linkwarden/prisma/client";
diff --git a/apps/web/lib/api/controllers/users/userId/updateUserById.ts b/apps/web/lib/api/controllers/users/userId/updateUserById.ts
index 29d20fef..5ae28fd9 100644
--- a/apps/web/lib/api/controllers/users/userId/updateUserById.ts
+++ b/apps/web/lib/api/controllers/users/userId/updateUserById.ts
@@ -4,7 +4,7 @@ import bcrypt from "bcrypt";
import { removeFile, createFile, createFolder } from "@linkwarden/filesystem";
import sendChangeEmailVerificationRequest from "@/lib/api/sendChangeEmailVerificationRequest";
import { i18n } from "next-i18next.config";
-import { UpdateUserSchema } from "@/lib/shared/schemaValidation";
+import { UpdateUserSchema } from "@linkwarden/lib/schemaValidation";
const emailEnabled =
process.env.EMAIL_FROM && process.env.EMAIL_SERVER ? true : false;
diff --git a/apps/web/lib/client/pinLink.ts b/apps/web/lib/client/pinLink.ts
index e0cbecb0..09ef7805 100644
--- a/apps/web/lib/client/pinLink.ts
+++ b/apps/web/lib/client/pinLink.ts
@@ -1,8 +1,8 @@
-import { useUpdateLink } from "@/hooks/store/links";
+import { useUpdateLink } from "@linkwarden/router/links";
import { LinkIncludingShortenedCollectionAndTags } from "@linkwarden/types";
import toast from "react-hot-toast";
import { useTranslation } from "next-i18next";
-import { useUser } from "@/hooks/store/user";
+import { useUser } from "@linkwarden/router/user";
const usePinLink = () => {
const { t } = useTranslation();
diff --git a/apps/web/pages/admin.tsx b/apps/web/pages/admin.tsx
index f4082898..893de4d3 100644
--- a/apps/web/pages/admin.tsx
+++ b/apps/web/pages/admin.tsx
@@ -5,7 +5,7 @@ import { useState } from "react";
import { useTranslation } from "next-i18next";
import getServerSideProps from "@/lib/client/getServerSideProps";
import UserListing from "@/components/UserListing";
-import { useUsers } from "@/hooks/store/admin/users";
+import { useUsers } from "@linkwarden/router/admin/users";
import Divider from "@/components/ui/Divider";
interface User extends U {
diff --git a/apps/web/pages/api/v1/archives/[linkId].ts b/apps/web/pages/api/v1/archives/[linkId].ts
index c7383428..7a37be84 100644
--- a/apps/web/pages/api/v1/archives/[linkId].ts
+++ b/apps/web/pages/api/v1/archives/[linkId].ts
@@ -8,7 +8,7 @@ import verifyUser from "@/lib/api/verifyUser";
import getPermission from "@/lib/api/getPermission";
import { prisma } from "@linkwarden/prisma";
import { UsersAndCollections } from "@linkwarden/prisma/client";
-import { UploadFileSchema } from "@/lib/shared/schemaValidation";
+import { UploadFileSchema } from "@linkwarden/lib/schemaValidation";
import isDemoMode from "@/lib/api/isDemoMode";
import getSuffixFromFormat from "@/lib/shared/getSuffixFromFormat";
import { ArchivedFormat } from "@linkwarden/types";
diff --git a/apps/web/pages/api/v1/auth/forgot-password.ts b/apps/web/pages/api/v1/auth/forgot-password.ts
index 2f5d3852..34048206 100644
--- a/apps/web/pages/api/v1/auth/forgot-password.ts
+++ b/apps/web/pages/api/v1/auth/forgot-password.ts
@@ -1,6 +1,6 @@
import { prisma } from "@linkwarden/prisma";
import sendPasswordResetRequest from "@/lib/api/sendPasswordResetRequest";
-import { ForgotPasswordSchema } from "@/lib/shared/schemaValidation";
+import { ForgotPasswordSchema } from "@linkwarden/lib/schemaValidation";
import type { NextApiRequest, NextApiResponse } from "next";
export default async function forgotPassword(
diff --git a/apps/web/pages/api/v1/auth/reset-password.ts b/apps/web/pages/api/v1/auth/reset-password.ts
index d101d7c2..c263ffb4 100644
--- a/apps/web/pages/api/v1/auth/reset-password.ts
+++ b/apps/web/pages/api/v1/auth/reset-password.ts
@@ -1,7 +1,7 @@
import { prisma } from "@linkwarden/prisma";
import type { NextApiRequest, NextApiResponse } from "next";
import bcrypt from "bcrypt";
-import { ResetPasswordSchema } from "@/lib/shared/schemaValidation";
+import { ResetPasswordSchema } from "@linkwarden/lib/schemaValidation";
export default async function resetPassword(
req: NextApiRequest,
diff --git a/apps/web/pages/api/v1/auth/verify-email.ts b/apps/web/pages/api/v1/auth/verify-email.ts
index 615a7545..f32908bc 100644
--- a/apps/web/pages/api/v1/auth/verify-email.ts
+++ b/apps/web/pages/api/v1/auth/verify-email.ts
@@ -1,6 +1,6 @@
import { prisma } from "@linkwarden/prisma";
import updateCustomerEmail from "@/lib/api/stripe/updateCustomerEmail";
-import { VerifyEmailSchema } from "@/lib/shared/schemaValidation";
+import { VerifyEmailSchema } from "@linkwarden/lib/schemaValidation";
import type { NextApiRequest, NextApiResponse } from "next";
export default async function verifyEmail(
diff --git a/apps/web/pages/api/v1/highlights/index.ts b/apps/web/pages/api/v1/highlights/index.ts
index daf7c945..ab83ef7b 100644
--- a/apps/web/pages/api/v1/highlights/index.ts
+++ b/apps/web/pages/api/v1/highlights/index.ts
@@ -1,6 +1,6 @@
import type { NextApiRequest, NextApiResponse } from "next";
import verifyUser from "@/lib/api/verifyUser";
-import { PostHighlightSchema } from "@/lib/shared/schemaValidation";
+import { PostHighlightSchema } from "@linkwarden/lib/schemaValidation";
import postOrUpdateHighlight from "@/lib/api/controllers/highlights/postOrUpdateHighlight";
export default async function highlights(
diff --git a/apps/web/pages/api/v1/links/archive/index.ts b/apps/web/pages/api/v1/links/archive/index.ts
index 11b4c1d9..70479de4 100644
--- a/apps/web/pages/api/v1/links/archive/index.ts
+++ b/apps/web/pages/api/v1/links/archive/index.ts
@@ -1,7 +1,7 @@
import type { NextApiRequest, NextApiResponse } from "next";
import verifyUser from "@/lib/api/verifyUser";
import { prisma } from "@linkwarden/prisma";
-import { LinkArchiveActionSchema } from "@/lib/shared/schemaValidation";
+import { LinkArchiveActionSchema } from "@linkwarden/lib/schemaValidation";
import { removeFiles, removePreservationFiles } from "@linkwarden/filesystem";
import { ArchivalSettings } from "@linkwarden/types";
import { isArchivalTag } from "@linkwarden/lib";
diff --git a/apps/web/pages/api/v1/rss/index.ts b/apps/web/pages/api/v1/rss/index.ts
index 56dc7c69..38088f43 100644
--- a/apps/web/pages/api/v1/rss/index.ts
+++ b/apps/web/pages/api/v1/rss/index.ts
@@ -2,7 +2,7 @@ import { prisma } from "@linkwarden/prisma";
import { rssHandler } from "@linkwarden/lib";
import setCollection from "@/lib/api/setCollection";
import verifyUser from "@/lib/api/verifyUser";
-import { PostRssSubscriptionSchema } from "@/lib/shared/schemaValidation";
+import { PostRssSubscriptionSchema } from "@linkwarden/lib/schemaValidation";
import { NextApiRequest, NextApiResponse } from "next";
import Parser from "rss-parser";
diff --git a/apps/web/pages/api/v1/session/index.ts b/apps/web/pages/api/v1/session/index.ts
index 294c4ac0..aa8d1d3d 100644
--- a/apps/web/pages/api/v1/session/index.ts
+++ b/apps/web/pages/api/v1/session/index.ts
@@ -1,7 +1,7 @@
import type { NextApiRequest, NextApiResponse } from "next";
import verifyByCredentials from "@/lib/api/verifyByCredentials";
import createSession from "@/lib/api/controllers/session/createSession";
-import { PostSessionSchema } from "@/lib/shared/schemaValidation";
+import { PostSessionSchema } from "@linkwarden/lib/schemaValidation";
export default async function session(
req: NextApiRequest,
diff --git a/apps/web/pages/api/v1/tags/index.ts b/apps/web/pages/api/v1/tags/index.ts
index 5783e4a2..d616fc53 100644
--- a/apps/web/pages/api/v1/tags/index.ts
+++ b/apps/web/pages/api/v1/tags/index.ts
@@ -1,7 +1,7 @@
import type { NextApiRequest, NextApiResponse } from "next";
import getTags from "@/lib/api/controllers/tags/getTags";
import verifyUser from "@/lib/api/verifyUser";
-import { PostTagSchema } from "@/lib/shared/schemaValidation";
+import { PostTagSchema } from "@linkwarden/lib/schemaValidation";
import createOrUpdateTags from "@/lib/api/controllers/tags/createOrUpdateTags";
export default async function tags(req: NextApiRequest, res: NextApiResponse) {
diff --git a/apps/web/pages/collections/[id].tsx b/apps/web/pages/collections/[id].tsx
index 17ffe11d..05b5db98 100644
--- a/apps/web/pages/collections/[id].tsx
+++ b/apps/web/pages/collections/[id].tsx
@@ -20,9 +20,9 @@ import NewCollectionModal from "@/components/ModalContent/NewCollectionModal";
import getServerSideProps from "@/lib/client/getServerSideProps";
import { useTranslation } from "next-i18next";
import LinkListOptions from "@/components/LinkListOptions";
-import { useCollections } from "@/hooks/store/collections";
-import { useUser } from "@/hooks/store/user";
-import { useLinks } from "@/hooks/store/links";
+import { useCollections } from "@linkwarden/router/collections";
+import { useUser } from "@linkwarden/router/user";
+import { useLinks } from "@linkwarden/router/links";
import Links from "@/components/LinkViews/Links";
import Icon from "@/components/Icon";
import CollectionCard from "@/components/CollectionCard";
diff --git a/apps/web/pages/collections/index.tsx b/apps/web/pages/collections/index.tsx
index 02029c28..aeb4d799 100644
--- a/apps/web/pages/collections/index.tsx
+++ b/apps/web/pages/collections/index.tsx
@@ -9,7 +9,7 @@ import NewCollectionModal from "@/components/ModalContent/NewCollectionModal";
import PageHeader from "@/components/PageHeader";
import getServerSideProps from "@/lib/client/getServerSideProps";
import { useTranslation } from "next-i18next";
-import { useCollections } from "@/hooks/store/collections";
+import { useCollections } from "@linkwarden/router/collections";
import { dropdownTriggerer } from "@/lib/client/utils";
export default function Collections() {
diff --git a/apps/web/pages/dashboard.tsx b/apps/web/pages/dashboard.tsx
index 02608461..f43cba54 100644
--- a/apps/web/pages/dashboard.tsx
+++ b/apps/web/pages/dashboard.tsx
@@ -10,12 +10,12 @@ import PageHeader from "@/components/PageHeader";
import ViewDropdown from "@/components/ViewDropdown";
import getServerSideProps from "@/lib/client/getServerSideProps";
import { useTranslation } from "next-i18next";
-import { useCollections } from "@/hooks/store/collections";
-import { useTags } from "@/hooks/store/tags";
-import { useDashboardData } from "@/hooks/store/dashboardData";
+import { useCollections } from "@linkwarden/router/collections";
+import { useTags } from "@linkwarden/router/tags";
+import { useDashboardData } from "@linkwarden/router/dashboardData";
import Links from "@/components/LinkViews/Links";
import useLocalSettingsStore from "@/store/localSettings";
-import { useUpdateUser, useUser } from "@/hooks/store/user";
+import { useUpdateUser, useUser } from "@linkwarden/router/user";
import SurveyModal from "@/components/ModalContent/SurveyModal";
import ImportDropdown from "@/components/ImportDropdown";
diff --git a/apps/web/pages/links/[id].tsx b/apps/web/pages/links/[id].tsx
index bb697698..7b054109 100644
--- a/apps/web/pages/links/[id].tsx
+++ b/apps/web/pages/links/[id].tsx
@@ -1,5 +1,5 @@
import LinkDetails from "@/components/LinkDetails";
-import { useGetLink } from "@/hooks/store/links";
+import { useGetLink } from "@linkwarden/router/links";
import { useRouter } from "next/router";
import { useEffect, useState } from "react";
import getServerSideProps from "@/lib/client/getServerSideProps";
diff --git a/apps/web/pages/links/index.tsx b/apps/web/pages/links/index.tsx
index b9b6a546..366563d0 100644
--- a/apps/web/pages/links/index.tsx
+++ b/apps/web/pages/links/index.tsx
@@ -1,5 +1,5 @@
import NoLinksFound from "@/components/NoLinksFound";
-import { useLinks } from "@/hooks/store/links";
+import { useLinks } from "@linkwarden/router/links";
import MainLayout from "@/layouts/MainLayout";
import React, { useEffect, useState } from "react";
import PageHeader from "@/components/PageHeader";
diff --git a/apps/web/pages/links/pinned.tsx b/apps/web/pages/links/pinned.tsx
index 46f2fb12..1643648b 100644
--- a/apps/web/pages/links/pinned.tsx
+++ b/apps/web/pages/links/pinned.tsx
@@ -6,7 +6,7 @@ import { useRouter } from "next/router";
import { useTranslation } from "next-i18next";
import getServerSideProps from "@/lib/client/getServerSideProps";
import LinkListOptions from "@/components/LinkListOptions";
-import { useLinks } from "@/hooks/store/links";
+import { useLinks } from "@linkwarden/router/links";
import Links from "@/components/LinkViews/Links";
export default function PinnedLinks() {
diff --git a/apps/web/pages/member-onboarding.tsx b/apps/web/pages/member-onboarding.tsx
index fce49b5a..a2f61d57 100644
--- a/apps/web/pages/member-onboarding.tsx
+++ b/apps/web/pages/member-onboarding.tsx
@@ -7,7 +7,7 @@ import { FormEvent, useState } from "react";
import { toast } from "react-hot-toast";
import getServerSideProps from "@/lib/client/getServerSideProps";
import { Trans, useTranslation } from "next-i18next";
-import { useUpdateUser, useUser } from "@/hooks/store/user";
+import { useUpdateUser, useUser } from "@linkwarden/router/user";
interface FormData {
password: string;
diff --git a/apps/web/pages/public/collections/[id]/index.tsx b/apps/web/pages/public/collections/[id]/index.tsx
index 62ad2e2a..2f0e8ba4 100644
--- a/apps/web/pages/public/collections/[id]/index.tsx
+++ b/apps/web/pages/public/collections/[id]/index.tsx
@@ -20,9 +20,9 @@ import EditCollectionSharingModal from "@/components/ModalContent/EditCollection
import { useTranslation } from "next-i18next";
import getServerSideProps from "@/lib/client/getServerSideProps";
import LinkListOptions from "@/components/LinkListOptions";
-import { usePublicLinks } from "@/hooks/store/publicLinks";
+import { usePublicLinks } from "@linkwarden/router/publicLinks";
import Links from "@/components/LinkViews/Links";
-import { usePublicTags } from "@/hooks/store/publicTags";
+import { usePublicTags } from "@linkwarden/router/publicTags";
export default function PublicCollections() {
const { t } = useTranslation();
diff --git a/apps/web/pages/public/links/[id].tsx b/apps/web/pages/public/links/[id].tsx
index 6a340b35..4c764ede 100644
--- a/apps/web/pages/public/links/[id].tsx
+++ b/apps/web/pages/public/links/[id].tsx
@@ -1,5 +1,5 @@
import LinkDetails from "@/components/LinkDetails";
-import { useGetLink } from "@/hooks/store/links";
+import { useGetLink } from "@linkwarden/router/links";
import { useRouter } from "next/router";
import { useEffect } from "react";
import getServerSideProps from "@/lib/client/getServerSideProps";
diff --git a/apps/web/pages/register.tsx b/apps/web/pages/register.tsx
index 1bc3aedc..5ba45674 100644
--- a/apps/web/pages/register.tsx
+++ b/apps/web/pages/register.tsx
@@ -13,7 +13,7 @@ import { prisma } from "@linkwarden/prisma";
import { serverSideTranslations } from "next-i18next/serverSideTranslations";
import { i18n } from "next-i18next.config";
import { Trans, useTranslation } from "next-i18next";
-import { useConfig } from "@/hooks/store/config";
+import { useConfig } from "@linkwarden/router/config";
type FormData = {
name: string;
diff --git a/apps/web/pages/search.tsx b/apps/web/pages/search.tsx
index 4f5ec401..394563b6 100644
--- a/apps/web/pages/search.tsx
+++ b/apps/web/pages/search.tsx
@@ -1,4 +1,4 @@
-import { useLinks } from "@/hooks/store/links";
+import { useLinks } from "@linkwarden/router/links";
import MainLayout from "@/layouts/MainLayout";
import { Sort, ViewMode } from "@linkwarden/types";
import { useRouter } from "next/router";
diff --git a/apps/web/pages/settings/access-tokens.tsx b/apps/web/pages/settings/access-tokens.tsx
index ba267f2e..d0bde79b 100644
--- a/apps/web/pages/settings/access-tokens.tsx
+++ b/apps/web/pages/settings/access-tokens.tsx
@@ -5,7 +5,7 @@ import RevokeTokenModal from "@/components/ModalContent/RevokeTokenModal";
import { AccessToken } from "@linkwarden/prisma/client";
import { useTranslation } from "next-i18next";
import getServerSideProps from "@/lib/client/getServerSideProps";
-import { useTokens } from "@/hooks/store/tokens";
+import { useTokens } from "@linkwarden/router/tokens";
export default function AccessTokens() {
const [newTokenModal, setNewTokenModal] = useState(false);
diff --git a/apps/web/pages/settings/account.tsx b/apps/web/pages/settings/account.tsx
index e920e45a..ba76dde0 100644
--- a/apps/web/pages/settings/account.tsx
+++ b/apps/web/pages/settings/account.tsx
@@ -15,10 +15,10 @@ import Button from "@/components/ui/Button";
import { i18n } from "next-i18next.config";
import { useTranslation } from "next-i18next";
import getServerSideProps from "@/lib/client/getServerSideProps";
-import { useUpdateUser, useUser } from "@/hooks/store/user";
+import { useUpdateUser, useUser } from "@linkwarden/router/user";
import { z } from "zod";
import ImportDropdown from "@/components/ImportDropdown";
-import { useConfig } from "@/hooks/store/config";
+import { useConfig } from "@linkwarden/router/config";
export default function Account() {
const [emailChangeVerificationModal, setEmailChangeVerificationModal] =
diff --git a/apps/web/pages/settings/billing.tsx b/apps/web/pages/settings/billing.tsx
index ce89177d..666dee2b 100644
--- a/apps/web/pages/settings/billing.tsx
+++ b/apps/web/pages/settings/billing.tsx
@@ -5,9 +5,9 @@ import { User as U } from "@linkwarden/prisma/client";
import { useEffect, useState } from "react";
import { useTranslation } from "next-i18next";
import getServerSideProps from "@/lib/client/getServerSideProps";
-import { useUsers } from "@/hooks/store/admin/users";
+import { useUsers } from "@linkwarden/router/admin/users";
import DeleteUserModal from "@/components/ModalContent/DeleteUserModal";
-import { useUser } from "@/hooks/store/user";
+import { useUser } from "@linkwarden/router/user";
import { dropdownTriggerer } from "@/lib/client/utils";
import clsx from "clsx";
import { signIn } from "next-auth/react";
diff --git a/apps/web/pages/settings/delete.tsx b/apps/web/pages/settings/delete.tsx
index 0479d8fd..af89345b 100644
--- a/apps/web/pages/settings/delete.tsx
+++ b/apps/web/pages/settings/delete.tsx
@@ -7,7 +7,7 @@ import Link from "next/link";
import Button from "@/components/ui/Button";
import { useTranslation } from "next-i18next";
import getServerSideProps from "@/lib/client/getServerSideProps";
-import { useUser } from "@/hooks/store/user";
+import { useUser } from "@linkwarden/router/user";
export default function Delete() {
const [password, setPassword] = useState("");
diff --git a/apps/web/pages/settings/password.tsx b/apps/web/pages/settings/password.tsx
index dfe52452..c79f34e1 100644
--- a/apps/web/pages/settings/password.tsx
+++ b/apps/web/pages/settings/password.tsx
@@ -5,7 +5,7 @@ import { toast } from "react-hot-toast";
import TextInput from "@/components/TextInput";
import { useTranslation } from "next-i18next";
import getServerSideProps from "@/lib/client/getServerSideProps";
-import { useUpdateUser, useUser } from "@/hooks/store/user";
+import { useUpdateUser, useUser } from "@linkwarden/router/user";
export default function Password() {
const { t } = useTranslation();
diff --git a/apps/web/pages/settings/preference.tsx b/apps/web/pages/settings/preference.tsx
index 8e888863..8fd06a85 100644
--- a/apps/web/pages/settings/preference.tsx
+++ b/apps/web/pages/settings/preference.tsx
@@ -7,9 +7,9 @@ import useLocalSettingsStore from "@/store/localSettings";
import { useTranslation } from "next-i18next";
import getServerSideProps from "@/lib/client/getServerSideProps";
import { AiTaggingMethod, LinksRouteTo } from "@linkwarden/prisma/client";
-import { useUpdateUser, useUser } from "@/hooks/store/user";
-import { useConfig } from "@/hooks/store/config";
-import { useTags, useUpdateArchivalTags } from "@/hooks/store/tags";
+import { useUpdateUser, useUser } from "@linkwarden/router/user";
+import { useConfig } from "@linkwarden/router/config";
+import { useTags, useUpdateArchivalTags } from "@linkwarden/router/tags";
import { cn } from "@/lib/client/utils";
import TagSelection from "@/components/InputSelect/TagSelection";
import { useArchivalTags } from "@/hooks/useArchivalTags";
diff --git a/apps/web/pages/settings/rss-subscriptions.tsx b/apps/web/pages/settings/rss-subscriptions.tsx
index 94232787..f77575a1 100644
--- a/apps/web/pages/settings/rss-subscriptions.tsx
+++ b/apps/web/pages/settings/rss-subscriptions.tsx
@@ -1,12 +1,12 @@
import SettingsLayout from "@/layouts/SettingsLayout";
import { useTranslation } from "next-i18next";
import getServerSideProps from "@/lib/client/getServerSideProps";
-import { useRssSubscriptions } from "@/hooks/store/rss";
+import { useRssSubscriptions } from "@linkwarden/router/rss";
import DeleteRssSubscriptionModal from "@/components/ModalContent/DeleteRssSubscriptionModal";
import { useState } from "react";
import { RssSubscription } from "@linkwarden/prisma/client";
import NewRssSubscriptionModal from "@/components/ModalContent/NewRssSubscriptionModal";
-import { useConfig } from "@/hooks/store/config";
+import { useConfig } from "@linkwarden/router/config";
export default function RssSubscriptions() {
const { t } = useTranslation();
diff --git a/apps/web/pages/settings/worker.tsx b/apps/web/pages/settings/worker.tsx
index a90e95ee..4628d15a 100644
--- a/apps/web/pages/settings/worker.tsx
+++ b/apps/web/pages/settings/worker.tsx
@@ -4,7 +4,7 @@ import getServerSideProps from "@/lib/client/getServerSideProps";
import { useEffect, useState } from "react";
import ConfirmationModal from "@/components/ConfirmationModal";
import { useMutation, useQueryClient } from "@tanstack/react-query";
-import { LinkArchiveActionSchemaType } from "@/lib/shared/schemaValidation";
+import { LinkArchiveActionSchemaType } from "@linkwarden/lib/schemaValidation";
import toast from "react-hot-toast";
const useArchiveAction = () => {
diff --git a/apps/web/pages/subscribe.tsx b/apps/web/pages/subscribe.tsx
index f9dc22a7..da0e2e83 100644
--- a/apps/web/pages/subscribe.tsx
+++ b/apps/web/pages/subscribe.tsx
@@ -7,7 +7,7 @@ import { Plan } from "@linkwarden/types";
import Button from "@/components/ui/Button";
import getServerSideProps from "@/lib/client/getServerSideProps";
import { Trans, useTranslation } from "next-i18next";
-import { useUser } from "@/hooks/store/user";
+import { useUser } from "@linkwarden/router/user";
export default function Subscribe() {
const { t } = useTranslation();
diff --git a/apps/web/pages/tags/[id].tsx b/apps/web/pages/tags/[id].tsx
index ff408adf..b0e1aa2a 100644
--- a/apps/web/pages/tags/[id].tsx
+++ b/apps/web/pages/tags/[id].tsx
@@ -2,14 +2,14 @@ import { useRouter } from "next/router";
import { FormEvent, useEffect, useState } from "react";
import MainLayout from "@/layouts/MainLayout";
import { Sort, TagIncludingLinkCount, ViewMode } from "@linkwarden/types";
-import { useLinks } from "@/hooks/store/links";
+import { useLinks } from "@linkwarden/router/links";
import { dropdownTriggerer } from "@/lib/client/utils";
import BulkDeleteLinksModal from "@/components/ModalContent/BulkDeleteLinksModal";
import BulkEditLinksModal from "@/components/ModalContent/BulkEditLinksModal";
import { useTranslation } from "next-i18next";
import getServerSideProps from "@/lib/client/getServerSideProps";
import LinkListOptions from "@/components/LinkListOptions";
-import { useRemoveTag, useTags, useUpdateTag } from "@/hooks/store/tags";
+import { useRemoveTag, useTags, useUpdateTag } from "@linkwarden/router/tags";
import Links from "@/components/LinkViews/Links";
import toast from "react-hot-toast";
diff --git a/apps/web/lib/shared/schemaValidation.ts b/packages/lib/schemaValidation.ts
similarity index 100%
rename from apps/web/lib/shared/schemaValidation.ts
rename to packages/lib/schemaValidation.ts
diff --git a/apps/web/hooks/store/collections.tsx b/packages/router/collections.tsx
similarity index 100%
rename from apps/web/hooks/store/collections.tsx
rename to packages/router/collections.tsx
diff --git a/apps/web/hooks/store/config.tsx b/packages/router/config.tsx
similarity index 100%
rename from apps/web/hooks/store/config.tsx
rename to packages/router/config.tsx
diff --git a/apps/web/hooks/store/dashboardData.tsx b/packages/router/dashboardData.tsx
similarity index 100%
rename from apps/web/hooks/store/dashboardData.tsx
rename to packages/router/dashboardData.tsx
diff --git a/apps/web/hooks/store/highlights.tsx b/packages/router/highlights.tsx
similarity index 96%
rename from apps/web/hooks/store/highlights.tsx
rename to packages/router/highlights.tsx
index 567b85a4..f18f9a2d 100644
--- a/apps/web/hooks/store/highlights.tsx
+++ b/packages/router/highlights.tsx
@@ -6,7 +6,7 @@ import {
} from "@tanstack/react-query";
import { useSession } from "next-auth/react";
import { Highlight } from "@linkwarden/prisma/client";
-import { PostHighlightSchemaType } from "@/lib/shared/schemaValidation";
+import { PostHighlightSchemaType } from "@linkwarden/lib/schemaValidation";
const useGetLinkHighlights = (
linkId: number
diff --git a/apps/web/hooks/store/links.tsx b/packages/router/links.tsx
similarity index 99%
rename from apps/web/hooks/store/links.tsx
rename to packages/router/links.tsx
index 1222a751..06bcb875 100644
--- a/apps/web/hooks/store/links.tsx
+++ b/packages/router/links.tsx
@@ -11,7 +11,7 @@ import {
} from "@linkwarden/types";
import { useRouter } from "next/router";
import { useSession } from "next-auth/react";
-import { PostLinkSchemaType } from "@/lib/shared/schemaValidation";
+import { PostLinkSchemaType } from "@linkwarden/lib/schemaValidation";
import getFormatFromContentType from "@/lib/shared/getFormatFromContentType";
import getLinkTypeFromFormat from "@/lib/shared/getLinkTypeFromFormat";
diff --git a/packages/router/package.json b/packages/router/package.json
index 2bf2b8d5..90bada20 100644
--- a/packages/router/package.json
+++ b/packages/router/package.json
@@ -5,6 +5,12 @@
"main": "index.ts",
"dependencies": {
"@tanstack/react-query": "^5.51.15",
- "@tanstack/react-query-devtools": "^5.51.15"
+ "@tanstack/react-query-devtools": "^5.51.15",
+ "next-auth": "^4.22.1",
+ "next": "13.4.12",
+ "@linkwarden/lib": "*",
+ "@linkwarden/prisma": "*",
+ "@linkwarden/types": "*",
+ "react": "18.2.0"
}
}
diff --git a/apps/web/hooks/store/publicLinks.tsx b/packages/router/publicLinks.tsx
similarity index 100%
rename from apps/web/hooks/store/publicLinks.tsx
rename to packages/router/publicLinks.tsx
diff --git a/apps/web/hooks/store/publicTags.tsx b/packages/router/publicTags.tsx
similarity index 100%
rename from apps/web/hooks/store/publicTags.tsx
rename to packages/router/publicTags.tsx
diff --git a/apps/web/hooks/store/rss.tsx b/packages/router/rss.tsx
similarity index 100%
rename from apps/web/hooks/store/rss.tsx
rename to packages/router/rss.tsx
diff --git a/apps/web/hooks/store/tags.tsx b/packages/router/tags.tsx
similarity index 97%
rename from apps/web/hooks/store/tags.tsx
rename to packages/router/tags.tsx
index 608afca4..f49868b8 100644
--- a/apps/web/hooks/store/tags.tsx
+++ b/packages/router/tags.tsx
@@ -7,7 +7,7 @@ import {
import { TagIncludingLinkCount } from "@linkwarden/types";
import { useSession } from "next-auth/react";
import { Tag } from "@linkwarden/prisma/client";
-import { ArchivalTagOption } from "@/components/InputSelect/types";
+import { ArchivalTagOption } from "@linkwarden/types/inputSelect";
const useTags = (): UseQueryResult<Tag[], Error> => {
const { status } = useSession();
diff --git a/apps/web/hooks/store/tokens.tsx b/packages/router/tokens.tsx
similarity index 100%
rename from apps/web/hooks/store/tokens.tsx
rename to packages/router/tokens.tsx
diff --git a/apps/web/hooks/store/user.tsx b/packages/router/user.tsx
similarity index 100%
rename from apps/web/hooks/store/user.tsx
rename to packages/router/user.tsx
diff --git a/apps/web/hooks/store/admin/users.tsx b/packages/router/users.tsx
similarity index 100%
rename from apps/web/hooks/store/admin/users.tsx
rename to packages/router/users.tsx
diff --git a/apps/web/components/InputSelect/types.ts b/packages/types/inputSelect.ts
similarity index 100%
rename from apps/web/components/InputSelect/types.ts
rename to packages/types/inputSelect.ts