diff options
Diffstat (limited to 'frontend/app/routes')
| -rw-r--r-- | frontend/app/routes/_index.tsx | 2 | ||||
| -rw-r--r-- | frontend/app/routes/dashboard.tsx | 4 | ||||
| -rw-r--r-- | frontend/app/routes/golf.$gameId.play.tsx | 7 |
3 files changed, 7 insertions, 6 deletions
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" /> <div className="text-center"> - <div className="font-bold text-transparent bg-clip-text bg-gradient-to-r from-orange-400 via-pink-500 to-purple-400 flex flex-col gap-y-2"> + <div className="font-bold text-transparent bg-clip-text bg-iosdc-japan flex flex-col gap-y-2"> <div className="text-3xl">iOSDC Japan 2024</div> <div className="text-6xl">Swift Code Battle</div> </div> 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 ( <div className="p-6 bg-gray-100 min-h-screen flex flex-col items-center"> - <h1 className="text-2xl font-bold mb-4 text-gray-800"> - <span>{user.display_name}</span> + <h1 className="text-2xl font-bold mb-4"> + <span className="text-gray-800">{user.display_name}</span> <span className="text-gray-500 ml-2">@{user.username}</span> </h1> <h2 className="text-xl font-semibold mb-4 text-gray-700">試合</h2> 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<typeof loader> = ({ 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<typeof loader>(); + const { game, player, sockToken } = useLoaderData<typeof loader>(); return ( <ClientOnly fallback={<GolfPlayAppConnecting />}> - {() => <GolfPlayApp game={game} sockToken={sockToken} />} + {() => <GolfPlayApp game={game} player={player} sockToken={sockToken} />} </ClientOnly> ); } |