Merge branch 'ep2025' into ep2025-issue-1302

Author: nikoshell

public/images/sprints.png

@@ -21,7 +21,7 @@ const socialMap = {
 };
 ---
 
-<div class=`social-links flex justify-center space-x-4 ${className}`>
+<div class=`social-links flex justify-center space-x-4 ${className} h-[36px]`>
   {
     Object.entries(socialMap)
       .filter(([key]) => socials?.[key])

src/components/SocialLinks.astro

@@ -66,7 +66,7 @@ const logo = sponsorLogos[sponsor.id];
   {
     description && (
       <div class="flex-1">
-        <h2 class="text-2xl font-bold mb-2 ">
+        <h2 id=`sponsor-${sponsorId}` class="sponsor text-2xl font-bold mb-2 ">
           { !isSponsorPage && tier !== 'Partners' ?
             <a href={`/sponsor/${sponsor.id}`}>
             {title}
@@ -95,10 +95,15 @@ const logo = sponsorLogos[sponsor.id];
         )}
 
 
+      </div>
+    )
+  }
+    <div>
+
         {(tier !== "Partners") && website && (
           <div class="website-btn-container flex flex-col sm:flex-row justify-center gap-2 mt-4">
 
-          { !isSponsorPage && sponsor.body &&
+            { !isSponsorPage && sponsor.body && tier && ["Gold", "Platinum"].includes(tier) &&
             <a href={`/sponsor/${sponsor.id}`} class="website-btn-outline">
               About {title}
             </a>
@@ -114,9 +119,7 @@ const logo = sponsorLogos[sponsor.id];
       { (tier !== "Partners") &&
         <SocialLinks socials={socials} />
       }
-      </div>
-    )
-  }
+    </div>
 </div>
 
 <style>

src/components/SponsorCard.astro

@@ -15,7 +15,7 @@ import { sponsorDisplay } from "@data/sponsorDisplay";
 const image = sponsorDisplay[sponsor.id]
 ---
 
-{ image &&
+{ sponsor.data.tier == "Platinum" && image &&
 <section class="space-y-12 pb-6 overflow-hidden">
   <Image
     src={image}

src/components/SponsorDisplay.astro

@@ -15,10 +15,13 @@ if (!sponsor) {
 const {
   name: title,
   url: website,
+  tier,
   logo_padding = false,
 } = sponsor.data;
 
 const logo = sponsorLogos[sponsor.id];
+const slug = tier==="Partners"? `/community-partners#sponsor-${sponsorId}`: tier==="Platinum" ? `/sponsor/${sponsorId}` : `/sponsors#sponsor-${sponsorId}`
+
 ---
 
 <div
@@ -28,13 +31,13 @@ const logo = sponsorLogos[sponsor.id];
     {
       website ? (
 
-        <a href={website} target="_blank" aria-label={`Link to ${title}`}
+      <a href={slug} aria-label={`Link to ${title}`}
 >
           <Image
             src={logo}
             alt={`${title} Logo`}
             style={{
-              minWidth: "250px",
+              minWidth: "170px",
               maxHeight: "120px",
               objectFit: "contain",
               padding: logo_padding ? logo_padding : undefined,
@@ -46,7 +49,7 @@ const logo = sponsorLogos[sponsor.id];
             src={logo}
             alt={`${title} Logo`}
             style={{
-              minWidth: "250px",
+              minWidth: "170px",
               maxHeight: "120px",
               objectFit: "contain",
               padding: logo_padding ? logo_padding : undefined,

src/components/SponsorLogo.astro

@@ -10,10 +10,10 @@ export interface Props {
     sponsors: Sponsor[];
   };
 
-  top?: boolean;
+  level: number;
 }
 
-const { tier, top } = Astro.props;
+const { tier, level = 2} = Astro.props;
 ---
 
 <div class="relative">
@@ -27,9 +27,11 @@ const { tier, top } = Astro.props;
   <div
     class:list={[
       "grid ml-12 items-center justify-items-center",
+      `level-${level}`,
       {
-        "grid-cols-1 md:grid-cols-2 lg:grid-cols-3": !top,
-        "grid-cols-1 md:grid-cols-2": top,
+        "grid-cols-1 md:grid-cols-2 m-20 [&>*]:scale-110": level===0,
+        "grid-cols-1 md:grid-cols-2 lg:grid-cols-3 [&>*]:scale-80": level > 0 && level << 6,
+        "grid-cols-2 md:grid-cols-3 lg:grid-cols-4 [&>*]:scale-80" : level===6,
       },
     ]}
   >

src/components/sponsors/sponsor-tier.astro renamed to src/components/sections/sponsors/sponsor-tier.astro

@@ -68,20 +68,15 @@ const topTier = sponsorTiers.find((tier) => tier.name === "Keystone");
     <div class="mt-4 text-center">
       <Button url="/sponsor">Become a sponsor</Button>
     </div>
-    {
-      topTier && topTier.sponsors.length > 0 && (
-        <SponsorTier tier={topTier} top={true} />
-      )
-    }
   </div>
 
   {sponsorTiers.length > 0 && <hr />}
 
-  <div class="">
+  <div >
     {
       sponsorTiers.map((tier, index) => (
         <Fragment>
-          <SponsorTier tier={tier} top={tier.name === "Platinum"} />
+          <SponsorTier tier={tier} level={index} />
           {index !== sponsorTiers.length - 1 && <hr />}
         </Fragment>
       ))

src/components/sponsors/sponsors.astro renamed to src/components/sections/sponsors/sponsors.astro

@@ -0,0 +1,27 @@
+---
+import { getEntry } from "astro:content";
+import Card from "./card.astro";
+
+export interface Props {
+  id: string;
+}
+
+const { id } = Astro.props;
+
+const deadline = await getEntry("week", id);
+
+if (!deadline) {
+  throw new Error(`No deadline found with id ${id}`);
+}
+
+const { Content } = await deadline.render();
+---
+
+<Card
+  image={deadline.data.image}
+  title={deadline.data.title}
+  url={deadline.data.url}
+  subtitle={deadline.data.subtitle}
+>
+  <Content />
+</Card>

src/components/sections/updates/week-card.astro

@@ -0,0 +1,19 @@
+---
+import DeadlineCard from "./week-card.astro";
+import Headline from "@ui/Headline.astro";
+import { getCollection } from "astro:content";
+import Section from "@ui/Section.astro";
+
+let deadlines = await getCollection("week");
+deadlines = deadlines
+  .sort((a, b) => a.slug.localeCompare(b.slug))
+  .reverse()
+  .slice(0, 3);
+---
+
+<Section>
+  <Headline id="the_week" title="A Week of All Things Python" center="true" />
+  <section class="justify-center gap-6 flex flex-wrap px-6">
+    {deadlines.map((deadline) => <DeadlineCard id={deadline.slug} />)}
+  </section>
+</Section>

src/components/sections/updates/week.astro

@@ -25,6 +25,17 @@ const deadlines = defineCollection({
     }),
 });
 
+const week = defineCollection({
+  type: "content",
+  schema: ({ image }) =>
+    z.object({
+      title: z.string(),
+      subtitle: z.string(),
+      url: z.string(),
+      image: image(),
+    }),
+});
+
 const keynoters = defineCollection({
   type: "content",
   schema: ({ image }) =>
@@ -198,7 +209,7 @@ const sponsors = defineCollection({
   schema: z.object({
     name: z.string(),
     url: z.string().url(),
-    tier: z.string().nullable(),
+    tier: z.string(),
     location: z.string().optional(),
     industry: z.string().optional(),
     description: z.string().optional(),
@@ -244,6 +255,7 @@ export const collections = {
   days,
   pages,
   deadlines,
+  week,
   sessions,
   speakers,
   keynoters,