Rename CoursePopup

Old one to "Old", remove "2" from new one

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',

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<typeof CoursePopup2> = {
+const meta: Meta<typeof CoursePopup> = {
     title: 'Components/Injected/CoursePopup2',
-    component: CoursePopup2,
+    component: CoursePopup,
     argTypes: {
         onClose: { action: 'onClose' },
     },
 };
 
 export default meta;
-type Story = StoryObj<typeof CoursePopup2>;
+type Story = StoryObj<typeof CoursePopup>;
 
 export const Default: Story = {
     args: {

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';

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 (
-        <Popup className={styles.popup} overlay onClose={onClose}>
-            <CourseHeader course={course} activeSchedule={activeSchedule} onClose={onClose} />
-            <CourseDescription course={course} />
-            <GradeDistribution course={course} />
+const CoursePopup = ({ course, activeSchedule, onClose }: CoursePopup2Props) => (
+    <Popup overlay className='px-6' onClose={onClose}>
+        <div className='flex flex-col'>
+            <CourseHeadingAndActions course={course} onClose={onClose} activeSchedule={activeSchedule} />
+        </div>
     </Popup>
-    );
-}
+);
+export default CoursePopup;

src/views/components/injected/CoursePopup2/CoursePopup2.tsx

@@ -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) => (
-    <Popup overlay className='px-6' onClose={onClose}>
-        <div className='flex flex-col'>
-            <CourseHeadingAndActions course={course} onClose={onClose} activeSchedule={activeSchedule} />
-        </div>
-    </Popup>
-);
-export default CoursePopup2;

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 (
+        <Popup className={styles.popup} overlay onClose={onClose}>
+            <CourseHeader course={course} activeSchedule={activeSchedule} onClose={onClose} />
+            <CourseDescription course={course} />
+            <GradeDistribution course={course} />
+        </Popup>
+    );
+}