wip

4 files changed, 35 insertions, 27 deletions

diff --git a/frontend/app/.server/auth.ts b/frontend/app/.server/auth.ts
index d56c193..3e24638 100644
--- a/frontend/app/.server/auth.ts
+++ b/frontend/app/.server/auth.ts
@@ -1,4 +1,4 @@
-import { jwtDecode, type JwtPayload } from "jwt-decode";
+import { type JwtPayload, jwtDecode } from "jwt-decode";
 import { redirect } from "react-router";
 import { Authenticator } from "remix-auth";
 import { FormStrategy } from "remix-auth-form";
diff --git a/frontend/app/components/GolfPlayApp.tsx b/frontend/app/components/GolfPlayApp.tsx
index 9ba3818..e74edc7 100644
--- a/frontend/app/components/GolfPlayApp.tsx
+++ b/frontend/app/components/GolfPlayApp.tsx
@@ -68,7 +68,7 @@ export default function GolfPlayApp({ game, player, initialGameState }: Props) {
 			console.log("player:c2s:submit");
 			handleSubmitCodePre();
 			await apiClient.postGamePlaySubmit(game.game_id, code);
-			await new Promise((resolve) => setTimeout(resolve, 2000));
+			await new Promise((resolve) => setTimeout(resolve, 1000));
 			handleSubmitCodePost();
 		},
 		1000,
diff --git a/frontend/app/routes/golf.$gameId.play.tsx b/frontend/app/routes/golf.$gameId.play.tsx
index 8f41257..d9907aa 100644
--- a/frontend/app/routes/golf.$gameId.play.tsx
+++ b/frontend/app/routes/golf.$gameId.play.tsx
@@ -1,7 +1,7 @@
 import { Provider as JotaiProvider, createStore } from "jotai";
 import { useMemo } from "react";
 import type { LoaderFunctionArgs, MetaFunction } from "react-router";
-import { useLoaderData } from "react-router";
+import { redirect, useLoaderData } from "react-router";
 import { ensureUserLoggedIn } from "../.server/auth";
 import { ApiClientContext, createApiClient } from "../api/client";
 import GolfPlayApp from "../components/GolfPlayApp";
@@ -20,17 +20,21 @@ export async function loader({ params, request }: LoaderFunctionArgs) {
 
 	const gameId = Number(params.gameId);
 
-	const [{ game }, { state: gameState }] = await Promise.all([
-		apiClient.getGame(gameId),
-		apiClient.getGamePlayLatestState(gameId),
-	]);
-
-	return {
-		apiToken: token,
-		game,
-		player: user,
-		gameState,
-	};
+	try {
+		const [{ game }, { state: gameState }] = await Promise.all([
+			apiClient.getGame(gameId),
+			apiClient.getGamePlayLatestState(gameId),
+		]);
+
+		return {
+			apiToken: token,
+			game,
+			player: user,
+			gameState,
+		};
+	} catch {
+		throw redirect("/dashboard");
+	}
 }
 
 export default function GolfPlay() {
diff --git a/frontend/app/routes/golf.$gameId.watch.tsx b/frontend/app/routes/golf.$gameId.watch.tsx
index 07e8c9e..556eb03 100644
--- a/frontend/app/routes/golf.$gameId.watch.tsx
+++ b/frontend/app/routes/golf.$gameId.watch.tsx
@@ -1,7 +1,7 @@
 import { Provider as JotaiProvider, createStore } from "jotai";
 import { useMemo } from "react";
 import type { LoaderFunctionArgs, MetaFunction } from "react-router";
-import { useLoaderData } from "react-router";
+import { redirect, useLoaderData } from "react-router";
 import { ensureUserLoggedIn } from "../.server/auth";
 import { ApiClientContext, createApiClient } from "../api/client";
 import GolfWatchApp from "../components/GolfWatchApp";
@@ -20,18 +20,22 @@ export async function loader({ params, request }: LoaderFunctionArgs) {
 
 	const gameId = Number(params.gameId);
 
-	const [{ game }, { ranking }, { states: gameStates }] = await Promise.all([
-		await apiClient.getGame(gameId),
-		await apiClient.getGameWatchRanking(gameId),
-		await apiClient.getGameWatchLatestStates(gameId),
-	]);
-
-	return {
-		apiToken: token,
-		game,
-		ranking,
-		gameStates,
-	};
+	try {
+		const [{ game }, { ranking }, { states: gameStates }] = await Promise.all([
+			await apiClient.getGame(gameId),
+			await apiClient.getGameWatchRanking(gameId),
+			await apiClient.getGameWatchLatestStates(gameId),
+		]);
+
+		return {
+			apiToken: token,
+			game,
+			ranking,
+			gameStates,
+		};
+	} catch {
+		throw redirect("/dashboard");
+	}
 }
 
 export default function GolfWatch() {