Combine sponsors and companies.

Author: nikoshell

src/components/CompanyCard.astro

@@ -1,10 +1,11 @@
 ---
 import { type CollectionEntry, getEntry } from "astro:content";
-import { marked } from 'marked';
+import { Image } from "astro:assets";
+import { companyLogos } from "@data/companyLogos";
 
 
 const { company } = Astro.props;
-const { title, logo, website, location, industry, description, socials } = company.data;
+const { name: title, url:website, location, industry, description, socials, logo_padding=false } = company.data;
 
 const jobFiles = import.meta.glob('../content/companies/*/!(index).md');
 const companiesJobsMap = {};
@@ -18,26 +19,31 @@ for (const path in jobFiles) {
   }
   }
 
-  const jobs = companiesJobsMap[company.id];
+  const jobs: CollectionEntry<"jobs"> = companiesJobsMap[company.id];
 
   const isCompanyPage = Astro.url.pathname == `/company/${company.id}`;
 
-const html = marked.parse(company.body);
+const logo = companyLogos[company.id];
+
+const link = description ? `/company/${company.id}` : website;
 
 ---
 
 <div class="lg:max-w-[400px] flex flex-col gap-6 p-6 rounded-lg shadow-md bg-white text-black">
   <div class="w-full flex justify-center items-center md:items-center ">
-    <img src={logo} alt={title + " Logo"} class="max-h-[200px] object-contain" />
+    {logo && (
+      <a href={link}>
+        <Image
+          src={logo}
+          alt={`${title} Logo`}
+         style={{ minWidth: "250px", maxHeight: "120px", objectFit: "contain", padding: logo_padding ? logo_padding : undefined, }}
+        />
+      </a>
+    )}
   </div>
+  { description &&
   <div class="flex-1">
-    <h2 class="text-2xl font-bold mb-2">
-      { isCompanyPage ?
-          <>{title}</> :
-          <a href={`/company/${company.id}`}>{title}</a>
-      }
-    </h2>
-    <p class="text-gray-600 mb-2">{industry} — {location}</p>
+    <p class="text-gray-600 mb-2">{industry} {industry && location && <>—</>} {location}</p>
     <p class="mb-4">{description}</p>
 
     <div class="flex space-x-4 mb-4">
@@ -58,7 +64,8 @@ const html = marked.parse(company.body);
       </div>
     )}
 
-    { !isCompanyPage && <a class="btn btn-primary mt-6 inline-block" href={`/company/${company.id}`}>Who We Are</a>}
+    { !isCompanyPage && company.body && <a class="btn btn-primary mt-6 inline-block" href={`/company/${company.id}`}>Who We Are</a>}
   </div>
+  }
 
 </div>

src/components/CompanyCardBody.astro

@@ -1,26 +1,8 @@
 ---
-import { type CollectionEntry, getEntry } from "astro:content";
-import { marked } from 'marked';
-
-
-const { company, full=false, openings=false } = Astro.props;
-const { title, logo, website, location, industry, description, socials } = company.data;
 
-const jobFiles = import.meta.glob('../content/companies/*/!(index).md');
-const jobs: CollectionEntry<'jobs'>[] = [];
-
-for (const path in jobFiles) {
-  const match = path.match(/\.\.\/content\/companies\/([^/]+)\/([^/]+)\.md$/);
-  if (match) {
-    const companyId = company.id;
-    const entry = await getEntry('jobs', `${companyId}/${match[2]}`);
-    if (entry) {
-      jobs.push(entry);
-    }
-  }
-}
-
-const html = marked.parse(company.body);
+import { marked } from 'marked';
+const { company } = Astro.props;
+const html = company.body ? marked.parse(company.body) :  "";
 
 ---
 

src/components/sponsors/sponsor-tier.astro

@@ -2,7 +2,7 @@
 import { getCollection } from "astro:content";
 import { Image } from "astro:assets";
 
-type Sponsor = Awaited<ReturnType<typeof getCollection<"sponsors">>>[0];
+type Sponsor = Awaited<ReturnType<typeof getCollection<"companies">>>[0];
 
 export interface Props {
   tier: {
@@ -13,6 +13,9 @@ export interface Props {
   top?: boolean;
 }
 
+
+import { companyLogos } from "@data/companyLogos";
+
 const { tier, top } = Astro.props;
 ---
 
@@ -42,7 +45,7 @@ const { tier, top } = Astro.props;
           class="pb-8"
         >
           <Image
-            src={sponsor.data.image}
+            src={companyLogos[sponsor.id]}
             alt={sponsor.data.name}
             width={500}
             class="max-w-[250px] max-h-[120px]"

src/components/sponsors/sponsors.astro

@@ -23,7 +23,7 @@ const tiers = [
   "Partners"
 ] as const;
 
-const sponsors = await getCollection("sponsors");
+const sponsors = await getCollection("companies");
 
 let hasSponsors = false;
 

src/content/sponsors/1password.svg renamed to src/content/companies/1password/1password.svg

@@ -38,17 +38,6 @@ const deadlines = defineCollection({
     }),
 });
 
-const sponsors = defineCollection({
-  type: "data",
-  schema: ({ image }) =>
-    z.object({
-      name: z.string(),
-      url: z.string(),
-      image: image(),
-      tier: z.enum(tiers),
-    }),
-});
-
 const keynoters = defineCollection({
   type: "content",
   schema: ({ image }) =>
@@ -219,19 +208,20 @@ const days = defineCollection({
 const companies = defineCollection({
   loader: glob({ pattern: "*/index.md", base: "./src/content/companies" }),
   schema: z.object({
-    title: z.string(),
-    logo: z.string().optional(),
-    website: z.string().url(),
-    location: z.string(),
-    industry: z.string(),
-    description: z.string(),
+    name: z.string(),
+    url: z.string().url(),
+    tier: z.string().optional(),
+    location: z.string().optional(),
+    industry: z.string().optional(),
+    description: z.string().optional(),
     socials: z
       .object({
         linkedin: z.string().url().optional(),
         twitter: z.string().url().optional(),
       })
       .optional(),
     jobs: z.array(z.string()).optional(),
+    logo_padding: z.string().optional(),
   }),
 });
 
@@ -256,7 +246,6 @@ export const collections = {
   days,
   pages,
   deadlines,
-  sponsors,
   sessions,
   speakers,
   keynoters,

src/content/sponsors/1password.yaml renamed to src/content/companies/1password/index.md

@@ -0,0 +1,16 @@
+const logoImports = import.meta.glob<true, string, { default: ImageMetadata }>(
+  "../content/companies/*/{logo,*}.@(svg|png|webp)",
+  { eager: true }
+);
+
+export const companyLogos: Record<string, ImageMetadata> = {};
+
+for (const path in logoImports) {
+  const match = path.match(
+    /\/companies\/([^/]+)\/(?:\1|logo)\.(svg|png|webp)$/
+  );
+  if (match) {
+    const companyId = match[1];
+    companyLogos[companyId] = logoImports[path].default;
+  }
+}