Merge branch 'new-conf-design--speakers' into new-conf-design--ogs

hasparus · hasparus · commit a85dad552083 · 2025-06-11T15:40:54.000+02:00
diff --git a/scripts/sync-sched/schedule-2025.json b/scripts/sync-sched/schedule-2025.json
diff --git a/scripts/sync-sched/speakers.json b/scripts/sync-sched/speakers.json
diff --git a/scripts/sync-sched/sync.ts b/scripts/sync-sched/sync.ts
@@ -181,6 +181,19 @@ async function updateSpeakerDetails(
     })
 
   const toUpdate = byUpdateTime.slice(0, quota)
+  console.log(`Fetching additional details for ${toUpdate.length} speakers...`)
+  console.log(
+    toUpdate
+      .map(s =>
+        [
+          `- ${s.username.padEnd(32, " ")}`,
+          s["~syncedDetailsAt"]
+            ? `last synced at ${new Date(s["~syncedDetailsAt"]).toLocaleString()}`
+            : "without details yet",
+        ].join("\t"),
+      )
+      .join("\n"),
+  )
 
   const limit = pLimit(5)
   const updated = await Promise.all(
@@ -193,15 +206,20 @@ async function updateSpeakerDetails(
     const location = locations.get(speaker.username)
     if (location) {
       const [key, index] = location
+      const current =
+        key === "changed" ? comparison[key][index].new : comparison[key][index]
+
+      const newValue = mergeSpeaker(current, speaker)
+      const diff = objectDiff({ old: current, new: newValue })
+      if (diff.trim()) {
+        console.log(diff)
+      }
+      newValue["~syncedDetailsAt"] = Date.now()
+
       if (key === "changed") {
-        comparison[key][index].new = mergeSpeaker(
-          comparison[key][index].new,
-          speaker,
-        )
-        comparison[key][index].new["~syncedDetailsAt"] = Date.now()
+        comparison[key][index].new = newValue
       } else {
-        comparison[key][index] = mergeSpeaker(comparison[key][index], speaker)
-        comparison[key][index]["~syncedDetailsAt"] = Date.now()
+        comparison[key][index] = newValue
       }
     }
   }
@@ -212,7 +230,7 @@ async function updateSpeakerDetails(
   )
   const nowUnchanged = comparison.changed
     .filter(change => deepStrictEqualWithoutInternals(change.old, change.new))
-    .map(change => change.old)
+    .map(change => change.new)
 
   comparison.changed = actuallyChanged
   comparison.unchanged.push(...nowUnchanged)
diff --git a/src/app/conf/2025/_data.ts b/src/app/conf/2025/_data.ts
@@ -4,7 +4,6 @@ import { SchedSpeaker, ScheduleSession } from "@/app/conf/2023/types"
 import { readSpeakers } from "../_api/sched-data"
 
 export const schedule: ScheduleSession[] = require("../../../../scripts/sync-sched/schedule-2025.json")
-export const speakers: SchedSpeaker[] = readSpeakers(2025)
 
 type SpeakerUsername = SchedSpeaker["username"]
 
@@ -20,6 +19,10 @@ for (const session of schedule) {
   }
 }
 
+export const speakers: SchedSpeaker[] = readSpeakers(2025).filter(speaker =>
+  speakerSessions.has(speaker.username),
+)
+
 export const previousEditionSessions = new Map<
   SpeakerUsername,
   ScheduleSession[]
diff --git a/src/app/conf/2025/_videos.ts b/src/app/conf/2025/_videos.ts
@@ -1,10 +1,4 @@
 export const videos: {
   id: string
   title: string
-}[] = [
-  // temporary
-  {
-    id: "fA81OFu9BVY",
-    title: `Top 10 GraphQL Security Checks for Every Developer - Ankita Gupta, Ankush Jain - Akto.io`,
-  },
-]
+}[] = []
diff --git a/src/app/conf/2025/components/session-tags.tsx b/src/app/conf/2025/components/session-tags.tsx
@@ -19,7 +19,7 @@ export function SessionTags({ session, className, ...rest }: SessionTagsProps) {
   return (
     <div className={clsx("flex flex-wrap gap-2 md:gap-3", className)} {...rest}>
       {eventType && (
-        <Tag color={eventsColors[session.event_type]}>{eventType}</Tag>
+        <Tag color={eventsColors[session.event_type || ""]}>{eventType}</Tag>
       )}
       {session.audience && (
         <Tag
diff --git a/src/app/conf/2025/components/speaker-card.tsx b/src/app/conf/2025/components/speaker-card.tsx
@@ -43,7 +43,7 @@ export function SpeakerCard({
           />
         )}
 
-        <div className="relative h-full overflow-hidden @[420px]:w-[176px] @[420px]:shrink-0">
+        <div className="relative aspect-square h-full overflow-hidden @[420px]:w-[176px] @[420px]:shrink-0">
           <div className="absolute inset-0 z-[1] bg-sec-light mix-blend-multiply" />
           {speaker.avatar ? (
             <Image
@@ -82,7 +82,7 @@ export function SpeakerCard({
       </div>
       <Anchor
         href={`/conf/${year}/speakers/${speaker.username}`}
-        className="absolute inset-0 z-[1] ring-inset ring-neu-400 hover:bg-sec-base/[.035] hover:ring-1 dark:ring-neu-100"
+        className="absolute inset-0 z-[1] ring-inset ring-neu-400 hover:bg-sec-base/[.035] hover:ring-1 dark:ring-neu-100 dark:hover:bg-sec-base/[.05]"
         aria-label={`See ${speaker.name.split(" ")[0]}'s sessions`}
       />
     </article>
diff --git a/src/app/conf/2025/components/speaker-links.tsx b/src/app/conf/2025/components/speaker-links.tsx
@@ -19,7 +19,11 @@ export function SpeakerLinks({
   ...rest
 }: SpeakerLinksProps) {
   const speakerUrls = SocialIconType.all
-    .map(social => speaker.socialurls.find(x => x.service === social))
+    .map(social =>
+      speaker.socialurls.find(
+        x => x.service.toLowerCase() === social.toLowerCase(),
+      ),
+    )
     .concat([{ service: "website", url: speaker.url || "" }])
     .filter((x): x is Exclude<typeof x, undefined> => !!x?.url)
     .slice(-3)
diff --git a/src/app/conf/2025/schedule/[id]/session-video.tsx b/src/app/conf/2025/schedule/[id]/session-video.tsx
@@ -26,6 +26,10 @@ export function SessionVideo({ video, className }: SessionVideoProps) {
 }
 
 export function findVideo(event: ScheduleSession, eventTitle: string) {
+  if (videos.length === 0) {
+    return null
+  }
+
   const result = findBestMatch(
     `${eventTitle} ${event.speakers!.map(e => e.name).join(" ")}`,
     videos.map(e => e.title),
diff --git a/src/app/conf/2025/schedule/_components/schedule-list.tsx b/src/app/conf/2025/schedule/_components/schedule-list.tsx
@@ -163,14 +163,17 @@ export function ScheduleList({
                 className="typography-body-sm bg-neu-200 pb-px dark:bg-neu-50"
               >
                 <h3
-                  className="bg-neu-50 py-4 dark:bg-neu-0 lg:mb-px"
+                  className="bg-neu-50 py-4 dark:bg-neu-0"
                   id={`day-${index + 1}`}
                 >
                   {format(parseISO(date), "EEEE, MMMM d")}
                 </h3>
                 {Object.entries(concurrentSessionsGroup).map(
                   ([sessionDate, sessions]) => (
-                    <div key={`concurrent sessions on ${sessionDate}`}>
+                    <div
+                      key={`concurrent sessions on ${sessionDate}`}
+                      className="lg:mt-px"
+                    >
                       <div className="mr-px flex flex-col max-lg:ml-px lg:flex-row">
                         <div className="relative border-neu-50 bg-neu-50 dark:bg-neu-0 max-lg:-mx-px max-lg:mb-px max-lg:mt-px max-lg:border-x lg:mr-px">
                           <span className="typography-body-sm mt-3 inline-block w-20 whitespace-nowrap pb-0.5 pl-4 lg:mr-6 lg:w-28 lg:pb-4 lg:pl-0">
diff --git a/src/app/conf/2025/speakers/[id]/long-session-card.tsx b/src/app/conf/2025/speakers/[id]/long-session-card.tsx
@@ -29,7 +29,7 @@ export function LongSessionCard({
 
   const formattedDate = eventStart.toLocaleDateString("en-US", {
     day: "numeric",
-    month: "short",
+    month: "long",
   })
 
   const year = eventStart.getFullYear()
@@ -70,7 +70,7 @@ export function LongSessionCard({
         <div className="flex items-start justify-between gap-6">
           <SessionTags session={session} />
           {year !== new Date().getFullYear() && (
-            <div className="flex items-center gap-2 border border-neu-400 bg-neu-100 px-2 py-1">
+            <div className="flex items-center gap-2 border border-neu-400 bg-neu-100 px-2 py-1 dark:border-neu-100 dark:bg-neu-50">
               <span className="typography-menu text-neu-900">{year}</span>
             </div>
           )}
diff --git a/src/app/conf/2025/speakers/[id]/past-speaker-sessions.tsx b/src/app/conf/2025/speakers/[id]/past-speaker-sessions.tsx
diff --git a/src/app/conf/_api/sched-client.tsx b/src/app/conf/_api/sched-client.tsx
@@ -110,18 +110,34 @@ export async function getSchedule(
     "/session/export",
   )) as ScheduleSession[]
 
-  const result = sessions.map(session => {
-    const { description } = session
+  const result = sessions
+    .filter(session => session.active === "Y")
+    .map(session => {
+      const { description } = session
 
-    // This field is sometimes sent as a string, sometimes as a number,
-    // so it creates noise in our diffs, but we don't use it anyway.
-    delete (session as Record<string, unknown>)["event_type_sort"]
+      // This field is sometimes sent as a string, sometimes as a number,
+      // so it creates noise in our diffs, but we don't use it anyway.
+      delete (session as Record<string, unknown>)["event_type_sort"]
 
-    return {
-      ...session,
-      description: preprocessDescription(description),
-    }
-  })
+      // If Sched form includes just event type or event subtype and its a phrase separated by a dash,
+      // we split it into two fields.
+
+      let event_type = session.event_type || ""
+      let event_subtype = session.event_subtype || ""
+
+      if (!event_type && event_subtype.includes(" - ")) {
+        ;[event_type, event_subtype] = event_subtype.split(" - ")
+      } else if (!event_subtype && event_type.includes(" - ")) {
+        ;[event_type, event_subtype] = event_type.split(" - ")
+      }
+
+      return {
+        ...session,
+        event_type,
+        event_subtype,
+        description: preprocessDescription(description),
+      }
+    })
 
   return result
 }
diff --git a/src/app/conf/_api/sched-types.ts b/src/app/conf/_api/sched-types.ts
@@ -1,5 +1,6 @@
 export type ScheduleSession = {
   id: string
+  active: "Y" | "N"
   audience: string
   description: string
   event_end: string
diff --git a/src/app/conf/_design-system/social-icon.tsx b/src/app/conf/_design-system/social-icon.tsx
@@ -33,7 +33,7 @@ export interface SocialIconProps extends React.SVGProps<SVGSVGElement> {
 }
 
 export const SocialIcon = ({ type, ...rest }: SocialIconProps) => {
-  switch (type) {
+  switch (type.toLowerCase()) {
     case "twitter":
       return <TwitterIcon {...rest} />
     case "linkedin":

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@ import { SchedSpeaker, ScheduleSession } from "@/app/conf/2023/types"`
`4`	`4`	`import { readSpeakers } from "../_api/sched-data"`
`5`	`5`
`6`	`6`	`export const schedule: ScheduleSession[] = require("../../../../scripts/sync-sched/schedule-2025.json")`
`7`		`-export const speakers: SchedSpeaker[] = readSpeakers(2025)`
`8`	`7`
`9`	`8`	`type SpeakerUsername = SchedSpeaker["username"]`
`10`	`9`
`@@ -20,6 +19,10 @@ for (const session of schedule) {`
`20`	`19`	`}`
`21`	`20`	`}`
`22`	`21`
	`22`	`+export const speakers: SchedSpeaker[] = readSpeakers(2025).filter(speaker =>`
	`23`	`+ speakerSessions.has(speaker.username),`
	`24`	`+)`
	`25`	`+`
`23`	`26`	`export const previousEditionSessions = new Map<`
`24`	`27`	`SpeakerUsername,`
`25`	`28`	`ScheduleSession[]`