From 4c34172e624322b564e85ecac13b3ab26220b431 Mon Sep 17 00:00:00 2001
From: Settel <settel@localhost>
Date: Tue, 12 Apr 2022 14:27:49 +0200
Subject: [PATCH] feat: show player id, game id on click

---
 client/src/components/admin/AdminEditPlayer.vue  |  8 ++++++++
 .../src/components/admin/AdminTileGameinfo.vue   | 11 +++++++++++
 server/src/game/getGameInfo.go                   | 15 +++++++--------
 server/src/game/player.go                        | 16 ++++++----------
 server/src/game/struct.go                        | 15 +++++++--------
 5 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/client/src/components/admin/AdminEditPlayer.vue b/client/src/components/admin/AdminEditPlayer.vue
index 4f30531..bc73737 100644
--- a/client/src/components/admin/AdminEditPlayer.vue
+++ b/client/src/components/admin/AdminEditPlayer.vue
@@ -20,6 +20,13 @@
           <td><input v-model="authcode" size="6" maxlength="6" /></td>
           <td><span class="admin-edit-player__button-generate-code" @click="generateCode">generate code</span></td>
         </tr>
+        <tr v-if="!showId">
+          <td colspan="3" @click="showId=true">&nbsp;</td>
+        </tr>
+        <tr v-if="showId">
+          <td>id: </td>
+          <td colspan="2">{{ id }}</td>
+        </tr>
         <tr>
           <td colspan="3">&nbsp;</td>
         </tr>
@@ -40,6 +47,7 @@ export default {
   props: ['player'],
   data() {
     return {
+      showId: false,
       name: '',
       score: 0,
       authcode: '',
diff --git a/client/src/components/admin/AdminTileGameinfo.vue b/client/src/components/admin/AdminTileGameinfo.vue
index 6527544..f4684bf 100644
--- a/client/src/components/admin/AdminTileGameinfo.vue
+++ b/client/src/components/admin/AdminTileGameinfo.vue
@@ -20,6 +20,12 @@
           {{ gameinfo.numQuotesTotal - gameinfo.numQuotesLeft }} / {{ gameinfo.numQuotesTotal }}
         </td>
       </tr>
+      <tr v-if="!showId">
+        <td colspan="3" @click="showId=true">&nbsp;</td>
+      </tr>
+      <tr v-if="showId">
+        <td colspan="3">{{ gameinfo.id }}</td>
+      </tr>
     </table>
   </AdminTile>
 </template>
@@ -27,6 +33,11 @@
 <script>
 export default {
   props: ['gameinfo', 'players'],
+  data() {
+    return {
+      showId: false,
+    }
+  },
   methods: {
     async editName() {
       const name = window.prompt('new game name: ')
diff --git a/server/src/game/getGameInfo.go b/server/src/game/getGameInfo.go
index f9d25a0..09459c8 100644
--- a/server/src/game/getGameInfo.go
+++ b/server/src/game/getGameInfo.go
@@ -17,6 +17,7 @@ func (gm *Game) initGameInfoJson() *GameInfoJson {
 	defer gm.mu.Unlock()
 
 	gameInfo := GameInfoJson{
+		Id:             gm.id,
 		Name:           gm.name,
 		Created:        gm.created,
 		State:          gm.state,
@@ -27,14 +28,12 @@ func (gm *Game) initGameInfoJson() *GameInfoJson {
 
 	for _, player := range gm.players {
 		gameInfo.Players = append(gameInfo.Players, PlayerInfoJson{
-			Id:           player.id,
-			Name:         player.name,
-			Created:      player.created,
-			LastLoggedIn: player.lastLoggedIn,
-			Score:        player.score,
-			IsPlaying:    player.isPlaying,
-			IsIdle:       player.isIdle,
-			Role:         player.role,
+			Id:        player.id,
+			Name:      player.name,
+			Score:     player.score,
+			IsPlaying: player.isPlaying,
+			IsIdle:    player.isIdle,
+			Role:      player.role,
 		})
 	}
 
diff --git a/server/src/game/player.go b/server/src/game/player.go
index 1deaaf5..1330c87 100644
--- a/server/src/game/player.go
+++ b/server/src/game/player.go
@@ -62,14 +62,12 @@ func (gm *Game) AddPlayer(usr *user.User) {
 	}
 
 	gm.players[usrId] = playerInfo{
-		id:           usrId,
-		name:         usr.GetName(),
-		created:      usr.GetCreated(),
-		lastLoggedIn: usr.GetLastLoggedIn(),
-		isPlaying:    false,
-		isIdle:       true,
-		score:        0,
-		role:         usr.GetRole(),
+		id:        usrId,
+		name:      usr.GetName(),
+		isPlaying: false,
+		isIdle:    true,
+		score:     0,
+		role:      usr.GetRole(),
 	}
 }
 
@@ -85,8 +83,6 @@ func (gm *Game) UpdatePlayer(usr *user.User) {
 	}
 
 	player.name = usr.GetName()
-	player.created = usr.GetCreated()
-	player.lastLoggedIn = usr.GetLastLoggedIn()
 	gm.players[usrId] = player
 }
 
diff --git a/server/src/game/struct.go b/server/src/game/struct.go
index 396d39d..33056da 100644
--- a/server/src/game/struct.go
+++ b/server/src/game/struct.go
@@ -30,14 +30,12 @@ const (
 )
 
 type playerInfo struct {
-	id           string
-	name         string
-	created      int64
-	lastLoggedIn int64
-	isPlaying    bool
-	isIdle       bool
-	score        int
-	role         string
+	id        string
+	name      string
+	isPlaying bool
+	isIdle    bool
+	score     int
+	role      string
 }
 
 type Source struct {
@@ -99,6 +97,7 @@ type PlayerInfoJson struct {
 }
 
 type GameInfoJson struct {
+	Id             string           `json:"id"`
 	Name           string           `json:"name"`
 	Created        int64            `json:"created"`
 	State          string           `json:"state"`