Skip to content

Commit a735dfc

Browse files
ZarrewitchZarrewitch
authored
Merge branch 'master' into ui/sort-templates-by-title
2 parents 5f3760d + 7e7eaf2 commit a735dfc

File tree

11 files changed

+336
-225
lines changed

11 files changed

+336
-225
lines changed

‎rcon/maps.py‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,16 @@ def image_name(self) -> str:
430430
axis=Faction(name=FactionName.GER.value, team=Team.AXIS),
431431
orientation=Orientation.VERTICAL,
432432
),
433+
Map(
434+
id="tobruk",
435+
name="TOBRUK",
436+
tag="TBK",
437+
pretty_name="Tobruk",
438+
shortname="Tobruk",
439+
allies=Faction(name=FactionName.GB.value, team=Team.ALLIES),
440+
axis=Faction(name=FactionName.GER.value, team=Team.AXIS),
441+
orientation=Orientation.HORIZONTAL,
442+
),
433443
)
434444
}
435445

@@ -1154,6 +1164,84 @@ def image_name(self) -> str:
11541164
game_mode=GameMode.CONTROL,
11551165
environment=Environment.NIGHT,
11561166
),
1167+
Layer(
1168+
id="tobruk_warfare_day",
1169+
map=MAPS["tobruk"],
1170+
game_mode=GameMode.WARFARE,
1171+
environment=Environment.DAY,
1172+
),
1173+
Layer(
1174+
id="tobruk_warfare_dusk",
1175+
map=MAPS["tobruk"],
1176+
game_mode=GameMode.WARFARE,
1177+
environment=Environment.DUSK,
1178+
),
1179+
Layer(
1180+
id="tobruk_warfare_morning",
1181+
map=MAPS["tobruk"],
1182+
game_mode=GameMode.WARFARE,
1183+
environment=Environment.DAWN,
1184+
),
1185+
Layer(
1186+
id="tobruk_offensivebritish_day",
1187+
map=MAPS["tobruk"],
1188+
game_mode=GameMode.OFFENSIVE,
1189+
attackers=Team.ALLIES,
1190+
environment=Environment.DAY,
1191+
),
1192+
Layer(
1193+
id="tobruk_offensiveger_day",
1194+
map=MAPS["tobruk"],
1195+
game_mode=GameMode.OFFENSIVE,
1196+
attackers=Team.AXIS,
1197+
environment=Environment.DAY,
1198+
),
1199+
Layer(
1200+
id="tobruk_offensivebritish_dusk",
1201+
map=MAPS["tobruk"],
1202+
game_mode=GameMode.OFFENSIVE,
1203+
attackers=Team.ALLIES,
1204+
environment=Environment.DUSK,
1205+
),
1206+
Layer(
1207+
id="tobruk_offensiveger_dusk",
1208+
map=MAPS["tobruk"],
1209+
game_mode=GameMode.OFFENSIVE,
1210+
attackers=Team.AXIS,
1211+
environment=Environment.DUSK,
1212+
),
1213+
Layer(
1214+
id="tobruk_offensivebritish_morning",
1215+
map=MAPS["tobruk"],
1216+
game_mode=GameMode.OFFENSIVE,
1217+
attackers=Team.ALLIES,
1218+
environment=Environment.DAWN,
1219+
),
1220+
Layer(
1221+
id="tobruk_offensiveger_morning",
1222+
map=MAPS["tobruk"],
1223+
game_mode=GameMode.OFFENSIVE,
1224+
attackers=Team.AXIS,
1225+
environment=Environment.DAWN,
1226+
),
1227+
Layer(
1228+
id="tobruk_skirmish_day",
1229+
map=MAPS["tobruk"],
1230+
game_mode=GameMode.CONTROL,
1231+
environment=Environment.DAY,
1232+
),
1233+
Layer(
1234+
id="tobruk_skirmish_dusk",
1235+
map=MAPS["tobruk"],
1236+
game_mode=GameMode.CONTROL,
1237+
environment=Environment.DUSK,
1238+
),
1239+
Layer(
1240+
id="tobruk_skirmish_morning",
1241+
map=MAPS["tobruk"],
1242+
game_mode=GameMode.CONTROL,
1243+
environment=Environment.DAWN,
1244+
),
11571245
)
11581246
}
11591247

‎rcongui/index.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
<meta name="viewport" content="width=device-width, initial-scale=1" />
1616
<meta name="theme-color" content="#000000" />
1717
<meta name="description" content="Open source tooling for Hell Let Loose" />
18-
<link rel="apple-touch-icon" href="/logo192.png" />
1918
<!--
2019
manifest.json provides metadata used when your web app is installed on a
2120
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/

‎rcongui/public/manifest.json‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,6 @@
66
"src": "favicon.png",
77
"sizes": "64x64 32x32 24x24 16x16",
88
"type": "image/png"
9-
},
10-
{
11-
"src": "logo192.png",
12-
"type": "image/png",
13-
"sizes": "192x192"
14-
},
15-
{
16-
"src": "logo512.png",
17-
"type": "image/png",
18-
"sizes": "512x512"
199
}
2010
],
2111
"start_url": ".",

‎rcongui/public/maps/tobruk-dawn.webp‎

54.1 KB
Loading

‎rcongui/public/maps/tobruk-day.webp‎

73.7 KB
Loading

‎rcongui/public/maps/tobruk-dusk.webp‎

79.7 KB
Loading

‎rcongui/src/components/Blacklist/BlacklistRecordGrid.js‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,6 @@ const BlacklistRecordTile = ({
165165
const text = getReportTemplate();
166166
if (navigator.clipboard === undefined) {
167167
alert(`This feature only works if your rcon uses HTTPS.`);
168-
return;
169-
}
170-
if (navigator.clipboard === undefined) {
171168
} else {
172169
navigator.clipboard.writeText(text).then(
173170
function () {
@@ -204,8 +201,7 @@ const BlacklistRecordTile = ({
204201
<Grid
205202
container
206203
justifyContent="space-around"
207-
spacing={0}
208-
204+
spacing={1}
209205
>
210206
<Grid>
211207
<Tooltip title={createdAt.format("LLLL")} arrow>
@@ -313,7 +309,7 @@ const BlacklistRecordGrid = ({
313309
(<Fragment>
314310
<Grid container>
315311
<Grid size={12}>
316-
<ImageList cols={size} cellHeight={210} spacing={12}>
312+
<ImageList cols={size} spacing={12}>
317313
{records.map((record) => {
318314
return (
319315
<ImageListItem

‎rcongui/src/pages/records/blacklists/index.jsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ const BlacklistRecords = () => {
207207
</Grid>
208208
<Grid size={12}>
209209
<MyPagination
210-
pageSize={searchQuery.pageSize}
210+
pageSize={searchQuery.page_size}
211211
page={page}
212212
setPage={setPage}
213213
total={totalRecords}
@@ -223,7 +223,7 @@ const BlacklistRecords = () => {
223223
</Grid>
224224
<Grid size={12}>
225225
<MyPagination
226-
pageSize={searchQuery.pageSize}
226+
pageSize={searchQuery.page_size}
227227
page={page}
228228
setPage={setPage}
229229
total={totalRecords}

0 commit comments

Comments
 (0)