Merge pull request #107 from icpc/overlay2-rework

Overlay redesign
icpc · Oct 29, 2023 · 34b4be9 · 34b4be9
2 parents 3dd8a66 + 43526f8
commit 34b4be9
Show file tree

Hide file tree

Showing 129 changed files with 7,712 additions and 4,337 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,9 +1,9 @@
 name: Tests
 on:
   push:
-    branches: [main, master]
+    branches: [main, master, overlay2-rework]
   pull_request:
-    branches: [main, master]
+    branches: [main, master, overlay2-rework]
 jobs:
   test:
     timeout-minutes: 20

diff --git a/.run/admin-start-local.run.xml b/.run/admin-start-local.run.xml
@@ -0,0 +1,16 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="admin-start-local" type="js.build_tools.npm">
+    <package-json value="$PROJECT_DIR$/src/frontend/admin/package.json" />
+    <command value="run" />
+    <scripts>
+      <script value="start" />
+    </scripts>
+    <node-interpreter value="project" />
+    <envs>
+      <env name="REACT_APP_BACKEND_URL" value="http://localhost:8080/api/admin" />
+      <env name="REACT_APP_WEBSOCKET_URL" value="ws://localhost:8080/api/admin" />
+      <env name="REACT_APP_OVERLAY_LOCATION" value="http://localhost:5173" />
+    </envs>
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/.run/fake.run.xml b/.run/fake.run.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="fake" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="-Plive.dev.contest=fake -Plive.dev.widgetPositionsFile=widget_positions.json.overlay2" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="backend:run" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <ForceTestExec>false</ForceTestExec>
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/.run/faker-server.run.xml b/.run/faker-server.run.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="faker-server" type="PythonConfigurationType" factoryName="Python">
+    <module name="live-v3.faker" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/src/faker" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/src/faker/main.py" />
+    <option name="PARAMETERS" value="" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="false" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/.run/nerc-onsite-2020.run.xml b/.run/nerc-onsite-2020.run.xml
@@ -4,7 +4,7 @@
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
       <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="-Plive.dev.contest=icpc-nef/2020-2021/onsite" />
+      <option name="scriptParameters" value="-Plive.dev.contest=icpc-nef/2020-2021/onsite -Plive.dev.widgetPositionsFile=widget_positions.json.overlay2" />
       <option name="taskDescriptions">
         <list />
       </option>
@@ -18,6 +18,7 @@
     <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
     <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
     <DebugAllEnabled>false</DebugAllEnabled>
+    <ForceTestExec>false</ForceTestExec>
     <method v="2" />
   </configuration>
 </component>
diff --git a/.run/overlay2-start-local.run.xml b/.run/overlay2-start-local.run.xml
@@ -0,0 +1,14 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="overlay2-start-local" type="js.build_tools.npm">
+    <package-json value="$PROJECT_DIR$/src/frontend/overlay/package.json" />
+    <command value="run" />
+    <scripts>
+      <script value="start" />
+    </scripts>
+    <node-interpreter value="project" />
+    <envs>
+      <env name="VITE_WEBSOCKET_URL" value="ws://localhost:8080/api/overlay" />
+    </envs>
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/.run/wf-2020.run.xml b/.run/wf-2020.run.xml
@@ -4,7 +4,7 @@
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
       <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="-Plive.dev.contest=icpc-wf/2020" />
+      <option name="scriptParameters" value="-Plive.dev.contest=icpc-wf/2020 -Plive.dev.widgetPositionsFile=widget_positions.json.overlay2" />
       <option name="taskDescriptions">
         <list />
       </option>
@@ -18,6 +18,7 @@
     <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
     <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
     <DebugAllEnabled>false</DebugAllEnabled>
+    <ForceTestExec>false</ForceTestExec>
     <method v="2" />
   </configuration>
 </component>
diff --git a/.run/wf-2021.run.xml b/.run/wf-2021.run.xml
@@ -4,7 +4,7 @@
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
       <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="-Plive.dev.contest=icpc-wf/2021/finals" />
+      <option name="scriptParameters" value="-Plive.dev.contest=icpc-wf/2021/finals -Plive.dev.widgetPositionsFile=widget_positions.json.overlay2" />
       <option name="taskDescriptions">
         <list />
       </option>
@@ -18,6 +18,7 @@
     <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
     <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
     <DebugAllEnabled>false</DebugAllEnabled>
+    <ForceTestExec>false</ForceTestExec>
     <method v="2" />
   </configuration>
 </component>