aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/mobile/app/dashboard/(tabs)/index.tsx4
-rw-r--r--apps/mobile/app/dashboard/(tabs)/search.tsx2
-rw-r--r--apps/mobile/app/dashboard/archive.tsx2
-rw-r--r--apps/mobile/app/dashboard/favourites.tsx6
-rw-r--r--apps/mobile/app/dashboard/lists/[slug].tsx6
-rw-r--r--apps/mobile/app/dashboard/tags/[slug].tsx6
-rw-r--r--apps/mobile/components/bookmarks/BookmarkList.tsx18
-rw-r--r--apps/web/app/dashboard/lists/[listId]/page.tsx12
-rw-r--r--apps/web/app/dashboard/tags/[tagName]/page.tsx2
-rw-r--r--apps/web/components/dashboard/bookmarks/AddToListModal.tsx5
-rw-r--r--apps/web/components/dashboard/bookmarks/TagsEditor.tsx1
-rw-r--r--apps/web/components/dashboard/lists/ListView.tsx26
12 files changed, 35 insertions, 55 deletions
diff --git a/apps/mobile/app/dashboard/(tabs)/index.tsx b/apps/mobile/app/dashboard/(tabs)/index.tsx
index 1a17d472..7f70af6b 100644
--- a/apps/mobile/app/dashboard/(tabs)/index.tsx
+++ b/apps/mobile/app/dashboard/(tabs)/index.tsx
@@ -2,9 +2,9 @@ import { Platform, SafeAreaView, View } from "react-native";
import * as Haptics from "expo-haptics";
import { useRouter } from "expo-router";
import BookmarkList from "@/components/bookmarks/BookmarkList";
+import PageTitle from "@/components/ui/PageTitle";
import { MenuView } from "@react-native-menu/menu";
import { SquarePen } from "lucide-react-native";
-import PageTitle from "@/components/ui/PageTitle";
function HeaderRight() {
const router = useRouter();
@@ -49,7 +49,7 @@ export default function Home() {
return (
<SafeAreaView>
<BookmarkList
- archived={false}
+ query={{ archived: false }}
header={
<View className="flex flex-row justify-between">
<PageTitle title="Home" />
diff --git a/apps/mobile/app/dashboard/(tabs)/search.tsx b/apps/mobile/app/dashboard/(tabs)/search.tsx
index 76e9aef9..25fc53d5 100644
--- a/apps/mobile/app/dashboard/(tabs)/search.tsx
+++ b/apps/mobile/app/dashboard/(tabs)/search.tsx
@@ -21,7 +21,7 @@ export default function Search() {
<SafeAreaView>
{data && (
<BookmarkList
- ids={data.bookmarks.map((b) => b.id)}
+ query={{ids: data.bookmarks.map((b) => b.id)}}
header={
<View>
<PageTitle title="Search" />
diff --git a/apps/mobile/app/dashboard/archive.tsx b/apps/mobile/app/dashboard/archive.tsx
index 5c86c6fc..98a03631 100644
--- a/apps/mobile/app/dashboard/archive.tsx
+++ b/apps/mobile/app/dashboard/archive.tsx
@@ -5,7 +5,7 @@ import PageTitle from "@/components/ui/PageTitle";
export default function Archive() {
return (
<SafeAreaView>
- <BookmarkList archived header={<PageTitle title="🗄️ Archive" />} />
+ <BookmarkList query={{archived: true}} header={<PageTitle title="🗄️ Archive" />} />
</SafeAreaView>
);
}
diff --git a/apps/mobile/app/dashboard/favourites.tsx b/apps/mobile/app/dashboard/favourites.tsx
index 6025d514..f62d561e 100644
--- a/apps/mobile/app/dashboard/favourites.tsx
+++ b/apps/mobile/app/dashboard/favourites.tsx
@@ -6,8 +6,10 @@ export default function Favourites() {
return (
<SafeAreaView>
<BookmarkList
- archived={false}
- favourited
+ query={{
+ archived: false,
+ favourited: true,
+ }}
header={<PageTitle title="⭐️ Favourites" />}
/>
</SafeAreaView>
diff --git a/apps/mobile/app/dashboard/lists/[slug].tsx b/apps/mobile/app/dashboard/lists/[slug].tsx
index 0d1c01dc..8596b49f 100644
--- a/apps/mobile/app/dashboard/lists/[slug].tsx
+++ b/apps/mobile/app/dashboard/lists/[slug].tsx
@@ -24,8 +24,10 @@ export default function ListView() {
{list ? (
<View>
<BookmarkList
- archived={false}
- ids={list.bookmarks}
+ query={{
+ archived: false,
+ listId: list.id,
+ }}
header={<PageTitle title={`${list.icon} ${list.name}`} />}
/>
</View>
diff --git a/apps/mobile/app/dashboard/tags/[slug].tsx b/apps/mobile/app/dashboard/tags/[slug].tsx
index 2d37b172..cb6e2ef4 100644
--- a/apps/mobile/app/dashboard/tags/[slug].tsx
+++ b/apps/mobile/app/dashboard/tags/[slug].tsx
@@ -25,8 +25,10 @@ export default function TagView() {
{tag ? (
<View>
<BookmarkList
- archived={false}
- ids={tag.bookmarks}
+ query={{
+ archived: false,
+ tagId: tag.id,
+ }}
header={<PageTitle title={tag.name} />}
/>
</View>
diff --git a/apps/mobile/components/bookmarks/BookmarkList.tsx b/apps/mobile/components/bookmarks/BookmarkList.tsx
index 04a3d922..e7b5e5f2 100644
--- a/apps/mobile/components/bookmarks/BookmarkList.tsx
+++ b/apps/mobile/components/bookmarks/BookmarkList.tsx
@@ -4,18 +4,16 @@ import Animated, { LinearTransition } from "react-native-reanimated";
import { api } from "@/lib/trpc";
import { useScrollToTop } from "@react-navigation/native";
+import type { ZGetBookmarksRequest } from "@hoarder/trpc/types/bookmarks";
+
import FullPageSpinner from "../ui/FullPageSpinner";
import BookmarkCard from "./BookmarkCard";
export default function BookmarkList({
- favourited,
- archived,
- ids,
- header
+ query,
+ header,
}: {
- favourited?: boolean;
- archived?: boolean;
- ids?: string[];
+ query: ZGetBookmarksRequest;
header?: React.ReactElement;
}) {
const apiUtils = api.useUtils();
@@ -23,11 +21,7 @@ export default function BookmarkList({
const flatListRef = useRef(null);
useScrollToTop(flatListRef);
const { data, isPending, isPlaceholderData } =
- api.bookmarks.getBookmarks.useQuery({
- favourited,
- archived,
- ids,
- });
+ api.bookmarks.getBookmarks.useQuery(query);
useEffect(() => {
setRefreshing(isPending || isPlaceholderData);
diff --git a/apps/web/app/dashboard/lists/[listId]/page.tsx b/apps/web/app/dashboard/lists/[listId]/page.tsx
index 4e35c377..b9a26053 100644
--- a/apps/web/app/dashboard/lists/[listId]/page.tsx
+++ b/apps/web/app/dashboard/lists/[listId]/page.tsx
@@ -1,6 +1,6 @@
import { notFound, redirect } from "next/navigation";
+import BookmarksGrid from "@/components/dashboard/bookmarks/BookmarksGrid";
import DeleteListButton from "@/components/dashboard/lists/DeleteListButton";
-import ListView from "@/components/dashboard/lists/ListView";
import { api } from "@/server/api/client";
import { getServerAuthSession } from "@/server/auth";
import { TRPCError } from "@trpc/server";
@@ -27,7 +27,10 @@ export default async function ListPage({
throw e;
}
- const bookmarks = await api.bookmarks.getBookmarks({ ids: list.bookmarks });
+ const bookmarks = await api.bookmarks.getBookmarks({
+ listId: list.id,
+ archived: false,
+ });
return (
<div className="container flex flex-col gap-3">
@@ -38,7 +41,10 @@ export default async function ListPage({
<DeleteListButton list={list} />
</div>
<hr />
- <ListView list={list} bookmarks={bookmarks.bookmarks} />
+ <BookmarksGrid
+ query={{ listId: list.id, archived: false }}
+ bookmarks={bookmarks.bookmarks}
+ />
</div>
);
}
diff --git a/apps/web/app/dashboard/tags/[tagName]/page.tsx b/apps/web/app/dashboard/tags/[tagName]/page.tsx
index 0c5c1c1f..dee29c5e 100644
--- a/apps/web/app/dashboard/tags/[tagName]/page.tsx
+++ b/apps/web/app/dashboard/tags/[tagName]/page.tsx
@@ -28,8 +28,8 @@ export default async function TagPage({
}
const query = {
- ids: tag.bookmarks,
archived: false,
+ tagId: tag.id,
};
const bookmarks = await api.bookmarks.getBookmarks(query);
diff --git a/apps/web/components/dashboard/bookmarks/AddToListModal.tsx b/apps/web/components/dashboard/bookmarks/AddToListModal.tsx
index 6242aa27..b8cce66d 100644
--- a/apps/web/components/dashboard/bookmarks/AddToListModal.tsx
+++ b/apps/web/components/dashboard/bookmarks/AddToListModal.tsx
@@ -52,7 +52,6 @@ export default function AddToListModal({
const { data: lists, isPending: isFetchingListsPending } =
api.lists.list.useQuery();
- const listInvalidationFunction = api.useUtils().lists.get.invalidate;
const bookmarksInvalidationFunction =
api.useUtils().bookmarks.getBookmarks.invalidate;
@@ -62,8 +61,8 @@ export default function AddToListModal({
toast({
description: "List has been updated!",
});
- listInvalidationFunction({ listId: req.listId });
- bookmarksInvalidationFunction();
+ setOpen(false);
+ bookmarksInvalidationFunction({ listId: req.listId });
},
onError: (e) => {
if (e.data?.code == "BAD_REQUEST") {
diff --git a/apps/web/components/dashboard/bookmarks/TagsEditor.tsx b/apps/web/components/dashboard/bookmarks/TagsEditor.tsx
index 8bfbce19..12c0dcd0 100644
--- a/apps/web/components/dashboard/bookmarks/TagsEditor.tsx
+++ b/apps/web/components/dashboard/bookmarks/TagsEditor.tsx
@@ -75,6 +75,7 @@ export function TagsEditor({ bookmark }: { bookmark: ZBookmark }) {
description: "Tags has been updated!",
});
bookmarkInvalidationFunction({ bookmarkId: bookmark.id });
+ // TODO(bug) Invalidate the tag views as well
},
onError: () => {
toast({
diff --git a/apps/web/components/dashboard/lists/ListView.tsx b/apps/web/components/dashboard/lists/ListView.tsx
deleted file mode 100644
index beeea7f1..00000000
--- a/apps/web/components/dashboard/lists/ListView.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-"use client";
-
-import BookmarksGrid from "@/components/dashboard/bookmarks/BookmarksGrid";
-import { api } from "@/lib/trpc";
-
-import type { ZBookmark } from "@hoarder/trpc/types/bookmarks";
-import type { ZBookmarkListWithBookmarks } from "@hoarder/trpc/types/lists";
-
-export default function ListView({
- bookmarks,
- list: initialData,
-}: {
- list: ZBookmarkListWithBookmarks;
- bookmarks: ZBookmark[];
-}) {
- const { data } = api.lists.get.useQuery(
- { listId: initialData.id },
- {
- initialData,
- },
- );
-
- return (
- <BookmarksGrid query={{ ids: data.bookmarks }} bookmarks={bookmarks} />
- );
-}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2026-01-30 02:20:01 +0000