diff --git a/src/pages/parts/home/BookmarksCarousel.tsx b/src/pages/parts/home/BookmarksCarousel.tsx index 117d752f..0d91b069 100644 --- a/src/pages/parts/home/BookmarksCarousel.tsx +++ b/src/pages/parts/home/BookmarksCarousel.tsx @@ -9,14 +9,11 @@ import { SectionHeading } from "@/components/layout/SectionHeading"; import { WatchedMediaCard } from "@/components/media/WatchedMediaCard"; import { EditBookmarkModal } from "@/components/overlays/EditBookmarkModal"; import { EditGroupModal } from "@/components/overlays/EditGroupModal"; -import { EditGroupOrderModal } from "@/components/overlays/EditGroupOrderModal"; import { useModal } from "@/components/overlays/Modal"; import { UserIcon, UserIcons } from "@/components/UserIcon"; import { Flare } from "@/components/utils/Flare"; -import { useBackendUrl } from "@/hooks/auth/useBackendUrl"; import { useIsMobile } from "@/hooks/useIsMobile"; import { CarouselNavButtons } from "@/pages/discover/components/CarouselNavButtons"; -import { useAuthStore } from "@/stores/auth"; import { useBookmarkStore } from "@/stores/bookmarks"; import { useGroupOrderStore } from "@/stores/groupOrder"; import { useProgressStore } from "@/stores/progress"; @@ -92,8 +89,6 @@ export function BookmarksCarousel({ let isScrolling = false; const [editing, setEditing] = useState(false); const removeBookmark = useBookmarkStore((s) => s.removeBookmark); - const backendUrl = useBackendUrl(); - const account = useAuthStore((s) => s.account); // Editing modals const editBookmarkModal = useModal("bookmark-edit-carousel"); @@ -107,11 +102,6 @@ export function BookmarksCarousel({ (s) => s.modifyBookmarksByGroup, ); - // Group order editing state - const groupOrder = useGroupOrderStore((s) => s.groupOrder); - const setGroupOrder = useGroupOrderStore((s) => s.setGroupOrder); - const editOrderModal = useModal("bookmark-edit-order-carousel"); - const { isMobile } = useIsMobile(); const bookmarksLength = useBookmarkStore( @@ -120,6 +110,7 @@ export function BookmarksCarousel({ const progressItems = useProgressStore((state) => state.items); const bookmarks = useBookmarkStore((state) => state.bookmarks); + const groupOrder = useGroupOrderStore((s) => s.groupOrder); const items = useMemo(() => { let output: MediaItem[] = []; @@ -179,22 +170,6 @@ export function BookmarksCarousel({ return { groupedItems: grouped, regularItems: regular }; }, [items, bookmarks, progressItems]); - // group sorting - const allGroups = useMemo(() => { - const groups = new Set(); - - Object.values(bookmarks).forEach((bookmark) => { - if (Array.isArray(bookmark.group)) { - bookmark.group.forEach((group) => groups.add(group)); - } - }); - - groups.add("bookmarks"); - - return Array.from(groups); - }, [bookmarks]); - - // Create a unified list of sections including both grouped and regular bookmarks const sortedSections = useMemo(() => { const sections: Array<{ type: "grouped" | "regular"; @@ -272,32 +247,6 @@ export function BookmarksCarousel({ } }; - const handleEditGroupOrder = () => { - editOrderModal.show(); - }; - - const handleReorderClick = () => { - handleEditGroupOrder(); - // Keep editing state active by setting it to true - setEditing(true); - }; - - const handleCancelOrder = () => { - editOrderModal.hide(); - }; - - const handleSaveOrderClick = (newOrder: string[]) => { - setGroupOrder(newOrder); - editOrderModal.hide(); - - // Save to backend - if (backendUrl && account) { - useGroupOrderStore - .getState() - .saveGroupOrderToBackend(backendUrl, account); - } - }; - const handleEditBookmark = (bookmarkId: string) => { setEditingBookmarkId(bookmarkId); editBookmarkModal.show(); @@ -353,15 +302,6 @@ export function BookmarksCarousel({ className="ml-4 md:ml-12 mt-2 -mb-5" >
- {editing && allGroups.length > 1 && ( - - )} {editing && section.group && (
- {editing && allGroups.length > 1 && ( - - )} - {/* Edit Bookmark Modal */} s.items); const bookmarks = useBookmarkStore((s) => s.bookmarks); const groupOrder = useGroupOrderStore((s) => s.groupOrder); - const setGroupOrder = useGroupOrderStore((s) => s.setGroupOrder); const removeBookmark = useBookmarkStore((s) => s.removeBookmark); const [editing, setEditing] = useState(false); const [gridRef] = useAutoAnimate(); - const editOrderModal = useModal("bookmark-edit-order"); const editBookmarkModal = useModal("bookmark-edit"); const editGroupModal = useModal("bookmark-edit-group"); const [editingBookmarkId, setEditingBookmarkId] = useState( null, ); const [editingGroupName, setEditingGroupName] = useState(null); - const backendUrl = useBackendUrl(); - const account = useAuthStore((s) => s.account); const modifyBookmarks = useBookmarkStore((s) => s.modifyBookmarks); const modifyBookmarksByGroup = useBookmarkStore( (s) => s.modifyBookmarksByGroup, @@ -118,21 +111,6 @@ export function BookmarksPart({ return { groupedItems: grouped, regularItems: regular }; }, [items, bookmarks, progressItems]); - // group sorting - const allGroups = useMemo(() => { - const groups = new Set(); - - Object.values(bookmarks).forEach((bookmark) => { - if (Array.isArray(bookmark.group)) { - bookmark.group.forEach((group) => groups.add(group)); - } - }); - - groups.add("bookmarks"); - - return Array.from(groups); - }, [bookmarks]); - const sortedSections = useMemo(() => { const sections: Array<{ type: "grouped" | "regular"; @@ -189,32 +167,6 @@ export function BookmarksPart({ onItemsChange(items.length > 0); }, [items, onItemsChange]); - const handleEditGroupOrder = () => { - editOrderModal.show(); - }; - - const handleReorderClick = () => { - handleEditGroupOrder(); - // Keep editing state active by setting it to true - setEditing(true); - }; - - const handleCancelOrder = () => { - editOrderModal.hide(); - }; - - const handleSaveOrderClick = (newOrder: string[]) => { - setGroupOrder(newOrder); - editOrderModal.hide(); - - // Save to backend - if (backendUrl && account) { - useGroupOrderStore - .getState() - .saveGroupOrderToBackend(backendUrl, account); - } - }; - const handleEditBookmark = (bookmarkId: string) => { setEditingBookmarkId(bookmarkId); editBookmarkModal.show(); @@ -266,15 +218,6 @@ export function BookmarksPart({ } >
- {editing && allGroups.length > 1 && ( - - )} {editing && section.group && (
- {editing && allGroups.length > 1 && ( - - )} - {/* Edit Bookmark Modal */}