Leaderboard now compatible with v2 API

malee31 · Dec 9, 2024 · 52e4cc1 · 52e4cc1
1 parent 42c46c6
commit 52e4cc1
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/components/pages/Leaderboard.js b/components/pages/Leaderboard.js
@@ -59,7 +59,15 @@ export default function Leaderboard({ navigation }) {
 
 	useEffect(() => {
 		const update = () => {
-			getLeaderboard().then(setLeaderboardData);
+			getLeaderboard()
+				.then(rawLeaderboard => {
+					setLeaderboardData(rawLeaderboard.map(entry => {
+						entry.name = `${entry.first_name} ${entry.last_name}`;
+						entry.signedIn = entry.session && !entry.session.endTime;
+
+						return entry;
+					}))
+				});
 		};
 
 		update();

diff --git a/components/parts/StyledParts/LeaderboardEntry.js b/components/parts/StyledParts/LeaderboardEntry.js
@@ -37,8 +37,10 @@ function formatTime(totalTime) {
 }
 
 export default function LeaderboardEntry({ entry }) {
-	const name = `${entry.first_name} ${entry.last_name}`;
-	const signedIn = entry.session && !entry.session.endTime;
+	const name = entry.name;
+	const signedIn = entry.signedIn;
+	const timeIn = signedIn ? (Date.now() - entry.session.startTime) / 1000 : 0;
+	const timeTotal = entry.total_sessions / 1000 + timeIn;
 
 	return (
 		<View style={leaderboardEntryStyles.member}>
@@ -54,9 +56,14 @@ export default function LeaderboardEntry({ entry }) {
 					{name}
 				</Text>
 				<Text>
-					Total: {formatTime(entry.totalTime / 1000)}{signedIn && ` (+${formatTime(entry.timeIn / 1000)})`}
+					{signedIn ? (
+						`[Signed In: ${formatTime(timeIn)}] `
+					) : (
+						"[Signed Out] "
+					)}
+					Total: {formatTime(timeTotal)}
 				</Text>
 			</View>
 		</View>
 	);
-}
+}