Run code clean and fix messages #45

Merged
Egamorf merged 1 commits from feature/run-code-cleaner into main 2025-05-07 01:28:38 +02:00
38 changed files with 150 additions and 155 deletions

View File

@@ -8,7 +8,6 @@ using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Authorization;
using Microsoft.AspNetCore.Components.Forms;
using Microsoft.JSInterop;
using System.Security.Claims;
namespace GameIdeas.BlazorApp.Pages.Games.Components;
@@ -21,7 +20,7 @@ public partial class GameCreationForm
[Parameter] public CategoriesDto? Categories { get; set; }
[Parameter] public EventCallback OnSubmit { get; set; }
private GameDetailDto GameDto = new();
private readonly GameDetailDto GameDto = new();
private EditContext? EditContext;
private readonly SelectTheme Theme = SelectTheme.Creation;
private readonly SliderParams SliderParams = new() { Gap = 1, Min = 1, Max = 5 };

View File

@@ -4,7 +4,7 @@
@inherits GameBase
<div class="row">
<img class="icon" src="~/icon.png" />
<img class="icon" src="icon.png" />
<a class="title" href="@($"/Detail/{GameDto.Id}")">@GameDto.Title</a>

View File

@@ -80,9 +80,20 @@
fill: var(--white);
}
@media screen and (max-width: 700px) {
.release-date {
display: none;
grid-column: span;
}
.row {
grid-template-columns: auto 3fr 3fr 30px 30px !important;
}
}
@media screen and (max-width: 1000px) {
.row {
grid-template-columns: 48px 3fr 2fr 3fr 30px 30px;
grid-template-columns: auto 3fr 2fr 3fr 30px 30px;
}
.tags, .storage {

View File

@@ -10,9 +10,9 @@ public partial class Login
[Parameter] public IAuthGateway AuthGateway { get; set; } = default!;
private EditContext? EditContext;
private UserDto UserDto = new();
private readonly UserDto UserDto = new();
private bool IsLoading = false;
private LoginValidator Validator = new();
private readonly LoginValidator Validator = new();
protected override void OnInitialized()
{
EditContext = new EditContext(UserDto);

View File

@@ -1,5 +1,4 @@
using FluentValidation;
using GameIdeas.BlazorApp.Shared.Components.Select;
using GameIdeas.BlazorApp.Shared.Components.Select.Models;
using GameIdeas.Shared.Dto;
using Microsoft.AspNetCore.Components;

View File

@@ -17,10 +17,10 @@ public partial class Users
private Popup? Popup;
private bool IsLoading = false;
private UserFilterParams FilterParams = new();
private readonly UserFilterParams FilterParams = new();
private UserListDto UserList = new();
private IEnumerable<RoleDto> Roles = [];
private int CurrentPage = 1;
private readonly int CurrentPage = 1;
private UserDto UserAdd = new();
private UserDto? UserDelete;
private string? currentUserId;

View File

@@ -1,4 +1,3 @@
using System.Net.Http.Json;
using Blazored.LocalStorage;
using GameIdeas.BlazorApp;
using GameIdeas.BlazorApp.Pages.Games.Gateways;
@@ -10,6 +9,7 @@ using GameIdeas.Shared.Constants;
using Microsoft.AspNetCore.Components.Authorization;
using Microsoft.AspNetCore.Components.Web;
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
using System.Net.Http.Json;
var builder = WebAssemblyHostBuilder.CreateDefault(args);
var services = builder.Services;

View File

@@ -1,11 +1,11 @@
using GameIdeas.Resources;
using System.Net.Http.Headers;
using System.Text.Json.Serialization;
using System.Text.Json;
using System.Text;
using Blazored.LocalStorage;
using Blazored.LocalStorage;
using GameIdeas.Resources;
using GameIdeas.Shared.Constants;
using Microsoft.AspNetCore.Components.Authorization;
using System.Net.Http.Headers;
using System.Text;
using System.Text.Json;
using System.Text.Json.Serialization;
namespace GameIdeas.BlazorApp.Services;

View File

@@ -1,9 +1,9 @@
using Blazored.LocalStorage;
using Microsoft.AspNetCore.Components.Authorization;
using System.Security.Claims;
using System.IdentityModel.Tokens.Jwt;
using GameIdeas.Shared.Constants;
using GameIdeas.Shared.Dto;
using Microsoft.AspNetCore.Components.Authorization;
using System.IdentityModel.Tokens.Jwt;
using System.Security.Claims;
namespace GameIdeas.BlazorApp.Services;

View File

@@ -35,7 +35,7 @@
}
else
{
await Js.InvokeVoidAsync("setBodyOverflow", "auto");
await Js.InvokeVoidAsync("setBodyOverflow", "visible");
}
}
catch (Exception)

View File

@@ -1,5 +1,5 @@
using GameIdeas.BlazorApp.Shared.Components.Select.Models;
using GameIdeas.BlazorApp.Shared.Components.Select;
using GameIdeas.BlazorApp.Shared.Components.Select.Models;
using GameIdeas.BlazorApp.Shared.Models;
using GameIdeas.Resources;
using Microsoft.AspNetCore.Components;

View File

@@ -1,7 +1,3 @@
using GameIdeas.BlazorApp.Shared.Components.Select;
using GameIdeas.BlazorApp.Shared.Components.Select.Models;
using GameIdeas.BlazorApp.Shared.Models;
using GameIdeas.Resources;
using Microsoft.AspNetCore.Components;
namespace GameIdeas.BlazorApp.Shared.Components.Header;

View File

@@ -1,5 +1,4 @@
using Microsoft.AspNetCore.Components;
using Microsoft.JSInterop;
namespace GameIdeas.BlazorApp.Shared.Components.ReadMore;

View File

@@ -1,9 +1,6 @@
using GameIdeas.BlazorApp.Shared.Components.Select.Models;
using GameIdeas.Resources;
using GameIdeas.Shared.Constants;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Forms;
using System.Text.RegularExpressions;
namespace GameIdeas.BlazorApp.Shared.Components.Select;

View File

@@ -1,6 +1,6 @@
using GameIdeas.BlazorApp.Shared.Components.Search;
using GameIdeas.BlazorApp.Shared.Components.Select.Models;
using GameIdeas.BlazorApp.Shared.Components.Select;
using GameIdeas.BlazorApp.Shared.Components.Select.Models;
using Microsoft.AspNetCore.Components;
namespace GameIdeas.BlazorApp.Shared.Components.SelectSearch;
@@ -34,15 +34,15 @@ public partial class SelectSearch<TItem>
}
private async Task HandleValuesChanged(IEnumerable<TItem> values)
{
Values = values.ToList();
Values = [.. values];
SearchInput?.SetText(string.Join(", ", Values.Select(GetLabel)));
await ValuesChanged.InvokeAsync(Values.ToList());
await ValuesChanged.InvokeAsync([.. Values]);
}
private async Task HandleClearClicked()
{
Values = [];
await ValuesChanged.InvokeAsync(Values.ToList());
await ValuesChanged.InvokeAsync([.. Values]);
}
private void HandleFocusIn()

View File

@@ -5,7 +5,7 @@ namespace GameIdeas.Resources;
public class TranslationService
{
private readonly Dictionary<string, Dictionary<string, string>?> _translations = new();
private readonly Dictionary<string, Dictionary<string, string>?> _translations = [];
public void Initialize(Dictionary<string, string> translations)
{

View File

@@ -1,6 +1,4 @@
using GameIdeas.Shared.Enum;
namespace GameIdeas.Shared.Dto;
namespace GameIdeas.Shared.Dto;
public class UserDto
{

View File

@@ -31,4 +31,3 @@ public partial class Game
public virtual ICollection<GameProperty> GameProperties { get; set; }
public virtual ICollection<GameTag> GameTags { get; set; }
}

View File

@@ -25,14 +25,16 @@ public class GameIdeasContext : IdentityDbContext<User>
protected override void OnModelCreating(ModelBuilder modelBuilder)
{
modelBuilder.Entity<Developer>(entity => {
modelBuilder.Entity<Developer>(entity =>
{
entity.ToTable("Developer");
entity.HasIndex(e => e.Name)
.IsUnique();
});
modelBuilder.Entity<Platform>(entity => {
modelBuilder.Entity<Platform>(entity =>
{
entity.ToTable("Platform");
entity.HasIndex(e => e.Label)

View File

@@ -1,5 +1,4 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Migrations;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
#nullable disable

View File

@@ -54,7 +54,7 @@ namespace GameIdeas.WebAPI.Migrations
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.Sql(@$"DELETE FROM ""AspNetUserRoles"" WHERE ""UserId"" = '{GlobalConstants.ADMINISTRATOR_USER_ID.ToString()}' AND ""RoleId"" = '{GlobalConstants.ADMINISTRATOR_ID.ToString()}'");
migrationBuilder.Sql(@$"DELETE FROM ""AspNetUserRoles"" WHERE ""UserId"" = '{GlobalConstants.ADMINISTRATOR_USER_ID}' AND ""RoleId"" = '{GlobalConstants.ADMINISTRATOR_ID}'");
migrationBuilder.DeleteData("AspNetUsers", "Id", GlobalConstants.ADMINISTRATOR_USER_ID.ToString());
migrationBuilder.DeleteData("AspNetRoles", "Id", GlobalConstants.ADMINISTRATOR_ID.ToString());
migrationBuilder.DeleteData("AspNetRoles", "Id", GlobalConstants.MEMBER_ID.ToString());

View File

@@ -130,15 +130,14 @@ public class GameReadService(GameIdeasContext context, IMapper mapper, ICategory
.Select(k => k.Trim())
.ToArray() ?? [];
games = games
games = [.. games
.Where(game => keywords.All(
kw => game.Title.Contains(kw, StringComparison.OrdinalIgnoreCase)
))
.OrderBy(game => keywords.Min(kw =>
game.Title.IndexOf(kw, StringComparison.OrdinalIgnoreCase)
))
.ThenBy(game => game.Title.Length)
.ToList();
.ThenBy(game => game.Title.Length)];
return;
}
@@ -147,10 +146,9 @@ public class GameReadService(GameIdeasContext context, IMapper mapper, ICategory
{
var storageSpaces = categoryService.GetStorageSpaces().Where(stor => filter.StorageSpaces.Contains(stor.Id));
games = games
games = [.. games
.Where(game => storageSpaces.Any(stor =>
(stor.MinSize ?? int.MinValue) <= game.StorageSpace && (stor.MaxSize ?? int.MaxValue) > game.StorageSpace))
.ToList();
(stor.MinSize ?? int.MinValue) <= game.StorageSpace && (stor.MaxSize ?? int.MaxValue) > game.StorageSpace))];
}
}
}

View File

@@ -91,15 +91,14 @@ public class UserReadService(
.Select(k => k.Trim())
.ToArray() ?? [];
users = users
users = [.. users
.Where(user => keywords.All(
kw => user.UserName?.Contains(kw, StringComparison.OrdinalIgnoreCase) ?? true
))
.OrderBy(user => keywords.Min(kw =>
user.UserName?.IndexOf(kw, StringComparison.OrdinalIgnoreCase)
))
.ThenBy(user => user.UserName?.Length)
.ToList();
.ThenBy(user => user.UserName?.Length)];
}
}

View File

@@ -1,5 +1,4 @@
using AutoMapper;
using GameIdeas.Resources;
using GameIdeas.Resources;
using GameIdeas.Shared.Dto;
using GameIdeas.Shared.Model;
using GameIdeas.WebAPI.Exceptions;