diff --git a/src/components/microsite/SectionRenderer.tsx b/src/components/microsite/SectionRenderer.tsx index 2c9c62f..d9f7122 100644 --- a/src/components/microsite/SectionRenderer.tsx +++ b/src/components/microsite/SectionRenderer.tsx @@ -1,7 +1,11 @@ import { useEffect, useState } from 'react'; import type { AgendaItem, MicrositeSection, MicrositeSpeaker, PublicMicrositePayload } from '../../types'; import { visitorApi } from '../../api/visitor'; +<<<<<<< HEAD + +======= import 'bootstrap-icons/font/bootstrap-icons.css'; +>>>>>>> f6fbf96 (Microsite Enhancement- 9-7-2026) type Ctx = { data: PublicMicrositePayload; eventId: string; @@ -15,6 +19,11 @@ function str(v: unknown, fallback = ''): string { function HeaderSection({ section, ctx }: { section: MicrositeSection; ctx: Ctx }) { const c = section.config; const logoText = str(c.logoText, ctx.data.event.name); +<<<<<<< HEAD + const logoUrl = str(c.logoUrl, ctx.data.website.logo || ctx.data.event.logoUrl || ''); + const menuItems = (Array.isArray(c.menuItems) ? c.menuItems : []) as { label?: string; url?: string }[]; + +======= // const logoUrl = str(c.logoUrl, ctx.data.website.logo || ctx.data.event.logoUrl || ''); const logoUrl = str( c.logoUrl || ctx.data.website.logo || ctx.data.event.logoUrl, ''); const menuItems = (Array.isArray(c.menuItems) ? c.menuItems : []) as { label?: string; url?: string }[]; @@ -25,10 +34,17 @@ function HeaderSection({ section, ctx }: { section: MicrositeSection; ctx: Ctx } // console.log("Event logo:", ctx.data.event.logoUrl); // console.log("Final logoUrl:", logoUrl); +>>>>>>> f6fbf96 (Microsite Enhancement- 9-7-2026) return (