Reading all stores instead of only one for collection

calimania · Dec 9, 2024 · fda3c48 · fda3c48
1 parent dcd4516
commit fda3c48
Show file tree

Hide file tree

Showing 10 changed files with 58 additions and 25 deletions.
diff --git a/src/components/Card.tsx b/src/components/Card.tsx
@@ -1,5 +1,6 @@
 import Tag from './Tag.astro';
 import type { SEO } from '../interfaces/Article';
+import { Fragment } from 'react';
 
 export interface Props {
   href?: string;
@@ -61,15 +62,18 @@ export default function Card({ href, frontmatter, tags, secHeading = true }: Pro
                 <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M13 7l5 5-5 5M6 7l5 5-5 5" />
               </svg>
             </div>
-            <ul>
-              {tags?.map((tag) => {
-                if (!tag) return null;
-                return <Tag tag={tag || 'x'} size="sm" />;
-              })}
-            </ul>
+            {/* <ul>
+              {
+                tags?.map((tag: string, index: number) => (
+                  <Fragment key={index}>
+                    {tag && <Tag tag={tag} size="sm" />}
+                  </Fragment>
+                ))
+              }
+            </ul> */}
           </div>
         </a>
       </article>
     </li>
   );
-}
+}
diff --git a/src/components/Header.astro b/src/components/Header.astro
@@ -8,10 +8,13 @@ export type activeNav = "tags" | "about" | "search" | "pages" | "blog";
 
 export interface Props {
   activeNav?: activeNav;
-  store?: Store;
+  store?: {
+    data: Store;
+  };
 }
 
 const { activeNav, store } = Astro.props;
+console.log({ store, logo: store?.data.Logo });
 ---
 
 <header>
@@ -20,14 +23,14 @@ const { activeNav, store } = Astro.props;
     <div class="top-nav-wrap">
       <a href="/" class="logo brand-magenta whitespace-nowrap">
         {
-          store?.Logo?.formats?.small ? (
+          store?.data?.Logo?.url ? (
             <img
-              src={`${store.Logo.formats.small.url}`}
-              alt={store.title}
+              src={`${store?.data?.Logo.url}`}
+              alt={store?.data?.title || store?.data?.SEO?.metaTitle}
               width={120}
             />
           ) : (
-            store?.title
+            store?.data?.title || store?.data?.SEO?.metaTitle || SITE.title
           )
         }
       </a>

diff --git a/src/components/Tag.astro b/src/components/Tag.astro
@@ -1,10 +1,10 @@
 ---
 export interface Props {
-  tag: string;
+  tag?: string;
   size?: "sm" | "lg";
 }
 
-const { tag, size = "sm" } = Astro.props;
+const { tag = "", size = "sm" } = Astro.props;
 ---
 
 <li
@@ -20,9 +20,11 @@ const { tag, size = "sm" } = Astro.props;
     <svg
       xmlns="http://www.w3.org/2000/svg"
       class={`${size === "sm" ? " scale-75" : "scale-110"}`}
-      ><path
+    >
+      <path
         d="M16.018 3.815 15.232 8h-4.966l.716-3.815-1.964-.37L8.232 8H4v2h3.857l-.751 4H3v2h3.731l-.714 3.805 1.965.369L8.766 16h4.966l-.714 3.805 1.965.369.783-4.174H20v-2h-3.859l.751-4H21V8h-3.733l.716-3.815-1.965-.37zM14.106 14H9.141l.751-4h4.966l-.752 4z"
-      ></path>
+      >
+      </path>
     </svg>
     &nbsp;<span>{tag}</span>
   </a>

diff --git a/src/interfaces/Store.ts b/src/interfaces/Store.ts
@@ -8,7 +8,10 @@ export default interface Store {
   slug: string;
   products: { data: [] };
   URLS: { Label: string, URL: string, }[];
-  SEO: {};
+  SEO: {
+    metaTitle: string,
+    metaDescription: string,
+  };
   Logo: {
     id: string,
     url: string,

diff --git a/src/layouts/PostDetails.astro b/src/layouts/PostDetails.astro
@@ -14,9 +14,12 @@ import HeroImage from "@components/HeroImage.astro";
 import { BlocksRenderer } from "@strapi/blocks-react-renderer";
 import { getCollection } from "astro:content";
 import type Store from "../interfaces/Store";
+import { markketplace } from "@config";
 
 const stores = await getCollection("stores");
-const store = stores?.[0]?.data as unknown as Store;
+const store = stores.find(
+  (store: Store) => store.data.slug === markketplace.STORE_SLUG
+);
 
 export interface Props {
   post: CollectionEntry<"posts">;

diff --git a/src/layouts/Posts.astro b/src/layouts/Posts.astro
@@ -8,9 +8,13 @@ import Pagination from "@components/Pagination.astro";
 import Card from "@components/Card";
 import { SITE } from "@config";
 import type Page from "@interfaces/Page";
-import { BlocksRenderer } from "@strapi/blocks-react-renderer";
+import {
+  BlocksRenderer,
+  type BlocksContent,
+} from "@strapi/blocks-react-renderer";
 import HeroImage from "@components/HeroImage.astro";
 import Hr from "@components/Hr.astro";
+import { markketplace } from "@config";
 
 export interface Props {
   currentPage: number;
@@ -23,7 +27,9 @@ import type Store from "../interfaces/Store";
 import { slugifyStr } from "@utils/slugify";
 
 const stores = await getCollection("stores");
-const store = stores?.[0]?.data as unknown as Store;
+const store = stores.find(
+  (store: Store) => store.data.slug === markketplace.STORE_SLUG
+);
 
 const { currentPage, totalPages, paginatedPosts } = Astro.props;
 
@@ -73,7 +79,7 @@ const blogPage: { data: Page } | undefined = pages.find(
             tags={data.Tags.map((tag: { Label: string }) => tag.Label)}
             frontmatter={{
               author: "x",
-              title: data.Title || "---",
+              title: data.Title || data.SEO?.metaTitle || "",
               pubDatetime: new Date(data.createdAt),
               modDatetime: new Date(data.updatedAt),
               description: data.SEO?.metaDescription || "",

diff --git a/src/pages/404.astro b/src/pages/404.astro
@@ -6,9 +6,12 @@ import Footer from "@components/Footer.astro";
 import LinkButton from "@components/LinkButton.astro";
 import { getCollection } from "astro:content";
 import type Store from "../interfaces/Store";
+import { markketplace } from "@config";
 
 const stores = await getCollection("stores");
-const store = stores?.[0]?.data as unknown as Store;
+const store = stores.find(
+  (store: Store) => store.data.slug === markketplace.STORE_SLUG
+);
 ---
 
 <Layout title={`404 Not Found | ${SITE.title}`}>

diff --git a/src/pages/[slug].astro b/src/pages/[slug].astro
@@ -11,6 +11,7 @@ import Header, { type activeNav } from "@components/Header.astro";
 import Footer from "@components/Footer.astro";
 import Breadcrumbs from "@components/Breadcrumbs.astro";
 import Hr from "@components/Hr.astro";
+import { markketplace } from "@config";
 
 export interface Props {
   page: CollectionEntry<"pages">;
@@ -26,7 +27,9 @@ export async function getStaticPaths() {
 }
 
 const stores = await getCollection("stores");
-const store = stores?.[0]?.data as unknown as Store;
+const store = stores.find(
+  (store: Store) => store.data.slug === markketplace.STORE_SLUG
+);
 
 const { page } = Astro.props;
 ---

diff --git a/src/pages/index.astro b/src/pages/index.astro
@@ -15,9 +15,12 @@ import {
   type BlocksContent,
 } from "@strapi/blocks-react-renderer";
 import { slugifyStr } from "@utils/slugify";
+import { markketplace } from "@config";
 
 const stores = await getCollection("stores");
-const store = stores?.[0]?.data as unknown as Store;
+const store = stores.find(
+  (store: Store) => store.data.slug === markketplace.STORE_SLUG
+);
 
 const posts = await getCollection("posts");
 

diff --git a/src/pages/pages.astro b/src/pages/pages.astro
@@ -8,9 +8,12 @@ import { SITE } from "@config";
 import Footer from "@components/Footer.astro";
 import Header from "@components/Header.astro";
 import type Store from "@interfaces/Store";
+import { markketplace } from "@config";
 
 const stores = await getCollection("stores");
-const store = stores?.[0]?.data as Store;
+const store = stores.find(
+  (store: Store) => store.data.slug === markketplace.STORE_SLUG
+);
 
 let pages = await getCollection("pages");
 pages = pages.sort(