fix: sitemap

package.json

@@ -89,6 +89,7 @@
     "react-medium-image-zoom": "^5.1.10",
     "react-syntax-highlighter": "^15.5.0",
     "react-textarea-autosize": "^8.5.3",
+    "remark-gfm": "^4.0.0",
     "resend": "^3.2.0",
     "server-only": "^0.0.1",
     "sonner": "^1.4.3",

src/app/(dashboard)/dashboard/stores/[storeId]/layout.tsx

@@ -11,9 +11,9 @@ import {
   PageHeaderDescription,
   PageHeaderHeading,
 } from "@/components/page-header"
-import { StoreSwitcher } from "@/components/pagers/store-switcher"
-import { StoreTabs } from "@/components/pagers/store-tabs"
 import { Shell } from "@/components/shell"
+import { StoreSwitcher } from "@/components/store-switcher"
+import { StoreTabs } from "@/components/store-tabs"
 
 interface StoreLayoutProps extends React.PropsWithChildren {
   params: {

src/app/(lobby)/(content)/(helps)/[...slug]/page.tsx

@@ -9,12 +9,12 @@ import { siteConfig } from "@/config/site"
 import { absoluteUrl } from "@/lib/utils"
 import { Separator } from "@/components/ui/separator"
 import { Mdx } from "@/components/mdx/mdx-components"
+import { MdxPager } from "@/components/mdx/mdx-pager"
 import {
   PageHeader,
   PageHeaderDescription,
   PageHeaderHeading,
 } from "@/components/page-header"
-import { MdxPager } from "@/components/pagers/mdx-pager"
 import { Shell } from "@/components/shell"
 
 interface PageProps {

src/app/(lobby)/(content)/blog/[...slug]/page.tsx

@@ -15,7 +15,7 @@ import { absoluteUrl, cn, formatDate } from "@/lib/utils"
 import { AspectRatio } from "@/components/ui/aspect-ratio"
 import { buttonVariants } from "@/components/ui/button"
 import { Separator } from "@/components/ui/separator"
-import { MdxPager } from "@/components/pagers/mdx-pager"
+import { MdxPager } from "@/components/mdx/mdx-pager"
 import { Shell } from "@/components/shell"
 
 interface PostPageProps {

src/app/(lobby)/collections/[category]/[subcategory]/page.tsx

@@ -1,9 +1,8 @@
 import type { Metadata } from "next"
-import { type Product } from "@/db/schema"
 import { env } from "@/env.js"
 
-import { getProducts } from "@/lib/fetchers/product"
-import { getStores } from "@/lib/fetchers/store"
+import { getProducts } from "@/lib/actions/product"
+import { getStores } from "@/lib/actions/store"
 import { toTitleCase, unslugify } from "@/lib/utils"
 import { productsSearchParamsSchema } from "@/lib/validations/params"
 import {
@@ -16,7 +15,7 @@ import { Shell } from "@/components/shell"
 
 interface SubcategoryPageProps {
   params: {
-    category: Product["category"]
+    category: string
     subcategory: string
   }
   searchParams: {
@@ -46,16 +45,7 @@ export default async function SubcategoryPage({
   const limit = typeof per_page === "string" ? parseInt(per_page) : 8
   const offset = typeof page === "string" ? (parseInt(page) - 1) * limit : 0
 
-  const productsTransaction = await getProducts({
-    limit,
-    offset,
-    sort: typeof sort === "string" ? sort : null,
-    categories: category,
-    subcategories: subcategory,
-    price_range: typeof price_range === "string" ? price_range : null,
-    store_ids: typeof store_ids === "string" ? store_ids : null,
-    active,
-  })
+  const productsTransaction = await getProducts(searchParams)
 
   // Stores transaction
   const storesLimit = 25
@@ -64,11 +54,7 @@ export default async function SubcategoryPage({
       ? (parseInt(store_page) - 1) * storesLimit
       : 0
 
-  const storesTransaction = await getStores({
-    limit: storesLimit,
-    offset: storesOffset,
-    sort: "productCount.desc",
-  })
+  const storesTransaction = await getStores(searchParams)
 
   return (
     <Shell>
@@ -80,12 +66,12 @@ export default async function SubcategoryPage({
           {`Buy the best ${unslugify(subcategory)}`}
         </PageHeaderDescription>
       </PageHeader>
-      <Products
+      {/* <Products
         products={productsTransaction.data}
         pageCount={productsTransaction.pageCount}
         stores={storesTransaction.data}
         storePageCount={storesTransaction.pageCount}
-      />
+      /> */}
     </Shell>
   )
 }

src/app/sitemap.ts

@@ -1,10 +1,10 @@
 import { type MetadataRoute } from "next"
 import { db } from "@/db"
+import { products, stores } from "@/db/schema"
 import { allPages, allPosts } from "contentlayer/generated"
-import { desc, eq, sql } from "drizzle-orm"
-import { products, stores } from "drizzle/schema"
+import { count, desc, eq, sql } from "drizzle-orm"
 
-import { productCategories } from "@/config/product"
+import { getCategories, getSubcategories } from "@/lib/actions/product"
 import { absoluteUrl } from "@/lib/utils"
 
 export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
@@ -30,8 +30,8 @@ export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
     .leftJoin(stores, eq(products.storeId, stores.id))
     .groupBy(products.id)
     .orderBy(
-      desc(sql<number>`count(${stores.stripeAccountId})`),
-      desc(sql<number>`count(${products.images})`),
+      desc(count(stores.stripeAccountId)),
+      desc(count(products.images)),
       desc(products.createdAt)
     )
 
@@ -40,15 +40,19 @@ export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
     lastModified: new Date().toISOString(),
   }))
 
-  const categoriesRoutes = productCategories.map((category) => ({
-    url: absoluteUrl(`/categories/${category.title}`),
+  const allCategories = await getCategories()
+
+  const categoriesRoutes = allCategories.map((category) => ({
+    url: absoluteUrl(`/collections/${category.slug}`),
     lastModified: new Date().toISOString(),
   }))
 
-  const subcategoriesRoutes = productCategories
-    .map((category) =>
-      category.subcategories.map((subcategory) => ({
-        url: absoluteUrl(`/categories/${category.title}/${subcategory.slug}`),
+  const allSubcategories = await getSubcategories()
+
+  const subcategoriesRoutes = allSubcategories
+    .map((s) =>
+      categoriesRoutes.map((c) => ({
+        url: absoluteUrl(`/collections/${c.url.split("/").pop()}/${s.slug}`),
         lastModified: new Date().toISOString(),
       }))
     )