bsmnt 0.4.0 → 0.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "bsmnt",
-	"version": "0.4.0",
+	"version": "0.4.1",
 	"packageManager": "bun@1.2.20",
 	"description": "CLI to scaffold basement projects and add integrations",
 	"type": "module",

package/src/templates/next-pagebuilder/app/(content)/[[...slug]]/page.tsx

@@ -1,6 +1,6 @@
 import { notFound } from "next/navigation"
 import { client } from "@/lib/integrations/sanity/client"
-import { sanityFetch } from "@/lib/integrations/sanity/live"
+import { fetchSanity } from "@/lib/integrations/sanity/live"
 import {
   ALL_PAGE_SLUGS_QUERY,
   PAGE_QUERY,
@@ -9,12 +9,12 @@ import type {
   ALL_PAGE_SLUGS_QUERY_RESULT,
   PAGE_QUERY_RESULT,
 } from "@/lib/integrations/sanity/sanity.types"
+import { PageDocument } from "@/components/page-document"
 import { generateSanityMetadata } from "@/lib/utils/metadata"
 import { getSlugTag } from "@/lib/utils/slug-tag"
-import { PageDocument } from "@/components/page-document"
 
 const getPageDocument = async (slug: string | null, stega = true) =>
-  sanityFetch({
+  fetchSanity<PAGE_QUERY_RESULT>({
     query: PAGE_QUERY,
     params: { slug },
     tags: [getSlugTag(slug)],
@@ -32,15 +32,19 @@ const getResolvedPage = async (
   return (page as NonNullable<PAGE_QUERY_RESULT> | null) ?? null
 }
 
+type SearchParams = Promise<{ [key: string]: string | string[] | undefined }>
+
 export const generateStaticParams = async () => {
-  if (!client) return []
+  if (!client) return [{ slug: [] }]
 
   const slugs =
     await client.fetch<ALL_PAGE_SLUGS_QUERY_RESULT>(ALL_PAGE_SLUGS_QUERY)
 
+  if (!slugs?.length) return [{ slug: [] }]
+
   return (slugs ?? []).flatMap((page) => {
     if (!page.slug) return []
-    return { slug: page.slug.split("/") }
+    return page.slug === "/" ? { slug: [] } : { slug: page.slug.split("/") }
   })
 }
 
@@ -56,13 +60,18 @@ export const generateMetadata = async ({ params }: Props) => {
     : {}
 }
 
-export default async function CatchAllPage({ params }: Props) {
+export default async function CatchAllPage({
+  params,
+  searchParams,
+}: Props & {
+  searchParams: SearchParams
+}) {
   const { slug } = await params
 
   const path = toPath(slug)
   const page = await getResolvedPage(path)
 
-  if (!page) return notFound()
+  if (!page) notFound()
 
-  return <PageDocument page={page} path={path} />
+  return <PageDocument page={page} path={path} searchParams={searchParams} />
 }

package/src/templates/next-pagebuilder/app/(content)/layout.tsx

@@ -1,13 +1,25 @@
 import { JsonLd } from "@/components/layout/json-ld"
 import { Wrapper } from "@/components/layout/wrapper"
 import { SanityVisualEditing } from "@/components/sanity/visual-editing"
+import { getSiteLayoutData } from "@/lib/integrations/sanity/fetchers/layout"
 
-const Layout = async ({ children }: { children: React.ReactNode }) => (
-  <>
-    <JsonLd />
-    <Wrapper>{children}</Wrapper>
-    <SanityVisualEditing />
-  </>
-)
+
+const Layout = async ({ children }: { children: React.ReactNode }) => {
+  const layoutData = await getSiteLayoutData()
+
+  return (
+    <>
+      <JsonLd navbar={layoutData.navbar} companyData={layoutData.companyData} />
+      <Wrapper
+        navbar={layoutData.navbar}
+        footer={layoutData.footer}
+        companyData={layoutData.companyData}
+      >
+        {children}
+      </Wrapper>
+      <SanityVisualEditing />
+    </>
+  )
+}
 
 export default Layout

package/src/templates/next-pagebuilder/app/actions/refresh.ts

@@ -0,0 +1,5 @@
+"use client"
+
+export async function refreshAction(): Promise<"refresh"> {
+  return "refresh"
+}

package/src/templates/next-pagebuilder/components/layout/footer/index.tsx

@@ -3,30 +3,19 @@ import { SanityImage } from "@/components/ui/sanity-image"
 import {
   type CompanyData,
   type FooterData,
-  getCompanyData,
-  getFooter,
 } from "@/lib/integrations/sanity/fetchers/layout"
 
 type FooterLinkGroup = NonNullable<FooterData["links"]>[number]
 type FooterLinkItem = NonNullable<FooterLinkGroup["items"]>[number]
 type SocialLink = NonNullable<CompanyData["socialLinks"]>[number]
 
-export const Footer = async () => {
-  const [footer, companyData] = await Promise.all([
-    getFooter(),
-    getCompanyData(),
-  ])
-
-  const year = new Date().getFullYear()
-
-  if (!(footer || companyData)) {
-    return (
-      <footer className="border-black/10 border-t px-6 py-3">
-        <p>&copy; {year} Basement</p>
-      </footer>
-    )
-  }
-
+export const Footer = ({
+  footer,
+  companyData,
+}: {
+  footer: FooterData | null
+  companyData: CompanyData | null
+}) => {
   const links = footer?.links ?? []
 
   return (
@@ -58,7 +47,9 @@ export const Footer = async () => {
         )}
 
         <div className="flex flex-row items-center justify-between gap-3 border-black/10 border-t pt-4">
-          <p className="w-fit">&copy; {year} Basement</p>
+          <p className="w-fit">
+            &copy; <CurrentYear /> Basement
+          </p>
 
           {companyData?.socialLinks && companyData.socialLinks.length > 0 ? (
             <div className="flex w-fit flex-wrap items-center gap-x-4 gap-y-2">
@@ -93,3 +84,8 @@ export const Footer = async () => {
     </footer>
   )
 }
+
+
+const CurrentYear = () => {
+  return <span>{new Date().getFullYear()}</span>
+}

package/src/templates/next-pagebuilder/components/layout/header/index.tsx

@@ -1,8 +1,6 @@
-import { getNavbar } from "@/lib/integrations/sanity/fetchers/layout"
-
 import { HeaderClient } from "./header-client"
+import type { NavbarData } from "@/lib/integrations/sanity/fetchers/layout"
 
-export const Header = async () => {
-  const navbar = await getNavbar()
-  return <HeaderClient data={navbar} />
+export const Header = ({ data }: { data: NavbarData | null }) => {
+  return <HeaderClient data={data} />
 }

package/src/templates/next-pagebuilder/components/layout/json-ld/index.tsx

@@ -1,7 +1,7 @@
 import { stegaClean } from "next-sanity"
-import {
-  getCompanyData,
-  getNavbar,
+import type {
+  CompanyData,
+  NavbarData,
 } from "@/lib/integrations/sanity/fetchers/layout"
 import {
   generateOrganizationJsonLd,
@@ -12,17 +12,18 @@ import {
 const APP_DESCRIPTION =
   "Basement is the AI-native platform for audit and advisory firms. Automate engagement workflows using AI agents trusted by 50% of top 100 firms."
 
-export const JsonLd = async () => {
-  const [navbarData, companyData] = await Promise.all([
-    getNavbar(),
-    getCompanyData(),
-  ])
-
+export const JsonLd = ({
+  navbar,
+  companyData,
+}: {
+  navbar: NavbarData | null
+  companyData: CompanyData | null
+}) => {
   const sameAs = companyData?.socialLinks
     ?.map((link) => stegaClean(link.url))
     .filter((url): url is string => Boolean(url))
 
-  const logoUrl = navbarData?.logo?.asset?.url
+  const logoUrl = navbar?.logo?.asset?.url
 
   return (
     <>

package/src/templates/next-pagebuilder/components/layout/wrapper/index.tsx

@@ -1,9 +1,12 @@
 import Link from "next/link"
 import { Footer } from "@/components/layout/footer"
 import { Header } from "@/components/layout/header"
+import type { SiteLayoutData } from "@/lib/integrations/sanity/fetchers/layout"
 import { cn } from "@/lib/styles/cn"
 
-interface WrapperProps extends React.HTMLAttributes<HTMLDivElement> {}
+interface WrapperProps
+  extends React.HTMLAttributes<HTMLDivElement>,
+    SiteLayoutData {}
 
 const SkipToMainContent = () => (
   <Link
@@ -14,10 +17,17 @@ const SkipToMainContent = () => (
   </Link>
 )
 
-export const Wrapper = ({ children, className, ...props }: WrapperProps) => (
+export const Wrapper = ({
+  children,
+  className,
+  navbar,
+  footer,
+  companyData,
+  ...props
+}: WrapperProps) => (
   <>
     <SkipToMainContent />
-    <Header />
+    <Header data={navbar} />
     <main
       id="main-content"
       className={cn("relative flex grow flex-col", className)}
@@ -25,6 +35,6 @@ export const Wrapper = ({ children, className, ...props }: WrapperProps) => (
     >
       {children}
     </main>
-    <Footer />
+    <Footer footer={footer} companyData={companyData} />
   </>
 )

package/src/templates/next-pagebuilder/components/page-builder/components/{post-collection → content-collection}/content-card.tsx

@@ -1,10 +1,10 @@
 import { Link } from "@/components/ui/link"
 import { SanityImage } from "@/components/ui/sanity-image"
 import { formatDate } from "@/lib/utils/format-date"
-import type { BlogArticleCard } from "./types"
+import type { ContentItemCard } from "./types"
 
 type ContentCardProps = {
-  article: BlogArticleCard
+  article: ContentItemCard
   className?: string | undefined
 }
 
@@ -46,9 +46,7 @@ export const ContentCard = ({ article, className }: ContentCardProps) => {
             </div>
           ) : null}
 
-          <h3 className="text-balance font-medium text-lg leading-snug">
-            {title}
-          </h3>
+          <h3 className="text-balance font-medium text-lg leading-snug">{title}</h3>
 
           {authorName || formattedDate ? (
             <div className="flex items-center gap-2 text-current/60 text-sm">

package/src/templates/next-pagebuilder/components/page-builder/components/content-collection/content-filters.tsx

@@ -0,0 +1,93 @@
+"use client"
+
+import { usePathname, useRouter, useSearchParams } from "next/navigation"
+import { cn } from "@/lib/styles/cn"
+import type { ContentCategory } from "./types"
+
+type ContentFiltersProps = {
+  categories: ContentCategory[]
+  activeCategory: string
+  totalCount: number
+  filteredCount: number
+}
+
+function FilterChip({
+  active,
+  label,
+  onClick,
+}: {
+  active: boolean
+  label: string
+  onClick: () => void
+}) {
+  return (
+    <button
+      type="button"
+      onClick={onClick}
+      className={cn(
+        "rounded-full border px-4 py-2 text-sm transition-colors",
+        active
+          ? "border-black bg-black text-white"
+          : "border-black/10 bg-white hover:border-black/30"
+      )}
+    >
+      {label}
+    </button>
+  )
+}
+
+export function ContentFilters({
+  categories,
+  activeCategory,
+  totalCount,
+  filteredCount,
+}: ContentFiltersProps) {
+  const pathname = usePathname()
+  const router = useRouter()
+  const searchParams = useSearchParams()
+
+  const navigate = (category: string) => {
+    const nextParams = new URLSearchParams(searchParams.toString())
+
+    if (category) nextParams.set("category", category)
+    else nextParams.delete("category")
+
+    nextParams.delete("page")
+
+    const href = nextParams.toString()
+      ? `${pathname}?${nextParams.toString()}`
+      : pathname
+
+    // biome-ignore lint/suspicious/noExplicitAny: typed routes do not accept dynamic query string helpers cleanly
+    router.push(href as any, { scroll: false })
+  }
+
+  return (
+    <div className="flex flex-col gap-4 rounded-[1.5rem] border border-black/10 bg-black/[0.02] p-4 sm:p-5">
+      <div className="flex flex-wrap gap-2">
+        <FilterChip
+          active={activeCategory === ""}
+          label="All content"
+          onClick={() => navigate("")}
+        />
+        {categories.map((category) => {
+          const slug = category.slug?.current
+          if (!slug) return null
+
+          return (
+            <FilterChip
+              key={category._id}
+              active={activeCategory === slug}
+              label={category.title || "Untitled"}
+              onClick={() => navigate(slug)}
+            />
+          )
+        })}
+      </div>
+      <p className="text-current/60 text-sm">
+        Showing {filteredCount} {filteredCount === 1 ? "item" : "items"}
+        {filteredCount !== totalCount ? ` out of ${totalCount}` : ""}
+      </p>
+    </div>
+  )
+}

package/src/templates/next-pagebuilder/components/page-builder/components/{post-collection → content-collection}/content-grid.tsx

@@ -1,20 +1,20 @@
-import type { BlogArticleCard } from "./types"
 import { ContentCard } from "./content-card"
+import type { ContentItemCard } from "./types"
 
 type ContentGridProps = {
-  articles: BlogArticleCard[]
+  items: ContentItemCard[]
   start?: number
   end?: number
   className?: string
 }
 
 export function ContentGrid({
-  articles,
+  items,
   start = 0,
   end,
   className,
 }: ContentGridProps) {
-  const slice = articles.slice(start, end)
+  const slice = items.slice(start, end)
 
   if (slice.length === 0) {
     if (start === 0) {
@@ -29,13 +29,11 @@ export function ContentGrid({
         className ?? "grid grid-cols-2 gap-8 md:grid-cols-2 lg:grid-cols-3"
       }
     >
-      {slice.map((article) => {
-        const slug = article.resolvedSlug
+      {slice.map((item) => {
+        const slug = item.resolvedSlug
         if (!slug) return null
 
-        return (
-         <ContentCard key={article._id} article={article} />
-        )
+        return <ContentCard key={item._id} article={item} />
       })}
     </ul>
   )

package/src/templates/next-pagebuilder/components/page-builder/components/content-collection/content-pagination-nav.tsx

@@ -0,0 +1,71 @@
+"use client"
+
+import { usePathname, useSearchParams } from "next/navigation"
+import { Link } from "@/components/ui/link"
+
+type ContentPaginationNavProps = {
+  currentPage: number
+  totalPages: number
+}
+
+function buildPaginationHref({
+  pathname,
+  page,
+  searchParams,
+}: {
+  pathname: string
+  page: number
+  searchParams: ReturnType<typeof useSearchParams>
+}) {
+  const nextParams = new URLSearchParams(searchParams.toString())
+
+  if (page > 1) nextParams.set("page", String(page))
+  else nextParams.delete("page")
+
+  const query = nextParams.toString()
+  return query ? `${pathname}?${query}` : pathname
+}
+
+export function ContentPaginationNav({
+  currentPage,
+  totalPages,
+}: ContentPaginationNavProps) {
+  const pathname = usePathname()
+  const searchParams = useSearchParams()
+
+  if (!pathname || totalPages <= 1) return null
+
+  return (
+    <nav className="flex flex-wrap items-center gap-2" aria-label="Pagination">
+      {currentPage > 1 ? (
+        <Link
+          href={buildPaginationHref({
+            pathname,
+            page: currentPage - 1,
+            searchParams,
+          })}
+          className="rounded-full border border-black/10 px-4 py-2 text-sm transition-colors hover:border-black/30"
+        >
+          Previous
+        </Link>
+      ) : null}
+
+      <span className="text-current/60 text-sm">
+        Page {currentPage} of {totalPages}
+      </span>
+
+      {currentPage < totalPages ? (
+        <Link
+          href={buildPaginationHref({
+            pathname,
+            page: currentPage + 1,
+            searchParams,
+          })}
+          className="rounded-full border border-black/10 px-4 py-2 text-sm transition-colors hover:border-black/30"
+        >
+          Next
+        </Link>
+      ) : null}
+    </nav>
+  )
+}