From c2e834a67aaa77b65fd2b4519d0acd1eb020f796 Mon Sep 17 00:00:00 2001
From: Paul Brinkmeier <hallo@pbrinkmeier.de>
Date: Tue, 17 Jan 2023 18:32:21 +0100
Subject: [PATCH] Implement board view and improve chat

---
 glebby-client/src/App.vue             |   9 +-
 glebby-client/src/components/Game.vue | 176 +++++++++++++++++++++++---
 2 files changed, 160 insertions(+), 25 deletions(-)

diff --git a/glebby-client/src/App.vue b/glebby-client/src/App.vue
index af311f3..64baaac 100644
--- a/glebby-client/src/App.vue
+++ b/glebby-client/src/App.vue
@@ -10,14 +10,14 @@ export default {
   components: {
     Game
   },
-  data() {
+  data(): { ws: WebSocket, model: any } {
     return {
       ws: new WebSocket(import.meta.env.VITE_GLEBBY_SERVER_URL),
-      model: null as any
+      model: null
     }
   },
   created() {
-    const messageListener = (ev: MessageEvent) => {
+    const messageListener = (ev: MessageEvent) => { 
       const message = JSON.parse(ev.data)
       const payload = message.payload
 
@@ -30,7 +30,8 @@ export default {
         }
         this.model = {
           yourId: payload.state.yourId,
-          players
+          players,
+          board: payload.state.board
         }
         this.ws.removeEventListener('message', messageListener)
       }
diff --git a/glebby-client/src/components/Game.vue b/glebby-client/src/components/Game.vue
index 8c23835..a3eeef6 100644
--- a/glebby-client/src/components/Game.vue
+++ b/glebby-client/src/components/Game.vue
@@ -8,7 +8,8 @@ interface Player {
 
 interface Model {
   yourId: number,
-  players: Map<number, Player>
+  players: Map<number, Player>,
+  board: string[4][4]
 }
 
 function getPlayer(model: Model, id: number): Player | undefined {
@@ -26,13 +27,16 @@ export default defineComponent({
   },
   data() {
     return {
-      chatMessages: [] as string[],
+      chatMessages: [] as { from: number, message: string }[],
 
       playerName: '',
       chatMessage: ''
     }
   },
   created() {
+    console.log(this.model.board)
+    console.log(this.model)
+    console.log(this.model.players)
     this.ws.addEventListener('message', (ev) => {
       const message = JSON.parse(ev.data)
       const payload = message.payload
@@ -50,12 +54,20 @@ export default defineComponent({
           this.model.players.delete(message.from)
           break
         case 'chat':
-          this.chatMessages.push(payload.message)
+          this.chatMessages.push({
+            from: message.from,
+            message: payload.message
+          })
           break
         case 'set-name':
           getPlayer(this.model, message.from)!.name = payload.name
           break
+        case 'roll':
+          this.model.board = payload.board
+          break
       }
+
+      console.log(this.model)
     })
   },
   methods: {
@@ -75,28 +87,150 @@ export default defineComponent({
         message: this.chatMessage
       }))
       this.chatMessage = ''
+    },
+    roll() {
+      this.ws.send(JSON.stringify({
+        type: 'roll'
+      }))
     }
   }
 })
 </script>
 
 <template>
-  <pre>{{ model }}</pre>
-  <h1>I am #{{ model.yourId }}</h1>
-  <form @submit.prevent="setName">
-    <input v-model="playerName" placeholder="enter your name...">
-    <button >set name</button>
-  </form>
-  <form @submit.prevent="sendChat">
-    <input v-model="chatMessage">
-    <button>Post</button>
-  </form>
-  <h2>players</h2>
-  <ul v-if="model">
-    <li v-for="[id, player] in model.players" :key="id">{{ player.name }}#{{ player.id }}</li>
-  </ul>
-  <h2>chat</h2>
-  <ul v-if="model">
-    <li v-for="message in chatMessages">{{ message }}</li>
-  </ul>
+  <div class="glebby-game">
+    <div class="topbar">
+      <h1>Glebby</h1>
+    </div>
+    <div class="game">
+      <h2>board</h2>
+      <button @click="roll">roll</button>
+      <div v-if="model.board" class="game-board">
+        <div v-for="row in model.board" class="game-row">
+          <div v-for="die in row" class="game-die">{{ die.toUpperCase() }}</div>
+        </div>
+      </div>
+    </div>
+    <div class="playerlist">
+      <h2>players</h2>
+      <form @submit.prevent="setName">
+        <input v-model="playerName" placeholder="enter your name...">
+        <button>set name</button>
+      </form>
+      <ul v-if="model">
+        <li v-for="[id, player] in model.players" :key="id">
+          <code>{{ player.name }}#{{ player.id }}</code>
+        </li>
+      </ul>
+    </div>
+    <div class="chatbox">
+      <h2>chat</h2>
+      <div class="chatbox-scroller">
+        <div class="chatbox-scroller-content">
+          <div v-for="message in chatMessages" class="chatbox-message">
+            <code>{{ model.players.get(message.from)!.name }}#{{ message.from }}:</code> {{ message.message }}
+          </div>
+        </div>
+      </div>
+      <form @submit.prevent="sendChat">
+        <input v-model="chatMessage">
+        <button>Post</button>
+      </form>
+    </div>
+  </div>
 </template>
+
+<style>
+  body {
+    margin: 0;
+  }
+
+  .glebby-game {
+    width: 100vw;
+    height: 100vh;
+    display: grid;
+    grid-template-columns: 1fr 20em;
+    grid-template-rows: min-content 1fr 12em;
+    grid-template-areas:
+      "topbar  topbar"
+      "game    playerlist"
+      "chatbox playerlist";
+    gap: .5em;
+    padding: .5em;
+    box-sizing: border-box;
+  }
+
+  .topbar,
+  .game,
+  .playerlist,
+  .chatbox {
+    background-color: #f0f0f0;
+    padding: .5em;
+  }
+
+  .topbar {
+    grid-area: topbar;
+  }
+
+  .game {
+    grid-area: game;
+  }
+
+  .playerlist {
+    grid-area: playerlist;
+  }
+
+  .chatbox {
+    grid-area: chatbox;
+  }
+
+  h1, h2 {
+    margin: 0;
+    font-family: monospace;
+  }
+
+  .game-board {
+    display: flex;
+    gap: 1em;
+    flex-direction: column;
+    align-items: center;
+  }
+
+  .game-row {
+    display: flex;
+    gap: 1em;
+  }
+
+  .game-die {
+    width: 2em;
+    height: 2em;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background-color: white;
+    font-family: monospace;
+    font-size: 1.5em;
+    font-weight: bold;
+  }
+
+  .chatbox {
+    display: grid;
+    grid-template-rows: min-content 1fr min-content;
+  }
+
+  .chatbox-scroller {
+    overflow-y: scroll;
+    display: flex;
+    flex-direction: column-reverse;
+  }
+
+  .chatbox-scroller {
+    border: 1px dashed #888;
+    margin: .25em 0;
+    padding: .25em;
+  }
+
+  .chatbox-message code {
+    color: #888;
+  }
+</style>