Index: src/app/admin/layout.tsx =================================================================== --- src/app/admin/layout.tsx (revision 8496f3c2ae490dee80fdf71af9fe30c63996efaf) +++ src/app/admin/layout.tsx (revision 8496f3c2ae490dee80fdf71af9fe30c63996efaf) @@ -0,0 +1,27 @@ +import type { Metadata } from "next"; +import { Geist, Geist_Mono } from "next/font/google"; +import "../globals.css"; +import "@fortawesome/fontawesome-svg-core/styles.css"; +import { config } from "@fortawesome/fontawesome-svg-core"; +import Header from "@/components/header"; +import AdminNavbar from "@/components/admin-navbar"; + +config.autoAddCss = false; + +const geistSans = Geist({ variable: "--font-geist-sans", subsets: ["latin"] }); +const geistMono = Geist_Mono({ variable: "--font-geist-mono", subsets: ["latin"] }); + +export const metadata: Metadata = { + title: "IKnow - Admin Portal", + description: "Administration of subjects, semesters and teaching assignments", +}; + +export default function AdminLayout({ children }: Readonly<{ children: React.ReactNode }>) { + return ( +
+
+ + {children} +
+ ); +} Index: src/app/admin/page.tsx =================================================================== --- src/app/admin/page.tsx (revision 8496f3c2ae490dee80fdf71af9fe30c63996efaf) +++ src/app/admin/page.tsx (revision 8496f3c2ae490dee80fdf71af9fe30c63996efaf) @@ -0,0 +1,5 @@ +import { redirect } from "next/navigation"; + +export default function AdminIndex() { + redirect("/admin/subjects"); +} Index: src/app/admin/schedule/page.tsx =================================================================== --- src/app/admin/schedule/page.tsx (revision 8496f3c2ae490dee80fdf71af9fe30c63996efaf) +++ src/app/admin/schedule/page.tsx (revision 8496f3c2ae490dee80fdf71af9fe30c63996efaf) @@ -0,0 +1,224 @@ +"use client"; + +import { useCallback, useEffect, useState } from "react"; +import { useTranslation } from "react-i18next"; +import { adminGet, adminSend, type AdminSemester, type Schedule } from "@/lib/admin-api"; + +export default function AdminSchedulePage() { + const { t } = useTranslation(); + + const [semesters, setSemesters] = useState([]); + const [semesterId, setSemesterId] = useState(null); + const [schedule, setSchedule] = useState(null); + + const [loading, setLoading] = useState(true); + const [busy, setBusy] = useState(false); + const [error, setError] = useState(null); + const [notice, setNotice] = useState(null); + + const [subjectId, setSubjectId] = useState(""); + const [professorId, setProfessorId] = useState(""); + + useEffect(() => { + (async () => { + try { + const list = await adminGet("/api/admin/semesters"); + setSemesters(list); + setSemesterId(list[0]?.id ?? null); + } catch (e) { + setError(e instanceof Error ? e.message : String(e)); + } finally { + setLoading(false); + } + })(); + }, []); + + const loadSchedule = useCallback(async (id: number) => { + setLoading(true); + setError(null); + try { + setSchedule(await adminGet(`/api/admin/schedule/${id}`)); + } catch (e) { + setError(e instanceof Error ? e.message : String(e)); + } finally { + setLoading(false); + } + }, []); + + useEffect(() => { + if (semesterId !== null) void loadSchedule(semesterId); + }, [semesterId, loadSchedule]); + + async function run(action: () => Promise<{ message?: string }>) { + setBusy(true); + setError(null); + setNotice(null); + try { + const result = await action(); + setNotice(result.message ?? null); + if (semesterId !== null) await loadSchedule(semesterId); + } catch (e) { + setError(e instanceof Error ? e.message : String(e)); + } finally { + setBusy(false); + } + } + + return ( +
+
+

{t("admin_schedule")}

+

{t("admin_schedule_intro")}

+
+ + {error && ( +
{error}
+ )} + {notice && ( +
{notice}
+ )} + +
+
+ + + + + + + +
+
+ + {schedule && schedule.uncoveredSubjects.length > 0 && ( +
+ {t("admin_uncovered_count", { count: schedule.uncoveredSubjects.length })} + {t("admin_uncovered_hint")} +
+ {schedule.uncoveredSubjects.map((u) => u.code).join(", ")} +
+
+ )} + +
+
+
+

+ {t("admin_assignments")} {schedule ? `— ${schedule.semesterName}` : ""} +

+
+
+ + + + + + + + + + + {loading ? ( + + ) : !schedule || schedule.assignments.length === 0 ? ( + + ) : ( + schedule.assignments.map((a) => ( + + + + + + + )) + )} + +
{t("admin_subject_code")}{t("subject")}{t("admin_professor")}{t("actions")}
{t("loading")}
{t("admin_no_assignments")}
{a.subjectCode}{a.subjectName}{a.professorName} + +
+
+
+ +
+
+

{t("admin_load")}

+
+
    + {schedule?.load.map((l) => ( +
  • + {l.professorName} + {l.subjects} +
    • + ))} + {!schedule?.load.length && ( +
  • {t("admin_no_professors")}
    • + )} +
+
+
+
+ ); +} Index: src/app/admin/semesters/page.tsx =================================================================== --- src/app/admin/semesters/page.tsx (revision 8496f3c2ae490dee80fdf71af9fe30c63996efaf) +++ src/app/admin/semesters/page.tsx (revision 8496f3c2ae490dee80fdf71af9fe30c63996efaf) @@ -0,0 +1,173 @@ +"use client"; + +import { useCallback, useEffect, useState } from "react"; +import { useTranslation } from "react-i18next"; +import { adminGet, adminSend, type AdminSemester } from "@/lib/admin-api"; + +export default function AdminSemestersPage() { + const { t } = useTranslation(); + + const [semesters, setSemesters] = useState([]); + const [loading, setLoading] = useState(true); + const [busy, setBusy] = useState(false); + const [error, setError] = useState(null); + const [notice, setNotice] = useState(null); + + const [year, setYear] = useState(new Date().getFullYear()); + const [type, setType] = useState<"winter" | "summer">("winter"); + const [expandedId, setExpandedId] = useState(null); + + const refresh = useCallback(async () => { + setLoading(true); + setError(null); + try { + setSemesters(await adminGet("/api/admin/semesters")); + } catch (e) { + setError(e instanceof Error ? e.message : String(e)); + } finally { + setLoading(false); + } + }, []); + + useEffect(() => { + void refresh(); + }, [refresh]); + + async function create() { + setBusy(true); + setError(null); + setNotice(null); + try { + const result = await adminSend("/api/admin/semesters", "POST", { Year: year, Type: type }); + setNotice(result.message ?? null); + await refresh(); + } catch (e) { + setError(e instanceof Error ? e.message : String(e)); + } finally { + setBusy(false); + } + } + + return ( +
+
+

{t("admin_semesters")}

+

{t("admin_semesters_intro")}

+
+ + {error && ( +
{error}
+ )} + {notice && ( +
{notice}
+ )} + +
+

{t("admin_new_semester")}

+
+ + + +
+
+ +
+
+

{t("admin_open_semesters")}

+
+
+ + + + + + + + + + + {loading ? ( + + ) : semesters.length === 0 ? ( + + ) : ( + semesters.map((s) => { + const uncovered = s.uncoveredSubjects.length; + return ( + <> + + + + + + + {expandedId === s.id && uncovered > 0 && ( + + + + )} + + ); + }) + )} + +
{t("semester")}{t("admin_enrolments")}{t("admin_coverage")}{t("actions")}
{t("loading")}
{t("admin_no_semesters")}
{s.name}{s.enrolmentCount} + {uncovered === 0 ? ( + + {t("admin_fully_covered")} + + ) : ( + + {t("admin_uncovered_count", { count: uncovered })} + + )} + + {uncovered > 0 && ( + + )} +
+

{t("admin_uncovered_hint")}

+
    + {s.uncoveredSubjects.map((u) => ( +
  • + {u.code} — {u.name} +
    • + ))} +
+
+
+
+
+ ); +} Index: src/app/admin/subjects/page.tsx =================================================================== --- src/app/admin/subjects/page.tsx (revision 8496f3c2ae490dee80fdf71af9fe30c63996efaf) +++ src/app/admin/subjects/page.tsx (revision 8496f3c2ae490dee80fdf71af9fe30c63996efaf) @@ -0,0 +1,409 @@ +"use client"; + +import { useCallback, useEffect, useMemo, useState } from "react"; +import { useTranslation } from "react-i18next"; +import { + adminGet, + adminSend, + type AdminSubject, + type SubjectRef, +} from "@/lib/admin-api"; + +const EMPTY_FORM = { name: "", code: "", awardedCredits: 6, dependencyCredit: 0 }; + +export default function AdminSubjectsPage() { + const { t } = useTranslation(); + + const [subjects, setSubjects] = useState([]); + const [majors, setMajors] = useState([]); + const [loading, setLoading] = useState(true); + const [busy, setBusy] = useState(false); + const [error, setError] = useState(null); + const [notice, setNotice] = useState(null); + + const [form, setForm] = useState(EMPTY_FORM); + const [editingId, setEditingId] = useState(null); + const [expandedId, setExpandedId] = useState(null); + const [query, setQuery] = useState(""); + + const refresh = useCallback(async () => { + setLoading(true); + setError(null); + try { + const [s, m] = await Promise.all([ + adminGet("/api/admin/subjects"), + adminGet("/api/admin/majors"), + ]); + setSubjects(s); + setMajors(m); + } catch (e) { + setError(e instanceof Error ? e.message : String(e)); + } finally { + setLoading(false); + } + }, []); + + useEffect(() => { + void refresh(); + }, [refresh]); + + async function run(action: () => Promise<{ message?: string }>) { + setBusy(true); + setError(null); + setNotice(null); + try { + const result = await action(); + setNotice(result.message ?? null); + await refresh(); + } catch (e) { + setError(e instanceof Error ? e.message : String(e)); + } finally { + setBusy(false); + } + } + + const filtered = useMemo(() => { + const q = query.trim().toLowerCase(); + if (!q) return subjects; + return subjects.filter( + (s) => + (s.name ?? "").toLowerCase().includes(q) || + (s.code ?? "").toLowerCase().includes(q), + ); + }, [subjects, query]); + + function startEdit(s: AdminSubject) { + setEditingId(s.id); + setForm({ + name: s.name ?? "", + code: s.code ?? "", + awardedCredits: s.awardedCredits, + dependencyCredit: s.dependencyCredit ?? 0, + }); + window.scrollTo({ top: 0, behavior: "smooth" }); + } + + function cancelEdit() { + setEditingId(null); + setForm(EMPTY_FORM); + } + + return ( +
+
+

{t("admin_subjects")}

+

{t("admin_subjects_intro")}

+
+ + {error && ( +
+ {error} +
+ )} + {notice && ( +
+ {notice} +
+ )} + + {/* create / edit */} +
+

+ {editingId === null ? t("admin_new_subject") : t("admin_edit_subject")} +

+
+ + + + +
+
+ + {editingId !== null && ( + + )} +
+
+ + {/* list */} +
+
+

+ {t("admin_subjects")} ({filtered.length}) +

+ setQuery(e.target.value)} + /> +
+ +
+ + + + + + + + + + + + + {loading ? ( + + ) : filtered.length === 0 ? ( + + ) : ( + filtered.map((s) => ( + setExpandedId(expandedId === s.id ? null : s.id)} + onEdit={() => startEdit(s)} + run={run} + /> + )) + )} + +
{t("admin_subject_code")}{t("admin_subject_name")}{t("admin_credits")}{t("admin_majors")}{t("admin_prerequisites")}{t("actions")}
{t("loading")}
{t("admin_no_subjects")}
+
+
+
+ ); +} + +function ExpandableRow({ + subject, + majors, + subjects, + busy, + expanded, + onToggle, + onEdit, + run, +}: { + subject: AdminSubject; + majors: SubjectRef[]; + subjects: AdminSubject[]; + busy: boolean; + expanded: boolean; + onToggle: () => void; + onEdit: () => void; + run: (action: () => Promise<{ message?: string }>) => Promise; +}) { + const { t } = useTranslation(); + const [majorId, setMajorId] = useState(""); + const [semester, setSemester] = useState(1); + const [prereqId, setPrereqId] = useState(""); + + // A subject already taken by students cannot be deleted; the FK forbids it. + const deletable = subject.enrolledCount === 0; + + return ( + <> + + {subject.code} + {subject.name} + {subject.awardedCredits} + + {subject.majors.length === 0 ? "—" : subject.majors.map((m) => `${m.majorName} (${m.mandatorySemester})`).join(", ")} + + + {subject.prerequisites.length === 0 ? "—" : subject.prerequisites.map((p) => p.code).join(", ")} + + +
+ + + +
+ + + + {expanded && ( + + +
+ {/* majors */} +
+

{t("admin_majors")}

+
    + {subject.majors.map((m) => ( +
  • + {m.majorName} — {t("enroll_semester_short")} {m.mandatorySemester} + +
    • + ))} + {subject.majors.length === 0 &&
  • —
    • } +
+
+ + setSemester(Number(e.target.value))} + /> + +
+
+ + {/* prerequisites */} +
+

{t("admin_prerequisites")}

+
    + {subject.prerequisites.map((p) => ( +
  • + {p.code} — {p.name} + +
    • + ))} + {subject.prerequisites.length === 0 &&
  • —
    • } +
+
+ + +
+
+
+ + + )} + + ); +} Index: src/app/api/prof/grade/add/route.ts =================================================================== --- src/app/api/prof/grade/add/route.ts (revision 4fe4582e6255b2244fa2c6ce9ae837ab03e74a58) +++ (revision ) @@ -1,13 +1,0 @@ -import { NextResponse } from "next/server"; -import { setGrade, type AddGrade } from "@/lib/prof-demo-store"; - -export async function POST(req: Request) { - try { - const payload = (await req.json()) as AddGrade; - const result = setGrade(payload, "add"); - return NextResponse.json({ ok: true, ...result }); - } catch (err) { - const message = err instanceof Error ? err.message : "Unknown error"; - return NextResponse.json({ ok: false, message }, { status: 400 }); - } -} Index: src/app/api/prof/grade/edit/route.ts =================================================================== --- src/app/api/prof/grade/edit/route.ts (revision 4fe4582e6255b2244fa2c6ce9ae837ab03e74a58) +++ (revision ) @@ -1,13 +1,0 @@ -import { NextResponse } from "next/server"; -import { setGrade, type AddGrade } from "@/lib/prof-demo-store"; - -export async function POST(req: Request) { - try { - const payload = (await req.json()) as AddGrade; - const result = setGrade(payload, "edit"); - return NextResponse.json({ ok: true, ...result }); - } catch (err) { - const message = err instanceof Error ? err.message : "Unknown error"; - return NextResponse.json({ ok: false, message }, { status: 400 }); - } -} Index: src/app/api/prof/grade/remove/route.ts =================================================================== --- src/app/api/prof/grade/remove/route.ts (revision 4fe4582e6255b2244fa2c6ce9ae837ab03e74a58) +++ (revision ) @@ -1,13 +1,0 @@ -import { NextResponse } from "next/server"; -import { setGrade, type AddGrade } from "@/lib/prof-demo-store"; - -export async function POST(req: Request) { - try { - const payload = (await req.json()) as AddGrade; - const result = setGrade(payload, "remove"); - return NextResponse.json({ ok: true, ...result }); - } catch (err) { - const message = err instanceof Error ? err.message : "Unknown error"; - return NextResponse.json({ ok: false, message }, { status: 400 }); - } -} Index: src/app/api/prof/students/route.ts =================================================================== --- src/app/api/prof/students/route.ts (revision 4fe4582e6255b2244fa2c6ce9ae837ab03e74a58) +++ (revision ) @@ -1,6 +1,0 @@ -import { NextResponse } from "next/server"; -import { getSubjects } from "@/lib/prof-demo-store"; - -export async function GET() { - return NextResponse.json(getSubjects()); -} Index: src/app/page.tsx =================================================================== --- src/app/page.tsx (revision 4fe4582e6255b2244fa2c6ce9ae837ab03e74a58) +++ src/app/page.tsx (revision 8496f3c2ae490dee80fdf71af9fe30c63996efaf) @@ -39,5 +39,11 @@ try { const session = await login({ email: formData.email, password: formData.password }); - window.location.href = session.role === 'Professor' ? '/professor' : '/students'; + // Admins previously fell through to /students, where they have no + // enrolments and every page renders empty. + const home = + session.role === 'Professor' ? '/professor' + : session.role === 'Admin' ? '/admin' + : '/students'; + window.location.href = home; } catch (err) { setErrorMessage(err instanceof Error ? err.message : 'Login failed.'); @@ -70,4 +76,14 @@
{t('login_professor_example')} +
+
+ {t('login_demo_note')} +
+ + +
+
{t('login_admin_title')}
+
+ {t('login_admin_example')}
Index: src/app/professor/profile/page.tsx =================================================================== --- src/app/professor/profile/page.tsx (revision 4fe4582e6255b2244fa2c6ce9ae837ab03e74a58) +++ src/app/professor/profile/page.tsx (revision 8496f3c2ae490dee80fdf71af9fe30c63996efaf) @@ -19,4 +19,5 @@ import { IconDefinition } from "@fortawesome/fontawesome-svg-core"; import { useTranslation } from 'react-i18next'; +import { apiUrl } from '@/lib/api'; type PersonalInfo = { @@ -152,5 +153,5 @@ try { - const response = await fetch("https://iknow-api.onrender.com/api/user/getUser", { + const response = await fetch(apiUrl("/api/user/getUser"), { method: "GET", headers: { Index: src/app/professor/students/page.tsx =================================================================== --- src/app/professor/students/page.tsx (revision 4fe4582e6255b2244fa2c6ce9ae837ab03e74a58) +++ src/app/professor/students/page.tsx (revision 8496f3c2ae490dee80fdf71af9fe30c63996efaf) @@ -3,15 +3,22 @@ import { useEffect, useMemo, useState } from "react"; import { useTranslation } from 'react-i18next'; +import { apiUrl } from '@/lib/api'; +import { getAccessToken } from '@/lib/auth'; type UsersBySubject = { - Id?: string; - Name?: string; - Grade: number; + /** users.id - what the grading endpoints expect as StudentId. */ + id: number; + name?: string; + /** users.index - the number shown to the professor and searched on. */ + index?: string; + grade: number; + semester?: string; }; type SubjectsAndUsers = { - Name?: string; - Id?: number; - Users: UsersBySubject[]; + name?: string; + id?: number; + code?: string; + users: UsersBySubject[]; }; @@ -19,20 +26,16 @@ StudentId: number; SubjectId: number; - grade: number; + Grade: number; }; type FlatRow = { - studentIdStr: string; - studentIdNum: number | null; + studentIdNum: number; + studentIndex: string; studentName: string; subjectId: number; subjectName: string; + semester: string; grade: number; }; - -function toInt(value: string): number | null { - const n = Number.parseInt(value, 10); - return Number.isFinite(n) ? n : null; -} export default function ProfessorStudentsPage() { @@ -52,5 +55,13 @@ setError(null); try { - const res = await fetch("/api/prof/students", { cache: "no-store" }); + const token = getAccessToken(); + if (!token) { + throw new Error("You are not signed in."); + } + + const res = await fetch(apiUrl("/api/prof/students"), { + cache: "no-store", + headers: { Authorization: `Bearer ${token}` }, + }); if (!res.ok) { throw new Error(`Failed to fetch students (${res.status})`); @@ -61,9 +72,9 @@ const nextSelections: Record = {}; for (const subj of data) { - if (!subj.Id) continue; - for (const u of subj.Users) { - const key = `${subj.Id}:${u.Id ?? ""}`; - const current = u.Grade; - nextSelections[key] = current >= 5 && current <= 10 ? current : 5; + if (!subj.id) continue; + for (const u of subj.users) { + const key = `${subj.id}:${u.id}`; + // grade_type only declares 6..10, so an ungraded row starts at 6. + nextSelections[key] = u.grade >= 6 && u.grade <= 10 ? u.grade : 6; } } @@ -83,13 +94,14 @@ const rows: FlatRow[] = []; for (const subj of subjects) { - if (!subj.Id) continue; - for (const u of subj.Users) { + if (!subj.id) continue; + for (const u of subj.users) { rows.push({ - studentIdStr: u.Id ?? "", - studentIdNum: toInt(u.Id ?? ""), - studentName: u.Name ?? "", - subjectId: subj.Id, - subjectName: subj.Name ?? "", - grade: u.Grade, + studentIdNum: u.id, + studentIndex: u.index ?? "", + studentName: u.name ?? "", + subjectId: subj.id, + subjectName: subj.name ?? "", + semester: u.semester ?? "", + grade: u.grade, }); } @@ -102,5 +114,5 @@ return flatRows.filter((r) => { if (subjectFilter !== "all" && String(r.subjectId) !== subjectFilter) return false; - if (q.length > 0 && !r.studentIdStr.includes(q)) return false; + if (q.length > 0 && !r.studentIndex.includes(q)) return false; return true; }); @@ -111,7 +123,15 @@ setError(null); try { - const res = await fetch(url, { + const token = getAccessToken(); + if (!token) { + throw new Error("You are not signed in."); + } + + const res = await fetch(apiUrl(url), { method: "POST", - headers: { "Content-Type": "application/json" }, + headers: { + "Content-Type": "application/json", + Authorization: `Bearer ${token}`, + }, body: JSON.stringify(payload), }); @@ -135,5 +155,5 @@

{t('prof_students_title')}

- {t('prof_students_data_note')} /api/prof/students (demo store). + {t('prof_students_data_note')} /api/prof/students.

@@ -149,8 +169,8 @@ {subjects - .filter((s) => typeof s.Id === "number") + .filter((s) => typeof s.id === "number") .map((s) => ( - ))} @@ -202,6 +222,6 @@ ) : ( filteredRows.map((r) => { - const key = `${r.subjectId}:${r.studentIdStr}`; - const selected = gradeSelection[key] ?? 5; + const key = `${r.subjectId}:${r.studentIdNum}`; + const selected = gradeSelection[key] ?? 6; const busy = actionBusyKey === key; @@ -209,6 +229,11 @@ {r.studentName} - {r.studentIdStr} - {r.subjectName} + {r.studentIndex} + + {r.subjectName} + {r.semester && ( + {r.semester} + )} +
@@ -223,5 +248,5 @@ } > - {[5, 6, 7, 8, 9, 10].map((g) => ( + {[6, 7, 8, 9, 10].map((g) => (
@@ -373,4 +387,10 @@
+ + setEnrollOpen(false)} + onEnrolled={() => setReloadKey((k) => k + 1)} + /> ); Index: src/app/students/subjects/page.tsx =================================================================== --- src/app/students/subjects/page.tsx (revision 4fe4582e6255b2244fa2c6ce9ae837ab03e74a58) +++ src/app/students/subjects/page.tsx (revision 8496f3c2ae490dee80fdf71af9fe30c63996efaf) @@ -10,4 +10,5 @@ import { getAccessToken } from '@/lib/auth'; import { useTranslation } from 'react-i18next'; +import { apiUrl } from '@/lib/api'; interface Subject { @@ -193,5 +194,5 @@ try { - const response = await fetch('https://iknow-api.onrender.com/api/user/getSubjects', { + const response = await fetch(apiUrl('/api/user/getSubjects'), { method: 'GET', headers: { Index: src/components/admin-navbar.tsx =================================================================== --- src/components/admin-navbar.tsx (revision 8496f3c2ae490dee80fdf71af9fe30c63996efaf) +++ src/components/admin-navbar.tsx (revision 8496f3c2ae490dee80fdf71af9fe30c63996efaf) @@ -0,0 +1,67 @@ +"use client"; + +import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; +import { faBook, faCalendarPlus, faChalkboardUser, faBars, faTimes, faUserGear } from "@fortawesome/free-solid-svg-icons"; +import Link from "next/link"; +import { useState } from "react"; +import { useTranslation } from "react-i18next"; + +const AdminNavbar = () => { + const [isMenuOpen, setIsMenuOpen] = useState(false); + const toggleMenu = () => setIsMenuOpen((v) => !v); + + const { t } = useTranslation(); + const menuItems = [ + { icon: faBook, label: t("admin_subjects"), href: "/admin/subjects" }, + { icon: faCalendarPlus, label: t("admin_semesters"), href: "/admin/semesters" }, + { icon: faChalkboardUser, label: t("admin_schedule"), href: "/admin/schedule" }, + ]; + + return ( + <> + {/* Desktop Navbar */} + + + {/* Mobile Navbar */} + + + ); +}; + +export default AdminNavbar; Index: src/components/enroll-semester-dialog.tsx =================================================================== --- src/components/enroll-semester-dialog.tsx (revision 8496f3c2ae490dee80fdf71af9fe30c63996efaf) +++ src/components/enroll-semester-dialog.tsx (revision 8496f3c2ae490dee80fdf71af9fe30c63996efaf) @@ -0,0 +1,287 @@ +"use client"; + +import { useEffect, useMemo, useState } from "react"; +import { useTranslation } from "react-i18next"; +import { apiUrl } from "@/lib/api"; +import { getAccessToken } from "@/lib/auth"; + +type SubjectOption = { + id: number; + name?: string; + code?: string; + credits: number; + mandatorySemester: number; + alreadyPassed: boolean; +}; + +type MajorOption = { + id: number; + name?: string; + subjects: SubjectOption[]; +}; + +type SemesterOption = { + id: number; + name?: string; + year: number; + type?: string; +}; + +type EnrollmentOptions = { + requiredSubjects: number; + semesters: SemesterOption[]; + majors: MajorOption[]; + defaultMajorId: number | null; +}; + +export default function EnrollSemesterDialog({ + open, + onClose, + onEnrolled, +}: { + open: boolean; + onClose: () => void; + onEnrolled: () => void; +}) { + const { t } = useTranslation(); + + const [options, setOptions] = useState(null); + const [loading, setLoading] = useState(false); + const [submitting, setSubmitting] = useState(false); + const [error, setError] = useState(null); + + const [semesterId, setSemesterId] = useState(null); + const [majorId, setMajorId] = useState(null); + const [picked, setPicked] = useState([]); + + useEffect(() => { + if (!open) return; + + let cancelled = false; + + async function load() { + setLoading(true); + setError(null); + try { + const token = getAccessToken(); + if (!token) throw new Error(t("enroll_not_signed_in")); + + const res = await fetch(apiUrl("/api/enrollment/options"), { + cache: "no-store", + headers: { Authorization: `Bearer ${token}` }, + }); + if (!res.ok) throw new Error(`${t("enroll_options_failed")} (${res.status})`); + + const data = (await res.json()) as EnrollmentOptions; + if (cancelled) return; + + setOptions(data); + setSemesterId(data.semesters[0]?.id ?? null); + setMajorId(data.defaultMajorId ?? data.majors[0]?.id ?? null); + setPicked([]); + } catch (e) { + if (!cancelled) setError(e instanceof Error ? e.message : String(e)); + } finally { + if (!cancelled) setLoading(false); + } + } + + void load(); + return () => { + cancelled = true; + }; + }, [open, t]); + + const required = options?.requiredSubjects ?? 5; + + const subjects = useMemo( + () => options?.majors.find((m) => m.id === majorId)?.subjects ?? [], + [options, majorId], + ); + + function toggle(subjectId: number) { + setPicked((prev) => { + if (prev.includes(subjectId)) return prev.filter((id) => id !== subjectId); + if (prev.length >= required) return prev; // the cap is the point of the form + return [...prev, subjectId]; + }); + } + + async function submit() { + setSubmitting(true); + setError(null); + try { + const token = getAccessToken(); + if (!token) throw new Error(t("enroll_not_signed_in")); + + const res = await fetch(apiUrl("/api/enrollment"), { + method: "POST", + headers: { + "Content-Type": "application/json", + Authorization: `Bearer ${token}`, + }, + body: JSON.stringify({ + SemesterId: semesterId, + MajorId: majorId, + SubjectIds: picked, + }), + }); + + const body = (await res.json()) as { ok: boolean; message?: string }; + if (!res.ok || !body.ok) { + throw new Error(body.message || `${t("enroll_failed")} (${res.status})`); + } + + onEnrolled(); + onClose(); + } catch (e) { + setError(e instanceof Error ? e.message : String(e)); + } finally { + setSubmitting(false); + } + } + + if (!open) return null; + + const noSemestersLeft = !loading && options !== null && options.semesters.length === 0; + const canSubmit = + !submitting && semesterId !== null && majorId !== null && picked.length === required; + + return ( +
+
e.stopPropagation()} + > +
+

{t("enroll_semester")}

+ +
+ +
+ {loading ? ( +

{t("loading")}

+ ) : noSemestersLeft ? ( +

{t("enroll_no_semesters")}

+ ) : ( + <> +
+
+ + +
+ +
+ + +
+
+ +
+

{t("subjects")}

+ + {picked.length} / {required} + +
+ +
+ {subjects.map((s) => { + const checked = picked.includes(s.id); + const atLimit = !checked && picked.length >= required; + return ( + + ); + })} +
+ + )} + + {error && ( +
+ {error} +
+ )} + +
+ + +
+
+
+
+ ); +} Index: src/components/exams.tsx =================================================================== --- src/components/exams.tsx (revision 4fe4582e6255b2244fa2c6ce9ae837ab03e74a58) +++ src/components/exams.tsx (revision 8496f3c2ae490dee80fdf71af9fe30c63996efaf) @@ -5,4 +5,5 @@ import { faSort, faSortUp, faSortDown } from '@fortawesome/free-solid-svg-icons'; import { getAccessToken } from '@/lib/auth'; +import { apiUrl } from '@/lib/api'; type PassedSubject = { @@ -56,5 +57,5 @@ try { - const response = await fetch('https://iknow-api.onrender.com/api/user/getPassedSubjects', { + const response = await fetch(apiUrl('/api/user/getPassedSubjects'), { method: 'GET', headers: { Index: src/components/header.tsx =================================================================== --- src/components/header.tsx (revision 4fe4582e6255b2244fa2c6ce9ae837ab03e74a58) +++ src/components/header.tsx (revision 8496f3c2ae490dee80fdf71af9fe30c63996efaf) @@ -9,4 +9,5 @@ import { useTranslation } from 'react-i18next'; import LanguageSwitcher from './LanguageSwitcher'; +import { apiUrl } from '@/lib/api'; const Header = () => { @@ -20,5 +21,5 @@ if (!token) return; try { - const response = await fetch('https://iknow-api.onrender.com/api/user/getUser', { + const response = await fetch(apiUrl('/api/user/getUser'), { method: 'GET', headers: { Authorization: `Bearer ${token}` }, Index: src/lib/admin-api.ts =================================================================== --- src/lib/admin-api.ts (revision 8496f3c2ae490dee80fdf71af9fe30c63996efaf) +++ src/lib/admin-api.ts (revision 8496f3c2ae490dee80fdf71af9fe30c63996efaf) @@ -0,0 +1,90 @@ +import { apiUrl } from "@/lib/api"; +import { getAccessToken } from "@/lib/auth"; + +export type AdminResult = { ok: boolean; message?: string; id?: number | null }; + +export type SubjectRef = { id: number; name?: string; code?: string | null }; + +export type SubjectMajor = { + majorId: number; + majorName?: string; + mandatorySemester: number; +}; + +export type AdminSubject = { + id: number; + name?: string; + code?: string; + awardedCredits: number; + dependencyCredit?: number | null; + majors: SubjectMajor[]; + prerequisites: SubjectRef[]; + enrolledCount: number; +}; + +export type AdminSemester = { + id: number; + year: number; + type?: string; + name?: string; + enrolmentCount: number; + uncoveredSubjects: SubjectRef[]; +}; + +export type ScheduleRow = { + subjectId: number; + subjectName?: string; + subjectCode?: string; + professorId: number; + professorName?: string; +}; + +export type ProfessorLoad = { + professorId: number; + professorName?: string; + subjects: number; +}; + +export type Schedule = { + semesterId: number; + semesterName?: string; + assignments: ScheduleRow[]; + load: ProfessorLoad[]; + uncoveredSubjects: SubjectRef[]; + allSubjects: SubjectRef[]; + professors: { id: number; name?: string }[]; +}; + +function authHeaders(): Record { + const token = getAccessToken(); + if (!token) throw new Error("You are not signed in."); + return { Authorization: `Bearer ${token}`, "Content-Type": "application/json" }; +} + +/** GET that throws with the server message rather than a bare status code. */ +export async function adminGet(path: string): Promise { + const res = await fetch(apiUrl(path), { cache: "no-store", headers: authHeaders() }); + if (!res.ok) { + const body = await res.json().catch(() => null); + throw new Error(body?.message || `Request failed (${res.status})`); + } + return (await res.json()) as T; +} + +/** POST/PUT/DELETE returning the standard {ok, message} envelope. */ +export async function adminSend( + path: string, + method: "POST" | "PUT" | "DELETE", + body?: unknown, +): Promise { + const res = await fetch(apiUrl(path), { + method, + headers: authHeaders(), + body: body === undefined ? undefined : JSON.stringify(body), + }); + const result = (await res.json().catch(() => null)) as AdminResult | null; + if (!res.ok || !result?.ok) { + throw new Error(result?.message || `Request failed (${res.status})`); + } + return result; +} Index: src/lib/api.ts =================================================================== --- src/lib/api.ts (revision 8496f3c2ae490dee80fdf71af9fe30c63996efaf) +++ src/lib/api.ts (revision 8496f3c2ae490dee80fdf71af9fe30c63996efaf) @@ -0,0 +1,15 @@ +/** + * Base URL of the iknow-api backend. + * + * Set NEXT_PUBLIC_API_BASE_URL in .env.local to point at a local API run + * (see .env.example). The faculty database is only reachable through the SSH + * tunnel on the developer machine, so the deployed backend cannot read it - + * working against real data means running iknow-api locally. + */ +export const API_BASE_URL = + process.env.NEXT_PUBLIC_API_BASE_URL ?? 'https://iknow-api.onrender.com'; + +/** Builds an absolute API URL from a path such as `/api/user/getUser`. */ +export function apiUrl(path: string): string { + return `${API_BASE_URL}${path}`; +} Index: src/lib/auth.ts =================================================================== --- src/lib/auth.ts (revision 4fe4582e6255b2244fa2c6ce9ae837ab03e74a58) +++ src/lib/auth.ts (revision 8496f3c2ae490dee80fdf71af9fe30c63996efaf) @@ -1,2 +1,3 @@ +import { API_BASE_URL } from './api'; export type AuthTokens = { accessToken: string; @@ -4,5 +5,5 @@ }; -export type UserRole = 'Professor' | 'Student' | string; +export type UserRole = 'Professor' | 'Student' | 'Admin' | string; export type AuthSession = AuthTokens & { @@ -91,5 +92,5 @@ export async function login(params: { email: string; password: string }): Promise { - const baseUrl = process.env.NEXT_PUBLIC_API_BASE_URL ?? 'https://iknow-api.onrender.com'; + const baseUrl = API_BASE_URL; const response = await fetch(`${baseUrl}/api/auth/login`, { Index: src/lib/pdf-generators.ts =================================================================== --- src/lib/pdf-generators.ts (revision 4fe4582e6255b2244fa2c6ce9ae837ab03e74a58) +++ src/lib/pdf-generators.ts (revision 8496f3c2ae490dee80fdf71af9fe30c63996efaf) @@ -2,4 +2,5 @@ import autoTable from 'jspdf-autotable'; import { loadCyrillicFonts } from './pdf-fonts'; +import { apiUrl } from './api'; /* ---------- shared types ---------- */ @@ -1056,5 +1057,5 @@ ): Promise { // Fetch student profile - const profileRes = await fetch('https://iknow-api.onrender.com/api/user/getUser', { + const profileRes = await fetch(apiUrl('/api/user/getUser'), { headers: { Authorization: `Bearer ${accessToken}` }, }); @@ -1095,5 +1096,5 @@ let passedExams: PassedExam[] = []; if (needsExams) { - const examsRes = await fetch('https://iknow-api.onrender.com/api/user/getPassedSubjects', { + const examsRes = await fetch(apiUrl('/api/user/getPassedSubjects'), { headers: { Authorization: `Bearer ${accessToken}` }, }); Index: src/lib/prof-demo-store.ts =================================================================== --- src/lib/prof-demo-store.ts (revision 4fe4582e6255b2244fa2c6ce9ae837ab03e74a58) +++ (revision ) @@ -1,107 +1,0 @@ -export type UsersBySubject = { - Id?: string; - Name?: string; - Grade: number; -}; - -export type SubjectsAndUsers = { - Name?: string; - Id?: number; - Users: UsersBySubject[]; -}; - -export type AddGrade = { - StudentId: number; - SubjectId: number; - grade: number; -}; - -type Store = { - subjects: SubjectsAndUsers[]; -}; - -function createInitialStore(): Store { - return { - subjects: [ - { - Id: 101, - Name: "Web Programming", - Users: [ - { Id: "20001", Name: "Ana Petrovska", Grade: 0 }, - { Id: "20002", Name: "Marko Trajkov", Grade: 8 }, - { Id: "20003", Name: "Elena Stojanova", Grade: 0 }, - ], - }, - { - Id: 102, - Name: "Databases", - Users: [ - { Id: "20001", Name: "Ana Petrovska", Grade: 0 }, - { Id: "20004", Name: "Nikola Iliev", Grade: 9 }, - { Id: "20005", Name: "Sara Dimitrova", Grade: 7 }, - ], - }, - { - Id: 103, - Name: "Algorithms", - Users: [ - { Id: "20002", Name: "Marko Trajkov", Grade: 0 }, - { Id: "20006", Name: "Ivana Kostova", Grade: 10 }, - ], - }, - ], - }; -} - -function getGlobalStore(): Store { - const globalKey = "__iknow_prof_demo_store__"; - const globalObj = globalThis as unknown as Record; - - if (!globalObj[globalKey]) { - globalObj[globalKey] = createInitialStore(); - } - - return globalObj[globalKey] as Store; -} - -export function getSubjects(): SubjectsAndUsers[] { - return getGlobalStore().subjects; -} - -function parseStudentId(id: string | undefined): number | null { - if (!id) return null; - const parsed = Number.parseInt(id, 10); - return Number.isFinite(parsed) ? parsed : null; -} - -export function setGrade( - payload: AddGrade, - mode: "add" | "edit" | "remove", -): { subject: SubjectsAndUsers; user: UsersBySubject } { - const store = getGlobalStore(); - const subject = store.subjects.find((s) => s.Id === payload.SubjectId); - if (!subject) { - throw new Error("Subject not found"); - } - - const user = subject.Users.find((u) => parseStudentId(u.Id) === payload.StudentId); - if (!user) { - throw new Error("Student not found in subject"); - } - - if (mode === "remove") { - user.Grade = 0; - return { subject, user }; - } - - if (payload.grade < 5 || payload.grade > 10) { - throw new Error("Grade must be between 5 and 10"); - } - - if (mode === "add" && user.Grade > 0) { - throw new Error("Grade already exists; use edit"); - } - - user.Grade = payload.grade; - return { subject, user }; -} Index: src/locales/en/translation.json =================================================================== --- src/locales/en/translation.json (revision 4fe4582e6255b2244fa2c6ce9ae837ab03e74a58) +++ src/locales/en/translation.json (revision 8496f3c2ae490dee80fdf71af9fe30c63996efaf) @@ -200,7 +200,9 @@ "applications_important_note_text": "The serial number of the electronic application must be entered on the paper application that the student will submit physically.", "login_student_title": "Login for Student", - "login_student_example": "Email: boris@example.com\nPassword: your-password-here", + "login_student_example": "Email: stefan.saveski@students.finki.ukim.mk\nPassword: Test12345!", "login_professor_title": "Login for Professor", - "login_professor_example": "Email: andonov@gmail.com\nPassword: 123lol456", + "login_professor_example": "Email: vangel.ajanovski@finki.ukim.mk\nPassword: Test12345!", + "login_admin_title": "Login for Administrator", + "login_admin_example": "Email: igor.adminovski@finki.ukim.mk\nPassword: Test12345!", "login_welcome": "Welcome", "login_subtitle": "Sign in to your IKnow account", @@ -257,4 +259,63 @@ "remove_grade": "Remove Grade", "current": "Current", - "login_demo_note": "Use these credentials to explore the system." + "login_demo_note": "Use these credentials to explore the system.", + "enroll_semester": "Enroll semester", + "enroll_confirm": "Enroll", + "enroll_no_semesters": "You are already enrolled in every available semester.", + "enroll_already_passed": "passed", + "enroll_credits": "credits", + "enroll_semester_short": "sem.", + "enroll_not_signed_in": "You are not signed in.", + "enroll_options_failed": "Could not load enrollment options", + "enroll_failed": "Enrollment failed", + "cancel": "Cancel", + "admin_portal": "Admin", + "admin_subjects": "Subjects", + "admin_semesters": "Semesters", + "admin_schedule": "Teaching schedule", + "admin_subjects_intro": "Add subjects, map them to study programmes and set prerequisites.", + "admin_semesters_intro": "Open an active semester so students can enroll in it.", + "admin_schedule_intro": "Decide which professor teaches which subject in which semester.", + "admin_new_subject": "New subject", + "admin_edit_subject": "Edit subject", + "admin_subject_name": "Name", + "admin_subject_code": "Code", + "admin_credits": "Credits", + "admin_dependency_credit": "Required credits", + "admin_create": "Create", + "admin_save": "Save", + "admin_delete": "Delete", + "admin_remove": "Remove", + "admin_add": "Add", + "admin_manage": "Manage", + "admin_close": "Close", + "admin_majors": "Study programmes", + "admin_prerequisites": "Prerequisites", + "admin_pick_major": "Pick a study programme", + "admin_pick_prerequisite": "Pick a prerequisite", + "admin_pick_subject": "Pick a subject", + "admin_pick_professor": "Pick a professor", + "admin_search_subject": "Search by name or code", + "admin_no_subjects": "No subjects found.", + "admin_delete_blocked": "Cannot delete: {{count}} enrolment(s) already contain this subject.", + "admin_new_semester": "Open a new semester", + "admin_year": "Year", + "admin_type": "Type", + "admin_winter": "Winter", + "admin_summer": "Summer", + "admin_open_semester": "Open semester", + "admin_open_semesters": "Open semesters", + "admin_no_semesters": "No semesters yet.", + "admin_enrolments": "Enrolments", + "admin_coverage": "Coverage", + "admin_fully_covered": "all subjects covered", + "admin_uncovered_count": "{{count}} subject(s) without a professor", + "admin_uncovered_hint": "Students cannot enroll in a subject nobody teaches that semester.", + "admin_show_uncovered": "Show", + "admin_professor": "Professor", + "admin_assign": "Assign", + "admin_assignments": "Assignments", + "admin_load": "Teaching load", + "admin_no_assignments": "Nothing assigned yet.", + "admin_no_professors": "No professors." } Index: src/locales/mk/translation.json =================================================================== --- src/locales/mk/translation.json (revision 4fe4582e6255b2244fa2c6ce9ae837ab03e74a58) +++ src/locales/mk/translation.json (revision 8496f3c2ae490dee80fdf71af9fe30c63996efaf) @@ -231,7 +231,9 @@ "applications_important_note_text": "Серискиот број на електронската пријава задолжително треба да се впише на хартиената пријава која студентот ќе ја поднесе физички.", "login_student_title": "Најава за студент", - "login_student_example": "Е-пошта: boris@example.com\nЛозинка: your-password-here", + "login_student_example": "Е-пошта: stefan.saveski@students.finki.ukim.mk\nЛозинка: Test12345!", "login_professor_title": "Најава за професор", - "login_professor_example": "Е-пошта: andonov@gmail.com\nЛозинка: 123lol456", + "login_professor_example": "Е-пошта: vangel.ajanovski@finki.ukim.mk\nЛозинка: Test12345!", + "login_admin_title": "Најава за администратор", + "login_admin_example": "Е-пошта: igor.adminovski@finki.ukim.mk\nЛозинка: Test12345!", "login_welcome": "Добредојде", "login_subtitle": "Најавете се во вашиот IKnow акаунт", @@ -261,4 +263,63 @@ "contact_sent_title": "Пораката е испратена!", "contact_sent_desc": "Ќе ви одговориме наскоро.", - "login_demo_note": "Користете ги овие податоци за да го истражите системот." + "login_demo_note": "Користете ги овие податоци за да го истражите системот.", + "enroll_semester": "Запиши семестар", + "enroll_confirm": "Запиши", + "enroll_no_semesters": "Веќе сте запишани во сите достапни семестри.", + "enroll_already_passed": "положен", + "enroll_credits": "кредити", + "enroll_semester_short": "сем.", + "enroll_not_signed_in": "Не сте најавени.", + "enroll_options_failed": "Не може да се вчитаат опциите за запишување", + "enroll_failed": "Запишувањето не успеа", + "cancel": "Откажи", + "admin_portal": "Админ", + "admin_subjects": "Предмети", + "admin_semesters": "Семестри", + "admin_schedule": "Распоред", + "admin_subjects_intro": "Додавање предмети, поврзување со студиски програми и предуслови.", + "admin_semesters_intro": "Отворање активен семестар во кој студентите можат да се запишат.", + "admin_schedule_intro": "Определување кој професор кој предмет го предава.", + "admin_new_subject": "Нов предмет", + "admin_edit_subject": "Измена на предмет", + "admin_subject_name": "Назив", + "admin_subject_code": "Шифра", + "admin_credits": "Кредити", + "admin_dependency_credit": "Потребни кредити", + "admin_create": "Креирај", + "admin_save": "Зачувај", + "admin_delete": "Избриши", + "admin_remove": "Отстрани", + "admin_add": "Додади", + "admin_manage": "Уреди", + "admin_close": "Затвори", + "admin_majors": "Студиски програми", + "admin_prerequisites": "Предуслови", + "admin_pick_major": "Избери студиска програма", + "admin_pick_prerequisite": "Избери предуслов", + "admin_pick_subject": "Избери предмет", + "admin_pick_professor": "Избери професор", + "admin_search_subject": "Пребарај по назив или шифра", + "admin_no_subjects": "Нема предмети.", + "admin_delete_blocked": "Не може да се избрише: {{count}} запишувања го содржат предметот.", + "admin_new_semester": "Отвори нов семестар", + "admin_year": "Година", + "admin_type": "Тип", + "admin_winter": "Зимски", + "admin_summer": "Летен", + "admin_open_semester": "Отвори семестар", + "admin_open_semesters": "Отворени семестри", + "admin_no_semesters": "Нема семестри.", + "admin_enrolments": "Запишувања", + "admin_coverage": "Покриеност", + "admin_fully_covered": "сите предмети се покриени", + "admin_uncovered_count": "{{count}} предмети без професор", + "admin_uncovered_hint": "Студентите не можат да запишат предмет кој никој не го предава.", + "admin_show_uncovered": "Прикажи", + "admin_professor": "Професор", + "admin_assign": "Распореди", + "admin_assignments": "Распоред", + "admin_load": "Оптовареност", + "admin_no_assignments": "Секој нема распоред.", + "admin_no_professors": "Нема професори." }