diff --git a/src/stories/injected/CoursePopup.stories.ts b/src/stories/injected/CoursePopup.stories.ts index d7a6dd2d..df4fa932 100644 --- a/src/stories/injected/CoursePopup.stories.ts +++ b/src/stories/injected/CoursePopup.stories.ts @@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react'; import { Course, Status } from 'src/shared/types/Course'; import { CourseMeeting } from 'src/shared/types/CourseMeeting'; import { UserSchedule } from 'src/shared/types/UserSchedule'; -import CoursePopup from 'src/views/components/injected/CoursePopup/CoursePopup'; +import CoursePopup from 'src/views/components/injected/CoursePopupOld/CoursePopup'; const exampleCourse: Course = new Course({ courseName: 'ELEMS OF COMPTRS/PROGRAMMNG-WB', diff --git a/src/stories/injected/CoursePopup2.stories.ts b/src/stories/injected/CoursePopup2.stories.ts index c81fb06c..1ea17832 100644 --- a/src/stories/injected/CoursePopup2.stories.ts +++ b/src/stories/injected/CoursePopup2.stories.ts @@ -4,7 +4,7 @@ import { CourseMeeting, DAY_MAP } from 'src/shared/types/CourseMeeting'; import { CourseSchedule } from 'src/shared/types/CourseSchedule'; import Instructor from 'src/shared/types/Instructor'; -import CoursePopup2 from 'src/views/components/injected/CoursePopup2/CoursePopup2'; +import CoursePopup from 'src/views/components/injected/CoursePopup/CoursePopup'; const exampleCourse: Course = new Course({ uniqueId: 50805, @@ -48,16 +48,16 @@ const exampleCourse: Course = new Course({ }, }); -const meta: Meta = { +const meta: Meta = { title: 'Components/Injected/CoursePopup2', - component: CoursePopup2, + component: CoursePopup, argTypes: { onClose: { action: 'onClose' }, }, }; export default meta; -type Story = StoryObj; +type Story = StoryObj; export const Default: Story = { args: { diff --git a/src/views/components/CourseCatalogMain.tsx b/src/views/components/CourseCatalogMain.tsx index c5e7e5da..723f5e7b 100644 --- a/src/views/components/CourseCatalogMain.tsx +++ b/src/views/components/CourseCatalogMain.tsx @@ -8,7 +8,7 @@ import { SiteSupport } from '../lib/getSiteSupport'; import { populateSearchInputs } from '../lib/populateSearchInputs'; import ExtensionRoot from './common/ExtensionRoot/ExtensionRoot'; import AutoLoad from './injected/AutoLoad/AutoLoad'; -import CoursePopup from './injected/CoursePopup/CoursePopup'; +import CoursePopup from './injected/CoursePopupOld/CoursePopup'; import RecruitmentBanner from './injected/RecruitmentBanner/RecruitmentBanner'; import TableHead from './injected/TableHead'; import TableRow from './injected/TableRow/TableRow'; diff --git a/src/views/components/injected/CoursePopup2/CourseHeadingAndActions.tsx b/src/views/components/injected/CoursePopup/CourseHeadingAndActions.tsx similarity index 100% rename from src/views/components/injected/CoursePopup2/CourseHeadingAndActions.tsx rename to src/views/components/injected/CoursePopup/CourseHeadingAndActions.tsx diff --git a/src/views/components/injected/CoursePopup/CoursePopup.tsx b/src/views/components/injected/CoursePopup/CoursePopup.tsx index 8cc99978..320ed7cb 100644 --- a/src/views/components/injected/CoursePopup/CoursePopup.tsx +++ b/src/views/components/injected/CoursePopup/CoursePopup.tsx @@ -1,27 +1,20 @@ -import { Course } from '@shared/types/Course'; -import { UserSchedule } from '@shared/types/UserSchedule'; +import Popup from '@views/components/common/Popup/Popup'; import React from 'react'; -import Popup from '../../common/Popup/Popup'; -import CourseDescription from './CourseDescription/CourseDescription'; -import CourseHeader from './CourseHeader/CourseHeader'; -import styles from './CoursePopup.module.scss'; -import GradeDistribution from './GradeDistribution/GradeDistribution'; +import { Course } from 'src/shared/types/Course'; +import { UserSchedule } from 'src/shared/types/UserSchedule'; +import CourseHeadingAndActions from './CourseHeadingAndActions'; -interface Props { +interface CoursePopup2Props { course: Course; activeSchedule?: UserSchedule; onClose: () => void; } -/** - * The popup that appears when the user clicks on a course for more details. - */ -export default function CoursePopup({ course, activeSchedule, onClose }: Props) { - return ( - - - - - - ); -} +const CoursePopup = ({ course, activeSchedule, onClose }: CoursePopup2Props) => ( + +
+ +
+
+); +export default CoursePopup; diff --git a/src/views/components/injected/CoursePopup2/CoursePopup2.tsx b/src/views/components/injected/CoursePopup2/CoursePopup2.tsx deleted file mode 100644 index 407fd0fa..00000000 --- a/src/views/components/injected/CoursePopup2/CoursePopup2.tsx +++ /dev/null @@ -1,20 +0,0 @@ -import Popup from '@views/components/common/Popup/Popup'; -import React from 'react'; -import { Course } from 'src/shared/types/Course'; -import { UserSchedule } from 'src/shared/types/UserSchedule'; -import CourseHeadingAndActions from './CourseHeadingAndActions'; - -interface CoursePopup2Props { - course: Course; - activeSchedule?: UserSchedule; - onClose: () => void; -} - -const CoursePopup2 = ({ course, activeSchedule, onClose }: CoursePopup2Props) => ( - -
- -
-
-); -export default CoursePopup2; diff --git a/src/views/components/injected/CoursePopup/CourseDescription/CourseDescription.module.scss b/src/views/components/injected/CoursePopupOld/CourseDescription/CourseDescription.module.scss similarity index 100% rename from src/views/components/injected/CoursePopup/CourseDescription/CourseDescription.module.scss rename to src/views/components/injected/CoursePopupOld/CourseDescription/CourseDescription.module.scss diff --git a/src/views/components/injected/CoursePopup/CourseDescription/CourseDescription.tsx b/src/views/components/injected/CoursePopupOld/CourseDescription/CourseDescription.tsx similarity index 100% rename from src/views/components/injected/CoursePopup/CourseDescription/CourseDescription.tsx rename to src/views/components/injected/CoursePopupOld/CourseDescription/CourseDescription.tsx diff --git a/src/views/components/injected/CoursePopup/CourseHeader/CourseButtons/CourseButtons.module.scss b/src/views/components/injected/CoursePopupOld/CourseHeader/CourseButtons/CourseButtons.module.scss similarity index 100% rename from src/views/components/injected/CoursePopup/CourseHeader/CourseButtons/CourseButtons.module.scss rename to src/views/components/injected/CoursePopupOld/CourseHeader/CourseButtons/CourseButtons.module.scss diff --git a/src/views/components/injected/CoursePopup/CourseHeader/CourseButtons/CourseButtons.tsx b/src/views/components/injected/CoursePopupOld/CourseHeader/CourseButtons/CourseButtons.tsx similarity index 100% rename from src/views/components/injected/CoursePopup/CourseHeader/CourseButtons/CourseButtons.tsx rename to src/views/components/injected/CoursePopupOld/CourseHeader/CourseButtons/CourseButtons.tsx diff --git a/src/views/components/injected/CoursePopup/CourseHeader/CourseHeader.module.scss b/src/views/components/injected/CoursePopupOld/CourseHeader/CourseHeader.module.scss similarity index 100% rename from src/views/components/injected/CoursePopup/CourseHeader/CourseHeader.module.scss rename to src/views/components/injected/CoursePopupOld/CourseHeader/CourseHeader.module.scss diff --git a/src/views/components/injected/CoursePopup/CourseHeader/CourseHeader.tsx b/src/views/components/injected/CoursePopupOld/CourseHeader/CourseHeader.tsx similarity index 100% rename from src/views/components/injected/CoursePopup/CourseHeader/CourseHeader.tsx rename to src/views/components/injected/CoursePopupOld/CourseHeader/CourseHeader.tsx diff --git a/src/views/components/injected/CoursePopup/CoursePopup.module.scss b/src/views/components/injected/CoursePopupOld/CoursePopup.module.scss similarity index 100% rename from src/views/components/injected/CoursePopup/CoursePopup.module.scss rename to src/views/components/injected/CoursePopupOld/CoursePopup.module.scss diff --git a/src/views/components/injected/CoursePopupOld/CoursePopup.tsx b/src/views/components/injected/CoursePopupOld/CoursePopup.tsx new file mode 100644 index 00000000..8cc99978 --- /dev/null +++ b/src/views/components/injected/CoursePopupOld/CoursePopup.tsx @@ -0,0 +1,27 @@ +import { Course } from '@shared/types/Course'; +import { UserSchedule } from '@shared/types/UserSchedule'; +import React from 'react'; +import Popup from '../../common/Popup/Popup'; +import CourseDescription from './CourseDescription/CourseDescription'; +import CourseHeader from './CourseHeader/CourseHeader'; +import styles from './CoursePopup.module.scss'; +import GradeDistribution from './GradeDistribution/GradeDistribution'; + +interface Props { + course: Course; + activeSchedule?: UserSchedule; + onClose: () => void; +} + +/** + * The popup that appears when the user clicks on a course for more details. + */ +export default function CoursePopup({ course, activeSchedule, onClose }: Props) { + return ( + + + + + + ); +} diff --git a/src/views/components/injected/CoursePopup/GradeDistribution/GradeDistribution.module.scss b/src/views/components/injected/CoursePopupOld/GradeDistribution/GradeDistribution.module.scss similarity index 100% rename from src/views/components/injected/CoursePopup/GradeDistribution/GradeDistribution.module.scss rename to src/views/components/injected/CoursePopupOld/GradeDistribution/GradeDistribution.module.scss diff --git a/src/views/components/injected/CoursePopup/GradeDistribution/GradeDistribution.tsx b/src/views/components/injected/CoursePopupOld/GradeDistribution/GradeDistribution.tsx similarity index 100% rename from src/views/components/injected/CoursePopup/GradeDistribution/GradeDistribution.tsx rename to src/views/components/injected/CoursePopupOld/GradeDistribution/GradeDistribution.tsx