neale/moth
neale
/
moth
mirror of https://github.com/dirtbags/moth.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clean up and comment js in puzzle list and scoreboard

This commit is contained in:
Neale Pickett 2018-10-10 23:33:26 +00:00
parent ab0cd35d2f
commit aa23e248b4
3 changed files with 122 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
theme/puzzle-list.html
View File

@ -9,10 +9,9 @@
function render(obj) { function render(obj) {
puzzlesElement = document.createElement('div'); puzzlesElement = document.createElement('div');
let cats = [];
for (let cat in obj) { // Create a sorted list of category names
cats.push(cat); let cats = Object.keys(obj);
}
cats.sort(); cats.sort();
for (let cat of cats) { for (let cat of cats) {
@ -29,6 +28,7 @@ function render(obj) {
pdiv.appendChild(h); pdiv.appendChild(h);
h.textContent = cat; h.textContent = cat;
// Extras if we're running a devel server
if (obj.__devel__) { if (obj.__devel__) {
var a = document.createElement('a'); var a = document.createElement('a');
h.insertBefore(a, h.firstChild); h.insertBefore(a, h.firstChild);
@ -50,6 +50,7 @@ function render(obj) {
i.textContent = " "; i.textContent = " ";
if (points === 0) { if (points === 0) {
// Sentry: there are no more puzzles in this category
i.textContent = "✿"; i.textContent = "✿";
} else { } else {
var a = document.createElement('a'); var a = document.createElement('a');
@ -66,16 +67,22 @@ function render(obj) {
function init() { function init() {
fetch("puzzles.json") fetch("puzzles.json")
.then(function(resp) { .then(resp => {
return resp.json(); return resp.json();
}).then(function(obj) { })
.then(obj => {
render(obj); render(obj);
}).catch(function(err) { })
.catch(err => {
console.log("Error", err); console.log("Error", err);
}); });
} }
document.addEventListener("DOMContentLoaded", init); if (document.readyState === "loading") {
document.addEventListener("DOMContentLoaded", init);
} else {
init();
}
</script> </script>
</head> </head>
<body> <body>

1
theme/puzzle.html
View File

@ -34,7 +34,6 @@ function init() {
let st = document.createElement("script"); let st = document.createElement("script");
document.head.appendChild(st); document.head.appendChild(st);
st.src = base + script; st.src = base + script;
} }
// List associated files // List associated files

122
theme/scoreboard.html
View File

@ -5,39 +5,34 @@
<link rel="stylesheet" href="basic.css"> <link rel="stylesheet" href="basic.css">
<meta name="viewport" content="width=device-width"> <meta name="viewport" content="width=device-width">
<script> <script>
function loadJSON(url, callback) { function update(state) {
function loaded(e) { let element = document.getElementById("scoreboard");
callback(e.target.response); let teamnames = state["teams"];
} let pointslog = state["points"];
var xhr = new XMLHttpRequest() let highscore = {};
xhr.onload = loaded; let teams = {};
xhr.open("GET", url, true);
xhr.responseType = "json";
xhr.send();
}
function scoreboard(element, continuous) { // Every machine that's displaying the scoreboard helpfully stores the last 20 values of
function update(state) { // points.json for us, in case of catastrophe. Thanks, y'all!
var teamnames = state["teams"]; //
var pointslog = state["points"]; // We have been doing some letiation on this "everybody backs up the server state" trick since 2009.
var pointshistory = JSON.parse(localStorage.getItem("pointshistory")) || []; // We have needed it 0 times.
let pointshistory = JSON.parse(localStorage.getItem("pointshistory")) || [];
if (pointshistory.length >= 20){ if (pointshistory.length >= 20){
pointshistory.shift(); pointshistory.shift();
} }
pointshistory.push(pointslog); pointshistory.push(pointslog);
localStorage.setItem("pointshistory", JSON.stringify(pointshistory)); localStorage.setItem("pointshistory", JSON.stringify(pointshistory));
var highscore = {};
var teams = {};
// Dole out points // Dole out points
for (var i in pointslog) { for (let i in pointslog) {
var entry = pointslog[i]; let entry = pointslog[i];
var timestamp = entry[0]; let timestamp = entry[0];
var teamhash = entry[1]; let teamhash = entry[1];
var category = entry[2]; let category = entry[2];
var points = entry[3]; let points = entry[3];
var team = teams[teamhash] || {__hash__: teamhash}; let team = teams[teamhash] || {__hash__: teamhash};
// Add points to team's points for that category // Add points to team's points for that category
team[category] = (team[category] || 0) + points; team[category] = (team[category] || 0) + points;
@ -50,51 +45,39 @@ function scoreboard(element, continuous) {
// Sort by team score // Sort by team score
function teamScore(t) { function teamScore(t) {
var score = 0; let score = 0;
for (let category in highscore) {
for (var category in highscore) {
score += (t[category] || 0) / highscore[category]; score += (t[category] || 0) / highscore[category];
} }
// XXX: This function really shouldn't have side effects.
t.__score__ = score;
return score; return score;
} }
function teamCompare(a, b) { function teamCompare(a, b) {
return teamScore(a) - teamScore(b); return teamScore(a) - teamScore(b);
} }
var winners = []; // Figure out how to order each team on the scoreboard
for (var i in teams) { let winners = [];
for (let i in teams) {
winners.push(teams[i]); winners.push(teams[i]);
} }
if (winners.length == 0) {
// No teams!
return;
}
winners.sort(teamCompare); winners.sort(teamCompare);
winners.reverse(); winners.reverse();
// Clear out the element we're about to populate // Clear out the element we're about to populate
while (element.lastChild) { Array.from(element.childNodes).map(e => e.remove());
element.removeChild(element.lastChild);
}
// Populate! let maxWidth = 100 / Object.keys(highscore).length;
var topActualScore = winners[0].__score__; for (let i in winners) {
let team = winners[i];
let row = document.createElement("div");
let ncat = 0;
for (let category in highscore) {
let catHigh = highscore[category];
let catTeam = team[category] || 0;
let catPct = catTeam / catHigh;
let width = maxWidth * catPct;
// (100 / ncats) * (ncats / topActualScore); let bar = document.createElement("span");
var maxWidth = 100 / topActualScore;
for (var i in winners) {
var team = winners[i];
var row = document.createElement("div");
var ncat = 0;
for (var category in highscore) {
var catHigh = highscore[category];
var catTeam = team[category] || 0;
var catPct = catTeam / catHigh;
var width = maxWidth * catPct;
var bar = document.createElement("span");
bar.classList.add("category"); bar.classList.add("category");
bar.classList.add("cat" + ncat); bar.classList.add("cat" + ncat);
bar.style.width = width + "%"; bar.style.width = width + "%";
@ -105,30 +88,37 @@ function scoreboard(element, continuous) {
ncat += 1; ncat += 1;
} }
var te = document.createElement("span"); let te = document.createElement("span");
te.classList.add("teamname"); te.classList.add("teamname");
te.textContent = teamnames[team.__hash__]; te.textContent = teamnames[team.__hash__];
row.appendChild(te); row.appendChild(te);
element.appendChild(row); element.appendChild(row);
} }
} }
function once() { function once() {
loadJSON("points.json", update); fetch("points.json")
} .then(resp => {
if (continuous) { return resp.json();
setInterval(once, 60000); })
} .then(obj => {
once(); update(obj);
})
.catch(err => {
console.log(err);
});
} }
function init() { function init() {
var sb = document.getElementById("scoreboard"); setInterval(once, 60000);
scoreboard(sb, true); once();
}
if (document.readyState === "loading") {
document.addEventListener("DOMContentLoaded", init);
} else {
init();
} }
document.addEventListener("DOMContentLoaded", init);
</script> </script>
</head> </head>
<body> <body>