Index: src/app/page.tsx =================================================================== --- src/app/page.tsx (revision 82c9c5395fa3ee03a1695f6a09655d574ffbc478) +++ src/app/page.tsx (revision b67f274e88a37e13671a714acf2c630e077f8758) @@ -11,9 +11,12 @@ } from '@fortawesome/free-solid-svg-icons'; import { useState } from 'react'; +import { login } from '@/lib/auth'; export default function LoginPage() { const [showPassword, setShowPassword] = useState(false); + const [isSubmitting, setIsSubmitting] = useState(false); + const [errorMessage, setErrorMessage] = useState(null); const [formData, setFormData] = useState({ - username: '', + email: '', password: '' }); @@ -27,8 +30,16 @@ }; - const handleSubmit = (e: React.FormEvent) => { + const handleSubmit = async (e: React.FormEvent) => { e.preventDefault(); - // Handle login logic here - console.log('Login attempt:', formData); + setErrorMessage(null); + setIsSubmitting(true); + try { + await login({ email: formData.email, password: formData.password }); + window.location.href = '/students/profile'; + } catch (err) { + setErrorMessage(err instanceof Error ? err.message : 'Login failed.'); + } finally { + setIsSubmitting(false); + } }; @@ -57,8 +68,8 @@
- {/* Username Field */} + {/* Email Field */}
-
@@ -132,11 +143,18 @@
+ {errorMessage && ( +
+ {errorMessage} +
+ )} + {/* Submit Button */} Index: src/app/students/profile/page.tsx =================================================================== --- src/app/students/profile/page.tsx (revision 82c9c5395fa3ee03a1695f6a09655d574ffbc478) +++ src/app/students/profile/page.tsx (revision b67f274e88a37e13671a714acf2c630e077f8758) @@ -17,7 +17,74 @@ faPassport } from '@fortawesome/free-solid-svg-icons'; -import studentData from '@/data/student-profile.json'; - +import { useEffect, useState } from 'react'; +import { getAccessToken } from '@/lib/auth'; import { IconDefinition } from '@fortawesome/fontawesome-svg-core'; + +type PersonalInfo = { + firstName: string; + middleName: string; + lastName: string; + maidenName: string; + dateOfBirth: string; + gender: string; + nationality: string; + citizenship: string; + scholarship: string; + currentPlan: string; + registryNumber: string; + studyGroup: string; + notes?: string; + index: string; + embg: string; +}; + +type BirthInfo = { + placeOfBirth: string; + municipalityOfBirth: string; + country: string; +}; + +type PreviousEducation = { + type: string; + profession: string; + average: string | number; + language: string; + country: string; + previousUniversity: string; + previousFaculty: string; + previousStudyMode: string; +}; + +type EnrollmentInfo = { + enrollmentYear: string | number; + status: string; + cycle: string; + program: string; + quota: string; + secondaryEducationNumber: string; + previousEducationCredits: string | number; +}; + +type Contact = { + placeOfResidence: string; + municipalityOfResidence: string; + country: string; + address: string; + temporaryAddress: string; + phone: string; + mobilePhone: string; + passportNumber: string; + passportExpiryDate: string; + email: string; + microsoftEmail: string; +}; + +type StudentProfile = { + personalInfo: PersonalInfo; + birthInfo: BirthInfo; + previousEducation: PreviousEducation; + enrollmentInfo: EnrollmentInfo; + contact: Contact; +}; interface InfoRowProps { @@ -60,4 +127,73 @@ export default function ProfilePage() { + const [studentData, setStudentData] = useState(null); + const [isLoading, setIsLoading] = useState(true); + const [errorMessage, setErrorMessage] = useState(null); + + useEffect(() => { + let cancelled = false; + + async function load() { + setIsLoading(true); + setErrorMessage(null); + + const token = getAccessToken(); + if (!token) { + setErrorMessage('Not authenticated. Please login again.'); + setIsLoading(false); + return; + } + + try { + const response = await fetch('http://localhost:5147/api/user/getUser', { + method: 'GET', + headers: { + Authorization: `Bearer ${token}`, + }, + }); + + if (!response.ok) { + const text = await response.text().catch(() => ''); + throw new Error(text || `Failed to load profile (${response.status})`); + } + + const data = (await response.json()) as StudentProfile; + if (!cancelled) setStudentData(data); + } catch (err) { + if (!cancelled) { + setErrorMessage(err instanceof Error ? err.message : 'Failed to load profile.'); + } + } finally { + if (!cancelled) setIsLoading(false); + } + } + + void load(); + + return () => { + cancelled = true; + }; + }, []); + + if (isLoading) { + return ( +
+
+ Loading... +
+
+ ); + } + + if (errorMessage || !studentData) { + return ( +
+
+ {errorMessage ?? 'Failed to load profile.'} +
+
+ ); + } + const { personalInfo, birthInfo, previousEducation, enrollmentInfo, contact } = studentData; Index: src/app/students/semesters/page.tsx =================================================================== --- src/app/students/semesters/page.tsx (revision 82c9c5395fa3ee03a1695f6a09655d574ffbc478) +++ src/app/students/semesters/page.tsx (revision b67f274e88a37e13671a714acf2c630e077f8758) @@ -12,5 +12,33 @@ faTimesCircle } from '@fortawesome/free-solid-svg-icons'; -import semestersData from '@/data/semesters.json'; +import { useEffect, useState } from 'react'; +import { getAccessToken } from '@/lib/auth'; + +type Semester = { + id: number | string; + semester: string; + direction: string; + quota: string; + note: string; + studentCom: string; + sum: string; + paid: string; + ukim: string; + createdOn: string; + dateChanged: string; + credits: string; + type: string; + doc: string; + doc1: string; + verified: string; + taxes: string; + signatures: string; + status: string; + completed: string; +}; + +type SemestersResponse = { + semesters: Semester[]; +}; interface TableCellProps { @@ -81,5 +109,72 @@ export default function SemestersPage() { - const { semesters } = semestersData; + const [semesters, setSemesters] = useState([]); + const [isLoading, setIsLoading] = useState(true); + const [errorMessage, setErrorMessage] = useState(null); + + useEffect(() => { + let cancelled = false; + + async function load() { + setIsLoading(true); + setErrorMessage(null); + + const token = getAccessToken(); + if (!token) { + setErrorMessage('Not authenticated. Please login again.'); + setIsLoading(false); + return; + } + + try { + const response = await fetch('http://localhost:5147/api/user/getSemesters', { + method: 'GET', + headers: { + Authorization: `Bearer ${token}`, + }, + }); + + if (!response.ok) { + const text = await response.text().catch(() => ''); + throw new Error(text || `Failed to load semesters (${response.status})`); + } + + const data = (await response.json()) as SemestersResponse; + if (!cancelled) setSemesters(Array.isArray(data?.semesters) ? data.semesters : []); + } catch (err) { + if (!cancelled) { + setErrorMessage(err instanceof Error ? err.message : 'Failed to load semesters.'); + } + } finally { + if (!cancelled) setIsLoading(false); + } + } + + void load(); + + return () => { + cancelled = true; + }; + }, []); + + if (isLoading) { + return ( +
+
+ Loading... +
+
+ ); + } + + if (errorMessage) { + return ( +
+
+ {errorMessage} +
+
+ ); + } return ( Index: src/app/students/subjects/page.tsx =================================================================== --- src/app/students/subjects/page.tsx (revision 82c9c5395fa3ee03a1695f6a09655d574ffbc478) +++ src/app/students/subjects/page.tsx (revision b67f274e88a37e13671a714acf2c630e077f8758) @@ -7,6 +7,6 @@ faFileInvoice } from '@fortawesome/free-solid-svg-icons'; -import { useState } from 'react'; -import subjectsData from '@/data/subjects.json'; +import { useEffect, useState } from 'react'; +import { getAccessToken } from '@/lib/auth'; interface Subject { @@ -21,4 +21,116 @@ group: string; professor: string; +} + +type SemesterInfo = { + id: number; + name: string; + status: string; + serviceNumber: string | number; +}; + +type FinancialInfo = { + sum: string | number; + paid: string; + due: string; + materialCosts: string; + credits: string; + MKSA: string; + electronicRegistration: string; + eUKIM: string; + bankProvision: string; + total: string; +}; + +type CurrentSemester = { + id: string; + name: string; + status: string; + serviceNumber: string | number; + ticketNumber: string; + debt: string; + financialInfo: FinancialInfo; +}; + +type SubjectsResponse = { + currentSemester: CurrentSemester; + semesters: SemesterInfo[]; + subjectsBySemester: Record; + semesterKeyById: Record; +}; + +type ApiCurrentSemester = { + id: string; + name: string; + status: string; + serviceNumber: string | number; + ticketNumber: string; + debt: string; + financialInfo: { + sum: string | number; + paid: string; + due: string; + materialCosts: string; + credits: string; + totalCredits?: string; + mksa?: string; + MKSA?: string; + electronicRegistration: string; + eUKIM: string; + bankProvision: string; + total: string; + }; +}; + +type ApiSubjectsResponse = { + semesters: SemesterInfo[]; + currentSemester?: ApiCurrentSemester; + currentSemestar?: ApiCurrentSemester; + subjectsBySemester: Record; +}; + +function normalizeKey(input: string) { + return input.toLowerCase().replace(/\s|\(|\)|\.|,/g, ''); +} + +function detectSeasonFromName(name: string): 'summer' | 'winter' | null { + const n = name.toLowerCase(); + if (n.includes('летен')) return 'summer'; + if (n.includes('зимски')) return 'winter'; + return null; +} + +function buildSemesterKeyById(semesters: SemesterInfo[], keys: string[]) { + const keyBySeason: Partial> = {}; + for (const key of keys) { + const k = key.toLowerCase(); + if (k.includes('summer')) keyBySeason.summer = key; + if (k.includes('winter')) keyBySeason.winter = key; + } + + const mapping: Record = {}; + for (const s of semesters) { + const season = detectSeasonFromName(s.name); + const mapped = season ? keyBySeason[season] : undefined; + if (mapped) mapping[s.id] = mapped; + } + + // Fallback: if we couldn't infer seasons, try matching by normalized names. + if (Object.keys(mapping).length === 0) { + for (const s of semesters) { + const ns = normalizeKey(s.name); + const match = keys.find((k) => normalizeKey(k).includes(ns) || ns.includes(normalizeKey(k))); + if (match) mapping[s.id] = match; + } + } + + // Last resort: map in order. + if (Object.keys(mapping).length === 0) { + semesters.forEach((s, idx) => { + if (keys[idx]) mapping[s.id] = keys[idx]; + }); + } + + return mapping; } @@ -59,9 +171,130 @@ export default function SubjectsPage() { - const [selectedSemester, setSelectedSemester] = useState(subjectsData.currentSemester.id); + const [subjectsData, setSubjectsData] = useState(null); + const [selectedSemester, setSelectedSemester] = useState(null); const [isDropdownOpen, setIsDropdownOpen] = useState(false); + const [isLoading, setIsLoading] = useState(true); + const [errorMessage, setErrorMessage] = useState(null); + + useEffect(() => { + let cancelled = false; + + async function load() { + setIsLoading(true); + setErrorMessage(null); + + const token = getAccessToken(); + if (!token) { + setErrorMessage('Not authenticated. Please login again.'); + setIsLoading(false); + return; + } + + try { + const response = await fetch('http://localhost:5147/api/user/getSubjects', { + method: 'GET', + headers: { + Authorization: `Bearer ${token}`, + }, + }); + + if (!response.ok) { + const text = await response.text().catch(() => ''); + throw new Error(text || `Failed to load subjects (${response.status})`); + } + + const apiData = (await response.json()) as ApiSubjectsResponse; + if (cancelled) return; + + const current = apiData.currentSemester ?? apiData.currentSemestar; + if (!current) { + throw new Error('Response missing currentSemestar/currentSemester'); + } + + const keys = Object.keys(apiData.subjectsBySemester ?? {}); + const semesterKeyById = buildSemesterKeyById(apiData.semesters ?? [], keys); + + const normalized: SubjectsResponse = { + semesters: apiData.semesters ?? [], + subjectsBySemester: apiData.subjectsBySemester ?? {}, + semesterKeyById, + currentSemester: { + id: current.id, + name: current.name, + status: current.status, + serviceNumber: current.serviceNumber, + ticketNumber: current.ticketNumber, + debt: current.debt, + financialInfo: { + sum: current.financialInfo.sum, + paid: current.financialInfo.paid, + due: current.financialInfo.due, + materialCosts: current.financialInfo.materialCosts, + credits: current.financialInfo.credits, + MKSA: current.financialInfo.MKSA ?? current.financialInfo.mksa ?? '', + electronicRegistration: current.financialInfo.electronicRegistration, + eUKIM: current.financialInfo.eUKIM, + bankProvision: current.financialInfo.bankProvision, + total: current.financialInfo.total, + }, + }, + }; + + setSubjectsData(normalized); + + setSelectedSemester((prev) => { + if (prev !== null) return prev; + const season = detectSeasonFromName(current.name); + if (season) { + const key = keys.find((k) => k.toLowerCase().includes(season)); + if (key) { + const matchId = normalized.semesters.find((s) => normalized.semesterKeyById[s.id] === key)?.id; + if (typeof matchId === 'number') return matchId; + } + } + return normalized.semesters[0]?.id ?? null; + }); + } catch (err) { + if (!cancelled) { + setErrorMessage(err instanceof Error ? err.message : 'Failed to load subjects.'); + } + } finally { + if (!cancelled) setIsLoading(false); + } + } + + void load(); + + return () => { + cancelled = true; + }; + }, []); + + if (isLoading) { + return ( +
+
+ Loading... +
+
+ ); + } + + if (errorMessage || !subjectsData || selectedSemester === null) { + return ( +
+
+ {errorMessage ?? 'Failed to load subjects.'} +
+
+ ); + } - const currentSemesterData = subjectsData.semesters.find(s => s.id === selectedSemester) || subjectsData.currentSemester; - const currentSubjects: Subject[] = subjectsData.subjectsBySemester[selectedSemester as keyof typeof subjectsData.subjectsBySemester] || []; + const currentSemesterData = + subjectsData.semesters.find((s) => s.id === selectedSemester) ?? subjectsData.semesters[0]; + const semesterKey = + subjectsData.semesterKeyById[selectedSemester] ?? + Object.keys(subjectsData.subjectsBySemester)[0]; + const currentSubjects: Subject[] = semesterKey ? subjectsData.subjectsBySemester[semesterKey] || [] : []; const { currentSemester } = subjectsData;