From 37f3a39c3ebce1155fdb5bf7e9b5d55f3c17a2e5 Mon Sep 17 00:00:00 2001 From: Farhan Pathan Date: Thu, 9 Jul 2026 14:11:58 +0530 Subject: [PATCH 1/5] Microsite Enhancement- 9-7-2026 --- .gitignore | 3 + package-lock.json | 23 + package.json | 4 + src/components/microsite/SectionRenderer.tsx | 624 +++++++++++++++++ src/styles/conference.css | 684 +++++++++++++++++++ src/types/index.ts | 4 + tsconfig.json | 9 + 7 files changed, 1351 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b3eb616 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +node_modules/ +.env +dist/ \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 359e45d..b559a85 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,6 +8,10 @@ "name": "eventbuzz-web", "version": "0.0.1", "dependencies": { +<<<<<<< HEAD +======= + "bootstrap-icons": "^1.13.1", +>>>>>>> f6fbf96 (Microsite Enhancement- 9-7-2026) "flatpickr": "^4.6.13", "react": "^18.3.1", "react-dom": "^18.3.1", @@ -1275,6 +1279,25 @@ "node": ">=6.0.0" } }, +<<<<<<< HEAD +======= + "node_modules/bootstrap-icons": { + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.13.1.tgz", + "integrity": "sha512-ijombt4v6bv5CLeXvRWKy7CuM3TRTuPEuGaGKvTV5cz65rQSY8RQ2JcHt6b90cBBAC7s8fsf2EkQDldzCoXUjw==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/twbs" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/bootstrap" + } + ], + "license": "MIT" + }, +>>>>>>> f6fbf96 (Microsite Enhancement- 9-7-2026) "node_modules/browserslist": { "version": "4.28.4", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.4.tgz", diff --git a/package.json b/package.json index 6a03224..26bb12f 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,10 @@ "preview": "vite preview --port 5175" }, "dependencies": { +<<<<<<< HEAD +======= + "bootstrap-icons": "^1.13.1", +>>>>>>> f6fbf96 (Microsite Enhancement- 9-7-2026) "flatpickr": "^4.6.13", "react": "^18.3.1", "react-dom": "^18.3.1", diff --git a/src/components/microsite/SectionRenderer.tsx b/src/components/microsite/SectionRenderer.tsx index a7b88ae..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,17 +19,40 @@ 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 }[]; + + // Temporary console logs for debugging for Logo in Navbar + // console.log("Header config:", c); + // console.log("Website logo:", ctx.data.website.logo); + // console.log("Event logo:", ctx.data.event.logoUrl); + // console.log("Final logoUrl:", logoUrl); + +>>>>>>> f6fbf96 (Microsite Enhancement- 9-7-2026) return (