From 965c7a6fd4baa220c933384da1887444ef9b6ae7 Mon Sep 17 00:00:00 2001
From: Daniel McAssey <daniel.mcassey@gmail.com>
Date: Fri, 24 Jan 2025 16:55:34 +0000
Subject: [PATCH] fix(admin): make admin friendlier by adding reload button

---
 .../src/pages/ActorsPage.vue                  |  4 ++
 GLOKON.Baiters.Client/src/pages/BansPage.vue  |  4 ++
 .../src/pages/ChalkCanvasesPage.vue           |  4 ++
 .../src/pages/PluginsPage.vue                 |  6 +++
 GLOKON.Baiters.Client/src/pages/UsersPage.vue | 17 +++------
 .../Controllers/ServerController.cs           |  2 +-
 .../Controllers/UsersController.cs            |  3 +-
 .../Responses/ActorResponse.cs                |  4 +-
 .../Responses/BanResponse.cs                  |  2 +-
 .../Responses/ChalkCanvasResponse.cs          |  2 +-
 .../Responses/PlayerResponse.cs               | 37 +++++++++++++++++++
 .../Responses/ServerInfoResponse.cs           |  2 +-
 12 files changed, 69 insertions(+), 18 deletions(-)
 create mode 100644 GLOKON.Baiters.Server/Responses/PlayerResponse.cs

diff --git a/GLOKON.Baiters.Client/src/pages/ActorsPage.vue b/GLOKON.Baiters.Client/src/pages/ActorsPage.vue
index 6ae7056..935e4db 100644
--- a/GLOKON.Baiters.Client/src/pages/ActorsPage.vue
+++ b/GLOKON.Baiters.Client/src/pages/ActorsPage.vue
@@ -153,6 +153,10 @@ onMounted(() => {
         <p class="text-sm mr-auto">
           Here you will find all actors currently spawned
         </p>
+        <Button icon="fas fa-rotate-right"
+                severity="primary"
+                :loading="isLoading"
+                @click="fetchData()" />
         <SplitButton label="Spawn Actor"
                      severity="info"
                      icon="fas fa-wrench"
diff --git a/GLOKON.Baiters.Client/src/pages/BansPage.vue b/GLOKON.Baiters.Client/src/pages/BansPage.vue
index a29ac33..580f00a 100644
--- a/GLOKON.Baiters.Client/src/pages/BansPage.vue
+++ b/GLOKON.Baiters.Client/src/pages/BansPage.vue
@@ -130,6 +130,10 @@ onMounted(() => {
         <p class="text-sm mr-auto">
           Here you will find all actors currently spawned
         </p>
+        <Button icon="fas fa-rotate-right"
+                severity="primary"
+                :loading="isLoading"
+                @click="fetchData()" />
         <Button icon="fas fa-plus"
                 label="Ban SteamID"
                 severity="info"
diff --git a/GLOKON.Baiters.Client/src/pages/ChalkCanvasesPage.vue b/GLOKON.Baiters.Client/src/pages/ChalkCanvasesPage.vue
index b85f476..c82c267 100644
--- a/GLOKON.Baiters.Client/src/pages/ChalkCanvasesPage.vue
+++ b/GLOKON.Baiters.Client/src/pages/ChalkCanvasesPage.vue
@@ -163,6 +163,10 @@ onMounted(() => {
         <p class="text-sm mr-auto">
           Here you will find all chalk canvases currently in-game
         </p>
+        <Button icon="fas fa-rotate-right"
+                severity="primary"
+                :loading="isLoading"
+                @click="fetchData()" />
       </div>
       <DataTable :value="results" data-key="id" paginator :row-hover="true" :loading="isLoading"
                  :rows="50" :rowsPerPageOptions="[25, 50, 100]" stripedRows responsiveLayout="scroll">
diff --git a/GLOKON.Baiters.Client/src/pages/PluginsPage.vue b/GLOKON.Baiters.Client/src/pages/PluginsPage.vue
index bef59b2..ad9daed 100644
--- a/GLOKON.Baiters.Client/src/pages/PluginsPage.vue
+++ b/GLOKON.Baiters.Client/src/pages/PluginsPage.vue
@@ -4,6 +4,7 @@ import {useToast} from "primevue/usetoast";
 import DataTable from 'primevue/datatable';
 import Column from 'primevue/column';
 import type { AxiosInstance } from 'axios';
+import Button from 'primevue/button';
 const toast = useToast();
 
 const isLoading = ref(false);
@@ -49,6 +50,11 @@ onMounted(() => {
         <p class="text-sm mr-auto">
           Here you will find all plugins enabled on the server
         </p>
+
+        <Button icon="fas fa-rotate-right"
+                severity="primary"
+                :loading="isLoading"
+                @click="fetchData()" />
       </div>
       <DataTable :value="results" data-key="id" paginator :row-hover="true" :loading="isLoading"
                  :rows="50" :rowsPerPageOptions="[25, 50, 100]" stripedRows responsiveLayout="scroll">
diff --git a/GLOKON.Baiters.Client/src/pages/UsersPage.vue b/GLOKON.Baiters.Client/src/pages/UsersPage.vue
index 81b8111..0d5ee20 100644
--- a/GLOKON.Baiters.Client/src/pages/UsersPage.vue
+++ b/GLOKON.Baiters.Client/src/pages/UsersPage.vue
@@ -36,17 +36,7 @@ function fetchData(): void {
   $http.get(`/api/users/`)
     .then((response) => {
       if (response.data) {
-        const responseData = response.data;
-        const items = [];
-
-        for (const id of Object.keys(responseData)) {
-          items.push({
-            id: id,
-            ...responseData[id],
-          });
-        }
-
-        results.value = items;
+        results.value = response.data;
       } else {
         results.value = [];
       }
@@ -234,6 +224,11 @@ onMounted(() => {
         <p class="text-sm mr-auto">
           Here you will find all users currently on the server
         </p>
+        <Button icon="fas fa-rotate-right"
+                severity="primary"
+                :loading="isLoading"
+                @click="fetchData()" />
+
         <Button icon="fas fa-envelope"
                 label="Send Letter to Everyone"
                 severity="info"
diff --git a/GLOKON.Baiters.Server/Controllers/ServerController.cs b/GLOKON.Baiters.Server/Controllers/ServerController.cs
index bd34227..84e5146 100644
--- a/GLOKON.Baiters.Server/Controllers/ServerController.cs
+++ b/GLOKON.Baiters.Server/Controllers/ServerController.cs
@@ -15,7 +15,7 @@ public IActionResult Index()
         {
             return Ok(new ServerInfoResponse
             {
-                ServerSteamId = gm.Server.ServerId,
+                ServerSteamId = gm.Server.ServerId.ToString(),
                 LobbyCode = gm.Server.LobbyCode,
                 PlayerCount = gm.Server.PlayerCount,
                 MaxPlayers = gm.Server.MaxPlayerCount,
diff --git a/GLOKON.Baiters.Server/Controllers/UsersController.cs b/GLOKON.Baiters.Server/Controllers/UsersController.cs
index db25af4..b2105a4 100644
--- a/GLOKON.Baiters.Server/Controllers/UsersController.cs
+++ b/GLOKON.Baiters.Server/Controllers/UsersController.cs
@@ -1,6 +1,7 @@
 using GLOKON.Baiters.Core;
 using GLOKON.Baiters.Core.Models.Game;
 using GLOKON.Baiters.Server.Requests;
+using GLOKON.Baiters.Server.Responses;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
@@ -14,7 +15,7 @@ public class UsersController(GameManager gm) : Controller
         [HttpGet]
         public IActionResult Index()
         {
-            return Ok(gm.Server.Players);
+            return Ok(gm.Server.Players.Select((player) => new PlayerResponse(player.Key, player.Value)).ToList().OrderByDescending(player => player.FisherName));
         }
 
         [HttpPost("kick/{steamId}")]
diff --git a/GLOKON.Baiters.Server/Responses/ActorResponse.cs b/GLOKON.Baiters.Server/Responses/ActorResponse.cs
index 58df8c6..413cb02 100644
--- a/GLOKON.Baiters.Server/Responses/ActorResponse.cs
+++ b/GLOKON.Baiters.Server/Responses/ActorResponse.cs
@@ -7,11 +7,11 @@ internal struct ActorResponse(long id, Actor actor)
     {
         public DateTimeOffset SpawnedAt { get; set; } = actor.SpawnedAt;
 
-        public long Id { get; set; } = id;
+        public string Id { get; set; } = id.ToString();
 
         public string Type { get; set; } = actor.Type;
 
-        public ulong OwnerId { get; set; } = actor.OwnerId;
+        public string OwnerId { get; set; } = actor.OwnerId.ToString();
 
         public Vector3 Position { get; set; } = actor.Position;
 
diff --git a/GLOKON.Baiters.Server/Responses/BanResponse.cs b/GLOKON.Baiters.Server/Responses/BanResponse.cs
index bead74a..7d7ad8f 100644
--- a/GLOKON.Baiters.Server/Responses/BanResponse.cs
+++ b/GLOKON.Baiters.Server/Responses/BanResponse.cs
@@ -6,7 +6,7 @@ internal struct BanResponse(ulong steamId, PlayerBan playerBan)
     {
         public DateTime CreatedAt { get; set; } = playerBan.CreatedAt;
 
-        public ulong SteamId { get; set; } = steamId;
+        public string SteamId { get; set; } = steamId.ToString();
 
         public string PlayerName { get; set; } = playerBan.PlayerName;
 
diff --git a/GLOKON.Baiters.Server/Responses/ChalkCanvasResponse.cs b/GLOKON.Baiters.Server/Responses/ChalkCanvasResponse.cs
index 89ef05b..4dc5b9e 100644
--- a/GLOKON.Baiters.Server/Responses/ChalkCanvasResponse.cs
+++ b/GLOKON.Baiters.Server/Responses/ChalkCanvasResponse.cs
@@ -4,7 +4,7 @@ namespace GLOKON.Baiters.Server.Responses
 {
     internal struct ChalkCanvasResponse(long id, ChalkCanvas chalkCanvas)
     {
-        public long Id { get; set; } = id;
+        public string Id { get; set; } = id.ToString();
 
         public ChalkCanvasPoint[] Points { get; set; } = chalkCanvas.Cells.Values.ToArray();
 
diff --git a/GLOKON.Baiters.Server/Responses/PlayerResponse.cs b/GLOKON.Baiters.Server/Responses/PlayerResponse.cs
new file mode 100644
index 0000000..a04af0c
--- /dev/null
+++ b/GLOKON.Baiters.Server/Responses/PlayerResponse.cs
@@ -0,0 +1,37 @@
+using GLOKON.Baiters.Core.Models.Actor;
+using GLOKON.Baiters.Core.Models.Game;
+using System.Numerics;
+
+namespace GLOKON.Baiters.Server.Responses
+{
+    internal struct PlayerResponse(ulong id, Player player)
+    {
+        public DateTimeOffset SpawnedAt { get; set; } = player.SpawnedAt;
+
+        public string Id { get; set; } = id.ToString();
+
+        public string Type { get; set; } = player.Type;
+
+        public string OwnerId { get; set; } = player.OwnerId.ToString();
+
+        public Vector3 Position { get; set; } = player.Position;
+
+        public Vector3 Rotation { get; set; } = player.Rotation;
+
+        public string Zone { get; set; } = player.Zone;
+
+        public uint? DespawnTime { get; set; } = player.DespawnTime;
+
+        public string FisherName { get; set; } = player.FisherName;
+
+        public bool IsAdmin { get; set; } = player.IsAdmin;
+
+        public string? ActorId { get; set; } = player.ActorId?.ToString() ?? null;
+
+        public string? LastEmote { get; set; } = player.LastEmote;
+
+        public Cosmetics? Cosmetics { get; set; } = player.Cosmetics;
+
+        public HeldItem? HeldItem { get; set; } = player.HeldItem;
+    }
+}
diff --git a/GLOKON.Baiters.Server/Responses/ServerInfoResponse.cs b/GLOKON.Baiters.Server/Responses/ServerInfoResponse.cs
index ecd1444..1b1e158 100644
--- a/GLOKON.Baiters.Server/Responses/ServerInfoResponse.cs
+++ b/GLOKON.Baiters.Server/Responses/ServerInfoResponse.cs
@@ -2,7 +2,7 @@
 {
     internal struct ServerInfoResponse
     {
-        public required ulong ServerSteamId { get; set; }
+        public required string ServerSteamId { get; set; }
 
         public required string LobbyCode { get; set; }