Merge branch 'main' into leaderboard

Decatur-Robotics · Jan 3, 2025 · f6db438 · f6db438
2 parents ccc5074 + df0800c
commit f6db438
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 17 deletions.
diff --git a/components/Avatar.tsx b/components/Avatar.tsx
@@ -11,6 +11,7 @@ export default function Avatar(props: {
 	onClick?: () => void | undefined;
 	className?: string | undefined;
 	online?: boolean;
+	gearSize?: number;
 }) {
 	const { session, status } = useCurrentSession();
 	const user = props.user ?? session?.user;
@@ -38,7 +39,7 @@ export default function Avatar(props: {
 			</div>
 			{admin ? (
 				<div className="absolute z-10 -bottom-2 -left-2 text-slate-300 animate-spin-slow">
-					<BsGearFill size={36} />
+					<BsGearFill size={props.gearSize ?? 36}></BsGearFill>
 				</div>
 			) : (
 				<></>

diff --git a/components/Container.tsx b/components/Container.tsx
@@ -226,6 +226,7 @@ export default function Container(props: ContainerProps) {
 										imgHeightOverride="h-11"
 										showLevel={false}
 										borderThickness={2}
+										gearSize={24}
 									/>
 								</Link>
 							) : (

diff --git a/components/XpProgressBar.tsx b/components/XpProgressBar.tsx
@@ -12,21 +12,44 @@ export default function XpProgressBar({
 	const [hovered, setHovered] = useState(false);
 
 	return (
-		<div
-			className={`radial-progress text-accent m-2 text-${hovered ? "xs" : "sm"}`}
-			style={
-				{
-					"--value": (user.xp / xpRequiredForNextLevel(user.level)) * 100,
-					"--size": size,
-				} as any
-			}
-			role="progressbar"
-			onMouseEnter={() => setHovered(true)}
-			onMouseLeave={() => setHovered(false)}
-		>
-			{hovered
-				? `${user.xp}/${xpRequiredForNextLevel(user.level)}`
-				: `Lvl ${user.level}`}
+		<div className="text-accent m-2">
+			{/* Desktop layout */}
+			<div
+				className={`max-sm:hidden radial-progress text-${hovered ? "xs" : "sm"}`}
+				style={
+					{
+						"--value":
+							((user.xp - xpRequiredForNextLevel(user.level - 1)) /
+								(xpRequiredForNextLevel(user.level) -
+									xpRequiredForNextLevel(user.level - 1))) *
+							100,
+						"--size": size,
+					} as any
+				}
+				role="progressbar"
+				onMouseEnter={() => setHovered(true)}
+				onMouseLeave={() => setHovered(false)}
+			>
+				{hovered
+					? `${user.xp}/${xpRequiredForNextLevel(user.level)}`
+					: `Lvl ${user.level}`}
+			</div>
+			{/* Desktop layout */}
+			<div className="sm:hidden">
+				<div className="divider" />
+				<div>
+					Level {user.level} - XP: {user.xp}/
+					{xpRequiredForNextLevel(user.level)}
+				</div>
+				<progress
+					className="progress progress-accent"
+					value={user.xp - xpRequiredForNextLevel(user.level - 1)}
+					max={
+						xpRequiredForNextLevel(user.level) -
+						xpRequiredForNextLevel(user.level - 1)
+					}
+				/>
+			</div>
 		</div>
 	);
 }
diff --git a/components/competition/MatchScheduleCard.tsx b/components/competition/MatchScheduleCard.tsx
@@ -230,6 +230,7 @@ export default function MatchScheduleCard(props: {
 																		showLevel={false}
 																		borderThickness={2}
 																		onClick={() => remindUserOnSlack(user._id!)}
+																		gearSize={25}
 																	/>
 																) : (
 																	<div className="w-12 h-12"></div>

diff --git a/lib/Xp.ts b/lib/Xp.ts
@@ -9,7 +9,7 @@ export function levelToXp(level: number) {
 }
 
 export function xpRequiredForNextLevel(level: number) {
-	return levelToXp(level + 1);
+	return Math.max(levelToXp(level + 1), 0);
 }
 
 export function levelToClassName(level: number | undefined) {