small fixes

Author: LSKpr

my-app/src/presenters/ListViewPresenter.jsx

@@ -6,14 +6,12 @@ import CoursePagePopup from '../views/Components/CoursePagePopup.jsx';
 import PrerequisitePresenter from './PrerequisitePresenter.jsx';
 
 const ListViewPresenter = observer(({ model }) => {
-
-<<<<<<< HEAD
-    
-    
-    const [isPopupOpen, setIsPopupOpen] = useState(false);
-    const [selectedCourse, setSelectedCourse] = useState(null);
-    const preP = <PrerequisitePresenter model={model} selectedCourse={selectedCourse} />
-=======
+    const addFavourite = (course) => {
+        model.addFavourite(course);
+    }
+    const removeFavourite = (course) => {
+        model.removeFavourite(course);
+    }
     const handleFavouriteClick = (course) => {
         if (model.favourites.some(fav => fav.code === course.code)) {
             model.removeFavourite(course);
@@ -24,16 +22,8 @@ const ListViewPresenter = observer(({ model }) => {
 
     const [isPopupOpen, setIsPopupOpen] = useState(false);
     const [selectedCourse, setSelectedCourse] = useState(null);
-    const preP = <PrerequisitePresenter model={model} selectedCourse={selectedCourse}/>
-    const popup = <CoursePagePopup isOpen={isPopupOpen} onClose={() => setIsPopupOpen(false)} course={selectedCourse} handleFavouriteClick={handleFavouriteClick} prerequisiteTree={preP}/>
+    const preP = <PrerequisitePresenter model={model} selectedCourse={selectedCourse} />
 
->>>>>>> a6593340b954b95fa693730a4ba199b2268736ff
-    const addFavourite = (course) => {
-        model.addFavourite(course);
-    }
-    const removeFavourite = (course) => {
-        model.removeFavourite(course);
-    }
     const popup = <CoursePagePopup
         favouriteCourses={model.favourites}
         addFavourite={addFavourite}

my-app/src/views/Components/CoursePagePopup.jsx

@@ -1,5 +1,4 @@
 import React, { useEffect, useRef } from 'react'
-import React, { useEffect, useRef } from 'react'
 
 function CoursePagePopup({ favouriteCourses, addFavourite,
   removeFavourite, isOpen, onClose, course, prerequisiteTree }) {
@@ -42,7 +41,6 @@ function CoursePagePopup({ favouriteCourses, addFavourite,
       onClick={onClose}
     >
       <div
-        className="bg-indigo-300/75 backdrop-blur-lg h-full w-3/4 flex flex-col overflow-auto"
         className="bg-indigo-300/75 backdrop-blur-lg h-full w-3/4 flex flex-col overflow-auto"
         onClick={(e) => e.stopPropagation()}
       >
@@ -57,14 +55,13 @@ function CoursePagePopup({ favouriteCourses, addFavourite,
                 </span>
               </h2>
               <div className="my-6 h-1.5 w-full bg-violet-500"></div>
-              <div className="my-6 h-1.5 w-full bg-violet-500"></div>
             </div>
             <div>
               <button
                 className="text-yellow-500 bg-yellow-400 cursor-pointer"
                 onClick={(e) => {
                   e.stopPropagation(); // prevent popup from opening
-                  PaymentResponse.handleFavouriteClick(course.code);
+                  handleFavouriteClick(course.code);
                 }}
               >
                 {favouriteCourses.includes(course.code)
@@ -75,12 +72,9 @@ function CoursePagePopup({ favouriteCourses, addFavourite,
 
             {/* Description Section */}
             <div>
-              <h3 className="text-2xl font-bold text-[#2e2e4f] mb-0.5">Course Description</h3>
-              <div className="mb-3 h-0.5 w-full bg-violet-500"></div>
               <h3 className="text-2xl font-bold text-[#2e2e4f] mb-0.5">Course Description</h3>
               <div className="mb-3 h-0.5 w-full bg-violet-500"></div>
               <div
-                className="text-lg leading-8 text-[#2e2e4f] font-semibold tracking-wide prose prose-slate max-w-full"
                 className="text-lg leading-8 text-[#2e2e4f] font-semibold tracking-wide prose prose-slate max-w-full"
                 dangerouslySetInnerHTML={{ __html: course.description }}
               />
@@ -105,8 +99,6 @@ function CoursePagePopup({ favouriteCourses, addFavourite,
             </div>
             {/* Reviews Section */}
             <div>
-              <h3 className="text-2xl font-semibold text-[#2e2e4f] mb-0.5">Reviews</h3>
-              <div className="mb-4 h-0.5 w-full bg-violet-500"></div>
               <h3 className="text-2xl font-semibold text-[#2e2e4f] mb-0.5">Reviews</h3>
               <div className="mb-4 h-0.5 w-full bg-violet-500"></div>
               <p className="text-lg text-slate-700 leading-7">Here would be some reviews of the course...</p>