astro-better-cards 1.0.0 → 1.0.1

package/CardGrid.astro

@@ -0,0 +1,17 @@
+---
+interface Props {
+  columns?: 1 | 2 | 3 | 4;
+}
+
+const { columns = 2 } = Astro.props;
+const colClasses: Record<number, string> = {
+  1: 'grid-cols-1',
+  2: 'grid-cols-1 lg:grid-cols-2',
+  3: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3',
+  4: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-4',
+};
+const colClass = colClasses[columns] ?? colClasses[2];
+---
+<div class={`gap-6 mt-6 mb-6 grid ${colClass} not-prose`} xmlns="http://www.w3.org/1999/xhtml">
+  <slot />
+</div>

package/ChildCards.astro

@@ -117,7 +117,7 @@ const colClass = colClasses[columns] ?? colClasses[2];
 
 async function pageToItem(p: any): Promise<NavItem> {
   return {
-    href: `/${stripExt(p.id).replace(/\/index$/, '')}`,
+    href: `/${collection}/${stripExt(p.id).replace(/\/index$/, '')}`,
     title: await md(p.data.title) as string,
     description: p.data.description,
     icon: p.data.icon ?? null,

package/PageNav.astro

@@ -18,11 +18,17 @@ function stripExt(id: string): string {
 }
 
 const pathname = Astro.url.pathname.replace(/^\/+|\/+$/g, '').replace(/\.html$/, '');
-const currentFolder = pathname.includes('/') ? pathname.replace(/\/[^/]+$/, '') : '';
+// strip the collection URL prefix so the remainder matches bare entry IDs
+const pathnameRelative = pathname.startsWith(`${collection}/`)
+  ? pathname.slice(collection.length + 1)
+  : pathname;
+const currentFolder = pathnameRelative.includes('/')
+  ? pathnameRelative.replace(/\/[^/]+$/, '')
+  : '';
 
 const currentEntry = (pages as any[]).find(p => {
   const cid = stripExt(p.id);
-  return cid === pathname || cid === `${pathname}/index`;
+  return cid === pathnameRelative || cid === `${pathnameRelative}/index`;
 });
 
 const prevPath = prevProp ?? currentEntry?.data.prev;
@@ -40,7 +46,7 @@ function findPage(href: string) {
 
 function makeHref(href: string): string {
   if (href.startsWith('/')) return href;
-  return `/${currentFolder ? `${currentFolder}/` : ''}${href}`;
+  return `/${collection}/${currentFolder ? `${currentFolder}/` : ''}${href}`;
 }
 
 let prevEntry = prevPath ? findPage(prevPath) : null;
@@ -64,11 +70,11 @@ if (!prevEntry || !nextEntry) {
   const idx = siblings.findIndex(p => stripExt(p.id) === pathname);
   if (idx > 0 && !prevEntry) {
     prevEntry = siblings[idx - 1];
-    prevHref = `/${stripExt(prevEntry.id).replace(/\/index$/, '')}`;
+    prevHref = `/${collection}/${stripExt(prevEntry.id).replace(/\/index$/, '')}`;
   }
   if (idx >= 0 && idx < siblings.length - 1 && !nextEntry) {
     nextEntry = siblings[idx + 1];
-    nextHref = `/${stripExt(nextEntry.id).replace(/\/index$/, '')}`;
+    nextHref = `/${collection}/${stripExt(nextEntry.id).replace(/\/index$/, '')}`;
   }
 }
 

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "astro-better-cards",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "type": "module",
   "exports": {
     "./Card.astro": "./Card.astro",
+    "./CardGrid.astro": "./CardGrid.astro",
     "./ChildCards.astro": "./ChildCards.astro",
     "./PageNav.astro": "./PageNav.astro"
   },