Skip to content

Commit

Permalink
Merge branch 'main' into overlay2-rework
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/frontend/build.gradle.kts
  • Loading branch information
kunyavskiy committed Sep 23, 2023
2 parents a9695e5 + d2b6d57 commit fb6c324
Show file tree
Hide file tree
Showing 496 changed files with 2,439 additions and 3,644 deletions.
24 changes: 24 additions & 0 deletions .run/nwerc-2018.run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="nwerc-2018" 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=icpc-nwerc/2018/native" />
<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>
<RunAsTest>false</RunAsTest>
<method v="2" />
</configuration>
</component>
15 changes: 10 additions & 5 deletions config/_examples/_domjudge_test1/settings.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
{
"login":"live",
"password":"$creds.cds_password_pretest_dhaka",
"url":"https://cds.storm.vu/api/contests/pretest_dhaka",
"type":"clics"
{
"type":"clics",
"feeds": [
{
"login":"live",
"password":"$creds.cds_password_pretest_dhaka",
"url":"https://cds.storm.vu/api",
"contestId": "pretest_dhaka"
}
]
}
11 changes: 8 additions & 3 deletions config/_examples/_pc2/settings.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
{
"type":"clics",

"url":"_examples/_pc2",
"feedVersion":"2020_03",
"feeds": [
{
"url": ".",
"contestId": "",
"eventFeedPath": "",
"feedVersion": "2020_03"
}
],

"emulation":{"speed":5,"startTime":"now"}
}
58 changes: 58 additions & 0 deletions config/ejoi/2023/advanced.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{
"freezeTimeSeconds": 18000,
"teamOverrides": {
"GEO5" : {"isOutOfContest": true },
"GEO6" : {"isOutOfContest": true },
"GEO7" : {"isOutOfContest": true },
"GEO8" : {"isOutOfContest": true }
},
"teamOverrideTemplate": {
"displayName": "[{country}] {first_name} {last_name}"
},
"teamMediaTemplate": {
"photo": {
"type": "Photo",
"url": "/media/photos/{teamId}.png"
}
},
"problemOverrides": {
"search": {
"displayName": "A1"
},
"teleport": {
"displayName": "B1"
},
"offices": {
"displayName": "C1"
},
"puzzle": {
"displayName": "A2"
},
"infection": {
"displayName": "B2"
},
"team": {
"displayName": "C2"
}
},
"scoreboardOverrides": {
"medals": [
{
"name": "gold",
"count": 8,
"tiebreakMode": "ALL"
},
{
"name": "silver",
"count": 15,
"tiebreakMode": "ALL"
},
{
"name": "bronze",
"count": 23,
"tiebreakMode": "ALL"
}
]
}

}
Binary file added config/ejoi/2023/media/photos/ARM1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added config/ejoi/2023/media/photos/ARM2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added config/ejoi/2023/media/photos/ARM3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added config/ejoi/2023/media/photos/ARM4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added config/ejoi/2023/media/photos/AZE1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added config/ejoi/2023/media/photos/AZE2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added config/ejoi/2023/media/photos/AZE3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added config/ejoi/2023/media/photos/AZE4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added config/ejoi/2023/media/photos/BEL1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added config/ejoi/2023/media/photos/BEL2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added config/ejoi/2023/media/photos/BEL3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added config/ejoi/2023/media/photos/BEL4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added config/ejoi/2023/media/photos/BGR1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added config/ejoi/2023/media/photos/BGR2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added config/ejoi/2023/media/photos/BGR3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added config/ejoi/2023/media/photos/BGR4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added config/ejoi/2023/media/photos/BIH1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added config/ejoi/2023/media/photos/BIH2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added config/ejoi/2023/media/photos/BIH3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added config/ejoi/2023/media/photos/BIH4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added config/ejoi/2023/media/photos/CHE1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added config/ejoi/2023/media/photos/CHE2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added config/ejoi/2023/media/photos/CHE3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added config/ejoi/2023/media/photos/CYP1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added config/ejoi/2023/media/photos/CYP2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added config/ejoi/2023/media/photos/CYP3.png
Binary file added config/ejoi/2023/media/photos/CYP4.png
Binary file added config/ejoi/2023/media/photos/EST1.png
Binary file added config/ejoi/2023/media/photos/EST2.png
Binary file added config/ejoi/2023/media/photos/FRA1.png
Binary file added config/ejoi/2023/media/photos/FRA2.png
Binary file added config/ejoi/2023/media/photos/FRA3.png
Binary file added config/ejoi/2023/media/photos/FRA4.png
Binary file added config/ejoi/2023/media/photos/GEO1.png
Binary file added config/ejoi/2023/media/photos/GEO2.png
Binary file added config/ejoi/2023/media/photos/GEO3.png
Binary file added config/ejoi/2023/media/photos/GEO4.png
Binary file added config/ejoi/2023/media/photos/GEO5.png
Binary file added config/ejoi/2023/media/photos/GEO6.png
Binary file added config/ejoi/2023/media/photos/GEO7.png
Binary file added config/ejoi/2023/media/photos/GEO8.png
Binary file added config/ejoi/2023/media/photos/GRC1.png
Binary file added config/ejoi/2023/media/photos/GRC2.png
Binary file added config/ejoi/2023/media/photos/GRC3.png
Binary file added config/ejoi/2023/media/photos/GRC4.png
Binary file added config/ejoi/2023/media/photos/HRV1.png
Binary file added config/ejoi/2023/media/photos/HRV2.png
Binary file added config/ejoi/2023/media/photos/HRV3.png
Binary file added config/ejoi/2023/media/photos/HRV4.png
Binary file added config/ejoi/2023/media/photos/HUN1.png
Binary file added config/ejoi/2023/media/photos/HUN2.png
Binary file added config/ejoi/2023/media/photos/HUN3.png
Binary file added config/ejoi/2023/media/photos/HUN4.png
Binary file added config/ejoi/2023/media/photos/KAZ1.png
Binary file added config/ejoi/2023/media/photos/KAZ2.png
Binary file added config/ejoi/2023/media/photos/KAZ3.png
Binary file added config/ejoi/2023/media/photos/KAZ4.png
Binary file added config/ejoi/2023/media/photos/LTU1.png
Binary file added config/ejoi/2023/media/photos/LTU2.png
Binary file added config/ejoi/2023/media/photos/LTU3.png
Binary file added config/ejoi/2023/media/photos/LTU4.png
Binary file added config/ejoi/2023/media/photos/LVA1.png
Binary file added config/ejoi/2023/media/photos/LVA2.png
Binary file added config/ejoi/2023/media/photos/LVA3.png
Binary file added config/ejoi/2023/media/photos/LVA4.png
Binary file added config/ejoi/2023/media/photos/MDA1.png
Binary file added config/ejoi/2023/media/photos/MDA2.png
Binary file added config/ejoi/2023/media/photos/MDA3.png
Binary file added config/ejoi/2023/media/photos/MKD1.png
Binary file added config/ejoi/2023/media/photos/MKD2.png
Binary file added config/ejoi/2023/media/photos/MKD3.png
Binary file added config/ejoi/2023/media/photos/MKD4.png
Binary file added config/ejoi/2023/media/photos/POL1.png
Binary file added config/ejoi/2023/media/photos/POL2.png
Binary file added config/ejoi/2023/media/photos/POL3.png
Binary file added config/ejoi/2023/media/photos/POL4.png
Binary file added config/ejoi/2023/media/photos/ROU1.png
Binary file added config/ejoi/2023/media/photos/ROU2.png
Binary file added config/ejoi/2023/media/photos/ROU3.png
Binary file added config/ejoi/2023/media/photos/ROU4.png
Binary file added config/ejoi/2023/media/photos/SRB1.png
Binary file added config/ejoi/2023/media/photos/SRB2.png
Binary file added config/ejoi/2023/media/photos/SRB3.png
Binary file added config/ejoi/2023/media/photos/SRB4.png
Binary file added config/ejoi/2023/media/photos/SVN1.png
Binary file added config/ejoi/2023/media/photos/SVN2.png
Binary file added config/ejoi/2023/media/photos/SVN3.png
Binary file added config/ejoi/2023/media/photos/SVN4.png
Binary file added config/ejoi/2023/media/photos/TUR1.png
Binary file added config/ejoi/2023/media/photos/TUR2.png
Binary file added config/ejoi/2023/media/photos/TUR3.png
Binary file added config/ejoi/2023/media/photos/TUR4.png
Binary file added config/ejoi/2023/media/photos/UKR1.png
Binary file added config/ejoi/2023/media/photos/UKR2.png
Binary file added config/ejoi/2023/media/photos/UKR3.png
Binary file added config/ejoi/2023/media/photos/UKR4.png
6 changes: 6 additions & 0 deletions config/ejoi/2023/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"type": "cms",
"activeContest": "day2",
"otherContests": ["day1"],
"url": "http://ranking.ejoi2023.kiu.edu.ge"
}
13 changes: 9 additions & 4 deletions config/icpc-bapc/2022/settings.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
{
"type":"clics",
"login":"$creds.login",
"password":"$creds.password",
"url":"https://cds.gehack.nl/api/contests/bapc2022"
"type": "clics",
"feeds": [
{
"login": "$creds.login",
"password": "$creds.password",
"url": "https://cds.gehack.nl/api",
"contestId": "bapc2022"
}
]
}
15 changes: 10 additions & 5 deletions config/icpc-nac/2022/practice4/settings.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
{
"login":"$creds.kattis_login",
"password":"$creds.kattis_token",
"url":"https://open.kattis.com/clics-api/contests/nac22practice4",
"type":"clics",
"feedVersion":"2020_03",
"type": "clics",
"feeds": [
{
"url": "https://open.kattis.com/clics-api",
"contestId": "nac22practice4",
"feedVersion": "2020_03",
"login":"$creds.kattis_login",
"password":"$creds.kattis_token"
}
],
"emulation": { "speed": 10, "startTime": "now"}
}
17 changes: 10 additions & 7 deletions config/icpc-nac/2023/contest/settings.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
{
"type":"clics",
"login":"$creds.cds_login",
"password":"$creds.cds_password",
"url":"https://10.3.3.207/api/contests/NAC-2023-real",
"useTeamNames":false,

"#media_base_url":"http://10.3.3.207/api"
"type": "clics",
"feeds": [
{
"login": "$creds.cds_login",
"password": "$creds.cds_password",
"url": "https://10.3.3.207/api",
"contestId": "NAC-2023-real"
}
],
"useTeamNames": false
}
15 changes: 9 additions & 6 deletions config/icpc-nac/2023/dr/settings.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
{
"type":"clics",
"login":"$creds.cds_login",
"password":"$creds.cds_password",
"url":"https://10.3.3.207/api/contests/NAC-2023-dress",
"useTeamNames": false,

"#media_base_url":"http://10.3.3.207/api"
"feeds": [
{
"login": "$creds.cds_login",
"password": "$creds.cds_password",
"url": "https://10.3.3.207/api",
"contestId": "NAC-2023-dress"
}
],
"useTeamNames": false
}

14 changes: 9 additions & 5 deletions config/icpc-nac/2023/test1/settings.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
{
"type": "clics",
"login": "$creds.cds_login",
"password": "$creds.cds_password",
"url": "https://10.3.3.207/api/contests/NAC-2023-test1",
"useTeamNames": false,
"#media_base_url": "http://10.3.3.207/api"
"feeds": [
{
"login": "$creds.cds_login",
"password": "$creds.cds_password",
"url": "https://10.3.3.207/api",
"contestId": "NAC-2023-test1"
}
],
"useTeamNames": false
}
17 changes: 10 additions & 7 deletions config/icpc-nac/2023/test2/settings.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
{
"type":"clics",
"login":"$creds.cds_login",
"password":"$creds.cds_password",
"url":"https://10.3.3.207/api/contests/NAC-2023-test2",
"useTeamNames":false,

"#media_base_url":"http://10.3.3.207/api"
"type": "clics",
"feeds": [
{
"login": "$creds.cds_login",
"password": "$creds.cds_password",
"url": "https://10.3.3.207/api",
"contestId": "NAC-2023-test2"
}
],
"useTeamNames": false
}

11 changes: 8 additions & 3 deletions config/icpc-nwerc/2018/cds/settings.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
{
"type":"clics",
"login":"$creds.nwerc18_login_cds",
"password":"$creds.nwerc18_password_cds",
"url":"https://cds.gehack.nl/api/contests/nwerc18"
"feeds": [
{
"login": "$creds.nwerc18_login_cds",
"password": "$creds.nwerc18_password_cds",
"url": "https://cds.gehack.nl/api",
"contestId": "nwerc18"
}
]
}
13 changes: 9 additions & 4 deletions config/icpc-nwerc/2018/native/settings.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
{
"type":"clics",
"login":"$creds.nwerc18_login",
"password":"$creds.nwerc18_password",
"url":"https://www.domjudge.org/demoweb/api/contests/nwerc18"
"type": "clics",
"feeds": [
{
"login": "$creds.nwerc18_login",
"password": "$creds.nwerc18_password",
"url": "https://www.domjudge.org/demoweb/api",
"contestId": "nwerc18"
}
]
}
11 changes: 8 additions & 3 deletions config/icpc-nwerc/2019/settings.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
{
"type":"clics",
"login":"live",
"password":"monger-lawless-hymn-inhaler",
"url":"https://judge.gehack.nl:8443/api/contests/3"
"feeds": [
{
"login": "live",
"password": "monger-lawless-hymn-inhaler",
"url": "https://judge.gehack.nl:8443/api",
"contestId": "3"
}
]
}
12 changes: 8 additions & 4 deletions config/icpc-nwerc/2022/settings.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
{
"type":"clics",
"login":"$creds.login",
"password":"$creds.password",
"url":"https://cds.chipcie.ch.tudelft.nl/api/contests/nwerc2022",
"mediaBaseUrl":"https://cds.chipcie.ch.tudelft.nl/api"
"feeds": [
{
"login": "$creds.login",
"password": "$creds.password",
"url": "https://cds.chipcie.ch.tudelft.nl/api",
"contestId": "nwerc2022"
}
]
}
13 changes: 9 additions & 4 deletions config/icpc-rmc/2021/settings.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
{
"type":"clics",
"login":"$creds.kattis_login",
"password":"$creds.kattis_token",
"url":"https://open.kattis.com/clics-api/contests/rmc21",
"feedVersion":"2020_03",
"feeds": [
{
"login": "$creds.kattis_login",
"password": "$creds.kattis_token",
"url": "https://open.kattis.com/clics-api",
"contestId": "rmc21",
"feedVersion": "2020_03"
}
],

"emulation":{"speed":5,"startTime":"2022-05-11 22:40"}
}
4 changes: 0 additions & 4 deletions config/icpc-swerc/2021/contest/events.properties

This file was deleted.

11 changes: 11 additions & 0 deletions config/icpc-swerc/2021/contest/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"type": "clics",
"feeds": [
{
"login": "live",
"password": "secret",
"url": "https://cds.swerc.eu/api",
"contestId": "swerc2021"
}
]
}
13 changes: 9 additions & 4 deletions config/icpc-swerc/2021/dress/settings.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
{
"type":"clics",
"login":"live",
"password":"SECRET",
"url":"https://cds.swerc.eu/api/contests/demo",
"feedVersion":"2020_03"
"feeds": [
{
"login": "live",
"password": "SECRET",
"url": "https://cds.swerc.eu/api",
"contestId": "demo",
"feedVersion": "2020_03"
}
]
}
4 changes: 0 additions & 4 deletions config/icpc-swerc/2022/contest/events.properties

This file was deleted.

11 changes: 11 additions & 0 deletions config/icpc-swerc/2022/contest/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"type": "clics",
"feeds": [
{
"login": "live",
"password": "$creds.swerc22",
"url": "https://cds.swerc.eu/api",
"contestId": "swerc2022"
}
]
}
5 changes: 0 additions & 5 deletions config/icpc-swerc/2022/mirror/events.properties

This file was deleted.

6 changes: 6 additions & 0 deletions config/icpc-swerc/2022/mirror/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"type": "cf",
"apiKey": "$creds.codeforces_key",
"apiSecret": "$creds.codeforces_secret",
"contestId": 1776
}
Loading

0 comments on commit fb6c324

Please sign in to comment.