fix: add content schema and fix slug ids

Author: yasinmiran

src/components/services-list.astro

@@ -7,7 +7,7 @@ const { services } = Astro.props;
         {services.map((service) => (
                 <li class={`overflow-clip bg-light-surface dark:bg-dark-surface shadow-2xl relative px-6 py-6 flex animate__animated animate__fadeIn`}
                     data-tags={`${service.tags?.join(",")}`}>
-                    <a href={`/services/${service.id}`}>
+                    <a href={`/services/${service.slug}`}>
                         {service.tags.includes("service") && (
                                 <span class="absolute shadow top-0 z-10 text-xs right-0 text-white bg-brand-primary px-1.5 py-0.5 rounded-bl opacity-75">
                                     Node Service

src/content/config.ts

@@ -0,0 +1,127 @@
+import { defineCollection, z } from 'astro:content';
+
+const news = defineCollection({
+  type: 'content',
+  schema: z.object({
+    title: z.string(),
+    date: z.string(),
+    summary: z.string(),
+    cover: z.object({
+      source: z.string(),
+    }).optional(),
+    layout: z.string().optional(),
+    variant: z.string().optional(),
+  }),
+});
+
+const services = defineCollection({
+  type: 'content',
+  schema: z.object({
+    title: z.string(),
+    summary: z.string(),
+    logo: z.string().optional(),
+    tags: z.array(z.string()).optional(),
+    layout: z.string().optional(),
+    variant: z.string().optional(),
+  }),
+});
+
+const events = defineCollection({
+  type: 'content',
+  schema: z.object({
+    title: z.string(),
+    date: z.string(),
+    summary: z.string(),
+    cover: z.object({
+      source: z.string(),
+    }).optional(),
+    layout: z.string().optional(),
+    variant: z.string().optional(),
+  }),
+});
+
+const about = defineCollection({
+  type: 'content',
+  schema: z.object({
+    title: z.string(),
+    summary: z.string().optional(),
+    logo: z.string().optional(),
+    layout: z.string().optional(),
+    variant: z.string().optional(),
+  }),
+});
+
+const fundingAndProjects = defineCollection({
+  type: 'content',
+  schema: z.object({
+    title: z.string(),
+    summary: z.string().optional(),
+    date: z.string().optional(),
+    cover: z.object({
+      source: z.string(),
+    }).optional(),
+    layout: z.string().optional(),
+    variant: z.string().optional(),
+  }),
+});
+
+const accessibility = defineCollection({
+  type: 'content',
+  schema: z.object({
+    title: z.string(),
+    layout: z.string().optional(),
+    variant: z.string().optional(),
+  }),
+});
+
+const banner = defineCollection({
+  type: 'content',
+  schema: z.object({
+    title: z.string(),
+    layout: z.string().optional(),
+    variant: z.string().optional(),
+  }),
+});
+
+const landing = defineCollection({
+  type: 'content',
+  schema: z.object({
+    title: z.string(),
+    layout: z.string().optional(),
+    variant: z.string().optional(),
+  }),
+});
+
+const researchSupport = defineCollection({
+  type: 'content',
+  schema: z.object({
+    title: z.string(),
+    summary: z.string().optional(),
+    layout: z.string().optional(),
+    variant: z.string().optional(),
+  }),
+});
+
+const training = defineCollection({
+  type: 'content',
+  schema: z.object({
+    title: z.string(),
+    summary: z.string().optional(),
+    date: z.string().optional(),
+    layout: z.string().optional(),
+    variant: z.string().optional(),
+  }),
+});
+
+export const collections = {
+  news,
+  services,
+  events,
+  about,
+  'funding-and-projects': fundingAndProjects,
+  accessibility,
+  banner,
+  landing,
+  'research-support': researchSupport,
+  training,
+};

src/pages/about/[...organization].astro

@@ -6,14 +6,17 @@ export const prerender = true;
 
 export async function getStaticPaths() {
     const organizations = await getCollection("about");
-    return organizations.map((entry) => ({
-        params: {
-            organization: entry.id,
-        },
-        props: {
-            entry,
-        },
-    }));
+    return organizations.map((entry) => {
+        console.log(entry)
+        return ({
+            params: {
+                organization: entry.slug,
+            },
+            props: {
+                entry,
+            },
+        })
+    });
 }
 const { entry } = Astro.props;
 const { Content } = await render(entry);

src/pages/events/[...events].astro

@@ -9,7 +9,7 @@ export async function getStaticPaths() {
     return events.map((entry) => {
         return {
             params: {
-                events: entry.id,
+                events: entry.slug,
             },
             props: {
                 entry,

src/pages/events/index.astro

@@ -26,7 +26,7 @@ events.sort((a, b) => parseDate(b.data.date) - parseDate(a.data.date));
             events.map((entry) => {
                 return (
                     <CardV2
-                        link={`/events/${entry.id}`}
+                        link={`/events/${entry.slug}`}
                         title={entry.data.title}
                         summary={entry.data.summary}
                         cover={entry.data?.cover?.source}

src/pages/funding-and-projects/[...project].astro

@@ -8,7 +8,7 @@ export async function getStaticPaths() {
     const projects = await getCollection("funding-and-projects");
     return projects.map((entry) => ({
         params: {
-            project: entry.id,
+            project: entry.slug,
         },
         props: {
             entry,

src/pages/news/[...news].astro

@@ -1,5 +1,6 @@
 ---
 import { getCollection, render } from "astro:content";
+import type { CollectionEntry } from "astro:content";
 import { components } from "../../components/elements";
 
 export const prerender = true;
@@ -13,7 +14,7 @@ export async function getStaticPaths() {
         ];
         return {
             params: {
-                news: entry.id,
+                news: entry.slug,
             },
             props: {
                 entry,

src/pages/news/index.astro

@@ -29,7 +29,7 @@ news.sort((a, b) => parseDate(b.data.date) - parseDate(a.data.date));
         {news.map((entry) => {
             return (
                     <CardV2
-                            link={`/news/${entry.id}`}
+                            link={`/news/${entry.slug}`}
                             title={entry.data.title}
                             summary={entry.data.summary}
                             cover={entry.data?.cover?.source}

src/pages/services/[...service].astro

@@ -8,7 +8,7 @@ export async function getStaticPaths() {
     const services = await getCollection("services");
     return services.map((entry) => ({
         params: {
-            service: entry.id,
+            service: entry.slug,
         },
         props: {
             entry,