Big refactor

icpc · Aug 5, 2023 · 0dd9ad3 · 0dd9ad3
1 parent a3d2df5
commit 0dd9ad3
Show file tree

Hide file tree

Showing 42 changed files with 894 additions and 1,473 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -2,5 +2,5 @@ kotlin.code.style=official
 
 build_version=dev
 #change this to `false` to use system installed npm
-npm.download=true
-org.gradle.parallel=true
+npm.download=false
+org.gradle.parallel=true
diff --git a/src/backend/build.gradle.kts b/src/backend/build.gradle.kts
@@ -49,12 +49,8 @@ tasks {
         from(project(":frontend").tasks["npm_run_buildOverlay"])
         destinationDir = jsBuildPath.resolve("overlay")
     }
-    val copyJsOverlay2 = register<Copy>("copyJsOverlay2") {
-        from(project(":frontend").tasks["npm_run_buildOverlay2"])
-        destinationDir = jsBuildPath.resolve("overlay2")
-    }
     register("buildJs") {
-        dependsOn(copyJsAdmin, copyJsOverlay, copyJsOverlay2)
+        dependsOn(copyJsAdmin, copyJsOverlay)
         outputs.dir(jsBuildPath)
     }
 }

diff --git a/src/frontend/admin/public/icon-192x192.png b/src/frontend/admin/public/icon-192x192.png
diff --git a/src/frontend/admin/public/icon-256x256.png b/src/frontend/admin/public/icon-256x256.png
diff --git a/src/frontend/admin/public/icon-384x384.png b/src/frontend/admin/public/icon-384x384.png
diff --git a/src/frontend/admin/public/icon-512x512.png b/src/frontend/admin/public/icon-512x512.png
diff --git a/src/frontend/admin/public/index.html b/src/frontend/admin/public/index.html
@@ -4,7 +4,8 @@
     <meta charset="utf-8"/>
     <meta name="viewport" content="width=device-width, initial-scale=1"/>
     <meta name="theme-color" content="#000000"/>
-    <meta name="description" content="Web site created using create-react-app"/>
+    <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
+    <link rel="icon" type="image/png" href="%PUBLIC_URL%/icon-192x192.png" sizes="192x192">
     <title>ICPC Live 3 Admin</title>
 </head>
 <body>

diff --git a/src/frontend/admin/public/manifest.json b/src/frontend/admin/public/manifest.json
@@ -0,0 +1,27 @@
+{
+    "display": "browser",
+    "name": "ICPC Live admin",
+    "short_name": "ICPC Live admin",
+    "icons": [
+        {
+            "src": "/icon-192x192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "/icon-256x256.png",
+            "sizes": "256x256",
+            "type": "image/png"
+        },
+        {
+            "src": "/icon-384x384.png",
+            "sizes": "384x384",
+            "type": "image/png"
+        },
+        {
+            "src": "/icon-512x512.png",
+            "sizes": "512x512",
+            "type": "image/png"
+        }
+    ]
+}
diff --git a/src/frontend/build.gradle.kts b/src/frontend/build.gradle.kts
@@ -23,13 +23,6 @@ tasks {
         inputs.file("overlay/package.json")
         outputs.dir("overlay/build")
     }
-    named<NpmTask>("npm_run_buildOverlay2") {
-        environment.set(mapOf("PUBLIC_URL" to "/overlay2", "BUILD_PATH" to "build2", "VITE_VERSION" to "2"))
-        inputs.dir("overlay/src")
-        inputs.file("overlay/index.html")
-        inputs.file("overlay/package.json")
-        outputs.dir("overlay/build2")
-    }
     named<NpmTask>("npm_run_buildAdmin") {
         environment.set(mapOf("PUBLIC_URL" to "/admin"))
         inputs.dir("admin/src")

diff --git a/src/frontend/overlay/index.html b/src/frontend/overlay/index.html
@@ -3,7 +3,8 @@
 <head>
     <meta charset="utf-8"/>
     <meta name="viewport" content="width=device-width, initial-scale=1"/>
-    <meta name="theme-color" content="#000000"/>
+    <link rel="manifest" href="/src/assets/manifest.json">
+    <link rel="icon" type="image/png" href="/src/assets/icon-192x192.png" sizes="192x192">
     <title>ICPC Live</title>
 </head>
 <body>

diff --git a/src/frontend/overlay/src/assets/icon-192x192.png b/src/frontend/overlay/src/assets/icon-192x192.png
diff --git a/src/frontend/overlay/src/assets/icon-256x256.png b/src/frontend/overlay/src/assets/icon-256x256.png
diff --git a/src/frontend/overlay/src/assets/icon-384x384.png b/src/frontend/overlay/src/assets/icon-384x384.png
diff --git a/src/frontend/overlay/src/assets/icon-512x512.png b/src/frontend/overlay/src/assets/icon-512x512.png
diff --git a/src/frontend/overlay/src/assets/manifest.json b/src/frontend/overlay/src/assets/manifest.json
@@ -0,0 +1,27 @@
+{
+    "display": "browser",
+    "name": "ICPC Live",
+    "short_name": "ICPC Live",
+    "icons": [
+        {
+            "src": "/icon-192x192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "/icon-256x256.png",
+            "sizes": "256x256",
+            "type": "image/png"
+        },
+        {
+            "src": "/icon-384x384.png",
+            "sizes": "384x384",
+            "type": "image/png"
+        },
+        {
+            "src": "/icon-512x512.png",
+            "sizes": "512x512",
+            "type": "image/png"
+        }
+    ]
+}
diff --git a/src/frontend/overlay/src/components/atoms/Box2.jsx b/src/frontend/overlay/src/components/atoms/Box2.jsx
diff --git a/src/frontend/overlay/src/components/atoms/Cell.jsx b/src/frontend/overlay/src/components/atoms/Cell.jsx
@@ -19,6 +19,10 @@ const flash = keyframes`
 `;
 
 // FIXME: too overloaded with props.
+/**
+ * @deprecated Do not use this component or inherit from this component. If you need styles - use them ad hoc.
+ * @type {StyledComponent<"div", AnyIfEmpty<DefaultTheme>, {}, never>}
+ */
 export const Cell = styled.div`
   width: ${props => props.width};
   height: 100%;

diff --git a/src/frontend/overlay/src/components/atoms/CircleCellsProblem.jsx b/src/frontend/overlay/src/components/atoms/CircleCellsProblem.jsx
@@ -1,10 +1,9 @@
 import React from "react";
 import styled from "styled-components";
 import { QUEUE_PROBLEM_LABEL_FONT_SIZE, CIRCLE_PROBLEM_LINE_WIDTH, CIRCLE_PROBLEM_SIZE } from "../../config";
-import { FlexedBox2 } from "./Box2";
 import { isShouldUseDarkColor } from "../../utils/colors";
 
-const CircleCellProblemWrap = styled(FlexedBox2)`
+const CircleCellProblemWrap = styled.div`
     position: relative;
     width: ${props => props.radius ?? CIRCLE_PROBLEM_SIZE};
     height: ${props => props.radius ?? CIRCLE_PROBLEM_SIZE};

diff --git a/...y/src/components/atoms/ContestLabels2.jsx → ...ay/src/components/atoms/ContestLabels.jsx b/...y/src/components/atoms/ContestLabels2.jsx → ...ay/src/components/atoms/ContestLabels.jsx
@@ -8,15 +8,15 @@ import {
     VERDICT_UNKNOWN2,
 } from "../../config";
 import { isShouldUseDarkColor } from "../../utils/colors";
-import { Box2, FlexedBox2, ShrinkingBox2 } from "./Box2";
+import { ShrinkingBox } from "./ShrinkingBox";
 import { formatScore, ICPCResult, IOIResult } from "./ContestCells";
 import {
-    TeamTaskColor2,
+    TeamTaskColor,
     TeamTaskSymbol,
     TeamTaskStatus,
-    getStatus2,
-    getTeamTaskColor2,
-} from "../../utils/statusInfo2";
+    getStatus,
+    getTeamTaskColor,
+} from "../../utils/statusInfo";
 import { CircleCell } from "./CircleCellsProblem";
 
 export const ICPCTaskResult = PropTypes.shape({
@@ -32,7 +32,7 @@ export const IOITaskResult = PropTypes.shape({
     score: PropTypes.number,
 });
 
-const VerdictLabel = styled(ShrinkingBox2)`
+const VerdictLabel = styled(ShrinkingBox)`
   background-color: ${({ color }) => color};
   font-size: 14px;
   font-weight: 700;
@@ -63,8 +63,8 @@ const getIOIScoreText = (difference) => {
 const IOIVerdictLabel = ({ runResult: { wrongVerdict, difference }, ...props }) => {
     const [diffText, diffColor] = getIOIScoreText(difference);
     return <>
-        {wrongVerdict !== undefined && <ShrinkingBox2 text={wrongVerdict ?? "??"} color={VERDICT_NOK2} {...{ Wrapper: FlexedBox2, ...props }}/>}
-        {wrongVerdict === undefined && <ShrinkingBox2 text={diffText ?? "??"} color={diffColor} {...{ Wrapper: FlexedBox2, ...props }}/>}
+        {wrongVerdict !== undefined && <ShrinkingBox text={wrongVerdict ?? "??"} color={VERDICT_NOK2} {...{ Wrapper: FlexedBox2, ...props }}/>}
+        {wrongVerdict === undefined && <ShrinkingBox text={diffText ?? "??"} color={diffColor} {...{ Wrapper: FlexedBox2, ...props }}/>}
     </>;
 };
 IOIVerdictLabel.propTypes = {
@@ -134,34 +134,33 @@ VerdictCellInProgress2.propTypes = {
     percentage: PropTypes.number.isRequired
 };
 
-export const RunStatusLabel2 = ({ runInfo, className }) => {
+export const RunStatusLabel = ({ runInfo, className }) => {
     return <>
         {runInfo.result === undefined && <VerdictCellInProgress2 percentage={runInfo.percentage} className={className}/>}
         {runInfo.result !== undefined && <VerdictLabel2 runResult={runInfo.result} score={runInfo.result.result} className={className}/>}
     </>;
 };
 
-RunStatusLabel2.propTypes = {
-    ...Box2.propTypes,
+RunStatusLabel.propTypes = {
     runInfo: PropTypes.shape({
         result: PropTypes.oneOf([IOIResult, IOIResult]),
         percentage: PropTypes.number.isRequired,
     }),
 };
 
-const TaskResultLabelWrapper2 = styled(Box2)`
+const TaskResultLabelWrapper2 = styled.div`
   font-weight: bold;
   background-color: ${({ color }) => color};
   color: #fff;
 `;
 
 // TODO: fts start
 const ICPCTaskResultLabel2 = ({ problemResult: r, ...props }) => {
-    const status = getStatus2(r.isFirstToSolve, r.isSolved, r.pendingAttempts, r.wrongAttempts);
+    const status = getStatus(r.isFirstToSolve, r.isSolved, r.pendingAttempts, r.wrongAttempts);
     const attempts = r.wrongAttempts + r.pendingAttempts;
     return <>
         {/*{status === TeamTaskStatus.first && <StarIcon/>}*/}
-        <TaskResultLabelWrapper2 color={TeamTaskColor2[status]} {...props}>
+        <TaskResultLabelWrapper2 color={TeamTaskColor[status]} {...props}>
             {TeamTaskSymbol[status]}
             {status !== TeamTaskStatus.untouched && attempts > 0 && attempts}
         </TaskResultLabelWrapper2>
@@ -173,7 +172,7 @@ ICPCTaskResultLabel2.propTypes = {
 };
 
 const IOITaskResultLabel2 = ({ problemResult: r, minScore, maxScore,  ...props }) => {
-    return <TaskResultLabelWrapper2 color={getTeamTaskColor2(r.score, minScore, maxScore)} { ...props}>
+    return <TaskResultLabelWrapper2 color={getTeamTaskColor(r.score, minScore, maxScore)} { ...props}>
         {formatScore(r?.score)}
     </TaskResultLabelWrapper2>;
 };
@@ -184,17 +183,9 @@ IOITaskResultLabel2.propTypes = {
     maxScore: PropTypes.number,
 };
 
-export const TaskResultLabel2 = ({ problemResult, minScore, maxScore, ...props }) => {
+export const TaskResultLabel = ({ problemResult, minScore, maxScore, ...props }) => {
     return <>
         {problemResult.type === "ICPC" && <ICPCTaskResultLabel2 problemResult={problemResult} {...props}/>}
         {problemResult.type === "IOI" && <IOITaskResultLabel2 problemResult={problemResult} minScore={minScore} maxScore={maxScore} {...props}/>}
     </>;
 };
-
-export const ProblemCircleLabel = ({ letter, problemColor }) => {
-    return (
-        <Box2 width={"30px"} marginBottom={"8px"} paddingTop={"4px"}>
-            <CircleCell content={letter ?? "??"} backgroundColor={problemColor ?? "#000000"} />
-        </Box2>
-    );
-};