Skip to content

Commit

Permalink
Revert "update"
Browse files Browse the repository at this point in the history
This reverts commit 8edd062.
  • Loading branch information
knownotunknown committed Feb 17, 2024
1 parent 8edd062 commit 3c7b35d
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 17 deletions.
2 changes: 1 addition & 1 deletion src/stories/components/CalendarCourseCell.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export const Default: Story = {
schedule: new CourseSchedule({
meetings: [
new CourseMeeting({
days: [DAY_MAP.M, DAY_MAP.W, DAY_MAP.F],
days: [DAY_MAP.MON, DAY_MAP.WED, DAY_MAP.FRI],
startTime: 480,
endTime: 570,
location: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 CalendarCourseCellProps {
export interface CalendarCourseBlockProps {
/** The Course that the meeting is for. */
course: Course;
/* index into course meeting array to display */
Expand All @@ -15,7 +15,7 @@ export interface CalendarCourseCellProps {
color: string;
}

const CalendarCourseCell: React.FC<CalendarCourseCellProps> = ({ course, meetingIdx }: CalendarCourseCellProps) => {
const CalendarCourseBlock: React.FC<CalendarCourseBlockProps> = ({ course, meetingIdx }: CalendarCourseBlockProps) => {
let meeting: CourseMeeting | null = meetingIdx !== undefined ? course.schedule.meetings[meetingIdx] : null;
let rightIcon: React.ReactNode | null = null;
if (course.status === Status.WAITLISTED) {
Expand Down Expand Up @@ -47,4 +47,4 @@ const CalendarCourseCell: React.FC<CalendarCourseCellProps> = ({ course, meeting
);
};

export default CalendarCourseCell;
export default CalendarCourseBlock;
20 changes: 7 additions & 13 deletions src/views/components/common/CalendarGrid/CalendarGrid.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ import React from 'react';
import { DAY_MAP } from 'src/shared/types/CourseMeeting';
import styles from './CalendarGrid.module.scss';
import CalendarCell from '../CalendarGridCell/CalendarGridCell';
import CalendarCourseCell from '../CalendarCourseCell/CalendarCourseCell';
import { Chip } from '../Chip/Chip';

import { CourseMeeting } from 'src/shared/types/CourseMeeting';

const daysOfWeek = Object.keys(DAY_MAP).filter(key => !['S', 'SU'].includes(key));
const hoursOfDay = Array.from({ length: 14 }, (_, index) => index + 8);
Expand All @@ -24,14 +22,14 @@ for (let i = 0; i < 13; i++) {
}

interface Props {
courseCells: typeof CalendarCourseCell[];
CourseMeetingBlocks: CourseMeeting[];
}

/**
* Grid of CalendarGridCell components forming the user's course schedule calendar view
* @param props
*/
export function Calendar({ courseCells }: React.PropsWithChildren<Props>): JSX.Element {
export function Calendar({ courseMeetingBlocks }: React.PropsWithChildren<Props>): JSX.Element {

return (
<div className={styles.calendar}>
Expand All @@ -56,16 +54,12 @@ export function Calendar({ courseCells }: React.PropsWithChildren<Props>): JSX.E
{day}
</div>
))}
{grid.map((row) => row)}
{grid.map((row, rowIndex) => row)}
</div>
</div>
{courseCells.map((Block: typeof CalendarCourseCell) => (
<div key={`${Block}`}
style ={{
gridColumn: `1`,
gridRow: `1`
}}>
<Chip label='test'/>
{courseMeetingBlocks.map((block: CourseMeeting, index: number) => (
<div key={index}>
{block}
</div>
))}
</div>
Expand Down

0 comments on commit 3c7b35d

Please sign in to comment.