From b87ac4a1e8fed91c2f8e23d19e4be5066b1d9e63 Mon Sep 17 00:00:00 2001
From: Saahith <22772542+saahithjanapati@users.noreply.github.com>
Date: Thu, 25 Sep 2025 11:59:38 -0400
Subject: [PATCH] Improve catalog table responsiveness

---
 src/Catalog.css    | 571 ++++++++++++++-------------------------------
 src/CatalogPage.js | 203 ++++++++++------
 2 files changed, 303 insertions(+), 471 deletions(-)

diff --git a/src/Catalog.css b/src/Catalog.css
index 49037ad..2450b77 100644
--- a/src/Catalog.css
+++ b/src/Catalog.css
@@ -48,7 +48,7 @@ body{
   }
 }
 
-  
+
 @media (prefers-color-scheme: dark) {
   .back-to-top {
     background-color: #ffffff; /* White theme background for dark mode */
@@ -60,157 +60,92 @@ body{
   }
 }
 
-@media (max-width: 768px) {
-  .back-to-top {
-    padding: 10px 20px; /* Increase padding for smaller screens */
-    font-size: 15px; /* Increase font size for smaller screens */
-  }
-}
 
-@media (max-width: 480px) {
-  .back-to-top {
-    padding: 8px 16px; /* Increase padding for very small screens */
-    font-size: 13px; /* Increase font size for very small screens */
-  }
+.button-container{
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+  justify-content: flex-start;
 }
 
-.department-container {
-  max-height: 0;
+.catalogPage .course-container {
+  margin: 24px 0;
+  border-radius: 12px;
+  border: 1px solid rgba(255, 255, 255, 0.2);
+  background: rgba(17, 41, 78, 0.35);
+  backdrop-filter: blur(6px);
   overflow: hidden;
-  transition: max-height 0.3s ease-out;
 }
 
-.department-container.expanded {
-  max-height: 1000px; /* Adjust this value based on your content */
-  transition: max-height 0.5s ease-in;
+.catalogPage .course-header {
+  background-color: #184276;
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+  padding: 18px 20px;
+  cursor: pointer;
 }
 
-.department-table {
-  padding: 15px 0;
-  margin: 0;
-  list-style-type: none;
-  display: grid;
-  grid-template-columns: repeat(2, 1fr);
-  grid-gap: 15px;
-  width: 100%;
+.catalogPage .course-header:focus-visible {
+  outline: 3px solid rgba(255, 255, 255, 0.85);
+  outline-offset: -3px;
 }
 
-.department-item {
-  background: rgba(255, 255, 255, 0.05);
-  border-radius: 8px;
-  transition: all 0.2s ease-in-out;
-  text-align: left;
-  box-sizing: border-box;
+.course-title{
+  font-size: clamp(1.125rem, 2.4vw, 1.9rem);
+  font-weight: 700;
+  line-height: 1.3;
 }
 
-.department-item:hover {
-  transform: translateY(-3px);
-  background: rgba(255, 255, 255, 0.1);
+.catalogPage .table-wrapper {
+  overflow-x: auto;
 }
 
-.department-item a {
-  display: block;
-  padding: 20px;
-  text-decoration: none;
-  color: inherit;
+.catalogPage .custom-table {
+  width: 100%;
+  border-collapse: collapse;
+  min-width: 560px;
 }
 
-.department-item a .department-name {
-  color: #fff;
+.catalogPage .custom-table th,
+.catalogPage .custom-table td {
+  padding: 12px 16px;
+  text-align: left;
+  vertical-align: top;
   font-size: 16px;
-  font-weight: bold;
-}
-
-
-/* .minimized-table td {
-  display: none; /* Hide the table contents }*/
-
-/* CSS for Minimized Table */
-/* .minimized-table tr {
-  display: none; /* Hide the table contents */
-/* } */
-
-
-
-
-.expanded-table {
-  display: table;
-}
-
-
-.catalog-section {
-  display: flex;
-  flex-direction: column;
-  align-items: flex-start;
-  padding-bottom: 10px;
-  border-bottom: 1px solid #333;
 }
 
-/* Example to limit the width of the entire catalog container */
-.catalog {
-  max-width: 800px; /* Adjust the max-width as needed */
-  margin: 0 auto; /* Center the catalog in its parent container */
+.catalogPage .custom-table thead th {
+  background-color: rgba(24, 66, 118, 0.85);
+  font-weight: 600;
 }
 
-
-
-.section-title {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    width: 100%;
-    font-size: 30px;
-    font-weight: bold;
-    color: white;
-    text-align: left;
-    cursor: pointer;
-    padding: 10px 0;
+.catalogPage .custom-table tbody tr:nth-child(even) {
+  background-color: rgba(24, 66, 118, 0.22);
 }
 
-.chevron {
-    border-style: solid;
-    border-width: 0.1em 0.1em 0 0;
-    content: '';
-    display: inline-block;
-    height: 0.3em;
-    width: 0.3em;
-    transform: rotate(135deg);
-    transition: transform 0.3s ease-out;
-    border-color: #888;
+.catalogPage .custom-table tbody tr:nth-child(odd) {
+  background-color: transparent;
 }
 
-.chevron.expanded {
-    transform: rotate(-45deg);
-}
-
-
-.button-container{
-  display: flex;
-  justify-content: flex-end;
-}
-
-
-
-
-
 .section-type{
-  width: 20%
+  width: 22%;
 }
 
 .section-number{
-  width: 5%
+  width: 18%;
 }
 
 .instructor{
-  width: 20%
+  width: 22%;
 }
 
 .enrollment{
-
+  width: 12%;
 }
 
 .meeting-table{
-  width: 100%;
+  width: 26%;
   vertical-align: top;
 }
 
@@ -223,9 +158,9 @@ body{
 .meeting-table-head,
 .meeting-row {
   display: grid;
-  grid-template-columns: repeat(2, minmax(0, 1fr));
+  grid-template-columns: repeat(auto-fit, minmax(110px, 1fr));
   column-gap: 12px;
-  text-align: center;
+  text-align: left;
 }
 
 .meeting-table-content {
@@ -238,166 +173,51 @@ body{
   display: block;
 }
 
-.days{
+.section-cards{
+  display: grid;
+  gap: 16px;
+  padding: 18px 20px;
+  background: rgba(17, 41, 78, 0.25);
 }
 
-.time{
+.section-card{
+  border: 1px solid rgba(255, 255, 255, 0.18);
+  border-radius: 12px;
+  padding: 16px;
+  background: rgba(8, 21, 43, 0.55);
 }
 
-.custom-table button{
-  /* background: #e88c42; */
-  color: #000000;
-  font-size: 15px;
-  padding: 0.5em 0.5em;
-  border: none;
-  border-radius: 5px;
-  cursor: pointer;
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
-  'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
-  sans-serif;
-  font-weight: bold;
+.section-card-row{
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
 }
 
-a {
-  font-size: 16px;
+.section-card-row + .section-card-row{
+  margin-top: 12px;
 }
 
-p{
-  font-size: 16px;
+.section-card-label{
+  font-size: 12px;
+  font-weight: 600;
+  letter-spacing: 0.05em;
+  text-transform: uppercase;
+  color: #d5e3ff;
 }
 
-tr{
+.section-card-value{
   font-size: 16px;
+  line-height: 1.45;
 }
 
-
-.catalogPage .custom-table {
-  width: 100%;
-  max-width: 1000px; /* Limit the table width on large screens */
-  border: 1px solid #fff;
-  border-radius: 3px;
-  table-layout: fixed;
-}
-
-.custom-table th, .custom-table td {
-  padding: 8px; /* Adjust padding as needed */
-  text-align: center; /* Center-align text within cells */
-}
-.custom-table td {
-  padding: 8px; /* Adjust padding as needed */
-  text-align: center;
-}
-.custom-table th {
-  /* background-color: #656769; */
-  background-color: #184276;
-  text-align: center;
-  /* background-color: #1d1d1e; */
-}
-
-.custom-table .column-names {
-  position: sticky;
-  /* top: 2.5em; */
-}
-
-.custom-table .title-header {
-  position: sticky;
-  /* top: 0; */
-
-  z-index: 5; /* Ensure the header appears above the table content */
-}
-
-.custom-table .title-header th{
-  position: sticky;
-  text-align: left;
-  /* top: 0; */
-  
-  z-index: 5; /* Ensure the header appears above the table content */
-}
-
-.course-title{
-  font-size: 30px;
-  font-weight: bold;
-  padding: 20px;
-
-  text-align: left;
-  flex-grow: 1;
-}
-
-.external-buttons{
-  width: 20%;
-  /* min-width: 350px; */
-    text-align: right;
-}
-
-
-
-
-
-.custom-table .expanded {
-  display: table-row;
-}
-
-.custom-table .collapsed {
-  display: none;
-}
-
-
-
-
-.custom-table tr {
-  border: none; /* Remove all borders for data rows */
-}
-
-/* Style for even rows */
-.custom-table tr:nth-child(even) {
-  /* background-color: #1e2b53; Background color for odd rows */
-  background-color: #1e2b53; /* Background color for odd rows */
-  
-
-}
-
-/* Style for odd rows */
-.custome-table tr:nth-child(odd) {
-  background-color: #191c21; /* Background color for even rows */
-  
-}
-
-
-/* Style for all rows of the inner table */
-.custom-table tr:nth-child(even) .meeting-table .meeting-row,
-.custom-table tr:nth-child(odd) .meeting-table .meeting-row {
-  background-color: inherit; /* Inherit background color from outer table */
-}
-
-h3, h2, .custom-table tr{
-  color: #fff;
-}
-
-h2{
-  font-size: 30px;
-}
-
-ul {
-  list-style-type: none;
-}
-
-.custom-table button:hover{
-  background-color: #b4b0b0;
-}
-
-
-
-
-tr.title-header:hover th{
-  cursor: pointer; /* Optional: Change the cursor to a pointer to indicate it's clickable */
-  text-decoration: underline;
+.section-card-value p{
+  margin: 0;
 }
 
-.toggle-button{
-  /* background: #e88c42; */
+.catalogPage .catalog-button{
   color: #000000;
   font-size: 15px;
-  padding: 0.5em 0.5em;
+  padding: 0.5em 0.75em;
   border: none;
   border-radius: 5px;
   cursor: pointer;
@@ -407,17 +227,20 @@ tr.title-header:hover th{
   font-weight: bold;
 }
 
-.toggle-button:hover{
-  background-color: #d7d3d3;
+.catalogPage .catalog-button:hover{
+  background-color: #b4b0b0;
 }
 
+@media (min-width: 768px) {
+  .catalogPage .course-header {
+    flex-direction: row;
+    align-items: center;
+  }
 
-
-
-
-
-
-/* light / dark mode stuff */
+  .button-container{
+    justify-content: flex-end;
+  }
+}
 
 @media (prefers-color-scheme: light) {
   .section-title{
@@ -427,7 +250,7 @@ tr.title-header:hover th{
   .chevron {
     border-color: #999;
   }
-  
+
   h1, h2, h3, h4, h5 {
     color: #000000;
   }
@@ -441,205 +264,149 @@ tr.title-header:hover th{
     background: #e9e9e9;
     border-color: #ddd;
   }
-  
+
   .department-item a .department-name {
     color: #000;
   }
 
+  .catalogPage .course-container {
+    border: 1px solid rgba(0, 0, 0, 0.12);
+    background: #ffffff;
+    backdrop-filter: none;
+  }
 
-  .catalogPage .catalog-button:hover{
-    background-color: #c1baba;
-
+  .catalogPage .course-header {
+    background-color: #e7eef9;
   }
 
-  .toggle-button{
-    background-color: #ffffff;
-    border: 1px solid #000000;
-    border-radius: 5px;
+  .section-cards {
+    background: rgba(0, 0, 0, 0.03);
   }
 
-  .catalogPage .custom-table {
-    border: 1px solid #000000;
+  .section-card {
+    background: #f9fbff;
+    border: 1px solid rgba(0, 0, 0, 0.08);
+  }
 
+  .section-card-label {
+    color: #3c4a66;
   }
-  .catalogPage .custom-table tr{
-    color: #000000;
+
+  .catalogPage .custom-table thead th {
+    background-color: #dfe7f5;
   }
-  .catalogPage .custom-table th {
-    /* background-color: #ffdeb3; */
-    background-color: #fff4e6;
-    background-color: #e7e7e7;
 
+  .catalogPage .custom-table tbody tr:nth-child(even) {
+    background-color: #f2f6fd;
   }
-  /* Style for even rows */
-  .catalogPage .custom-table tr:nth-child(even) {
-    /* background-color: #fff4e6; */
-    background-color: #f0f0f0;
+
+  .catalogPage .custom-table tbody tr:nth-child(odd) {
+    background-color: #ffffff;
   }
-  
-  /* Style for odd rows */
-  .catalogPage .custom-table tr:nth-child(odd) {
-  background-color: #ffffff; /* Background color for even rows */
 
+  .catalogPage .custom-table td,
+  .catalogPage .custom-table th {
+    color: #000000;
   }
 
-  /* Style for all rows of the inner table */
-  .catalogPage .custom-table tr:nth-child(even) .meeting-table .meeting-row,
-  .catalogPage .custom-table tr:nth-child(odd) .meeting-table .meeting-row {
-      background-color: inherit; /* Inherit background color from outer table */
+  .catalogPage .catalog-button {
+    background-color: #ffffff;
+    border: 1px solid #000000;
   }
 
+  .catalogPage .catalog-button:hover{
+    background-color: #c1baba;
+  }
 
-  .catalogPage .custom-table button{
-    /* background: #e88c42; */
+  .toggle-button{
     background-color: #ffffff;
     border: 1px solid #000000;
     border-radius: 5px;
   }
 
 }
-
 .catalogPage .subject {
   font-size: 35px;
 }
 
-@media (max-width: 1000px) {
-  .catalogPage h2{
-    font-size: 14px
-  }
-
-  .catalogPage h3{
-    font-size: 14px;
-  }
-
-  
-  .catalogPage .section-title{
-    font-size: 20px;
-    cursor: pointer;
+@media (max-width: 1024px) {
+  .catalogPage .course-container {
+    margin: 20px 0;
   }
 
-  /* .catalogPage .section-title:hover{
-    cursor: pointer;
-  } */
-
-
-
-  .catalogPage .custom-table {
-    width: 90%;
-  }
-
-  @media (max-width: 768px) {
-    .catalogPage .hide-button {
-        display: none;
-    }
+  .course-title {
+    font-size: clamp(1.05rem, 3.1vw, 1.7rem);
   }
 
   .catalogPage .catalog-button {
-    text-align: right;
-    font-size: 8px;
-    white-space: nowrap; 
-  }
-
-  .toggle-button {
-    font-size: 8px;
-  }
-
-  .catalogPage .external-buttons {
-    padding: 0.2em 0.2em;
-    font-size: 8px;
-    width: 5%;
+    font-size: 14px;
   }
+}
 
-  .catalogPage .course-title {
-      font-size: max(min(calc(4.5vw - 10px), 30px), 10px);
+@media (max-width: 768px) {
+  .section-title{
+    font-size: 20px;
   }
 
-  .catalogPage .custom-table button{
-    font-size: max(min(calc(4vw - 12px), 15px), 8px);
+  .catalog-section {
+    padding: 10px;
   }
 
-
-  .catalogPage table {
-    font-size: 8px;
-    border: none;
-    border-collapse: collapse;
+  .department-table {
+    grid-template-columns: 1fr;
   }
 
-  .catalogPage .subject {
-    font-size: max(min(calc(4.5vw - 10px), 35px), 15px);
-  }
-  
-  .catalogPage a {
-    font-size: max(min(calc(4vw - 12px), 15px), 7px);
+  strong{
+    font-size: 14px;
   }
 
-  .catalogPage p{
-    font-size: max(min(calc(4vw - 12px), 15px), 7px);
+  .catalogPage .button-container {
+    justify-content: flex-start;
   }
 
-  .catalogPage tr{
-    font-size: max(min(calc(4vw - 12px), 15px), 7px);
+  .catalogPage .catalog-button {
+    font-size: 13px;
+    white-space: nowrap;
   }
 
-  .catalogPage .table-header {
-    font-size: max(min(calc(4vw - 12px), 15px), 7px);
+  .catalogPage .subject {
+    font-size: clamp(1.5rem, 6vw, 2rem);
   }
 
-  .catalogPage .section-type{
-    width: 10%;
-    font-size: max(min(calc(4vw - 12px), 15px), 7px);
+  .section-card-label {
+    font-size: 11px;
   }
 
-  .catalogPage .section-number{
-    width: 10%;
-    padding: 0px;
-    font-size: max(min(calc(4vw - 12px), 15px), 7px);
+  .section-card-value {
+    font-size: 14px;
   }
 
-  .catalogPage .instructor{
-    width: 10%;
-    padding: 0px;
-    font-size: max(min(calc(4vw - 12px), 15px), 8px);
+  .section-cards {
+    padding: 16px;
+    gap: 14px;
   }
 
-  .catalogPage .enrollment{
-    width: 1%;
-    padding: 0px;
-    font-size: max(min(calc(4vw - 12px), 15px), 8px);
-
-  }
-  .catalogPage .meeting-table{
-    width: 10%;
+  .meeting-table-head,
+  .meeting-row {
+    grid-template-columns: repeat(auto-fit, minmax(90px, 1fr));
   }
 
-  .catalogPage .days{
-    width: 9%;
+  .catalogPage .hide-button {
+    display: none;
   }
+}
 
-  .catalogPage .time{
-    width: 9%;
+@media (max-width: 480px) {
+  .catalogPage .course-header {
+    padding: 16px;
   }
 
-  .catalogPage .location{
-    width: 9%;
+  .catalogPage .catalog-button {
+    font-size: 12px;
+    padding: 0.45em 0.65em;
   }
-}
 
-@media (max-width: 768px) { /* Adjust the breakpoint as needed */
-  .section-title{
-    font-size: 20px;
-  }
-  .catalog-section {
-    padding: 10px; /* Add some padding to the section for narrower screens */
-  }
-  .department-table {
-    grid-template-columns: 1fr; /* One column when the screen is under 768 pixels */
+  .section-card {
+    padding: 12px;
   }
-  .department-item {
-    /* flex-basis: 100%; /* Set it to 100% to display one item per row on mobile */
-  }
-  strong{
-    font-size: 14px;
-  }
-
 }
diff --git a/src/CatalogPage.js b/src/CatalogPage.js
index 48859dc..bc65c83 100644
--- a/src/CatalogPage.js
+++ b/src/CatalogPage.js
@@ -1,7 +1,6 @@
 import React, { useState, useEffect, useCallback} from 'react';
 import { useParams, useNavigate} from 'react-router-dom';
-import './Catalog.css'
-import './Catalog.css'
+import './Catalog.css';
 import { requirementMapping } from './RequirementMap';
 
 function CatalogPage() {
@@ -19,6 +18,7 @@ function CatalogPage() {
   const [noDataFound, setNoDataFound] = useState(false);
 
   const [showBackToTop, setShowBackToTop] = useState(false);
+  const [isMobile, setIsMobile] = useState(false);
 
 
   const scrollToTop = () => {
@@ -38,8 +38,18 @@ function CatalogPage() {
       lastScrollY = currentScrollY;
     };
 
+    const handleResize = () => {
+      setIsMobile(window.innerWidth <= 768);
+    };
+
+    handleResize();
+
     window.addEventListener('scroll', handleScroll);
-    return () => window.removeEventListener('scroll', handleScroll);
+    window.addEventListener('resize', handleResize);
+    return () => {
+      window.removeEventListener('scroll', handleScroll);
+      window.removeEventListener('resize', handleResize);
+    };
   }, []);
 
 
@@ -183,16 +193,17 @@ function CatalogPage() {
   };
 
   const generateInstructorHTML = (instructors) => {
-    const elements = [];
-    for (const instructor of instructors){
-      if(instructor.email.length > 0){
-        elements.push(<p><a href={`mailto:${instructor.email}`}>{instructor.name}</a></p>);
-      }
-      else{
-        elements.push(<p>{instructor.name}</p>);
+    return instructors.map((instructor, index) => {
+      if (instructor.email.length > 0) {
+        return (
+          <p key={`${instructor.name}-${instructor.email}`}>
+            <a href={`mailto:${instructor.email}`}>{instructor.name}</a>
+          </p>
+        );
       }
-    }
-    return elements;
+
+      return <p key={`${instructor.name}-${index}`}>{instructor.name}</p>;
+    });
   }
 
 
@@ -269,74 +280,128 @@ function CatalogPage() {
       </button>);
 
     for (const [subject, courseArr] of Object.entries(data)) {
-      elements.push(<h2 className="subject">{subject}</h2>);
+      elements.push(<h2 className="subject" key={`subject-${subject}`}>{subject}</h2>);
       for (const course of courseArr) {
 
         const tableKey = `${course.subject}${course.catalog_number}`;
         const isExpanded = tableExpansions[tableKey];
 
-        const trClassName = `${isExpanded ? 'expanded' : 'collapsed'} animate-expansion`;
-
-        // console.log(`Rendering table ${tableKey}: ${isExpanded ? 'expanded' : 'collapsed'}`);
-        // const trClassName = isExpanded ? 'expanded' : 'collapsed';
-        const table = [];
-        table.push(
-          <tr className="title-header">
-            <th colSpan="4" className='course-title' onClick={() => toggleTableExpansion(tableKey)}>{course.subject} {course.catalog_number}: {course.descr}</th>
-
-            <th className="external-buttons">
-              <div className = "button-container">
-              <th className="sis-button"><a target="_blank" rel="noopener noreferrer" href={getSisLink(course.subject, course.catalog_number) }><button className="catalog-button">SIS</button></a></th>
-              <th><a target="_blank" rel="noopener noreferrer" href={getCourseForumLink(course.subject, course.catalog_number)}><button className="catalog-button">theCourseForum</button></a> </th>
-              <th><a target="_blank" rel="noopener noreferrer" href={getVAGradesLink(course.subject, course.catalog_number)}> <button className="catalog-button hide-button">VA Grades</button></a></th>
-              </div>
-            </th>
-          </tr>
-        );
-
-        table.push(
-          <tr className={`column-names ${trClassName}`}>
-            <th className="section-type">Section Type</th>
-            <th className="section-number">Section Number</th>
-            <th className="instructor">Instructor</th>
-            <th className="enrollment">Enrollment</th>
-            <th className="meeting-table">
-              <div className='meeting-table-head'>
-                <span className='table-header'>Days</span>
-                <span className='table-header'>Time</span>
-              </div>
-            </th>
-          </tr>
-        );
+        const renderCourseSections = () => {
+          if (!isExpanded) {
+            return null;
+          }
 
-        for (const section of course.sessions) {
-          const classSectionString = section.topic !== null ? `${section.class_section} - ${section.topic}` : `${section.class_section}`;
-
-          table.push(<tr className={trClassName}>
-            <td className="section-type">{section.section_type} ({section.units} units)</td>
-            <td className="section-number">{classSectionString}</td>
-            <td className="instructor">{generateInstructorHTML(section.instructors)}</td>
-            <td className="enrollment">{`${section.enrollment_total}/${section.class_capacity}`}</td>
-            <td className='meeting-table'>
-              <div className='meeting-table-content'>
-                {generateMeetingTable(section.meetings)}
+          if (isMobile) {
+            return (
+              <div className="section-cards">
+                {course.sessions.map((section) => {
+                  const classSectionString = section.topic !== null ? `${section.class_section} - ${section.topic}` : `${section.class_section}`;
+
+                  return (
+                    <div className="section-card" key={`${tableKey}-${classSectionString}`}>
+                      <div className="section-card-row">
+                        <span className="section-card-label">Section Type</span>
+                        <div className="section-card-value">{section.section_type} ({section.units} units)</div>
+                      </div>
+                      <div className="section-card-row">
+                        <span className="section-card-label">Section Number</span>
+                        <div className="section-card-value">{classSectionString}</div>
+                      </div>
+                      <div className="section-card-row">
+                        <span className="section-card-label">Instructor</span>
+                        <div className="section-card-value">{generateInstructorHTML(section.instructors)}</div>
+                      </div>
+                      <div className="section-card-row">
+                        <span className="section-card-label">Enrollment</span>
+                        <div className="section-card-value">{`${section.enrollment_total}/${section.class_capacity}`}</div>
+                      </div>
+                      <div className="section-card-row">
+                        <span className="section-card-label">Meetings</span>
+                        <div className="section-card-value meeting-card">
+                          {generateMeetingTable(section.meetings)}
+                        </div>
+                      </div>
+                    </div>
+                  );
+                })}
               </div>
-            </td>
-          </tr>);
-        }
+            );
+          }
 
-          elements.push(
-            <div>
-              <table className={'custom-table'} id={tableKey}>
-                <tbody>{table}</tbody>
+          return (
+            <div className="table-wrapper">
+              <table className="custom-table" aria-label={`${course.subject} ${course.catalog_number} sections`}>
+                <thead>
+                  <tr className="column-names">
+                    <th className="section-type">Section Type</th>
+                    <th className="section-number">Section Number</th>
+                    <th className="instructor">Instructor</th>
+                    <th className="enrollment">Enrollment</th>
+                    <th className="meeting-table">
+                      <div className='meeting-table-head'>
+                        <span className='table-header'>Days</span>
+                        <span className='table-header'>Time</span>
+                      </div>
+                    </th>
+                  </tr>
+                </thead>
+                <tbody>
+                  {course.sessions.map((section) => {
+                    const classSectionString = section.topic !== null ? `${section.class_section} - ${section.topic}` : `${section.class_section}`;
+
+                    return (
+                      <tr key={`${tableKey}-${classSectionString}`}>
+                        <td className="section-type">{section.section_type} ({section.units} units)</td>
+                        <td className="section-number">{classSectionString}</td>
+                        <td className="instructor">{generateInstructorHTML(section.instructors)}</td>
+                        <td className="enrollment">{`${section.enrollment_total}/${section.class_capacity}`}</td>
+                        <td className='meeting-table'>
+                          <div className='meeting-table-content'>
+                            {generateMeetingTable(section.meetings)}
+                          </div>
+                        </td>
+                      </tr>
+                    );
+                  })}
+                </tbody>
               </table>
             </div>
           );
-
-          if (isExpanded) {
-            elements.push(<br />);
-            elements.push(<br />);
-          }
+        };
+
+        const handleToggle = () => toggleTableExpansion(tableKey);
+
+        elements.push(
+          <div className="course-container" id={tableKey} key={`course-${tableKey}`}>
+            <div
+              className="course-header"
+              role="button"
+              tabIndex={0}
+              aria-expanded={isExpanded}
+              onClick={handleToggle}
+              onKeyDown={(event) => {
+                if (event.key === 'Enter' || event.key === ' ') {
+                  event.preventDefault();
+                  handleToggle();
+                }
+              }}
+            >
+              <div className='course-title'>
+                {course.subject} {course.catalog_number}: {course.descr}
+              </div>
+              <div
+                className="button-container"
+                onClick={(event) => event.stopPropagation()}
+                onKeyDown={(event) => event.stopPropagation()}
+              >
+                <a target="_blank" rel="noopener noreferrer" href={getSisLink(course.subject, course.catalog_number) }><button className="catalog-button">SIS</button></a>
+                <a target="_blank" rel="noopener noreferrer" href={getCourseForumLink(course.subject, course.catalog_number)}><button className="catalog-button">theCourseForum</button></a>
+                <a target="_blank" rel="noopener noreferrer" href={getVAGradesLink(course.subject, course.catalog_number)}> <button className="catalog-button hide-button">VA Grades</button></a>
+              </div>
+            </div>
+            {renderCourseSections()}
+          </div>
+        );
 
       }
     }