+
);
diff --git a/frontend/src/components/LoginModal.tsx b/frontend/src/components/LoginModal.tsx
index a55be36..31ad1bf 100644
--- a/frontend/src/components/LoginModal.tsx
+++ b/frontend/src/components/LoginModal.tsx
@@ -2,8 +2,8 @@ import { Fragment } from "react";
import { Dialog, Transition } from "@headlessui/react";
import { useAppDispatch, useAppSelector } from "../app/hooks";
import { uiSlice } from "../app/ui";
-import { loginHandler } from "./Header";
import Link from "./Link";
+import { SignInButton } from "@clerk/nextjs";
export const LoginModal = () => {
const isOpen = useAppSelector((state) => state.ui.session.loginModalOpen);
@@ -76,12 +76,8 @@ export const LoginModal = () => {
diff --git a/frontend/src/components/Page.tsx b/frontend/src/components/Page.tsx
index 43630ed..7e4a172 100644
--- a/frontend/src/components/Page.tsx
+++ b/frontend/src/components/Page.tsx
@@ -7,6 +7,8 @@ import { uiSlice } from "../app/ui";
import { Toaster } from "react-hot-toast";
import { SideNav } from "./SideNav";
import Link from "./Link";
+import { useAuth } from "@clerk/nextjs"
+import { userSlice } from "../app/user";
type Props = {
sidebar?: React.ReactNode;
@@ -21,9 +23,26 @@ export const Page = ({ sidebar, content, activePage }: Props) => {
);
const dispatch = useAppDispatch();
+ const { isLoaded, userId, sessionId, getToken } = useAuth();
+
+ useEffect(() => {
+ if (isLoaded && userId && sessionId) {
+ dispatch(userSlice.actions.logIn());
+ getToken().then((token) => {
+ if (token) {
+ dispatch(userSlice.actions.setToken(token));
+ }
+ }).catch(() => {userSlice.actions.logOut()});
+ } else {
+ dispatch(userSlice.actions.logOut());
+ }
+ }, [isLoaded, userId, sessionId, getToken, dispatch]);
+
useEffect(() => {
if (!loggedIn && !modalShown) {
dispatch(uiSlice.actions.openLoginModal());
+ } else if (loggedIn) {
+ dispatch(uiSlice.actions.closeLoginModal());
}
}, [dispatch, loggedIn, modalShown]);
@@ -39,7 +58,7 @@ export const Page = ({ sidebar, content, activePage }: Props) => {
{sidebar &&
{sidebar}}
{content}
From 557724ef6de4897dce7eb96ef462facb0d6c3772 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxavilien=E2=80=9D?= <“xavilien@gmail.com”>
Date: Sun, 5 May 2024 02:20:08 -0400
Subject: [PATCH 3/9] Fix some errors apparently
---
frontend/src/app/api/course.ts | 8 ++++----
frontend/src/app/api/fce.ts | 4 ++--
frontend/src/app/api/instructors.ts | 2 +-
frontend/src/app/userSchedules.ts | 4 ++++
4 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/frontend/src/app/api/course.ts b/frontend/src/app/api/course.ts
index 06dfbc4..b5cc100 100644
--- a/frontend/src/app/api/course.ts
+++ b/frontend/src/app/api/course.ts
@@ -12,7 +12,7 @@ export const fetchCourseInfos = createAsyncThunk<
const newIds = ids.filter((id) => !(id in state.cache.courseResults));
if (newIds.length === 0) return [];
- const url = `${process.env.backendUrl}/courses?`;
+ const url = `${process.env.backendUrl || ""}/courses?`;
const params = new URLSearchParams(ids.map((id) => ["courseID", id]));
params.set("schedules", "true");
@@ -56,7 +56,7 @@ export const fetchCourseInfosByPage = createAsyncThunk<
>("fetchCourseInfosByPage", async (page: number, thunkAPI) => {
const state = thunkAPI.getState();
- const url = `${process.env.backendUrl}/courses/search?`;
+ const url = `${process.env.backendUrl || ""}/courses/search?`;
const params = new URLSearchParams({
page: `${page}`,
schedules: "true",
@@ -129,7 +129,7 @@ export const fetchCourseInfo = createAsyncThunk<
const state = thunkAPI.getState();
if (courseID in state.cache.courseResults && !schedules) return;
- const url = `${process.env.backendUrl}/course/${courseID}?`;
+ const url = `${process.env.backendUrl || ""}/course/${courseID}?`;
const params = new URLSearchParams({
schedules: schedules ? "true" : "false",
});
@@ -145,7 +145,7 @@ export const fetchAllCourses = createAsyncThunk<
void,
{ state: RootState }
>("fetchAllCourses", async (_, thunkAPI) => {
- const url = `${process.env.backendUrl}/courses/all`;
+ const url = `${process.env.backendUrl || ""}/courses/all`;
const state = thunkAPI.getState();
if (state.cache.allCourses.length > 0) return;
diff --git a/frontend/src/app/api/fce.ts b/frontend/src/app/api/fce.ts
index 2b8c0e6..14e41df 100644
--- a/frontend/src/app/api/fce.ts
+++ b/frontend/src/app/api/fce.ts
@@ -14,7 +14,7 @@ export const fetchFCEInfosByCourse = createAsyncThunk<
const newIds = courseIDs.filter((id) => !(id in state.cache.fces));
if (newIds.length === 0) return;
- const url = `${process.env.backendUrl}/fces?`;
+ const url = `${process.env.backendUrl || ""}/fces?`;
const params = new URLSearchParams();
newIds.forEach((courseID) => params.append("courseID", courseID));
@@ -43,7 +43,7 @@ export const fetchFCEInfosByInstructor = createAsyncThunk<
if (instructor in state.cache.instructorResults) return;
- const url = `${process.env.backendUrl}/fces?`;
+ const url = `${process.env.backendUrl || ""}/fces?`;
const params = new URLSearchParams();
params.append("instructor", instructor);
diff --git a/frontend/src/app/api/instructors.ts b/frontend/src/app/api/instructors.ts
index 5c0d245..f70454e 100644
--- a/frontend/src/app/api/instructors.ts
+++ b/frontend/src/app/api/instructors.ts
@@ -8,7 +8,7 @@ export const fetchAllInstructors = createAsyncThunk<
void,
{ state: RootState }
>("fetchAllInstructors", async (_, thunkAPI) => {
- const url = `${process.env.backendUrl}/instructors`;
+ const url = `${process.env.backendUrl || ""}/instructors`;
const state = thunkAPI.getState();
if (state.cache.allInstructors.length > 0) return;
diff --git a/frontend/src/app/userSchedules.ts b/frontend/src/app/userSchedules.ts
index 3a68b84..78449cc 100644
--- a/frontend/src/app/userSchedules.ts
+++ b/frontend/src/app/userSchedules.ts
@@ -50,6 +50,7 @@ export const userSchedulesSlice = createSlice({
);
},
removeCourseFromActiveSchedule: (state, action: PayloadAction
) => {
+ if (state.active === null) return;
state.saved[state.active].courses = removeFromSet(
state.saved[state.active].courses,
action.payload
@@ -60,18 +61,21 @@ export const userSchedulesSlice = createSlice({
);
},
selectCourseInActiveSchedule: (state, action: PayloadAction) => {
+ if (state.active === null) return;
state.saved[state.active].selected = addToSet(
state.saved[state.active].selected,
action.payload
);
},
deselectCourseInActiveSchedule: (state, action: PayloadAction) => {
+ if (state.active === null) return;
state.saved[state.active].selected = removeFromSet(
state.saved[state.active].selected,
action.payload
);
},
toggleSelectedInActiveSchedule: (state) => {
+ if (state.active === null) return;
if (state.saved[state.active].selected.length > 0) {
state.saved[state.active].selected = [];
} else {
From f782a36e0310bef9409de43b670730c7ac1094bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxavilien=E2=80=9D?= <“xavilien@gmail.com”>
Date: Sun, 5 May 2024 12:35:37 -0400
Subject: [PATCH 4/9] Cleaned up backend
---
backend/src/controllers/user.mts | 24 ++++++------------------
1 file changed, 6 insertions(+), 18 deletions(-)
diff --git a/backend/src/controllers/user.mts b/backend/src/controllers/user.mts
index 009ea55..cf23ade 100644
--- a/backend/src/controllers/user.mts
+++ b/backend/src/controllers/user.mts
@@ -1,30 +1,18 @@
import * as jose from "jose";
-import cron from "node-cron";
import { NextFunction, Request, Response } from "express";
-let JWT_PUBKEY: jose.KeyLike | undefined;
-
-async function fetchLoginKey() {
+const verifyUserToken = async (token: string) => {
const pubkey = process.env.CLERK_PEM_KEY || "";
- JWT_PUBKEY = await jose.importSPKI(pubkey, "RS256");
- return JWT_PUBKEY;
-}
-
-if (!JWT_PUBKEY) fetchLoginKey();
+ const JWT_PUBKEY = await jose.importSPKI(pubkey, "RS256");
-async function getLoginKey(): Promise {
- return JWT_PUBKEY ?? (await fetchLoginKey());
-}
-
-cron.schedule("0 0 * * *", fetchLoginKey);
-
-const verifyUserToken = async (token: string) => {
- const { payload } = await jose.jwtVerify(token, await getLoginKey(), {
+ const { payload } = await jose.jwtVerify(token, JWT_PUBKEY, {
algorithms: ["RS256"]
});
const currentTime = Math.floor(Date.now() / 1000);
+ const BACKEND_ENV = process.env.BACKEND_ENV || "dev";
+ const CLERK_LOGIN_HOST = process.env.CLERK_LOGIN_HOST || "http://localhost:3000";
if (!payload) {
throw "No token present. Did you forget to pass in the token with the API call?";
@@ -32,7 +20,7 @@ const verifyUserToken = async (token: string) => {
throw "Token has expired.";
} else if (payload.nbf && payload.nbf > currentTime) {
throw "Token is not valid yet.";
- } else if (payload.azp && payload.azp !== process.env.CLERK_LOGIN_HOST) {
+ } else if (BACKEND_ENV === "prod" && payload.azp && payload.azp !== CLERK_LOGIN_HOST) {
throw "Token is not valid for this host.";
}
};
From d078acf5b55ec0908425ee184f2cf716920737c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxavilien=E2=80=9D?= <“xavilien@gmail.com”>
Date: Sun, 5 May 2024 12:37:19 -0400
Subject: [PATCH 5/9] Cleaned up backend
---
backend/src/controllers/user.mts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/backend/src/controllers/user.mts b/backend/src/controllers/user.mts
index cf23ade..b666a1a 100644
--- a/backend/src/controllers/user.mts
+++ b/backend/src/controllers/user.mts
@@ -12,7 +12,7 @@ const verifyUserToken = async (token: string) => {
const currentTime = Math.floor(Date.now() / 1000);
const BACKEND_ENV = process.env.BACKEND_ENV || "dev";
- const CLERK_LOGIN_HOST = process.env.CLERK_LOGIN_HOST || "http://localhost:3000";
+ const CLERK_LOGIN_HOST = process.env.CLERK_LOGIN_HOST || "http://localhost:3010";
if (!payload) {
throw "No token present. Did you forget to pass in the token with the API call?";
From ff3b8b3a2643798ac2cd302acf79503008f38e0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxavilien=E2=80=9D?= <“xavilien@gmail.com”>
Date: Sun, 5 May 2024 12:50:52 -0400
Subject: [PATCH 6/9] Removed passlink
---
backend/src/app.ts | 20 --------------------
1 file changed, 20 deletions(-)
diff --git a/backend/src/app.ts b/backend/src/app.ts
index 0d4b1da..b3a3db0 100644
--- a/backend/src/app.ts
+++ b/backend/src/app.ts
@@ -2,28 +2,12 @@ import "dotenv/config";
import morgan from "morgan";
import express, { ErrorRequestHandler } from "express";
import cors from "cors";
-import { generateSigningRequestHandler, KeyStore } from "passlink-server";
import { isUser } from "./controllers/user.mjs";
import { getAllCourses, getCourseByID, getCourses, getFilteredCourses } from "./controllers/courses.mjs";
import { getFCEs } from "./controllers/fces.mjs";
import { getInstructors } from "./controllers/instructors.mjs";
-// because there is a bug in the typing for passlink
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-KeyStore.readKey(process.env.LOGIN_API_KEY);
-
const app = express();
-const signingRequestHandler = generateSigningRequestHandler(
- {
- redirectUrl: "",
- restrictDomain: true,
- applicationId: process.env.LOGIN_API_ID ?? "",
- },
- KeyStore.getSecretKey(),
- true,
-);
-
const port = process.env.PORT || 3000;
app.use(cors());
@@ -32,10 +16,6 @@ app.use(express.urlencoded({ extended: true }));
app.use(express.json());
app.use(morgan("dev"));
-app.get("/signingrequest", (req, res) => {
- signingRequestHandler(req, res);
-});
-
app.route("/course/:courseID").get(getCourseByID);
app.route("/courses").get(getCourses);
app.route("/courses").post(isUser, getCourses);
From aeea93585759f61453ad4f036d89abc1453ef01c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxavilien=E2=80=9D?= <“xavilien@gmail.com”>
Date: Sun, 5 May 2024 12:56:30 -0400
Subject: [PATCH 7/9] Renamed middleware
---
frontend/src/{middleware..ts => middleware.ts} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename frontend/src/{middleware..ts => middleware.ts} (100%)
diff --git a/frontend/src/middleware..ts b/frontend/src/middleware.ts
similarity index 100%
rename from frontend/src/middleware..ts
rename to frontend/src/middleware.ts
From 1ef9dd58b1006f683cbcf00c2e7ba2d34c8a644f Mon Sep 17 00:00:00 2001
From: Xavier Lien
Date: Sun, 5 May 2024 17:10:36 +0000
Subject: [PATCH 8/9] Added codespaces support
---
frontend/next.config.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/frontend/next.config.js b/frontend/next.config.js
index 1d7f237..ce9097c 100644
--- a/frontend/next.config.js
+++ b/frontend/next.config.js
@@ -6,6 +6,7 @@ module.exports = (phase) => {
env: {
backendUrl:
process.env.BACKEND_URL ||
+ process.env.CODESPACES && `https://${process.env.CODESPACE_NAME}-3000.app.github.dev` ||
(phase === PHASE_DEVELOPMENT_SERVER
? "http://localhost:3000"
: "https://course-tool-backend-2kh6wuzobq-uc.a.run.app"),
From 03a4b34b8ee6ffeb82af7768caa71cc47a0feda4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxavilien=E2=80=9D?= <“xavilien@gmail.com”>
Date: Sun, 5 May 2024 14:10:51 -0400
Subject: [PATCH 9/9] Fixed type issues
---
frontend/src/app/cache.ts | 2 +-
frontend/src/app/fce.ts | 4 ++--
frontend/src/app/utils.tsx | 9 +++++++--
frontend/src/components/CourseDetail.tsx | 6 +-----
frontend/src/components/FCETable.tsx | 8 ++++----
frontend/src/components/ScheduleSearch.tsx | 12 ++++++------
frontend/src/components/SearchBar.tsx | 2 +-
frontend/src/components/Toast.tsx | 2 +-
frontend/src/components/filters/CourseFilter.tsx | 4 ++--
frontend/src/pages/course/[courseID].tsx | 2 +-
10 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/frontend/src/app/cache.ts b/frontend/src/app/cache.ts
index f862aa9..0f24b00 100644
--- a/frontend/src/app/cache.ts
+++ b/frontend/src/app/cache.ts
@@ -71,7 +71,7 @@ export const selectCourseResult = (courseID: string) => (state: RootState) =>
export const selectFCEResultsForCourses =
(courseIDs: string[]) => (state: RootState) =>
courseIDs.map((courseID) => {
- if (!state.cache.fces[courseID]) return { courseID, fces: null };
+ if (!state.cache.fces[courseID]) return { courseID, fces: [] };
return { courseID, fces: state.cache.fces[courseID] };
});
diff --git a/frontend/src/app/fce.ts b/frontend/src/app/fce.ts
index 2f72a2a..b3ae4ae 100644
--- a/frontend/src/app/fce.ts
+++ b/frontend/src/app/fce.ts
@@ -94,8 +94,8 @@ export const aggregateCourses = (
courses: Course[],
options: AggregateFCEsOptions
) => {
- const messages = [];
- const unitsMessage = [];
+ const messages : string[] = [];
+ const unitsMessage : string[] = [];
const coursesWithoutFCEs = data
.filter(({ fces }) => fces === null)
diff --git a/frontend/src/app/utils.tsx b/frontend/src/app/utils.tsx
index 84bc190..39c5c2d 100644
--- a/frontend/src/app/utils.tsx
+++ b/frontend/src/app/utils.tsx
@@ -68,7 +68,7 @@ export const sessionToShortString = (sessionInfo: Session | FCE | Schedule) => {
export const compareSessions = (
session1: Session | FCE,
session2: Session | FCE
-) => {
+) : number => {
if (session1.year != session2.year)
return session1.year < session2.year ? 1 : -1;
@@ -88,11 +88,16 @@ export const compareSessions = (
}
if (session1.session !== session2.session) {
+ if (!session1.session) return 1;
+ if (!session2.session) return -1;
+
return sessionNumbers.indexOf(session1.session) <
sessionNumbers.indexOf(session2.session)
? 1
: -1;
}
+
+ return 0;
};
export function filterSessions(sessions: T[]): T[] {
@@ -175,7 +180,7 @@ export function isExactSearch(search: string): boolean {
}
export function getCourseIDs(search: string): string[] {
- return search.match(courseIdRegex);
+ return search.match(courseIdRegex) || [];
}
export function classNames(...classes) {
diff --git a/frontend/src/components/CourseDetail.tsx b/frontend/src/components/CourseDetail.tsx
index f26a69d..e2e900f 100644
--- a/frontend/src/components/CourseDetail.tsx
+++ b/frontend/src/components/CourseDetail.tsx
@@ -20,17 +20,13 @@ const CourseDetail = ({ info, schedules }: Props) => {
void dispatch(fetchFCEInfosByCourse({ courseIDs: [info.courseID] }));
}, [dispatch, info.courseID, loggedIn]);
- let sortedSchedules: Schedule[];
- if (schedules)
- sortedSchedules = filterSessions([...schedules]).sort(compareSessions);
-
const fces = useAppSelector((state) => state.cache.fces[info.courseID]);
return (
{fces && }
- {schedules && }
+ {schedules && }
);
};
diff --git a/frontend/src/components/FCETable.tsx b/frontend/src/components/FCETable.tsx
index 45f386e..3ebee27 100644
--- a/frontend/src/components/FCETable.tsx
+++ b/frontend/src/components/FCETable.tsx
@@ -145,7 +145,7 @@ export const FCETable = ({
columnVisibility: Record;
aggregationOptions: AggregateFCEsOptions;
}) => {
- let aggregateData: AggregatedFCEs;
+ let aggregateData: AggregatedFCEs | undefined = undefined;
let filteredFCEs = fces;
if (fces) {
@@ -160,7 +160,7 @@ export const FCETable = ({
return (
<>
{
- aggregateData.fcesCounted !== 0 && (
+ aggregateData && aggregateData.fcesCounted !== 0 && (
Aggregate Data
@@ -180,7 +180,7 @@ export const FCETable = ({
-
+
{aggregateData.teachingRate}
@@ -193,7 +193,7 @@ export const FCETable = ({
-
+
{aggregateData.courseRate}
diff --git a/frontend/src/components/ScheduleSearch.tsx b/frontend/src/components/ScheduleSearch.tsx
index 42680dc..b8ad909 100644
--- a/frontend/src/components/ScheduleSearch.tsx
+++ b/frontend/src/components/ScheduleSearch.tsx
@@ -31,7 +31,7 @@ const CourseCombobox = ({
onSelectedItemsChange: (items: string[]) => void;
}) => {
const [inputValue, setInputValue] = useState("");
- const listRef = useRef();
+ const listRef = useRef(null);
const dispatch = useAppDispatch();
const allCourses = useAppSelector((state) => state.cache.allCourses);
@@ -70,14 +70,14 @@ const CourseCombobox = ({
selectedItems,
} = useMultipleSelection({
onSelectedItemsChange: ({ selectedItems }) => {
- onSelectedItemsChange(selectedItems.map(({ courseID }) => courseID));
+ onSelectedItemsChange(selectedItems?.map(({ courseID }) => courseID) || []);
},
});
const filteredCourses = getCourses();
const rowVirtualizer = useVirtualizer({
count: filteredCourses.length,
- getScrollElement: () => listRef.current,
+ getScrollElement: () => listRef.current || null,
estimateSize: useCallback(() => 40, []),
});
@@ -99,9 +99,9 @@ const CourseCombobox = ({
selectedItem: null,
inputValue,
defaultHighlightedIndex: 0,
- onInputValueChange: ({ inputValue: newValue }) => setInputValue(newValue),
+ onInputValueChange: ({ inputValue: newValue }) => setInputValue(newValue || ""),
onHighlightedIndexChange: ({ highlightedIndex }) =>
- rowVirtualizer.scrollToIndex(highlightedIndex),
+ rowVirtualizer.scrollToIndex(highlightedIndex || 0),
stateReducer: (state, actionAndChanges) => {
const { changes, type } = actionAndChanges;
switch (type) {
@@ -117,7 +117,7 @@ const CourseCombobox = ({
onStateChange: ({ inputValue, type, selectedItem }) => {
switch (type) {
case useCombobox.stateChangeTypes.InputChange:
- setInputValue(inputValue);
+ setInputValue(inputValue || "");
break;
case useCombobox.stateChangeTypes.InputKeyDownEnter:
case useCombobox.stateChangeTypes.ItemClick:
diff --git a/frontend/src/components/SearchBar.tsx b/frontend/src/components/SearchBar.tsx
index 2177954..f701133 100644
--- a/frontend/src/components/SearchBar.tsx
+++ b/frontend/src/components/SearchBar.tsx
@@ -42,7 +42,7 @@ const AppliedFiltersPill = ({
const AppliedFilters = () => {
const dispatch = useAppDispatch();
- const badges = [];
+ const badges : JSX.Element[] = [];
const filter = useAppSelector((state) => state.filters);
if (filter.departments.active) {
diff --git a/frontend/src/components/Toast.tsx b/frontend/src/components/Toast.tsx
index d9a2a10..ba94bce 100644
--- a/frontend/src/components/Toast.tsx
+++ b/frontend/src/components/Toast.tsx
@@ -9,7 +9,7 @@ type Props = {
};
export const Toast = (t: ToastType, { message, title, icon }: Props) => {
- const Icon = icon;
+ const Icon = icon || (() => );
return (
{
const filteredCourses = useAppSelector((state) => state.user.fceAggregation.filters.courses);
const fces = useAppSelector(selectFCEResultsForInstructor(name));
- const courses = getUnique(fces?.map((fce) => fce.courseID).sort());
+ const courses = getUnique(fces?.map((fce) => fce.courseID).sort() || []);
useEffect(() => {
dispatch(userSlice.actions.setFilters({ type: "courses",
- courses: getUnique(fces?.map((fce) => fce.courseID).sort()), instructors: [] }));
+ courses: getUnique(fces?.map((fce) => fce.courseID).sort() || []), instructors: [] }));
}, [fces, dispatch]);
const setCourses = (courses: string[]) => {
diff --git a/frontend/src/pages/course/[courseID].tsx b/frontend/src/pages/course/[courseID].tsx
index 0c209bd..2eec5cd 100644
--- a/frontend/src/pages/course/[courseID].tsx
+++ b/frontend/src/pages/course/[courseID].tsx
@@ -29,7 +29,7 @@ const CourseDetailPage: NextPage = () => {
);
if (info) {
- content = ;
+ content = ;
}
return (