feat: Course, Class, CourseDrawer, ClassDrawer

asuc-octo · Jul 15, 2024 · 6fb2209 · 6fb2209
1 parent e1d99e3
commit 6fb2209
Show file tree

Hide file tree

Showing 36 changed files with 881 additions and 714 deletions.
diff --git a/backend/src/bootstrap/loaders/express.ts b/backend/src/bootstrap/loaders/express.ts
@@ -9,7 +9,11 @@ import { RedisClientType } from "redis";
 import passportLoader from "./passport";
 import { config } from "../../config";
 
-export default async (app: Application, server: ApolloServer, redis: RedisClientType) => {
+export default async (
+  app: Application,
+  server: ApolloServer,
+  redis: RedisClientType
+) => {
   app.use(compression());
 
   // Body parser only needed during POST on the graphQL path
@@ -19,7 +23,7 @@ export default async (app: Application, server: ApolloServer, redis: RedisClient
   app.use(
     cors({
       // Allow requests from the local frontend (should be the only requirement)
-      origin: [config.url, "http://localhost:3000"],
+      origin: [config.url, "http://localhost:8080", "http://localhost:5173"],
       credentials: true,
     })
   );

diff --git a/frontend/package.json b/frontend/package.json
@@ -20,6 +20,7 @@
 		"@radix-ui/react-scroll-area": "^1.1.0",
 		"@radix-ui/react-select": "^2.1.1",
 		"@radix-ui/react-separator": "^1.1.0",
+		"@radix-ui/react-tabs": "^1.1.0",
 		"@radix-ui/react-tooltip": "^1.1.2",
 		"@shopify/draggable": "^1.1.3",
 		"@tanstack/react-virtual": "^3.8.2",

diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
@@ -1,5 +1,6 @@
 import { lazy } from "react";
 
+import { ApolloClient, ApolloProvider, InMemoryCache } from "@apollo/client";
 import * as Tooltip from "@radix-ui/react-tooltip";
 import { IconoirProvider } from "iconoir-react";
 import { RouterProvider, createBrowserRouter } from "react-router-dom";
@@ -11,10 +12,10 @@ import Landing from "@/app/Landing";
 import Layout from "@/components/Layout";
 
 const About = lazy(() => import("@/app/About"));
-const CatalogEnrollment = lazy(() => import("@/app/Catalog/Class/Enrollment"));
-const CatalogGrades = lazy(() => import("@/app/Catalog/Class/Grades"));
-const CatalogOverview = lazy(() => import("@/app/Catalog/Class/Overview"));
-const CatalogSections = lazy(() => import("@/app/Catalog/Class/Sections"));
+const CatalogEnrollment = lazy(() => import("@/components/Class/Enrollment"));
+const CatalogGrades = lazy(() => import("@/components/Class/Grades"));
+const CatalogOverview = lazy(() => import("@/components/Class/Overview"));
+const CatalogSections = lazy(() => import("@/components/Class/Sections"));
 const Discover = lazy(() => import("@/app/Discover"));
 const Plan = lazy(() => import("@/app/Plan"));
 const Schedule = lazy(() => import("@/app/Schedule"));
@@ -119,18 +120,25 @@ const router = createBrowserRouter([
   },
 ]);
 
+const client = new ApolloClient({
+  uri: "http://192.168.86.21:8080/api/graphql",
+  cache: new InMemoryCache(),
+});
+
 export default function App() {
   return (
-    <IconoirProvider
-      iconProps={{
-        strokeWidth: 2,
-        width: 16,
-        height: 16,
-      }}
-    >
-      <Tooltip.Provider delayDuration={0}>
-        <RouterProvider router={router} />
-      </Tooltip.Provider>
-    </IconoirProvider>
+    <ApolloProvider client={client}>
+      <IconoirProvider
+        iconProps={{
+          strokeWidth: 2,
+          width: 16,
+          height: 16,
+        }}
+      >
+        <Tooltip.Provider delayDuration={0}>
+          <RouterProvider router={router} />
+        </Tooltip.Provider>
+      </IconoirProvider>
+    </ApolloProvider>
   );
 }