6 changed files with 36 additions and 153 deletions
--- a/theme/config.json
+++ b/theme/config.json
@ -1,14 +1,13 @@
 {
    "TrackSolved": true,
    "Scoreboard": {
-        "DisplayServerURLWhenEnabled": true,
+        "DisplayServerURL": true,
        "ShowCategoryLeaders": true,
        "ReplayHistory": true,
-        "ReplayFPS": 6,
+        "ReplayFPS": 30,
        "ReplayDurationMS": 2000,
-        "NoScoresHtml": "<div class='notification'><h2>~ no scores ~</h2></div>",
        "": ""
    },
    "Messages": "<!-- Messages can go here (HTML) -->",
    "": "this is here so you don't have to remember to take the comma off the last item"
-}
+}
--- a/theme/moth.mjs
+++ b/theme/moth.mjs
@ -367,8 +367,8 @@ class State {
            Devel: obj.Config.Devel,
        }

-        /** True if the server is in enabled state, or if  we don't know */
-        this.Enabled = obj.Enabled ?? true
+        /** True if the server is in enabled state */
+        this.Enabled = obj.Enabled

        /** Map from Team ID to Team Name
         * @type {Object.<string,string>}
@ -492,7 +492,9 @@ class State {
     * @returns {Scores}
     */
    CurrentScores() {
-        return [...this.ScoresHistory()].pop()
+        let scores
+        for (scores of this.ScoreHistory());
+        return scores
    }
 }

@ -674,5 +676,4 @@ class Server {
 export {
    Hash,
    Server,
-    State,
 }
--- a/theme/scoreboard-all.html
+++ b/theme/scoreboard-all.html
@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Scoreboard</title>
-    <link rel="stylesheet" href="basic.css">
-    <link rel="stylesheet" href="scoreboard.css">
-    <meta name="viewport" content="width=device-width">
-    <link rel="icon" href="luna-moth.svg">
-    <script type="module" src="scoreboard.mjs"></script>
-  </head>
-  <body>
-    <div class="no-scores hidden"></div>
-    <div class="rotate">
-      <div class="rankings category"></div>
-      <div class="rankings classic"></div>
-    </div>
-    <div class="location"></div>
-  </body>
-</html>
--- a/theme/scoreboard.css
+++ b/theme/scoreboard.css
@ -18,52 +18,32 @@
  text-decoration: underline;
 }

-.no-scores {
-  display: flex;
-  justify-content: space-around;
-  align-items: center;
-  flex-wrap: wrap;
-  min-height: calc(100vh - 2em);
-}
-.no-scores.hidden {
-  display: none;
-}
-.no-scores img {
-  object-fit: cover;
-  max-height: 60vh;
-}
-
-/* Only the first child of a rotate class is visible */
-.rotate > div:nth-child(n + 2) {
-  display: none;
-}
-
 /** Scoreboard */
-.rankings.classic {
+#rankings {
 	width: 100%;
 	position: relative;
  background-color: #000c;
 }
-.rankings.classic div {
+#rankings div {
  height: 1.2rem;
  display: flex;
  align-items: center;
 }
-.rankings.classic div:nth-child(6n){
+#rankings div:nth-child(6n){
  background-color: #ccc3;
 }
-.rankings.classic div:nth-child(6n+3) {
+#rankings div:nth-child(6n+3) {
  background-color: #0f03;
 }

-.rankings.classic span {
+#rankings span {
  display: inline-block;
  overflow: hidden;
 }
-.rankings.classic span.category {
+#rankings span.category {
  font-size: 80%;
 }
-.rankings.classic span.teamname {
+#rankings span.teamname {
  height: auto;
 	font-size: inherit;
 	color: white;
@ -72,8 +52,8 @@
 	position: absolute;
 	right: 0.2em;
 }
-.rankings.classic span.teamname:hover,
-.rankings.classic span.category:hover {
+#rankings span.teamname:hover,
+#rankings span.category:hover {
  width: inherit;
  max-width: 100%;
 }
@ -83,24 +63,8 @@
  vertical-align: top;
 }

-.rankings.category {
-  display: flex;
-  flex-wrap: wrap;
-  justify-content: space-evenly;
-}
-.rankings.category div {
-  border: solid black 2px;
-  min-width: 15em;
-}
-.rankings.category table {
-  width: 100%;
-}
-.rankings.category td.number {
-  text-align: right;
-}
-
@media only screen and (max-width: 450px) {
-  .rankings.classic span.teamname {
+  #rankings span.teamname {
    max-width: 6em;
    text-overflow: ellipsis;
  }
@ -109,7 +73,7 @@
  }
 }

-.rankings div * {white-space: nowrap;}
+#rankings div * {white-space: nowrap;}
 .cat0, .cat8, .cat16 {background-color: #a6cee3; color: black;}
 .cat1, .cat9, .cat17 {background-color: #1f78b4; color: white;}
 .cat2, .cat10, .cat18 {background-color: #b2df8a; color: black;}
--- a/theme/scoreboard.html
+++ b/theme/scoreboard.html
@ -5,12 +5,13 @@
    <link rel="stylesheet" href="basic.css">
    <link rel="stylesheet" href="scoreboard.css">
    <meta name="viewport" content="width=device-width">
-    <link rel="icon" href="luna-moth.svg">
+    <script src="https://cdn.jsdelivr.net/npm/luxon@1.26.0"></script>
+    <script src="https://cdn.jsdelivr.net/npm/chart.js@3.0.2"></script>
+    <script src="https://cdn.jsdelivr.net/npm/chartjs-adapter-luxon@0.2.1"></script>
    <script type="module" src="scoreboard.mjs"></script>
  </head>
  <body>
-    <div class="no-scores hidden"></div>
-    <div class="rankings classic"></div>
+    <div id="rankings"></div>
    <div class="location"></div>
  </body>
 </html>
--- a/theme/scoreboard.mjs
+++ b/theme/scoreboard.mjs
@ -34,43 +34,25 @@ async function update() {
  }

  // Pull configuration settings
-  if (!config.Scoreboard) {
-    console.warn("config.json has empty Scoreboard section")
-  }
  let ScoreboardConfig = config.Scoreboard ?? {}
-  let state = await server.GetState()
-
-  // Show URL of server
-  for (let e of document.querySelectorAll(".location")) {
-    e.textContent = common.BaseURL
-    e.classList.toggle("hidden", !(ScoreboardConfig.DisplayServerURLWhenEnabled && state.Enabled))
-  }
-
-  // Rotate views
-  for (let e of document.querySelectorAll(".rotate")) {
-    e.appendChild(e.firstChild)
-  }
-
-  // Render rankings
-  for (let e of document.querySelectorAll(".rankings")) {
-    if (e.classList.contains("classic")) {
-      classicRankings(e, state, ScoreboardConfig)
-    } else if (e.classList.contains("category")) {
-      categoryRankings(e, state, ScoreboardConfig)
-    }
-  }
-
-}
-
-async function classicRankings(rankingsElement, state, ScoreboardConfig) {
  let ReplayHistory = ScoreboardConfig.ReplayHistory ?? false
  let ReplayDurationMS = ScoreboardConfig.ReplayDurationMS ?? 300
  let ReplayFPS = ScoreboardConfig.ReplayFPS ?? 24
+  if (!config.Scoreboard) {
+    console.warn("config.json has empty Scoreboard section")
+  }

+  for (let e of document.querySelectorAll(".location")) {
+    e.textContent = common.BaseURL
+    e.classList.toggle("hidden", !ScoreboardConfig.DisplayServerURL)
+  }
+
+  let state = await server.GetState()
+  let rankingsElement = document.querySelector("#rankings")
  let logSize = state.PointsLog.length

  // Figure out the timing so that we can replay the scoreboard in about
-  // ReplayDurationMS.
+  // ReplayDurationMS, but no more than 24 frames per second.
  let frameModulo = 1
  let delay = 0
  while (delay < (common.Second / ReplayFPS)) {
@ -95,7 +77,7 @@ async function classicRankings(rankingsElement, state, ScoreboardConfig) {
    
    let topScore = scores.CyFiScore(sortedTeamIDs[0])
    for (let teamID of sortedTeamIDs) {
-      let teamName = state.TeamNames[teamID] ?? "rodney"
+      let teamName = state.TeamNames[teamID]
      
      let row = rankingsElement.appendChild(document.createElement("div"))
      
@ -103,6 +85,7 @@ async function classicRankings(rankingsElement, state, ScoreboardConfig) {
      teamname.textContent = teamName
      teamname.classList.add("teamname")
      
+      let categoryNumber = 0
      let teampoints = row.appendChild(document.createElement("span"))
      teampoints.classList.add("teampoints")
      for (let category of scores.Categories) {
@ -115,7 +98,6 @@ async function classicRankings(rankingsElement, state, ScoreboardConfig) {
        let block = row.appendChild(document.createElement("span"))
        let points = scores.GetPoints(category, teamID)
        let width = MaxScoreWidth * score / topScore
-        let categoryNumber = [...scores.Categories].indexOf(category)

        block.textContent = category
        block.title = `${points} points`
@ -128,51 +110,6 @@ async function classicRankings(rankingsElement, state, ScoreboardConfig) {
    }
    await sleep(delay)
  }
-
-  for (let e of document.querySelectorAll(".no-scores")) {
-    e.innerHTML = ScoreboardConfig.NoScoresHtml
-    e.classList.toggle("hidden", frame > 0)
-  }
-}
-
-/**
- * 
- * @param {*} rankingsElement 
- * @param {moth.State} state 
- * @param {*} ScoreboardConfig 
- */
-async function categoryRankings(rankingsElement, state, ScoreboardConfig) {
-  while (rankingsElement.firstChild) rankingsElement.firstChild.remove()
-  let scores = state.CurrentScores()
-  for (let category of scores.Categories) {
-    let categoryBox = rankingsElement.appendChild(document.createElement("div"))
-    categoryBox.classList.add("category")
-
-    categoryBox.appendChild(document.createElement("h2")).textContent = category
-
-    let categoryScores = []
-    for (let teamID in state.TeamNames) {
-      categoryScores.push({
-        teamName: state.TeamNames[teamID],
-        score: scores.GetPoints(category, teamID),
-      })
-    }
-    categoryScores.sort((a, b) => b.score - a.score)
-    
-    let table = categoryBox.appendChild(document.createElement("table"))
-    let rows = 0
-    for (let categoryScore of categoryScores) {
-      let row = table.appendChild(document.createElement("tr"))
-      row.appendChild(document.createElement("td")).textContent = categoryScore.teamName
-      let td = row.appendChild(document.createElement("td"))
-      td.textContent = categoryScore.score
-      td.classList.add("number")
-      rows += 1
-      if (rows == 5) {
-        break
-      }
-    }
-  }
 }

 function init() {