Merge branch 'ep2025' into ep2025-issue-1089-sessions

nikoshell · web-flow · commit 1f158797ff47 · 2025-04-14T23:38:02.000+02:00
diff --git a/.env.development b/.env.development
@@ -0,0 +1,2 @@
+EP_SESSIONS_API="https://static.europython.eu/programme/ep2025/releases/current/sessions.json"
+EP_SPEAKERS_API="https://static.europython.eu/programme/ep2025/releases/current/speakers.json"
diff --git a/.env.preview b/.env.preview
@@ -0,0 +1,2 @@
+EP_SESSIONS_API="https://static.europython.eu/programme/ep2025/releases/current/sessions.json"
+EP_SPEAKERS_API="https://static.europython.eu/programme/ep2025/releases/current/speakers.json"
diff --git a/.env.production b/.env.production
@@ -0,0 +1,2 @@
+EP_SESSIONS_API="https://static.europython.eu/programme/ep2025/releases/current/sessions.json"
+EP_SPEAKERS_API="https://static.europython.eu/programme/ep2025/releases/current/speakers.json"
diff --git a/astro.config.mjs b/astro.config.mjs
@@ -20,6 +20,7 @@ export default defineConfig({
     },
     resolve: {
       alias: {
+        "@utils": path.resolve("./src/utils"),
         "@data": path.resolve("./src/data"),
         "@components": path.resolve("./src/components"),
         "@sections": path.resolve("./src/components/sections"),
@@ -60,6 +61,7 @@ export default defineConfig({
     "/sponsor/": "/sponsorship/sponsor/",
     "/voting/": "/programme/voting/",
     "/wasm-summit/": "/programme/wasm-summit/",
+    "/programme/sessions/": "/sessions/",
   },
   integrations: [
     preload(),
diff --git a/src/components/keynoters/keynoters.astro b/src/components/keynoters/keynoters.astro
@@ -85,7 +85,7 @@ const placeholders = Math.max(0, 5 - keynoters.length);
     {
       keynoters
         .sort((a, b) => a.data.order - b.data.order)
-        .map((keynoter, index) => (
+        .map((keynoter, _index) => (
           <Keynoter
             name={keynoter.data.name}
             slug={keynoter.slug}
@@ -95,7 +95,6 @@ const placeholders = Math.max(0, 5 - keynoters.length);
             order={keynoter.data.order}
             class:list={[
               "w-full sm:w-[calc(50%-1rem)] md:w-[calc(30%-1rem)]",
-              { "md:ml-[10%]": index === 0 },
             ]}
           />
         ))
diff --git a/src/components/ticket-tiers/ticket-tiers.astro b/src/components/ticket-tiers/ticket-tiers.astro
@@ -48,7 +48,7 @@ const tiers: TicketTierProps[] = [
       {
         text: "Access to in-person networking opportunities during the tutorial days",
       },
-      { text: "Access to free childcare for children aged 18 months and older" },
+      { text: "Access to free childcare for children aged 19 months and older" },
       { text: "Conference T-shirt included" },
       {
         text: "<strong>Limited to only 300, due to tutorial capacity</strong>",
@@ -83,7 +83,7 @@ const tiers: TicketTierProps[] = [
       {
         text: "Access to in-person networking opportunities during the main conference days",
       },
-      { text: "Access to free childcare for children aged 18 months and older" },
+      { text: "Access to free childcare for children aged 19 months and older" },
       { text: "Conference T-shirt included" },
     ],
   },
@@ -112,7 +112,7 @@ const tiers: TicketTierProps[] = [
       {
         text: "Access to in-person networking opportunities throughout the entire conference",
       },
-      { text: "Access to free childcare for children aged 18 months and older" },
+      { text: "Access to free childcare for children aged 19 months and older" },
       { text: "Conference T-shirt included" },
       {
         text: "<strong>Limited to only 300, due to tutorial capacity</strong>",
diff --git a/src/content/config.ts b/src/content/config.ts
@@ -1,31 +1,8 @@
 import { defineCollection, reference, z } from "astro:content";
-import fs from "fs/promises";
-import path from "path";
+import { loadData } from "../utils/dataLoader";
 
-const CACHE_DIR = ".cache/data";
-
-async function ensureCacheDir() {
-  await fs.mkdir(CACHE_DIR, { recursive: true });
-}
-
-async function fetchWithCache(url: string, filename: string): Promise<Buffer> {
-  const filePath = path.join(CACHE_DIR, filename);
-
-  try {
-    // Return cached if available
-    const data = await fs.readFile(filePath);
-    console.log(`Fetch from cache: ${filePath}`);
-    return data;
-  } catch {
-    const res = await fetch(url);
-    if (!res.ok) throw new Error(`Failed to fetch: ${url}`);
-
-    const arrayBuffer = await res.arrayBuffer();
-    const buffer: Buffer = Buffer.from(arrayBuffer);
-    await fs.writeFile(filePath, new Uint8Array(buffer));
-    return buffer;
-  }
-}
+const mode = import.meta.env.MODE;
+console.log(`\x1b[35m[EP]\x1b[0m Current MODE: \x1b[1m\x1b[34m${mode}\x1b[0m`);
 
 const tiers = [
   "Keystone",
@@ -83,32 +60,19 @@ const keynoters = defineCollection({
 
 // Shared data fetching function
 async function getCollectionsData() {
-  // Only fetch if not already cached
-  await ensureCacheDir();
-
-  const speakersBuffer = await fetchWithCache(
-    "https://gist.githubusercontent.com/nikoshell/d8efd41f90961cc6298519c0eec04843/raw/d13a7b1d35f61be1773404e7faf8395dd4862313/speakers.json",
-    "speakers.json"
-  );
-
-  const sessionsBuffer = await fetchWithCache(
-    "https://gist.githubusercontent.com/egeakman/eddfb15f32ae805e8cfb4c5856ae304b/raw/466f8c20c17a9f6c5875f973acaec60e4e4d0fae/sessions.json",
-    "sessions.json"
-  );
-
-  const cachedSpeakersData = JSON.parse(speakersBuffer.toString("utf-8"));
-  const cachedSessionsData = JSON.parse(sessionsBuffer.toString("utf-8"));
+  const speakersData = await loadData(import.meta.env.EP_SPEAKERS_API);
+  const sessionsData = await loadData(import.meta.env.EP_SESSIONS_API);
 
   // Create indexed versions for efficient lookups
-  const speakersById = Object.entries(cachedSpeakersData).reduce(
+  const speakersById = Object.entries(speakersData).reduce(
     (acc, [id, speaker]: [string, any]) => {
       acc[id] = { id, ...speaker };
       return acc;
     },
     {} as Record<string, any>
   );
 
-  const sessionsById = Object.entries(cachedSessionsData).reduce(
+  const sessionsById = Object.entries(sessionsData).reduce(
     (acc, [id, session]: [string, any]) => {
       acc[id] = { id, ...session };
       return acc;
@@ -117,8 +81,8 @@ async function getCollectionsData() {
   );
 
   return {
-    speakersData: cachedSpeakersData,
-    sessionsData: cachedSessionsData,
+    speakersData,
+    sessionsData,
     speakersById,
     sessionsById,
   };
@@ -145,7 +109,7 @@ const speakers = defineCollection({
     submissions: z.array(reference("sessions")),
     affiliation: z.string().nullable(),
     homepage: z.string().nullable(),
-    gitx: z.string().nullable(),
+    gitx_url: z.string().url().nullable(),
     linkedin_url: z.string().url().nullable(),
     mastodon_url: z.string().url().nullable(),
     bluesky_url: z.string().url().nullable(),
diff --git a/src/content/home/intro.md b/src/content/home/intro.md
diff --git a/src/content/pages/childcare.mdx b/src/content/pages/childcare.mdx
@@ -12,10 +12,10 @@ import childcareBalls from "./images/childcare-balls.jpg";
 
 We’re committed to making EuroPython as inclusive and accessible as possible — and that includes supporting parents attending the conference.
 
-🧸 **Free childcare** will be available for children aged **18 months and older**.
+🧸 **Free childcare** will be available for children aged **19 months and older**.
 Our professional childcare providers will offer a fun, safe, and engaging environment for your little ones during the conference.
 
-👶 Children under 18 months are welcome too! While we don’t provide dedicated care for infants, you’re very welcome to bring your own caregiver — whether it’s a nanny, grandparent, or another family member. They’re also welcome to use our designated family-friendly space during the event.
+👶 Children under 19 months are welcome too! While we don’t provide dedicated care for infants, you’re very welcome to bring your own caregiver — whether it’s a nanny, grandparent, or another family member. They’re also welcome to use our designated family-friendly space during the event.
 
 If you prefer, you can hire a professional nanny at your own cost through our childcare provider.
 
diff --git a/src/content/pages/tickets.mdx b/src/content/pages/tickets.mdx
@@ -127,7 +127,7 @@ If you're purchasing multiple tickets, please consider sponsoring the event!
       <span>☕ Every ticket includes break refreshments and a light lunch for each day.</span>
     </li>
     <li class="flex items-start">
-      <span>👶 Free childcare is available at the conference for children aged 18 months and older. For more info, check out our [childcare](/childcare) page. Please make sure to register a ticket for yourself and select how many children will require childcare at checkout.</span>
+      <span>👶 Free childcare is available at the conference for children aged 19 months and older. For more info, check out our [childcare](/childcare) page. Please make sure to register a ticket for yourself and select how many children will require childcare at checkout.</span>
     </li>
     <li class="flex items-start">
       <span>⏰ We encourage you to book your ticket early. This makes it easier for us to plan for the event and arrange important things like catering, badge printing, and other logistics.</span>
diff --git a/src/data/links.json b/src/data/links.json
@@ -7,6 +7,10 @@
           "name": "List of Sessions",
           "path": "/sessions"
         },
+        {
+          "name": "List of Speakers",
+          "path": "/speakers"
+        },
         {
           "name": "Tracks",
           "path": "/programme/tracks"
diff --git a/src/env.d.ts b/src/env.d.ts
@@ -1,2 +1,11 @@
 /// <reference path="../.astro/types.d.ts" />
 /// <reference types="astro/client" />
+
+interface ImportMetaEnv {
+  readonly EP_SESSIONS_API: string;
+  readonly EP_SPEAKERS_API: string;
+}
+
+interface ImportMeta {
+  readonly env: ImportMetaEnv;
+}
diff --git a/src/pages/session/[slug].astro b/src/pages/session/[slug].astro
@@ -74,7 +74,7 @@ const nextSessionsOrdered = sameRoomNextSession
       <dd class="capitalize">{entry.data.session_type}</dd>
       <dt class="font-bold">Level:</dt>
       <dd class="capitalize">{entry.data.level}</dd>
-      {
+      <!-- {
         entry.data.room && (
           <>
             <dt class="font-bold">Room:</dt>
@@ -95,7 +95,7 @@ const nextSessionsOrdered = sameRoomNextSession
             </dd>
           </>
         )
-      }
+      } -->
       <dt class="font-bold">Duration:</dt>
       <dd>{entry.data.duration} minutes</dd>
     </dl>
@@ -185,7 +185,7 @@ const nextSessionsOrdered = sameRoomNextSession
         )
       }
 
-      {
+      <!-- {
         (parallelSessions?.length ?? 0) > 0 ||
         (nextSessionsInAllRooms?.length ?? 0) > 0 ? (
           <>
@@ -232,7 +232,7 @@ const nextSessionsOrdered = sameRoomNextSession
             </div>
           </>
         ) : null
-      }
+      } -->
     </footer>
   </article>
 </Layout>
diff --git a/src/pages/speaker/[slug].astro b/src/pages/speaker/[slug].astro
@@ -38,10 +38,15 @@ function getTwitterUsername(url: string): string | undefined {
   return (username ?? url).startsWith("@") ? username : `@${username}`;
 }
 
-// Get @username from Twitter URL
 function getBlueskyUsername(url: string): string | undefined {
-  const username = url.split("/").pop();
-  return (username ?? url).startsWith("@") ? username : `@${username}`;
+  const username = url.split("/").pop()?.replace(/^@/, "");
+  return username ? `@${username}` : undefined;
+}
+
+function getBlueskyProfileLink(username: string): string {
+  // Remove any leading @ if present
+  const cleanUsername = username.replace(/^@/, "");
+  return `https://bsky.app/profile/${cleanUsername}`;
 }
 
 // Get @username@instance.tld from Mastodon URL
@@ -53,7 +58,14 @@ function getMastodonUsername(url: string): string | null {
 // Get in/username from LinkedIn URL
 function getLinkedInUsername(url: string): string | null {
   const match = url.match(/https?:\/\/([^\/]+)\/in\/([^\/]+)(\/|\?|$)/);
-  return match ? `in/${match[2]}` : null;
+  if (match) {
+    try {
+      return `in/${decodeURIComponent(match[2])}`;
+    } catch {
+      return `in/${match[2]}`;
+    }
+  }
+  return null;
 }
 
 // Get Git hosting service from URL
@@ -80,7 +92,7 @@ function getGitHosting(url: string): string | undefined {
                   <div class="flex items-start">
                     <div class="border-4 border-white rounded-lg shadow-lg inline-block mb-10">
           <Image
-          src={entry.data.avatar}
+            src={entry.data.avatar}
             alt={entry.data.name}
             height={400}
             width={600}
@@ -108,7 +120,7 @@ function getGitHosting(url: string): string | undefined {
     {
       entry.data.affiliation ||
       entry.data.homepage ||
-      entry.data.gitx ||
+      entry.data.gitx_url ||
       entry.data.linkedin_url ||
       entry.data.mastodon_url ||
       entry.data.twitter_url ? (
@@ -142,22 +154,18 @@ function getGitHosting(url: string): string | undefined {
               </>
             )}
 
-            {entry.data.gitx && (
+            {entry.data.gitx_url && (
               <>
                 <dt class="font-bold">
-                  {getGitHosting(entry.data.gitx) ?? "Git"}
+                  {getGitHosting(entry.data.gitx_url) ?? "Git"}
                 </dt>
                 <dd>
-                  {isUrl(entry.data.gitx) ? (
-                    <a
-                      href={ensureHttps(entry.data.gitx)}
-                      class="text-primary underline hover:text-primary-hover"
-                    >
-                      {entry.data.gitx}
-                    </a>
-                  ) : (
-                    <span>{entry.data.gitx}</span>
-                  )}
+                  <a
+                    href={ensureHttps(entry.data.gitx_url)}
+                    class="text-primary underline hover:text-primary-hover"
+                  >
+                    {entry.data.gitx_url}
+                  </a>
                 </dd>
               </>
             )}
@@ -208,7 +216,7 @@ function getGitHosting(url: string): string | undefined {
                 <dt class="font-bold">Bluesky</dt>
                 <dd>
                   <a
-                    href={entry.data.bluesky_url}
+                    href={getBlueskyProfileLink(getBlueskyUsername(entry.data.bluesky_url) as string)}
                     class="text-primary underline hover:text-primary-hover"
                   >
                     {getBlueskyUsername(entry.data.bluesky_url)}
diff --git a/src/utils/dataLoader.ts b/src/utils/dataLoader.ts
@@ -0,0 +1,23 @@
+const mode = import.meta.env.MODE;
+export async function loadData(apiUrl: any) {
+  if (!apiUrl) {
+    console.warn(`No API URL provided`);
+    return {};
+  }
+
+  try {
+    console.log(`Fetching data from: ${apiUrl}`);
+    const response = await fetch(apiUrl);
+
+    if (!response.ok) {
+      throw new Error(
+        `Failed to fetch data: ${response.status} ${response.statusText}`
+      );
+    }
+
+    return await response.json();
+  } catch (error) {
+    console.error(`Error loading data:`, error);
+    return {};
+  }
+}
diff --git a/tsconfig.json b/tsconfig.json
@@ -6,6 +6,7 @@
     "jsx": "react-jsx",
     "jsxImportSource": "react",
     "paths": {
+      "@utils/*": ["src/utils/*"],
       "@data/*": ["src/data/*"],
       "@components/*": ["src/components/*"],
       "@sections/*": ["src/components/sections/*"],

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+EP_SESSIONS_API="https://static.europython.eu/programme/ep2025/releases/current/sessions.json"`
	`2`	`+EP_SPEAKERS_API="https://static.europython.eu/programme/ep2025/releases/current/speakers.json"`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ const tiers: TicketTierProps[] = [`
`48`	`48`	`{`
`49`	`49`	`text: "Access to in-person networking opportunities during the tutorial days",`
`50`	`50`	`},`
`51`		`- { text: "Access to free childcare for children aged 18 months and older" },`
	`51`	`+ { text: "Access to free childcare for children aged 19 months and older" },`
`52`	`52`	`{ text: "Conference T-shirt included" },`
`53`	`53`	`{`
`54`	`54`	`text: "<strong>Limited to only 300, due to tutorial capacity</strong>",`
`@@ -83,7 +83,7 @@ const tiers: TicketTierProps[] = [`
`83`	`83`	`{`
`84`	`84`	`text: "Access to in-person networking opportunities during the main conference days",`
`85`	`85`	`},`
`86`		`- { text: "Access to free childcare for children aged 18 months and older" },`
	`86`	`+ { text: "Access to free childcare for children aged 19 months and older" },`
`87`	`87`	`{ text: "Conference T-shirt included" },`
`88`	`88`	`],`
`89`	`89`	`},`
`@@ -112,7 +112,7 @@ const tiers: TicketTierProps[] = [`
`112`	`112`	`{`
`113`	`113`	`text: "Access to in-person networking opportunities throughout the entire conference",`
`114`	`114`	`},`
`115`		`- { text: "Access to free childcare for children aged 18 months and older" },`
	`115`	`+ { text: "Access to free childcare for children aged 19 months and older" },`
`116`	`116`	`{ text: "Conference T-shirt included" },`
`117`	`117`	`{`
`118`	`118`	`text: "<strong>Limited to only 300, due to tutorial capacity</strong>",`