aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile2
-rw-r--r--frontend/app/components/GolfWatchApp.client.tsx4
-rw-r--r--frontend/app/components/GolfWatchApps/GolfWatchAppGaming.tsx182
-rw-r--r--frontend/app/components/SubmitStatusLabel.tsx2
4 files changed, 118 insertions, 72 deletions
diff --git a/Makefile b/Makefile
index 9e776e9..6adde68 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ DOCKER_COMPOSE := docker compose -f compose.local.yaml
all: down build reset up
reset:
- echo "UPDATE games SET state = 'waiting', started_at = NULL WHERE game_id = 7;" | make psql-query
+ echo "UPDATE games SET state = 'waiting', started_at = NULL WHERE game_id = 1;" | make psql-query
.PHONY: build
build:
diff --git a/frontend/app/components/GolfWatchApp.client.tsx b/frontend/app/components/GolfWatchApp.client.tsx
index b2f3b69..15b78dc 100644
--- a/frontend/app/components/GolfWatchApp.client.tsx
+++ b/frontend/app/components/GolfWatchApp.client.tsx
@@ -246,11 +246,13 @@ export default function GolfWatchApp({
} else if (gameState === "gaming") {
return (
<GolfWatchAppGaming
+ gameDisplayName={game.display_name}
gameDurationSeconds={game.duration_seconds}
leftTimeSeconds={leftTimeSeconds!}
playerInfoA={playerInfoA}
playerInfoB={playerInfoB}
- problem={game.problem!.description}
+ problemTitle={game.problem.title}
+ problemDescription={game.problem.description}
/>
);
} else if (gameState === "finished") {
diff --git a/frontend/app/components/GolfWatchApps/GolfWatchAppGaming.tsx b/frontend/app/components/GolfWatchApps/GolfWatchAppGaming.tsx
index f9647b3..c4c3a53 100644
--- a/frontend/app/components/GolfWatchApps/GolfWatchAppGaming.tsx
+++ b/frontend/app/components/GolfWatchApps/GolfWatchAppGaming.tsx
@@ -1,21 +1,26 @@
+import { faArrowDown } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { PlayerInfo } from "../../models/PlayerInfo";
+import BorderedContainer from "../BorderedContainer";
import ExecStatusIndicatorIcon from "../ExecStatusIndicatorIcon";
import SubmitStatusLabel from "../SubmitStatusLabel";
type Props = {
+ gameDisplayName: string;
gameDurationSeconds: number;
leftTimeSeconds: number;
playerInfoA: PlayerInfo;
playerInfoB: PlayerInfo;
- problem: string;
+ problemTitle: string;
+ problemDescription: string;
};
export default function GolfWatchAppGaming({
+ gameDisplayName,
gameDurationSeconds,
leftTimeSeconds,
playerInfoA,
playerInfoB,
- problem,
}: Props) {
const leftTime = (() => {
const k = gameDurationSeconds + leftTimeSeconds;
@@ -25,96 +30,135 @@ export default function GolfWatchAppGaming({
})();
const scoreRatio = (() => {
- const scoreA = playerInfoA.score ?? 0;
- const scoreB = playerInfoB.score ?? 0;
- const totalScore = scoreA + scoreB;
- return totalScore === 0 ? 50 : (scoreB / totalScore) * 100;
+ const scoreA = playerInfoA.score;
+ const scoreB = playerInfoB.score;
+ if (scoreA === null && scoreB === null) {
+ return 50;
+ } else if (scoreA === null) {
+ return 0;
+ } else if (scoreB === null) {
+ return 100;
+ } else {
+ return (scoreB / (scoreA + scoreB)) * 100;
+ }
})();
return (
- <div className="grid h-full w-full grid-rows-[auto_auto_1fr_auto]">
- <div className="grid grid-cols-[1fr_auto_1fr]">
- <div className="grid justify-start bg-red-500 p-2 text-white">
- {playerInfoA.displayName}
- </div>
- <div className="grid justify-center p-2">{leftTime}</div>
- <div className="grid justify-end bg-blue-500 p-2 text-white">
- {playerInfoB.displayName}
- </div>
- </div>
- <div className="grid grid-cols-[auto_1fr_auto]">
- <div className="grid justify-start bg-red-500 p-2 text-lg font-bold text-white">
- {playerInfoA.score}
+ <div className="min-h-screen bg-gray-100 flex flex-col">
+ <div className="text-white bg-iosdc-japan grid grid-cols-3 px-4 py-2">
+ <div className="font-bold flex justify-between my-auto">
+ <div>
+ <div className="text-gray-100">Player 1</div>
+ <div className="text-2xl">{playerInfoA.displayName}</div>
+ </div>
+ <div className="text-6xl">{playerInfoA.score}</div>
</div>
- <div className="w-full bg-blue-500">
- <div
- className="h-full bg-red-500"
- style={{ width: `${scoreRatio}%` }}
- ></div>
+ <div className="font-bold text-center">
+ <div className="text-gray-100">{gameDisplayName}</div>
+ <div className="text-3xl">{leftTime}</div>
</div>
- <div className="grid justify-end bg-blue-500 p-2 text-lg font-bold text-white">
- {playerInfoB.score}
+ <div className="font-bold flex justify-between my-auto">
+ <div className="text-6xl">{playerInfoB.score}</div>
+ <div>
+ <div className="text-gray-100">Player 2</div>
+ <div className="text-2xl">{playerInfoB.displayName}</div>
+ </div>
</div>
</div>
- <div className="grid grid-cols-[3fr_2fr_3fr_2fr] p-2">
- <div>
- <pre>
+ <div className="w-full bg-purple-400">
+ <div
+ className="h-6 bg-orange-400"
+ style={{ width: `${scoreRatio}%` }}
+ ></div>
+ </div>
+ <div className="grow grid grid-cols-10 p-4 gap-4">
+ <div className="col-span-3">
+ <pre className="bg-white resize-none h-full w-full rounded-lg border border-gray-300 p-2">
<code>{playerInfoA.code}</code>
</pre>
</div>
- <div>
- <div>
- <SubmitStatusLabel status={playerInfoA.submitResult.status} />
+ <div className="col-span-2 flex flex-col gap-4">
+ <div className="flex">
+ <div className="grow font-bold text-xl text-center">
+ <SubmitStatusLabel status={playerInfoA.submitResult.status} />
+ </div>
</div>
- <div>
- <ol>
- {playerInfoA.submitResult?.execResults.map((result) => (
- <li key={result.testcase_id ?? -1}>
- <div>
+ <ul className="flex flex-col gap-2">
+ {playerInfoA.submitResult.execResults.map((r, idx) => (
+ <li key={r.testcase_id ?? -1} className="flex gap-2">
+ <div className="flex flex-col gap-2 p-2">
+ <div className="w-6">
+ <ExecStatusIndicatorIcon status={r.status} />
+ </div>
+ {idx !== playerInfoA.submitResult.execResults.length - 1 && (
<div>
- <ExecStatusIndicatorIcon status={result.status} />{" "}
- {result.label}
+ <FontAwesomeIcon
+ icon={faArrowDown}
+ fixedWidth
+ className="text-gray-500"
+ />
</div>
+ )}
+ </div>
+ <div className="grow p-2 overflow-x-scroll">
+ <BorderedContainer>
+ <div className="font-semibold">{r.label}</div>
<div>
- {result.stdout}
- {result.stderr}
+ <code>
+ {r.stdout}
+ {r.stderr}
+ </code>
</div>
- </div>
- </li>
- ))}
- </ol>
- </div>
- </div>
- <div>
- <pre>
- <code>{playerInfoB.code}</code>
- </pre>
+ </BorderedContainer>
+ </div>
+ </li>
+ ))}
+ </ul>
</div>
- <div>
- <div>
- <SubmitStatusLabel status={playerInfoB.submitResult.status} />
+ <div className="col-span-2 flex flex-col gap-4">
+ <div className="flex">
+ <div className="grow font-bold text-xl text-center">
+ <SubmitStatusLabel status={playerInfoB.submitResult.status} />
+ </div>
</div>
- <div>
- <ol>
- {playerInfoB.submitResult?.execResults.map((result, idx) => (
- <li key={idx}>
- <div>
+ <ul className="flex flex-col gap-2">
+ {playerInfoB.submitResult.execResults.map((r, idx) => (
+ <li key={r.testcase_id ?? -1} className="flex gap-2">
+ <div className="flex flex-col gap-2 p-2">
+ <div className="w-6">
+ <ExecStatusIndicatorIcon status={r.status} />
+ </div>
+ {idx !== playerInfoB.submitResult.execResults.length - 1 && (
<div>
- <ExecStatusIndicatorIcon status={result.status} />{" "}
- {result.label}
+ <FontAwesomeIcon
+ icon={faArrowDown}
+ fixedWidth
+ className="text-gray-500"
+ />
</div>
+ )}
+ </div>
+ <div className="grow p-2 overflow-x-scroll">
+ <BorderedContainer>
+ <div className="font-semibold">{r.label}</div>
<div>
- {result.stdout}
- {result.stderr}
+ <code>
+ {r.stdout}
+ {r.stderr}
+ </code>
</div>
- </div>
- </li>
- ))}
- </ol>
- </div>
+ </BorderedContainer>
+ </div>
+ </li>
+ ))}
+ </ul>
+ </div>
+ <div className="col-span-3">
+ <pre className="bg-white resize-none h-full w-full rounded-lg border border-gray-300 p-2">
+ <code>{playerInfoB.code}</code>
+ </pre>
</div>
</div>
- <div className="grid justify-center p-2 bg-slate-300">{problem}</div>
</div>
);
}
diff --git a/frontend/app/components/SubmitStatusLabel.tsx b/frontend/app/components/SubmitStatusLabel.tsx
index e0ecc27..0e13c1e 100644
--- a/frontend/app/components/SubmitStatusLabel.tsx
+++ b/frontend/app/components/SubmitStatusLabel.tsx
@@ -7,7 +7,7 @@ type Props = {
export default function SubmitStatusLabel({ status }: Props) {
switch (status) {
case "waiting_submission":
- return null;
+ return "提出待ち";
case "running":
return "実行中...";
case "success":
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-11-30 22:19:57 +0000