From cf476f2914a986f3ee22fefa81cf6696040986b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20Po=C5=9Bwiata?= <mateusz147@vp.pl>
Date: Fri, 22 May 2026 20:10:17 +0200
Subject: [PATCH] Add version info and move 'Generate new item' button to gear
 menu

---
 Server/Components/Pages/GamePage.razor        |  4 +---
 Server/Components/Popups/EquipmentPopup.razor |  5 -----
 .../Components/Popups/EquipmentPopup.razor.cs | 14 ------------
 Server/Components/Popups/SettingsPopup.razor  | 22 ++++++++++++++++---
 .../Components/Popups/SettingsPopup.razor.cs  | 18 +++++++++++++++
 Server/wwwroot/css/game.css                   |  6 +++++
 6 files changed, 44 insertions(+), 25 deletions(-)
 create mode 100644 Server/Components/Popups/SettingsPopup.razor.cs

diff --git a/Server/Components/Pages/GamePage.razor b/Server/Components/Pages/GamePage.razor
index fae5361..ae809de 100644
--- a/Server/Components/Pages/GamePage.razor
+++ b/Server/Components/Pages/GamePage.razor
@@ -23,7 +23,6 @@
 @inject IUsersRepository UsersRepository
 @inject NavigationManager NavigationManager
 @inject IItemsRepository ItemsRepository
-@inject VersionInfoProvider VersionInfoProvider
 @inject UserService UserService
 @inject MovementService MovementService
 @inject ILogger<GamePage> Logger
@@ -69,7 +68,6 @@
 		<div class="dialogueWindowBg"
 			 style="background: url(@BackgroundImage);background-repeat: no-repeat;  background-size: cover; ">
 			<div class="dialogueWindow">
-				Fracture @VersionInfoProvider.InformationalVersion<br />
 				tutaj log mojej gry<br />
 				<PopupContainer @ref="_popup"></PopupContainer>
 			</div>
@@ -136,7 +134,7 @@
 		<div class="settings">
 			<div class="settingsBtn">
 				<div class="settingsBtn-content">
-					<img src="assets/icons/settingsbutton.svg" />
+					<img @onclick="() => _popup.ShowComponent<SettingsPopup>()" src="assets/icons/settingsbutton.svg" />
 				</div>
 			</div>
 			<div class="settingsBtn">
diff --git a/Server/Components/Popups/EquipmentPopup.razor b/Server/Components/Popups/EquipmentPopup.razor
index ffe62c3..f415466 100644
--- a/Server/Components/Popups/EquipmentPopup.razor
+++ b/Server/Components/Popups/EquipmentPopup.razor
@@ -5,16 +5,11 @@
 @using Fracture.Server.Modules.Items.Services
 @using Fracture.Server.Modules.Users
 @using Fracture.Server.Modules.Users.Services
-@inject IItemGenerator ItemGenerator
-@inject IItemsRepository ItemsRepository
 @inject ILogger<EquipmentPopup> Logger
 @inject UserService UserService
 
 
 <div class="eqContainer">
-    <div class="buttonEquipBg">
-        <button class="buttonEquip" @onclick="GenerateNewItem">Generate new item</button>
-    </div>
     <div class="equipmentContent">
         <div>Inventory</div>
         <div class="eqColumn">
diff --git a/Server/Components/Popups/EquipmentPopup.razor.cs b/Server/Components/Popups/EquipmentPopup.razor.cs
index 653d4d4..cc573db 100644
--- a/Server/Components/Popups/EquipmentPopup.razor.cs
+++ b/Server/Components/Popups/EquipmentPopup.razor.cs
@@ -9,20 +9,6 @@ public partial class EquipmentPopup
 {
     protected override async Task OnInitializedAsync() { }
 
-    public async Task GenerateNewItem()
-    {
-        var item = await ItemGenerator.Generate();
-
-        if (item is not null)
-        {
-            item.CreatedBy = UserService.User!;
-            item.CreatedById = UserService.User!.Id;
-
-            await ItemsRepository.AddItemAsync(item);
-            UserService.Inventory.Add(item);
-        }
-    }
-
     public void Equip(Item item)
     {
         UserService.Equip(item);
diff --git a/Server/Components/Popups/SettingsPopup.razor b/Server/Components/Popups/SettingsPopup.razor
index e3db0cd..4c6985b 100644
--- a/Server/Components/Popups/SettingsPopup.razor
+++ b/Server/Components/Popups/SettingsPopup.razor
@@ -1,5 +1,21 @@
-<h3>SettingsPopup</h3>
+@using Fracture.Server.Modules.Shared
+@using Fracture.Server.Modules.Items.Services
+@using Fracture.Server.Modules.Database
+@using Fracture.Server.Modules.Users.Services
 
-@code {
+@inject VersionInfoProvider VersionInfoProvider
+@inject IItemGenerator ItemGenerator
+@inject IItemsRepository ItemsRepository
+@inject UserService UserService
 
-}
\ No newline at end of file
+<div class="settings-popup">
+    <h3>Settings</h3>
+    
+    <p>Version: Fracture @VersionInfoProvider.InformationalVersion</p>
+    
+    <h4>Options:</h4>
+    
+    <div class="actionButton settingsPopupButton" @onclick="GenerateNewItem">
+        <div class="actionButton-content">Generate new random item</div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/Server/Components/Popups/SettingsPopup.razor.cs b/Server/Components/Popups/SettingsPopup.razor.cs
new file mode 100644
index 0000000..0bd9138
--- /dev/null
+++ b/Server/Components/Popups/SettingsPopup.razor.cs
@@ -0,0 +1,18 @@
+namespace Fracture.Server.Components.Popups;
+
+public partial class SettingsPopup
+{
+    public async Task GenerateNewItem()
+    {
+        var item = await ItemGenerator.Generate();
+
+        if (item is not null)
+        {
+            item.CreatedBy = UserService.User!;
+            item.CreatedById = UserService.User!.Id;
+
+            await ItemsRepository.AddItemAsync(item);
+            UserService.Inventory.Add(item);
+        }
+    }
+}
diff --git a/Server/wwwroot/css/game.css b/Server/wwwroot/css/game.css
index ccab000..df6bbf2 100644
--- a/Server/wwwroot/css/game.css
+++ b/Server/wwwroot/css/game.css
@@ -504,6 +504,12 @@ body {
         filter: drop-shadow(3px 4px 2px black);
     }
 
+.settingsPopupButton {
+    height: 6vh;
+    width: auto;
+    font-size: 1rem;
+}
+    
 .closeBtn {
     border-radius: 100%;
     width: 30px;