Merge branch 'jhuopensource:develop' into feature/evaluations

jhuopensource · Dec 7, 2023 · d84037f · d84037f
2 parents 77d9d57 + 0cd718f
commit d84037f
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/docs/frontend.rst b/docs/frontend.rst
@@ -122,27 +122,27 @@ Modals
 +-------------------------------+--------------------------------------------------+--------------------------+
 | Component File                | Screenshot                                       | Description              |
 +===============================+==================================================+==========================+
-|``course_modal_body.jsx``      | .. image:: components/course_modal_body.png      |                          |
+|``CourseModalBody.tsx``        | .. image:: components/course_modal_body.png      |                          |
 +-------------------------------+--------------------------------------------------+--------------------------+
-|``course_modal.jsx``           | .. image:: components/course_modal.png           |                          |
+|``CousreModal.tsx``            | .. image:: components/course_modal.png           |                          |
 +-------------------------------+--------------------------------------------------+--------------------------+
 |``AdvancedSearchModal.jsx``    | .. image:: components/exploration_modal.png      |                          |
 +-------------------------------+--------------------------------------------------+--------------------------+
 |``final_exams_modal.jsx``      | .. image:: components/final_exams_modal.png      |                          |
 +-------------------------------+--------------------------------------------------+--------------------------+
-|``peer_modal.jsx``             | .. image:: components/peer_modal.png             |                          |
+|``PeerModal.tsx``              | .. image:: components/peer_modal.png             |                          |
 +-------------------------------+--------------------------------------------------+--------------------------+
 |``preference_modal.jsx``       | .. image:: components/preference_modal.png       |                          |
 +-------------------------------+--------------------------------------------------+--------------------------+
-|``save_calendar_modal.jsx``    | .. image:: components/save_calendar_modal.png    |                          |
+|``SaveCalendarModal.tsx``      | .. image:: components/save_calendar_modal.png    |                          |
 +-------------------------------+--------------------------------------------------+--------------------------+
-|``signup_modal.jsx``           | .. image:: components/signup_modal.png           |                          |
+|``SignupModal.tsx``            | .. image:: components/signup_modal.png           |                          |
 +-------------------------------+--------------------------------------------------+--------------------------+
-|``tut_modal.jsx``              | .. image:: components/tut_modal.png              |                          |
+|``TutorialModal.tsx``          | .. image:: components/tut_modal.png              |                          |
 +-------------------------------+--------------------------------------------------+--------------------------+
-|``user_acquisition_modal.jsx`` | .. image:: components/user_acquisition_modal.png |                          |
+|``UserAquisitionModal.tsx``    | .. image:: components/user_acquisition_modal.png |                          |
 +-------------------------------+--------------------------------------------------+--------------------------+
-|``user_settings_modal.jsx``    | .. image:: components/user_settings_modal.png    |                          |
+|``UserSettingsModal.tsx``      | .. image:: components/user_settings_modal.png    |                          |
 +-------------------------------+--------------------------------------------------+--------------------------+
 
 General Components
@@ -154,7 +154,7 @@ General Components
 +-------------------------------+--------------------------------------------------+--------------------------+
 |``Calendar.tsx``               | .. image:: components/calendar.png               |                          |
 +-------------------------------+--------------------------------------------------+--------------------------+
-|``course_modal_section.jsx``   | .. image:: components/course_modal_section.png   |                          |
+|``CourseModalSelection.tsx``   | .. image:: components/course_modal_section.png   |                          |
 +-------------------------------+--------------------------------------------------+--------------------------+
 |``CreditTicker.tsx``           | .. image:: components/credit_ticker.png          |                          |
 +-------------------------------+--------------------------------------------------+--------------------------+
@@ -188,7 +188,7 @@ General Components
 +-------------------------------+--------------------------------------------------+--------------------------+
 |``SlotManager.tsx``            | .. image:: components/slot_manager.png           |                          |
 +-------------------------------+--------------------------------------------------+--------------------------+
-|``slot.jsx``                   | .. image:: components/slot.png                   |                          |
+|``Slot.tsx``                   | .. image:: components/slot.png                   |                          |
 +-------------------------------+--------------------------------------------------+--------------------------+
 |``social_profile.jsx``         | .. image:: components/social_profile.png         |                          |
 +-------------------------------+--------------------------------------------------+--------------------------+
@@ -198,7 +198,7 @@ General Components
 +-------------------------------+--------------------------------------------------+--------------------------+
 | ``timetable_loader.jsx``      | .. image:: components/timetable_loader.png       |                          |
 +-------------------------------+--------------------------------------------------+--------------------------+
-| ``timetable_name_input.jsx``  | .. image:: components/timetable_name_input.png   |                          |
+| ``TimetableNameInput.tsx``    | .. image:: components/timetable_name_input.png   |                          |
 +-------------------------------+--------------------------------------------------+--------------------------+
 | ``TopBar.tsx``                | .. image:: components/top_bar.png                |                          |
 +-------------------------------+--------------------------------------------------+--------------------------+
diff --git a/static/css/timetable/modules/evaluation.scss b/static/css/timetable/modules/evaluation.scss
@@ -132,7 +132,7 @@
   width: 90px;
 }
 
-.col-3-16 {
+.col-4-16 {
   .star-ratings-sprite {
     margin-left: 50%;
     transform: translateX(-50%);

diff --git a/static/js/redux/__tests__/modals/__snapshots__/course_modal_body.test.jsx.snap b/static/js/redux/__tests__/modals/__snapshots__/course_modal_body.test.jsx.snap
@@ -9,7 +9,7 @@ exports[`CourseModalBody correctly renders 1`] = `
       class="cf"
     >
       <div
-        class="col-3-16"
+        class="col-4-16"
       >
         <div
           class="credits"
@@ -568,7 +568,7 @@ exports[`CourseModalBody correctly renders 1`] = `
         </div>
       </div>
       <div
-        class="col-5-16 cf"
+        class="col-4-16 cf"
         id="modal-section-lists"
       >
         <div>

diff --git a/static/js/redux/ui/modals/CourseModalBody.tsx b/static/js/redux/ui/modals/CourseModalBody.tsx
@@ -538,7 +538,7 @@ const CourseModalBody = (props: CourseModalBodyProps) => {
   return (
     <div className="modal-body">
       <div className="cf">
-        <div className="col-3-16">
+        <div className="col-4-16">
           <div className="credits">
             <h3>{numCredits}</h3>
             <h4>{creditsSuffix}</h4>
@@ -582,7 +582,7 @@ const CourseModalBody = (props: CourseModalBodyProps) => {
             <EvaluationList evalInfo={evalInfo} />
           </div>
         </div>
-        <div id="modal-section-lists" className="col-5-16 cf">
+        <div id="modal-section-lists" className="col-4-16 cf">
           {!isComparingTimetables && sectionGrid}
           {similarCourses}
         </div>

diff --git a/static/js/redux/ui/slot_hover_tip.jsx b/static/js/redux/ui/slot_hover_tip.jsx
@@ -27,7 +27,7 @@ const SlotHoverTip = ({ num, code, name, getShareLinkFromModal }) => {
   const maxColourIndex = colorData.length - 1;
   return (
     <a href={getShareLinkFromModal(code)} className="course-link" key={num}>
-      <span>{code}</span>
+      <span>{name}</span>
       <span
         className="course-link-tip"
         style={{