Index: frontend/src/App.tsx =================================================================== --- frontend/src/App.tsx (revision 5c50b04ac5c182dfc4023a59711ea23503d99e8e) +++ frontend/src/App.tsx (revision 491a010119327425022533a785e12978d064bcaa) @@ -13,6 +13,6 @@ import Recommendations from "./pages/Recommendations"; import Register from "./pages/Register"; +import SubjectPreferences from "./pages/SubjectPreferences"; import SubjectView from "./pages/SubjectView"; -import FavoriteSubjects from "./pages/FavoriteSubjects"; const Layout = () => ( @@ -64,8 +64,8 @@ }, { - path: "favorite-subjects", + path: "subject-preferences", element: ( - + ), Index: frontend/src/components/Navbar.tsx =================================================================== --- frontend/src/components/Navbar.tsx (revision 5c50b04ac5c182dfc4023a59711ea23503d99e8e) +++ frontend/src/components/Navbar.tsx (revision 491a010119327425022533a785e12978d064bcaa) @@ -128,9 +128,9 @@ setMenuOpen(false)} > - Омилени предмети + Мои предмети Index: frontend/src/components/SubjectCatalog/FavoriteButton.tsx =================================================================== --- frontend/src/components/SubjectCatalog/FavoriteButton.tsx (revision 5c50b04ac5c182dfc4023a59711ea23503d99e8e) +++ frontend/src/components/SubjectCatalog/FavoriteButton.tsx (revision 491a010119327425022533a785e12978d064bcaa) @@ -28,12 +28,12 @@ const isFavorite = favoriteIds.has(subjectId); const isFilled = isAuthenticated && isFavorite; - return ( + + {canReview && ( + <> + + + + )} + +
+ +
+ + + + ); +}; + +export default SubjectCard; Index: frontend/src/components/SubjectCatalog/SubjectCatalog.tsx =================================================================== --- frontend/src/components/SubjectCatalog/SubjectCatalog.tsx (revision 5c50b04ac5c182dfc4023a59711ea23503d99e8e) +++ frontend/src/components/SubjectCatalog/SubjectCatalog.tsx (revision 491a010119327425022533a785e12978d064bcaa) @@ -85,5 +85,5 @@

Преглед на сите предмети

-
+
-
+
void; from: string; + canReview?: boolean; } @@ -15,4 +16,5 @@ openSubjectDetails, from, + canReview = false, }: SubjectListProps) => { const navigate = useNavigate(); @@ -25,44 +27,11 @@
{filteredSubjects.slice(0, visibleCourses).map((subject) => ( -
-
-
-
-

{subject.name}

-

{subject.code}

-
-
- {/*
- {subject.subject_info.tags.map((tag) => ( - - {tag} - - ))} -
*/} -
-
- - -
-
- -
-
-
-
+ subject={subject} + openSubjectDetails={openSubjectDetails} + openSubjectView={openSubjectView} + canReview={canReview} + /> ))}
Index: frontend/src/components/SubjectCatalog/utils.ts =================================================================== --- frontend/src/components/SubjectCatalog/utils.ts (revision 5c50b04ac5c182dfc4023a59711ea23503d99e8e) +++ frontend/src/components/SubjectCatalog/utils.ts (revision 491a010119327425022533a785e12978d064bcaa) @@ -177,5 +177,5 @@ export const getSubjectPrerequisites = ( subject: Subject, - subjectMap: Map + subjectMap: Map | undefined ): "Нема предуслов" | number | string => { const prerequisite = subject?.subject_info?.prerequisite; @@ -184,5 +184,5 @@ if ("subjects" in prerequisite && Array.isArray(prerequisite.subjects)) { const names = prerequisite.subjects.map( - (id) => subjectMap.get(id) || "Непознат предмет" + (id) => subjectMap?.get(id) || "Непознат предмет" ); return names.length > 0 ? names.join(" или ") : "Нема предуслов"; Index: ontend/src/pages/FavoriteSubjects.tsx =================================================================== --- frontend/src/pages/FavoriteSubjects.tsx (revision 5c50b04ac5c182dfc4023a59711ea23503d99e8e) +++ (revision ) @@ -1,104 +1,0 @@ -import { useEffect, useMemo, useState } from "react"; -import SkeletonCard from "../components/SubjectCatalog/SkeletonCard"; -import SubjectList from "../components/SubjectCatalog/SubjectList"; -import SubjectModal from "../components/SubjectCatalog/SubjectModal"; -import { getSubjectPrerequisites } from "../components/SubjectCatalog/utils"; -import { Subject } from "../components/types"; -import { usePreferences } from "../context/PreferencesContext"; -import { useSubjects } from "../context/SubjectsContext"; - -const FavoriteSubjects = () => { - const [subjects] = useSubjects(); - const { favoriteIds } = usePreferences(); - const [visibleCourses, setVisibleCourses] = useState(12); - const [selectedSubject, setSelectedSubject] = useState(null); - const [isLoaded, setIsLoaded] = useState(false); - const [showModal, setShowModal] = useState(false); - - useEffect(() => { - if (subjects && subjects.length > 0) { - setIsLoaded(true); - } - }, [subjects]); - - const favoriteIDsToMap = useMemo(() => { - const map = new Map(); - subjects.forEach((subject) => { - if (favoriteIds.has(subject.id)) { - map.set(subject.id, subject.name); - } - }); - return map; - }, [subjects, favoriteIds]); - - const favoriteSubjects = useMemo(() => { - return subjects.filter((subject) => favoriteIds.has(subject.id)); - }, [subjects, favoriteIds]); - - const loadMore = () => { - setVisibleCourses((prev) => prev + 12); - }; - - const openSubjectDetails = (subject: Subject) => { - setSelectedSubject(subjects.find((item) => item.id == subject.id) ?? null); - setShowModal(true); - }; - - const closeModal = () => { - setShowModal(false); - }; - - return ( -
- {favoriteSubjects.length > 0 && ( -
-

- Омилени предмети -

-
- )} - -
-
- {!isLoaded ? ( -
- {[...Array(9)].map((_, index) => ( - - ))} -
- ) : ( - - )} - - {isLoaded && favoriteSubjects.length > visibleCourses && ( -
- -
- )} -
-
- {showModal && selectedSubject && ( - - )} -
- ); -}; - -export default FavoriteSubjects; Index: frontend/src/pages/Login.tsx =================================================================== --- frontend/src/pages/Login.tsx (revision 5c50b04ac5c182dfc4023a59711ea23503d99e8e) +++ frontend/src/pages/Login.tsx (revision 491a010119327425022533a785e12978d064bcaa) @@ -68,5 +68,5 @@ }; return ( -
+
-
-
-
-

- {subject.name} -

-

{subject.code}

-
-
- -
- {subject.subject_info.activated === false ? ( - - Никогаш не бил активиран! - - ) : index === 0 ? ( - - Најсоодветен! - - ) : null} -
- -
-
- - - - -
-
- -
-
-
+
))} Index: frontend/src/pages/Register.tsx =================================================================== --- frontend/src/pages/Register.tsx (revision 5c50b04ac5c182dfc4023a59711ea23503d99e8e) +++ frontend/src/pages/Register.tsx (revision 491a010119327425022533a785e12978d064bcaa) @@ -80,5 +80,5 @@ }; return ( -
+
{ + const [subjects] = useSubjects(); + const { favoriteIds, likedIds, dislikedIds } = usePreferences(); + const [visibleCourses, setVisibleCourses] = useState(12); + const [selectedSubject, setSelectedSubject] = useState(null); + const [isLoaded, setIsLoaded] = useState(false); + const [showModal, setShowModal] = useState(false); + const [selectedSubjects, setSelectedSubjects] = useState([]); + const [idsToMap, setIdsToMap] = useState>(); + const [activeFilter, setActiveFilter] = useState< + "favorite" | "liked" | "disliked" + >("favorite"); + + // Helper functions + const favoriteIDsToMap = () => { + const map = new Map(); + subjects.forEach((subject) => { + if (favoriteIds.has(subject.id)) { + map.set(subject.id, subject.name); + } + }); + return map; + }; + + const likedIDsToMap = () => { + const map = new Map(); + subjects.forEach((subject) => { + if (likedIds.has(subject.id)) { + map.set(subject.id, subject.name); + } + }); + return map; + }; + + const dislikedIDsToMap = () => { + const map = new Map(); + subjects.forEach((subject) => { + if (dislikedIds.has(subject.id)) { + map.set(subject.id, subject.name); + } + }); + return map; + }; + + const favoriteSubjects = () => { + return subjects.filter((subject) => favoriteIds.has(subject.id)); + }; + + const likedSubjects = () => { + return subjects.filter((subject) => likedIds.has(subject.id)); + }; + + const dislikedSubjects = () => { + return subjects.filter((subject) => dislikedIds.has(subject.id)); + }; + + useEffect(() => { + let newSubjects: Subject[] = []; + let newMap: Map = new Map(); + switch (activeFilter) { + case "favorite": + newSubjects = favoriteSubjects(); + newMap = favoriteIDsToMap(); + break; + case "liked": + newSubjects = likedSubjects(); + newMap = likedIDsToMap(); + break; + case "disliked": + newSubjects = dislikedSubjects(); + newMap = dislikedIDsToMap(); + break; + } + setSelectedSubjects(newSubjects); + setIdsToMap(newMap); + setIsLoaded(true); + }, [favoriteIds, likedIds, dislikedIds, activeFilter, subjects]); + + const loadMore = () => { + setVisibleCourses((prev) => prev + 12); + }; + + const openSubjectDetails = (subject: Subject) => { + setSelectedSubject(subjects.find((item) => item.id == subject.id) ?? null); + setShowModal(true); + }; + + const closeModal = () => { + setShowModal(false); + }; + + const handleFilterClick = (filterType: "favorite" | "liked" | "disliked") => { + setActiveFilter(filterType); + setVisibleCourses(12); // Reset visible courses when switching filters + }; + + return ( +
+

Мои предмети

+
+
+
+
+

+ Филтри +

+
+ + + +
+
+
+ +
+
+ {!isLoaded ? ( +
+ {[...Array(9)].map((_, index) => ( + + ))} +
+ ) : selectedSubjects.length === 0 ? ( +
+ Нема предмети за прикажување со избраниот филтер. +
+ ) : ( + <> + + {selectedSubjects.length > visibleCourses && ( +
+ +
+ )} + + )} +
+
+
+
+ + {showModal && selectedSubject && ( + + )} +
+ ); +}; + +export default SubjectPreferences; Index: frontend/src/pages/SubjectView.tsx =================================================================== --- frontend/src/pages/SubjectView.tsx (revision 5c50b04ac5c182dfc4023a59711ea23503d99e8e) +++ frontend/src/pages/SubjectView.tsx (revision 491a010119327425022533a785e12978d064bcaa) @@ -72,5 +72,5 @@ if (!selectedSubject) { return ( -
+

Предметот со код '{code}' не е пронајден.