Match DTOs

CSSE6400 · May 1, 2024 · f412530 · f412530
1 parent 0192821
commit f412530
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 31 deletions.
diff --git a/frontend/src/app/courses/[courseCode]/course-profile/page.tsx b/frontend/src/app/courses/[courseCode]/course-profile/page.tsx
@@ -9,11 +9,11 @@ export default function CourseProfile({ params }: { params: { courseCode: string
         <main>
             {isLoading && <p>Loading...</p>}
             {!isError && !isLoading && (
-                <div key={course!.coursecode}>
-                    <Link href={`/courses/${course!.coursecode}/course-profile`}>
-                        <h2>{course!.coursecode} | {course!.coursename}</h2>
+                <div key={course!.courseCode}>
+                    <Link href={`/courses/${course!.courseCode}/course-profile`}>
+                        <h2>{course!.courseCode} | {course!.courseName}</h2>
                     </Link>
-                    <p>{course!.coursedescription}</p>
+                    <p>{course!.courseDescription}</p>
                 </div>
             )}
         </main>

diff --git a/frontend/src/app/courses/[courseCode]/exams/[examId]/page.tsx b/frontend/src/app/courses/[courseCode]/exams/[examId]/page.tsx
@@ -9,17 +9,17 @@ export default function Exam({ params }: { params: { courseCode: string, examId:
 
     return (
         <main>
-            <h1>{`${params.courseCode} ${exam?.examtype}`}</h1>
-            <h2>{`${exam?.examyear} Semester ${exam?.examsemester}`}</h2>
+            <h1>{`${params.courseCode} ${exam?.examType}`}</h1>
+            <h2>{`${exam?.examYear} Semester ${exam?.examSemester}`}</h2>
             {isLoadingQuestions && <p>Loading...</p>}
             {!isErrorQuestions && !isLoadingQuestions && questions?.map(question => (
                 <>
                     <hr />
-                    <div key={question.questionid}>
-                        <Link href={`/courses/${params.courseCode}/exams/${question.questionid}`}>
-                            <h2>{question.questiontype}</h2>
+                    <div key={question.questionId}>
+                        <Link href={`/courses/${params.courseCode}/exams/${question.questionId}`}>
+                            <h2>{question.questionType}</h2>
                         </Link>
-                        <p>{question.questiontext}</p>
+                        <p>{question.questionText}</p>
                     </div>
                 </>
                 ))

diff --git a/frontend/src/app/courses/[courseCode]/exams/page.tsx b/frontend/src/app/courses/[courseCode]/exams/page.tsx
@@ -15,9 +15,9 @@ export default function Exams({ params }: { params: { courseCode: string }}) {
                     <hr />
                     <div key={exam.examId}>
                         <Link href={`/courses/${params.courseCode}/exams/${exam.examId}`}>
-                            <h2>{exam.examyear} | S{exam.examsemester}</h2>
+                            <h2>{exam.examYear} | S{exam.examSemester}</h2>
                         </Link>
-                        <p>{exam.examtype}</p>
+                        <p>{exam.examType}</p>
                     </div>
                 </>
                 ))

diff --git a/frontend/src/app/courses/[courseCode]/notes/page.tsx b/frontend/src/app/courses/[courseCode]/notes/page.tsx
@@ -5,15 +5,15 @@ export default function Notes({ params }: { params: { courseCode: string }}) {
     const course: Course = useMemo(() => {
         // query backend here
         return {
-            coursecode: params.courseCode.toUpperCase(),
-            coursename: 'Course Name',
-            coursedescription: 'Some sort of description'
+            courseCode: params.courseCode.toUpperCase(),
+            courseName: 'Course Name',
+            courseDescription: 'Some sort of description'
         }
     }, [params.courseCode])
 
     return (
         <main>
-            <h1>Study material for {course.coursecode}</h1>
+            <h1>Study material for {course.courseCode}</h1>
             There will be some cards here
         </main>
     );

diff --git a/frontend/src/app/courses/page.tsx b/frontend/src/app/courses/page.tsx
@@ -10,11 +10,11 @@ export default function Courses() {
             {!isError && !isLoading && courses?.map(course => (
                 <>
                     <hr />
-                    <div key={course.coursecode}>
-                        <Link href={`/courses/${course.coursecode}/course-profile`}>
-                            <h2>{course.coursecode} | {course.coursename}</h2>
+                    <div key={course.courseCode}>
+                        <Link href={`/courses/${course.courseCode}/course-profile`}>
+                            <h2>{course.courseCode} | {course.courseName}</h2>
                         </Link>
-                        <p>{course.coursedescription}</p>
+                        <p>{course.courseDescription}</p>
                     </div>
                 </>
                 ))

diff --git a/frontend/src/components/Navigation.tsx b/frontend/src/components/Navigation.tsx
@@ -247,7 +247,7 @@ export function Navigation(props: React.ComponentPropsWithoutRef<'nav'>) {
     {
       title: `Exams`,
       links: (!isLoading && !isError && !!exams) ? exams?.map((exam) => ({
-        title: `${exam.examyear} S${exam.examsemester}`,
+        title: `${exam.examYear} S${exam.examSemester}`,
         href: `/courses/${courseCode}/exams/${exam.examId}`,
       })) : []
     },

diff --git a/frontend/src/types.ts b/frontend/src/types.ts
@@ -1,19 +1,19 @@
 export type Course = {
-    coursecode: string
-    coursename: string
-    coursedescription: string
+    courseCode: string
+    courseName: string
+    courseDescription: string
 }
 
 export type Exam = {
     examId: number
-    examyear: number
-    examsemester: number
-    examtype: string
+    examYear: number
+    examSemester: number
+    examType: string
 }
 
 export type Question = {
-    questionid: number
-    questiontext: string
-    questiontype: string
-    questionpng: string
+    questionId: number
+    questionText: string
+    questionType: string
+    questionPng: string
 }