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: {