From d0841c0a56218d56891243d896397336fd132e30 Mon Sep 17 00:00:00 2001 From: "jozsef.b@aycode.com" <9Rj@D}fVwBaN> Date: Sat, 18 May 2024 13:06:30 +0200 Subject: [PATCH] improvements, fixes --- .../Pages/Components/AuthComponent.razor.cs | 13 ++++++++++-- .../Pages/Components/TiamComponentBase.cs | 8 ++++++++ .../Shared/Components/Navbar.razor.cs | 20 +++++++++++++++---- TIAMWebApp/Client/Program.cs | 3 +++ .../Services/ComponentUpdateServiceWeb.cs | 2 +- 5 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 TIAMSharedUI/Pages/Components/TiamComponentBase.cs diff --git a/TIAMSharedUI/Pages/Components/AuthComponent.razor.cs b/TIAMSharedUI/Pages/Components/AuthComponent.razor.cs index f710c0ff..3c05ff80 100644 --- a/TIAMSharedUI/Pages/Components/AuthComponent.razor.cs +++ b/TIAMSharedUI/Pages/Components/AuthComponent.razor.cs @@ -1,16 +1,22 @@ -using Microsoft.AspNetCore.Components; +using AyCode.Services.Loggers; +using Microsoft.AspNetCore.Components; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using TIAM.Core.Loggers; using TIAMSharedUI.Shared.Components; using TIAMWebApp.Shared.Application.Interfaces; +using TIAMWebApp.Shared.Application.Utility; namespace TIAMSharedUI.Pages.Components { public partial class AuthComponent : ComponentBase { + [Inject] + public required IEnumerable LogWriters { get; set; } + [Inject] public ISessionService sessionService { get; set; } public bool IsLoggedIn = false; @@ -21,10 +27,13 @@ namespace TIAMSharedUI.Pages.Components private PopupMessageBox PopupMessageBox { get; set; } = default!; public bool IsVisible = false; + private ILogger _logger; protected override async Task OnInitializedAsync() { - + _logger = new LoggerClient(LogWriters.ToArray()); + _logger.Debug("OnInitializedAsync"); + IsLoggedIn = sessionService.IsAuthenticated; if(IsLoggedIn) { diff --git a/TIAMSharedUI/Pages/Components/TiamComponentBase.cs b/TIAMSharedUI/Pages/Components/TiamComponentBase.cs new file mode 100644 index 00000000..a102fb1b --- /dev/null +++ b/TIAMSharedUI/Pages/Components/TiamComponentBase.cs @@ -0,0 +1,8 @@ +using Microsoft.AspNetCore.Components; + +namespace TIAMSharedUI.Pages.Components; + +public partial class TiamComponentBase : ComponentBase +{ + +} \ No newline at end of file diff --git a/TIAMSharedUI/Shared/Components/Navbar.razor.cs b/TIAMSharedUI/Shared/Components/Navbar.razor.cs index fceea2ee..82920326 100644 --- a/TIAMSharedUI/Shared/Components/Navbar.razor.cs +++ b/TIAMSharedUI/Shared/Components/Navbar.razor.cs @@ -9,6 +9,7 @@ using System.Threading.Tasks; using AyCode.Core.Loggers; using AyCode.Services.Loggers; using TIAM.Core.Loggers; +using TIAM.Resources; using TIAMSharedUI.Resources; using TIAMWebApp.Shared.Application.Interfaces; using TIAMWebApp.Shared.Application.Utility; @@ -54,10 +55,14 @@ namespace TIAMSharedUI.Shared.Components //componentUpdateService.RefreshRequested += RefreshMe; + public Navbar() + { + + } private void RefreshMe() { - _logger.Info($"Navbar refresh called! {DateTime.Now} "); + _logger.Debug($"Navbar refresh called! {DateTime.Now} "); OnInitialized(); StateHasChanged(); @@ -86,8 +91,8 @@ namespace TIAMSharedUI.Shared.Components _logger = new LoggerClient(LogWriters.ToArray()); - componentUpdateService.RefreshRequested += RefreshMe; - _logger.Info($"Navbar OnInit {DateTime.Now} "); + + _logger.Debug($"Navbar OnInit {DateTime.Now} "); if (sessionService.User != null) { @@ -95,7 +100,7 @@ namespace TIAMSharedUI.Shared.Components } else { - _logger.Info($"Navbar myUser false! {DateTime.Now} "); + _logger.Debug($"Navbar myUser false! {DateTime.Now} "); myUser = false; } @@ -112,5 +117,12 @@ namespace TIAMSharedUI.Shared.Components } } + protected override void OnAfterRender(bool firstRender) + { + base.OnAfterRender(firstRender); + + if (firstRender) + componentUpdateService.RefreshRequested += RefreshMe; + } } } diff --git a/TIAMWebApp/Client/Program.cs b/TIAMWebApp/Client/Program.cs index ef04073d..fb5d25d6 100644 --- a/TIAMWebApp/Client/Program.cs +++ b/TIAMWebApp/Client/Program.cs @@ -29,7 +29,10 @@ builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddBlazoredLocalStorage(); builder.Services.AddScoped(); + +//EZT NAGYON ÁT KÉNE BESZÉLNI!:) - J. builder.Services.AddSingleton(); + builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); diff --git a/TIAMWebApp/Client/Services/ComponentUpdateServiceWeb.cs b/TIAMWebApp/Client/Services/ComponentUpdateServiceWeb.cs index 68d338fe..e7549185 100644 --- a/TIAMWebApp/Client/Services/ComponentUpdateServiceWeb.cs +++ b/TIAMWebApp/Client/Services/ComponentUpdateServiceWeb.cs @@ -3,7 +3,7 @@ namespace TIAMWebApp.Client.Services { public class ComponentUpdateServiceWeb : IComponentUpdateService { - public event Action RefreshRequested; + public event Action? RefreshRequested; public void CallRequestRefresh() {