made router ID's a var to avoid typos

SELab-2 · Mar 13, 2024 · 455a882 · 455a882
1 parent 45be65a
commit 455a882
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 13 deletions.
diff --git a/frontend/src/dataloaders/StudentLoader.ts b/frontend/src/dataloaders/StudentLoader.ts
@@ -4,6 +4,10 @@ import {projectsLoader, teacherStudentRole} from "./SharedFunctions.ts";
 export interface studentLoaderObject {
     projects: Project[]
 }
+
+export const STUDENT_ROUTER_ID = "student";
+
+
 export default async function studentLoader(): Promise<studentLoaderObject> {
     const projects: Project[] = await projectsLoader(teacherStudentRole.STUDENT);
     // TODO: add submission data

diff --git a/frontend/src/dataloaders/SubjectsTeacherLoader.ts b/frontend/src/dataloaders/SubjectsTeacherLoader.ts
@@ -5,7 +5,7 @@ export interface subjectsTeacherLoaderObject {
     subjects: properSubject[]
 }
 
-export let SUBJECT_TEACHER_ID = "subjectTeacher";
+export const SUBJECT_TEACHER_ROUTER_ID = "subjectTeacher";
 
 export default async function subjectsTeacherLoader(): Promise<subjectsTeacherLoaderObject> {
     const temp: projectsAndSubjects = await getAllProjectsAndSubjects(teacherStudentRole.TEACHER);

diff --git a/frontend/src/dataloaders/TeacherLoader.ts b/frontend/src/dataloaders/TeacherLoader.ts
@@ -4,6 +4,9 @@ import {projectsLoader, teacherStudentRole} from "./SharedFunctions.ts";
 export interface teacherLoaderObject {
     projects: Project[]
 }
+
+export const TEACHER_ROUTER_ID = "teacher";
+
 export default async function teacherLoader(): Promise<teacherLoaderObject> {
     const projects: Project[] = await projectsLoader(teacherStudentRole.TEACHER);
     return {"projects": projects}

diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx
@@ -10,10 +10,10 @@ import HomeStudent from "./pages/student/HomeStudent.tsx";
 import HomeTeacher from "./pages/teacher/HomeTeacher.tsx";
 import 'bulma/css/bulma.min.css';
 import './assets/styles/mainpage.css'
-import studentLoader from "./dataloaders/StudentLoader.ts";
-import teacherLoader from "./dataloaders/TeacherLoader.ts";
+import studentLoader, {STUDENT_ROUTER_ID} from "./dataloaders/StudentLoader.ts";
+import teacherLoader, {TEACHER_ROUTER_ID} from "./dataloaders/TeacherLoader.ts";
 import SubjectsTeacher from "./pages/teacher/SubjectsTeacher.tsx";
-import subjectsTeacherLoader, {SUBJECT_TEACHER_ID} from "./dataloaders/SubjectsTeacherLoader.ts";
+import subjectsTeacherLoader, {SUBJECT_TEACHER_ROUTER_ID} from "./dataloaders/SubjectsTeacherLoader.ts";
 
 const router = createBrowserRouter([
     {
@@ -32,19 +32,19 @@ const router = createBrowserRouter([
     {
         path: "/student",
         element: <HomeStudent/>,
-        id: "student",
+        id: STUDENT_ROUTER_ID,
         loader: studentLoader
     },
     {
         path: "/teacher",
         element: <HomeTeacher/>,
-        id: "teacher",
+        id: TEACHER_ROUTER_ID,
         loader: teacherLoader
     },
     {
         path: "/teacher/courses",
         element: <SubjectsTeacher/>,
-        id: SUBJECT_TEACHER_ID,
+        id: SUBJECT_TEACHER_ROUTER_ID,
         loader: subjectsTeacherLoader
     }
 ]);

diff --git a/frontend/src/pages/student/HomeStudent.tsx b/frontend/src/pages/student/HomeStudent.tsx
@@ -4,12 +4,12 @@ import {Sidebar} from "../../components/Sidebar.tsx";
 import ProjectCardStudent from "./ProjectCardStudent.tsx";
 import '../../assets/styles/students_components.css'
 import {useRouteLoaderData} from "react-router-dom";
-import {studentLoaderObject} from "../../dataloaders/StudentLoader.ts";
+import {STUDENT_ROUTER_ID, studentLoaderObject} from "../../dataloaders/StudentLoader.ts";
 
 export default function HomeStudent(): JSX.Element {
 
     // data contains a list of Project in data.projects (i think)
-    const data: studentLoaderObject = useRouteLoaderData("student") as studentLoaderObject
+    const data: studentLoaderObject = useRouteLoaderData(STUDENT_ROUTER_ID) as studentLoaderObject
     console.log(data) // TODO: remove
 
     return (

diff --git a/frontend/src/pages/teacher/HomeTeacher.tsx b/frontend/src/pages/teacher/HomeTeacher.tsx
@@ -1,10 +1,10 @@
 import {JSX} from "react";
-import {teacherLoaderObject} from "../../dataloaders/TeacherLoader.ts";
+import {TEACHER_ROUTER_ID, teacherLoaderObject} from "../../dataloaders/TeacherLoader.ts";
 import {useRouteLoaderData} from "react-router-dom";
 
 export default function HomeTeacher(): JSX.Element {
 
-    const data: teacherLoaderObject = useRouteLoaderData("teacher") as teacherLoaderObject;
+    const data: teacherLoaderObject = useRouteLoaderData(TEACHER_ROUTER_ID) as teacherLoaderObject;
     console.log(data);
 
     return (

diff --git a/frontend/src/pages/teacher/SubjectsTeacher.tsx b/frontend/src/pages/teacher/SubjectsTeacher.tsx
@@ -1,10 +1,10 @@
 import {JSX} from "react";
-import {SUBJECT_TEACHER_ID, subjectsTeacherLoaderObject} from "../../dataloaders/SubjectsTeacherLoader.ts";
+import {SUBJECT_TEACHER_ROUTER_ID, subjectsTeacherLoaderObject} from "../../dataloaders/SubjectsTeacherLoader.ts";
 import {useRouteLoaderData} from "react-router-dom";
 
 export default function SubjectsTeacher(): JSX.Element {
 
-    const data: subjectsTeacherLoaderObject = useRouteLoaderData(SUBJECT_TEACHER_ID) as subjectsTeacherLoaderObject;
+    const data= useRouteLoaderData(SUBJECT_TEACHER_ROUTER_ID) as subjectsTeacherLoaderObject;
     console.log(data);
 
     return(