From 9d0d5ec599ee1b98e7f08b42238289d0c994ad49 Mon Sep 17 00:00:00 2001 From: Egamorf Date: Mon, 21 Apr 2025 19:58:06 +0200 Subject: [PATCH] Renaming folder --- .../Client/GameIdeas.BlazorApp/Helpers/GameHelper.cs | 8 ++------ .../Pages/Games/Header/GameHeader.razor | 2 +- .../Pages/{User => UserMenu}/Components/Login.razor | 0 .../Pages/{User => UserMenu}/Components/Login.razor.cs | 4 ++-- .../Pages/{User => UserMenu}/Components/Login.razor.css | 0 .../Pages/{User => UserMenu}/Components/LoginValidator.cs | 2 +- .../Pages/{User => UserMenu}/Gateways/AuthGateway.cs | 2 +- .../Pages/{User => UserMenu}/Gateways/IAuthGateway.cs | 2 +- .../Pages/{User => UserMenu}/UserMenu.razor | 2 +- .../Pages/{User => UserMenu}/UserMenu.razor.cs | 6 ++---- .../Pages/{User => UserMenu}/UserMenu.razor.css | 0 src/GameIdeas/Client/GameIdeas.BlazorApp/Program.cs | 2 +- 12 files changed, 12 insertions(+), 18 deletions(-) rename src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/{User => UserMenu}/Components/Login.razor (100%) rename src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/{User => UserMenu}/Components/Login.razor.cs (89%) rename src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/{User => UserMenu}/Components/Login.razor.css (100%) rename src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/{User => UserMenu}/Components/LoginValidator.cs (85%) rename src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/{User => UserMenu}/Gateways/AuthGateway.cs (95%) rename src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/{User => UserMenu}/Gateways/IAuthGateway.cs (69%) rename src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/{User => UserMenu}/UserMenu.razor (96%) rename src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/{User => UserMenu}/UserMenu.razor.cs (73%) rename src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/{User => UserMenu}/UserMenu.razor.css (100%) diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Helpers/GameHelper.cs b/src/GameIdeas/Client/GameIdeas.BlazorApp/Helpers/GameHelper.cs index 181281d..f33ea26 100644 --- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Helpers/GameHelper.cs +++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Helpers/GameHelper.cs @@ -13,12 +13,8 @@ public static class GameHelper throw new ArgumentNullException(nameof(authState), "Authentication state missing"); } - var userId = authState.User.FindFirstValue(ClaimTypes.Sid); - - if (userId == null) - { - throw new ArgumentNullException(nameof(authState), "user state missing"); - } + var userId = authState.User.FindFirstValue(ClaimTypes.Sid) + ?? throw new ArgumentNullException(nameof(authState), "user state missing"); game.CreationUserId = userId; game.CreationDate = DateTime.Now; diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Header/GameHeader.razor b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Header/GameHeader.razor index 0516759..e51f11b 100644 --- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Header/GameHeader.razor +++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Header/GameHeader.razor @@ -1,5 +1,5 @@ @using GameIdeas.BlazorApp.Pages.Games -@using GameIdeas.BlazorApp.Pages.User +@using GameIdeas.BlazorApp.Pages.UserMenu @using GameIdeas.BlazorApp.Shared.Components.Select @using GameIdeas.BlazorApp.Shared.Components.Select.Models @using GameIdeas.BlazorApp.Shared.Models diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/User/Components/Login.razor b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/UserMenu/Components/Login.razor similarity index 100% rename from src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/User/Components/Login.razor rename to src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/UserMenu/Components/Login.razor diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/User/Components/Login.razor.cs b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/UserMenu/Components/Login.razor.cs similarity index 89% rename from src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/User/Components/Login.razor.cs rename to src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/UserMenu/Components/Login.razor.cs index da55a33..9d935ab 100644 --- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/User/Components/Login.razor.cs +++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/UserMenu/Components/Login.razor.cs @@ -1,9 +1,9 @@ -using GameIdeas.BlazorApp.Pages.User.Gateways; +using GameIdeas.BlazorApp.Pages.UserMenu.Gateways; using GameIdeas.Shared.Dto; using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Forms; -namespace GameIdeas.BlazorApp.Pages.User.Components; +namespace GameIdeas.BlazorApp.Pages.UserMenu.Components; public partial class Login { diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/User/Components/Login.razor.css b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/UserMenu/Components/Login.razor.css similarity index 100% rename from src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/User/Components/Login.razor.css rename to src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/UserMenu/Components/Login.razor.css diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/User/Components/LoginValidator.cs b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/UserMenu/Components/LoginValidator.cs similarity index 85% rename from src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/User/Components/LoginValidator.cs rename to src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/UserMenu/Components/LoginValidator.cs index 13c7046..8ff7aaa 100644 --- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/User/Components/LoginValidator.cs +++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/UserMenu/Components/LoginValidator.cs @@ -1,7 +1,7 @@ using FluentValidation; using GameIdeas.Shared.Dto; -namespace GameIdeas.BlazorApp.Pages.User.Components; +namespace GameIdeas.BlazorApp.Pages.UserMenu.Components; public class LoginValidator : AbstractValidator { diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/User/Gateways/AuthGateway.cs b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/UserMenu/Gateways/AuthGateway.cs similarity index 95% rename from src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/User/Gateways/AuthGateway.cs rename to src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/UserMenu/Gateways/AuthGateway.cs index ea2de5c..4753e96 100644 --- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/User/Gateways/AuthGateway.cs +++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/UserMenu/Gateways/AuthGateway.cs @@ -5,7 +5,7 @@ using GameIdeas.Resources; using GameIdeas.Shared.Dto; using Microsoft.AspNetCore.Components.Authorization; -namespace GameIdeas.BlazorApp.Pages.User.Gateways; +namespace GameIdeas.BlazorApp.Pages.UserMenu.Gateways; public class AuthGateway(IHttpClientService httpClient, AuthenticationStateProvider stateProvider) : IAuthGateway diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/User/Gateways/IAuthGateway.cs b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/UserMenu/Gateways/IAuthGateway.cs similarity index 69% rename from src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/User/Gateways/IAuthGateway.cs rename to src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/UserMenu/Gateways/IAuthGateway.cs index c3d2620..9ded24c 100644 --- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/User/Gateways/IAuthGateway.cs +++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/UserMenu/Gateways/IAuthGateway.cs @@ -1,6 +1,6 @@ using GameIdeas.Shared.Dto; -namespace GameIdeas.BlazorApp.Pages.User.Gateways; +namespace GameIdeas.BlazorApp.Pages.UserMenu.Gateways; public interface IAuthGateway { diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/User/UserMenu.razor b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/UserMenu/UserMenu.razor similarity index 96% rename from src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/User/UserMenu.razor rename to src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/UserMenu/UserMenu.razor index 49c6910..b46f17a 100644 --- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/User/UserMenu.razor +++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/UserMenu/UserMenu.razor @@ -1,4 +1,4 @@ -@using GameIdeas.BlazorApp.Pages.User.Components +@using GameIdeas.BlazorApp.Pages.UserMenu.Components @using GameIdeas.BlazorApp.Shared.Components.BackdropFilter @using GameIdeas.BlazorApp.Shared.Constants @using GameIdeas.Shared.Constants diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/User/UserMenu.razor.cs b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/UserMenu/UserMenu.razor.cs similarity index 73% rename from src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/User/UserMenu.razor.cs rename to src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/UserMenu/UserMenu.razor.cs index 33e6c07..cd40676 100644 --- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/User/UserMenu.razor.cs +++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/UserMenu/UserMenu.razor.cs @@ -1,9 +1,7 @@ -using GameIdeas.BlazorApp.Pages.User.Gateways; -using GameIdeas.BlazorApp.Services; +using GameIdeas.BlazorApp.Pages.UserMenu.Gateways; using Microsoft.AspNetCore.Components; -using Microsoft.AspNetCore.Components.Authorization; -namespace GameIdeas.BlazorApp.Pages.User; +namespace GameIdeas.BlazorApp.Pages.UserMenu; public partial class UserMenu { diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/User/UserMenu.razor.css b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/UserMenu/UserMenu.razor.css similarity index 100% rename from src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/User/UserMenu.razor.css rename to src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/UserMenu/UserMenu.razor.css diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Program.cs b/src/GameIdeas/Client/GameIdeas.BlazorApp/Program.cs index 647dc15..4edf1f7 100644 --- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Program.cs +++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Program.cs @@ -2,7 +2,7 @@ using System.Net.Http.Json; using Blazored.LocalStorage; using GameIdeas.BlazorApp; using GameIdeas.BlazorApp.Pages.Games.Gateways; -using GameIdeas.BlazorApp.Pages.User.Gateways; +using GameIdeas.BlazorApp.Pages.UserMenu.Gateways; using GameIdeas.BlazorApp.Services; using GameIdeas.Resources; using Microsoft.AspNetCore.Components.Authorization;