Merge pull request #171 from JedPattersonn/jed/fix-breadcrumb

This commit is contained in:
Dhravya Shah 2024-07-26 10:59:55 -05:00 committed by GitHub
commit 1707103fda
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 31 additions and 11 deletions

View file

@ -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

View file

@ -27,16 +27,23 @@ function AutoBreadCrumbs() {
{pathname
.split("/")
.filter(Boolean)
.map((path, idx, paths) => (
<>
<BreadcrumbItem key={path + idx}>
<BreadcrumbLink href={`/${paths.slice(0, idx + 1).join("/")}`}>
{path.charAt(0).toUpperCase() + path.slice(1)}
</BreadcrumbLink>
</BreadcrumbItem>
<BreadcrumbSeparator hidden={idx === paths.length - 1} />
</>
))}
.map((path, idx, paths) => {
const isSpacePath = path === "space";
const href = isSpacePath
? `/memories?tab=spaces`
: `/${paths.slice(0, idx + 1).join("/")}`;
return (
<React.Fragment key={path + idx}>
<BreadcrumbItem>
<BreadcrumbLink href={href}>
{path.charAt(0).toUpperCase() + path.slice(1)}
</BreadcrumbLink>
</BreadcrumbItem>
<BreadcrumbSeparator hidden={idx === paths.length - 1} />
</React.Fragment>
);
})}
</BreadcrumbList>
</Breadcrumb>
);