From 713773d8533839ac512c5f9b6c8cd0fda7f68d97 Mon Sep 17 00:00:00 2001 From: Cory Pride Date: Tue, 9 Jun 2026 18:48:25 -0500 Subject: [PATCH 1/2] fix: removed operational insights page due to potential merge conflicts --- .../knowledge-center/OpenContentItemAccordion.tsx | 2 +- .../src/components/schedule/SessionDetailSheet.tsx | 2 +- .../src/components/student/ActivityHistoryCard.tsx | 4 ++-- frontend/src/components/ui/command.tsx | 2 +- frontend/src/components/ui/drawer.tsx | 2 +- frontend/src/components/ui/navigation-menu.tsx | 2 +- frontend/src/pages/ClassesPage.tsx | 14 +++++++------- frontend/src/pages/Dashboard.tsx | 6 +++--- frontend/src/pages/ProgramsPage.tsx | 6 +++--- .../resident-profile/DetailedAttendanceDialog.tsx | 10 +++------- frontend/src/pages/auth/Login.tsx | 4 ++-- frontend/src/pages/class-detail/AuditTab.tsx | 2 +- frontend/src/pages/class-detail/EditClassModal.tsx | 2 +- .../pages/class-detail/EnrollmentHistoryTab.tsx | 2 +- frontend/src/pages/class-detail/RosterTab.tsx | 9 ++++++--- frontend/src/pages/class-detail/ScheduleTab.tsx | 4 ++-- frontend/src/pages/class-detail/SupportTab.tsx | 2 +- .../src/pages/class-detail/TakeAttendanceModal.tsx | 2 +- frontend/src/pages/class-detail/index.tsx | 2 +- .../src/pages/event-attendance/AttendanceRow.tsx | 2 +- frontend/src/pages/event-attendance/index.tsx | 4 ++-- frontend/src/pages/program-detail/ClassesTab.tsx | 2 +- .../src/pages/program-detail/EditProgramDialog.tsx | 2 +- frontend/src/pages/programs/ClassEvents.tsx | 2 +- .../programs/ProgramOverviewFacilityAdmin.tsx | 4 ++-- frontend/src/styles/globals.css | 6 +++--- 26 files changed, 50 insertions(+), 51 deletions(-) diff --git a/frontend/src/components/knowledge-center/OpenContentItemAccordion.tsx b/frontend/src/components/knowledge-center/OpenContentItemAccordion.tsx index 2e02434d5..4e3b94e34 100644 --- a/frontend/src/components/knowledge-center/OpenContentItemAccordion.tsx +++ b/frontend/src/components/knowledge-center/OpenContentItemAccordion.tsx @@ -102,7 +102,7 @@ export default function OpenContentItemAccordion({
diff --git a/frontend/src/components/schedule/SessionDetailSheet.tsx b/frontend/src/components/schedule/SessionDetailSheet.tsx index eac90749a..f4296610a 100644 --- a/frontend/src/components/schedule/SessionDetailSheet.tsx +++ b/frontend/src/components/schedule/SessionDetailSheet.tsx @@ -181,7 +181,7 @@ export function SessionDetailSheet({ return ( <> - + Class Instance Details diff --git a/frontend/src/components/student/ActivityHistoryCard.tsx b/frontend/src/components/student/ActivityHistoryCard.tsx index 2b8b64615..6ffd5e181 100644 --- a/frontend/src/components/student/ActivityHistoryCard.tsx +++ b/frontend/src/components/student/ActivityHistoryCard.tsx @@ -90,7 +90,7 @@ export default function ActivityHistoryCard({

{heading}

- + @@ -336,7 +336,7 @@ export default function ClassesPage() { value={programFilter} onValueChange={setProgramFilter} > - + @@ -355,7 +355,7 @@ export default function ClassesPage() { value={statusFilter} onValueChange={setStatusFilter} > - + @@ -468,7 +468,7 @@ export default function ClassesPage() { className="pl-10" />
-
+
{facilities .filter( (f) => @@ -556,7 +556,7 @@ export default function ClassesPage() { className="pl-10" />
-
+
{!programsResp ? (

Loading programs... @@ -689,7 +689,7 @@ function ClassRow({

-
+
{cls.enrolled} / {cls.capacity} diff --git a/frontend/src/pages/Dashboard.tsx b/frontend/src/pages/Dashboard.tsx index 6a14f92ed..e32d41460 100644 --- a/frontend/src/pages/Dashboard.tsx +++ b/frontend/src/pages/Dashboard.tsx @@ -199,7 +199,7 @@ function DeptAdminView({
-
+
-
+
{formatTime12h(item.start_time)} @@ -371,7 +371,7 @@ function TodaysSchedule({ {item.instructor_name}
-
+
{item.room || '-'}
diff --git a/frontend/src/pages/ProgramsPage.tsx b/frontend/src/pages/ProgramsPage.tsx index f1c2a8839..546aaf679 100644 --- a/frontend/src/pages/ProgramsPage.tsx +++ b/frontend/src/pages/ProgramsPage.tsx @@ -441,7 +441,7 @@ export default function ProgramsPage() { value={sort} onValueChange={(v) => setSort(v as SortOption)} > - + @@ -480,7 +480,7 @@ export default function ProgramsPage() { - +
Filter by Program Type
@@ -521,7 +521,7 @@ export default function ProgramsPage() { - +
Filter by Status
diff --git a/frontend/src/pages/admin/resident-profile/DetailedAttendanceDialog.tsx b/frontend/src/pages/admin/resident-profile/DetailedAttendanceDialog.tsx index abc1a8112..7c6166541 100644 --- a/frontend/src/pages/admin/resident-profile/DetailedAttendanceDialog.tsx +++ b/frontend/src/pages/admin/resident-profile/DetailedAttendanceDialog.tsx @@ -138,13 +138,9 @@ export function DetailedAttendanceDialog({ - - Date - - - Status - - + Date + Status + Marked By Notes diff --git a/frontend/src/pages/auth/Login.tsx b/frontend/src/pages/auth/Login.tsx index fe0847c94..c8fee051e 100644 --- a/frontend/src/pages/auth/Login.tsx +++ b/frontend/src/pages/auth/Login.tsx @@ -12,11 +12,11 @@ export default function Login() {
diff --git a/frontend/src/pages/class-detail/AuditTab.tsx b/frontend/src/pages/class-detail/AuditTab.tsx index a50214ea7..ef112bc8f 100644 --- a/frontend/src/pages/class-detail/AuditTab.tsx +++ b/frontend/src/pages/class-detail/AuditTab.tsx @@ -182,7 +182,7 @@ export function AuditTab({ classId }: AuditTabProps) { key={`${entry.created_at}-${entry.field_name}-${idx}`} className="flex gap-3 text-sm" > -
+
{new Date(entry.created_at).toLocaleDateString( 'en-US', { diff --git a/frontend/src/pages/class-detail/EditClassModal.tsx b/frontend/src/pages/class-detail/EditClassModal.tsx index 6ec38c1d4..04fbabe33 100644 --- a/frontend/src/pages/class-detail/EditClassModal.tsx +++ b/frontend/src/pages/class-detail/EditClassModal.tsx @@ -430,7 +430,7 @@ export function EditClassModal({ onOpenChange={onOpenChange} title="Edit Class" description="Make changes to the class details." - className="sm:max-w-[600px] max-h-[90vh] overflow-y-auto" + className="sm:max-w-150 max-h-[90vh] overflow-y-auto" >
diff --git a/frontend/src/pages/class-detail/EnrollmentHistoryTab.tsx b/frontend/src/pages/class-detail/EnrollmentHistoryTab.tsx index 43970fe9b..580711a23 100644 --- a/frontend/src/pages/class-detail/EnrollmentHistoryTab.tsx +++ b/frontend/src/pages/class-detail/EnrollmentHistoryTab.tsx @@ -169,7 +169,7 @@ export function EnrollmentHistoryTab({ classId }: EnrollmentHistoryTabProps) { >
-
+
{enrollment.doc_id}
diff --git a/frontend/src/pages/class-detail/RosterTab.tsx b/frontend/src/pages/class-detail/RosterTab.tsx index 4bfd8534c..8a1313f57 100644 --- a/frontend/src/pages/class-detail/RosterTab.tsx +++ b/frontend/src/pages/class-detail/RosterTab.tsx @@ -101,7 +101,10 @@ export function RosterTab({ `/api/program-classes/${classId}/events?all=true` ); - const enrolledRows = enrollmentResp?.data ?? []; + const enrolledRows = useMemo( + () => enrollmentResp?.data ?? [], + [enrollmentResp] + ); const attendanceMap = useMemo(() => { return computeAttendanceByUser(eventsResp?.data ?? []); @@ -290,7 +293,7 @@ export function RosterTab({ aria-label={`Select ${enrollment.doc_id}`} className="shrink-0" /> -
+
{enrollment.doc_id}
@@ -421,7 +424,7 @@ export function RosterTab({ diff --git a/frontend/src/pages/class-detail/ScheduleTab.tsx b/frontend/src/pages/class-detail/ScheduleTab.tsx index 5b663d8d3..8a100811f 100644 --- a/frontend/src/pages/class-detail/ScheduleTab.tsx +++ b/frontend/src/pages/class-detail/ScheduleTab.tsx @@ -346,7 +346,7 @@ export function ScheduleTab({ cls, onClassMutate }: ScheduleTabProps) {
-
+
{DAY_HEADERS.map((d) => (
-
+
{flag.doc_id}
diff --git a/frontend/src/pages/class-detail/TakeAttendanceModal.tsx b/frontend/src/pages/class-detail/TakeAttendanceModal.tsx index c3b00f2b0..3ac039587 100644 --- a/frontend/src/pages/class-detail/TakeAttendanceModal.tsx +++ b/frontend/src/pages/class-detail/TakeAttendanceModal.tsx @@ -178,7 +178,7 @@ export function TakeAttendanceModal({ )}
-
+
{pastSessions.length === 0 ? (

No past sessions in the last 30 days. diff --git a/frontend/src/pages/class-detail/index.tsx b/frontend/src/pages/class-detail/index.tsx index a8503f331..806386a79 100644 --- a/frontend/src/pages/class-detail/index.tsx +++ b/frontend/src/pages/class-detail/index.tsx @@ -170,7 +170,7 @@ export default function ClassDetailPage() { diff --git a/frontend/src/pages/event-attendance/AttendanceRow.tsx b/frontend/src/pages/event-attendance/AttendanceRow.tsx index be85ea4bb..86aa4cf17 100644 --- a/frontend/src/pages/event-attendance/AttendanceRow.tsx +++ b/frontend/src/pages/event-attendance/AttendanceRow.tsx @@ -56,7 +56,7 @@ export function AttendanceRow({ {row.doc_id || '-'} - +

{TABLE_ATTENDANCE_STATUSES.map((opt) => ( - + {formatMonthYear(currentMonth)}
{showEnrollment && ( -
+
Enrollment diff --git a/frontend/src/styles/globals.css b/frontend/src/styles/globals.css index 986233d92..3eb0b441f 100644 --- a/frontend/src/styles/globals.css +++ b/frontend/src/styles/globals.css @@ -240,7 +240,7 @@ html { } .filter-button { - @apply w-[220px] bg-white border border-gray-200 rounded-lg px-3 py-2 text-sm flex items-center justify-between hover:bg-gray-50 transition-colors cursor-default focus-visible:outline-none focus-visible:border-gray-400 focus-visible:ring-1 focus-visible:ring-gray-400/50; + @apply w-55 bg-white border border-gray-200 rounded-lg px-3 py-2 text-sm flex items-center justify-between hover:bg-gray-50 transition-colors cursor-default focus-visible:outline-none focus-visible:border-gray-400 focus-visible:ring-1 focus-visible:ring-gray-400/50; } .media-card { @@ -340,11 +340,11 @@ html { } .lead-icon { - @apply size-5 text-gray-400 mt-0.5 flex-shrink-0; + @apply size-5 text-gray-400 mt-0.5 shrink-0; } .lead-icon-sm { - @apply size-4 text-gray-600 mt-0.5 flex-shrink-0; + @apply size-4 text-gray-600 mt-0.5 shrink-0; } .clickable-row { From b48579347bba0c12581302650efa16449cf9bf6f Mon Sep 17 00:00:00 2001 From: Cory Pride Date: Tue, 9 Jun 2026 19:17:02 -0500 Subject: [PATCH 2/2] fix: removed changes to global.css --- frontend/src/styles/globals.css | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/frontend/src/styles/globals.css b/frontend/src/styles/globals.css index 3eb0b441f..b648ae02d 100644 --- a/frontend/src/styles/globals.css +++ b/frontend/src/styles/globals.css @@ -465,16 +465,11 @@ input[type='checkbox']:focus { } .unlocked-calendar .rbc-month-view, -.unlocked-calendar .rbc-time-view { - border: 1px solid #e5e7eb; - border-radius: 8px; - overflow: hidden; -} - +.unlocked-calendar .rbc-time-view, .unlocked-calendar .rbc-agenda-view { border: 1px solid #e5e7eb; border-radius: 8px; - overflow: auto; + overflow: hidden; } .unlocked-calendar .rbc-time-slot {