Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions Server/Components/Pages/GamePage.razor
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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">
Expand Down
5 changes: 0 additions & 5 deletions Server/Components/Popups/EquipmentPopup.razor
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
14 changes: 0 additions & 14 deletions Server/Components/Popups/EquipmentPopup.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
22 changes: 19 additions & 3 deletions Server/Components/Popups/SettingsPopup.razor
Original file line number Diff line number Diff line change
@@ -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

}
<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>
18 changes: 18 additions & 0 deletions Server/Components/Popups/SettingsPopup.razor.cs
Original file line number Diff line number Diff line change
@@ -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);
}
}
}
6 changes: 6 additions & 0 deletions Server/wwwroot/css/game.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading