From 1a82774492fe83f0de4dabb38ba315d73a5404ed Mon Sep 17 00:00:00 2001 From: Jed Patterson Date: Fri, 26 Jul 2024 16:53:56 +0100 Subject: [PATCH] Fix Spaces Breadcrumb --- apps/web/app/(dash)/(memories)/content.tsx | 15 ++++++++++- .../web/app/(dash)/header/autoBreadCrumbs.tsx | 27 ++++++++++++------- 2 files changed, 31 insertions(+), 11 deletions(-) diff --git a/apps/web/app/(dash)/(memories)/content.tsx b/apps/web/app/(dash)/(memories)/content.tsx index fea4477a..1e0bc5ca 100644 --- a/apps/web/app/(dash)/(memories)/content.tsx +++ b/apps/web/app/(dash)/(memories)/content.tsx @@ -33,6 +33,7 @@ import { addUserToSpace, deleteItem, moveItem } from "@/app/actions/doers"; import { toast } from "sonner"; import { Input } from "@repo/ui/shadcn/input"; import { motion } from "framer-motion"; +import { useSearchParams } from "next/navigation"; export function MemoriesPage({ memoriesAndSpaces, @@ -45,7 +46,19 @@ export function MemoriesPage({ currentSpace?: StoredSpace; usersWithAccess?: string[]; }) { - const [filter, setFilter] = useState("All"); + const searchParams = useSearchParams(); + + const tab = searchParams.get("tab"); + + const initialFilter = useMemo(() => { + if (tab === "spaces") return "Spaces"; + if (tab === "pages") return "Pages"; + if (tab === "notes") return "Notes"; + if (tab === "tweet") return "Tweet"; + return "All"; + }, [tab]); + + const [filter, setFilter] = useState(initialFilter); // Sort Both memories and spaces by their savedAt and createdAt dates respectfully. // The output should be just one single list of items diff --git a/apps/web/app/(dash)/header/autoBreadCrumbs.tsx b/apps/web/app/(dash)/header/autoBreadCrumbs.tsx index 671464ff..632daa61 100644 --- a/apps/web/app/(dash)/header/autoBreadCrumbs.tsx +++ b/apps/web/app/(dash)/header/autoBreadCrumbs.tsx @@ -27,16 +27,23 @@ function AutoBreadCrumbs() { {pathname .split("/") .filter(Boolean) - .map((path, idx, paths) => ( - <> - - - {path.charAt(0).toUpperCase() + path.slice(1)} - - -