From 12e939380e0e9783daa9cc892a432b2b5a9a5795 Mon Sep 17 00:00:00 2001
From: mertbagt <mertbagt@gmail.com>
Date: Sun, 19 Jul 2026 13:35:29 -0400
Subject: [PATCH 1/2] remove value overrriden property

---
 components/OurTeam/Partners.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/OurTeam/Partners.tsx b/components/OurTeam/Partners.tsx
index 5ab695e1b..0b11ce8fc 100644
--- a/components/OurTeam/Partners.tsx
+++ b/components/OurTeam/Partners.tsx
@@ -14,7 +14,7 @@ export const LocalizedContent = (props: {
     components={{
       a: (
         <a
-          href="value-overridden-by-partners-json"
+          // href="value-overridden-by-partners-json"
           target="_blank"
           rel="noreferrer"
           className={props.linkClassName}

From 85c23ac31bbfe5e9390121b3ef8d40b46618814d Mon Sep 17 00:00:00 2001
From: mertbagt <mertbagt@gmail.com>
Date: Tue, 18 Aug 2026 21:25:38 -0400
Subject: [PATCH 2/2] generate legislatorEvents

---
 .../HearingsScheduled/HearingsScheduled.tsx   |  1 +
 .../LegislatorProfilePage.tsx                 |  1 +
 .../LegislatorProfile/LegislatorSidebar.tsx   |  4 +-
 .../SidebarComponents/UpcomingHearings.tsx    | 54 ++++++++++++++++++-
 4 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/components/HearingsScheduled/HearingsScheduled.tsx b/components/HearingsScheduled/HearingsScheduled.tsx
index bb51b18d6..88508ee81 100644
--- a/components/HearingsScheduled/HearingsScheduled.tsx
+++ b/components/HearingsScheduled/HearingsScheduled.tsx
@@ -9,6 +9,7 @@ export type EventData = {
   index: number
   type: "hearing" | "session"
   name: string
+  code?: string | null
   id: number
   location?: string
   fullDate: Date // TODO: Could be a timestamp
diff --git a/components/LegislatorProfile/LegislatorProfilePage.tsx b/components/LegislatorProfile/LegislatorProfilePage.tsx
index 24ea34433..e65576a90 100644
--- a/components/LegislatorProfile/LegislatorProfilePage.tsx
+++ b/components/LegislatorProfile/LegislatorProfilePage.tsx
@@ -376,6 +376,7 @@ export function LegislatorProfilePage({
         </Col>
         <Col md="3">
           <LegislatorSidebar
+            committeeList={member.Committees}
             court={court}
             legislatorData={legislatorData}
             legislatorId={legislatorId}
diff --git a/components/LegislatorProfile/LegislatorSidebar.tsx b/components/LegislatorProfile/LegislatorSidebar.tsx
index c35d166f4..4e43e7394 100644
--- a/components/LegislatorProfile/LegislatorSidebar.tsx
+++ b/components/LegislatorProfile/LegislatorSidebar.tsx
@@ -3,11 +3,13 @@ import { OtherTestimony } from "./SidebarComponents/OtherTestimony"
 import { UpcomingHearings } from "./SidebarComponents/UpcomingHearings"
 
 export function LegislatorSidebar({
+  committeeList,
   court,
   legislatorData,
   legislatorId,
   memberCode
 }: {
+  committeeList: any[]
   court: number
   legislatorData: any[]
   legislatorId: string
@@ -16,7 +18,7 @@ export function LegislatorSidebar({
   return (
     <>
       <OtherTestimony />
-      <UpcomingHearings />
+      <UpcomingHearings committeeList={committeeList} />
       <Biography
         court={court}
         legislatorData={legislatorData}
diff --git a/components/LegislatorProfile/SidebarComponents/UpcomingHearings.tsx b/components/LegislatorProfile/SidebarComponents/UpcomingHearings.tsx
index c3da92690..e900ed8f6 100644
--- a/components/LegislatorProfile/SidebarComponents/UpcomingHearings.tsx
+++ b/components/LegislatorProfile/SidebarComponents/UpcomingHearings.tsx
@@ -1,5 +1,57 @@
+import { DateTime } from "luxon"
+
 import { TabBlock } from "../LegislatorComponents"
 
-export function UpcomingHearings() {
+import { useUpcomingEvents } from "components/db/events"
+import { EventData } from "components/HearingsScheduled"
+import { formatDate } from "components/HearingsScheduled/dateUtils"
+
+export function UpcomingHearings({ committeeList }: { committeeList: any[] }) {
+  const events = useUpcomingEvents()
+  const thisMonth = DateTime.now().startOf("month")
+  const eventList: EventData[] = []
+  let latestDate = DateTime.now()
+
+  if (events) {
+    for (let e of events) {
+      const eventDate = DateTime.fromISO(e.content.EventDate)
+
+      if (eventDate > latestDate) latestDate = eventDate
+
+      const index = Math.floor(eventDate.diff(thisMonth, "months").months)
+      const date = formatDate(e.content.EventDate)
+      if (e.type === "hearing") {
+        eventList.push({
+          index,
+          type: e.type,
+          name: e.content.Name ?? "Hearing",
+          code: e.content.HearingHost.CommitteeCode,
+          id: e.content.EventId,
+          location: e.content.Location?.LocationName ?? undefined,
+          fullDate: eventDate.toJSDate(),
+          year: date.year,
+          month: date.month,
+          date: date.date,
+          day: date.day,
+          time: date.time
+        })
+      }
+    }
+  }
+
+  const LegislatorCommitteCodes = committeeList.map(code => code.CommitteeCode)
+
+  let legislatorEvents: any[] = []
+
+  if (events) {
+    eventList.forEach(event => {
+      if (LegislatorCommitteCodes.includes(event.code)) {
+        legislatorEvents.push(event)
+      }
+    })
+  }
+
+  console.log("legislatorEvents", legislatorEvents)
+
   return <TabBlock>- Upcoming Hearings</TabBlock>
 }