Index: frontend/src/components/Navbar.tsx =================================================================== --- frontend/src/components/Navbar.tsx (revision 4f59a58017fe45923d55e066e2dd9f821de74277) +++ frontend/src/components/Navbar.tsx (revision 30a7df0656c54cce36be6925e7ce15d9b4cf84e6) @@ -2,149 +2,149 @@ import { useState } from "react"; import { Link, useNavigate } from "react-router-dom"; +import { toast } from "react-toastify"; import IOimage from "../assets/IOLogo.png"; import { useAuth } from "../hooks/useAuth"; -import { toast } from "react-toastify"; const Navbar: React.FC = () => { - const [menuOpen, setMenuOpen] = useState(false); - const { isAuthenticated, logout } = useAuth(); - const navigate = useNavigate(); - const { login } = useAuth(); + const [menuOpen, setMenuOpen] = useState(false); + const { isAuthenticated, logout } = useAuth(); + const navigate = useNavigate(); + const { login } = useAuth(); - const handleLogout = () => { - logout(); - navigate("/"); - toast.success("Успешно сте одјавени!"); - }; + const handleLogout = () => { + logout(); + navigate("/"); + toast.success("Успешно сте одјавени!"); + }; - const testAccountLogin = async () => { - if (isAuthenticated) return; - try { - const response = await axios.post("http://localhost:8000/auth/login/", { - email: "fffff@finki.ukim.mk", - password: "testTestTEST123", - }); - const { access, refresh } = response.data; - login(access, refresh); - navigate("/"); - } catch (err: unknown) { - console.log(err); - } - }; + const testAccountLogin = async () => { + if (isAuthenticated) return; + try { + const response = await axios.post("http://localhost:8000/auth/login/", { + email: "fffff@finki.ukim.mk", + password: "testTestTEST123", + }); + const { access, refresh } = response.data; + login(access, refresh); + navigate("/"); + } catch (err: unknown) { + console.log(err); + } + }; - return ( - - ); + {menuOpen && ( +
+ + Предмети + + {isAuthenticated && ( + + Профил + + )} + {isAuthenticated && ( + + Препораки + + )} + {isAuthenticated ? ( + + ) : ( + <> + setMenuOpen(false)}> + Најави се + + setMenuOpen(false)}> + Регистрирај се + + + )} +
+ )} + + ); }; Index: frontend/src/components/StudentForm/StudentForm.tsx =================================================================== --- frontend/src/components/StudentForm/StudentForm.tsx (revision 4f59a58017fe45923d55e066e2dd9f821de74277) +++ frontend/src/components/StudentForm/StudentForm.tsx (revision 30a7df0656c54cce36be6925e7ce15d9b4cf84e6) @@ -1,9 +1,9 @@ import { useEffect, useState } from "react"; import { - EVALUATIONS, - EVALUATIONS_MAP, - STUDY_EFFORT, - STUDY_TRACKS, - YEARS, + EVALUATIONS, + EVALUATIONS_MAP, + STUDY_EFFORT, + STUDY_TRACKS, + YEARS, } from "../../constants/subjects"; import { useAuth } from "../../hooks/useAuth"; @@ -13,645 +13,645 @@ import SubjectsSelector from "./SubjectsSelector"; import { - getPassedSubjectsByID, - LatinToCyrillic, - mapToID, - validateForm, + getPassedSubjectsByID, + LatinToCyrillic, + mapToID, + validateForm, } from "./utils"; interface StudentFormProps { - formData: StudentData | null; - isLoading: boolean; - setIsLoading?: (b: boolean) => void; + formData: StudentData | null; + isLoading: boolean; + setIsLoading?: (b: boolean) => void; } interface DistinctSubjectData { - tags: string[]; - professors: string[]; - technologies: string[]; + tags: string[]; + professors: string[]; + technologies: string[]; } const StudentForm = ({ formData, isLoading }: StudentFormProps) => { - const { accessToken } = useAuth(); - const [isSubmitted, setIsSubmitted] = useState(false); - const [validationErrors, setValidationErrors] = useState<{ - [key: string]: string; - }>({}); - const [index, setIndex] = useState(formData?.index || ""); - const [studyTrack, setStudyTrack] = useState( - (formData?.study_track as StudyTrack) || "" - ); - const [year, setYear] = useState(formData?.current_year || 1); - const [passedSubjectsPerSemester, setPassedSubjectsPerSemester] = useState< - Record - >( - formData?.passed_subjects_per_semester ?? - Object.fromEntries(Array.from({ length: 8 }, (_, i) => [[i + 1], []])) - ); - const [studyEffort, setStudyEffort] = useState(formData?.study_effort || ""); - const [domains, setDomains] = useState(formData?.tags || []); - const [semesterSearchTerms, setSemesterSearchTerms] = useState< - Record - >({}); - const [professorsSearchTerm, setProfessorSearchTerm] = useState(""); - const [technologies, setTechnologies] = useState( - formData?.technologies || [] - ); - const [evaluation, setEvaluation] = useState(formData?.evaluation || []); - const [favoriteProfs, setFavoriteProfs] = useState( - formData?.professors || [] - ); - const [isNemamSelected, setIsNemamSelected] = useState({ - domains: false, - tech: false, - eval: false, - prof: false, - }); - const [formStatus, setFormStatus] = useState<{ - isSubmitting: boolean; - message: string; - isError: boolean; - }>({ - isSubmitting: false, - message: "", - isError: false, - }); - const [showProfessors, setShowProfessors] = useState(false); - const [subjects, setSubjects] = useState([]); - const [distinctSubjectData, setDistinctSubjectData] = - useState({ - tags: [], - professors: [], - technologies: [], - }); - const [hasExtracurricular, setHasExtracurricular] = useState(false); - const [invalidSubjects, setInvalidSubjects] = useState([]); - - // Update form when formData changes (e.g., after fetching user data) - useEffect(() => { - if (formData) { - setIndex(formData.index || ""); - setStudyTrack((formData.study_track as StudyTrack) || ""); - setYear(formData.current_year || 1); - setStudyEffort(formData.study_effort || ""); - - const domains_ = (formData.tags || []).includes("None") - ? [] - : formData.tags || []; - setDomains(domains_); - - const technologies_ = (formData.technologies || []).includes("None") - ? [] - : formData.technologies || []; - setTechnologies(technologies_); - - const eval_ = (formData.evaluation || []).map( - (val: string) => - Object.keys(EVALUATIONS_MAP).find( - (key) => - EVALUATIONS_MAP[key as keyof typeof EVALUATIONS_MAP] === val - ) || val - ); - setEvaluation( - eval_.includes("Немам") || eval_.includes("None") ? [] : eval_ - ); - - const favoriteProfs_ = (formData.professors || []).includes("None") - ? [] - : formData.professors || []; - setFavoriteProfs(favoriteProfs_); - - setPassedSubjectsPerSemester(formData.passed_subjects_per_semester || []); - } - }, [formData]); - - useEffect(() => { - const fetchSubjects = async () => { - try { - const resSubjects = await fetch("http://localhost:8000/subjects"); - if (resSubjects.ok) { - const subJson: Subject[] = await resSubjects.json(); - setSubjects(subJson || []); - const allProfessors: string[] = subJson - .flatMap((subject: Subject) => subject.subject_info.professors) - .filter((p): p is string => typeof p === "string"); - const uniqueProfessors = Array.from(new Set(allProfessors)); - const allProfessors_ = uniqueProfessors - .filter((prof) => prof.trim().toLowerCase() !== "сите професори") - .sort((a, b) => a.localeCompare(b)); - setDistinctSubjectData(() => ({ - tags: Array.from( - new Set(subJson.flatMap((subject) => subject.subject_info.tags)) - ).sort((a, b) => a.localeCompare(b)), - technologies: Array.from( - new Set( - subJson - .flatMap((subject) => subject.subject_info.technologies) - .filter((tech) => tech != "any" && tech != "") - ) - ).sort((a, b) => a.localeCompare(b)), - professors: allProfessors_, - })); - } - } catch (error) { - console.error("Error fetching subjects:", error); - } - }; - - fetchSubjects(); - }, []); - - const toggleSubject = (subject: Subject, semester: number) => { - const exists = (passedSubjectsPerSemester[semester] || []).some( - (s) => s.id === subject.id - ); - if (exists) { - setPassedSubjectsPerSemester({ - ...passedSubjectsPerSemester, - [semester]: passedSubjectsPerSemester[semester].filter( - (s) => s.id != subject.id - ), - }); - } else { - setPassedSubjectsPerSemester({ - ...passedSubjectsPerSemester, - [semester]: [...(passedSubjectsPerSemester[semester] || []), subject], - }); - } - }; - - const handleSubmit = async (e: React.FormEvent) => { - e.preventDefault(); - const totalCredits = { value: -1 }; - const creditsByLevel = { value: [0, 0, 0] }; - const errors = validateForm({ - index, - studyTrack, - year, - studyEffort, - passedSubjectsPerSemester, - hasExtracurricular, - setInvalidSubjects, - totalCredits, - creditsByLevel, - }); - if (Object.keys(errors).length > 0) { - setValidationErrors(errors); - window.scrollTo({ top: 0, behavior: "smooth" }); - if (errors.invalidSubjects) - setFormStatus({ - isSubmitting: false, - message: errors.invalidSubjects, - isError: true, - }); - else - setFormStatus({ - isSubmitting: false, - message: `Пополни ги сите задолжителни полиња`, - isError: true, - }); - return; - } - setValidationErrors({}); - setFormStatus({ - isSubmitting: true, - message: "", - isError: false, - }); - - const payload = { - index, - study_track: studyTrack, - current_year: year, - passed_subjects: getPassedSubjectsByID(passedSubjectsPerSemester), - study_effort: studyEffort, - tags: domains, - technologies: technologies, - evaluation: evaluation.map( - (ev) => EVALUATIONS_MAP[ev as keyof typeof EVALUATIONS_MAP] ?? ev - ), - professors: favoriteProfs, - passed_subjects_per_semester: mapToID(passedSubjectsPerSemester), - has_extracurricular: hasExtracurricular, - total_credits: totalCredits.value, - level_credits: creditsByLevel.value, - }; - try { - // For updating existing form data use PATCH instead of PUT for partial updates - const method = formData?.current_year || isSubmitted ? "PATCH" : "POST"; - const endpoint = "http://localhost:8000/auth/form/"; - const res = await fetch(endpoint, { - method, - headers: { - "Content-Type": "application/json", - Authorization: `Bearer ${accessToken}`, - }, - body: JSON.stringify(payload), - }); - - if (res.ok) { - setFormStatus({ - isSubmitting: false, - message: "Формата е успешно зачувана!", - isError: false, - }); - setTimeout(() => { - setFormStatus((prev) => ({ ...prev, message: "" })); - }, 5000); - } else { - const errorData = await res.json(); - throw new Error(errorData.message || "Error submitting form"); - } - setIsSubmitted(true); - window.scrollTo({ top: 0, behavior: "smooth" }); - } catch (error) { - console.error("Form submission error:", error); - - setFormStatus({ - isSubmitting: false, - message: `Грешка при зачувување: ${(error as Error).message}`, - isError: true, - }); - window.scrollTo({ top: 0, behavior: "smooth" }); - } - }; - - const filteredMandatorySubjects = studyTrack - ? subjects - .filter( - (subj) => - subj.subject_info.mandatory_for.includes(studyTrack) && - subj.subject_info.semester <= year * 2 - ) - .sort((a, b) => a.subject_info.semester - b.subject_info.semester) - : []; - const filteredElectiveSubjects = studyTrack - ? subjects.filter((subj) => - subj.subject_info.elective_for.includes(studyTrack) - ) - : []; - - const filteredProfessors = distinctSubjectData.professors.filter( - (prof) => - professorsSearchTerm == "" || - prof - .toLowerCase() - .includes(LatinToCyrillic(professorsSearchTerm).toLowerCase()) - ); - - if (isLoading) { - return ; - } - - return ( -
-

- {isSubmitted || formData?.current_year - ? "Ажурирај ги податоците" - : "Внеси податоци"} -

- {formStatus.message && ( -
- {formStatus.message} -
- )} -
-
-

Индекс

- setIndex(e.target.value)} - className="w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500" - /> - {validationErrors.index && ( -

- {validationErrors.index} -

- )} -
- -
-

Смер

- - {validationErrors.studyTrack && ( -

- {validationErrors.studyTrack} -

- )} -
-
-
-

- Година на студии - - - - - ? - - - - Ако моментално е јуни/јули/август/септември, за да добиеш - препораки одбери дека си твојата година + 1. Пример ако си 2 - година и е јуни, одбери дека си 3 година. - - -

- - {validationErrors.year && ( -

- {validationErrors.year} -

- )} -
- -
- -
-
-

- Вложен труд при учење -

-
- {STUDY_EFFORT.map((effort) => ( - - ))} -
- {validationErrors.studyEffort && ( -

- {validationErrors.studyEffort} -

- )} -
-
-

- Полиња на интерес -

-
- {["Немам", ...distinctSubjectData.tags].map((item) => { - const isSelected = - domains.includes(item) || - (item === "Немам" && isNemamSelected["domains"]); - const shouldBeDisabled = - isNemamSelected["domains"] && item !== "Немам"; - return ( - - ); - })} -
- {validationErrors.domains && ( -

- {validationErrors.domains} -

- )} -
-
-

- Преферирани технологии -

-
- {["Немам", ...distinctSubjectData.technologies].map((item) => { - const isSelected = - technologies.includes(item) || - (item === "Немам" && isNemamSelected["tech"]); - const shouldBeDisabled = - isNemamSelected["tech"] && item !== "Немам"; - return ( - - ); - })} -
- {validationErrors.technologies && ( -

- {validationErrors.technologies} -

- )} -
-
-

- Преферирани начин на оценување -

-
- {["Немам", ...EVALUATIONS].map((item) => { - const isSelected = - evaluation.includes(item) || - (item === "Немам" && isNemamSelected["eval"]); - const shouldBeDisabled = - isNemamSelected["eval"] && item !== "Немам"; - return ( - - ); - })} -
- {validationErrors.evaluation && ( -

- {validationErrors.evaluation} -

- )} -
-
-
-

- Омилени професори -

- { - setProfessorSearchTerm(e.target.value)} - value={professorsSearchTerm} - disabled={isNemamSelected["prof"]} - type="text" - className="w-60 px-3 py-2.5 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 text-gray-900 text-sm" - placeholder="Пребарај професор" - /> - } -
-
- {["Немам", ...filteredProfessors] - .slice(0, showProfessors ? undefined : 10) - .map((item) => { - // hides "Nemam" when searching - if (item == "Немам" && professorsSearchTerm !== "") return; - const isSelected = - favoriteProfs.includes(item) || - (item === "Немам" && isNemamSelected["prof"]); - const shouldBeDisabled = - isNemamSelected["prof"] && item !== "Немам"; - return ( - - ); - })} - {filteredProfessors.length == 0 && ( -

Нема таков професор

- )} - {filteredProfessors.length > 10 && ( - - )} -
-
-
- -
- - ); + const { accessToken } = useAuth(); + const [isSubmitted, setIsSubmitted] = useState(false); + const [validationErrors, setValidationErrors] = useState<{ + [key: string]: string; + }>({}); + const [index, setIndex] = useState(formData?.index || ""); + const [studyTrack, setStudyTrack] = useState( + (formData?.study_track as StudyTrack) || "" + ); + const [year, setYear] = useState(formData?.current_year || 1); + const [passedSubjectsPerSemester, setPassedSubjectsPerSemester] = useState< + Record + >( + formData?.passed_subjects_per_semester ?? + Object.fromEntries(Array.from({ length: 8 }, (_, i) => [[i + 1], []])) + ); + const [studyEffort, setStudyEffort] = useState(formData?.study_effort || ""); + const [domains, setDomains] = useState(formData?.tags || []); + const [semesterSearchTerms, setSemesterSearchTerms] = useState< + Record + >({}); + const [professorsSearchTerm, setProfessorSearchTerm] = useState(""); + const [technologies, setTechnologies] = useState( + formData?.technologies || [] + ); + const [evaluation, setEvaluation] = useState(formData?.evaluation || []); + const [favoriteProfs, setFavoriteProfs] = useState( + formData?.professors || [] + ); + const [isNemamSelected, setIsNemamSelected] = useState({ + domains: false, + tech: false, + eval: false, + prof: false, + }); + const [formStatus, setFormStatus] = useState<{ + isSubmitting: boolean; + message: string; + isError: boolean; + }>({ + isSubmitting: false, + message: "", + isError: false, + }); + const [showProfessors, setShowProfessors] = useState(false); + const [subjects, setSubjects] = useState([]); + const [distinctSubjectData, setDistinctSubjectData] = + useState({ + tags: [], + professors: [], + technologies: [], + }); + const [hasExtracurricular, setHasExtracurricular] = useState(false); + const [invalidSubjects, setInvalidSubjects] = useState([]); + + // Update form when formData changes (e.g., after fetching user data) + useEffect(() => { + if (formData) { + setIndex(formData.index || ""); + setStudyTrack((formData.study_track as StudyTrack) || ""); + setYear(formData.current_year || 1); + setStudyEffort(formData.study_effort || ""); + + const domains_ = (formData.tags || []).includes("None") + ? [] + : formData.tags || []; + setDomains(domains_); + + const technologies_ = (formData.technologies || []).includes("None") + ? [] + : formData.technologies || []; + setTechnologies(technologies_); + + const eval_ = (formData.evaluation || []).map( + (val: string) => + Object.keys(EVALUATIONS_MAP).find( + (key) => + EVALUATIONS_MAP[key as keyof typeof EVALUATIONS_MAP] === val + ) || val + ); + setEvaluation( + eval_.includes("Немам") || eval_.includes("None") ? [] : eval_ + ); + + const favoriteProfs_ = (formData.professors || []).includes("None") + ? [] + : formData.professors || []; + setFavoriteProfs(favoriteProfs_); + + setPassedSubjectsPerSemester(formData.passed_subjects_per_semester || []); + } + }, [formData]); + + useEffect(() => { + const fetchSubjects = async () => { + try { + const resSubjects = await fetch("http://localhost:8000/subjects"); + if (resSubjects.ok) { + const subJson: Subject[] = await resSubjects.json(); + setSubjects(subJson || []); + const allProfessors: string[] = subJson + .flatMap((subject: Subject) => subject.subject_info.professors) + .filter((p): p is string => typeof p === "string"); + const uniqueProfessors = Array.from(new Set(allProfessors)); + const allProfessors_ = uniqueProfessors + .filter((prof) => prof.trim().toLowerCase() !== "сите професори") + .sort((a, b) => a.localeCompare(b)); + setDistinctSubjectData(() => ({ + tags: Array.from( + new Set(subJson.flatMap((subject) => subject.subject_info.tags)) + ).sort((a, b) => a.localeCompare(b)), + technologies: Array.from( + new Set( + subJson + .flatMap((subject) => subject.subject_info.technologies) + .filter((tech) => tech != "any" && tech != "") + ) + ).sort((a, b) => a.localeCompare(b)), + professors: allProfessors_, + })); + } + } catch (error) { + console.error("Error fetching subjects:", error); + } + }; + + fetchSubjects(); + }, []); + + const toggleSubject = (subject: Subject, semester: number) => { + const exists = (passedSubjectsPerSemester[semester] || []).some( + (s) => s.id === subject.id + ); + if (exists) { + setPassedSubjectsPerSemester({ + ...passedSubjectsPerSemester, + [semester]: passedSubjectsPerSemester[semester].filter( + (s) => s.id != subject.id + ), + }); + } else { + setPassedSubjectsPerSemester({ + ...passedSubjectsPerSemester, + [semester]: [...(passedSubjectsPerSemester[semester] || []), subject], + }); + } + }; + + const handleSubmit = async (e: React.FormEvent) => { + e.preventDefault(); + const totalCredits = { value: -1 }; + const creditsByLevel = { value: [0, 0, 0] }; + const errors = validateForm({ + index, + studyTrack, + year, + studyEffort, + passedSubjectsPerSemester, + hasExtracurricular, + setInvalidSubjects, + totalCredits, + creditsByLevel, + }); + if (Object.keys(errors).length > 0) { + setValidationErrors(errors); + window.scrollTo({ top: 0, behavior: "smooth" }); + if (errors.invalidSubjects) + setFormStatus({ + isSubmitting: false, + message: errors.invalidSubjects, + isError: true, + }); + else + setFormStatus({ + isSubmitting: false, + message: `Пополни ги сите задолжителни полиња`, + isError: true, + }); + return; + } + setValidationErrors({}); + setFormStatus({ + isSubmitting: true, + message: "", + isError: false, + }); + + const payload = { + index, + study_track: studyTrack, + current_year: year, + passed_subjects: getPassedSubjectsByID(passedSubjectsPerSemester), + study_effort: studyEffort, + tags: domains, + technologies: technologies, + evaluation: evaluation.map( + (ev) => EVALUATIONS_MAP[ev as keyof typeof EVALUATIONS_MAP] ?? ev + ), + professors: favoriteProfs, + passed_subjects_per_semester: mapToID(passedSubjectsPerSemester), + has_extracurricular: hasExtracurricular, + total_credits: totalCredits.value, + level_credits: creditsByLevel.value, + }; + try { + // For updating existing form data use PATCH instead of PUT for partial updates + const method = formData?.current_year || isSubmitted ? "PATCH" : "POST"; + const endpoint = "http://localhost:8000/auth/form/"; + const res = await fetch(endpoint, { + method, + headers: { + "Content-Type": "application/json", + Authorization: `Bearer ${accessToken}`, + }, + body: JSON.stringify(payload), + }); + + if (res.ok) { + setFormStatus({ + isSubmitting: false, + message: "Формата е успешно зачувана!", + isError: false, + }); + setTimeout(() => { + setFormStatus((prev) => ({ ...prev, message: "" })); + }, 5000); + } else { + const errorData = await res.json(); + throw new Error(errorData.message || "Error submitting form"); + } + setIsSubmitted(true); + window.scrollTo({ top: 0, behavior: "smooth" }); + } catch (error) { + console.error("Form submission error:", error); + + setFormStatus({ + isSubmitting: false, + message: `Грешка при зачувување: ${(error as Error).message}`, + isError: true, + }); + window.scrollTo({ top: 0, behavior: "smooth" }); + } + }; + + const filteredMandatorySubjects = studyTrack + ? subjects + .filter( + (subj) => + subj.subject_info.mandatory_for.includes(studyTrack) && + subj.subject_info.semester <= year * 2 + ) + .sort((a, b) => a.subject_info.semester - b.subject_info.semester) + : []; + const filteredElectiveSubjects = studyTrack + ? subjects.filter((subj) => + subj.subject_info.elective_for.includes(studyTrack) + ) + : []; + + const filteredProfessors = distinctSubjectData.professors.filter( + (prof) => + professorsSearchTerm == "" || + prof + .toLowerCase() + .includes(LatinToCyrillic(professorsSearchTerm).toLowerCase()) + ); + + if (isLoading) { + return ; + } + + return ( +
+

+ {isSubmitted || formData?.current_year + ? "Ажурирај ги податоците" + : "Внеси податоци"} +

+ {formStatus.message && ( +
+ {formStatus.message} +
+ )} +
+
+

Индекс

+ setIndex(e.target.value)} + className="w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500" + /> + {validationErrors.index && ( +

+ {validationErrors.index} +

+ )} +
+ +
+

Смер

+ + {validationErrors.studyTrack && ( +

+ {validationErrors.studyTrack} +

+ )} +
+
+
+

+ Година на студии + + + + + ? + + + + Ако моментално е јуни/јули/август/септември, за да добиеш + соодветни препораки избери дека си твојата година + 1. Пример ако + си 2 година и е јуни, избери дека си 3 година. + + +

+ + {validationErrors.year && ( +

+ {validationErrors.year} +

+ )} +
+ +
+ +
+
+

+ Вложен труд при учење +

+
+ {STUDY_EFFORT.map((effort) => ( + + ))} +
+ {validationErrors.studyEffort && ( +

+ {validationErrors.studyEffort} +

+ )} +
+
+

+ Полиња на интерес +

+
+ {["Немам", ...distinctSubjectData.tags].map((item) => { + const isSelected = + domains.includes(item) || + (item === "Немам" && isNemamSelected["domains"]); + const shouldBeDisabled = + isNemamSelected["domains"] && item !== "Немам"; + return ( + + ); + })} +
+ {validationErrors.domains && ( +

+ {validationErrors.domains} +

+ )} +
+
+

+ Преферирани технологии +

+
+ {["Немам", ...distinctSubjectData.technologies].map((item) => { + const isSelected = + technologies.includes(item) || + (item === "Немам" && isNemamSelected["tech"]); + const shouldBeDisabled = + isNemamSelected["tech"] && item !== "Немам"; + return ( + + ); + })} +
+ {validationErrors.technologies && ( +

+ {validationErrors.technologies} +

+ )} +
+
+

+ Преферирани начин на оценување +

+
+ {["Немам", ...EVALUATIONS].map((item) => { + const isSelected = + evaluation.includes(item) || + (item === "Немам" && isNemamSelected["eval"]); + const shouldBeDisabled = + isNemamSelected["eval"] && item !== "Немам"; + return ( + + ); + })} +
+ {validationErrors.evaluation && ( +

+ {validationErrors.evaluation} +

+ )} +
+
+
+

+ Омилени професори +

+ { + setProfessorSearchTerm(e.target.value)} + value={professorsSearchTerm} + disabled={isNemamSelected["prof"]} + type="text" + className="w-60 px-3 py-2.5 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 text-gray-900 text-sm" + placeholder="Пребарај професор" + /> + } +
+
+ {["Немам", ...filteredProfessors] + .slice(0, showProfessors ? undefined : 10) + .map((item) => { + // hides "Nemam" when searching + if (item == "Немам" && professorsSearchTerm !== "") return; + const isSelected = + favoriteProfs.includes(item) || + (item === "Немам" && isNemamSelected["prof"]); + const shouldBeDisabled = + isNemamSelected["prof"] && item !== "Немам"; + return ( + + ); + })} + {filteredProfessors.length == 0 && ( +

Нема таков професор

+ )} + {filteredProfessors.length > 10 && ( + + )} +
+
+
+ +
+ + ); }; Index: frontend/src/components/StudentForm/SubjectsSelector.tsx =================================================================== --- frontend/src/components/StudentForm/SubjectsSelector.tsx (revision 4f59a58017fe45923d55e066e2dd9f821de74277) +++ frontend/src/components/StudentForm/SubjectsSelector.tsx (revision 30a7df0656c54cce36be6925e7ce15d9b4cf84e6) @@ -286,5 +286,5 @@ ) : (

- Одбери смер и година за да се прикажат предметите. + Избери смер и година за да се прикажат предметите.

)} Index: frontend/src/components/StudentForm/utils.ts =================================================================== --- frontend/src/components/StudentForm/utils.ts (revision 4f59a58017fe45923d55e066e2dd9f821de74277) +++ frontend/src/components/StudentForm/utils.ts (revision 30a7df0656c54cce36be6925e7ce15d9b4cf84e6) @@ -89,11 +89,11 @@ errors.index = "Индексот треба да има точно 6 цифри."; } - if (!studyTrack) errors.studyTrack = "Одбери насока."; - if (!year) errors.year = "Одбери година."; - if (!studyEffort) errors.studyEffort = "Одбери пожелен вложен труд."; + if (!studyTrack) errors.studyTrack = "Избери насока."; + if (!year) errors.year = "Избери година."; + if (!studyEffort) errors.studyEffort = "Избери пожелен вложен труд."; // passedSubjectsPerSemester is a map, not an array, that's why index 1 is needed, not 0 if (passedSubjectsPerSemester[1].length === 0) errors.passedSubjectsPerSemester = - "Одбери барем еден предмет од прв семестар."; + "Избери барем еден предмет од прв семестар."; const passedSubjects = getPassedSubjects(passedSubjectsPerSemester); Index: frontend/src/pages/Home.tsx =================================================================== --- frontend/src/pages/Home.tsx (revision 4f59a58017fe45923d55e066e2dd9f821de74277) +++ frontend/src/pages/Home.tsx (revision 30a7df0656c54cce36be6925e7ce15d9b4cf84e6) @@ -1,9 +1,135 @@ -const Home = () => { - return ( -
-

Избравте ли изборен?

-
- ); -}; +import { ArrowRight, BookOpen, Lightbulb, Users } from "lucide-react"; +import { Link } from "react-router-dom"; +import { useAuth } from "../hooks/useAuth"; -export default Home; +export default function Homepage() { + const { isAuthenticated } = useAuth(); + return ( +
+ {/* Main Content */} +
+ {/* Hero Section */} +
+

+ Најди го изборниот предмет за тебе +

+

+ ИзбериИзборен е веб апликација која помага на студентите на ФИНКИ да + се запознаат со изборните предмети кои ги нуди факултетот, и да им + помогне да го изберат најдобриот. +

+
+ +
+
+
+
+ +
+
+
+

+ Зошто ИзбериИзборен? +

+

+ Студентите на ФИНКИ се соочуваат со огромен избор при + селекцијата на изборни предмети. Со многу достапни опции, + ограничени описи на предметите и минимален увид во тоа што + всушност се изучува, донесувањето информирана одлука е речиси + невозможно. Многу студенти избираат на случаен избор или врз + основа на нецелосни информации, што често доведува до + разочарување и избирање нешто несоодветно за нив. Ова е + проблемот којшто ние го решаваме. +

+
+
+
+ +
+
+
+
+ +
+
+
+

+ Како работи нашиот алгоритам? +

+

+ Нашиот систем ги анализира вашите положени предмети, интереси и + преференци, и ги споредува со деталните информации за сите + достапни предмети што може да ги запишете. Секој релевантен + фактор добива соодветна тежина при анализата. На крај, системот + ги прикажува шесте најсоодветни предмети, подредени според + нивната усогласеност со вашите параметри — почнувајќи од + најпрепорачаниот. +

+ + {isAuthenticated ? ( + + + + ) : ( +
+

+ + Најавете се + {" "} + за да добиете персонализирани препораки и да го најдете + најсоодветниот предмет за вас. +

+
+ )} +
+
+
+ +
+
+
+
+ +
+
+
+

+ База на сите предмети на ФИНКИ +

+

+ Прелистајте ги сите предмети што факултетот моментално ги нуди. + За секој предмет нудиме информации како што се начинот на + полагање, изучуваните технологии, професорите и асистентите, + предусловите и слично. Достапни се опции за пребарување и + филтрирање за полесна и поефикасна навигација низ базата. +

+ + +
+
+
+
+ + {/* Footer +
+
+
+

+ © 2025 IzberiIzboren. Made for FINKI students, by FINKI + students. +

+
+
+
*/} +
+ ); +} Index: frontend/src/pages/Recommendations.tsx =================================================================== --- frontend/src/pages/Recommendations.tsx (revision 4f59a58017fe45923d55e066e2dd9f821de74277) +++ frontend/src/pages/Recommendations.tsx (revision 30a7df0656c54cce36be6925e7ce15d9b4cf84e6) @@ -1,266 +1,267 @@ -import { useState, useEffect, useMemo } from "react"; +import { useEffect, useMemo, useState } from "react"; import { useNavigate } from "react-router-dom"; -import { Subject } from "../components/types"; import SubjectModal from "../components/SubjectCatalog/SubjectModal"; import { getSubjectPrerequisites } from "../components/SubjectCatalog/utils"; +import { Subject } from "../components/types"; import useAxiosAuth from "../hooks/useAxiosAuth"; const Recommendations = () => { - const axiosAuth = useAxiosAuth(); - const navigate = useNavigate(); - const [subjectData, setSubjectData] = useState([]); - const [recommendations, setRecommendations] = useState([]); - const [season_, setSeason] = useState<"winter" | "summer" | "all">("all"); - const [isLoading, setIsLoading] = useState(false); - const [showModal, setShowModal] = useState(false); - - const mapToSeasonInt = (season: "winter" | "summer" | "all") => { - if (season == "summer") return 0; - if (season == "winter") return 1; - return 2; - }; - - const fetchRecommendations = async () => { - setIsLoading(true); - try { - const season = mapToSeasonInt(season_); - const response = await axiosAuth.get("/suggestion", { - params: { season }, - }); - setRecommendations(response.data.data); - } catch (error) { - console.error("Error fetching recommendations:", error); - } finally { - setIsLoading(false); - } - }; - - // need to fetch subject data so that we can compare the subject IDs (prerequisites store IDs, but we need names) - // in the modals for the recommendations - useEffect(() => { - const fetchData = async () => { - const response = await axiosAuth.get("/subjects"); - setSubjectData(response.data); - }; - fetchData(); - }, [axiosAuth]); - - const subjectIdToNameMap = useMemo(() => { - const map = new Map(); - subjectData.forEach((subject) => { - map.set(subject.id, subject.name); - }); - return map; - }, [subjectData]); - - const cycleSeason = () => { - if (season_ === "all") setSeason("winter"); - else if (season_ === "winter") setSeason("summer"); - else setSeason("all"); - }; - - const openSubjectView = (subject: Subject) => { - navigate(`/subjects/${subject.id}`, { - state: { from: "/recommendations" }, - }); - }; - - const [selectedSubject, setSelectedSubject] = useState(null); - - const openSubjectDetails = (subject: Subject) => { - setSelectedSubject(subject); - setShowModal(true); - }; - - const closeModal = () => { - setSelectedSubject(null); - setShowModal(false); - }; - - const getSeasonText = () => { - switch (season_) { - case "winter": - return "Зимски"; - case "summer": - return "Летен"; - case "all": - return "Двата"; - } - }; - - return ( -
-
-
-

Препораки

-

- Предметите што ќе ги добиете од алгоритамот се базирани на она што - сте го пополниле во формата. -
- Тие се подредени според тоа колку вашите интереси се совпаѓаат со - она што го нудат предметите. -

-
- -
-

Избран семестар:

-

- {getSeasonText()} -

-
- - - - -
- -
- {recommendations.length > 0 ? ( -
-
-

- Вашите препораки за {getSeasonText().toLowerCase()}{" "} - {getSeasonText().toLowerCase() === "двата" - ? "семестри" - : "семестар"} -

-
-
- -
- {recommendations.map((subject, index) => ( -
-
-
-
-

- {subject.name} -

-

{subject.code}

-
-
- - {/* Badge Logic: Prioritizes the warning, and shows the selected badge only on hover. */} - {/* 1. First, check for the most critical warning. */} -
- {subject.subject_info.activated === false ? ( - - ⚠️ Никогаш не бил активиран! - - ) : index === 0 ? ( - - ⭐ Најсоодветен! - - ) : null} -
- -
- - -
-
-
- ))} -
-
- ) : ( -
-
- - - -
-

- Започнете со пребарување! -

-

- Изберете ја саканата сезона и кликнете на "Вчитај препораки" за да - ги откриете вашите идеални предмети! -

-
- )} -
- {showModal && selectedSubject && ( - - )} -
- ); + const axiosAuth = useAxiosAuth(); + const navigate = useNavigate(); + const [subjectData, setSubjectData] = useState([]); + const [recommendations, setRecommendations] = useState([]); + const [season_, setSeason] = useState<"winter" | "summer" | "all">("all"); + const [isLoading, setIsLoading] = useState(false); + const [showModal, setShowModal] = useState(false); + + const mapToSeasonInt = (season: "winter" | "summer" | "all") => { + if (season == "summer") return 0; + if (season == "winter") return 1; + return 2; + }; + + const fetchRecommendations = async () => { + setIsLoading(true); + try { + const season = mapToSeasonInt(season_); + const response = await axiosAuth.get("/suggestion", { + params: { season }, + }); + setRecommendations(response.data.data); + } catch (error) { + console.error("Error fetching recommendations:", error); + } finally { + setIsLoading(false); + } + }; + + // need to fetch subject data so that we can compare the subject IDs (prerequisites store IDs, but we need names) + // in the modals for the recommendations + useEffect(() => { + const fetchData = async () => { + const response = await axiosAuth.get("/subjects"); + setSubjectData(response.data); + }; + fetchData(); + }, [axiosAuth]); + + const subjectIdToNameMap = useMemo(() => { + const map = new Map(); + subjectData.forEach((subject) => { + map.set(subject.id, subject.name); + }); + return map; + }, [subjectData]); + + const cycleSeason = () => { + if (season_ === "all") setSeason("winter"); + else if (season_ === "winter") setSeason("summer"); + else setSeason("all"); + }; + + const openSubjectView = (subject: Subject) => { + navigate(`/subjects/${subject.id}`, { + state: { from: "/recommendations" }, + }); + }; + + const [selectedSubject, setSelectedSubject] = useState(null); + + const openSubjectDetails = (subject: Subject) => { + setSelectedSubject(subject); + setShowModal(true); + }; + + const closeModal = () => { + setSelectedSubject(null); + setShowModal(false); + }; + + const getSeasonText = () => { + switch (season_) { + case "winter": + return "Зимски"; + case "summer": + return "Летен"; + case "all": + return "Двата"; + } + }; + + return ( +
+ {/*
*/} +
+
+

Препораки

+

+ Предметите што ќе ги добиете од алгоритамот се базирани на она што + сте го пополниле во формата. +
+ Тие се подредени според тоа колку вашите интереси се совпаѓаат со + она што го нудат предметите. +

+
+ +
+

Избран семестар:

+

+ {getSeasonText()} +

+
+ + + + +
+ +
+ {recommendations.length > 0 ? ( +
+
+

+ Вашите препораки за {getSeasonText().toLowerCase()}{" "} + {getSeasonText().toLowerCase() === "двата" + ? "семестри" + : "семестар"} +

+
+
+ +
+ {recommendations.map((subject, index) => ( +
+
+
+
+

+ {subject.name} +

+

{subject.code}

+
+
+ + {/* Badge Logic: Prioritizes the warning, and shows the selected badge only on hover. */} + {/* 1. First, check for the most critical warning. */} +
+ {subject.subject_info.activated === false ? ( + + ⚠️ Никогаш не бил активиран! + + ) : index === 0 ? ( + + ⭐ Најсоодветен! + + ) : null} +
+ +
+ + +
+
+
+ ))} +
+
+ ) : ( +
+
+ + + +
+

+ Започнете со пребарување! +

+

+ Изберете ја саканата сезона и кликнете на "Вчитај препораки" за да + ги откриете вашите идеални предмети! +

+
+ )} +
+ {showModal && selectedSubject && ( + + )} +
+ ); };