Merge branch 'main' of gitlab.fabcity.hamburg:fcos-suite/fcos-suite-astro

README.md

@@ -30,5 +30,6 @@ To start this project locally and edit the content of this template, you need to
 
 1. Clone the project via Git
 2. Switch into the newly created folder
-3. Run `npm run dev` in your command line
-4. Open your browser at `http://localhost:3000/`
\ No newline at end of file
+3. Run `npm install` once
+4. Run `npm run dev` in your command line
+5. Open your browser at `http://localhost:3000/`

src/components/CarouselWrapper.astro

@@ -78,7 +78,8 @@ const data = trimmedArticlesAndEvents.map((data) => {
     customTextColor: data.frontmatter.customTextColor,
     category: {
       id: 2,
-      title: data.frontmatter.type.toLowerCase() === "article" ? "News" : "Event",
+      title:
+        data.frontmatter?.type?.toLowerCase() === "article" ? "News" : "Event",
     },
   };
 }) as INewsCard[];

src/components/FooterWrapper.astro

@@ -14,19 +14,6 @@ const localeFromUrl =
 
 const menuItems = buildPageTree(rawContent, baseUrl, localeFromUrl);
 
-// const supportedBy = [
-//   {
-//     alt: "Europäischer Fonds für regionale Entwicklung",
-//     href: "https://www.europarl.europa.eu/factsheets/de/sheet/95/europaischer-fonds-fur-regionale-entwicklung-efre-",
-//     img: "images/logos/Logo_EU.svg",
-//   },
-//   {
-//     alt: "Hamburger Behörde für Wirtschaft und Innovation",
-//     href: "https://www.hamburg.de/bwi/",
-//     img: "images/logos/Logo_BWI.svg",
-//   },
-// ];
-
 const policyLinks = [
   {
     title: "Impressum",
@@ -43,8 +30,12 @@ const policyLinks = [
 ];
 
 const socialMedia = (await getCollection("socials")).map(
-  (social) => social.data
+  (social) => social?.data
 );
+
+const footerLogos = (await getCollection("footerLogos"))
+  .map((logo) => logo?.data)
+  .sort((a, b) => (a.order || 0) - (b.order || 0));
 ---
 
 <FooterNewsletterWrapper
@@ -53,4 +44,5 @@ const socialMedia = (await getCollection("socials")).map(
   policyLinks={policyLinks}
   socialMedia={socialMedia}
   baseUrl={baseUrl}
+  supportedBy={footerLogos}
 />

src/content/config.ts

@@ -47,9 +47,19 @@ const toolbarCollection = defineCollection({
   }),
 });
 
+const footerLogosCollection = defineCollection({
+  schema: z.object({
+    img: z.string(),
+    href: z.string().optional(),
+    alt: z.string().optional(),
+    order: z.number().optional()
+  }),
+});
+
 export const collections = {
   people: peopleCollection,
   map: mapCollection,
   socials: socialsCollection,
   toolbar: toolbarCollection,
+  footerLogos: footerLogosCollection
 };

src/content/footerLogos/efre.mdx

+---
+img: images/logos/Logo_EU.svg
+alt: Europäischer Fonds für regionale Entwicklung
+href: https://www.europarl.europa.eu/factsheets/de/sheet/95/europaischer-fonds-fur-regionale-entwicklung-efre-
+order: 0
+---
\ No newline at end of file