cleanup

sipb · Jan 7, 2025 · 0883f0b · 0883f0b
1 parent c8ba07b
commit 0883f0b
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 24 deletions.
diff --git a/src/components/Auth.tsx b/src/components/Auth.tsx
@@ -73,7 +73,6 @@ const Auth: Component<{
 	conflict: (conflictInfo: Conflict) => void;
 	resolveConflict: () => void;
 }> = (props) => {
-	const finalProps = mergeProps({ conflictInfo: {} }, props);
 	const [
 		store,
 		{

diff --git a/src/components/Road.tsx b/src/components/Road.tsx
@@ -8,7 +8,6 @@ import Semester from "~/components/Semester";
 import { Accordion } from "~/components/ui/accordion";
 import { IconButton } from "~/components/ui/icon-button";
 
-import { useCourseDataContext } from "~/context/create";
 import type { SimplifiedSelectedSubjects } from "~/context/types";
 
 const Road: Component<{
@@ -50,13 +49,13 @@ const Road: Component<{
 	return (
 		<Accordion.RootProvider lazyMount unmountOnExit value={accordion}>
 			<Index each={[...Array(numSems()).keys()]}>
-				{(item) => (
+				{(index) => (
 					<Semester
-						index={item()}
+						index={index()}
 						selectedSubjects={props.selectedSubjects}
-						semesterSubjects={props.selectedSubjects[item()]}
+						semesterSubjects={props.selectedSubjects[index()]}
 						roadID={props.roadID}
-						isOpen={visibleList().includes(`${item()}`)}
+						isOpen={visibleList().includes(index().toString())}
 					/>
 				)}
 			</Index>

diff --git a/src/components/Semester.tsx b/src/components/Semester.tsx
@@ -19,7 +19,7 @@ const Semester: Component<{
 	const [store, { getUserYear }] = useCourseDataContext();
 
 	const baseYear = createMemo(() => {
-		const today = new Date(Date.now());
+		const today = new Date();
 		const currentYear = today.getFullYear();
 		const baseYear = today.getMonth() >= 5 ? currentYear + 1 : currentYear;
 		return baseYear - getUserYear();
@@ -31,7 +31,7 @@ const Semester: Component<{
 			"Junior",
 			"Senior",
 			"Fifth Year",
-		];
+		] as const;
 		if (props.index === 0) {
 			return "";
 		}
@@ -46,24 +46,29 @@ const Semester: Component<{
 	const semesterType = createMemo(() => {
 		return props.index === 0
 			? "Prior Credit"
-			: ["Fall", "IAP", "Spring"][(props.index - 1) % 3];
+			: (["Fall", "IAP", "Spring"] as const)[(props.index - 1) % 3];
+	});
+	const semesterYearRendered = createMemo(() => {
+		return props.index > 0 && semesterYear()
+			? `'${semesterYear().toString().substring(2)}`
+			: "";
 	});
 
 	return (
-		<Show when={!store.hideIAP || semesterType() !== "IAP"}>
-			<Accordion.Item value={props.index.toString()}>
-				<Accordion.ItemTrigger>
-					{semesterYearName()} {semesterType()}{" "}
-					{props.index > 0 ? `'${semesterYear().toString().substring(2)}` : ""}
-					<Accordion.ItemIndicator>
-						<ChevronDownIcon />
-					</Accordion.ItemIndicator>
-				</Accordion.ItemTrigger>
-				<Accordion.ItemContent>
-					Showing semester {props.index} for {props.roadID}
-				</Accordion.ItemContent>
-			</Accordion.Item>
-		</Show>
+		<Accordion.Item
+			value={props.index.toString()}
+			hidden={store.hideIAP && semesterType() === "IAP"}
+		>
+			<Accordion.ItemTrigger>
+				{semesterYearName()} {semesterType()} {semesterYearRendered()}
+				<Accordion.ItemIndicator>
+					<ChevronDownIcon />
+				</Accordion.ItemIndicator>
+			</Accordion.ItemTrigger>
+			<Accordion.ItemContent>
+				Showing semester {props.index} for {props.roadID}
+			</Accordion.ItemContent>
+		</Accordion.Item>
 	);
 };
 

diff --git a/src/components/layout/SidebarDrawer.tsx b/src/components/layout/SidebarDrawer.tsx
@@ -22,7 +22,7 @@ const SidebarDialog: ParentComponent<Drawer.RootProps> = (props) => {
 			<Drawer.Positioner>
 				<Drawer.Content>
 					<Drawer.Header>
-						<Drawer.Title>Courseroad</Drawer.Title>
+						<Drawer.Title>CourseRoad</Drawer.Title>
 						<Drawer.Description>
 							<SidebarWarningText />
 						</Drawer.Description>