From 4f9ca53e1bfb24febbe981c746405c50194f9303 Mon Sep 17 00:00:00 2001
From: Derek Stevens <nilix@nilfm.cc>
Date: Tue, 21 Feb 2023 22:27:54 -0700
Subject: [PATCH] auto-scroll dicelog and connect to table viewing as admin

---
 static/admin.js   |  4 ++++
 static/index.html |  4 ++--
 static/socket.js  | 31 ++++++++++++++++++++-----------
 static/style.css  | 10 +++++++++-
 4 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/static/admin.js b/static/admin.js
index fa6002b..d72b466 100644
--- a/static/admin.js
+++ b/static/admin.js
@@ -15,6 +15,9 @@ async function getTable(name, pass) {
     });
   
     if (res.ok) {
+      document.getElementById("input_table_name").value = name;
+      document.getElementById("input_table_pass").value = pass;
+      dial();
       infoHtml = "<a href='#' onclick='getTables()'>&larr; table list</a><br><pre>";
       infoHtml += await res.text();
       infoHtml += "</pre>"
@@ -63,6 +66,7 @@ async function doLogin() {
     if (adminToken) {
       adminWrapper.style.display="block";
       getTables();
+      adminZone.style.display = "block";
     } else {
       setErr("Incorrect credentials");
     }
diff --git a/static/index.html b/static/index.html
index a6e97f6..a24e392 100644
--- a/static/index.html
+++ b/static/index.html
@@ -58,7 +58,8 @@
   <input id="dice_note"><button id="dice_submit" onclick="rollDice()">Roll</button>
   <div id="dice_log"></div>
   <div id="map"></div>
-  <div id="adminWrapper" style="display:none;">
+  </main>
+    <div id="adminWrapper" style="display:none;">
     <div id="adminCtrl">
       <button onclick="setTableCreateFormVisible(true)">New Table</button>
       <form onsubmit="return false" id="createTableForm" style="display:none;">
@@ -70,7 +71,6 @@
     </div>
     <div id="adminZone"></div>
   </div>
-  </main>
 </body>
     <script src="./util.js" type="text/javascript"></script>
     <script src="./socket.js" type="text/javascript"></script>
diff --git a/static/socket.js b/static/socket.js
index 0d238b9..df7c055 100644
--- a/static/socket.js
+++ b/static/socket.js
@@ -16,21 +16,27 @@ function showTableModal(show) {
 
 function formatDice(r) {
   const date = new Date(r.timestamp)
-  
-  return `<p>${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()} ${date.getHours()}:${date.getMinutes()}:${date.getSeconds()} ${r.player} rolled ${r.roll.length}d${r.faces} ${(r.note ? "(" + r.note + ")" : "")}<br>[${r.roll}] (total ${r.roll.reduce((a,c)=>a+c,0)})</p>`
+  const p = document.createElement("p");
+  p.innerHTML = `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()} ${date.getHours()}:${date.getMinutes()}:${date.getSeconds()} ${r.player} rolled ${r.roll.length}d${r.faces} ${(r.note ? "(" + r.note + ")" : "")}<br>[${r.roll}] (total ${r.roll.reduce((a,c)=>a+c,0)})`;
+  return p;
 }
 
 function logDice(dice, many) {
   const diceLog = document.getElementById("dice_log");
-  if (diceLog) {
-    if (many) {
-      for(const r of dice) {
-        diceLog.innerHTML += formatDice(r);
-      }
-    } else {
-      diceLog.innerHTML += formatDice(dice);
+  if (!many) {
+    dice = [ dice ];
+  } else {
+    if (diceLog) {
+      diceLog.innerHTML = "";
     }
   }
+  if (diceLog) {
+      for(const r of dice) {
+        const p = formatDice(r);
+        diceLog.append(p);
+        p.scrollIntoView();
+      }
+  }
 }
 
 function makeUpToDate(table) {
@@ -47,9 +53,12 @@ function dial() {
     tableKey.name = tblNameInput.value;
     tableKey.passcode = tblPassInput.value;
     
+    if (conn) {
+      conn.close(1000);
+    }
     conn = new WebSocket(`ws://${location.host}/subscribe`, `${tableKey.name}.${tableKey.passcode}`);
     conn.addEventListener("close", e => {
-      if (e.code !== 1001) {
+      if (e.code > 1001) {
         // TODO: add message to let user know they are reconnecting
         setTimeout(dial, 1000)
       } else {
@@ -70,7 +79,7 @@ function dial() {
     });
     conn.addEventListener("error", e => {
       setErr(JSON.stringify(e));
-      conn.close();
+      conn.close(1002);
     })
     
     conn.addEventListener("message", e => {
diff --git a/static/style.css b/static/style.css
index 0ffd3fd..4b58d35 100644
--- a/static/style.css
+++ b/static/style.css
@@ -65,8 +65,16 @@ button:hover {
 #dice_log {
   background: #fff;
   color: #000;
+  height: 10em;
+  max-height: 10em;
+  display: block;
+  overflow-y: auto;
 }
 
 #dice_log p {
-  margin: 0.5ch;
+  padding: 0.5ch;
+}
+
+#dice_log p:not(:last-child) {
+  border-bottom: solid 1px gray;
 }
\ No newline at end of file