Skip to content

Commit 85d5b37

Browse files
committed
fixes
1 parent 12cb496 commit 85d5b37

3 files changed

Lines changed: 33 additions & 30 deletions

File tree

my-app/src/presenters/PrerequisitePresenter.jsx

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { observer } from "mobx-react-lite";
22
import PrerequisiteTreeView from "../views/PrerequisiteTreeView";
33

44
import dagre from '@dagrejs/dagre';
5-
import { useCallback, useMemo } from "react";
5+
import { useCallback } from "react";
66

77
import {
88
Background,
@@ -17,10 +17,6 @@ import { model } from "../model";
1717

1818

1919
export const PrerequisitePresenter = observer((props) => {
20-
const nodes = useMemo(() => {
21-
if (!props.selectedCourse?.prerequisites) return [];
22-
return createNodes(props.selectedCourse.prerequisites);
23-
}, [props.selectedCourse?.prerequisites]);
2420

2521
let uniqueCounter = 0;
2622
let textCounter = 0;
@@ -219,6 +215,11 @@ export const PrerequisitePresenter = observer((props) => {
219215
type: node_type,
220216
data: { label: name },
221217
style: {
218+
//padding: 0,
219+
//maxWidth: "100px",
220+
//display: 'inline-block',
221+
//justifyContent: 'center',
222+
//alignItems: 'center',
222223
zIndex: 0
223224
},
224225
position,
@@ -483,9 +484,7 @@ export const PrerequisitePresenter = observer((props) => {
483484
let copy = JSON.parse(JSON.stringify(props.selectedCourse.prerequisites));
484485
let courses_taken = [];
485486
if (localStorage.getItem("completedCourses") != null) {
486-
for (let obj of localStorage.getItem("completedCourses")) {
487-
courses_taken.push(obj?.id);
488-
}
487+
courses_taken = localStorage.getItem("completedCourses");
489488
}
490489
code_to_name = model.getCourseNames(courses_taken);
491490

my-app/src/presenters/ReviewPresenter.jsx

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -41,29 +41,33 @@ export const ReviewPresenter = observer(({ model, course }) => {
4141
setErrorMessage("You need to be logged in to post a comment - Posting anonymously is possible.");
4242
return;
4343
}
44-
if (formData.text.trim()) {
45-
const review = {
46-
userName: postAnonymous ? "Anonymous" : model.user?.displayName,
47-
uid: model?.user?.uid,
48-
timestamp: Date.now(),
49-
...formData,
5044

51-
};
52-
if(!await model.addReview(course.code, review)){
53-
setErrorMessage("Something went wrong when posting. Are you logged in?")
54-
return;
55-
}
56-
const updatedReviews = await model.getReviews(course.code);
57-
setReviews(updatedReviews);
58-
setFormData({
59-
text: "",
60-
overallRating: 0,
61-
difficultyRating: 0,
62-
professorName: "",
63-
grade: "",
64-
recommended: false,
65-
});
45+
if (!formData.text.trim() && formData.overallRating === 0) {
46+
setErrorMessage("Please provide either a review text or an overall rating.");
47+
return;
48+
}
49+
50+
const review = {
51+
userName: postAnonymous ? "Anonymous" : model.user?.displayName,
52+
uid: model?.user?.uid,
53+
timestamp: Date.now(),
54+
...formData,
55+
};
56+
57+
if(!await model.addReview(course.code, review)){
58+
setErrorMessage("Something went wrong when posting. Are you logged in?")
59+
return;
6660
}
61+
const updatedReviews = await model.getReviews(course.code);
62+
setReviews(updatedReviews);
63+
setFormData({
64+
text: "",
65+
overallRating: 0,
66+
difficultyRating: 0,
67+
professorName: "",
68+
grade: "",
69+
recommended: false,
70+
});
6771
};
6872

6973

my-app/src/views/ListView.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ function ListView(props) {
274274
</div>
275275
)}
276276
{props.popup}
277-
{!isLoading && props.targetScroll > 1000 && (
277+
{!isLoading && !props.isPopupOpen && props.targetScroll > 1000 && (
278278
<button
279279
onClick={() => props.setTargetScroll(0)}
280280
className="fixed bottom-6 right-6 z-50 bg-[#000061] text-white p-3 rounded-full shadow-lg hover:bg-[#1a1a80] transition-all"

0 commit comments

Comments
 (0)