astro-tractstack 2.0.0-rc.42 → 2.0.0-rc.44

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro-tractstack",
-  "version": "2.0.0-rc.42",
+  "version": "2.0.0-rc.44",
   "description": "Astro integration for TractStack - redeeming the web from boring experiences",
   "type": "module",
   "main": "dist/index.js",

package/templates/src/components/search/SearchModal.tsx

@@ -78,7 +78,7 @@ export default function SearchModal({
     >
       <Portal>
         <Dialog.Backdrop className="fixed inset-0 z-50 bg-black bg-opacity-50 backdrop-blur-sm" />
-        <Dialog.Positioner className="fixed inset-0 z-50 mx-auto max-w-3xl p-2 pt-16 md:p-4">
+        <Dialog.Positioner className="fixed inset-0 z-50 mx-auto max-w-5xl p-2 pt-16 md:p-4">
           <Dialog.Content
             className="bg-mywhite mx-auto w-full overflow-hidden rounded-lg shadow-2xl"
             style={{ height: '80vh' }}

package/templates/src/components/search/SearchResults.tsx

@@ -1,9 +1,12 @@
 import { useState, useMemo } from 'react';
 import { Pagination } from '@ark-ui/react/pagination';
-import { ChevronLeftIcon, ChevronRightIcon } from '@heroicons/react/24/outline';
 import type { SearchResults as SearchResultsType } from '@/hooks/useSearch';
 import type { FullContentMapItem } from '@/types/tractstack';
-import { getResourceUrl, getResourceImage } from '@/utils/customHelpers';
+import {
+  getResourceUrl,
+  getResourceImage,
+  getResourceDescription,
+} from '@/utils/customHelpers';
 
 interface SearchResultsProps {
   results: SearchResultsType;
@@ -84,12 +87,18 @@ export default function SearchResults({
           item.slug,
           item.categorySlug || ''
         );
+        const description = getResourceDescription(
+          item.id,
+          item.slug,
+          item.categorySlug || ''
+        );
 
         items.push({
           id: item.id,
           type: 'Resource',
           title: item.title,
           slug: item.slug,
+          description: description || undefined,
           categorySlug: item.categorySlug || undefined,
           url: resourceUrl,
           imageSrc: resourceImage,
@@ -114,8 +123,8 @@ export default function SearchResults({
     startIndex + ITEMS_PER_PAGE
   );
 
-  const handlePageChange = (page: number) => {
-    setCurrentPage(page);
+  const handlePageChange = (details: { page: number }) => {
+    setCurrentPage(details.page);
   };
 
   const getResultBadge = (type: string, categorySlug?: string) => {
@@ -170,14 +179,32 @@ export default function SearchResults({
             <a href={item.url} onClick={onResultClick} className="group block">
               <div className="flex items-start gap-4">
                 <div
-                  className="bg-mydarkgrey hidden flex-shrink-0 overflow-hidden rounded-lg md:block"
-                  style={{ width: '120px', height: '67.5px' }}
+                  className="bg-mydarkgrey flex-shrink-0 overflow-hidden rounded-lg p-1 md:hidden"
+                  style={{
+                    width: '100px',
+                    height: '56px',
+                  }}
+                  data-mobile-size="100x56"
+                >
+                  <img
+                    src={item.imageSrc}
+                    alt={item.title}
+                    className="h-full w-full rounded object-contain"
+                  />
+                </div>
+
+                <div
+                  className="bg-mydarkgrey hidden flex-shrink-0 overflow-hidden rounded-lg p-1 md:block"
+                  style={{
+                    width: '240px',
+                    height: '135px',
+                  }}
+                  data-desktop-size="240x135"
                 >
                   <img
                     src={item.imageSrc}
                     alt={item.title}
-                    className="h-full w-full object-contain"
-                    style={{ width: '100%', height: '100%' }}
+                    className="h-full w-full rounded object-contain"
                   />
                 </div>
 
@@ -190,11 +217,13 @@ export default function SearchResults({
                         </h3>
                       </div>
 
-                      {item.type === 'StoryFragment' && item.description && (
-                        <p className="mb-2 line-clamp-2 text-sm text-gray-600">
-                          {item.description}
-                        </p>
-                      )}
+                      {(item.type === 'StoryFragment' ||
+                        item.type === 'Resource') &&
+                        item.description && (
+                          <p className="mb-2 line-clamp-2 text-sm text-gray-600">
+                            {item.description}
+                          </p>
+                        )}
 
                       {item.topics && item.topics.length > 0 && (
                         <div className="mb-2 flex flex-wrap gap-1">
@@ -217,6 +246,11 @@ export default function SearchResults({
                       <p className="truncate text-xs text-gray-500">
                         {item.url}
                       </p>
+
+                      {/* Mobile badge row */}
+                      <div className="mt-2 block md:hidden">
+                        {getResultBadge(item.type, item.categorySlug)}
+                      </div>
                     </div>
 
                     <div className="hidden flex-shrink-0 text-right md:block">
@@ -233,47 +267,42 @@ export default function SearchResults({
       </div>
 
       {totalPages > 1 && (
-        <div className="flex items-center space-x-1">
+        <div className="mt-8 flex justify-center">
           <Pagination.Root
             count={allResultItems.length}
             pageSize={ITEMS_PER_PAGE}
             page={currentPage}
-            onPageChange={(details) => handlePageChange(details.page)}
+            siblingCount={1}
+            onPageChange={handlePageChange}
+            className="flex flex-wrap items-center gap-2"
           >
-            <Pagination.PrevTrigger className="text-mydarkgrey flex items-center rounded-md border border-gray-300 px-3 py-2 text-sm hover:bg-gray-50 disabled:cursor-not-allowed disabled:opacity-50">
-              <ChevronLeftIcon className="mr-1 h-4 w-4" />
-              Previous
-            </Pagination.PrevTrigger>
-
             <Pagination.Context>
               {(pagination) =>
                 pagination.pages.map((page, index) =>
                   page.type === 'page' ? (
                     <Pagination.Item
                       key={index}
-                      value={page.value}
-                      type="page"
+                      {...page}
                       className={`cursor-pointer rounded-md px-3 py-2 text-sm ${
                         page.value === currentPage
-                          ? 'bg-myblue text-white'
-                          : 'text-mydarkgrey hover:bg-gray-50'
+                          ? 'bg-gray-900 text-white'
+                          : 'border border-gray-300 bg-white text-gray-700 hover:bg-gray-50'
                       }`}
                     >
                       {page.value}
                     </Pagination.Item>
                   ) : (
-                    <span key={index} className="px-2 text-gray-400">
-                      ...
-                    </span>
+                    <Pagination.Ellipsis
+                      key={index}
+                      index={index}
+                      className="px-3 py-2 text-sm text-gray-500"
+                    >
+                      …
+                    </Pagination.Ellipsis>
                   )
                 )
               }
             </Pagination.Context>
-
-            <Pagination.NextTrigger className="text-mydarkgrey flex items-center rounded-md border border-gray-300 px-3 py-2 text-sm hover:bg-gray-50 disabled:cursor-not-allowed disabled:opacity-50">
-              Next
-              <ChevronRightIcon className="ml-1 h-4 w-4" />
-            </Pagination.NextTrigger>
           </Pagination.Root>
         </div>
       )}

package/templates/src/layouts/Layout.astro

@@ -85,13 +85,12 @@ const defaultSocialDesc =
   description ||
   brandConfig.OGDESC ||
   `No-code website builder and content marketing platform`;
-const buildVersion = (() => {
-  if (modDatetime) return modDatetime.getTime();
-  if (pubDatetime) return pubDatetime.getTime();
-  return Date.now();
-})();
-const socialImageWithVersion = `${defaultSocialImageURL}?v=${buildVersion}`;
-const socialLogoWithVersion = `${defaultSocialLogoURL}?v=${buildVersion}`;
+const socialImageFullURL = brandConfig?.SITE_URL
+  ? `${brandConfig.SITE_URL.replace(/\/$/, '')}${defaultSocialImageURL}`
+  : `${defaultSocialImageURL}`;
+const socialLogoFullURL = brandConfig?.SITE_URL
+  ? `${brandConfig.SITE_URL.replace(/\/$/, '')}${defaultSocialLogoURL}`
+  : `${defaultSocialLogoURL}`;
 const gtagId = brandConfig?.GTAG || false;
 const gtagUrl =
   typeof gtagId === `string` && gtagId.length > 1
@@ -144,14 +143,14 @@ const enableBunny = import.meta.env.PUBLIC_ENABLE_BUNNY === 'true';
     <meta property="og:type" content="website" />
     <meta property="og:description" content={defaultSocialDesc} />
     <meta property="og:url" content={fullCanonicalUrl} />
-    <meta property="og:image" content={socialImageWithVersion} />
-    <meta property="og:logo" content={socialLogoWithVersion} />
+    <meta property="og:image" content={socialImageFullURL} />
+    <meta property="og:logo" content={socialLogoFullURL} />
 
     <meta property="twitter:card" content="summary_large_image" />
     <meta property="twitter:url" content={fullCanonicalUrl} />
     <meta property="twitter:title" content={defaultSocialTitle} />
     <meta property="twitter:description" content={defaultSocialDesc} />
-    <meta property="twitter:image" content={socialImageWithVersion} />
+    <meta property="twitter:image" content={socialImageFullURL} />
 
     {
       pubDatetime && (

package/templates/src/utils/customHelpers.ts

@@ -22,6 +22,15 @@ export function getResourceImage(
   return '/static.jpg';
 }
 
+export function getResourceDescription(
+  id: string,
+  slug: string,
+  category: string
+): string | null {
+  console.log(`please define getResourceDescription`, id, slug, category);
+  return null;
+}
+
 // Initialize search data - override in custom implementation
 export function initSearch(): void {
   // Default implementation does nothing