From ad42f43d1c3c8f0da0ac31b8016e2f20f1765720 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 18 Aug 2024 00:38:07 +0900 Subject: refactor(frontend): extract components for gaming page --- frontend/app/components/Gaming/CodeBlock.tsx | 11 +++++ .../components/Gaming/ExecStatusIndicatorIcon.tsx | 51 ++++++++++++++++++++ frontend/app/components/Gaming/ScoreBar.tsx | 25 ++++++++++ frontend/app/components/Gaming/SubmitResult.tsx | 56 ++++++++++++++++++++++ 4 files changed, 143 insertions(+) create mode 100644 frontend/app/components/Gaming/CodeBlock.tsx create mode 100644 frontend/app/components/Gaming/ExecStatusIndicatorIcon.tsx create mode 100644 frontend/app/components/Gaming/ScoreBar.tsx create mode 100644 frontend/app/components/Gaming/SubmitResult.tsx (limited to 'frontend/app/components/Gaming') diff --git a/frontend/app/components/Gaming/CodeBlock.tsx b/frontend/app/components/Gaming/CodeBlock.tsx new file mode 100644 index 0000000..20cd425 --- /dev/null +++ b/frontend/app/components/Gaming/CodeBlock.tsx @@ -0,0 +1,11 @@ +type Props = { + code: string; +}; + +export default function CodeBlock({ code }: Props) { + return ( +
+			{code}
+		
+ ); +} diff --git a/frontend/app/components/Gaming/ExecStatusIndicatorIcon.tsx b/frontend/app/components/Gaming/ExecStatusIndicatorIcon.tsx new file mode 100644 index 0000000..8daf48c --- /dev/null +++ b/frontend/app/components/Gaming/ExecStatusIndicatorIcon.tsx @@ -0,0 +1,51 @@ +import { + faBan, + faCircle, + faCircleCheck, + faCircleExclamation, + faRotate, +} from "@fortawesome/free-solid-svg-icons"; +import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; +import type { ExecResultStatus } from "../../models/ExecResult"; + +type Props = { + status: ExecResultStatus; +}; + +export default function ExecStatusIndicatorIcon({ status }: Props) { + switch (status) { + case "waiting_submission": + return ( + + ); + case "running": + return ( + + ); + case "success": + return ( + + ); + case "canceled": + return ( + + ); + default: + return ( + + ); + } +} diff --git a/frontend/app/components/Gaming/ScoreBar.tsx b/frontend/app/components/Gaming/ScoreBar.tsx new file mode 100644 index 0000000..4eac3ad --- /dev/null +++ b/frontend/app/components/Gaming/ScoreBar.tsx @@ -0,0 +1,25 @@ +type Props = { + scoreA: number | null; + scoreB: number | null; + bgA: string; + bgB: string; +}; + +export default function ScoreBar({ scoreA, scoreB, bgA, bgB }: Props) { + let scoreRatio; + if (scoreA === null && scoreB === null) { + scoreRatio = 50; + } else if (scoreA === null) { + scoreRatio = 0; + } else if (scoreB === null) { + scoreRatio = 100; + } else { + scoreRatio = (scoreB / (scoreA + scoreB)) * 100; + } + + return ( +
+
+
+ ); +} diff --git a/frontend/app/components/Gaming/SubmitResult.tsx b/frontend/app/components/Gaming/SubmitResult.tsx new file mode 100644 index 0000000..ae83e92 --- /dev/null +++ b/frontend/app/components/Gaming/SubmitResult.tsx @@ -0,0 +1,56 @@ +import { faArrowDown } from "@fortawesome/free-solid-svg-icons"; +import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; +import React from "react"; +import type { SubmitResult } from "../../models/SubmitResult"; +import BorderedContainer from "../BorderedContainer"; +import SubmitStatusLabel from "../SubmitStatusLabel"; +import ExecStatusIndicatorIcon from "./ExecStatusIndicatorIcon"; + +type Props = { + result: SubmitResult; + submitButton?: React.ReactNode; +}; + +export default function SubmitResult({ result, submitButton }: Props) { + return ( +
+
+ {submitButton} +
+ +
+
+
    + {result.execResults.map((r, idx) => ( +
  • +
    +
    + +
    + {idx !== result.execResults.length - 1 && ( +
    + +
    + )} +
    +
    + +
    {r.label}
    +
    + + {r.stdout} + {r.stderr} + +
    +
    +
    +
  • + ))} +
+
+ ); +} -- cgit v1.2.3-70-g09d2 From 9bd1f89febe6311781aca3e8ee2b6a706a606e3c Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 18 Aug 2024 01:44:10 +0900 Subject: fix(frontend): fix an issue where loading icon does not rotate --- frontend/app/components/Gaming/SubmitResult.tsx | 4 +--- frontend/app/root.tsx | 1 + frontend/app/routes/_index.tsx | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) (limited to 'frontend/app/components/Gaming') diff --git a/frontend/app/components/Gaming/SubmitResult.tsx b/frontend/app/components/Gaming/SubmitResult.tsx index ae83e92..5b08ef1 100644 --- a/frontend/app/components/Gaming/SubmitResult.tsx +++ b/frontend/app/components/Gaming/SubmitResult.tsx @@ -24,9 +24,7 @@ export default function SubmitResult({ result, submitButton }: Props) { {result.execResults.map((r, idx) => (
  • -
    - -
    + {idx !== result.execResults.length - 1 && (