-
+ /* The sidebar styling(under the menu)*/
+
+ { /* If sidebar is open, set length to 400px, else it should not be visible */}
+
+
-
+
+
+
-
+
+ {/* The button to open the menu */}
+
+
+
+
+
-
+
+
-
- );
+
)
}
function App({ model }) {
diff --git a/my-app/src/presenters/PrerequisitePresenter.jsx b/my-app/src/presenters/PrerequisitePresenter.jsx
index 2219fa41..90b9b213 100644
--- a/my-app/src/presenters/PrerequisitePresenter.jsx
+++ b/my-app/src/presenters/PrerequisitePresenter.jsx
@@ -459,7 +459,8 @@ export const PrerequisitePresenter = observer((props) => {
let key = Object.keys(prereqs);
if (prereqs[key] === true) {
return true;
- } else {
+ }
+ else {
return false;
}
diff --git a/my-app/src/styles.css b/my-app/src/styles.css
index 0b707bad..3f3106ad 100644
--- a/my-app/src/styles.css
+++ b/my-app/src/styles.css
@@ -21,4 +21,12 @@
.react-flow__node.no-handles .react-flow__handle {
display: none;
- }
\ No newline at end of file
+ }
+
+.bm-burger-button {
+ position: absolute;
+ width: 36px;
+ height: 36px;
+ left: 36px;
+ top: 36px;
+}
\ No newline at end of file
diff --git a/my-app/src/views/Components/CoursePagePopup.jsx b/my-app/src/views/Components/CoursePagePopup.jsx
index 98232c50..8785d5ea 100644
--- a/my-app/src/views/Components/CoursePagePopup.jsx
+++ b/my-app/src/views/Components/CoursePagePopup.jsx
@@ -13,7 +13,7 @@ function CoursePagePopup({
}) {
const treeRef = useRef(null);
- const [showOverlay, setShowOverlay] = useState(true);
+ const [showOverlay, setShowOverlay] = useState(false);
const [averageRating, setAverageRating] = useState(null);
@@ -59,10 +59,10 @@ function CoursePagePopup({
{
e.stopPropagation();
setShowOverlay(true);
@@ -82,7 +82,16 @@ function CoursePagePopup({
{course.code}
{' '}- {' '}
{course.name}
+
+
+
+
({course.credits} Credits)
diff --git a/my-app/src/views/ListView.jsx b/my-app/src/views/ListView.jsx
index 8617d228..ccf9d0bd 100644
--- a/my-app/src/views/ListView.jsx
+++ b/my-app/src/views/ListView.jsx
@@ -151,11 +151,13 @@ function ListView(props) {
className="text-gray-600"
dangerouslySetInnerHTML={{
__html: readMore[course.code]
+
? course?.description
: (course?.description?.slice(0, 200)+"..."),
}}
/>
{course?.description?.length > 150 && (
+
{
@@ -184,9 +186,9 @@ function ListView(props) {
transition-all duration-300 ease-in-out
font-semibold text-sm shadow-sm
${props.favouriteCourses.some((fav) => fav.code === course.code)
- ? 'bg-yellow-400 /90 hover:bg-yellow-500/90 border-2 border-yellow-600 hover:border-yellow-700 text-yellow-900'
- : 'bg-yellow-200/90 hover:bg-yellow-300 border-2 border-yellow-400 hover:border-yellow-500 text-yellow-600 hover:text-yellow-700'
- }`}
+ ? 'bg-yellow-400 /90 hover:bg-yellow-500/90 border-2 border-yellow-600 hover:border-yellow-700 text-yellow-900'
+ : 'bg-yellow-200/90 hover:bg-yellow-300 border-2 border-yellow-400 hover:border-yellow-500 text-yellow-600 hover:text-yellow-700'
+ }`}
onClick={(e) => {
e.stopPropagation();
handleFavouriteClick(course);
@@ -194,15 +196,21 @@ function ListView(props) {
>
{props.favouriteCourses.some((fav) => fav.code === course.code) ? (
<>
-
)}
{props.popup}
- {!isLoading && props.targetScroll > 1000 &&(
-