From 8c7d882dfa67bcef37a4f39be6f1ca57f160b816 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Mon, 12 Aug 2024 00:32:06 +0900 Subject: feat(frontend): improve play page styling --- frontend/app/routes/_index.tsx | 2 +- frontend/app/routes/dashboard.tsx | 4 ++-- frontend/app/routes/golf.$gameId.play.tsx | 7 ++++--- 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'frontend/app/routes') diff --git a/frontend/app/routes/_index.tsx b/frontend/app/routes/_index.tsx index 9be594f..24fff9f 100644 --- a/frontend/app/routes/_index.tsx +++ b/frontend/app/routes/_index.tsx @@ -22,7 +22,7 @@ export default function Index() { className="w-24 h-24" />
-
+
iOSDC Japan 2024
Swift Code Battle
diff --git a/frontend/app/routes/dashboard.tsx b/frontend/app/routes/dashboard.tsx index 4c751d9..99c64f2 100644 --- a/frontend/app/routes/dashboard.tsx +++ b/frontend/app/routes/dashboard.tsx @@ -31,8 +31,8 @@ export default function Dashboard() { return (
-

- {user.display_name} +

+ {user.display_name} @{user.username}

試合

diff --git a/frontend/app/routes/golf.$gameId.play.tsx b/frontend/app/routes/golf.$gameId.play.tsx index 3712df2..ea1b8fd 100644 --- a/frontend/app/routes/golf.$gameId.play.tsx +++ b/frontend/app/routes/golf.$gameId.play.tsx @@ -15,7 +15,7 @@ export const meta: MetaFunction = ({ data }) => [ ]; export async function loader({ params, request }: LoaderFunctionArgs) { - const { token } = await ensureUserLoggedIn(request); + const { token, user } = await ensureUserLoggedIn(request); const fetchGame = async () => { return (await apiGetGame(token, Number(params.gameId))).game; @@ -27,16 +27,17 @@ export async function loader({ params, request }: LoaderFunctionArgs) { const [game, sockToken] = await Promise.all([fetchGame(), fetchSockToken()]); return { game, + player: user, sockToken, }; } export default function GolfPlay() { - const { game, sockToken } = useLoaderData(); + const { game, player, sockToken } = useLoaderData(); return ( }> - {() => } + {() => } ); } -- cgit v1.2.3-70-g09d2