Skip to content

Commit 6518ef4

Browse files
Austin-Xgithub-actions[bot]
Austin-X
authored and
github-actions[bot]
committed
Auto-formatted the code using Prettier
1 parent 0ddb8a6 commit 6518ef4

File tree

4 files changed

+64
-40
lines changed

4 files changed

+64
-40
lines changed

‎course-matrix/frontend/src/components/ui/badge.tsx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import * as React from "react"
2-
import { cva, type VariantProps } from "class-variance-authority"
1+
import * as React from "react";
2+
import { cva, type VariantProps } from "class-variance-authority";
33

4-
import { cn } from "@/lib/utils"
4+
import { cn } from "@/lib/utils";
55

66
const badgeVariants = cva(
77
"inline-flex items-center rounded-full border px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2",
@@ -20,8 +20,8 @@ const badgeVariants = cva(
2020
defaultVariants: {
2121
variant: "default",
2222
},
23-
}
24-
)
23+
},
24+
);
2525

2626
export interface BadgeProps
2727
extends React.HTMLAttributes<HTMLDivElement>,
@@ -30,7 +30,7 @@ export interface BadgeProps
3030
function Badge({ className, variant, ...props }: BadgeProps) {
3131
return (
3232
<div className={cn(badgeVariants({ variant }), className)} {...props} />
33-
)
33+
);
3434
}
3535

36-
export { Badge, badgeVariants }
36+
export { Badge, badgeVariants };

‎course-matrix/frontend/src/pages/Compare/CompareTimetables.tsx‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,13 @@ export const CompareTimetables = () => {
172172
</SelectTrigger>
173173
</FormControl>
174174
<SelectContent>
175-
{allTimetables && allTimetables.map((timetable) => <TimetableCompareItem key={`timetable1/${timetable.id}/${timetable.user_id}`} timetable={timetable} />)}
175+
{allTimetables &&
176+
allTimetables.map((timetable) => (
177+
<TimetableCompareItem
178+
key={`timetable1/${timetable.id}/${timetable.user_id}`}
179+
timetable={timetable}
180+
/>
181+
))}
176182
</SelectContent>
177183
</Select>
178184
<FormMessage />
@@ -202,7 +208,13 @@ export const CompareTimetables = () => {
202208
</SelectTrigger>
203209
</FormControl>
204210
<SelectContent>
205-
{allTimetables && allTimetables.map((timetable) => <TimetableCompareItem key={`timetable2/${timetable.id}/${timetable.user_id}`} timetable={timetable} />)}
211+
{allTimetables &&
212+
allTimetables.map((timetable) => (
213+
<TimetableCompareItem
214+
key={`timetable2/${timetable.id}/${timetable.user_id}`}
215+
timetable={timetable}
216+
/>
217+
))}
206218
</SelectContent>
207219
</Select>
208220
<FormMessage />

‎course-matrix/frontend/src/pages/Home/TimetableCompareButton.tsx‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,12 @@ export const TimetableCompareButton = ({
115115
</SelectTrigger>
116116
</FormControl>
117117
<SelectContent>
118-
{timetables.map((timetable) => <TimetableCompareItem key={`timetable1/${timetable.id}/${timetable.user_id}`} timetable={timetable} />)}
118+
{timetables.map((timetable) => (
119+
<TimetableCompareItem
120+
key={`timetable1/${timetable.id}/${timetable.user_id}`}
121+
timetable={timetable}
122+
/>
123+
))}
119124
</SelectContent>
120125
</Select>
121126
<FormMessage />
@@ -136,7 +141,12 @@ export const TimetableCompareButton = ({
136141
</SelectTrigger>
137142
</FormControl>
138143
<SelectContent>
139-
{timetables.map((timetable) => <TimetableCompareItem key={`timetable2/${timetable.id}/${timetable.user_id}`} timetable={timetable} /> )}
144+
{timetables.map((timetable) => (
145+
<TimetableCompareItem
146+
key={`timetable2/${timetable.id}/${timetable.user_id}`}
147+
timetable={timetable}
148+
/>
149+
))}
140150
</SelectContent>
141151
</Select>
142152
<FormMessage />

‎course-matrix/frontend/src/pages/Home/TimetableCompareItem.tsx‎

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,42 @@
11
import { SemesterIcon } from "@/components/semester-icon";
22
import { SelectItem } from "@/components/ui/select";
33
import { Timetable } from "@/utils/type-utils";
4-
import { Badge } from "@/components/ui/badge"
4+
import { Badge } from "@/components/ui/badge";
55
import { useGetUsernameFromUserIdQuery } from "@/api/authApiSlice";
66
import { useEffect, useState } from "react";
77

88
interface TimetableCompareItemProps {
9-
timetable: Timetable;
10-
}
9+
timetable: Timetable;
10+
}
1111

12-
const TimetableCompareItem = ({
13-
timetable,
14-
}: TimetableCompareItemProps) => {
15-
const { data: usernameData } = useGetUsernameFromUserIdQuery(timetable.user_id);
16-
const [username, setUsername] = useState<string | null>("");
17-
const [loadedUsername, setLoadedUsername] = useState(false);
12+
const TimetableCompareItem = ({ timetable }: TimetableCompareItemProps) => {
13+
const { data: usernameData } = useGetUsernameFromUserIdQuery(
14+
timetable.user_id,
15+
);
16+
const [username, setUsername] = useState<string | null>("");
17+
const [loadedUsername, setLoadedUsername] = useState(false);
1818

19-
useEffect(() => {
20-
if (usernameData !== undefined && !loadedUsername) {
21-
setUsername(usernameData ?? "John Doe");
22-
setLoadedUsername(true);
23-
}
24-
}, [loadedUsername, usernameData]);
19+
useEffect(() => {
20+
if (usernameData !== undefined && !loadedUsername) {
21+
setUsername(usernameData ?? "John Doe");
22+
setLoadedUsername(true);
23+
}
24+
}, [loadedUsername, usernameData]);
2525

26-
return <SelectItem key={`timetable2/${timetable.id}/${timetable.user_id}`} value={`timetable2/${timetable.id}/${timetable.user_id}`}>
27-
<div className="flex flex-row justify-between gap-2">
28-
<span className="flex items-center gap-2">
29-
<SemesterIcon
30-
semester={timetable.semester}
31-
size={18}
32-
/>
33-
<span>{timetable.timetable_title}</span>
34-
</span>
35-
<Badge variant="secondary">Owner: {username}</Badge>
36-
</div>
37-
</SelectItem>
38-
}
26+
return (
27+
<SelectItem
28+
key={`timetable2/${timetable.id}/${timetable.user_id}`}
29+
value={`timetable2/${timetable.id}/${timetable.user_id}`}
30+
>
31+
<div className="flex flex-row justify-between gap-2">
32+
<span className="flex items-center gap-2">
33+
<SemesterIcon semester={timetable.semester} size={18} />
34+
<span>{timetable.timetable_title}</span>
35+
</span>
36+
<Badge variant="secondary">Owner: {username}</Badge>
37+
</div>
38+
</SelectItem>
39+
);
40+
};
3941

40-
export default TimetableCompareItem;
42+
export default TimetableCompareItem;

0 commit comments

Comments
 (0)