Merge branch 'main' into feature/best-run-tooltip

therungg · Nov 8, 2023 · 7d12a7e · 7d12a7e
2 parents d20f196 + ae22a7f
commit 7d12a7e
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 13 deletions.
diff --git a/app/games/[game]/page.tsx b/app/games/[game]/page.tsx
@@ -28,6 +28,7 @@ export default async function GamePage({ params }: PageProps) {
                 the upload is not processed yet. If you have uploaded runs for
                 the game, but this page still shows, please{" "}
                 <a href={"/contact"}>contact me!</a>
+                {JSON.stringify(data)}
             </>
         );
     }

diff --git a/app/tournaments/[tournament]/combined-tournament-seeding-table.tsx b/app/tournaments/[tournament]/combined-tournament-seeding-table.tsx
@@ -130,6 +130,9 @@ export const CombinedTournamentSeedingTable = ({
                                 );
                                 return (
                                     <td
+                                        title={`${run?.differenceToFirst.toFixed(
+                                            2
+                                        )}%`}
                                         key={
                                             leaderboard.username +
                                             tournament.game

diff --git a/app/tournaments/[tournament]/is-live-data-eligible-for-tournament.component.ts b/app/tournaments/[tournament]/is-live-data-eligible-for-tournament.component.ts
@@ -16,8 +16,9 @@ export const isLiveDataEligibleForTournament = (
                 equalsCaseInsensitive(run.category, data.category)
             );
         })
-    )
+    ) {
         return false;
+    }
 
     if (
         tournament.ineligibleUsers &&
@@ -38,7 +39,7 @@ export const isLiveDataEligibleForTournaments = (
     data: LiveRun,
     tournaments: Tournament[]
 ): boolean => {
-    return !!tournaments
-        .map((tournament) => isLiveDataEligibleForTournament(tournament, data))
-        .find((bool) => bool);
+    return tournaments
+        .map((tournament) => isLiveDataEligibleForTournament(data, tournament))
+        .includes(true);
 };
diff --git a/app/tournaments/all-tournaments.tsx b/app/tournaments/all-tournaments.tsx
@@ -13,15 +13,17 @@ export function AllTournaments({
 }: AllTournamentsProps) {
     return (
         <div>
-            <h1>Ongoing tournaments</h1>
+            <h1>Tournaments</h1>
+
+            <h2>Ongoing tournaments</h2>
 
             <ListTournaments tournaments={ongoingTournaments} />
 
-            <h1>Upcoming tournaments</h1>
+            <h2>Upcoming tournaments</h2>
 
             <ListTournaments tournaments={upcomingTournaments} />
 
-            <h1>Finished tournaments</h1>
+            <h2>Finished tournaments</h2>
 
             <ListTournaments tournaments={finishedTournaments} />
         </div>
@@ -34,7 +36,7 @@ export const ListTournaments = ({
     tournaments: Tournament[];
 }) => {
     return (
-        <Row>
+        <Row className={"g-3 mb-5"}>
             {tournaments.map((tournament: Tournament) => {
                 const startDate = new Date(tournament.startDate);
                 const endDate = new Date(tournament.endDate);
@@ -46,7 +48,7 @@ export const ListTournaments = ({
                 return (
                     <Col sm={12} lg={6} key={tournament.name}>
                         {tournament.logoUrl && (
-                            <div className="float-start d-flex d-none d-sm-block align-items-center me-2 ms-2">
+                            <div className="float-start d-flex d-none d-sm-block align-items-center me-2">
                                 <a
                                     href={`/tournaments/${safeEncodeURI(
                                         tournament.name

diff --git a/app/tournaments/tournament-list.ts b/app/tournaments/tournament-list.ts
@@ -17,14 +17,13 @@ const tournamentEntries: Array<[string, TournamentEntryValue]> = [
         { tournament: "Defeat Ganon No SRM Community Clash Main Event" },
     ],
     ["dirtythirty", { tournament: "Dirty Thirty Sapphire Tourney 2" }],
-    ["gsa", { tournament: "SWRC Season 3: Super Mario Sunshine" }],
+    ["gsa", { tournament: "PACE MK8" }],
     ["hgss", { tournament: "HGSS Blitz" }],
     ["lego", { tournament: "Lego Challenge 3" }],
     [
         "moist",
         {
-            tournament:
-                "The Elder Scrolls Adventures: Redguard Speedrun Challenge",
+            tournament: "Escape from Lavender Island",
         },
     ],
     ["saesr", { tournament: "NCW Seeding" }],
@@ -41,6 +40,8 @@ const tournamentEntries: Array<[string, TournamentEntryValue]> = [
     ["basementcup", { tournament: "Ultimate Basement Cup 2023" }],
     ["tcs", { tournament: "TCS Community BTR" }],
     ["nitro_cup", { tournament: "Nitro Cup" }],
+    ["nitro_tournament", { tournament: "Nitro Tournament 4" }],
+    ["knuckles", { tournament: "Knuckles Story Eclipse the Record" }],
     [
         "3dmm",
         {

diff --git a/public/Nitro_Tournament.png b/public/Nitro_Tournament.png
diff --git a/src/components/game/get-game.ts b/src/components/game/get-game.ts
@@ -22,6 +22,10 @@ export const getGame = async (game: string) => {
         return getGame(game.replace(" ", "+"));
     }
 
+    if (!gameData.data) {
+        return gameData;
+    }
+
     return { ...gameData, global: { ...globalGameData } };
 };
 

diff --git a/src/components/run/user-detail/user-overview.tsx b/src/components/run/user-detail/user-overview.tsx
@@ -93,6 +93,7 @@ export const UserOverview = ({
                 return (
                     <div
                         key={n}
+                        className="clearfix"
                         style={{
                             marginLeft:
                                 sameGame && globalData && images.length > 0

diff --git a/src/components/topbar.tsx b/src/components/topbar.tsx
@@ -87,7 +87,7 @@ const Topbar = ({
                             <b>Live</b>
                         </Nav.Link>
                         <Nav.Link href="/games/">Games</Nav.Link>
-                        <Nav.Link href="/3dmm/">3D Mario Madness</Nav.Link>
+                        <Nav.Link href="/gsa/">PACE LTA</Nav.Link>
                         <Nav.Link href="/patron">
                             Support <PatreonBunnySvgWithoutLink />
                         </Nav.Link>