Skip to content

Commit 9dee485

Browse files
committed
room colors
1 parent b4bf230 commit 9dee485

File tree

3 files changed

+12
-17
lines changed

3 files changed

+12
-17
lines changed

app/static/checkin/index.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ function scannedCode(result) {
3838
let room = "ENG1-186 staff desk";
3939
let team_number = Number(json.user.team_number);
4040
if (team_number >= 1 && team_number <= 8) {
41-
color = "green";
41+
color = "purple";
4242
room = "ENG1-187";
4343
} else if (team_number >= 9 && team_number <= 15) {
44-
color = "purple";
45-
room = "ENG1-188";
46-
} else if (team_number >= 15 && team_number <= 22) {
4744
color = "yellow";
45+
room = "ENG1-188";
46+
} else if (team_number >= 16 && team_number <= 22) {
47+
color = "green";
4848
room = "ENG1-260";
4949
}
5050

app/static/dash/index.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@ function populate_column(teams, min, max) {
3333
}
3434

3535
function populate_page(teams) {
36-
let out = `<div id="room_green" class="room">
37-
<h2 class="team green">ENG1-187</h2>
36+
let out = `<div id="room_purple" class="room">
37+
<h2 class="team purple">ENG1-187</h2>
3838
${populate_column(teams, 0, 8)}
3939
</div>
40-
<div id="room_purple" class="room">
41-
<h2 class="team purple">ENG1-188</h2>
40+
<div id="room_yellow" class="room">
41+
<h2 class="team yellow">ENG1-188</h2>
4242
${populate_column(teams, 8, 15)}
4343
</div>
44-
<div id="room_yellow" class="room">
45-
<h2 class="team yellow">ENG1-260</h2>
44+
<div id="room_green" class="room">
45+
<h2 class="team green">ENG1-260</h2>
4646
${populate_column(teams, 16, 22)}
4747
</div>`;
4848

app/templates/scoreboard.html

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -167,12 +167,7 @@
167167
<mq><div id="messageText"></div></mq>
168168
</div>
169169
</div>
170-
<iframe
171-
class="vid"
172-
src="https://scoreboard.plinko.horse/s/scorestack/app/dashboards#/view/scorestack-scoreboard?embed=true&_g=(filters%3A!()%2CrefreshInterval%3A(pause%3A!f%2Cvalue%3A30000)%2Ctime%3A(from%3Anow-7d%2Fd%2Cto%3Anow))&hide-filter-bar=true"
173-
height="600"
174-
width="800"
175-
></iframe>
170+
<iframe class="vid" src="" height="600" width="800"></iframe>
176171
<div class="else">
177172
<div class="center">
178173
<div id="secondary">
@@ -310,7 +305,7 @@
310305

311306
// WebSockets code (adapted from FastAPI docs)
312307
let ws = new WebSocket(
313-
"wss://{{domain}}/plinko/ws/" + getCookie("token"),
308+
"wss://hr.plinko.horse/plinko/ws/" + getCookie("token"),
314309
);
315310

316311
ws.onmessage = function (event) {

0 commit comments

Comments
 (0)