Tweak tags for new data

Author: hasparus

src/app/conf/2025/components/session-tags.tsx

@@ -21,17 +21,17 @@ export function SessionTags({ session, className, ...rest }: SessionTagsProps) {
       {eventType && (
         <Tag color={eventsColors[session.event_type || ""]}>{eventType}</Tag>
       )}
-      {session.audience && (
+      {session.company && (
         <Tag
-          color={eventsColors[session.audience] || "hsl(var(--color-neu-700))"}
+          color={eventsColors[session.company] || "hsl(var(--color-neu-500))"}
         >
-          {session.audience}
+          {session.company}
         </Tag>
       )}
       {session.event_subtype && (
         <Tag
           color={
-            eventsColors[session.event_subtype] || "hsl(var(--color-sec-base))"
+            eventsColors[session.event_subtype] || "hsl(var(--color-sec-dark))"
           }
         >
           {session.event_subtype}

src/app/conf/2025/components/speaker-card.tsx

@@ -1,10 +1,7 @@
 import clsx from "clsx"
 import Image from "next-image-export-optimizer"
 
-import { eventsColors } from "../utils"
-
 import { Anchor } from "../../_design-system/anchor"
-import { Tag } from "../../_design-system/tag"
 import { SchedSpeaker } from "../../2023/types"
 import { StripesDecoration } from "../../_design-system/stripes-decoration"
 

src/app/conf/2025/components/speaker-tags.tsx

@@ -16,18 +16,17 @@ export function SpeakerTags({
   className?: string
   showEventType?: boolean
 }) {
-  const eventType =
-    showEventType && speakerSessions.get(speaker.username)?.[0]?.event_type
+  const firstTalk = speakerSessions.get(speaker.username)?.[0]
+  let tag = showEventType && firstTalk?.event_subtype
+
+  const tagColor = (tag && eventsColors[tag]) || "hsl(var(--color-sec-dark))"
+  if (tag && tag.includes(" and ")) {
+    tag = tag.replace(" and ", " & ")
+  }
 
   return (
     <div className={clsx("flex basis-0 flex-wrap gap-2", className)}>
-      {eventType && (
-        <Tag color={eventsColors[eventType] || "hsl(var(--color-sec-base))"}>
-          {eventType === "Federation and Composite Schemas"
-            ? "Federation"
-            : eventType}
-        </Tag>
-      )}
+      {tag && <Tag color={tagColor}>{tag}</Tag>}
 
       {speaker._years.length > 1 && (
         <Tag color="hsl(var(--color-neu-500))">