From 7ad9d76f78c684630eeb8110fb266d62dd3f4bb1 Mon Sep 17 00:00:00 2001
From: Derek Stevens <nilix@nilfm.cc>
Date: Fri, 12 May 2023 22:33:14 -0600
Subject: [PATCH] auxMsg is working

---
 gametable/server.go |  8 ++++----
 models/models.go    |  9 ++++-----
 static/index.html   |  3 ++-
 static/socket.js    | 25 +++++++++++++++++--------
 static/style.css    |  9 +++++++++
 5 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/gametable/server.go b/gametable/server.go
index 2fb907c..b4ac9c0 100644
--- a/gametable/server.go
+++ b/gametable/server.go
@@ -232,10 +232,10 @@ func (self *GameTableServer) writeToDB(tableMsg models.TableMessage) error {
 				}
 			}
 			if tableMsg.AuxMsg != nil {
-			 err := self.dbAdapter.SetAuxMessage(key, *tableMsg.AuxMsg)
-			 if err != nil {
-			   return err
-			 }
+				err := self.dbAdapter.SetAuxMessage(key, *tableMsg.AuxMsg)
+				if err != nil {
+					return err
+				}
 			}
 		}
 	}
diff --git a/models/models.go b/models/models.go
index 799fc6b..e8de431 100644
--- a/models/models.go
+++ b/models/models.go
@@ -17,23 +17,22 @@ type DiceRoll struct {
 	Timestamp time.Time `json:"timestamp"`
 }
 
-
 type Token struct {
 	Id        string `json:"id"`
 	Name      string `json:"name"`
 	SpriteUri string `json:"spriteUrl"`
-	X         *int    `json:"x"`
-	Y         *int    `json:"y"`
+	X         *int   `json:"x"`
+	Y         *int   `json:"y"`
 }
 
 type Table struct {
 	Name            string     `json:"name"`
 	Passcode        string     `json:"passcode"`
-	MapImageUrl     string     `json:"mapImageUrl"`
+	MapImageUrl     string     `json:"mapImg"`
 	DiceRolls       []DiceRoll `json:"diceRolls"`
 	Tokens          []Token    `json:"tokens"`
 	AvailableTokens []Token    `json:"availableTokens"`
-	AuxMessage      string     `json:"auxMessage"`
+	AuxMessage      string     `json:"auxMsg"`
 }
 
 type TableMessage struct {
diff --git a/static/index.html b/static/index.html
index a24e392..c2df305 100644
--- a/static/index.html
+++ b/static/index.html
@@ -57,9 +57,10 @@
   </select>
   <input id="dice_note"><button id="dice_submit" onclick="rollDice()">Roll</button>
   <div id="dice_log"></div>
+  <div id="aux"></div>
   <div id="map"></div>
   </main>
-    <div id="adminWrapper" style="display:none;">
+  <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;">
diff --git a/static/socket.js b/static/socket.js
index 9e831e4..066ef01 100644
--- a/static/socket.js
+++ b/static/socket.js
@@ -39,13 +39,26 @@ function logDice(dice, many) {
   }
 }
 
+function setAuxMsg(msg) {
+  const auxDiv = document.getElementById("aux");
+  if (auxDiv) {
+    console.log("eeee");
+    auxDiv.innerText = msg;
+  }
+}
+
 function makeUpToDate(table) {
   if (table) {
     if (table.diceRolls) {
       logDice(table.diceRolls, true);
+    } else if (table.diceRoll) {
+      logDice(table.diceRoll, false);
     }
-    if (table.mapImageUrl) {
-      setMapImg(table.mapImageUrl);
+    if (table.mapImg) {
+      setMapImg(table.mapImg);
+    }
+    if (table.auxMsg) {
+      setAuxMsg(table.auxMsg);
     }
   }
 }
@@ -101,13 +114,9 @@ function dial() {
         table = data;
         makeUpToDate(table);
       } else {
-        if (data.diceRoll) {
-          logDice(data.diceRoll);
-        }
-        if (data.mapImageUrl) {
-          setMapImg(data.mapImageUrl);
-        }
+        makeUpToDate(data);
       }
+      
       console.log(data);
     });
   }
diff --git a/static/style.css b/static/style.css
index 4b58d35..65beb18 100644
--- a/static/style.css
+++ b/static/style.css
@@ -77,4 +77,13 @@ button:hover {
 
 #dice_log p:not(:last-child) {
   border-bottom: solid 1px gray;
+}
+
+#aux {
+  display: block;
+  background: #fff;
+  color: #000;
+  height: auto;
+  width: auto;
+  border: solid 1px dimgray;
 }
\ No newline at end of file