bug fix

Author: LSKpr

my-app/src/model.js

@@ -252,9 +252,14 @@ export const model = {
     },
 
     setPopupOpen(isOpen) {
-        if (isOpen && this.selectedCourse) {
-            this.addHistoryItem(this.selectedCourse.code);
-        }
+        console.log("OPENING/CLOSING A POPUP");
+        // if (isOpen && this.selectedCourse) {
+        //     // this.addHistoryItem(this.selectedCourse.code);
+        //     console.log("user path history:")
+        //     for (let index = 0; index < this.searchHistory.length; index++) {
+        //         console.log(this.searchHistory[index]);
+        //     }
+        // }
         this.isPopupOpen = isOpen;
     },
 

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

@@ -179,7 +179,7 @@ function CoursePagePopup({
 							<h3 className="text-2xl font-bold text-[#2e2e4f] mb-0.5">Learning Outcomes:</h3>
 							<div className="mb-3 h-0.5 w-full bg-violet-500"></div>
 							{course.learning_outcomes && course.learning_outcomes.trim() &&
-								course.description.trim() !== "null" ? (
+								course.learning_outcomes.trim() !== "null" ? (
 								<div
 									className="text-lg leading-8 text-[#2e2e4f] font-semibold tracking-wide prose prose-slate max-w-full"
 									dangerouslySetInnerHTML={{ __html: course.learning_outcomes }}
@@ -219,8 +219,8 @@ function CoursePagePopup({
 						<div>
 							<h3 className="text-2xl font-bold text-[#2e2e4f] mb-0.5">Prerequisites:</h3>
 							<div className="mb-3 h-0.5 w-full bg-violet-500"></div>
-							{course.prerequisites_text && course.prerequisites_text.trim() &&
-								course.description.trim() !== "null" ? (
+							{(course.prerequisites_text && course.prerequisites_text.trim() &&
+								course.prerequisites_text.trim() !== "null" )? (
 								<div
 									className="text-lg leading-8 text-[#2e2e4f] font-semibold tracking-wide prose prose-slate max-w-full"
 									dangerouslySetInnerHTML={{ __html: course.prerequisites_text }}

my-app/src/views/ListView.jsx

@@ -32,10 +32,6 @@ function ListView(props) {
         let ret_string = "";
         if (periods) {
             let keys = Object.keys(periods);
-<<<<<<< HEAD
-            // console.log(periods["P1"])
-=======
->>>>>>> ea9693aeba997f0e8f5baec1d13a0654cf5fe642
             for (let key of keys) {
                 if (periods[key]) {
                     ret_string += key + " | ";