fix: revert last commit

This reverts commit 3c7b35d.
Longhorn-Developers · Mar 6, 2024 · 27d945f · 27d945f
1 parent aef8c3d
commit 27d945f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/src/stories/components/CalendarCourseCell.stories.tsx b/src/stories/components/CalendarCourseCell.stories.tsx
@@ -56,7 +56,7 @@ export const Default: Story = {
             schedule: new CourseSchedule({
                 meetings: [
                     new CourseMeeting({
-                        days: [DAY_MAP.MON, DAY_MAP.WED, DAY_MAP.FRI],
+                        days: [DAY_MAP.M, DAY_MAP.W, DAY_MAP.F],
                         startTime: 480,
                         endTime: 570,
                         location: {

diff --git a/src/views/components/common/CalendarCourseCell/CalendarCourseCell.tsx b/src/views/components/common/CalendarCourseCell/CalendarCourseCell.tsx
@@ -6,7 +6,7 @@ import WaitlistIcon from '~icons/material-symbols/timelapse';
 import CancelledIcon from '~icons/material-symbols/warning';
 import Text from '../Text/Text';
 
-export interface CalendarCourseBlockProps {
+export interface CalendarCourseCellProps {
     /** The Course that the meeting is for. */
     course: Course;
     /* index into course meeting array to display */
@@ -15,7 +15,7 @@ export interface CalendarCourseBlockProps {
     color: string;
 }
 
-const CalendarCourseBlock: React.FC<CalendarCourseBlockProps> = ({ course, meetingIdx }: CalendarCourseBlockProps) => {
+const CalendarCourseCell: React.FC<CalendarCourseCellProps> = ({ course, meetingIdx }: CalendarCourseCellProps) => {
     let meeting: CourseMeeting | null = meetingIdx !== undefined ? course.schedule.meetings[meetingIdx] : null;
     let rightIcon: React.ReactNode | null = null;
     if (status === Status.WAITLISTED) {
@@ -60,4 +60,4 @@ const CalendarCourseBlock: React.FC<CalendarCourseBlockProps> = ({ course, meeti
     );
 };
 
-export default CalendarCourseBlock;
+export default CalendarCourseCell;
diff --git a/src/views/components/common/CalendarGrid/CalendarGrid.tsx b/src/views/components/common/CalendarGrid/CalendarGrid.tsx
@@ -2,7 +2,9 @@ import React from 'react';
 import { DAY_MAP } from 'src/shared/types/CourseMeeting';
 import styles from './CalendarGrid.module.scss';
 import CalendarCell from '../CalendarGridCell/CalendarGridCell';
-import { CourseMeeting } from 'src/shared/types/CourseMeeting';
+import CalendarCourseCell from '../CalendarCourseCell/CalendarCourseCell';
+import { Chip } from '../Chip/Chip';
+
 
 const daysOfWeek = Object.keys(DAY_MAP).filter(key => !['S', 'SU'].includes(key));
 const hoursOfDay = Array.from({ length: 14 }, (_, index) => index + 8);
@@ -22,14 +24,14 @@ for (let i = 0; i < 13; i++) {
 }
 
 interface Props {
-    CourseMeetingBlocks: CourseMeeting[];
+    courseCells: typeof CalendarCourseCell[];
 }
 
 /**
  * Grid of CalendarGridCell components forming the user's course schedule calendar view
  * @param props
  */
-export function Calendar({ courseMeetingBlocks }: React.PropsWithChildren<Props>): JSX.Element {
+export function Calendar({ courseCells }: React.PropsWithChildren<Props>): JSX.Element {
 
     return (
         <div className={styles.calendar}>
@@ -54,12 +56,16 @@ export function Calendar({ courseMeetingBlocks }: React.PropsWithChildren<Props>
                             {day}
                         </div>
                     ))}
-                    {grid.map((row, rowIndex) => row)}
+                    {grid.map((row) => row)}
                 </div>
             </div>
-            {courseMeetingBlocks.map((block: CourseMeeting, index: number) => (
-                <div key={index}>
-                    {block}
+            {courseCells.map((Block: typeof CalendarCourseCell) => (
+                <div key={`${Block}`} 
+                     style ={{
+                            gridColumn: `1`,
+                            gridRow: `1`
+                     }}>
+                    <Chip label='test'/>
                 </div>
             ))}
         </div>