From 67cf9c5d290fdf61e4bce1b9ae25676e0c6e9486 Mon Sep 17 00:00:00 2001
From: Damian <37555910+DCRepublic@users.noreply.github.com>
Date: Sun, 10 Nov 2024 20:07:13 -0500
Subject: [PATCH 1/2] Finish ratings, lint code, add basic splash page

---
 .eslintrc.json                                |  13 +-
 .prettierrc                                   |   6 +
 app/api/auth/[...nextauth]/route.ts           |   1 +
 app/api/createplan/route.ts                   |   3 +-
 app/api/getCourses/route.ts                   |  15 -
 app/api/getProfClasses/route.ts               |  24 +
 app/api/getProfs/route.ts                     |   9 +
 app/api/getcourseplans/route.ts               |   3 +
 app/api/getplancourses/route.ts               |   9 +-
 app/api/submitReview/route.ts                 |  39 ++
 app/api/updatePlan/route.ts                   |   4 +-
 app/api/user/route.ts                         |   1 +
 app/calendar/page.tsx                         |  25 +-
 app/error.tsx                                 |   2 +-
 app/layout.tsx                                |  10 +-
 app/login/layout.tsx                          |  13 +
 app/login/page.tsx                            |  20 +-
 app/page.tsx                                  |  25 +-
 app/rating/layout.tsx                         |   4 +-
 app/rating/page.tsx                           | 427 ++++++++++++++++--
 components/Calendar.tsx                       |  20 +-
 components/CourseCard.tsx                     | 209 ++++-----
 components/CreatePlan.tsx                     |  48 +-
 components/FullCourseList.tsx                 |  17 +-
 components/PlanCard.tsx                       |   3 +-
 components/PlanCardList.tsx                   |   5 +-
 components/Search.tsx                         |  44 +-
 components/navbar.tsx                         |  67 ++-
 components/theme-switch.tsx                   |   5 +-
 config/site.ts                                |  32 +-
 lib/auth.ts                                   |   3 +
 package-lock.json                             | 179 +++++---
 package.json                                  |  14 +-
 .../20241110205804_fix_prof/migration.sql     |  11 +
 .../20241110210423_fix_prof2/migration.sql    |   8 +
 .../20241111004015_fix_rating/migration.sql   |  16 +
 prisma/schema.prisma                          |  24 +-
 37 files changed, 968 insertions(+), 390 deletions(-)
 create mode 100644 .prettierrc
 delete mode 100644 app/api/getCourses/route.ts
 create mode 100644 app/api/getProfClasses/route.ts
 create mode 100644 app/api/getProfs/route.ts
 create mode 100644 app/api/submitReview/route.ts
 create mode 100644 app/login/layout.tsx
 create mode 100644 prisma/migrations/20241110205804_fix_prof/migration.sql
 create mode 100644 prisma/migrations/20241110210423_fix_prof2/migration.sql
 create mode 100644 prisma/migrations/20241111004015_fix_rating/migration.sql

diff --git a/.eslintrc.json b/.eslintrc.json
index d3067d4..0b48bc4 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -11,7 +11,14 @@
     "plugin:react-hooks/recommended",
     "plugin:jsx-a11y/recommended"
   ],
-  "plugins": ["react", "unused-imports", "import", "@typescript-eslint", "jsx-a11y", "prettier"],
+  "plugins": [
+    "react",
+    "unused-imports",
+    "import",
+    "@typescript-eslint",
+    "jsx-a11y",
+    "prettier"
+  ],
   "parser": "@typescript-eslint/parser",
   "parserOptions": {
     "ecmaFeatures": {
@@ -80,8 +87,8 @@
     ],
     "padding-line-between-statements": [
       "warn",
-      {"blankLine": "always", "prev": "*", "next": "return"},
-      {"blankLine": "always", "prev": ["const", "let", "var"], "next": "*"},
+      { "blankLine": "always", "prev": "*", "next": "return" },
+      { "blankLine": "always", "prev": ["const", "let", "var"], "next": "*" },
       {
         "blankLine": "any",
         "prev": ["const", "let", "var"],
diff --git a/.prettierrc b/.prettierrc
new file mode 100644
index 0000000..d85a09c
--- /dev/null
+++ b/.prettierrc
@@ -0,0 +1,6 @@
+{
+  "endOfLint": "lf",
+  "printWidhth": 80,
+  "tabWidth": 2,
+  "trailingComma": "es5"
+}
diff --git a/app/api/auth/[...nextauth]/route.ts b/app/api/auth/[...nextauth]/route.ts
index 4de5853..830090d 100644
--- a/app/api/auth/[...nextauth]/route.ts
+++ b/app/api/auth/[...nextauth]/route.ts
@@ -1,5 +1,6 @@
 export const dynamic = "force-dynamic"; // defaults to auto
 import NextAuth from "next-auth";
+
 import { config } from "../../../../lib/auth";
 
 const handler = NextAuth(config);
diff --git a/app/api/createplan/route.ts b/app/api/createplan/route.ts
index 5d60712..589ec6e 100644
--- a/app/api/createplan/route.ts
+++ b/app/api/createplan/route.ts
@@ -1,7 +1,7 @@
 // api/test.ts
 import { NextResponse, NextRequest } from "next/server";
+
 import prisma from "../../../lib/prisma";
-import { getServerSession } from "next-auth/next";
 import { auth } from "../../../lib/auth";
 
 export async function POST(request: NextRequest) {
@@ -51,6 +51,7 @@ export async function GET(request: NextRequest) {
       courses: true,
     },
   });
+
   //console.log(plans);
   return NextResponse.json(courses, { status: 200 });
 }
diff --git a/app/api/getCourses/route.ts b/app/api/getCourses/route.ts
deleted file mode 100644
index b4c5cfb..0000000
--- a/app/api/getCourses/route.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { NextResponse, NextRequest } from "next/server";
-import prisma from "../../../lib/prisma";
-import { auth } from "../../../lib/auth";
-
-export async function GET(request: NextRequest) {
-  const courses = await prisma.course.findMany({
-    select: {
-      id: true,
-      courseTitle: true,
-    },
-    where: { year: "S2025" },
-  });
-  //console.log(plans);
-  return NextResponse.json(courses, { status: 200 });
-}
diff --git a/app/api/getProfClasses/route.ts b/app/api/getProfClasses/route.ts
new file mode 100644
index 0000000..3db68cb
--- /dev/null
+++ b/app/api/getProfClasses/route.ts
@@ -0,0 +1,24 @@
+import { Faculty } from "./../../../node_modules/.prisma/client/index.d";
+import { NextResponse, NextRequest } from "next/server";
+
+import prisma from "../../../lib/prisma";
+
+export async function GET(request: NextRequest) {
+  const { searchParams } = await new URL(request.url);
+  const profID = parseInt((await searchParams.get("prof")) || "1");
+
+  const courses = await prisma.course.findMany({
+    include: {
+      instructor: true,
+    },
+    where: {
+      instructor: {
+        id: profID,
+      },
+    },
+  });
+
+  //console.log(plans);
+  console.log(courses);
+  return NextResponse.json(courses, { status: 200 });
+}
diff --git a/app/api/getProfs/route.ts b/app/api/getProfs/route.ts
new file mode 100644
index 0000000..2bba2d5
--- /dev/null
+++ b/app/api/getProfs/route.ts
@@ -0,0 +1,9 @@
+import { NextResponse, NextRequest } from "next/server";
+
+import prisma from "../../../lib/prisma";
+
+export async function GET(request: NextRequest) {
+  const profs = await prisma.faculty.findMany({});
+
+  return NextResponse.json(profs, { status: 200 });
+}
diff --git a/app/api/getcourseplans/route.ts b/app/api/getcourseplans/route.ts
index e948931..ec57edc 100644
--- a/app/api/getcourseplans/route.ts
+++ b/app/api/getcourseplans/route.ts
@@ -1,4 +1,5 @@
 import { NextResponse, NextRequest } from "next/server";
+
 import prisma from "../../../lib/prisma";
 import { auth } from "../../../lib/auth";
 
@@ -11,6 +12,7 @@ export async function GET(request: NextRequest) {
     },
   });
   let courses: any;
+
   if (user) {
     courses = await prisma.coursePlan.findMany({
       where: {
@@ -26,6 +28,7 @@ export async function GET(request: NextRequest) {
   } else {
     courses = null;
   }
+
   //console.log(plans);
   return NextResponse.json(courses, { status: 200 });
 }
diff --git a/app/api/getplancourses/route.ts b/app/api/getplancourses/route.ts
index bb2876c..f454ccb 100644
--- a/app/api/getplancourses/route.ts
+++ b/app/api/getplancourses/route.ts
@@ -1,15 +1,15 @@
 // api/test.ts
 import { NextResponse, NextRequest } from "next/server";
+
 import prisma from "../../../lib/prisma";
-import { getServerSession } from "next-auth/next";
 import { auth } from "../../../lib/auth";
 import { getPlanCookie } from "../../../app/actions";
 
 export async function GET(request: NextRequest) {
-  let planCookie: any = await getPlanCookie();
+  const planCookie: any = await getPlanCookie();
   const session = await auth();
 
-  let courses = await prisma.coursePlan.findMany({
+  const courses = await prisma.coursePlan.findMany({
     where: {
       AND: {
         User: {
@@ -23,6 +23,7 @@ export async function GET(request: NextRequest) {
       courses: true,
     },
   });
+
   return NextResponse.json(courses, { status: 200 });
 }
 
@@ -33,7 +34,7 @@ export async function POST(request: NextRequest) {
   const plan = data.plan;
   const session = await auth();
 
-  let courses = await prisma.coursePlan.update({
+  const courses = await prisma.coursePlan.update({
     where: {
       id: parseInt(plan),
     },
diff --git a/app/api/submitReview/route.ts b/app/api/submitReview/route.ts
new file mode 100644
index 0000000..caedabd
--- /dev/null
+++ b/app/api/submitReview/route.ts
@@ -0,0 +1,39 @@
+import { NextResponse, NextRequest } from "next/server";
+
+import prisma from "../../../lib/prisma";
+import { auth } from "../../../lib/auth";
+
+export async function POST(request: NextRequest) {
+  const data = await request.json();
+  const facultyID = parseInt(await data.facultyID);
+  const courseID = parseInt(await data.courseID);
+
+  const session = await auth();
+
+  //@ts-ignore
+  const user = await prisma.user.findUnique({
+    where: {
+      //@ts-ignore
+      uuid: session?.user?.id,
+    },
+  });
+  if (user?.id) {
+    const newReview = await prisma.rating.create({
+      data: {
+        userId: user?.id,
+        courseID: courseID,
+        facultyID: facultyID,
+        overallRating: data.overallRating,
+        difficulty: data.difficulty,
+        takeAgain: data.takeAgain,
+        forCredit: data.forCredit,
+        grade: data.grade,
+        review: data.review,
+      },
+    });
+    return NextResponse.json(newReview, { status: 200 });
+  }
+
+  //console.log(plans);
+  return NextResponse.json("Submission Failed, no user", { status: 500 });
+}
diff --git a/app/api/updatePlan/route.ts b/app/api/updatePlan/route.ts
index 215ecec..c5177e6 100644
--- a/app/api/updatePlan/route.ts
+++ b/app/api/updatePlan/route.ts
@@ -1,7 +1,7 @@
 // api/test.ts
 import { NextResponse, NextRequest } from "next/server";
+
 import prisma from "../../../lib/prisma";
-import { getServerSession } from "next-auth/next";
 import { auth } from "../../../lib/auth";
 import { getPlanCookie } from "../../../app/actions";
 
@@ -50,7 +50,9 @@ export async function GET(request: NextRequest) {
       courses: true,
     },
   });
+
   console.log(courses);
+
   return NextResponse.json(courses, { status: 200 });
 }
 
diff --git a/app/api/user/route.ts b/app/api/user/route.ts
index 9977879..5842a7d 100644
--- a/app/api/user/route.ts
+++ b/app/api/user/route.ts
@@ -1,5 +1,6 @@
 // api/test.ts
 import { NextResponse, NextRequest } from "next/server";
+
 import prisma from "../../../lib/prisma";
 
 export async function POST(request: NextRequest) {
diff --git a/app/calendar/page.tsx b/app/calendar/page.tsx
index 2697e13..c31e87c 100644
--- a/app/calendar/page.tsx
+++ b/app/calendar/page.tsx
@@ -1,22 +1,19 @@
-import { title } from "../../components/primitives";
-import FullCalendar from "@fullcalendar/react";
-import timeGridPlugin from "@fullcalendar/timegrid"; // a plugin!
+// a plugin!
+
 import CreatePlan from "../../components/CreatePlan";
-import moment from "moment";
 import Calendar from "../../components/Calendar";
 import prisma from "../../lib/prisma";
-import { auth } from "../../lib/auth";
 import { getPlanCookie } from "../actions";
-import { BorderColor } from "@mui/icons-material";
 import { generateColorFromName } from "../../components/primitives";
 export default async function CalendarPage() {
   async function getEvents() {
-    let output: any = [];
-    let planCookie: any = await getPlanCookie();
+    const output: any = [];
+    const planCookie: any = await getPlanCookie();
 
     let courses;
+
     if (planCookie) {
-      let plan = await prisma.coursePlan.findUnique({
+      const plan = await prisma.coursePlan.findUnique({
         where: {
           id: parseInt(planCookie),
         },
@@ -30,10 +27,10 @@ export default async function CalendarPage() {
 
     if (courses) {
       for (let i = 0; i < courses.length; i++) {
-        let color = generateColorFromName(courses[i].subject);
+        const color = generateColorFromName(courses[i].subject);
 
-        let num: string = courses[i].courseReferenceNumber;
-        let meetingTimes = await prisma.meetingTime.findFirst({
+        const num: string = courses[i].courseReferenceNumber;
+        const meetingTimes = await prisma.meetingTime.findFirst({
           where: {
             courseReferenceNumber: num,
           },
@@ -99,10 +96,12 @@ export default async function CalendarPage() {
         maxstart?.endTime.slice(0, 2) + ":" + maxstart?.beginTime.slice(2),
     };*/
     console.log(maxstart);
+
     return maxstart;
   }
 
-  let events = await getEvents();
+  const events = await getEvents();
+
   //let times = await getUniqueStartEndTimes();
   return (
     <div className="grid grid-cols-3 p-4 -mt-20 w-screen absolute start-0 px-32 gap-20">
diff --git a/app/error.tsx b/app/error.tsx
index 9ed5104..60c7801 100644
--- a/app/error.tsx
+++ b/app/error.tsx
@@ -11,7 +11,7 @@ export default function Error({
 }) {
   useEffect(() => {
     // Log the error to an error reporting service
-    /* eslint-disable no-console */
+     
     console.error(error);
   }, [error]);
 
diff --git a/app/layout.tsx b/app/layout.tsx
index 9a5676d..5f90469 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -2,15 +2,15 @@ import "../styles/globals.css";
 import { Metadata, Viewport } from "next";
 import { Link } from "@nextui-org/link";
 import clsx from "clsx";
-
-import { Providers } from "./providers";
-import { NextAuthProvider } from "../components/providers/NextAuthProvider";
 import { CookiesProvider } from "next-client-cookies/server";
 
+import { NextAuthProvider } from "../components/providers/NextAuthProvider";
 import { siteConfig } from "../config/site";
 import { fontSans } from "../config/fonts";
 import { Navbar } from "../components/navbar";
 
+import { Providers } from "./providers";
+
 export const metadata: Metadata = {
   title: {
     default: siteConfig.name,
@@ -52,14 +52,14 @@ export default function RootLayout({
                 defaultTheme: "dark",
               }}
             >
-              <div className="relative flex flex-col h-screen">
+              <div className="relative flex flex-col h-screen ">
                 <Navbar />
                 <main className="container mx-auto max-w-7xl pt-16 px-6 flex-grow">
                   {children}
                 </main>
                 <footer className="w-full flex items-center justify-center py-3">
                   <div className="columns-1 container max-w-4xl text-center">
-                    <span className="text-xs ">
+                    <span className="text-xs">
                       The Course Planner is a student-run service, and displays
                       classes from the Tri-College course database. We recommend
                       confirming your schedule with the official course listings
diff --git a/app/login/layout.tsx b/app/login/layout.tsx
new file mode 100644
index 0000000..5e425dc
--- /dev/null
+++ b/app/login/layout.tsx
@@ -0,0 +1,13 @@
+export default function DocsLayout({
+  children,
+}: {
+  children: React.ReactNode;
+}) {
+  return (
+    <section className="flex flex-col items-center justify-center gap-4 max-h-[75vh] -mt-5 ">
+      <div className="inline-block max-w-lg text-center justify-center overflow-scroll rounded-lg scrollbar-hide">
+        {children}
+      </div>
+    </section>
+  );
+}
diff --git a/app/login/page.tsx b/app/login/page.tsx
index 9dc4902..f5643e7 100644
--- a/app/login/page.tsx
+++ b/app/login/page.tsx
@@ -1,3 +1,19 @@
-export default async function LoginPage() {
-  return <div className="">login</div>;
+"use client";
+import { Card } from "@nextui-org/react";
+import { title } from "../../components/primitives";
+export default function LoginPage() {
+  return (
+    <div className="w-5/6 justify-center text-center ml-auto mr-auto grid gap-10">
+      <div className="text-7xl">Welcome to the</div>
+      <div className={title({ size: "lg", color: "logo" })}>SCCS</div>
+      <div className={title({ size: "lg" })}>Course Planner&nbsp;</div>
+      <div className={title({ size: "sm" })}>Version 2.0&nbsp;</div>
+
+      <div className="text-xl">
+        Please excuse us as we polish some remaining bugs, but feel free to
+        explore and plan your classes! If you have suggestions or feedback,
+        please email staff@sccs.swarthmore.edu.
+      </div>
+    </div>
+  );
 }
diff --git a/app/page.tsx b/app/page.tsx
index beecd91..1c4c220 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -5,21 +5,18 @@ import { Skeleton } from "@nextui-org/skeleton";
 import Search from "../components/Search";
 import { FullCourseList } from "../components/FullCourseList";
 import CreatePlan from "../components/CreatePlan";
-import { auth } from "../lib/auth";
 import prisma from "../lib/prisma";
-import { Course, CoursePlan } from "@prisma/client";
-import { getPlanCookie } from "../app/actions";
-import { dA } from "@fullcalendar/core/internal-common";
 
 async function getCourses() {
   const courses = await prisma.course.findMany();
-  let output: any = [];
+  const output: any = [];
 
   for (let i = 0; i < courses.length; i++) {
     if (!output.includes(courses[i].year)) {
       output.push(courses[i].year);
     }
   }
+
   return output;
 }
 
@@ -32,8 +29,8 @@ async function getUniqueStartEndTimes() {
       beginTime: "asc",
     },
   });
-  let startTimes: any = [];
-  let endTimes: any = [];
+  const startTimes: any = [];
+  const endTimes: any = [];
 
   for (let i = 0; i < meetingTimes.length; i++) {
     if (!startTimes.includes(meetingTimes[i].beginTime)) {
@@ -44,13 +41,14 @@ async function getUniqueStartEndTimes() {
     }
   }
 
-  let times = { startTimes: startTimes, endTimes: endTimes };
+  const times = { startTimes: startTimes, endTimes: endTimes };
+
   return times;
 }
 
 async function getUniquCodes() {
   const codes = await prisma.sectionAttribute.findMany();
-  let daCodes: any = [];
+  const daCodes: any = [];
 
   for (let i = 0; i < codes.length; i++) {
     if (!daCodes.includes(codes[i].code)) {
@@ -58,6 +56,7 @@ async function getUniquCodes() {
     }
   }
   console.log(daCodes);
+
   return daCodes;
 }
 
@@ -66,7 +65,7 @@ export default async function Page(props: {
     query?: string;
     page?: string;
     term?: string;
-    dotw?: Array<String>;
+    dotw?: Array<string>;
     stime?: Array<string>;
   }>;
 }) {
@@ -75,7 +74,7 @@ export default async function Page(props: {
   const term = searchParams?.term || "";
   const dotw = searchParams?.dotw || [];
   const stime = searchParams?.stime || [];
-  var homePageProps: any = {};
+  const homePageProps: any = {};
 
   homePageProps["fullCourseList"] = (
     <Suspense
@@ -83,7 +82,7 @@ export default async function Page(props: {
         <Skeleton className="rounded-lg w-8/12 h-full align-top justify-start" />
       }
     >
-      <FullCourseList query={query} term={term} dotw={dotw} stime={stime} />
+      <FullCourseList dotw={dotw} query={query} stime={stime} term={term} />
     </Suspense>
   );
 
@@ -110,7 +109,7 @@ async function Home(props: any) {
         <div className="col-span-2 col-start-1">
           <div className="grid grid-rows-subgrid grid-cols-1 gap-5 ">
             <div className="row-start-1">
-              <Search terms={terms} times={uniqueTimes} codes={codes} />
+              <Search codes={codes} terms={terms} times={uniqueTimes} />
             </div>
             <div className="row-start-2 h-[62vh] overflow-y-scroll overflow-x-clip">
               {props.fullCourseList}
diff --git a/app/rating/layout.tsx b/app/rating/layout.tsx
index 2332d1e..5e425dc 100644
--- a/app/rating/layout.tsx
+++ b/app/rating/layout.tsx
@@ -4,8 +4,8 @@ export default function DocsLayout({
   children: React.ReactNode;
 }) {
   return (
-    <section className="flex flex-col items-center justify-center gap-4 ">
-      <div className="inline-block max-w-lg text-center justify-center ">
+    <section className="flex flex-col items-center justify-center gap-4 max-h-[75vh] -mt-5 ">
+      <div className="inline-block max-w-lg text-center justify-center overflow-scroll rounded-lg scrollbar-hide">
         {children}
       </div>
     </section>
diff --git a/app/rating/page.tsx b/app/rating/page.tsx
index 3a01ee5..02b3256 100644
--- a/app/rating/page.tsx
+++ b/app/rating/page.tsx
@@ -4,53 +4,410 @@ import {
   CardBody,
   CardHeader,
   Textarea,
-  Select,
-  SelectItem,
-  Popover,
   Autocomplete,
   AutocompleteItem,
+  Checkbox,
+  Select,
+  SelectItem,
+  Divider,
   Button,
-  Chip,
-  Input,
+  Modal,
+  ModalContent,
+  ModalHeader,
+  ModalBody,
+  ModalFooter,
+  useDisclosure,
+  Selection,
+  Link,
 } from "@nextui-org/react";
 import useSWR from "swr";
+import { useState } from "react";
+import React from "react";
+
+import { Search, Person, Class, Star } from "@Mui/icons-material";
+import Rating from "@mui/material/Rating";
+
+import axios from "axios";
+import { factory } from "typescript";
+import { Alert } from "@mui/material";
+
+const labels: { [index: string]: string } = {
+  1: "Awful",
+  2: "OK",
+  3: "Good",
+  4: "Great",
+  5: "Awesome",
+};
+const diffLabels: { [index: string]: string } = {
+  1: "Very Easy",
+  2: "Easy",
+  3: "Average",
+  4: "Difficult",
+  5: "Very Difficult",
+};
+
+const gradeOptions = [
+  { key: "A+", label: "A+" },
+  { key: "A", label: "A" },
+  { key: "A-", label: "A-" },
+  { key: "B+", label: "B+" },
+  { key: "B", label: "B" },
+  { key: "B-", label: "B-" },
+  { key: "C+", label: "C+" },
+  { key: "C", label: "C" },
+  { key: "C-", label: "C-" },
+  { key: "D+", label: "D+" },
+  { key: "D", label: "D" },
+  { key: "D-", label: "D-" },
+  { key: "F", label: "F" },
+  { key: "Audit/No Grade", label: "Audit/No Grade" },
+  { key: "Dropped", label: "Dropped" },
+  { key: "Not sure yet", label: "Not sure yet" },
+  { key: "Rather Not Disclose", label: "Rather Not Disclose" },
+];
+
+function getDiffText(value: number) {
+  return `${value} Star${value !== 1 ? "s" : ""}, ${labels[value]}`;
+}
+
+function getLabelText(value: number) {
+  return `${value} Star${value !== 1 ? "s" : ""}, ${labels[value]}`;
+}
 
 export default function RatingPage() {
+  const [selectedProf, setSelectedProf]: any = useState(1);
+  const [selectedClass, setSelectedClass]: any = useState();
+  const [rating, setRating] = React.useState<number | null>(0);
+  const [hover, setHover] = React.useState(-1);
+  const [diffValue, setDiffValue] = React.useState<number | null>(0);
+  const [diffHover, setDiffHover] = React.useState(-1);
+  const [takeAgain, setTakeAgain] = React.useState(false);
+  const [forCredit, setForCredit] = React.useState(false);
+
+  const [submitSuccess, setSubmitSuccess] = React.useState(false);
+  const [submitError, setSubmitError] = React.useState(false);
+
+  const [grade, setGrade] = React.useState<string>("");
+
+  const [review, setReview] = React.useState("");
+
+  const { isOpen, onOpen, onOpenChange } = useDisclosure();
+
   const fetcher = (url: any) => fetch(url).then((r) => r.json());
+
   const {
-    data: courses,
+    data: profs,
     isLoading,
     error,
-  } = useSWR("/api/getCourses", fetcher, {});
+  } = useSWR("/api/getProfs", fetcher, {});
+  const {
+    data: classes,
+    isLoading: classesLoading,
+    error: classesError,
+  } = useSWR(`/api/getProfClasses?prof=${selectedProf}`, fetcher, {
+    refreshInterval: 1000,
+  });
+
+  const onProfSelectionChange = (key: any) => {
+    setSelectedProf(key);
+  };
+  const onClassSelectionChange = (key: any) => {
+    console.log(key);
+    setSelectedClass(key);
+  };
+  const handleSelectionChange = (e: React.ChangeEvent<HTMLSelectElement>) => {
+    setGrade(e.target.value);
+  };
+
+  async function submitReview() {
+    //Reset all vals to defaults... Send to DB!
+    if (!selectedClass || !selectedProf || rating == 0 || diffValue == 0) {
+      alert("Please fill out all required fields!");
+    } else {
+      await axios
+        .post("/api/submitReview", {
+          courseID: selectedClass,
+          facultyID: selectedProf,
+          overallRating: rating,
+          difficulty: diffValue,
+          takeAgain: takeAgain,
+          forCredit: forCredit,
+          grade: grade,
+          review: review,
+        })
+        .then(function (response) {
+          // Handle response
+          setRating(0);
+          setDiffValue(0);
+          setTakeAgain(false);
+          setForCredit(false);
+          setGrade("");
+          setSelectedClass([]);
+          setSelectedProf(1);
+          setReview("");
+
+          setSubmitSuccess(true);
+          setTimeout(() => {
+            setSubmitSuccess(false);
+          }, 5000);
+        })
+        .catch(function (error) {
+          console.log(error);
+          setSubmitError(true);
+          setTimeout(() => {
+            setSubmitError(false);
+          }, 5000);
+        });
+    }
+  }
+
   return (
-    <Card className="">
-      <CardHeader className="">
-        <h1 className=" text-center ml-auto mr-auto col-span-3 row-start-1 row-span-1  text-2xl">
-          Leave a Rating
-        </h1>
-      </CardHeader>
-      <CardBody className="grid grid-cols-10 grid-rows-6 gap-10 px-10 justify-center items-center">
-        <Autocomplete
-          variant={"bordered"}
-          labelPlacement="outside-left"
-          label="Select a Class"
-          placeholder="Search for a class"
-          className="col-span-8 col-start-2 max-w-xs "
+    <>
+      {submitSuccess ? (
+        <Card className="absolute  top-30 right-20 border-green-700 bg-transparent border-2 w-1/12 h-8 justify-center ">
+          Success!
+        </Card>
+      ) : (
+        <></>
+      )}
+
+      {submitError ? (
+        <Card className="absolute top-30 right-20 border-red-700 bg-transparent border-2 w-1/12 h-8 justify-center ">
+          Error!
+        </Card>
+      ) : (
+        <></>
+      )}
+
+      <Card className=" justify-center items-center place-items-center">
+        <CardHeader className="">
+          <h1 className=" text-center ml-auto mr-auto col-span-3 row-start-1 row-span-1  text-2xl mb-2 mt-2">
+            Leave a Rating
+          </h1>
+        </CardHeader>
+        <CardBody className="flex gap-5 md:px-20 px-10">
+          <Autocomplete
+            isRequired
+            aria-label="Select Professor"
+            className=" max-w-xs "
+            label="Select Professor"
+            labelPlacement="outside"
+            placeholder="Select Professor"
+            variant={"bordered"}
+            size="lg"
+            startContent={<Person />}
+            selectedKey={selectedProf}
+            onSelectionChange={onProfSelectionChange}
+          >
+            {profs?.map((prof: any) => (
+              <AutocompleteItem key={prof.id} textValue={prof.displayName}>
+                <div className="flex gap-2 items-center">
+                  <div className="flex flex-col">
+                    <span className="text-small">{prof.displayName}</span>
+                    <span className="text-tiny text-default-400">
+                      {prof.year}
+                    </span>
+                  </div>
+                </div>
+              </AutocompleteItem>
+            ))}
+          </Autocomplete>
+
+          <Autocomplete
+            isRequired
+            aria-label="Select Class"
+            className=" max-w-xs "
+            label="Select Class"
+            labelPlacement="outside"
+            placeholder="Select Class"
+            variant={"bordered"}
+            size="lg"
+            startContent={<Class />}
+            selectedKey={selectedClass}
+            onSelectionChange={onClassSelectionChange}
+          >
+            {classes?.map((thing: any) => (
+              <AutocompleteItem
+                key={thing.id}
+                textValue={thing.subject + " " + thing.courseNumber}
+              >
+                <div className="flex gap-2 items-center">
+                  <div className="flex flex-col">
+                    <span className="text-small">
+                      {thing.subject} {thing.courseNumber}
+                    </span>
+                    <span className="text-tiny text-default-400">
+                      Ref: {thing.courseReferenceNumber.replace(thing.year, "")}
+                    </span>
+                  </div>
+                </div>
+              </AutocompleteItem>
+            ))}
+          </Autocomplete>
+          <Divider className="mt-5" orientation="horizontal" />
+
+          <div className="mt-5">Rate Your Professor</div>
+          <div className="grid grid-cols-2">
+            <Rating
+              className="ml-5"
+              name="rate-prof"
+              value={rating}
+              precision={1}
+              getLabelText={getLabelText}
+              onChange={(event, newValue) => {
+                console.log(newValue);
+                setRating(newValue);
+              }}
+              onChangeActive={(event, newHover) => {
+                setHover(newHover);
+              }}
+              emptyIcon={
+                <Star
+                  style={{ opacity: 0.8, color: "grey" }}
+                  fontSize="inherit"
+                />
+              }
+            />
+            {rating !== null && (
+              <div className="ml-5">
+                {labels[hover !== -1 ? hover : rating]}
+              </div>
+            )}
+          </div>
+
+          <div>How difficult was this professor?</div>
+          <div className="grid grid-cols-2 mb-5">
+            <Rating
+              className="ml-5"
+              name="rate-prof-diff"
+              value={diffValue}
+              precision={1}
+              getLabelText={getDiffText}
+              onChange={(event, newValue) => {
+                console.log(newValue);
+                setDiffValue(newValue);
+              }}
+              onChangeActive={(event, newHover) => {
+                setDiffHover(newHover);
+              }}
+              emptyIcon={
+                <Star
+                  style={{ opacity: 0.8, color: "grey" }}
+                  fontSize="inherit"
+                />
+              }
+            />
+            {diffValue !== null && (
+              <div className="ml-5">
+                {diffLabels[diffHover !== -1 ? diffHover : diffValue]}
+              </div>
+            )}
+          </div>
+
+          <div>Would you take this professor again?</div>
+          <Checkbox
+            className="ml-5"
+            isSelected={takeAgain}
+            onValueChange={setTakeAgain}
+          >
+            Yes! <div className="text-tiny">(leave blank for no)</div>
+          </Checkbox>
+
+          <div>Did you mark this class as CR/NC?</div>
+          <Checkbox
+            className="ml-5"
+            isSelected={forCredit}
+            onValueChange={setForCredit}
+          >
+            Yes! <div className="text-tiny">(leave blank for no)</div>
+          </Checkbox>
+
+          <div>Select grade recieved</div>
+          <Select
+            selectionMode="single"
+            isRequired
+            selectedKeys={[grade]}
+            placeholder="SelectGrade"
+            className="max-w-xs"
+            onChange={handleSelectionChange}
+          >
+            {gradeOptions.map((grade) => (
+              <SelectItem key={grade.key}>{grade.label}</SelectItem>
+            ))}
+          </Select>
+
+          <Textarea
+            value={review}
+            size="lg"
+            className=""
+            rows={5}
+            labelPlacement="outside"
+            disableAutosize
+            label="Write a Review"
+            placeholder="What did you think of this prof/class?"
+            onValueChange={setReview}
+          />
+        </CardBody>
+
+        <Button
+          onPress={onOpen}
+          color="primary"
+          className="mb-10 mt-10"
+          size="lg"
+        >
+          Submit
+        </Button>
+
+        <Modal
+          isOpen={isOpen}
+          onOpenChange={onOpenChange}
+          isDismissable={false}
+          isKeyboardDismissDisabled={true}
+          backdrop={"blur"}
         >
-          {courses?.map((course: any) => (
-            <AutocompleteItem key={course.id}>
-              {course.courseTitle}
-            </AutocompleteItem>
-          ))}
-        </Autocomplete>
-
-        <Textarea
-          disableAutosize
-          className="row-start-3 col-span-3 row-span-2"
-          label="Review"
-          placeholder="What did you think of this prof/class?"
-        ></Textarea>
-      </CardBody>
-    </Card>
+          <ModalContent>
+            {(onClose) => (
+              <>
+                <ModalHeader className="flex flex-col gap-1">
+                  Confirm Rating Submission
+                </ModalHeader>
+                <ModalBody>
+                  <div>
+                    By submiting a rating to SCCS you agree to abide by the SCCS
+                    <Link
+                      className="ml-1 mr-1"
+                      isExternal
+                      href="https://www.sccs.swarthmore.edu/docs/policy"
+                      title="SCCS Usage & Data Policy"
+                    >
+                      <span className=" underline"> Usage & Data Policy </span>
+                    </Link>
+                  </div>
+
+                  <p>
+                    While reviews submitted through this site are completly
+                    anonymous we collect user identifiable information for the
+                    saftey and continued usage of this platform. We do reserve
+                    the right to remove reviews that are not in good spirit.
+                  </p>
+                </ModalBody>
+                <ModalFooter>
+                  <Button color="danger" variant="light" onPress={onClose}>
+                    Close
+                  </Button>
+                  <Button
+                    color="primary"
+                    onPress={onClose}
+                    onClick={submitReview}
+                  >
+                    Submit
+                  </Button>
+                </ModalFooter>
+              </>
+            )}
+          </ModalContent>
+        </Modal>
+      </Card>
+    </>
   );
 }
diff --git a/components/Calendar.tsx b/components/Calendar.tsx
index 2b43b10..76c90ed 100644
--- a/components/Calendar.tsx
+++ b/components/Calendar.tsx
@@ -4,7 +4,6 @@ import FullCalendar from "@fullcalendar/react";
 import timeGridPlugin from "@fullcalendar/timegrid"; // a plugin!
 import { Card } from "@nextui-org/react";
 import moment from "moment";
-import { generateColorFromName } from "./primitives";
 
 export default function Calendar(props: any) {
   function dayHeaderContent(args: any) {
@@ -13,6 +12,7 @@ export default function Calendar(props: any) {
 
   function renderEventContent(eventInfo: any) {
     console.log(eventInfo);
+
     return (
       <Card
         className="fc-event-main-frame w-[100%] rounded-md hover:h-[20vh] ease-in-out z-0 hover:z-10 hover:transition-all duration-700 "
@@ -39,20 +39,20 @@ export default function Calendar(props: any) {
 
   return (
     <FullCalendar
+      expandRows
+      allDaySlot={false}
+      dayHeaderFormat={dayHeaderContent}
+      editable={false}
+      eventContent={renderEventContent}
+      events={props.events}
+      headerToolbar={false}
       height="100%"
-      plugins={[timeGridPlugin]}
       initialView="timeGridWeek"
-      allDaySlot={false}
-      expandRows
+      plugins={[timeGridPlugin]}
       slotDuration="01:00:00"
-      slotMinTime="08:00:00"
       slotMaxTime="23:00:00"
+      slotMinTime="08:00:00"
       weekends={false}
-      dayHeaderFormat={dayHeaderContent}
-      events={props.events}
-      headerToolbar={false}
-      eventContent={renderEventContent}
-      editable={false}
     />
   );
 }
diff --git a/components/CourseCard.tsx b/components/CourseCard.tsx
index 408ee9b..24c7bd4 100644
--- a/components/CourseCard.tsx
+++ b/components/CourseCard.tsx
@@ -1,28 +1,11 @@
 "use client";
-import {
-  Card,
-  CardBody,
-  CardHeader,
-  Divider,
-  Link,
-  User,
-  Popover,
-  PopoverTrigger,
-  PopoverContent,
-  Button,
-  Chip,
-} from "@nextui-org/react";
+import { Card, CardBody, CardHeader, Chip } from "@nextui-org/react";
 import Image from "next/image";
 import { tv } from "tailwind-variants";
-import { generateColorFromName } from "../components/primitives";
-import { ScrollShadow } from "@nextui-org/react";
-
-import { InstructorCard } from "./InstructorCard";
-import AddIcon from "@mui/icons-material/Add";
-import ErrorRoundedIcon from "@mui/icons-material/ErrorRounded";
-
 import axios from "axios";
 
+import { generateColorFromName } from "../components/primitives";
+import { Error } from "@Mui/icons-material";
 export const card = tv({
   slots: {
     base: "bg-light_foreground min-h-32 max-h-62 w-[98%] rounded-sm scroll-none drop-shadow-lg transition-colors",
@@ -48,7 +31,7 @@ async function updatePlan(course: any) {
 
 export default function CourseCard(props: any) {
   console.log(props.course);
-  let color = generateColorFromName(props.course.subject);
+  const color = generateColorFromName(props.course.subject);
 
   const color_mappings: { [key: string]: string } = {
     "0": "#4CB944",
@@ -78,6 +61,7 @@ export default function CourseCard(props: any) {
         </div>
       );
     }
+
     return null;
   });
 
@@ -85,7 +69,7 @@ export default function CourseCard(props: any) {
     (item: any, index: number) => {
       if (item) {
         return (
-          <Chip variant={"bordered"} size="sm" key={index}>
+          <Chip key={index} size="sm" variant={"bordered"}>
             <p> {item.code}</p>
           </Chip>
         );
@@ -96,113 +80,118 @@ export default function CourseCard(props: any) {
   );
 
   return (
-    <Card key={props.course.id} className={base()} shadow="sm" isHoverable>
+    <Card key={props.course.id} isHoverable className={base()} shadow="sm">
       <div
         className="absolute top-0 left-0 h-full w-2 rounded-full"
         style={{ backgroundColor: color }}
       />
-      <div className="pl-6">
-        <CardHeader onClick={() => updatePlan(props.course)}>
-          <div className="flex items-center flex-row justify-between w-full">
-            <div className="flex flex-col">
-              <h1 className="font-bold text-3xl text-left">
-                {props.course.courseTitle.replace("&amp;", "&")}
-              </h1>
-              <h2 className=" flex text-left">
-                {props.course.subject} {props.course.courseNumber} |{" "}
-                {props.course.creditHours} credit(s) | &nbsp;
-                {props.course.sectionAttributes.length > 0 && (
-                  <div>{attributeCodes}</div>
-                )}
-              </h2>
-            </div>
-            <div className="flex items-center ml-auto mr-8">
-              <Image
-                // src={"https://www.swarthmore.edu/sites/default/files/styles/headshot/public/assets/images/user_photos/cmurphy4.jpg.webp"}
-                src={
-                  "https://cdn.vectorstock.com/i/500p/08/19/gray-photo-placeholder-icon-design-ui-vector-35850819.jpg"
-                }
-                width={100}
-                height={100}
-                alt="Professor"
-                className="object-cover rounded-md absolute top-6 right-6"
-              />
-            </div>
+      <CardHeader className="pl-6" onClick={() => updatePlan(props.course)}>
+        <div className="flex items-center flex-row justify-between w-full">
+          <div className="flex flex-col">
+            <h1 className="font-bold text-3xl text-left">
+              {props.course.courseTitle.replace("&amp;", "&")}
+            </h1>
+            <h2 className=" flex text-left">
+              {props.course.subject} {props.course.courseNumber} |{" "}
+              {props.course.creditHours} credit(s) | &nbsp;
+              {props.course.sectionAttributes.length > 0 && (
+                <div>{attributeCodes}</div>
+              )}
+            </h2>
+          </div>
+          <div className="flex items-center ml-auto mr-8">
+            <Image
+              // src={"https://www.swarthmore.edu/sites/default/files/styles/headshot/public/assets/images/user_photos/cmurphy4.jpg.webp"}
+              alt="Professor"
+              className="object-cover rounded-md absolute top-6 right-6"
+              height={100}
+              src={
+                "https://cdn.vectorstock.com/i/500p/08/19/gray-photo-placeholder-icon-design-ui-vector-35850819.jpg"
+              }
+              width={100}
+            />
           </div>
-        </CardHeader>
+        </div>
+      </CardHeader>
 
-        <CardBody className="mt-0 mb-2">
-          <div className="flex justify-between flex-row">
-            <div className="gap-10">
-              {props.course.facultyMeet.meetingTimes.room ? (
-                <div className="bg-[#2C2C33] p-3 w-64 rounded-md">
-                  <div className="font-semibold text-lg text-white">
-                    {props.course.facultyMeet.meetingTimes.buildingDescription}{" "}
-                    {props.course.facultyMeet.meetingTimes.room}
-                  </div>
-                  <div className="text-base">
-                    {props.course.facultyMeet.meetingTimes ? (
-                      <div className="mt-2">
-                        <div className="font-normal">
-                          {" "}
-                          {props.course.facultyMeet.meetingTimes.beginTime.slice(
-                            0,
+      <CardBody
+        className="mt-0 mb-2 pl-6"
+        onClick={() => updatePlan(props.course)}
+      >
+        <div className="flex justify-between flex-row">
+          <div className="gap-10">
+            {props.course.facultyMeet.meetingTimes.room ? (
+              <div className="bg-[#2C2C33] p-3 w-64 rounded-md">
+                <div className="font-semibold text-lg text-white">
+                  {props.course.facultyMeet.meetingTimes.buildingDescription}{" "}
+                  {props.course.facultyMeet.meetingTimes.room}
+                </div>
+                <div className="text-base">
+                  {props.course.facultyMeet.meetingTimes ? (
+                    <div className="mt-2">
+                      <div className="font-normal">
+                        {" "}
+                        {props.course.facultyMeet.meetingTimes.beginTime.slice(
+                          0,
+                          2
+                        ) +
+                          ":" +
+                          props.course.facultyMeet.meetingTimes.beginTime.slice(
                             2
-                          ) +
-                            ":" +
-                            props.course.facultyMeet.meetingTimes.beginTime.slice(
-                              2
-                            )}{" "}
-                          -{" "}
-                          {props.course.facultyMeet.meetingTimes.endTime.slice(
-                            0,
+                          )}{" "}
+                        -{" "}
+                        {props.course.facultyMeet.meetingTimes.endTime.slice(
+                          0,
+                          2
+                        ) +
+                          ":" +
+                          props.course.facultyMeet.meetingTimes.endTime.slice(
                             2
-                          ) +
-                            ":" +
-                            props.course.facultyMeet.meetingTimes.endTime.slice(
-                              2
-                            )}
-                        </div>
+                          )}
                       </div>
-                    ) : null}
-                  </div>
+                    </div>
+                  ) : null}
                 </div>
-              ) : (
-                <div className="bg-[#2C2C33] p-4 w-64 rounded-md">
-                  <p className="font-semibold">
-                    Contact your Professor for additional details.
-                  </p>
-                </div>
-              )}
-              <div className="flex flex-row">
-                <div className="flex flex-row gap-2 mt-5">{coloredDays}</div>
               </div>
+            ) : (
+              <div className="bg-[#2C2C33] p-4 w-64 rounded-md">
+                <p className="font-semibold">
+                  Contact your Professor for additional details.
+                </p>
+              </div>
+            )}
+            <div className="flex flex-row">
+              <div className="flex flex-row gap-2 mt-5">{coloredDays}</div>
             </div>
-            <div className="flex flex-col pr-3 pt-10">
-              <div className="flex flex-row gap-5 justify-end">
-                <div>
-                  <div className="text-right font-medium">Instructor</div>
-                  <div className="text-2xl font-bold">
-                    {props.course.instructor.displayName.replace("&#39;", "'")}
-                  </div>
-                </div>
-                <div className="flex bg-green-500 w-16 h-16 items-center justify-center rounded-md">
-                  <div className="font-black text-3xl">?</div>
+          </div>
+          <div className="flex flex-col pr-3 pt-10">
+            <div className="flex flex-row gap-5 justify-end">
+              <div>
+                <div className="text-right font-medium">Instructor</div>
+                <div className="text-2xl font-bold">
+                  {props.course.instructor.displayName.replace("&#39;", "'")}
                 </div>
               </div>
-              {props.course.seatsAvailable >= 0 && (
-                <div className="flex flex-row items-end pt-4 gap-2">
-                  <div className="font-medium text-slate">
-                    No available seats left for this section
+
+              {props.course.instructor.avgRating == null ? null : (
+                <div className="flex bg-green-500 w-16 h-16 items-center justify-center rounded-md">
+                  <div className="font-black text-3xl">
+                    {props.course.instructor.avgRating}
                   </div>
-                  {/*                   <ErrorRoundedIcon color="error" />
-                   */}
                 </div>
               )}
             </div>
+            {props.course.seatsAvailable >= 0 && (
+              <div className="flex flex-row items-end pt-4 gap-2">
+                <div className="font-medium text-slate">
+                  No available seats left for this section
+                </div>
+                <Error color="error" />
+              </div>
+            )}
           </div>
-        </CardBody>
-      </div>
+        </div>
+      </CardBody>
     </Card>
   );
 }
diff --git a/components/CreatePlan.tsx b/components/CreatePlan.tsx
index 80f288d..c790c3d 100644
--- a/components/CreatePlan.tsx
+++ b/components/CreatePlan.tsx
@@ -10,21 +10,18 @@ import {
 import AddIcon from "@mui/icons-material/Add";
 import DeleteIcon from "@mui/icons-material/Delete";
 import IosShareIcon from "@mui/icons-material/IosShare";
-import { tv } from "tailwind-variants";
 import axios from "axios";
 import { Select, SelectItem } from "@nextui-org/react";
 import { useRouter } from "next/navigation";
-
-import { InstructorCard } from "./InstructorCard";
 import { usePathname } from "next/navigation";
 import { useSession } from "next-auth/react";
-import { Suspense, useEffect, useState } from "react";
+import { useEffect, useState } from "react";
 import useSWR from "swr";
-import { setPlanCookie } from "../app/actions";
 import { useCookies } from "next-client-cookies";
+
+import { setPlanCookie } from "../app/actions";
 import { generateColorFromName } from "../components/primitives";
-import { FullCourseList } from "./FullCourseList";
-import { PlanCardList } from "./PlanCardList";
+
 export default function CreatePlan(props: any) {
   const cookies = useCookies();
   const router = useRouter();
@@ -107,19 +104,22 @@ export default function CreatePlan(props: any) {
   useEffect(() => {
     // Update the document title using the browser API
     setSelectedCoursePlan([cookies.get("plan")]);
-    var objDiv: any = document.getElementById("scrollMe");
+    const objDiv: any = document.getElementById("scrollMe");
+
     objDiv.scrollTop = objDiv.scrollHeight;
   }, [data]);
 
   const CoursesList = () => {
-    let output: any = [];
+    const output: any = [];
+
     if (isLoading) {
-      return <Skeleton></Skeleton>;
+      return <Skeleton />;
     }
     if (data && !isLoading) {
-      let filtered_data = data.filter(
+      const filtered_data = data.filter(
         (course: any) => course.id == selectedCoursePlan[0]
       );
+
       for (let i = 0; i < filtered_data.length; i++) {
         filtered_data[i].courses.map((course: any) =>
           output.push(
@@ -144,9 +144,9 @@ export default function CreatePlan(props: any) {
                   {course.courseTitle.replace(/&amp;/g, "&")}
                 </div>
                 <Button
-                  size={"sm"}
-                  className=""
                   isIconOnly
+                  className=""
+                  size={"sm"}
                   onClick={() =>
                     removeCourseFromPlan(selectedCoursePlan[0], course)
                   }
@@ -172,9 +172,9 @@ export default function CreatePlan(props: any) {
         <div className="grid grid-rows-subgrid grid-cols-3 gap-2 ">
           <Input
             isRequired
+            className="col-span-2 "
             label="Give your plan a name..."
             size="lg"
-            className="col-span-2 "
             value={coursePlanName}
             onChange={(event: any) => {
               setCoursePlanName(event.target.value);
@@ -182,7 +182,7 @@ export default function CreatePlan(props: any) {
           />
           <Button
             size="lg"
-            startContent={<AddIcon></AddIcon>}
+            startContent={<AddIcon />}
             onClick={() => createPlan()}
           >
             <div>Create</div>
@@ -202,12 +202,12 @@ export default function CreatePlan(props: any) {
         <div className="font-bold gap-0">Select a Plan</div>
         <div className="grid grid-cols-5 gap-2">
           <Select
-            selectionMode="single"
+            className="col-span-3"
             label="Select Plan"
+            selectedKeys={selectedCoursePlan}
+            selectionMode="single"
             size="sm"
-            className="col-span-3"
             onChange={handleSelectionChange}
-            selectedKeys={selectedCoursePlan}
           >
             {coursePlans != null
               ? coursePlans.map((plan: any) => (
@@ -218,16 +218,12 @@ export default function CreatePlan(props: any) {
 
           <Button
             isIconOnly
-            size="md"
             className=""
-            onClick={deletePlan}
-            startContent={<DeleteIcon></DeleteIcon>}
-          ></Button>
-          <Button
-            isIconOnly
             size="md"
-            startContent={<IosShareIcon></IosShareIcon>}
-          ></Button>
+            startContent={<DeleteIcon />}
+            onClick={deletePlan}
+          />
+          <Button isIconOnly size="md" startContent={<IosShareIcon />} />
         </div>
 
         <div
diff --git a/components/FullCourseList.tsx b/components/FullCourseList.tsx
index f30e20f..6d3af19 100644
--- a/components/FullCourseList.tsx
+++ b/components/FullCourseList.tsx
@@ -1,19 +1,20 @@
 import { Course, Prisma } from "@prisma/client";
+
 import prisma from "../lib/prisma";
+
 import CourseCard from "./CourseCard";
-import { getPlanCookie } from "../app/actions";
 
 async function getCourses(
   query: string,
   term: string,
-  dotw: Array<String>,
+  dotw: Array<string>,
   stime: Array<string>
 ) {
   //let DOTW: Array<String> = dotw.split(",");
 
   //query = query.trim().replace(/^[a-zA-Z0-9:]+$/g, "");
 
-  let startTime = stime.toString().split(",").filter(Number);
+  const startTime = stime.toString().split(",").filter(Number);
 
   return await prisma.course.findMany({
     relationLoadStrategy: "join", // or 'query'
@@ -75,6 +76,14 @@ async function getCourses(
                   mode: "insensitive",
                 },
               },
+              {
+                instructor: {
+                  displayName: {
+                    search: query.trim().split(" ").join(" | "),
+                    mode: "insensitive",
+                  },
+                },
+              },
             ],
 
             ...(startTime.length > 0
@@ -126,7 +135,7 @@ export async function FullCourseList({
 }: {
   query: string;
   term: string;
-  dotw: Array<String>;
+  dotw: Array<string>;
   stime: Array<string>;
 }) {
   const courseList: Course[] = await getCourses(query, term, dotw, stime);
diff --git a/components/PlanCard.tsx b/components/PlanCard.tsx
index c212480..4ac08a8 100644
--- a/components/PlanCard.tsx
+++ b/components/PlanCard.tsx
@@ -1,5 +1,6 @@
 "use client";
 import { Card, Button, CardHeader } from "@nextui-org/react";
+
 import { generateColorFromName } from "../components/primitives";
 
 export default function PlanCard(props: any) {
@@ -23,8 +24,8 @@ export default function PlanCard(props: any) {
           {props.course.courseTitle.replace(/&amp;/g, "&")}
         </div>
         <Button
-          size={"sm"}
           className=""
+          size={"sm"}
           isIconOnly
           /*
             onClick={() =>
diff --git a/components/PlanCardList.tsx b/components/PlanCardList.tsx
index 66a959b..867e3e4 100644
--- a/components/PlanCardList.tsx
+++ b/components/PlanCardList.tsx
@@ -1,7 +1,8 @@
-import { Course, Prisma } from "@prisma/client";
+import { Course } from "@prisma/client";
+
 import prisma from "../lib/prisma";
+
 import PlanCard from "./PlanCard";
-import { getPlanCookie } from "../app/actions";
 
 async function getPlanCourses(planID: any) {
   //let DOTW: Array<String> = dotw.split(",");
diff --git a/components/Search.tsx b/components/Search.tsx
index aa304ee..f0d8efb 100644
--- a/components/Search.tsx
+++ b/components/Search.tsx
@@ -6,10 +6,10 @@ import { useDebouncedCallback } from "use-debounce";
 import { Select, SelectItem } from "@nextui-org/react";
 import { useEffect, useState } from "react";
 import moment from "moment";
-import { Autocomplete, TextField, Chip } from "@mui/material";
+import { Chip } from "@mui/material";
 
 export default function Search(props: any) {
-  let router = useRouter();
+  const router = useRouter();
   const searchParams = useSearchParams();
   const [selectedTerm, setSelectedTerm]: any = useState(["S2025"]);
   const [selectedDOTW, setSelectedDOTW]: any = useState([]);
@@ -29,16 +29,17 @@ export default function Search(props: any) {
     //replaceText(term);
     //setSearch(term);
     //const term_regex = new RegExp(\w, "g");
-    let filtered_term = term.replace(/[^a-zA-Z0-9 ]+/gi, "");
-    let include_colons = term.replace(/[^a-zA-Z0-9: ]+/gi, "");
-    let term_list = include_colons.split(" ");
+    const filtered_term = term.replace(/[^a-zA-Z0-9 ]+/gi, "");
+    const include_colons = term.replace(/[^a-zA-Z0-9: ]+/gi, "");
+    const term_list = include_colons.split(" ");
 
-    for (var i = 0; i < term_list.length; i++) {
+    for (let i = 0; i < term_list.length; i++) {
       if (/\w+:/.test(term_list[i])) {
         console.log(term_list[i]);
       }
     }
     const params = new URLSearchParams(searchParams);
+
     if (term) {
       decodeURIComponent;
       params.set("query", filtered_term);
@@ -90,6 +91,7 @@ export default function Search(props: any) {
   const handleDOTWChange = (e: any) => {
     setSelectedDOTW(...[e]);
     const params = new URLSearchParams(searchParams);
+
     if (e.size > 0) {
       params.set("dotw", Array.from(e).join(","));
     } else {
@@ -101,6 +103,7 @@ export default function Search(props: any) {
   const handleSTimeChange = (e: any) => {
     setSelectedStartTime(...[e]);
     const params = new URLSearchParams(searchParams);
+
     if (e.size > 0) {
       params.set("stime", Array.from(e).join(","));
     } else {
@@ -110,11 +113,12 @@ export default function Search(props: any) {
   };
 
   const RenderSelectOptions = () => {
-    let output = [];
+    const output = [];
 
     for (let i = 0; i < props.terms?.length; i++) {
-      let sem = props.terms[i].substring(0, 1);
-      let year = props.terms[i].substring(1);
+      const sem = props.terms[i].substring(0, 1);
+      const year = props.terms[i].substring(1);
+
       if (sem.toLowerCase() == "s") {
         output.push({ key: props.terms[i], title: "Spring " + year });
       } else if (sem.toLowerCase() == "f") {
@@ -137,30 +141,30 @@ export default function Search(props: any) {
         defaultValue={searchParams.get("query")?.toString()}
         label="Search"
         labelPlacement="inside"
-        variant="bordered"
         value={search}
-        onClear={() => {
-          handleSearch("");
-        }}
+        variant="bordered"
         onChange={(e) => {
           handleSearch(e.target.value);
         }}
+        onClear={() => {
+          handleSearch("");
+        }}
       />
 
       <Select
-        label="Select Term"
-        disallowEmptySelection={true}
         className="max-w-xs col-span-1"
-        selectedKeys={selectedTerm}
         defaultSelectedKeys={searchParams.get("term")?.toString()}
+        disallowEmptySelection={true}
+        label="Select Term"
+        selectedKeys={selectedTerm}
         selectionMode={"single"}
         onChange={handleSelectionChange}
       >
         {RenderSelectOptions()}
       </Select>
       <Select
-        label="Day of the Week"
         className="max-w-xs"
+        label="Day of the Week"
         selectedKeys={selectedDOTW}
         selectionMode={"multiple"}
         //defaultSelectedKeys={searchParams.get("dotw")?.toString()}
@@ -190,15 +194,15 @@ export default function Search(props: any) {
       </Select>
 
       <Select
-        label="Start Time"
         className="max-w-xs"
+        label="Start Time"
         selectedKeys={selectedStartTime}
         selectionMode={"multiple"}
         onSelectionChange={handleSTimeChange}
       >
         {props.times.startTimes.map((startTime: any) => {
-          var time = startTime.slice(0, 2) + ":" + startTime.slice(2);
-          var daTime = moment(time, "HH:mm").format("hh:mm A");
+          const time = startTime.slice(0, 2) + ":" + startTime.slice(2);
+          const daTime = moment(time, "HH:mm").format("hh:mm A");
 
           return (
             <SelectItem key={startTime} value={startTime}>
diff --git a/components/navbar.tsx b/components/navbar.tsx
index 67eda04..946387a 100644
--- a/components/navbar.tsx
+++ b/components/navbar.tsx
@@ -1,8 +1,7 @@
 "use client";
 //Just for pathname highlighting though, could always go back if it becomes too slow
-import React, { useContext } from "react";
+import React from "react";
 import { signIn, signOut, useSession } from "next-auth/react";
-
 import {
   Navbar as NextUINavbar,
   NavbarContent,
@@ -12,33 +11,26 @@ import {
   NavbarItem,
   NavbarMenuItem,
 } from "@nextui-org/navbar";
-import { Button, ButtonGroup } from "@nextui-org/button";
-
 import {
   Dropdown,
   DropdownTrigger,
   DropdownMenu,
-  DropdownSection,
   DropdownItem,
 } from "@nextui-org/dropdown";
-import { Kbd } from "@nextui-org/kbd";
 import { Link } from "@nextui-org/link";
-import { Input } from "@nextui-org/input";
 import { Spacer } from "@nextui-org/spacer";
 import NextLink from "next/link";
 import { usePathname } from "next/navigation";
 import { button as buttonStyles } from "@nextui-org/theme";
-import { Divider } from "@nextui-org/divider";
 import InputIcon from "@mui/icons-material/Input";
+import HomeIcon from "@mui/icons-material/Home";
+import SendIcon from "@mui/icons-material/Send";
+import axios from "axios";
 
 import { siteConfig } from "../config/site";
 import { ThemeSwitch } from "../components/theme-switch";
 import { title } from "../components/primitives";
 
-import HomeIcon from "@mui/icons-material/Home";
-import SendIcon from "@mui/icons-material/Send";
-import axios from "axios";
-
 const pages = {
   Home: { link: "/", image: <HomeIcon /> },
   Submit: { link: "/submit", image: <SendIcon /> },
@@ -123,7 +115,11 @@ export const Navbar = (props: any) => {
 
   return (
     <div className="bg-background_navbar">
-      <NextUINavbar className="mt-2 bg-inherit" maxWidth="xl" position="sticky">
+      <NextUINavbar
+        className="mt-2 bg-inherit"
+        maxWidth="full"
+        position="sticky"
+      >
         <NavbarContent className="basis-1/5 sm:basis-full" justify="start">
           <NavbarBrand as="li" className="gap-3 max-w-fit">
             <NextLink
@@ -188,7 +184,6 @@ export const Navbar = (props: any) => {
 
               {authenticated ? (
                 <DropdownMenu aria-label="Static Actions">
-                  <DropdownItem key="myCourses">My Courses</DropdownItem>
                   <DropdownItem key="loginLink">{loginLink}</DropdownItem>
                 </DropdownMenu>
               ) : (
@@ -208,21 +203,43 @@ export const Navbar = (props: any) => {
           <div className="mx-4 mt-2 flex flex-col gap-2">
             {siteConfig.navMenuItems.map((item, index) => (
               <NavbarMenuItem key={`${item}-${index}`}>
-                <Link
-                  color={
-                    index === 2
-                      ? "primary"
-                      : index === siteConfig.navMenuItems.length - 1
-                        ? "danger"
-                        : "foreground"
-                  }
-                  href="#"
-                  size="lg"
-                >
+                <Link href={item.href} size="lg">
                   {item.label}
                 </Link>
               </NavbarMenuItem>
             ))}
+            <NavbarItem className="hidden sm:flex gap-2">
+              <ThemeSwitch />
+            </NavbarItem>
+
+            <NavbarItem>
+              <Dropdown>
+                <DropdownTrigger>
+                  <Link
+                    className={buttonStyles({
+                      color: "primary",
+                      radius: "full",
+                      variant: "ghost",
+                    })}
+                    onClick={
+                      authenticated
+                        ? () => {}
+                        : () => signIn("keycloak", { callbackUrl: "/" })
+                    }
+                  >
+                    {nameButton}
+                  </Link>
+                </DropdownTrigger>
+
+                {authenticated ? (
+                  <DropdownMenu aria-label="Static Actions">
+                    <DropdownItem key="loginLink">{loginLink}</DropdownItem>
+                  </DropdownMenu>
+                ) : (
+                  <></>
+                )}
+              </Dropdown>
+            </NavbarItem>
           </div>
         </NavbarMenu>
       </NextUINavbar>
diff --git a/components/theme-switch.tsx b/components/theme-switch.tsx
index b09d04d..72b5980 100644
--- a/components/theme-switch.tsx
+++ b/components/theme-switch.tsx
@@ -6,7 +6,6 @@ import { SwitchProps, useSwitch } from "@nextui-org/switch";
 import { useTheme } from "next-themes";
 import { useIsSSR } from "@react-aria/ssr";
 import clsx from "clsx";
-
 import Brightness4Icon from "@mui/icons-material/Brightness4";
 import BedtimeIcon from "@mui/icons-material/Bedtime";
 export interface ThemeSwitchProps {
@@ -44,7 +43,7 @@ export const ThemeSwitch: FC<ThemeSwitchProps> = ({
         className: clsx(
           "px-px transition-opacity hover:opacity-80 cursor-pointer",
           className,
-          classNames?.base
+          classNames?.base,
         ),
       })}
     >
@@ -66,7 +65,7 @@ export const ThemeSwitch: FC<ThemeSwitchProps> = ({
               "px-0",
               "mx-0",
             ],
-            classNames?.wrapper
+            classNames?.wrapper,
           ),
         })}
       >
diff --git a/config/site.ts b/config/site.ts
index 4b5bc7c..65a578c 100644
--- a/config/site.ts
+++ b/config/site.ts
@@ -12,40 +12,20 @@ export const siteConfig = {
       label: "Calendar",
       href: "/calendar",
     },
-  ],
-  navMenuItems: [
-    {
-      label: "Profile",
-      href: "/profile",
-    },
     {
-      label: "Dashboard",
-      href: "/dashboard",
-    },
-    {
-      label: "Projects",
-      href: "/projects",
+      label: "Ratings",
+      href: "/rating",
     },
+  ],
+  navMenuItems: [
     {
-      label: "Team",
-      href: "/team",
+      label: "Plan",
+      href: "/",
     },
     {
       label: "Calendar",
       href: "/calendar",
     },
-    {
-      label: "Settings",
-      href: "/settings",
-    },
-    {
-      label: "Help & Feedback",
-      href: "/help-feedback",
-    },
-    {
-      label: "Logout",
-      href: "/logout",
-    },
   ],
   links: {
     github: "https://github.com/nextui-org/nextui",
diff --git a/lib/auth.ts b/lib/auth.ts
index 2302ed5..63a140a 100644
--- a/lib/auth.ts
+++ b/lib/auth.ts
@@ -4,6 +4,7 @@ import type {
   NextApiResponse,
 } from "next";
 import type { NextAuthOptions } from "next-auth";
+
 import KeycloakProvider from "next-auth/providers/keycloak";
 import { getServerSession } from "next-auth";
 
@@ -42,6 +43,7 @@ export const config = {
     jwt({ token, user }) {
       // @ts-ignore
       if (user) token.role = user.role;
+
       return token;
     },
     session({ session, token }) {
@@ -51,6 +53,7 @@ export const config = {
         // @ts-ignore
         session.user.id = token.sub;
       }
+
       return session;
     },
   },
diff --git a/package-lock.json b/package-lock.json
index a175baa..1028894 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,6 +28,7 @@
         "@nextui-org/system": "2.2.6",
         "@nextui-org/tabs": "^2.0.37",
         "@nextui-org/theme": "2.2.11",
+        "@nextui-org/use-infinite-scroll": "^2.1.5",
         "@prisma/client": "^5.22.0",
         "@react-aria/ssr": "3.9.6",
         "@react-aria/visually-hidden": "3.8.17",
@@ -37,14 +38,11 @@
         "autoprefixer": "10.4.20",
         "axios": "^1.7.7",
         "clsx": "2.1.1",
-        "eslint": "^9.13.0",
         "eslint-config-next": "15.0.1",
-        "eslint-config-prettier": "^9.1.0",
         "eslint-plugin-import": "^2.31.0",
         "eslint-plugin-jsx-a11y": "^6.10.2",
         "eslint-plugin-node": "^11.1.0",
         "eslint-plugin-prettier": "^5.2.1",
-        "eslint-plugin-react": "^7.37.2",
         "eslint-plugin-react-hooks": "^5.0.0",
         "eslint-plugin-unused-imports": "^4.1.4",
         "framer-motion": "~11.11.10",
@@ -63,6 +61,16 @@
         "tailwindcss": "3.4.14",
         "typescript": "5.6.3",
         "use-debounce": "^10.0.4"
+      },
+      "devDependencies": {
+        "@eslint/js": "^9.14.0",
+        "@next/eslint-plugin-next": "^15.0.3",
+        "eslint": "^9.14.0",
+        "eslint-config-prettier": "^9.1.0",
+        "eslint-plugin-react": "^7.37.2",
+        "globals": "^15.12.0",
+        "turbopack": "^0.0.1",
+        "typescript-eslint": "^8.13.0"
       }
     },
     "node_modules/@alloc/quick-lru": {
@@ -197,6 +205,15 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@babel/traverse/node_modules/globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/@babel/types": {
       "version": "7.26.0",
       "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.0.tgz",
@@ -1352,9 +1369,10 @@
       "license": "MIT"
     },
     "node_modules/@next/eslint-plugin-next": {
-      "version": "15.0.1",
-      "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-15.0.1.tgz",
-      "integrity": "sha512-bKWsMaGPbiFAaGqrDJvbE8b4Z0uKicGVcgOI77YM2ui3UfjHMr4emFPrZTLeZVchi7fT1mooG2LxREfUUClIKw==",
+      "version": "15.0.3",
+      "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-15.0.3.tgz",
+      "integrity": "sha512-3Ln/nHq2V+v8uIaxCR6YfYo7ceRgZNXfTd3yW1ukTaFbO+/I8jNakrjYWODvG9BuR2v5kgVtH/C8r0i11quOgw==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "fast-glob": "3.3.1"
@@ -2960,6 +2978,19 @@
         "react": ">=18"
       }
     },
+    "node_modules/@nextui-org/use-infinite-scroll": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nextui-org/use-infinite-scroll/-/use-infinite-scroll-2.1.5.tgz",
+      "integrity": "sha512-btM1ZQanhVMh1pgV0gjbjPsYCriYX7vmQUtB55Ft8Ymusz2qi9e6obAgxez1Q70GPhlHsWA6wBOleeDee5h5XA==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/lodash.debounce": "^4.0.7",
+        "lodash.debounce": "^4.0.8"
+      },
+      "peerDependencies": {
+        "react": ">=18"
+      }
+    },
     "node_modules/@nextui-org/use-is-mobile": {
       "version": "2.0.9",
       "resolved": "https://registry.npmjs.org/@nextui-org/use-is-mobile/-/use-is-mobile-2.0.9.tgz",
@@ -5129,16 +5160,16 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.12.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.12.2.tgz",
-      "integrity": "sha512-gQxbxM8mcxBwaEmWdtLCIGLfixBMHhQjBqR8sVWNTPpcj45WlYL2IObS/DNMLH1DBP0n8qz+aiiLTGfopPEebw==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.13.0.tgz",
+      "integrity": "sha512-nQtBLiZYMUPkclSeC3id+x4uVd1SGtHuElTxL++SfP47jR0zfkZBJHc+gL4qPsgTuypz0k8Y2GheaDYn6Gy3rg==",
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.12.2",
-        "@typescript-eslint/type-utils": "8.12.2",
-        "@typescript-eslint/utils": "8.12.2",
-        "@typescript-eslint/visitor-keys": "8.12.2",
+        "@typescript-eslint/scope-manager": "8.13.0",
+        "@typescript-eslint/type-utils": "8.13.0",
+        "@typescript-eslint/utils": "8.13.0",
+        "@typescript-eslint/visitor-keys": "8.13.0",
         "graphemer": "^1.4.0",
         "ignore": "^5.3.1",
         "natural-compare": "^1.4.0",
@@ -5162,15 +5193,15 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.12.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.12.2.tgz",
-      "integrity": "sha512-MrvlXNfGPLH3Z+r7Tk+Z5moZAc0dzdVjTgUgwsdGweH7lydysQsnSww3nAmsq8blFuRD5VRlAr9YdEFw3e6PBw==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.13.0.tgz",
+      "integrity": "sha512-w0xp+xGg8u/nONcGw1UXAr6cjCPU1w0XVyBs6Zqaj5eLmxkKQAByTdV/uGgNN5tVvN/kKpoQlP2cL7R+ajZZIQ==",
       "license": "BSD-2-Clause",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.12.2",
-        "@typescript-eslint/types": "8.12.2",
-        "@typescript-eslint/typescript-estree": "8.12.2",
-        "@typescript-eslint/visitor-keys": "8.12.2",
+        "@typescript-eslint/scope-manager": "8.13.0",
+        "@typescript-eslint/types": "8.13.0",
+        "@typescript-eslint/typescript-estree": "8.13.0",
+        "@typescript-eslint/visitor-keys": "8.13.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -5190,13 +5221,13 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.12.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.12.2.tgz",
-      "integrity": "sha512-gPLpLtrj9aMHOvxJkSbDBmbRuYdtiEbnvO25bCMza3DhMjTQw0u7Y1M+YR5JPbMsXXnSPuCf5hfq0nEkQDL/JQ==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.13.0.tgz",
+      "integrity": "sha512-XsGWww0odcUT0gJoBZ1DeulY1+jkaHUciUq4jKNv4cpInbvvrtDoyBH9rE/n2V29wQJPk8iCH1wipra9BhmiMA==",
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.12.2",
-        "@typescript-eslint/visitor-keys": "8.12.2"
+        "@typescript-eslint/types": "8.13.0",
+        "@typescript-eslint/visitor-keys": "8.13.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -5207,13 +5238,13 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.12.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.12.2.tgz",
-      "integrity": "sha512-bwuU4TAogPI+1q/IJSKuD4shBLc/d2vGcRT588q+jzayQyjVK2X6v/fbR4InY2U2sgf8MEvVCqEWUzYzgBNcGQ==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.13.0.tgz",
+      "integrity": "sha512-Rqnn6xXTR316fP4D2pohZenJnp+NwQ1mo7/JM+J1LWZENSLkJI8ID8QNtlvFeb0HnFSK94D6q0cnMX6SbE5/vA==",
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.12.2",
-        "@typescript-eslint/utils": "8.12.2",
+        "@typescript-eslint/typescript-estree": "8.13.0",
+        "@typescript-eslint/utils": "8.13.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.3.0"
       },
@@ -5231,9 +5262,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.12.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.12.2.tgz",
-      "integrity": "sha512-VwDwMF1SZ7wPBUZwmMdnDJ6sIFk4K4s+ALKLP6aIQsISkPv8jhiw65sAK6SuWODN/ix+m+HgbYDkH+zLjrzvOA==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.13.0.tgz",
+      "integrity": "sha512-4cyFErJetFLckcThRUFdReWJjVsPCqyBlJTi6IDEpc1GWCIIZRFxVppjWLIMcQhNGhdWJJRYFHpHoDWvMlDzng==",
       "license": "MIT",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -5244,13 +5275,13 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.12.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.12.2.tgz",
-      "integrity": "sha512-mME5MDwGe30Pq9zKPvyduyU86PH7aixwqYR2grTglAdB+AN8xXQ1vFGpYaUSJ5o5P/5znsSBeNcs5g5/2aQwow==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.13.0.tgz",
+      "integrity": "sha512-v7SCIGmVsRK2Cy/LTLGN22uea6SaUIlpBcO/gnMGT/7zPtxp90bphcGf4fyrCQl3ZtiBKqVTG32hb668oIYy1g==",
       "license": "BSD-2-Clause",
       "dependencies": {
-        "@typescript-eslint/types": "8.12.2",
-        "@typescript-eslint/visitor-keys": "8.12.2",
+        "@typescript-eslint/types": "8.13.0",
+        "@typescript-eslint/visitor-keys": "8.13.0",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -5324,15 +5355,15 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.12.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.12.2.tgz",
-      "integrity": "sha512-UTTuDIX3fkfAz6iSVa5rTuSfWIYZ6ATtEocQ/umkRSyC9O919lbZ8dcH7mysshrCdrAM03skJOEYaBugxN+M6A==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.13.0.tgz",
+      "integrity": "sha512-A1EeYOND6Uv250nybnLZapeXpYMl8tkzYUxqmoKAWnI4sei3ihf2XdZVd+vVOmHGcp3t+P7yRrNsyyiXTvShFQ==",
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "8.12.2",
-        "@typescript-eslint/types": "8.12.2",
-        "@typescript-eslint/typescript-estree": "8.12.2"
+        "@typescript-eslint/scope-manager": "8.13.0",
+        "@typescript-eslint/types": "8.13.0",
+        "@typescript-eslint/typescript-estree": "8.13.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -5346,12 +5377,12 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.12.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.12.2.tgz",
-      "integrity": "sha512-PChz8UaKQAVNHghsHcPyx1OMHoFRUEA7rJSK/mDhdq85bk+PLsUHUBqTQTFt18VJZbmxBovM65fezlheQRsSDA==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.13.0.tgz",
+      "integrity": "sha512-7N/+lztJqH4Mrf0lb10R/CbI1EaAMMGyF5y0oJvFoAhafwgiRA7TXyd8TFn8FC8k5y2dTsYogg238qavRGNnlw==",
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.12.2",
+        "@typescript-eslint/types": "8.13.0",
         "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
@@ -6575,10 +6606,20 @@
         }
       }
     },
+    "node_modules/eslint-config-next/node_modules/@next/eslint-plugin-next": {
+      "version": "15.0.1",
+      "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-15.0.1.tgz",
+      "integrity": "sha512-bKWsMaGPbiFAaGqrDJvbE8b4Z0uKicGVcgOI77YM2ui3UfjHMr4emFPrZTLeZVchi7fT1mooG2LxREfUUClIKw==",
+      "license": "MIT",
+      "dependencies": {
+        "fast-glob": "3.3.1"
+      }
+    },
     "node_modules/eslint-config-prettier": {
       "version": "9.1.0",
       "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz",
       "integrity": "sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==",
+      "devOptional": true,
       "license": "MIT",
       "bin": {
         "eslint-config-prettier": "bin/cli.js"
@@ -7446,12 +7487,16 @@
       }
     },
     "node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "version": "15.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-15.12.0.tgz",
+      "integrity": "sha512-1+gLErljJFhbOVyaetcwJiJ4+eLe45S2E7P5UiZ9xGfeq3ATQf5DOv9G7MH3gGbKQLkzmNh2DxfZwLdw+j6oTQ==",
+      "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=4"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/globalthis": {
@@ -10239,6 +10284,12 @@
       "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
       "license": "0BSD"
     },
+    "node_modules/turbopack": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/turbopack/-/turbopack-0.0.1.tgz",
+      "integrity": "sha512-urgN2cl9AY9JnNi2bNJREMFkdnjyTo2bQlFnegAMEHBozMhB1fuCrQdsag1mHQwY83odPxNtip4BsxBrL7KbRQ==",
+      "dev": true
+    },
     "node_modules/type-check": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -10337,6 +10388,30 @@
         "node": ">=14.17"
       }
     },
+    "node_modules/typescript-eslint": {
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.13.0.tgz",
+      "integrity": "sha512-vIMpDRJrQd70au2G8w34mPps0ezFSPMEX4pXkTzUkrNbRX+36ais2ksGWN0esZL+ZMaFJEneOBHzCgSqle7DHw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/eslint-plugin": "8.13.0",
+        "@typescript-eslint/parser": "8.13.0",
+        "@typescript-eslint/utils": "8.13.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/unbox-primitive": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
diff --git a/package.json b/package.json
index e01c71a..3c5ce22 100644
--- a/package.json
+++ b/package.json
@@ -29,6 +29,7 @@
     "@nextui-org/system": "2.2.6",
     "@nextui-org/tabs": "^2.0.37",
     "@nextui-org/theme": "2.2.11",
+    "@nextui-org/use-infinite-scroll": "^2.1.5",
     "@prisma/client": "^5.22.0",
     "@react-aria/ssr": "3.9.6",
     "@react-aria/visually-hidden": "3.8.17",
@@ -38,14 +39,11 @@
     "autoprefixer": "10.4.20",
     "axios": "^1.7.7",
     "clsx": "2.1.1",
-    "eslint": "^9.13.0",
     "eslint-config-next": "15.0.1",
-    "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-jsx-a11y": "^6.10.2",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^5.2.1",
-    "eslint-plugin-react": "^7.37.2",
     "eslint-plugin-react-hooks": "^5.0.0",
     "eslint-plugin-unused-imports": "^4.1.4",
     "framer-motion": "~11.11.10",
@@ -64,5 +62,15 @@
     "tailwindcss": "3.4.14",
     "typescript": "5.6.3",
     "use-debounce": "^10.0.4"
+  },
+  "devDependencies": {
+    "@eslint/js": "^9.14.0",
+    "@next/eslint-plugin-next": "^15.0.3",
+    "eslint": "^9.14.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-react": "^7.37.2",
+    "globals": "^15.12.0",
+    "turbopack": "^0.0.1",
+    "typescript-eslint": "^8.13.0"
   }
 }
diff --git a/prisma/migrations/20241110205804_fix_prof/migration.sql b/prisma/migrations/20241110205804_fix_prof/migration.sql
new file mode 100644
index 0000000..31faa82
--- /dev/null
+++ b/prisma/migrations/20241110205804_fix_prof/migration.sql
@@ -0,0 +1,11 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `courseReferenceNumber` on the `Faculty` table. All the data in the column will be lost.
+
+*/
+-- DropIndex
+DROP INDEX "Faculty_courseReferenceNumber_key";
+
+-- AlterTable
+ALTER TABLE "Faculty" DROP COLUMN "courseReferenceNumber";
diff --git a/prisma/migrations/20241110210423_fix_prof2/migration.sql b/prisma/migrations/20241110210423_fix_prof2/migration.sql
new file mode 100644
index 0000000..3befbc6
--- /dev/null
+++ b/prisma/migrations/20241110210423_fix_prof2/migration.sql
@@ -0,0 +1,8 @@
+/*
+  Warnings:
+
+  - A unique constraint covering the columns `[bannerId]` on the table `Faculty` will be added. If there are existing duplicate values, this will fail.
+
+*/
+-- CreateIndex
+CREATE UNIQUE INDEX "Faculty_bannerId_key" ON "Faculty"("bannerId");
diff --git a/prisma/migrations/20241111004015_fix_rating/migration.sql b/prisma/migrations/20241111004015_fix_rating/migration.sql
new file mode 100644
index 0000000..6e91ee9
--- /dev/null
+++ b/prisma/migrations/20241111004015_fix_rating/migration.sql
@@ -0,0 +1,16 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `quality` on the `Rating` table. All the data in the column will be lost.
+  - Made the column `userId` on table `Rating` required. This step will fail if there are existing NULL values in that column.
+
+*/
+-- DropForeignKey
+ALTER TABLE "Rating" DROP CONSTRAINT "Rating_userId_fkey";
+
+-- AlterTable
+ALTER TABLE "Rating" DROP COLUMN "quality",
+ALTER COLUMN "userId" SET NOT NULL;
+
+-- AddForeignKey
+ALTER TABLE "Rating" ADD CONSTRAINT "Rating_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index b217798..b0d4148 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -1,6 +1,6 @@
 generator client {
   provider        = "prisma-client-js"
-  previewFeatures = ["fullTextIndex", "fullTextSearch", "relationJoins", "strictUndefinedChecks"]
+  previewFeatures = ["fieldReference", "fullTextIndex", "fullTextSearch", "relationJoins", "strictUndefinedChecks"]
 }
 
 datasource db {
@@ -54,15 +54,14 @@ model Course {
 }
 
 model Faculty {
-  id                    Int      @id @default(autoincrement())
-  bannerId              String
-  courseReferenceNumber String   @unique
-  displayName           String
-  emailAddress          String
-  year                  String
-  avgRating             Float?
-  courses               Course[]
-  Rating                Rating[]
+  id           Int      @id @default(autoincrement())
+  bannerId     String @unique
+  displayName  String
+  emailAddress String
+  year         String
+  avgRating    Float?
+  courses      Course[]
+  Rating       Rating[]
 }
 
 model MeetingsFaculty {
@@ -115,7 +114,6 @@ model Rating {
   courseID      Int
   facultyID     Int
   overallRating Int?
-  quality       Int?
   difficulty    Int?
   takeAgain     Boolean?
   review        String?
@@ -123,8 +121,8 @@ model Rating {
   forCredit     Boolean?
   createdAt     DateTime @default(now())
   updatedAt     DateTime @updatedAt
+  userId        Int
   course        Course   @relation(fields: [courseID], references: [id])
   faculty       Faculty  @relation(fields: [facultyID], references: [id])
-  User          User?    @relation(fields: [userId], references: [id])
-  userId        Int?
+  User          User?   @relation(fields: [userId], references: [id])
 }

From ba82c9c42fb303a6e251afe191b5bccb4a93171e Mon Sep 17 00:00:00 2001
From: Damian <37555910+DCRepublic@users.noreply.github.com>
Date: Sun, 10 Nov 2024 20:16:31 -0500
Subject: [PATCH 2/2] fix build error

---
 app/rating/page.tsx       | 6 +++++-
 components/CourseCard.tsx | 2 +-
 package-lock.json         | 2 +-
 package.json              | 2 +-
 swatscraper               | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/rating/page.tsx b/app/rating/page.tsx
index 02b3256..3fe910f 100644
--- a/app/rating/page.tsx
+++ b/app/rating/page.tsx
@@ -24,7 +24,11 @@ import useSWR from "swr";
 import { useState } from "react";
 import React from "react";
 
-import { Search, Person, Class, Star } from "@Mui/icons-material";
+//import { Search, Person, Class, Star } from "@mui/icons-material";
+import Person from "@mui/icons-material/Person";
+import Class from "@mui/icons-material/Class";
+import Star from "@mui/icons-material/Star";
+
 import Rating from "@mui/material/Rating";
 
 import axios from "axios";
diff --git a/components/CourseCard.tsx b/components/CourseCard.tsx
index 24c7bd4..29665ca 100644
--- a/components/CourseCard.tsx
+++ b/components/CourseCard.tsx
@@ -5,7 +5,7 @@ import { tv } from "tailwind-variants";
 import axios from "axios";
 
 import { generateColorFromName } from "../components/primitives";
-import { Error } from "@Mui/icons-material";
+import { Error } from "@mui/icons-material";
 export const card = tv({
   slots: {
     base: "bg-light_foreground min-h-32 max-h-62 w-[98%] rounded-sm scroll-none drop-shadow-lg transition-colors",
diff --git a/package-lock.json b/package-lock.json
index 1028894..ce77e43 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,7 +14,7 @@
         "@fullcalendar/daygrid": "^6.1.15",
         "@fullcalendar/react": "^6.1.15",
         "@fullcalendar/timegrid": "^6.1.15",
-        "@mui/icons-material": "^6.1.5",
+        "@mui/icons-material": "^6.1.6",
         "@nextui-org/button": "2.0.38",
         "@nextui-org/code": "2.0.33",
         "@nextui-org/input": "2.2.5",
diff --git a/package.json b/package.json
index 3c5ce22..d890b51 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "@fullcalendar/daygrid": "^6.1.15",
     "@fullcalendar/react": "^6.1.15",
     "@fullcalendar/timegrid": "^6.1.15",
-    "@mui/icons-material": "^6.1.5",
+    "@mui/icons-material": "^6.1.6",
     "@nextui-org/button": "2.0.38",
     "@nextui-org/code": "2.0.33",
     "@nextui-org/input": "2.2.5",
diff --git a/swatscraper b/swatscraper
index 6089f91..a08d124 160000
--- a/swatscraper
+++ b/swatscraper
@@ -1 +1 @@
-Subproject commit 6089f9194726570223d8d85018e2a4377925366b
+Subproject commit a08d124dbde1384db998f38939d94744e9ce9173