From be518d51eaf57a1f0e04b7608d9a4362a516eb85 Mon Sep 17 00:00:00 2001 From: MohamedBassem Date: Wed, 13 Mar 2024 02:43:57 +0000 Subject: mobile: All bookmarks homepage --- packages/mobile/app/_layout.tsx | 2 +- packages/mobile/app/dashboard/(tabs)/_layout.tsx | 2 +- packages/mobile/app/dashboard/(tabs)/index.tsx | 5 +- packages/mobile/app/sharing.tsx | 4 + .../mobile/components/bookmarks/BookmarkCard.tsx | 124 +++++++++++++++++++++ .../mobile/components/bookmarks/BookmarkList.tsx | 48 ++++++++ 6 files changed, 182 insertions(+), 3 deletions(-) create mode 100644 packages/mobile/components/bookmarks/BookmarkCard.tsx create mode 100644 packages/mobile/components/bookmarks/BookmarkList.tsx (limited to 'packages') diff --git a/packages/mobile/app/_layout.tsx b/packages/mobile/app/_layout.tsx index e8244867..063ad58e 100644 --- a/packages/mobile/app/_layout.tsx +++ b/packages/mobile/app/_layout.tsx @@ -2,11 +2,11 @@ import "@/globals.css"; import "expo-dev-client"; import { useRouter } from "expo-router"; +import { Stack } from "expo-router/stack"; import { useShareIntent } from "expo-share-intent"; import { StatusBar } from "expo-status-bar"; import { useEffect } from "react"; import { View } from "react-native"; -import { Stack } from "expo-router/stack"; import { Providers } from "@/lib/providers"; diff --git a/packages/mobile/app/dashboard/(tabs)/_layout.tsx b/packages/mobile/app/dashboard/(tabs)/_layout.tsx index 49d95b35..c15f37f1 100644 --- a/packages/mobile/app/dashboard/(tabs)/_layout.tsx +++ b/packages/mobile/app/dashboard/(tabs)/_layout.tsx @@ -1,6 +1,6 @@ -import React from "react"; import { Tabs } from "expo-router"; import { Home, Settings } from "lucide-react-native"; +import React from "react"; export default function TabLayout() { return ( diff --git a/packages/mobile/app/dashboard/(tabs)/index.tsx b/packages/mobile/app/dashboard/(tabs)/index.tsx index d043a9c4..28fa39de 100644 --- a/packages/mobile/app/dashboard/(tabs)/index.tsx +++ b/packages/mobile/app/dashboard/(tabs)/index.tsx @@ -1,8 +1,11 @@ import { View } from "react-native"; +import BookmarkList from "@/components/bookmarks/BookmarkList"; + export default function Home() { return ( - + + ); } diff --git a/packages/mobile/app/sharing.tsx b/packages/mobile/app/sharing.tsx index c9b6c0bb..89f1a168 100644 --- a/packages/mobile/app/sharing.tsx +++ b/packages/mobile/app/sharing.tsx @@ -22,9 +22,13 @@ function SaveBookmark({ setMode }: { setMode: (mode: Mode) => void }) { return null; }, [params]); + const invalidateAllBookmarks = + api.useUtils().bookmarks.getBookmarks.invalidate; + useEffect(() => { if (!isPending && shareIntent?.text) { mutate({ type: "link", url: shareIntent.text }); + invalidateAllBookmarks(); } }, []); diff --git a/packages/mobile/components/bookmarks/BookmarkCard.tsx b/packages/mobile/components/bookmarks/BookmarkCard.tsx new file mode 100644 index 00000000..17e675df --- /dev/null +++ b/packages/mobile/components/bookmarks/BookmarkCard.tsx @@ -0,0 +1,124 @@ +import { ZBookmark } from "@hoarder/trpc/types/bookmarks"; +import { ZBookmarkTags } from "@hoarder/trpc/types/tags"; +import { Star, Archive, Trash } from "lucide-react-native"; +import { View, Text, Image, ScrollView, Pressable } from "react-native"; + +import { api } from "@/lib/trpc"; + +function ActionBar({ bookmark }: { bookmark: ZBookmark }) { + const apiUtils = api.useUtils(); + + const { mutate: deleteBookmark } = api.bookmarks.deleteBookmark.useMutation({ + onSuccess: () => { + apiUtils.bookmarks.getBookmarks.invalidate(); + }, + }); + const { mutate: updateBookmark, variables } = + api.bookmarks.updateBookmark.useMutation({ + onSuccess: () => { + apiUtils.bookmarks.getBookmarks.invalidate(); + apiUtils.bookmarks.getBookmark.invalidate({ bookmarkId: bookmark.id }); + }, + }); + + return ( + + + updateBookmark({ + bookmarkId: bookmark.id, + favourited: !bookmark.favourited, + }) + } + > + {(variables ? variables.favourited : bookmark.favourited) ? ( + + ) : ( + + )} + + + updateBookmark({ + bookmarkId: bookmark.id, + archived: !bookmark.archived, + }) + } + > + + + + deleteBookmark({ + bookmarkId: bookmark.id, + }) + } + > + + + + ); +} + +function TagList({ tags }: { tags: ZBookmarkTags[] }) { + return ( + + + {tags.map((t) => ( + + {t.name} + + ))} + + + ); +} + +function LinkCard({ bookmark }: { bookmark: ZBookmark }) { + if (bookmark.content.type !== "link") { + throw new Error("Wrong content type rendered"); + } + + const parsedUrl = new URL(bookmark.content.url); + + return ( + + + + {bookmark.content.title || parsedUrl.host} + + + + {parsedUrl.host} + + + + ); +} + +function TextCard({ bookmark }: { bookmark: ZBookmark }) { + return ; +} + +export default function BookmarkCard({ + bookmark: initialData, +}: { + bookmark: ZBookmark; +}) { + const { data: bookmark } = api.bookmarks.getBookmark.useQuery( + { + bookmarkId: initialData.id, + }, + { initialData }, + ); + + switch (bookmark.content.type) { + case "link": + return ; + case "text": + return ; + } +} diff --git a/packages/mobile/components/bookmarks/BookmarkList.tsx b/packages/mobile/components/bookmarks/BookmarkList.tsx new file mode 100644 index 00000000..bb4b8668 --- /dev/null +++ b/packages/mobile/components/bookmarks/BookmarkList.tsx @@ -0,0 +1,48 @@ +import { useEffect, useState } from "react"; +import { FlatList } from "react-native"; + +import BookmarkCard from "./BookmarkCard"; + +import { api } from "@/lib/trpc"; + +export default function BookmarkList({ + favourited, + archived, +}: { + favourited?: boolean; + archived?: boolean; +}) { + const apiUtils = api.useUtils(); + const [refreshing, setRefreshing] = useState(false); + const { data, isPending, isPlaceholderData } = + api.bookmarks.getBookmarks.useQuery({ + favourited, + archived, + }); + + useEffect(() => { + setRefreshing(isPending || isPlaceholderData); + }, [isPending, isPlaceholderData]); + + if (isPending || !data) { + // TODO: Add a spinner + return; + } + + const onRefresh = () => { + apiUtils.bookmarks.getBookmarks.invalidate(); + apiUtils.bookmarks.getBookmark.invalidate(); + }; + + return ( + } + data={data.bookmarks} + refreshing={refreshing} + onRefresh={onRefresh} + /> + ); +} -- cgit v1.2.3-70-g09d2