diff --git a/TIAM.Core/Consts/TiamConst.cs b/TIAM.Core/Consts/TiamConst.cs index 2206e6e1..69da799a 100644 --- a/TIAM.Core/Consts/TiamConst.cs +++ b/TIAM.Core/Consts/TiamConst.cs @@ -6,6 +6,10 @@ namespace TIAM.Core.Consts; public static class TiamConstClient { public static string DefaultLocale = "en-US"; + + public static string DevAdminHubName = "DevAdminHub"; + public static string LoggerHubName = "TiamLoggerHub"; + public static Guid TransferProductId = Guid.Parse("814b5495-c2e9-4f1d-a73f-37cd5d353078"); public static Guid[] DevAdminIds = new Guid[2] { Guid.Parse("dcf451d2-cc4c-4ac2-8c1f-da00041be1fd"), Guid.Parse("4cbaed43-2465-4d99-84f1-c8bc6b7025f7") }; public static Guid[] SysAdmins = new Guid[3] diff --git a/TIAMMobileApp/Services/UserDataServiceMobile.cs b/TIAMMobileApp/Services/UserDataServiceMobile.cs index 9189b73a..521cb993 100644 --- a/TIAMMobileApp/Services/UserDataServiceMobile.cs +++ b/TIAMMobileApp/Services/UserDataServiceMobile.cs @@ -1,6 +1,7 @@ using System.Net.Http.Json; using System.Text; using System.Text.Json; +using AyCode.Core.Loggers; using AyCode.Interfaces.StorageHandlers; using AyCode.Services.Loggers; using Newtonsoft.Json; diff --git a/TIAMSharedUI/Pages/Components/AuthComponent.razor.cs b/TIAMSharedUI/Pages/Components/AuthComponent.razor.cs index a4242f4f..95547822 100644 --- a/TIAMSharedUI/Pages/Components/AuthComponent.razor.cs +++ b/TIAMSharedUI/Pages/Components/AuthComponent.razor.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using AyCode.Core.Loggers; using TIAM.Core.Loggers; using TIAMSharedUI.Shared.Components; using TIAMWebApp.Shared.Application.Interfaces; diff --git a/TIAMSharedUI/Pages/Components/EditComponents/DynamicEditForm.razor b/TIAMSharedUI/Pages/Components/EditComponents/DynamicEditForm.razor index 5c89977b..44797fe8 100644 --- a/TIAMSharedUI/Pages/Components/EditComponents/DynamicEditForm.razor +++ b/TIAMSharedUI/Pages/Components/EditComponents/DynamicEditForm.razor @@ -4,6 +4,7 @@ @using AyCode.Services.Loggers @using System.Reflection @using AyCode.Blazor.Components.Components +@using AyCode.Core.Loggers @using TIAM.Entities.Products @using TIAM.Entities.Transfers @using TIAM.Models.Dtos.Users diff --git a/TIAMSharedUI/Pages/Components/InputWizard.razor.cs b/TIAMSharedUI/Pages/Components/InputWizard.razor.cs index 87565e05..a32db9b5 100644 --- a/TIAMSharedUI/Pages/Components/InputWizard.razor.cs +++ b/TIAMSharedUI/Pages/Components/InputWizard.razor.cs @@ -15,6 +15,7 @@ using System.Text.RegularExpressions; using AyCode.Core.Consts; using TIAM.Core.Loggers; using AyCode.Services.Loggers; +using AyCode.Core.Loggers; namespace TIAMSharedUI.Pages.Components diff --git a/TIAMSharedUI/Pages/Formula1.razor b/TIAMSharedUI/Pages/Formula1.razor index 1d6744d3..391b802e 100644 --- a/TIAMSharedUI/Pages/Formula1.razor +++ b/TIAMSharedUI/Pages/Formula1.razor @@ -1,4 +1,5 @@ @page "/formulaone" +@using AyCode.Core.Loggers @using AyCode.Interfaces.StorageHandlers; @using TIAM.Entities.Transfers @using TIAMSharedUI.Shared.Components diff --git a/TIAMSharedUI/Pages/Index.razor b/TIAMSharedUI/Pages/Index.razor index a8daeb72..21f0ce75 100644 --- a/TIAMSharedUI/Pages/Index.razor +++ b/TIAMSharedUI/Pages/Index.razor @@ -1,4 +1,5 @@ @page "/" +@using AyCode.Core.Loggers @using AyCode.Interfaces.StorageHandlers; @using BlazorAnimation @using TIAMSharedUI.Shared.Components diff --git a/TIAMSharedUI/Pages/LaunchAdmin.razor b/TIAMSharedUI/Pages/LaunchAdmin.razor index 235728eb..23448572 100644 --- a/TIAMSharedUI/Pages/LaunchAdmin.razor +++ b/TIAMSharedUI/Pages/LaunchAdmin.razor @@ -3,6 +3,7 @@ @using TIAMWebApp.Shared.Application.Utility @using Newtonsoft.Json @using System.IdentityModel.Tokens.Jwt +@using AyCode.Core.Loggers @using AyCode.Interfaces.StorageHandlers; @using AyCode.Services.Loggers @using TIAM.Core.Loggers diff --git a/TIAMSharedUI/Pages/Login.razor.cs b/TIAMSharedUI/Pages/Login.razor.cs index 5b571bcc..44870209 100644 --- a/TIAMSharedUI/Pages/Login.razor.cs +++ b/TIAMSharedUI/Pages/Login.razor.cs @@ -3,6 +3,7 @@ using System.IdentityModel.Tokens.Jwt; using System.Text.Json; using AyCode.Core.Extensions; using AyCode.Core.Helpers; +using AyCode.Core.Loggers; using TIAMWebApp.Shared.Application.Models.ClientSide; using TIAMWebApp.Shared.Application.Models; using TIAMWebApp.Shared.Application.Interfaces; diff --git a/TIAMSharedUI/Pages/PublicCreateAndManageTransfer.razor b/TIAMSharedUI/Pages/PublicCreateAndManageTransfer.razor index b171da8f..fe312970 100644 --- a/TIAMSharedUI/Pages/PublicCreateAndManageTransfer.razor +++ b/TIAMSharedUI/Pages/PublicCreateAndManageTransfer.razor @@ -14,6 +14,7 @@ @using TIAMWebApp.Shared.Application.Services @using TIAMWebApp.Shared.Application.Utility @using AyCode.Core.Extensions +@using AyCode.Core.Loggers @layout AdminLayout @inject IPopulationStructureDataProvider DataProvider @inject ISessionServiceClient SessionService diff --git a/TIAMSharedUI/Pages/SumupPayment.razor b/TIAMSharedUI/Pages/SumupPayment.razor index 725139f3..c7611486 100644 --- a/TIAMSharedUI/Pages/SumupPayment.razor +++ b/TIAMSharedUI/Pages/SumupPayment.razor @@ -1,6 +1,7 @@ @page "/sumuppayment/{checkoutId}" @using AyCode.Services.Loggers @using System.Text.Json.Serialization +@using AyCode.Core.Loggers @using TIAMWebApp.Shared.Application.Services @using TIAMWebApp.Shared.Application.Utility @inject IEnumerable LogWriters diff --git a/TIAMSharedUI/Pages/TestPage.razor b/TIAMSharedUI/Pages/TestPage.razor index 6a035f22..1636f00d 100644 --- a/TIAMSharedUI/Pages/TestPage.razor +++ b/TIAMSharedUI/Pages/TestPage.razor @@ -1,4 +1,5 @@ @page "/dbtest" +@using AyCode.Core.Loggers @using TIAMSharedUI.Pages.Components @using TIAMWebApp.Shared.Application.Interfaces @using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels diff --git a/TIAMSharedUI/Pages/TicTacToe.razor b/TIAMSharedUI/Pages/TicTacToe.razor index 9ca2d60e..db350e8f 100644 --- a/TIAMSharedUI/Pages/TicTacToe.razor +++ b/TIAMSharedUI/Pages/TicTacToe.razor @@ -1,4 +1,5 @@ @page "/tictactoe" +@using AyCode.Core.Loggers @using Microsoft.AspNetCore.SignalR.Client @using AyCode.Services.Loggers @using TIAMWebApp.Shared.Application.Utility diff --git a/TIAMSharedUI/Pages/TransferBookTourPage.razor b/TIAMSharedUI/Pages/TransferBookTourPage.razor index aade1915..dfdfb40c 100644 --- a/TIAMSharedUI/Pages/TransferBookTourPage.razor +++ b/TIAMSharedUI/Pages/TransferBookTourPage.razor @@ -1,6 +1,7 @@ @page "/book-a-tour/{TransferDestinationId}/{PriceCategory:int}" @using AyCode.Core.Consts @using AyCode.Core.Helpers +@using AyCode.Core.Loggers @using TIAM.Models.Dtos.Users @using TIAM.Services @using TIAMSharedUI.Pages.Components diff --git a/TIAMSharedUI/Pages/TransferPage.razor b/TIAMSharedUI/Pages/TransferPage.razor index 5ebbfddd..71217c5e 100644 --- a/TIAMSharedUI/Pages/TransferPage.razor +++ b/TIAMSharedUI/Pages/TransferPage.razor @@ -1,6 +1,7 @@ @page "/transfer" @using AyCode.Core.Consts @using AyCode.Core.Helpers +@using AyCode.Core.Loggers @using TIAM.Models.Dtos.Users @using TIAM.Services @using TIAMSharedUI.Pages.Components diff --git a/TIAMSharedUI/Pages/User/CardComponents/TransferCardComponent.razor b/TIAMSharedUI/Pages/User/CardComponents/TransferCardComponent.razor index 522e9301..49861d3c 100644 --- a/TIAMSharedUI/Pages/User/CardComponents/TransferCardComponent.razor +++ b/TIAMSharedUI/Pages/User/CardComponents/TransferCardComponent.razor @@ -1,4 +1,5 @@ @using AyCode.Core.Enums +@using AyCode.Core.Loggers @using AyCode.Services.Loggers @using BlazorAnimation @using TIAM.Core.Consts diff --git a/TIAMSharedUI/Pages/User/Drivers/DriverManageCars.razor b/TIAMSharedUI/Pages/User/Drivers/DriverManageCars.razor index fb41b291..09cc72b5 100644 --- a/TIAMSharedUI/Pages/User/Drivers/DriverManageCars.razor +++ b/TIAMSharedUI/Pages/User/Drivers/DriverManageCars.razor @@ -1,4 +1,5 @@ @page "/driver/cars/{driverId:guid}" +@using AyCode.Core.Loggers @using BlazorAnimation @using TIAM.Entities.Drivers @using TIAM.Models.Dtos.Users diff --git a/TIAMSharedUI/Pages/User/Drivers/DriverManageTransfers.razor b/TIAMSharedUI/Pages/User/Drivers/DriverManageTransfers.razor index 832dc177..f55f4a8d 100644 --- a/TIAMSharedUI/Pages/User/Drivers/DriverManageTransfers.razor +++ b/TIAMSharedUI/Pages/User/Drivers/DriverManageTransfers.razor @@ -22,6 +22,7 @@ @using AyCode.Core.Consts @using AyCode.Core @using AyCode.Core.Helpers +@using AyCode.Core.Loggers @using AyCode.Services.SignalRs @using DevExpress.Data.Filtering @using TIAM.Entities.Emails diff --git a/TIAMSharedUI/Pages/User/Hotels/CreateAndManageTransfer.razor b/TIAMSharedUI/Pages/User/Hotels/CreateAndManageTransfer.razor index e9b0e3ec..b0eed94b 100644 --- a/TIAMSharedUI/Pages/User/Hotels/CreateAndManageTransfer.razor +++ b/TIAMSharedUI/Pages/User/Hotels/CreateAndManageTransfer.razor @@ -1,6 +1,7 @@ @page "/user/createAndManageTransfer" @using AyCode.Core.Consts @using AyCode.Core.Helpers +@using AyCode.Core.Loggers @using TIAM.Entities.Products @using TIAM.Entities.ServiceProviders @using TIAM.Entities.Transfers diff --git a/TIAMSharedUI/Pages/User/Hotels/HotelComponent.razor.cs b/TIAMSharedUI/Pages/User/Hotels/HotelComponent.razor.cs index a6e1ba3b..3333a797 100644 --- a/TIAMSharedUI/Pages/User/Hotels/HotelComponent.razor.cs +++ b/TIAMSharedUI/Pages/User/Hotels/HotelComponent.razor.cs @@ -16,6 +16,7 @@ using TIAMWebApp.Shared.Application.Models.ClientSide.UI; using TIAMWebApp.Shared.Application.Services; using TIAMWebApp.Shared.Application.Utility; using System.Collections.Generic; +using AyCode.Core.Loggers; namespace TIAMSharedUI.Pages.User.Hotels { diff --git a/TIAMSharedUI/Pages/User/Hotels/ManageIncome.razor b/TIAMSharedUI/Pages/User/Hotels/ManageIncome.razor index e7984c01..2d92fd53 100644 --- a/TIAMSharedUI/Pages/User/Hotels/ManageIncome.razor +++ b/TIAMSharedUI/Pages/User/Hotels/ManageIncome.razor @@ -20,6 +20,7 @@ @using AyCode.Core.Consts @using AyCode.Core @using AyCode.Core.Helpers +@using AyCode.Core.Loggers @using DevExpress.Data.Filtering @using TIAM.Entities.Emails @using TIAMSharedUI.Shared.Components.BaseComponents diff --git a/TIAMSharedUI/Pages/User/ManageAccount.razor b/TIAMSharedUI/Pages/User/ManageAccount.razor index 7e5f1769..f2e2c0e5 100644 --- a/TIAMSharedUI/Pages/User/ManageAccount.razor +++ b/TIAMSharedUI/Pages/User/ManageAccount.razor @@ -24,6 +24,7 @@ @using AyCode.Core.Consts @using AyCode.Core @using AyCode.Core.Helpers +@using AyCode.Core.Loggers @using DevExpress.Data.Filtering @using TIAMSharedUI.Shared.Components.BaseComponents @inherits BasePageComponent diff --git a/TIAMSharedUI/Pages/User/ManageMyServiceProvider.razor b/TIAMSharedUI/Pages/User/ManageMyServiceProvider.razor index 134ac545..784decb8 100644 --- a/TIAMSharedUI/Pages/User/ManageMyServiceProvider.razor +++ b/TIAMSharedUI/Pages/User/ManageMyServiceProvider.razor @@ -1,5 +1,6 @@ @page "/user/serviceprovider/{id}" @using AyCode.Core +@using AyCode.Core.Loggers @using AyCode.Services.Loggers @using BlazorAnimation @using TIAM.Entities.ServiceProviders diff --git a/TIAMSharedUI/Pages/User/MediaPage.razor b/TIAMSharedUI/Pages/User/MediaPage.razor index 3fa8d9d0..395ff831 100644 --- a/TIAMSharedUI/Pages/User/MediaPage.razor +++ b/TIAMSharedUI/Pages/User/MediaPage.razor @@ -36,6 +36,7 @@ @rendermode RenderMode.InteractiveWebAssembly @page "/user/media" @using System.Net.Http.Headers +@using AyCode.Core.Loggers @using AyCode.Services.Loggers @using TIAMSharedUI.Shared @using TIAMWebApp.Shared.Application.Interfaces diff --git a/TIAMSharedUI/Pages/User/MyServiceProviders.razor b/TIAMSharedUI/Pages/User/MyServiceProviders.razor index 0deeff6f..4703b654 100644 --- a/TIAMSharedUI/Pages/User/MyServiceProviders.razor +++ b/TIAMSharedUI/Pages/User/MyServiceProviders.razor @@ -13,6 +13,7 @@ @using AyCode.Services.Loggers @using TIAMWebApp.Shared.Application.Services @using AyCode.Core.Helpers +@using AyCode.Core.Loggers @using TIAMSharedUI.Shared.Components.Grids @using TIAMSharedUI.Pages.User.CardComponents @inherits BasePageComponent diff --git a/TIAMSharedUI/Pages/User/ServiceProvider.razor b/TIAMSharedUI/Pages/User/ServiceProvider.razor index 1eb4ab1a..ec9a1ddd 100644 --- a/TIAMSharedUI/Pages/User/ServiceProvider.razor +++ b/TIAMSharedUI/Pages/User/ServiceProvider.razor @@ -1,5 +1,6 @@ @page "/user/serviceproviderold/{id}" @using AyCode.Core +@using AyCode.Core.Loggers @using AyCode.Services.Loggers @using TIAM.Entities.ServiceProviders @using TIAM.Resources diff --git a/TIAMSharedUI/Pages/User/SysAdmins/AddressDetailGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/AddressDetailGridComponent.razor index 453b60c7..b988de79 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/AddressDetailGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/AddressDetailGridComponent.razor @@ -14,6 +14,7 @@ @using TIAMWebApp.Shared.Application.Services @using AyCode.Interfaces.Addresses @using AyCode.Core +@using AyCode.Core.Loggers @inject IServiceProviderDataService serviceProviderDataService @inject IUserDataService userDataService @inject ITransferDataService transferDataService diff --git a/TIAMSharedUI/Pages/User/SysAdmins/AddressGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/AddressGridComponent.razor index 9872a465..3d4bd229 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/AddressGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/AddressGridComponent.razor @@ -12,6 +12,7 @@ @using TIAMSharedUI.Shared.Components.Grids @using TIAMSharedUI.Pages.Components.EditComponents @using AyCode.Core +@using AyCode.Core.Loggers @inject IServiceProviderDataService serviceProviderDataService @inject IUserDataService userDataService @inject ITransferDataService transferDataService diff --git a/TIAMSharedUI/Pages/User/SysAdmins/CompaniesNestedUserProductMapping.razor b/TIAMSharedUI/Pages/User/SysAdmins/CompaniesNestedUserProductMapping.razor index 815345f6..8e29a86d 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/CompaniesNestedUserProductMapping.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/CompaniesNestedUserProductMapping.razor @@ -1,4 +1,5 @@ -@using TIAM.Entities.ServiceProviders +@using AyCode.Core.Loggers +@using TIAM.Entities.ServiceProviders @using TIAM.Entities.Users @using TIAM.Models.Dtos.Users @using TIAMWebApp.Shared.Application.Interfaces diff --git a/TIAMSharedUI/Pages/User/SysAdmins/LogViewer.razor b/TIAMSharedUI/Pages/User/SysAdmins/LogViewer.razor index fcb3c351..5444fa55 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/LogViewer.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/LogViewer.razor @@ -1,4 +1,5 @@ @page "/sysadmin/logs" +@using AyCode.Core.Loggers @using BlazorAnimation @using TIAM.Entities.Users @using TIAM.Models.Dtos.Users diff --git a/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor index 67c76709..3e62d067 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor @@ -20,6 +20,7 @@ @using TIAM.Entities.Emails @using AyCode.Blazor.Components.Services @using AyCode.Core.Extensions +@using AyCode.Core.Loggers @using TIAM.Models @using TIAM.Services @inherits UserBasePageComponent diff --git a/TIAMSharedUI/Pages/User/SysAdmins/MessageGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/MessageGridComponent.razor index fbaa7c16..d3ec1b67 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/MessageGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/MessageGridComponent.razor @@ -15,6 +15,7 @@ @using AyCode.Interfaces.Addresses @using TIAM.Entities.Emails @using AyCode.Core +@using AyCode.Core.Loggers @inject IServiceProviderDataService serviceProviderDataService @inject IUserDataService userDataService @inject ITransferDataService transferDataService diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ProductDetailGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/ProductDetailGridComponent.razor index 9e34b187..93ac22fa 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ProductDetailGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ProductDetailGridComponent.razor @@ -19,6 +19,7 @@ @using AyCode.Interfaces.Addresses @using AyCode.Core @using AyCode.Core.Extensions +@using AyCode.Core.Loggers @inject IStringLocalizer Localizer @inject IEnumerable LogWriters @inject AdminSignalRClient AdminSignalRClient; diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ProductGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/ProductGridComponent.razor index b3f377c5..e9a3aa4b 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ProductGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ProductGridComponent.razor @@ -18,6 +18,7 @@ @using TIAMWebApp.Shared.Application.Services @using AyCode.Interfaces.Addresses @using AyCode.Core +@using AyCode.Core.Loggers @inject IStringLocalizer Localizer @inject IEnumerable LogWriters @inject AdminSignalRClient AdminSignalRClient; diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ProfileGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/ProfileGridComponent.razor index 15e3012b..f3677db9 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ProfileGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ProfileGridComponent.razor @@ -9,6 +9,7 @@ @using TIAM.Core.Loggers @using AyCode.Core @using AyCode.Core.Extensions +@using AyCode.Core.Loggers @using AyCode.Interfaces.Profiles.Dtos @using TIAM.Entities.Addresses @using TIAM.Entities.Profiles diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ServiceProviderGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/ServiceProviderGridComponent.razor index dc432bbd..0a53a628 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ServiceProviderGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ServiceProviderGridComponent.razor @@ -10,6 +10,7 @@ @using AyCode.Services.Loggers @using TIAM.Core.Loggers @using AyCode.Core +@using AyCode.Core.Loggers @using TIAMSharedUI.Shared.Components.Grids @inject IServiceProviderDataService ServiceProviderDataService @inject IEnumerable LogWriters diff --git a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductDetailGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductDetailGridComponent.razor index 4fe9d82b..e890b5c8 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductDetailGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductDetailGridComponent.razor @@ -11,6 +11,7 @@ @using AyCode.Services.Loggers @using TIAM.Core.Loggers @using AyCode.Core +@using AyCode.Core.Loggers @using TIAM.Services @using TIAMSharedUI.Shared.Components.Grids @inject IServiceProviderDataService ServiceProviderDataService diff --git a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductGridComponent.razor index 4bcc3094..336015ab 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductGridComponent.razor @@ -13,6 +13,7 @@ @using TIAM.Core.Loggers @using AyCode.Core @using AyCode.Core.Extensions +@using AyCode.Core.Loggers @using TIAMSharedUI.Shared.Components.Grids @inject IServiceProviderDataService ServiceProviderDataService @inject IEnumerable LogWriters diff --git a/TIAMSharedUI/Pages/User/UserManageTransfers.razor b/TIAMSharedUI/Pages/User/UserManageTransfers.razor index c3afed7e..4f52340b 100644 --- a/TIAMSharedUI/Pages/User/UserManageTransfers.razor +++ b/TIAMSharedUI/Pages/User/UserManageTransfers.razor @@ -22,6 +22,7 @@ @using AyCode.Core.Consts @using AyCode.Core @using AyCode.Core.Helpers +@using AyCode.Core.Loggers @using DevExpress.Data.Filtering @using TIAM.Entities.Emails @using TIAMSharedUI.Shared.Components.BaseComponents diff --git a/TIAMSharedUI/Shared/AdminLayout.razor b/TIAMSharedUI/Shared/AdminLayout.razor index 09a5410b..a0a0e985 100644 --- a/TIAMSharedUI/Shared/AdminLayout.razor +++ b/TIAMSharedUI/Shared/AdminLayout.razor @@ -1,5 +1,6 @@ @inherits LayoutComponentBase +@using AyCode.Core.Loggers @using Microsoft.AspNetCore.Authorization @using TIAMSharedUI.Pages @using TIAMSharedUI.Shared.Users diff --git a/TIAMSharedUI/Shared/Components/BaseComponents/BasePageComponent.cs b/TIAMSharedUI/Shared/Components/BaseComponents/BasePageComponent.cs index 8571a12b..156fbb65 100644 --- a/TIAMSharedUI/Shared/Components/BaseComponents/BasePageComponent.cs +++ b/TIAMSharedUI/Shared/Components/BaseComponents/BasePageComponent.cs @@ -7,6 +7,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using AyCode.Core.Loggers; using TIAM.Resources; using TIAMSharedUI.Pages.User; using TIAMSharedUI.Resources; diff --git a/TIAMSharedUI/Shared/Components/TiamErrorBoundaryComponent.razor b/TIAMSharedUI/Shared/Components/TiamErrorBoundaryComponent.razor index 46196286..77eb6ca7 100644 --- a/TIAMSharedUI/Shared/Components/TiamErrorBoundaryComponent.razor +++ b/TIAMSharedUI/Shared/Components/TiamErrorBoundaryComponent.razor @@ -1,5 +1,6 @@ @using TIAMWebApp.Shared.Application.Utility @using AyCode.Core.Extensions +@using AyCode.Core.Loggers @using AyCode.Services.Loggers @using AyCode.Utils.Extensions @inject IJSRuntime jsRuntime diff --git a/TIAMSharedUI/Shared/MainLayout.razor b/TIAMSharedUI/Shared/MainLayout.razor index bb1e2023..cba8aee7 100644 --- a/TIAMSharedUI/Shared/MainLayout.razor +++ b/TIAMSharedUI/Shared/MainLayout.razor @@ -1,4 +1,5 @@ @inherits LayoutComponentBase +@using AyCode.Core.Loggers @using AyCode.Interfaces.StorageHandlers; @using AyCode.Services.Loggers @using TIAMSharedUI.Pages diff --git a/TIAMSharedUI/Shared/Users/AdminNavMenu.razor b/TIAMSharedUI/Shared/Users/AdminNavMenu.razor index 721237b3..db0bb29b 100644 --- a/TIAMSharedUI/Shared/Users/AdminNavMenu.razor +++ b/TIAMSharedUI/Shared/Users/AdminNavMenu.razor @@ -1,4 +1,5 @@ -@using AyCode.Services.Loggers +@using AyCode.Core.Loggers +@using AyCode.Services.Loggers @using Microsoft.AspNetCore.Components.Authorization @using Newtonsoft.Json @using TIAM.Core.Loggers diff --git a/TIAMWebApp/Client/Program.cs b/TIAMWebApp/Client/Program.cs index a1113d75..5667d92b 100644 --- a/TIAMWebApp/Client/Program.cs +++ b/TIAMWebApp/Client/Program.cs @@ -12,6 +12,7 @@ using TIAMWebApp.Shared.Application.Services; using TIAMWebApp.Shared.Application.Utility; using AyCode.Services.Loggers; using System.Net; +using AyCode.Core.Loggers; using Microsoft.AspNetCore.Components.Authorization; using TIAM.Models; using TIAM.Models.PageViewModels; diff --git a/TIAMWebApp/Client/Services/PermissionService.cs b/TIAMWebApp/Client/Services/PermissionService.cs index 9de05e2c..79a62164 100644 --- a/TIAMWebApp/Client/Services/PermissionService.cs +++ b/TIAMWebApp/Client/Services/PermissionService.cs @@ -1,6 +1,7 @@ using AyCode.Services.Loggers; using System.Net.Http.Json; using System.Text.Json; +using AyCode.Core.Loggers; using TIAM.Entities.Permissions; using TIAM.Models.Dtos.Products; using TIAMWebApp.Shared.Application.Interfaces; diff --git a/TIAMWebApp/Client/Services/UserDataServiceWeb.cs b/TIAMWebApp/Client/Services/UserDataServiceWeb.cs index fa5a974e..c921c3f6 100644 --- a/TIAMWebApp/Client/Services/UserDataServiceWeb.cs +++ b/TIAMWebApp/Client/Services/UserDataServiceWeb.cs @@ -14,6 +14,7 @@ using AyCode.Core.Extensions; using System.Text.Json; using TIAM.Models; using AyCode.Blazor.Components.Services; +using AyCode.Core.Loggers; using TIAMWebApp.Shared.Application.Services; diff --git a/TIAMWebApp/Server/Program.cs b/TIAMWebApp/Server/Program.cs index 6d24ff6e..1e6092a4 100644 --- a/TIAMWebApp/Server/Program.cs +++ b/TIAMWebApp/Server/Program.cs @@ -1,9 +1,19 @@ -using Microsoft.AspNetCore.Authentication.JwtBearer; -using Microsoft.AspNetCore.Http.Features; -using Microsoft.IdentityModel.Tokens; -using Microsoft.OpenApi.Models; -using System.Text; using AyCode.Core.Loggers; +using Microsoft.AspNetCore.Authentication.JwtBearer; +using Microsoft.AspNetCore.Components.WebAssembly.Hosting; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Http.Json; +using Microsoft.AspNetCore.ResponseCompression; +using Microsoft.AspNetCore.Server.Kestrel.Core; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.IdentityModel.Tokens; +using Microsoft.OpenApi; +using Microsoft.OpenApi.Models; +using System.IO.Compression; +using System.Text; +using System.Text.Json.Serialization; +using TIAM.Core.Consts; using TIAM.Core.Loggers; using TIAM.Database; using TIAM.Database.DataLayers.Admins; @@ -14,15 +24,6 @@ using TIAM.Entities.Emails; using TIAM.Services.Server; using TIAMWebApp.Server.Controllers; using TIAMWebApp.Server.Services; -using Microsoft.AspNetCore.Server.Kestrel.Core; -using Microsoft.AspNetCore.ResponseCompression; -using System.IO.Compression; -using System.Text.Json.Serialization; -using Microsoft.AspNetCore.Components.WebAssembly.Hosting; -using Microsoft.AspNetCore.Http.Json; -using Microsoft.EntityFrameworkCore; -using Microsoft.OpenApi; -using Microsoft.Extensions.DependencyInjection; var builder = WebApplication.CreateBuilder(args); @@ -216,8 +217,8 @@ app.MapControllers(); app.MapBlazorHub(); app.MapHub("/TiamChatHub"); -app.MapHub("/TiamLoggerHub"); -app.MapHub("/DevAdminHub"); +app.MapHub($"/{TiamConstClient.LoggerHubName}"); +app.MapHub($"/{TiamConstClient.DevAdminHubName}"); app.MapHub("/gamehub"); app.MapFallbackToFile("index.html"); diff --git a/TIAMWebApp/Server/Services/LoggerSignalRHub.cs b/TIAMWebApp/Server/Services/LoggerSignalRHub.cs index f96781cf..af3ff79b 100644 --- a/TIAMWebApp/Server/Services/LoggerSignalRHub.cs +++ b/TIAMWebApp/Server/Services/LoggerSignalRHub.cs @@ -1,35 +1,10 @@ using AyCode.Core.Consts; using AyCode.Entities.Server.LogItems; +using AyCode.Services.Server.SignalRs; using Microsoft.AspNetCore.SignalR; namespace TIAMWebApp.Server.Services; -public class LoggerSignalRHub(LoggerToLoggerApiController logger) : Hub -{ - public void AddLogItem(AcLogItem? logItem) - { - try - { - if (logItem == null) - { - logger.Error("AddLogItem; LogItem == null"); - //_logger.Writer().Detail(""); - - return; - } - - //logItem.LogHeaderId = ??? - logItem.TimeStampUtc = DateTime.UtcNow; - - logger.Write(logItem); - - //_logger.Writer()?.Write(logItem.AppType, logItem.LogLevel, logItem.Text, logItem.CallerName, logItem.CategoryName, logItem.ErrorType, logItem.Exception); - //_logger.Writer().WriteLogItemAsync(logItem); - } - catch (Exception ex) - { - Console.WriteLine($@"ERROR!!! {nameof(LoggerSignalRHub)}->AddLogItem; ex: {ex.Message}{AcEnv.NL}{AcEnv.NL}{ex}"); - } - } -} \ No newline at end of file +public class LoggerSignalRHub(LoggerToLoggerApiController logger) : AcLoggerSignalRHub(logger) +{ } \ No newline at end of file diff --git a/TIAMWebApp/Shared/Services/AdminSignalRClient.cs b/TIAMWebApp/Shared/Services/AdminSignalRClient.cs index 5a7ec0ce..b9843b6f 100644 --- a/TIAMWebApp/Shared/Services/AdminSignalRClient.cs +++ b/TIAMWebApp/Shared/Services/AdminSignalRClient.cs @@ -1,10 +1,12 @@ using AyCode.Blazor.Components.Services; using AyCode.Core.Consts; using AyCode.Core.Helpers; +using AyCode.Core.Loggers; using AyCode.Services.Loggers; using AyCode.Services.Server.SignalRs; using AyCode.Services.SignalRs; using Microsoft.Extensions.DependencyInjection; +using TIAM.Core.Consts; using TIAM.Entities.Drivers; using TIAM.Entities.Transfers; using TIAM.Entities.Users; @@ -18,7 +20,7 @@ namespace TIAMWebApp.Shared.Application.Services { public class AdminSignalRClient : AcSignalRClientBase, IUserApiControllerClient, ITransferApiControllerClient { - public AdminSignalRClient(/*IServiceProvider serviceProvider, */IEnumerable logWriters) : base($"{Setting.BaseUrl}/DevAdminHub", new LoggerClient(nameof(AdminSignalRClient), logWriters.ToArray())) + public AdminSignalRClient(/*IServiceProvider serviceProvider, */IEnumerable logWriters) : base($"{Setting.BaseUrl}/{TiamConstClient.DevAdminHubName}", new LoggerClient(nameof(AdminSignalRClient), logWriters.ToArray())) { //var a = ActivatorUtilities.GetServiceOrCreateInstance(serviceProvider); ConstHelper.NameByValue(0); diff --git a/TIAMWebApp/Shared/Services/GooglePlacesService.cs b/TIAMWebApp/Shared/Services/GooglePlacesService.cs index f68ca366..46ed60d0 100644 --- a/TIAMWebApp/Shared/Services/GooglePlacesService.cs +++ b/TIAMWebApp/Shared/Services/GooglePlacesService.cs @@ -3,6 +3,7 @@ using DevExpress.Office; using System.Net.Http; using System.Net.Http.Json; using System.Threading.Tasks; +using AyCode.Core.Loggers; using TIAM.Core.Loggers; using TIAMWebApp.Shared.Application.Models; using TIAMWebApp.Shared.Application.Models.ClientSide; diff --git a/TIAMWebApp/Shared/Services/ServiceProviderDataService.cs b/TIAMWebApp/Shared/Services/ServiceProviderDataService.cs index 816be767..5a90dc56 100644 --- a/TIAMWebApp/Shared/Services/ServiceProviderDataService.cs +++ b/TIAMWebApp/Shared/Services/ServiceProviderDataService.cs @@ -1,6 +1,7 @@ using AyCode.Interfaces.StorageHandlers; using Newtonsoft.Json; using System.Net.Http.Json; +using AyCode.Core.Loggers; using AyCode.Services.Loggers; using AyCode.Services.SignalRs; using TIAM.Entities.Products; diff --git a/TIAMWebApp/Shared/Services/SumupService.cs b/TIAMWebApp/Shared/Services/SumupService.cs index ad8ba553..65126497 100644 --- a/TIAMWebApp/Shared/Services/SumupService.cs +++ b/TIAMWebApp/Shared/Services/SumupService.cs @@ -7,6 +7,7 @@ using TIAMWebApp.Shared.Application.Utility; using TIAM.Core.Loggers; using System.Text.Json; using System.Text.Json.Serialization; +using AyCode.Core.Loggers; namespace TIAMWebApp.Shared.Application.Services { diff --git a/TIAMWebApp/Shared/Services/TransferDataService.cs b/TIAMWebApp/Shared/Services/TransferDataService.cs index 92c6f2bd..04b551b7 100644 --- a/TIAMWebApp/Shared/Services/TransferDataService.cs +++ b/TIAMWebApp/Shared/Services/TransferDataService.cs @@ -1,6 +1,7 @@ using AyCode.Services.Loggers; using System.Net.Http.Json; using System.Text.Json; +using AyCode.Core.Loggers; using TIAM.Core.Loggers; using TIAM.Entities.Transfers; using TIAMWebApp.Shared.Application.Interfaces; diff --git a/TIAMWebApp/Shared/Services/UserDataServiceClientBase.cs b/TIAMWebApp/Shared/Services/UserDataServiceClientBase.cs index 859408c4..f8b86e8d 100644 --- a/TIAMWebApp/Shared/Services/UserDataServiceClientBase.cs +++ b/TIAMWebApp/Shared/Services/UserDataServiceClientBase.cs @@ -2,6 +2,7 @@ using System.Text; using System.Text.Json; using AyCode.Core.Extensions; +using AyCode.Core.Loggers; using AyCode.Interfaces.StorageHandlers; using AyCode.Services.Loggers; using AyCode.Utils.Extensions; diff --git a/TIAMWebApp/Shared/Utility/BrowserConsoleLogWriter.cs b/TIAMWebApp/Shared/Utility/BrowserConsoleLogWriter.cs index 3d4788d9..12954e98 100644 --- a/TIAMWebApp/Shared/Utility/BrowserConsoleLogWriter.cs +++ b/TIAMWebApp/Shared/Utility/BrowserConsoleLogWriter.cs @@ -2,6 +2,7 @@ using AyCode.Core.Loggers; using AyCode.Services.Loggers; using Microsoft.JSInterop; +using TIAM.Core.Consts; namespace TIAMWebApp.Shared.Application.Utility; @@ -14,34 +15,6 @@ namespace TIAMWebApp.Shared.Application.Utility; // { } //} -public class BrowserConsoleLogWriter : AcTextLogWriterBase, IAcLogWriterClientBase +public class BrowserConsoleLogWriter(IJSRuntime jsRuntime) : AcBrowserConsoleLogWriter(jsRuntime, AppType.Web, TiamConstClient.DefaultLogLevelClient) { - private readonly IJSRuntime _jsRuntime; - - private readonly Dictionary _invokeConsoleNames = new() - { - [LogLevel.Detail] = "console.info", //trace - [LogLevel.Trace] = "console.info", - [LogLevel.Debug] = "console.info", - [LogLevel.Info] = "console.info", - [LogLevel.Suggest] = "console.info", - [LogLevel.Warning] = "console.warn", - [LogLevel.Error] = "console.error" - }; - - public BrowserConsoleLogWriter(IJSRuntime jsRuntime) : base(AppType.Web, LogLevel.Info) - { - _jsRuntime = jsRuntime; - } - - protected override void WriteText(string? logText, LogLevel logLevel) - { - _jsRuntime.InvokeVoidAsync(_invokeConsoleNames[logLevel], logText); //logText?.Replace(Environment.NewLine, "
")); - } - - //public void Info(string message) - //{ - // ((AcLogWriterBase)this).Info(message); - // //jsRuntime.InvokeVoidAsync("console.log", logText); - //} } \ No newline at end of file diff --git a/TIAMWebApp/Shared/Utility/LogToBrowserConsole.cs b/TIAMWebApp/Shared/Utility/LogToBrowserConsole.cs deleted file mode 100644 index 9dc53340..00000000 --- a/TIAMWebApp/Shared/Utility/LogToBrowserConsole.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace TIAMWebApp.Shared.Application.Utility -{ - //public class LogToBrowserConsole - //{ - // private readonly IJSRuntime jsRuntime; - - // public LogToBrowserConsole(IJSRuntime jsRuntime) - // { - // this.jsRuntime = jsRuntime; - // } - - // public void LogToBC(string message) - // { - // jsRuntime.InvokeVoidAsync("console.log", message); - // } - - //} -} diff --git a/TIAMWebApp/Shared/Utility/SignaRClientLogItemWriter.cs b/TIAMWebApp/Shared/Utility/SignaRClientLogItemWriter.cs index 4d535a65..1d1b9d85 100644 --- a/TIAMWebApp/Shared/Utility/SignaRClientLogItemWriter.cs +++ b/TIAMWebApp/Shared/Utility/SignaRClientLogItemWriter.cs @@ -5,55 +5,18 @@ using AyCode.Entities; using AyCode.Entities.LogItems; using AyCode.Services.Loggers; using Microsoft.AspNetCore.SignalR.Client; +using TIAM.Core.Consts; using TIAMWebApp.Shared.Application.Models.ClientSide; namespace TIAMWebApp.Shared.Application.Utility { - public class SignaRClientLogItemWriter : AcLogItemWriterBase, IAcLogWriterClientBase + public class SignaRClientLogItemWriter : AcSignaRClientLogItemWriter { - private readonly HubConnection _hubConnection = new HubConnectionBuilder() - .WithUrl($"{Setting.BaseUrl}/TiamLoggerHub") - //.AddMessagePackProtocol(options => options.SerializerOptions = MessagePackSerializerOptions.Standard.WithSecurity(MessagePackSecurity.UntrustedData)) - .Build(); - - public SignaRClientLogItemWriter() : this(AppType.Web, LogLevel.Detail) - { } - - public SignaRClientLogItemWriter(AppType appType, LogLevel logLevel, string? categoryName = null) : base(appType, logLevel, categoryName) + public SignaRClientLogItemWriter() : this(AppType.Web, LogLevel.Detail, null) { - _hubConnection.StartAsync().Forget(); } - - public async Task StartConnection() + public SignaRClientLogItemWriter(AppType appType, LogLevel logLevel, string? categoryName = null) : base($"{Setting.BaseUrl}/{TiamConstClient.LoggerHubName}", appType, logLevel, categoryName) { - if (_hubConnection.State == HubConnectionState.Disconnected) - await _hubConnection.StartAsync(); - - if (_hubConnection.State != HubConnectionState.Connected) - await TaskHelper.WaitToAsync(() => _hubConnection.State == HubConnectionState.Connected, 10000, 10, 25); - } - - public async Task StopConnection() - { - await _hubConnection.StopAsync(); - await _hubConnection.DisposeAsync(); - } - - public override void Write(AppType appType, LogLevel logLevel, string? logText, string? callerMemberName, string? categoryName, string? errorType, string? exMessage) - => WriteLogItem(CreateLogItem(DateTime.UtcNow, appType, Environment.CurrentManagedThreadId, logLevel, logText, callerMemberName, categoryName, errorType, exMessage)); - - protected override async void WriteLogItemCallback(AcLogItemClient logItem) - { - //Ez fontos, mert a signalR nem küldi a DateTime.Kind-ot! A szeró oldalon kap egy utc DateTime-ot, ami a kliens lokális DateTime-ját tartalmazza! - J. - logItem.TimeStampUtc = logItem.TimeStampUtc.ToUniversalTime(); - - await StartConnection(); - - if (_hubConnection.State != HubConnectionState.Connected) - return; - - //var refreshToken = Setting.UserBasicDetails?.RefreshToken ?? Guid.NewGuid().ToString("N"); - _hubConnection.SendAsync("AddLogItem", /*refreshToken,*/ logItem).Forget(); } } }