From 291982cf958658564893957142d99bad91f0301b Mon Sep 17 00:00:00 2001 From: Mateusz Skoczek Date: Sun, 27 Oct 2024 22:09:46 +0100 Subject: [PATCH] Website services organized --- .../AuthenticationService.cs | 14 +-- .../IAuthenticationService.cs | 2 +- .../JWTAuthenticationStateProvider.cs | 10 +- .../User.cs | 2 +- ...hIt.Website.Services.Authentication.csproj | 24 ++++ .../Accounts/AccountsClientService.cs} | 10 +- .../Accounts/IAccountsClientService.cs} | 4 +- .../AuthorizationType.cs | 2 +- .../BaseClientService.cs} | 11 +- .../Genders/GendersClientService.cs} | 9 +- .../Genders/IGendersClientService.cs} | 4 +- .../Media/IMediaClientService.cs} | 4 +- .../Media/MediaClientService.cs} | 10 +- .../Movies/IMoviesClientService.cs} | 4 +- .../Movies/MoviesClientService.cs} | 9 +- .../Persons/IPersonsClientService.cs} | 4 +- .../Persons/PersonsClientService.cs} | 9 +- .../Photos/IPhotosClientService.cs} | 4 +- .../Photos/PhotosClientService.cs} | 9 +- .../Roles/IRolesClientService.cs} | 4 +- .../Roles/RolesClientService.cs} | 9 +- .../Series/ISeriesClientService.cs} | 4 +- .../Series/SeriesClientService.cs} | 9 +- .../WatchIt.Website.Services.Client.csproj | 16 +++ .../ITokensService.cs | 2 +- .../TokensService.cs | 4 +- .../WatchIt.Website.Services.Tokens.csproj} | 5 +- .../ConfigurationService.cs | 4 +- .../IConfigurationService.cs | 8 ++ .../Model/Accounts.cs | 2 +- .../Model/ConfigurationData.cs | 2 +- .../Model/Endpoints.cs | 2 +- .../Model/Genders.cs | 2 +- .../Model/Genres.cs | 2 +- .../Model/LogLevel.cs | 2 +- .../Model/Logging.cs | 2 +- .../Model/Media.cs | 2 +- .../Model/Movies.cs | 2 +- .../Model/Persons.cs | 2 +- .../Model/Photos.cs | 2 +- .../Model/Roles.cs | 2 +- .../Model/Series.cs | 2 +- .../Model/StorageKeys.cs | 2 +- .../Model/Style.cs | 2 +- ...hIt.Website.Services.Configuration.csproj} | 0 ...ite.Services.Utility.Authentication.csproj | 19 --- .../IConfigurationService.cs | 8 -- ...It.Website.Services.WebAPI.Accounts.csproj | 16 --- ...chIt.Website.Services.WebAPI.Common.csproj | 15 --- ...hIt.Website.Services.WebAPI.Genders.csproj | 14 --- ...chIt.Website.Services.WebAPI.Genres.csproj | 9 -- ...tchIt.Website.Services.WebAPI.Media.csproj | 16 --- ...chIt.Website.Services.WebAPI.Movies.csproj | 23 ---- ...hIt.Website.Services.WebAPI.Persons.csproj | 14 --- ...chIt.Website.Services.WebAPI.Photos.csproj | 15 --- ...tchIt.Website.Services.WebAPI.Roles.csproj | 14 --- ...chIt.Website.Services.WebAPI.Series.csproj | 14 --- .../Subcomponents/ListItemComponent.razor.cs | 2 +- .../PersonsFilterFormComponent.razor.cs | 6 +- ...MediaActorRolesEditPanelComponent.razor.cs | 22 ++-- ...diaCreatorRolesEditPanelComponent.razor.cs | 22 ++-- .../MediaActorRolesPanelComponent.razor | 14 +-- .../MediaActorRolesPanelComponent.razor.cs | 14 +-- .../MediaCreatorRolesPanelComponent.razor | 14 +-- .../MediaCreatorRolesPanelComponent.razor.cs | 16 +-- ...ersonActorRolesEditPanelComponent.razor.cs | 22 ++-- ...sonCreatorRolesEditPanelComponent.razor.cs | 22 ++-- .../PersonEditFormPanelComponent.razor.cs | 16 +-- .../PersonActorRolesPanelComponent.razor | 14 +-- .../PersonActorRolesPanelComponent.razor.cs | 12 +- .../PersonCreatorRolesPanelComponent.razor | 14 +-- .../PersonCreatorRolesPanelComponent.razor.cs | 14 +-- .../Panels/PersonRatingPanel.razor.cs | 10 +- .../WatchIt.Website/Layout/MainLayout.razor | 2 +- .../Layout/MainLayout.razor.cs | 20 ++-- .../WatchIt.Website/Pages/AdminPage.razor.cs | 2 +- .../WatchIt.Website/Pages/AdminPage.razor.css | 1 - .../WatchIt.Website/Pages/AuthPage.razor.cs | 22 ++-- .../WatchIt.Website/Pages/DatabasePage.razor | 30 ++--- .../Pages/DatabasePage.razor.cs | 16 +-- .../Pages/DatabasePage.razor.css | 0 .../WatchIt.Website/Pages/HomePage.razor | 12 +- .../WatchIt.Website/Pages/HomePage.razor.cs | 16 +-- .../WatchIt.Website/Pages/HomePage.razor.css | 0 .../WatchIt.Website/Pages/MediaEditPage.razor | 6 +- .../Pages/MediaEditPage.razor.cs | 56 ++++----- .../WatchIt.Website/Pages/MediaPage.razor | 2 +- .../WatchIt.Website/Pages/MediaPage.razor.cs | 34 +++--- .../Pages/PersonEditPage.razor | 6 +- .../Pages/PersonEditPage.razor.cs | 14 +-- .../Pages/PersonEditPage.razor.css | 0 .../WatchIt.Website/Pages/PersonPage.razor | 2 +- .../WatchIt.Website/Pages/PersonPage.razor.cs | 8 +- .../Pages/PersonPage.razor.css | 0 .../WatchIt.Website/Pages/SearchPage.razor | 30 ++--- .../WatchIt.Website/Pages/SearchPage.razor.cs | 16 +-- .../Pages/SearchPage.razor.css | 0 .../WatchIt.Website/Pages/UserEditPage.razor | 1 + .../Pages/UserEditPage.razor.cs | 7 ++ .../WatchIt.Website/Pages/UserPage.razor | 1 + .../WatchIt.Website/Pages/UserPage.razor.cs | 7 ++ WatchIt.Website/WatchIt.Website/Program.cs | 38 +++--- .../WatchIt.Website/WatchIt.Website.csproj | 13 +- .../WatchIt.Website/_Imports.razor | 8 +- WatchIt.sln | 113 ++++-------------- 105 files changed, 465 insertions(+), 669 deletions(-) rename WatchIt.Website/WatchIt.Website.Services/{WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Authentication => WatchIt.Website.Services.Authentication}/AuthenticationService.cs (85%) rename WatchIt.Website/WatchIt.Website.Services/{WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Authentication => WatchIt.Website.Services.Authentication}/IAuthenticationService.cs (70%) rename WatchIt.Website/WatchIt.Website.Services/{WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Authentication => WatchIt.Website.Services.Authentication}/JWTAuthenticationStateProvider.cs (94%) rename WatchIt.Website/WatchIt.Website.Services/{WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Authentication => WatchIt.Website.Services.Authentication}/User.cs (80%) create mode 100644 WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Authentication/WatchIt.Website.Services.Authentication.csproj rename WatchIt.Website/WatchIt.Website.Services/{WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Accounts/AccountsWebAPIService.cs => WatchIt.Website.Services.Client/Accounts/AccountsClientService.cs} (93%) rename WatchIt.Website/WatchIt.Website.Services/{WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Accounts/IAccountsWebAPIService.cs => WatchIt.Website.Services.Client/Accounts/IAccountsClientService.cs} (93%) rename WatchIt.Website/WatchIt.Website.Services/{WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Common => WatchIt.Website.Services.Client}/AuthorizationType.cs (52%) rename WatchIt.Website/WatchIt.Website.Services/{WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Common/BaseWebAPIService.cs => WatchIt.Website.Services.Client/BaseClientService.cs} (71%) rename WatchIt.Website/WatchIt.Website.Services/{WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Genders/GendersWebAPIService.cs => WatchIt.Website.Services.Client/Genders/GendersClientService.cs} (91%) rename WatchIt.Website/WatchIt.Website.Services/{WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Genders/IGendersWebAPIService.cs => WatchIt.Website.Services.Client/Genders/IGendersClientService.cs} (87%) rename WatchIt.Website/WatchIt.Website.Services/{WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Media/IMediaWebAPIService.cs => WatchIt.Website.Services.Client/Media/IMediaClientService.cs} (97%) rename WatchIt.Website/WatchIt.Website.Services/{WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Media/MediaWebAPIService.cs => WatchIt.Website.Services.Client/Media/MediaClientService.cs} (97%) rename WatchIt.Website/WatchIt.Website.Services/{WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Movies/IMoviesWebAPIService.cs => WatchIt.Website.Services.Client/Movies/IMoviesClientService.cs} (91%) rename WatchIt.Website/WatchIt.Website.Services/{WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Movies/MoviesWebAPIService.cs => WatchIt.Website.Services.Client/Movies/MoviesClientService.cs} (94%) rename WatchIt.Website/WatchIt.Website.Services/{WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Persons/IPersonsWebAPIService.cs => WatchIt.Website.Services.Client/Persons/IPersonsClientService.cs} (96%) rename WatchIt.Website/WatchIt.Website.Services/{WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Persons/PersonsWebAPIService.cs => WatchIt.Website.Services.Client/Persons/PersonsClientService.cs} (97%) rename WatchIt.Website/WatchIt.Website.Services/{WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Photos/IPhotosWebAPIService.cs => WatchIt.Website.Services.Client/Photos/IPhotosClientService.cs} (89%) rename WatchIt.Website/WatchIt.Website.Services/{WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Photos/PhotosWebAPIService.cs => WatchIt.Website.Services.Client/Photos/PhotosClientService.cs} (92%) rename WatchIt.Website/WatchIt.Website.Services/{WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Roles/IRolesWebAPIService.cs => WatchIt.Website.Services.Client/Roles/IRolesClientService.cs} (97%) rename WatchIt.Website/WatchIt.Website.Services/{WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Roles/RolesWebAPIService.cs => WatchIt.Website.Services.Client/Roles/RolesClientService.cs} (98%) rename WatchIt.Website/WatchIt.Website.Services/{WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Series/ISeriesWebAPIService.cs => WatchIt.Website.Services.Client/Series/ISeriesClientService.cs} (91%) rename WatchIt.Website/WatchIt.Website.Services/{WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Series/SeriesWebAPIService.cs => WatchIt.Website.Services.Client/Series/SeriesClientService.cs} (94%) create mode 100644 WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/WatchIt.Website.Services.Client.csproj rename WatchIt.Website/WatchIt.Website.Services/{WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Tokens => WatchIt.Website.Services.Tokens}/ITokensService.cs (89%) rename WatchIt.Website/WatchIt.Website.Services/{WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Tokens => WatchIt.Website.Services.Tokens}/TokensService.cs (96%) rename WatchIt.Website/WatchIt.Website.Services/{WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Tokens/WatchIt.Website.Services.Utility.Tokens.csproj => WatchIt.Website.Services.Tokens/WatchIt.Website.Services.Tokens.csproj} (54%) rename WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/{WatchIt.Website.Services.Utility.Configuration => WatchIt.Website.Services.Configuration}/ConfigurationService.cs (68%) create mode 100644 WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/IConfigurationService.cs rename WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/{WatchIt.Website.Services.Utility.Configuration => WatchIt.Website.Services.Configuration}/Model/Accounts.cs (86%) rename WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/{WatchIt.Website.Services.Utility.Configuration => WatchIt.Website.Services.Configuration}/Model/ConfigurationData.cs (78%) rename WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/{WatchIt.Website.Services.Utility.Configuration => WatchIt.Website.Services.Configuration}/Model/Endpoints.cs (86%) rename WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/{WatchIt.Website.Services.Utility.Configuration => WatchIt.Website.Services.Configuration}/Model/Genders.cs (78%) rename WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/{WatchIt.Website.Services.Utility.Configuration => WatchIt.Website.Services.Configuration}/Model/Genres.cs (78%) rename WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/{WatchIt.Website.Services.Utility.Configuration => WatchIt.Website.Services.Configuration}/Model/LogLevel.cs (63%) rename WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/{WatchIt.Website.Services.Utility.Configuration => WatchIt.Website.Services.Configuration}/Model/Logging.cs (50%) rename WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/{WatchIt.Website.Services.Utility.Configuration => WatchIt.Website.Services.Configuration}/Model/Media.cs (93%) rename WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/{WatchIt.Website.Services.Utility.Configuration => WatchIt.Website.Services.Configuration}/Model/Movies.cs (82%) rename WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/{WatchIt.Website.Services.Utility.Configuration => WatchIt.Website.Services.Configuration}/Model/Persons.cs (92%) rename WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/{WatchIt.Website.Services.Utility.Configuration => WatchIt.Website.Services.Configuration}/Model/Photos.cs (81%) rename WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/{WatchIt.Website.Services.Utility.Configuration => WatchIt.Website.Services.Configuration}/Model/Roles.cs (94%) rename WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/{WatchIt.Website.Services.Utility.Configuration => WatchIt.Website.Services.Configuration}/Model/Series.cs (83%) rename WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/{WatchIt.Website.Services.Utility.Configuration => WatchIt.Website.Services.Configuration}/Model/StorageKeys.cs (63%) rename WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/{WatchIt.Website.Services.Utility.Configuration => WatchIt.Website.Services.Configuration}/Model/Style.cs (52%) rename WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/{WatchIt.Website.Services.Utility.Configuration/WatchIt.Website.Services.Utility.Configuration.csproj => WatchIt.Website.Services.Configuration/WatchIt.Website.Services.Configuration.csproj} (100%) delete mode 100644 WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Authentication/WatchIt.Website.Services.Utility.Authentication.csproj delete mode 100644 WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/IConfigurationService.cs delete mode 100644 WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Accounts/WatchIt.Website.Services.WebAPI.Accounts.csproj delete mode 100644 WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Common/WatchIt.Website.Services.WebAPI.Common.csproj delete mode 100644 WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Genders/WatchIt.Website.Services.WebAPI.Genders.csproj delete mode 100644 WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Genres/WatchIt.Website.Services.WebAPI.Genres.csproj delete mode 100644 WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Media/WatchIt.Website.Services.WebAPI.Media.csproj delete mode 100644 WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Movies/WatchIt.Website.Services.WebAPI.Movies.csproj delete mode 100644 WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Persons/WatchIt.Website.Services.WebAPI.Persons.csproj delete mode 100644 WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Photos/WatchIt.Website.Services.WebAPI.Photos.csproj delete mode 100644 WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Roles/WatchIt.Website.Services.WebAPI.Roles.csproj delete mode 100644 WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Series/WatchIt.Website.Services.WebAPI.Series.csproj delete mode 100644 WatchIt.Website/WatchIt.Website/Pages/AdminPage.razor.css delete mode 100644 WatchIt.Website/WatchIt.Website/Pages/DatabasePage.razor.css delete mode 100644 WatchIt.Website/WatchIt.Website/Pages/HomePage.razor.css delete mode 100644 WatchIt.Website/WatchIt.Website/Pages/PersonEditPage.razor.css delete mode 100644 WatchIt.Website/WatchIt.Website/Pages/PersonPage.razor.css delete mode 100644 WatchIt.Website/WatchIt.Website/Pages/SearchPage.razor.css create mode 100644 WatchIt.Website/WatchIt.Website/Pages/UserEditPage.razor create mode 100644 WatchIt.Website/WatchIt.Website/Pages/UserEditPage.razor.cs create mode 100644 WatchIt.Website/WatchIt.Website/Pages/UserPage.razor create mode 100644 WatchIt.Website/WatchIt.Website/Pages/UserPage.razor.cs diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Authentication/AuthenticationService.cs b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Authentication/AuthenticationService.cs similarity index 85% rename from WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Authentication/AuthenticationService.cs rename to WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Authentication/AuthenticationService.cs index efe799c..9f57109 100644 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Authentication/AuthenticationService.cs +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Authentication/AuthenticationService.cs @@ -1,10 +1,10 @@ using System.IdentityModel.Tokens.Jwt; using System.Net.Http.Headers; using Microsoft.AspNetCore.Components.Authorization; -using WatchIt.Website.Services.Utility.Tokens; -using WatchIt.Website.Services.WebAPI.Accounts; +using WatchIt.Website.Services.Client.Accounts; +using WatchIt.Website.Services.Tokens; -namespace WatchIt.Website.Services.Utility.Authentication; +namespace WatchIt.Website.Services.Authentication; public class AuthenticationService : IAuthenticationService { @@ -13,7 +13,7 @@ public class AuthenticationService : IAuthenticationService private readonly AuthenticationStateProvider _authenticationStateProvider; private readonly HttpClient _httpClient; private readonly ITokensService _tokensService; - private readonly IAccountsWebAPIService _accountsWebAPIService; + private readonly IAccountsClientService _accountsClientService; #endregion @@ -21,12 +21,12 @@ public class AuthenticationService : IAuthenticationService #region CONSTRUCTORS - public AuthenticationService(AuthenticationStateProvider authenticationStateProvider, HttpClient httpClient, ITokensService tokensService, IAccountsWebAPIService accountsWebAPIService) + public AuthenticationService(AuthenticationStateProvider authenticationStateProvider, HttpClient httpClient, ITokensService tokensService, IAccountsClientService accountsClientService) { _authenticationStateProvider = authenticationStateProvider; _httpClient = httpClient; _tokensService = tokensService; - _accountsWebAPIService = accountsWebAPIService; + _accountsClientService = accountsClientService; } #endregion @@ -65,7 +65,7 @@ public class AuthenticationService : IAuthenticationService if (refreshToken is not null) { _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("refresh", refreshToken.Replace("\"", "")); - await _accountsWebAPIService.Logout(); + await _accountsClientService.Logout(); _httpClient.DefaultRequestHeaders.Authorization = null; } } diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Authentication/IAuthenticationService.cs b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Authentication/IAuthenticationService.cs similarity index 70% rename from WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Authentication/IAuthenticationService.cs rename to WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Authentication/IAuthenticationService.cs index 68ef29c..99a4ac9 100644 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Authentication/IAuthenticationService.cs +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Authentication/IAuthenticationService.cs @@ -1,4 +1,4 @@ -namespace WatchIt.Website.Services.Utility.Authentication; +namespace WatchIt.Website.Services.Authentication; public interface IAuthenticationService { diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Authentication/JWTAuthenticationStateProvider.cs b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Authentication/JWTAuthenticationStateProvider.cs similarity index 94% rename from WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Authentication/JWTAuthenticationStateProvider.cs rename to WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Authentication/JWTAuthenticationStateProvider.cs index 3646136..b86ccbe 100644 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Authentication/JWTAuthenticationStateProvider.cs +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Authentication/JWTAuthenticationStateProvider.cs @@ -4,10 +4,10 @@ using System.Text.Json; using Microsoft.AspNetCore.Components.Authorization; using Microsoft.Extensions.Logging; using WatchIt.Common.Model.Accounts; -using WatchIt.Website.Services.Utility.Tokens; -using WatchIt.Website.Services.WebAPI.Accounts; +using WatchIt.Website.Services.Tokens; +using WatchIt.Website.Services.Client.Accounts; -namespace WatchIt.Website.Services.Utility.Authentication; +namespace WatchIt.Website.Services.Authentication; public class JWTAuthenticationStateProvider : AuthenticationStateProvider { @@ -18,7 +18,7 @@ public class JWTAuthenticationStateProvider : AuthenticationStateProvider private readonly ILogger _logger; private readonly ITokensService _tokensService; - private readonly IAccountsWebAPIService _accountsService; + private readonly IAccountsClientService _accountsService; #endregion @@ -26,7 +26,7 @@ public class JWTAuthenticationStateProvider : AuthenticationStateProvider #region CONSTRUCTORS - public JWTAuthenticationStateProvider(HttpClient httpClient, ILogger logger, ITokensService tokensService, IAccountsWebAPIService accountsService) + public JWTAuthenticationStateProvider(HttpClient httpClient, ILogger logger, ITokensService tokensService, IAccountsClientService accountsService) { _httpClient = httpClient; diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Authentication/User.cs b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Authentication/User.cs similarity index 80% rename from WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Authentication/User.cs rename to WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Authentication/User.cs index 247e171..e4a7042 100644 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Authentication/User.cs +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Authentication/User.cs @@ -1,4 +1,4 @@ -namespace WatchIt.Website.Services.Utility.Authentication; +namespace WatchIt.Website.Services.Authentication; public class User { diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Authentication/WatchIt.Website.Services.Authentication.csproj b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Authentication/WatchIt.Website.Services.Authentication.csproj new file mode 100644 index 0000000..8e4ca55 --- /dev/null +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Authentication/WatchIt.Website.Services.Authentication.csproj @@ -0,0 +1,24 @@ + + + + net8.0 + enable + enable + + + + + ..\..\..\..\..\..\..\Program Files\dotnet\shared\Microsoft.AspNetCore.App\8.0.10\Microsoft.AspNetCore.Components.Authorization.dll + + + + + + + + + + + + + diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Accounts/AccountsWebAPIService.cs b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Accounts/AccountsClientService.cs similarity index 93% rename from WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Accounts/AccountsWebAPIService.cs rename to WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Accounts/AccountsClientService.cs index 5e1c092..70b6ccd 100644 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Accounts/AccountsWebAPIService.cs +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Accounts/AccountsClientService.cs @@ -1,13 +1,11 @@ using WatchIt.Common.Model.Accounts; using WatchIt.Common.Services.HttpClient; -using WatchIt.Website.Services.Utility.Configuration; -using WatchIt.Website.Services.Utility.Configuration.Model; -using WatchIt.Website.Services.Utility.Tokens; -using WatchIt.Website.Services.WebAPI.Common; +using WatchIt.Website.Services.Configuration; +using WatchIt.Website.Services.Tokens; -namespace WatchIt.Website.Services.WebAPI.Accounts; +namespace WatchIt.Website.Services.Client.Accounts; -public class AccountsWebAPIService(IHttpClientService httpClientService, IConfigurationService configurationService, ITokensService tokensService) : BaseWebAPIService(configurationService), IAccountsWebAPIService +public class AccountsClientService(IHttpClientService httpClientService, IConfigurationService configurationService, ITokensService tokensService) : BaseClientService(configurationService), IAccountsClientService { #region PUBLIC METHODS diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Accounts/IAccountsWebAPIService.cs b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Accounts/IAccountsClientService.cs similarity index 93% rename from WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Accounts/IAccountsWebAPIService.cs rename to WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Accounts/IAccountsClientService.cs index 8aed63e..9410526 100644 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Accounts/IAccountsWebAPIService.cs +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Accounts/IAccountsClientService.cs @@ -1,8 +1,8 @@ using WatchIt.Common.Model.Accounts; -namespace WatchIt.Website.Services.WebAPI.Accounts; +namespace WatchIt.Website.Services.Client.Accounts; -public interface IAccountsWebAPIService +public interface IAccountsClientService { Task Register(RegisterRequest data, Action? createdAction = null, Action>? badRequestAction = null); Task Authenticate(AuthenticateRequest data, Action? successAction = null, Action>? badRequestAction = null, Action? unauthorizedAction = null); diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Common/AuthorizationType.cs b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/AuthorizationType.cs similarity index 52% rename from WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Common/AuthorizationType.cs rename to WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/AuthorizationType.cs index b98bd71..687d7c4 100644 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Common/AuthorizationType.cs +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/AuthorizationType.cs @@ -1,4 +1,4 @@ -namespace WatchIt.Website.Services.WebAPI.Common; +namespace WatchIt.Website.Services.Client; public enum AuthorizationType { diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Common/BaseWebAPIService.cs b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/BaseClientService.cs similarity index 71% rename from WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Common/BaseWebAPIService.cs rename to WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/BaseClientService.cs index aab7ea8..fd9a9a3 100644 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Common/BaseWebAPIService.cs +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/BaseClientService.cs @@ -1,10 +1,9 @@ -using WatchIt.Website.Services.Utility.Configuration; -using WatchIt.Website.Services.Utility.Configuration.Model; -using WatchIt.Website.Services.Utility.Tokens; +using WatchIt.Website.Services.Configuration; +using WatchIt.Website.Services.Configuration.Model; -namespace WatchIt.Website.Services.WebAPI.Common; +namespace WatchIt.Website.Services.Client; -public abstract class BaseWebAPIService +public abstract class BaseClientService { #region SERVICES @@ -24,7 +23,7 @@ public abstract class BaseWebAPIService #region CONSTRUCTORS - protected BaseWebAPIService(IConfigurationService configurationService) + protected BaseClientService(IConfigurationService configurationService) { _configurationService = configurationService; } diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Genders/GendersWebAPIService.cs b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Genders/GendersClientService.cs similarity index 91% rename from WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Genders/GendersWebAPIService.cs rename to WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Genders/GendersClientService.cs index 1976795..6221118 100644 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Genders/GendersWebAPIService.cs +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Genders/GendersClientService.cs @@ -1,11 +1,10 @@ using WatchIt.Common.Model.Genders; using WatchIt.Common.Services.HttpClient; -using WatchIt.Website.Services.Utility.Configuration; -using WatchIt.Website.Services.WebAPI.Common; +using WatchIt.Website.Services.Configuration; -namespace WatchIt.Website.Services.WebAPI.Genders; +namespace WatchIt.Website.Services.Client.Genders; -public class GendersWebAPIService : BaseWebAPIService, IGendersWebAPIService +public class GendersClientService : BaseClientService, IGendersClientService { #region SERVICES @@ -18,7 +17,7 @@ public class GendersWebAPIService : BaseWebAPIService, IGendersWebAPIService #region CONSTRUCTORS - public GendersWebAPIService(IHttpClientService httpClientService, IConfigurationService configurationService) : base(configurationService) + public GendersClientService(IHttpClientService httpClientService, IConfigurationService configurationService) : base(configurationService) { _httpClientService = httpClientService; _configurationService = configurationService; diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Genders/IGendersWebAPIService.cs b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Genders/IGendersClientService.cs similarity index 87% rename from WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Genders/IGendersWebAPIService.cs rename to WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Genders/IGendersClientService.cs index 393b0fe..7e32d3a 100644 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Genders/IGendersWebAPIService.cs +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Genders/IGendersClientService.cs @@ -1,8 +1,8 @@ using WatchIt.Common.Model.Genders; -namespace WatchIt.Website.Services.WebAPI.Genders; +namespace WatchIt.Website.Services.Client.Genders; -public interface IGendersWebAPIService +public interface IGendersClientService { Task GetAllGenders(GenderQueryParameters? query = null, Action>? successAction = null); Task GetGender(long id, Action? successAction = null, Action? notFoundAction = null); diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Media/IMediaWebAPIService.cs b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Media/IMediaClientService.cs similarity index 97% rename from WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Media/IMediaWebAPIService.cs rename to WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Media/IMediaClientService.cs index 7f80fa0..bdc3465 100644 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Media/IMediaWebAPIService.cs +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Media/IMediaClientService.cs @@ -4,9 +4,9 @@ using WatchIt.Common.Model.Photos; using WatchIt.Common.Model.Rating; using WatchIt.Common.Model.Roles; -namespace WatchIt.Website.Services.WebAPI.Media; +namespace WatchIt.Website.Services.Client.Media; -public interface IMediaWebAPIService +public interface IMediaClientService { Task GetAllMedia(MediaQueryParameters? query = null, Action>? successAction = null); Task GetMedia(long mediaId, Action? successAction = null, Action? notFoundAction = null); diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Media/MediaWebAPIService.cs b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Media/MediaClientService.cs similarity index 97% rename from WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Media/MediaWebAPIService.cs rename to WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Media/MediaClientService.cs index 4fecf3b..d907dfb 100644 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Media/MediaWebAPIService.cs +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Media/MediaClientService.cs @@ -4,13 +4,11 @@ using WatchIt.Common.Model.Photos; using WatchIt.Common.Model.Rating; using WatchIt.Common.Model.Roles; using WatchIt.Common.Services.HttpClient; -using WatchIt.Website.Services.Utility.Configuration; -using WatchIt.Website.Services.Utility.Configuration.Model; -using WatchIt.Website.Services.WebAPI.Common; +using WatchIt.Website.Services.Configuration; -namespace WatchIt.Website.Services.WebAPI.Media; +namespace WatchIt.Website.Services.Client.Media; -public class MediaWebAPIService : BaseWebAPIService, IMediaWebAPIService +public class MediaClientService : BaseClientService, IMediaClientService { #region FIELDS @@ -22,7 +20,7 @@ public class MediaWebAPIService : BaseWebAPIService, IMediaWebAPIService #region CONSTRUCTORS - public MediaWebAPIService(IHttpClientService httpClientService, IConfigurationService configurationService) : base(configurationService) + public MediaClientService(IHttpClientService httpClientService, IConfigurationService configurationService) : base(configurationService) { _httpClientService = httpClientService; } diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Movies/IMoviesWebAPIService.cs b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Movies/IMoviesClientService.cs similarity index 91% rename from WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Movies/IMoviesWebAPIService.cs rename to WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Movies/IMoviesClientService.cs index 1bbe0e7..2188efe 100644 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Movies/IMoviesWebAPIService.cs +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Movies/IMoviesClientService.cs @@ -1,8 +1,8 @@ using WatchIt.Common.Model.Movies; -namespace WatchIt.Website.Services.WebAPI.Movies; +namespace WatchIt.Website.Services.Client.Movies; -public interface IMoviesWebAPIService +public interface IMoviesClientService { Task GetAllMovies(MovieQueryParameters? query = null, Action>? successAction = null); Task PostMovie(MovieRequest data, Action? successAction = null, Action>? badRequestAction = null, Action? unauthorizedAction = null, Action? forbiddenAction = null); diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Movies/MoviesWebAPIService.cs b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Movies/MoviesClientService.cs similarity index 94% rename from WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Movies/MoviesWebAPIService.cs rename to WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Movies/MoviesClientService.cs index c8980bf..8ccc46c 100644 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Movies/MoviesWebAPIService.cs +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Movies/MoviesClientService.cs @@ -3,12 +3,11 @@ using Microsoft.AspNetCore.Components; using Microsoft.Extensions.Primitives; using WatchIt.Common.Model.Movies; using WatchIt.Common.Services.HttpClient; -using WatchIt.Website.Services.Utility.Configuration; -using WatchIt.Website.Services.WebAPI.Common; +using WatchIt.Website.Services.Configuration; -namespace WatchIt.Website.Services.WebAPI.Movies; +namespace WatchIt.Website.Services.Client.Movies; -public class MoviesWebAPIService : BaseWebAPIService, IMoviesWebAPIService +public class MoviesClientService : BaseClientService, IMoviesClientService { #region SERVICES @@ -21,7 +20,7 @@ public class MoviesWebAPIService : BaseWebAPIService, IMoviesWebAPIService #region CONSTRUCTORS - public MoviesWebAPIService(IHttpClientService httpClientService, IConfigurationService configurationService) : base(configurationService) + public MoviesClientService(IHttpClientService httpClientService, IConfigurationService configurationService) : base(configurationService) { _httpClientService = httpClientService; _configurationService = configurationService; diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Persons/IPersonsWebAPIService.cs b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Persons/IPersonsClientService.cs similarity index 96% rename from WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Persons/IPersonsWebAPIService.cs rename to WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Persons/IPersonsClientService.cs index 071ed25..4e564e9 100644 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Persons/IPersonsWebAPIService.cs +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Persons/IPersonsClientService.cs @@ -2,9 +2,9 @@ using WatchIt.Common.Model.Persons; using WatchIt.Common.Model.Rating; using WatchIt.Common.Model.Roles; -namespace WatchIt.Website.Services.WebAPI.Persons; +namespace WatchIt.Website.Services.Client.Persons; -public interface IPersonsWebAPIService +public interface IPersonsClientService { Task GetAllPersons(PersonQueryParameters? query = null, Action>? successAction = null); Task GetPerson(long id, Action? successAction = null, Action? notFoundAction = null); diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Persons/PersonsWebAPIService.cs b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Persons/PersonsClientService.cs similarity index 97% rename from WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Persons/PersonsWebAPIService.cs rename to WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Persons/PersonsClientService.cs index a38a6f0..d0823eb 100644 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Persons/PersonsWebAPIService.cs +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Persons/PersonsClientService.cs @@ -5,12 +5,11 @@ using WatchIt.Common.Model.Persons; using WatchIt.Common.Model.Rating; using WatchIt.Common.Model.Roles; using WatchIt.Common.Services.HttpClient; -using WatchIt.Website.Services.Utility.Configuration; -using WatchIt.Website.Services.WebAPI.Common; +using WatchIt.Website.Services.Configuration; -namespace WatchIt.Website.Services.WebAPI.Persons; +namespace WatchIt.Website.Services.Client.Persons; -public class PersonsWebAPIService : BaseWebAPIService, IPersonsWebAPIService +public class PersonsClientService : BaseClientService, IPersonsClientService { #region SERVICES @@ -23,7 +22,7 @@ public class PersonsWebAPIService : BaseWebAPIService, IPersonsWebAPIService #region CONSTRUCTORS - public PersonsWebAPIService(IHttpClientService httpClientService, IConfigurationService configurationService) : base(configurationService) + public PersonsClientService(IHttpClientService httpClientService, IConfigurationService configurationService) : base(configurationService) { _httpClientService = httpClientService; _configurationService = configurationService; diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Photos/IPhotosWebAPIService.cs b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Photos/IPhotosClientService.cs similarity index 89% rename from WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Photos/IPhotosWebAPIService.cs rename to WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Photos/IPhotosClientService.cs index 560574b..4ed2b08 100644 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Photos/IPhotosWebAPIService.cs +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Photos/IPhotosClientService.cs @@ -1,8 +1,8 @@ using WatchIt.Common.Model.Photos; -namespace WatchIt.Website.Services.WebAPI.Photos; +namespace WatchIt.Website.Services.Client.Photos; -public interface IPhotosWebAPIService +public interface IPhotosClientService { Task GetPhotoRandomBackground(Action? successAction = null, Action? notFoundAction = null); Task DeletePhoto(Guid id, Action? successAction = null, Action? unauthorizedAction = null, Action? forbiddenAction = null, Action? notFoundAction = null); diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Photos/PhotosWebAPIService.cs b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Photos/PhotosClientService.cs similarity index 92% rename from WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Photos/PhotosWebAPIService.cs rename to WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Photos/PhotosClientService.cs index 3ca5a1d..fb9f786 100644 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Photos/PhotosWebAPIService.cs +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Photos/PhotosClientService.cs @@ -1,11 +1,10 @@ using WatchIt.Common.Model.Photos; using WatchIt.Common.Services.HttpClient; -using WatchIt.Website.Services.Utility.Configuration; -using WatchIt.Website.Services.WebAPI.Common; +using WatchIt.Website.Services.Configuration; -namespace WatchIt.Website.Services.WebAPI.Photos; +namespace WatchIt.Website.Services.Client.Photos; -public class PhotosWebAPIService : BaseWebAPIService, IPhotosWebAPIService +public class PhotosClientService : BaseClientService, IPhotosClientService { #region FIELDS @@ -17,7 +16,7 @@ public class PhotosWebAPIService : BaseWebAPIService, IPhotosWebAPIService #region CONSTRUCTORS - public PhotosWebAPIService(IHttpClientService httpClientService, IConfigurationService configurationService) : base(configurationService) + public PhotosClientService(IHttpClientService httpClientService, IConfigurationService configurationService) : base(configurationService) { _httpClientService = httpClientService; } diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Roles/IRolesWebAPIService.cs b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Roles/IRolesClientService.cs similarity index 97% rename from WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Roles/IRolesWebAPIService.cs rename to WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Roles/IRolesClientService.cs index b270d98..885fcf2 100644 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Roles/IRolesWebAPIService.cs +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Roles/IRolesClientService.cs @@ -1,9 +1,9 @@ using WatchIt.Common.Model.Rating; using WatchIt.Common.Model.Roles; -namespace WatchIt.Website.Services.WebAPI.Roles; +namespace WatchIt.Website.Services.Client.Roles; -public interface IRolesWebAPIService +public interface IRolesClientService { Task GetActorRole(Guid id, Action? successAction = null, Action? notFoundAction = null); Task PutActorRole(Guid id, ActorRoleUniversalRequest data, Action? successAction = null, Action>? badRequestAction = null, Action? unauthorizedAction = null, Action? forbiddenAction = null, Action? notFoundAction = null); diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Roles/RolesWebAPIService.cs b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Roles/RolesClientService.cs similarity index 98% rename from WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Roles/RolesWebAPIService.cs rename to WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Roles/RolesClientService.cs index 09b0418..29401f2 100644 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Roles/RolesWebAPIService.cs +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Roles/RolesClientService.cs @@ -1,12 +1,11 @@ using WatchIt.Common.Model.Rating; using WatchIt.Common.Model.Roles; using WatchIt.Common.Services.HttpClient; -using WatchIt.Website.Services.Utility.Configuration; -using WatchIt.Website.Services.WebAPI.Common; +using WatchIt.Website.Services.Configuration; -namespace WatchIt.Website.Services.WebAPI.Roles; +namespace WatchIt.Website.Services.Client.Roles; -public class RolesWebAPIService : BaseWebAPIService, IRolesWebAPIService +public class RolesClientService : BaseClientService, IRolesClientService { #region SERVICES @@ -18,7 +17,7 @@ public class RolesWebAPIService : BaseWebAPIService, IRolesWebAPIService #region CONSTRUCTORS - public RolesWebAPIService(IHttpClientService httpClientService, IConfigurationService configurationService) : base(configurationService) + public RolesClientService(IHttpClientService httpClientService, IConfigurationService configurationService) : base(configurationService) { _httpClientService = httpClientService; } diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Series/ISeriesWebAPIService.cs b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Series/ISeriesClientService.cs similarity index 91% rename from WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Series/ISeriesWebAPIService.cs rename to WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Series/ISeriesClientService.cs index dfb2b4d..8a4dd44 100644 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Series/ISeriesWebAPIService.cs +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Series/ISeriesClientService.cs @@ -1,8 +1,8 @@ using WatchIt.Common.Model.Series; -namespace WatchIt.Website.Services.WebAPI.Series; +namespace WatchIt.Website.Services.Client.Series; -public interface ISeriesWebAPIService +public interface ISeriesClientService { Task GetAllSeries(SeriesQueryParameters? query = null, Action>? successAction = null); Task GetSeries(long id, Action? successAction = null, Action? notFoundAction = null); diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Series/SeriesWebAPIService.cs b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Series/SeriesClientService.cs similarity index 94% rename from WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Series/SeriesWebAPIService.cs rename to WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Series/SeriesClientService.cs index 52f144b..5a3bc59 100644 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Series/SeriesWebAPIService.cs +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Series/SeriesClientService.cs @@ -1,12 +1,11 @@ using System.Text; using WatchIt.Common.Model.Series; using WatchIt.Common.Services.HttpClient; -using WatchIt.Website.Services.Utility.Configuration; -using WatchIt.Website.Services.WebAPI.Common; +using WatchIt.Website.Services.Configuration; -namespace WatchIt.Website.Services.WebAPI.Series; +namespace WatchIt.Website.Services.Client.Series; -public class SeriesWebAPIService : BaseWebAPIService, ISeriesWebAPIService +public class SeriesClientService : BaseClientService, ISeriesClientService { #region SERVICES @@ -19,7 +18,7 @@ public class SeriesWebAPIService : BaseWebAPIService, ISeriesWebAPIService #region CONSTRUCTORS - public SeriesWebAPIService(IHttpClientService httpClientService, IConfigurationService configurationService) : base(configurationService) + public SeriesClientService(IHttpClientService httpClientService, IConfigurationService configurationService) : base(configurationService) { _httpClientService = httpClientService; _configurationService = configurationService; diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/WatchIt.Website.Services.Client.csproj b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/WatchIt.Website.Services.Client.csproj new file mode 100644 index 0000000..2c834c9 --- /dev/null +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/WatchIt.Website.Services.Client.csproj @@ -0,0 +1,16 @@ + + + + net8.0 + enable + enable + + + + + + + + + + diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Tokens/ITokensService.cs b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Tokens/ITokensService.cs similarity index 89% rename from WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Tokens/ITokensService.cs rename to WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Tokens/ITokensService.cs index c0026a1..5c5d08a 100644 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Tokens/ITokensService.cs +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Tokens/ITokensService.cs @@ -1,6 +1,6 @@ using WatchIt.Common.Model.Accounts; -namespace WatchIt.Website.Services.Utility.Tokens; +namespace WatchIt.Website.Services.Tokens; public interface ITokensService { diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Tokens/TokensService.cs b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Tokens/TokensService.cs similarity index 96% rename from WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Tokens/TokensService.cs rename to WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Tokens/TokensService.cs index ffb35d5..fbbe843 100644 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Tokens/TokensService.cs +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Tokens/TokensService.cs @@ -2,9 +2,9 @@ using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage; using Microsoft.Extensions.Logging; using WatchIt.Common.Model.Accounts; -using WatchIt.Website.Services.Utility.Configuration; +using WatchIt.Website.Services.Configuration; -namespace WatchIt.Website.Services.Utility.Tokens; +namespace WatchIt.Website.Services.Tokens; public class TokensService : ITokensService { diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Tokens/WatchIt.Website.Services.Utility.Tokens.csproj b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Tokens/WatchIt.Website.Services.Tokens.csproj similarity index 54% rename from WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Tokens/WatchIt.Website.Services.Utility.Tokens.csproj rename to WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Tokens/WatchIt.Website.Services.Tokens.csproj index 840c020..f278ad0 100644 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Tokens/WatchIt.Website.Services.Utility.Tokens.csproj +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Tokens/WatchIt.Website.Services.Tokens.csproj @@ -4,12 +4,11 @@ net8.0 enable enable - WatchIt.Website.Services.Utility.Token - - + + diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/ConfigurationService.cs b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/ConfigurationService.cs similarity index 68% rename from WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/ConfigurationService.cs rename to WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/ConfigurationService.cs index ea86d69..5848589 100644 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/ConfigurationService.cs +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/ConfigurationService.cs @@ -1,7 +1,7 @@ using Microsoft.Extensions.Configuration; -using WatchIt.Website.Services.Utility.Configuration.Model; +using WatchIt.Website.Services.Configuration.Model; -namespace WatchIt.Website.Services.Utility.Configuration; +namespace WatchIt.Website.Services.Configuration; public class ConfigurationService(IConfiguration configuration) : IConfigurationService { diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/IConfigurationService.cs b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/IConfigurationService.cs new file mode 100644 index 0000000..852ca0a --- /dev/null +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/IConfigurationService.cs @@ -0,0 +1,8 @@ +using WatchIt.Website.Services.Configuration.Model; + +namespace WatchIt.Website.Services.Configuration; + +public interface IConfigurationService +{ + ConfigurationData Data { get; } +} \ No newline at end of file diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/Accounts.cs b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Accounts.cs similarity index 86% rename from WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/Accounts.cs rename to WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Accounts.cs index c8f50a5..1f648cf 100644 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/Accounts.cs +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Accounts.cs @@ -1,4 +1,4 @@ -namespace WatchIt.Website.Services.Utility.Configuration.Model; +namespace WatchIt.Website.Services.Configuration.Model; public class Accounts { diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/ConfigurationData.cs b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/ConfigurationData.cs similarity index 78% rename from WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/ConfigurationData.cs rename to WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/ConfigurationData.cs index 7709295..d8032f0 100644 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/ConfigurationData.cs +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/ConfigurationData.cs @@ -1,4 +1,4 @@ -namespace WatchIt.Website.Services.Utility.Configuration.Model; +namespace WatchIt.Website.Services.Configuration.Model; public class ConfigurationData { diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/Endpoints.cs b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Endpoints.cs similarity index 86% rename from WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/Endpoints.cs rename to WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Endpoints.cs index 386b6c1..979014c 100644 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/Endpoints.cs +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Endpoints.cs @@ -1,4 +1,4 @@ -namespace WatchIt.Website.Services.Utility.Configuration.Model; +namespace WatchIt.Website.Services.Configuration.Model; public class Endpoints { diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/Genders.cs b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Genders.cs similarity index 78% rename from WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/Genders.cs rename to WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Genders.cs index 58a8f53..93765b3 100644 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/Genders.cs +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Genders.cs @@ -1,4 +1,4 @@ -namespace WatchIt.Website.Services.Utility.Configuration.Model; +namespace WatchIt.Website.Services.Configuration.Model; public class Genders { diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/Genres.cs b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Genres.cs similarity index 78% rename from WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/Genres.cs rename to WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Genres.cs index 108e72b..59d41f4 100644 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/Genres.cs +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Genres.cs @@ -1,4 +1,4 @@ -namespace WatchIt.Website.Services.Utility.Configuration.Model; +namespace WatchIt.Website.Services.Configuration.Model; public class Genres { diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/LogLevel.cs b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/LogLevel.cs similarity index 63% rename from WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/LogLevel.cs rename to WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/LogLevel.cs index 601ee2d..dfb4f77 100644 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/LogLevel.cs +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/LogLevel.cs @@ -1,4 +1,4 @@ -namespace WatchIt.Website.Services.Utility.Configuration.Model; +namespace WatchIt.Website.Services.Configuration.Model; public class LogLevel { diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/Logging.cs b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Logging.cs similarity index 50% rename from WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/Logging.cs rename to WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Logging.cs index 25db637..608faab 100644 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/Logging.cs +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Logging.cs @@ -1,4 +1,4 @@ -namespace WatchIt.Website.Services.Utility.Configuration.Model; +namespace WatchIt.Website.Services.Configuration.Model; public class Logging { diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/Media.cs b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Media.cs similarity index 93% rename from WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/Media.cs rename to WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Media.cs index a7ae025..9aa7a09 100644 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/Media.cs +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Media.cs @@ -1,4 +1,4 @@ -namespace WatchIt.Website.Services.Utility.Configuration.Model; +namespace WatchIt.Website.Services.Configuration.Model; public class Media { diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/Movies.cs b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Movies.cs similarity index 82% rename from WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/Movies.cs rename to WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Movies.cs index 36ee8e2..abe1ff8 100644 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/Movies.cs +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Movies.cs @@ -1,4 +1,4 @@ -namespace WatchIt.Website.Services.Utility.Configuration.Model; +namespace WatchIt.Website.Services.Configuration.Model; public class Movies { diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/Persons.cs b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Persons.cs similarity index 92% rename from WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/Persons.cs rename to WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Persons.cs index 0bbc44e..2cc849d 100644 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/Persons.cs +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Persons.cs @@ -1,4 +1,4 @@ -namespace WatchIt.Website.Services.Utility.Configuration.Model; +namespace WatchIt.Website.Services.Configuration.Model; public class Persons { diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/Photos.cs b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Photos.cs similarity index 81% rename from WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/Photos.cs rename to WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Photos.cs index 46384b4..5fa02f1 100644 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/Photos.cs +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Photos.cs @@ -1,4 +1,4 @@ -namespace WatchIt.Website.Services.Utility.Configuration.Model; +namespace WatchIt.Website.Services.Configuration.Model; public class Photos { diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/Roles.cs b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Roles.cs similarity index 94% rename from WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/Roles.cs rename to WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Roles.cs index 6eec92e..8861284 100644 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/Roles.cs +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Roles.cs @@ -1,4 +1,4 @@ -namespace WatchIt.Website.Services.Utility.Configuration.Model; +namespace WatchIt.Website.Services.Configuration.Model; public class Roles { diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/Series.cs b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Series.cs similarity index 83% rename from WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/Series.cs rename to WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Series.cs index ec8dc63..a22e6ba 100644 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/Series.cs +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Series.cs @@ -1,4 +1,4 @@ -namespace WatchIt.Website.Services.Utility.Configuration.Model; +namespace WatchIt.Website.Services.Configuration.Model; public class Series { diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/StorageKeys.cs b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/StorageKeys.cs similarity index 63% rename from WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/StorageKeys.cs rename to WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/StorageKeys.cs index 456f4b0..60531b0 100644 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/StorageKeys.cs +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/StorageKeys.cs @@ -1,4 +1,4 @@ -namespace WatchIt.Website.Services.Utility.Configuration.Model; +namespace WatchIt.Website.Services.Configuration.Model; public class StorageKeys { diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/Style.cs b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Style.cs similarity index 52% rename from WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/Style.cs rename to WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Style.cs index 00abcbd..a6afadd 100644 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/Model/Style.cs +++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Style.cs @@ -1,4 +1,4 @@ -namespace WatchIt.Website.Services.Utility.Configuration.Model; +namespace WatchIt.Website.Services.Configuration.Model; public class Style { diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/WatchIt.Website.Services.Utility.Configuration.csproj b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/WatchIt.Website.Services.Configuration.csproj similarity index 100% rename from WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/WatchIt.Website.Services.Utility.Configuration.csproj rename to WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/WatchIt.Website.Services.Configuration.csproj diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Authentication/WatchIt.Website.Services.Utility.Authentication.csproj b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Authentication/WatchIt.Website.Services.Utility.Authentication.csproj deleted file mode 100644 index e669fe9..0000000 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Authentication/WatchIt.Website.Services.Utility.Authentication.csproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - net8.0 - enable - enable - - - - - - - - - - - - - diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/IConfigurationService.cs b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/IConfigurationService.cs deleted file mode 100644 index 9a39607..0000000 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/IConfigurationService.cs +++ /dev/null @@ -1,8 +0,0 @@ -using WatchIt.Website.Services.Utility.Configuration.Model; - -namespace WatchIt.Website.Services.Utility.Configuration; - -public interface IConfigurationService -{ - ConfigurationData Data { get; } -} \ No newline at end of file diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Accounts/WatchIt.Website.Services.WebAPI.Accounts.csproj b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Accounts/WatchIt.Website.Services.WebAPI.Accounts.csproj deleted file mode 100644 index ca5168e..0000000 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Accounts/WatchIt.Website.Services.WebAPI.Accounts.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - net8.0 - enable - enable - - - - - - - - - - diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Common/WatchIt.Website.Services.WebAPI.Common.csproj b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Common/WatchIt.Website.Services.WebAPI.Common.csproj deleted file mode 100644 index 642c1aa..0000000 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Common/WatchIt.Website.Services.WebAPI.Common.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - - net8.0 - enable - enable - - - - - - - - - diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Genders/WatchIt.Website.Services.WebAPI.Genders.csproj b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Genders/WatchIt.Website.Services.WebAPI.Genders.csproj deleted file mode 100644 index abf3359..0000000 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Genders/WatchIt.Website.Services.WebAPI.Genders.csproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - net8.0 - enable - enable - - - - - - - - diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Genres/WatchIt.Website.Services.WebAPI.Genres.csproj b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Genres/WatchIt.Website.Services.WebAPI.Genres.csproj deleted file mode 100644 index 3a63532..0000000 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Genres/WatchIt.Website.Services.WebAPI.Genres.csproj +++ /dev/null @@ -1,9 +0,0 @@ - - - - net8.0 - enable - enable - - - diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Media/WatchIt.Website.Services.WebAPI.Media.csproj b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Media/WatchIt.Website.Services.WebAPI.Media.csproj deleted file mode 100644 index ca5168e..0000000 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Media/WatchIt.Website.Services.WebAPI.Media.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - net8.0 - enable - enable - - - - - - - - - - diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Movies/WatchIt.Website.Services.WebAPI.Movies.csproj b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Movies/WatchIt.Website.Services.WebAPI.Movies.csproj deleted file mode 100644 index ef9c88f..0000000 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Movies/WatchIt.Website.Services.WebAPI.Movies.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - net8.0 - enable - enable - - - - - ..\..\..\..\..\..\..\..\Program Files\dotnet\shared\Microsoft.AspNetCore.App\8.0.2\Microsoft.AspNetCore.Components.dll - - - - - - - - - - - - diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Persons/WatchIt.Website.Services.WebAPI.Persons.csproj b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Persons/WatchIt.Website.Services.WebAPI.Persons.csproj deleted file mode 100644 index abf3359..0000000 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Persons/WatchIt.Website.Services.WebAPI.Persons.csproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - net8.0 - enable - enable - - - - - - - - diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Photos/WatchIt.Website.Services.WebAPI.Photos.csproj b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Photos/WatchIt.Website.Services.WebAPI.Photos.csproj deleted file mode 100644 index 79bbe83..0000000 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Photos/WatchIt.Website.Services.WebAPI.Photos.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - - net8.0 - enable - enable - - - - - - - - - diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Roles/WatchIt.Website.Services.WebAPI.Roles.csproj b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Roles/WatchIt.Website.Services.WebAPI.Roles.csproj deleted file mode 100644 index abf3359..0000000 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Roles/WatchIt.Website.Services.WebAPI.Roles.csproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - net8.0 - enable - enable - - - - - - - - diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Series/WatchIt.Website.Services.WebAPI.Series.csproj b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Series/WatchIt.Website.Services.WebAPI.Series.csproj deleted file mode 100644 index abf3359..0000000 --- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Series/WatchIt.Website.Services.WebAPI.Series.csproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - net8.0 - enable - enable - - - - - - - - diff --git a/WatchIt.Website/WatchIt.Website/Components/Common/Subcomponents/ListItemComponent.razor.cs b/WatchIt.Website/WatchIt.Website/Components/Common/Subcomponents/ListItemComponent.razor.cs index 818f3ee..326dbf1 100644 --- a/WatchIt.Website/WatchIt.Website/Components/Common/Subcomponents/ListItemComponent.razor.cs +++ b/WatchIt.Website/WatchIt.Website/Components/Common/Subcomponents/ListItemComponent.razor.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Components; using WatchIt.Common.Model; using WatchIt.Common.Model.Rating; -using WatchIt.Website.Services.Utility.Authentication; +using WatchIt.Website.Services.Authentication; namespace WatchIt.Website.Components.Common.Subcomponents; diff --git a/WatchIt.Website/WatchIt.Website/Components/Pages/DatabasePage/Subcomponents/PersonsFilterFormComponent.razor.cs b/WatchIt.Website/WatchIt.Website/Components/Pages/DatabasePage/Subcomponents/PersonsFilterFormComponent.razor.cs index ca4f085..c57a68a 100644 --- a/WatchIt.Website/WatchIt.Website/Components/Pages/DatabasePage/Subcomponents/PersonsFilterFormComponent.razor.cs +++ b/WatchIt.Website/WatchIt.Website/Components/Pages/DatabasePage/Subcomponents/PersonsFilterFormComponent.razor.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Components; using WatchIt.Common.Model.Genders; using WatchIt.Common.Model.Persons; -using WatchIt.Website.Services.WebAPI.Genders; +using WatchIt.Website.Services.Client.Genders; namespace WatchIt.Website.Components.Pages.DatabasePage.Subcomponents; @@ -9,7 +9,7 @@ public partial class PersonsFilterFormComponent : FilterFormComponent _genders = data) + GendersClientService.GetAllGenders(successAction: data => _genders = data) ]); // END diff --git a/WatchIt.Website/WatchIt.Website/Components/Pages/MediaEditPage/Panels/MediaActorRolesEditPanelComponent.razor.cs b/WatchIt.Website/WatchIt.Website/Components/Pages/MediaEditPage/Panels/MediaActorRolesEditPanelComponent.razor.cs index f152025..f539c69 100644 --- a/WatchIt.Website/WatchIt.Website/Components/Pages/MediaEditPage/Panels/MediaActorRolesEditPanelComponent.razor.cs +++ b/WatchIt.Website/WatchIt.Website/Components/Pages/MediaEditPage/Panels/MediaActorRolesEditPanelComponent.razor.cs @@ -2,9 +2,9 @@ using Microsoft.AspNetCore.Components; using WatchIt.Common.Model.Media; using WatchIt.Common.Model.Persons; using WatchIt.Common.Model.Roles; -using WatchIt.Website.Services.WebAPI.Media; -using WatchIt.Website.Services.WebAPI.Persons; -using WatchIt.Website.Services.WebAPI.Roles; +using WatchIt.Website.Services.Client.Media; +using WatchIt.Website.Services.Client.Persons; +using WatchIt.Website.Services.Client.Roles; namespace WatchIt.Website.Components.Pages.MediaEditPage.Panels; @@ -12,9 +12,9 @@ public partial class MediaActorRolesEditPanelComponent : ComponentBase { #region SERVICES - [Inject] private IPersonsWebAPIService PersonsWebAPIService { get; set; } = default!; - [Inject] private IMediaWebAPIService MediaWebAPIService { get; set; } = default!; - [Inject] private IRolesWebAPIService RolesWebAPIService { get; set; } = default!; + [Inject] private IPersonsClientService PersonsClientService { get; set; } = default!; + [Inject] private IMediaClientService MediaClientService { get; set; } = default!; + [Inject] private IRolesClientService RolesClientService { get; set; } = default!; #endregion @@ -62,8 +62,8 @@ public partial class MediaActorRolesEditPanelComponent : ComponentBase { endTasks.AddRange( [ - MediaWebAPIService.GetMediaAllActorRoles(Id.Value, successAction: data => _roles = data.ToDictionary(x => x.Id, x => (x, false))), - RolesWebAPIService.GetAllActorRoleTypes(successAction: data => _roleTypes = data.ToDictionary(x => x.Id, x => x.Name)), + MediaClientService.GetMediaAllActorRoles(Id.Value, successAction: data => _roles = data.ToDictionary(x => x.Id, x => (x, false))), + RolesClientService.GetAllActorRoleTypes(successAction: data => _roleTypes = data.ToDictionary(x => x.Id, x => x.Name)), ]); } @@ -120,11 +120,11 @@ public partial class MediaActorRolesEditPanelComponent : ComponentBase _saving = true; if (_editedId.HasValue) { - await RolesWebAPIService.PutActorRole(_editedId.Value, _editedModel as ActorRoleUniversalRequest, SuccessPut, BadRequest, Unauthorized); + await RolesClientService.PutActorRole(_editedId.Value, _editedModel as ActorRoleUniversalRequest, SuccessPut, BadRequest, Unauthorized); } else { - await MediaWebAPIService.PostMediaActorRole(Id!.Value, _editedModel as ActorRoleMediaRequest, SuccessPost, BadRequest, Unauthorized); + await MediaClientService.PostMediaActorRole(Id!.Value, _editedModel as ActorRoleMediaRequest, SuccessPost, BadRequest, Unauthorized); } } @@ -141,7 +141,7 @@ public partial class MediaActorRolesEditPanelComponent : ComponentBase private async Task Delete(Guid id) { _roles[id] = (_roles[id].Data, true); - await RolesWebAPIService.DeleteActorRole(id, () => _roles.Remove(id)); + await RolesClientService.DeleteActorRole(id, () => _roles.Remove(id)); } #endregion diff --git a/WatchIt.Website/WatchIt.Website/Components/Pages/MediaEditPage/Panels/MediaCreatorRolesEditPanelComponent.razor.cs b/WatchIt.Website/WatchIt.Website/Components/Pages/MediaEditPage/Panels/MediaCreatorRolesEditPanelComponent.razor.cs index 46c61c7..6d1a131 100644 --- a/WatchIt.Website/WatchIt.Website/Components/Pages/MediaEditPage/Panels/MediaCreatorRolesEditPanelComponent.razor.cs +++ b/WatchIt.Website/WatchIt.Website/Components/Pages/MediaEditPage/Panels/MediaCreatorRolesEditPanelComponent.razor.cs @@ -2,9 +2,9 @@ using Microsoft.AspNetCore.Components; using WatchIt.Common.Model.Media; using WatchIt.Common.Model.Persons; using WatchIt.Common.Model.Roles; -using WatchIt.Website.Services.WebAPI.Media; -using WatchIt.Website.Services.WebAPI.Persons; -using WatchIt.Website.Services.WebAPI.Roles; +using WatchIt.Website.Services.Client.Media; +using WatchIt.Website.Services.Client.Persons; +using WatchIt.Website.Services.Client.Roles; namespace WatchIt.Website.Components.Pages.MediaEditPage.Panels; @@ -12,9 +12,9 @@ public partial class MediaCreatorRolesEditPanelComponent : ComponentBase { #region SERVICES - [Inject] private IPersonsWebAPIService PersonsWebAPIService { get; set; } = default!; - [Inject] private IMediaWebAPIService MediaWebAPIService { get; set; } = default!; - [Inject] private IRolesWebAPIService RolesWebAPIService { get; set; } = default!; + [Inject] private IPersonsClientService PersonsClientService { get; set; } = default!; + [Inject] private IMediaClientService MediaClientService { get; set; } = default!; + [Inject] private IRolesClientService RolesClientService { get; set; } = default!; #endregion @@ -62,8 +62,8 @@ public partial class MediaCreatorRolesEditPanelComponent : ComponentBase { endTasks.AddRange( [ - MediaWebAPIService.GetMediaAllCreatorRoles(Id.Value, successAction: data => _roles = data.ToDictionary(x => x.Id, x => (x, false))), - RolesWebAPIService.GetAllCreatorRoleTypes(successAction: data => _roleTypes = data.ToDictionary(x => x.Id, x => x.Name)), + MediaClientService.GetMediaAllCreatorRoles(Id.Value, successAction: data => _roles = data.ToDictionary(x => x.Id, x => (x, false))), + RolesClientService.GetAllCreatorRoleTypes(successAction: data => _roleTypes = data.ToDictionary(x => x.Id, x => x.Name)), ]); } @@ -119,11 +119,11 @@ public partial class MediaCreatorRolesEditPanelComponent : ComponentBase _saving = true; if (_editedId.HasValue) { - await RolesWebAPIService.PutCreatorRole(_editedId.Value, _editedModel as CreatorRoleUniversalRequest, SuccessPut, BadRequest, Unauthorized); + await RolesClientService.PutCreatorRole(_editedId.Value, _editedModel as CreatorRoleUniversalRequest, SuccessPut, BadRequest, Unauthorized); } else { - await MediaWebAPIService.PostMediaCreatorRole(Id!.Value, _editedModel as CreatorRoleMediaRequest, SuccessPost, BadRequest, Unauthorized); + await MediaClientService.PostMediaCreatorRole(Id!.Value, _editedModel as CreatorRoleMediaRequest, SuccessPost, BadRequest, Unauthorized); } } @@ -140,7 +140,7 @@ public partial class MediaCreatorRolesEditPanelComponent : ComponentBase private async Task Delete(Guid id) { _roles[id] = (_roles[id].Data, true); - await RolesWebAPIService.DeleteCreatorRole(id, () => _roles.Remove(id)); + await RolesClientService.DeleteCreatorRole(id, () => _roles.Remove(id)); } #endregion diff --git a/WatchIt.Website/WatchIt.Website/Components/Pages/MediaPage/Panels/MediaActorRolesPanelComponent.razor b/WatchIt.Website/WatchIt.Website/Components/Pages/MediaPage/Panels/MediaActorRolesPanelComponent.razor index 80804ab..f373100 100644 --- a/WatchIt.Website/WatchIt.Website/Components/Pages/MediaPage/Panels/MediaActorRolesPanelComponent.razor +++ b/WatchIt.Website/WatchIt.Website/Components/Pages/MediaPage/Panels/MediaActorRolesPanelComponent.razor @@ -10,17 +10,17 @@ TQuery="ActorRoleMediaQueryParameters" TRoleParent="PersonResponse" Id="@(Id)" - GetRolesAction="@(MediaWebAPIService.GetMediaAllActorRoles)" + GetRolesAction="@(MediaClientService.GetMediaAllActorRoles)" NameSource="@((_, parent) => parent.Name)" AdditionalInfoSource="@((item, _) => $" as {item.Name}")" - GetRoleParentMethod="@((id, action) => PersonsWebAPIService.GetPerson(id, action))" + GetRoleParentMethod="@((id, action) => PersonsClientService.GetPerson(id, action))" ParentItemIdSource="@(item => item.PersonId)" ParentUrlTemplate="/person/{0}" PosterPlaceholder="/assets/person_poster.png" - PosterDownloadingTask="@((id, action) => PersonsWebAPIService.GetPersonPhoto(id, action))" - GetGlobalRatingMethod="@((id, action) => RolesWebAPIService.GetActorRoleRating(id, action))" - GetUserRatingMethod="@((id, userId, actionSuccess, actionNotFound) => RolesWebAPIService.GetActorRoleRatingByUser(id, userId, actionSuccess, actionNotFound))" - PutRatingMethod="@((id, request) => RolesWebAPIService.PutActorRoleRating(id, request))" - DeleteRatingMethod="@(id => RolesWebAPIService.DeleteActorRoleRating(id))"/> + PosterDownloadingTask="@((id, action) => PersonsClientService.GetPersonPhoto(id, action))" + GetGlobalRatingMethod="@((id, action) => RolesClientService.GetActorRoleRating(id, action))" + GetUserRatingMethod="@((id, userId, actionSuccess, actionNotFound) => RolesClientService.GetActorRoleRatingByUser(id, userId, actionSuccess, actionNotFound))" + PutRatingMethod="@((id, request) => RolesClientService.PutActorRoleRating(id, request))" + DeleteRatingMethod="@(id => RolesClientService.DeleteActorRoleRating(id))"/> \ No newline at end of file diff --git a/WatchIt.Website/WatchIt.Website/Components/Pages/MediaPage/Panels/MediaActorRolesPanelComponent.razor.cs b/WatchIt.Website/WatchIt.Website/Components/Pages/MediaPage/Panels/MediaActorRolesPanelComponent.razor.cs index 54e7287..4cd13fb 100644 --- a/WatchIt.Website/WatchIt.Website/Components/Pages/MediaPage/Panels/MediaActorRolesPanelComponent.razor.cs +++ b/WatchIt.Website/WatchIt.Website/Components/Pages/MediaPage/Panels/MediaActorRolesPanelComponent.razor.cs @@ -1,8 +1,8 @@ using Microsoft.AspNetCore.Components; -using WatchIt.Website.Services.Utility.Authentication; -using WatchIt.Website.Services.WebAPI.Media; -using WatchIt.Website.Services.WebAPI.Persons; -using WatchIt.Website.Services.WebAPI.Roles; +using WatchIt.Website.Services.Authentication; +using WatchIt.Website.Services.Client.Media; +using WatchIt.Website.Services.Client.Persons; +using WatchIt.Website.Services.Client.Roles; namespace WatchIt.Website.Components.Pages.MediaPage.Panels; @@ -10,9 +10,9 @@ public partial class MediaActorRolesPanelComponent : ComponentBase { #region SERVICES - [Inject] private IMediaWebAPIService MediaWebAPIService { get; set; } = default!; - [Inject] private IPersonsWebAPIService PersonsWebAPIService { get; set; } = default!; - [Inject] private IRolesWebAPIService RolesWebAPIService { get; set; } = default!; + [Inject] private IMediaClientService MediaClientService { get; set; } = default!; + [Inject] private IPersonsClientService PersonsClientService { get; set; } = default!; + [Inject] private IRolesClientService RolesClientService { get; set; } = default!; #endregion diff --git a/WatchIt.Website/WatchIt.Website/Components/Pages/MediaPage/Panels/MediaCreatorRolesPanelComponent.razor b/WatchIt.Website/WatchIt.Website/Components/Pages/MediaPage/Panels/MediaCreatorRolesPanelComponent.razor index 3361227..851721f 100644 --- a/WatchIt.Website/WatchIt.Website/Components/Pages/MediaPage/Panels/MediaCreatorRolesPanelComponent.razor +++ b/WatchIt.Website/WatchIt.Website/Components/Pages/MediaPage/Panels/MediaCreatorRolesPanelComponent.razor @@ -22,17 +22,17 @@ TRoleParent="PersonResponse" Id="@(Id)" Query="@(_query)" - GetRolesAction="@(MediaWebAPIService.GetMediaAllCreatorRoles)" + GetRolesAction="@(MediaClientService.GetMediaAllCreatorRoles)" NameSource="@((_, parent) => parent.Name)" - GetRoleParentMethod="@((id, action) => PersonsWebAPIService.GetPerson(id, action))" + GetRoleParentMethod="@((id, action) => PersonsClientService.GetPerson(id, action))" ParentItemIdSource="@(item => item.PersonId)" ParentUrlTemplate="/person/{0}" PosterPlaceholder="/assets/person_poster.png" - PosterDownloadingTask="@((id, action) => PersonsWebAPIService.GetPersonPhoto(id, action))" - GetGlobalRatingMethod="@((id, action) => RolesWebAPIService.GetCreatorRoleRating(id, action))" - GetUserRatingMethod="@((id, userId, actionSuccess, actionNotFound) => RolesWebAPIService.GetCreatorRoleRatingByUser(id, userId, actionSuccess, actionNotFound))" - PutRatingMethod="@((id, request) => RolesWebAPIService.PutCreatorRoleRating(id, request))" - DeleteRatingMethod="@((id) => RolesWebAPIService.DeleteCreatorRoleRating(id))"/> + PosterDownloadingTask="@((id, action) => PersonsClientService.GetPersonPhoto(id, action))" + GetGlobalRatingMethod="@((id, action) => RolesClientService.GetCreatorRoleRating(id, action))" + GetUserRatingMethod="@((id, userId, actionSuccess, actionNotFound) => RolesClientService.GetCreatorRoleRatingByUser(id, userId, actionSuccess, actionNotFound))" + PutRatingMethod="@((id, request) => RolesClientService.PutCreatorRoleRating(id, request))" + DeleteRatingMethod="@((id) => RolesClientService.DeleteCreatorRoleRating(id))"/> } else diff --git a/WatchIt.Website/WatchIt.Website/Components/Pages/MediaPage/Panels/MediaCreatorRolesPanelComponent.razor.cs b/WatchIt.Website/WatchIt.Website/Components/Pages/MediaPage/Panels/MediaCreatorRolesPanelComponent.razor.cs index c1bb1b4..3d86984 100644 --- a/WatchIt.Website/WatchIt.Website/Components/Pages/MediaPage/Panels/MediaCreatorRolesPanelComponent.razor.cs +++ b/WatchIt.Website/WatchIt.Website/Components/Pages/MediaPage/Panels/MediaCreatorRolesPanelComponent.razor.cs @@ -2,10 +2,10 @@ using Microsoft.AspNetCore.Components; using WatchIt.Common.Model.Persons; using WatchIt.Common.Model.Roles; using WatchIt.Website.Components.Common.Subcomponents; -using WatchIt.Website.Services.Utility.Authentication; -using WatchIt.Website.Services.WebAPI.Media; -using WatchIt.Website.Services.WebAPI.Persons; -using WatchIt.Website.Services.WebAPI.Roles; +using WatchIt.Website.Services.Authentication; +using WatchIt.Website.Services.Client.Media; +using WatchIt.Website.Services.Client.Persons; +using WatchIt.Website.Services.Client.Roles; namespace WatchIt.Website.Components.Pages.MediaPage.Panels; @@ -13,9 +13,9 @@ public partial class MediaCreatorRolesPanelComponent : ComponentBase { #region SERVICES - [Inject] private IPersonsWebAPIService PersonsWebAPIService { get; set; } = default!; - [Inject] private IMediaWebAPIService MediaWebAPIService { get; set; } = default!; - [Inject] private IRolesWebAPIService RolesWebAPIService { get; set; } = default!; + [Inject] private IPersonsClientService PersonsClientService { get; set; } = default!; + [Inject] private IMediaClientService MediaClientService { get; set; } = default!; + [Inject] private IRolesClientService RolesClientService { get; set; } = default!; #endregion @@ -54,7 +54,7 @@ public partial class MediaCreatorRolesPanelComponent : ComponentBase // STEP 0 endTasks.AddRange( [ - RolesWebAPIService.GetAllCreatorRoleTypes(successAction: data => _roleTypes = data) + RolesClientService.GetAllCreatorRoleTypes(successAction: data => _roleTypes = data) ]); // END diff --git a/WatchIt.Website/WatchIt.Website/Components/Pages/PersonEditPage/Panels/PersonActorRolesEditPanelComponent.razor.cs b/WatchIt.Website/WatchIt.Website/Components/Pages/PersonEditPage/Panels/PersonActorRolesEditPanelComponent.razor.cs index b462c9e..95a40ab 100644 --- a/WatchIt.Website/WatchIt.Website/Components/Pages/PersonEditPage/Panels/PersonActorRolesEditPanelComponent.razor.cs +++ b/WatchIt.Website/WatchIt.Website/Components/Pages/PersonEditPage/Panels/PersonActorRolesEditPanelComponent.razor.cs @@ -1,9 +1,9 @@ using Microsoft.AspNetCore.Components; using WatchIt.Common.Model.Media; using WatchIt.Common.Model.Roles; -using WatchIt.Website.Services.WebAPI.Media; -using WatchIt.Website.Services.WebAPI.Persons; -using WatchIt.Website.Services.WebAPI.Roles; +using WatchIt.Website.Services.Client.Media; +using WatchIt.Website.Services.Client.Persons; +using WatchIt.Website.Services.Client.Roles; namespace WatchIt.Website.Components.Pages.PersonEditPage.Panels; @@ -11,9 +11,9 @@ public partial class PersonActorRolesEditPanelComponent : ComponentBase { #region SERVICES - [Inject] private IPersonsWebAPIService PersonsWebAPIService { get; set; } = default!; - [Inject] private IMediaWebAPIService MediaWebAPIService { get; set; } = default!; - [Inject] private IRolesWebAPIService RolesWebAPIService { get; set; } = default!; + [Inject] private IPersonsClientService PersonsClientService { get; set; } = default!; + [Inject] private IMediaClientService MediaClientService { get; set; } = default!; + [Inject] private IRolesClientService RolesClientService { get; set; } = default!; #endregion @@ -61,8 +61,8 @@ public partial class PersonActorRolesEditPanelComponent : ComponentBase { endTasks.AddRange( [ - PersonsWebAPIService.GetPersonAllActorRoles(Id.Value, successAction: data => _roles = data.ToDictionary(x => x.Id, x => (x, false))), - RolesWebAPIService.GetAllActorRoleTypes(successAction: data => _roleTypes = data.ToDictionary(x => x.Id, x => x.Name)), + PersonsClientService.GetPersonAllActorRoles(Id.Value, successAction: data => _roles = data.ToDictionary(x => x.Id, x => (x, false))), + RolesClientService.GetAllActorRoleTypes(successAction: data => _roleTypes = data.ToDictionary(x => x.Id, x => x.Name)), ]); } @@ -122,11 +122,11 @@ public partial class PersonActorRolesEditPanelComponent : ComponentBase _saving = true; if (_editedId.HasValue) { - await RolesWebAPIService.PutActorRole(_editedId.Value, _editedModel as ActorRoleUniversalRequest, SuccessPut, BadRequest, Unauthorized); + await RolesClientService.PutActorRole(_editedId.Value, _editedModel as ActorRoleUniversalRequest, SuccessPut, BadRequest, Unauthorized); } else { - await PersonsWebAPIService.PostPersonActorRole(Id!.Value, _editedModel as ActorRolePersonRequest, SuccessPost, BadRequest, Unauthorized); + await PersonsClientService.PostPersonActorRole(Id!.Value, _editedModel as ActorRolePersonRequest, SuccessPost, BadRequest, Unauthorized); } } @@ -143,7 +143,7 @@ public partial class PersonActorRolesEditPanelComponent : ComponentBase private async Task Delete(Guid id) { _roles[id] = (_roles[id].Data, true); - await RolesWebAPIService.DeleteActorRole(id, () => _roles.Remove(id)); + await RolesClientService.DeleteActorRole(id, () => _roles.Remove(id)); } #endregion diff --git a/WatchIt.Website/WatchIt.Website/Components/Pages/PersonEditPage/Panels/PersonCreatorRolesEditPanelComponent.razor.cs b/WatchIt.Website/WatchIt.Website/Components/Pages/PersonEditPage/Panels/PersonCreatorRolesEditPanelComponent.razor.cs index ca9b0c6..11a81d3 100644 --- a/WatchIt.Website/WatchIt.Website/Components/Pages/PersonEditPage/Panels/PersonCreatorRolesEditPanelComponent.razor.cs +++ b/WatchIt.Website/WatchIt.Website/Components/Pages/PersonEditPage/Panels/PersonCreatorRolesEditPanelComponent.razor.cs @@ -1,9 +1,9 @@ using Microsoft.AspNetCore.Components; using WatchIt.Common.Model.Media; using WatchIt.Common.Model.Roles; -using WatchIt.Website.Services.WebAPI.Media; -using WatchIt.Website.Services.WebAPI.Persons; -using WatchIt.Website.Services.WebAPI.Roles; +using WatchIt.Website.Services.Client.Media; +using WatchIt.Website.Services.Client.Persons; +using WatchIt.Website.Services.Client.Roles; namespace WatchIt.Website.Components.Pages.PersonEditPage.Panels; @@ -11,9 +11,9 @@ public partial class PersonCreatorRolesEditPanelComponent : ComponentBase { #region SERVICES - [Inject] private IPersonsWebAPIService PersonsWebAPIService { get; set; } = default!; - [Inject] private IMediaWebAPIService MediaWebAPIService { get; set; } = default!; - [Inject] private IRolesWebAPIService RolesWebAPIService { get; set; } = default!; + [Inject] private IPersonsClientService PersonsClientService { get; set; } = default!; + [Inject] private IMediaClientService MediaClientService { get; set; } = default!; + [Inject] private IRolesClientService RolesClientService { get; set; } = default!; #endregion @@ -61,8 +61,8 @@ public partial class PersonCreatorRolesEditPanelComponent : ComponentBase { endTasks.AddRange( [ - PersonsWebAPIService.GetPersonAllCreatorRoles(Id.Value, successAction: data => _roles = data.ToDictionary(x => x.Id, x => (x, false))), - RolesWebAPIService.GetAllCreatorRoleTypes(successAction: data => _roleTypes = data.ToDictionary(x => x.Id, x => x.Name)), + PersonsClientService.GetPersonAllCreatorRoles(Id.Value, successAction: data => _roles = data.ToDictionary(x => x.Id, x => (x, false))), + RolesClientService.GetAllCreatorRoleTypes(successAction: data => _roleTypes = data.ToDictionary(x => x.Id, x => x.Name)), ]); } @@ -121,11 +121,11 @@ public partial class PersonCreatorRolesEditPanelComponent : ComponentBase _saving = true; if (_editedId.HasValue) { - await RolesWebAPIService.PutCreatorRole(_editedId.Value, _editedModel as CreatorRoleUniversalRequest, SuccessPut, BadRequest, Unauthorized); + await RolesClientService.PutCreatorRole(_editedId.Value, _editedModel as CreatorRoleUniversalRequest, SuccessPut, BadRequest, Unauthorized); } else { - await PersonsWebAPIService.PostPersonCreatorRole(Id!.Value, _editedModel as CreatorRolePersonRequest, SuccessPost, BadRequest, Unauthorized); + await PersonsClientService.PostPersonCreatorRole(Id!.Value, _editedModel as CreatorRolePersonRequest, SuccessPost, BadRequest, Unauthorized); } } @@ -142,7 +142,7 @@ public partial class PersonCreatorRolesEditPanelComponent : ComponentBase private async Task Delete(Guid id) { _roles[id] = (_roles[id].Data, true); - await RolesWebAPIService.DeleteCreatorRole(id, () => _roles.Remove(id)); + await RolesClientService.DeleteCreatorRole(id, () => _roles.Remove(id)); } #endregion diff --git a/WatchIt.Website/WatchIt.Website/Components/Pages/PersonEditPage/Panels/PersonEditFormPanelComponent.razor.cs b/WatchIt.Website/WatchIt.Website/Components/Pages/PersonEditPage/Panels/PersonEditFormPanelComponent.razor.cs index c76a9ff..98be2da 100644 --- a/WatchIt.Website/WatchIt.Website/Components/Pages/PersonEditPage/Panels/PersonEditFormPanelComponent.razor.cs +++ b/WatchIt.Website/WatchIt.Website/Components/Pages/PersonEditPage/Panels/PersonEditFormPanelComponent.razor.cs @@ -1,8 +1,8 @@ using Microsoft.AspNetCore.Components; using WatchIt.Common.Model.Genders; using WatchIt.Common.Model.Persons; -using WatchIt.Website.Services.WebAPI.Genders; -using WatchIt.Website.Services.WebAPI.Persons; +using WatchIt.Website.Services.Client.Genders; +using WatchIt.Website.Services.Client.Persons; namespace WatchIt.Website.Components.Pages.PersonEditPage.Panels; @@ -11,8 +11,8 @@ public partial class PersonEditFormPanelComponent : ComponentBase #region SERVICES [Inject] private NavigationManager NavigationManager { get; set; } = default!; - [Inject] private IPersonsWebAPIService PersonsWebAPIService { get; set; } = default!; - [Inject] private IGendersWebAPIService GendersWebAPIService { get; set; } = default!; + [Inject] private IPersonsClientService PersonsClientService { get; set; } = default!; + [Inject] private IGendersClientService GendersClientService { get; set; } = default!; #endregion @@ -52,13 +52,13 @@ public partial class PersonEditFormPanelComponent : ComponentBase // STEP 0 endTasks.AddRange( [ - GendersWebAPIService.GetAllGenders(successAction: data => _genders = data) + GendersClientService.GetAllGenders(successAction: data => _genders = data) ]); if (Id.HasValue) { endTasks.AddRange( [ - PersonsWebAPIService.GetPerson(Id.Value, data => _person = new PersonRequest(data)) + PersonsClientService.GetPerson(Id.Value, data => _person = new PersonRequest(data)) ]); } @@ -98,11 +98,11 @@ public partial class PersonEditFormPanelComponent : ComponentBase _saving = true; if (Id.HasValue) { - await PersonsWebAPIService.PutPerson(Id.Value, _person, PutSuccess, BadRequest, AuthError, AuthError); + await PersonsClientService.PutPerson(Id.Value, _person, PutSuccess, BadRequest, AuthError, AuthError); } else { - await PersonsWebAPIService.PostPerson(_person, PostSuccess, BadRequest, AuthError, AuthError); + await PersonsClientService.PostPerson(_person, PostSuccess, BadRequest, AuthError, AuthError); } } diff --git a/WatchIt.Website/WatchIt.Website/Components/Pages/PersonPage/Panels/PersonActorRolesPanelComponent.razor b/WatchIt.Website/WatchIt.Website/Components/Pages/PersonPage/Panels/PersonActorRolesPanelComponent.razor index 88a40e8..068bd6d 100644 --- a/WatchIt.Website/WatchIt.Website/Components/Pages/PersonPage/Panels/PersonActorRolesPanelComponent.razor +++ b/WatchIt.Website/WatchIt.Website/Components/Pages/PersonPage/Panels/PersonActorRolesPanelComponent.razor @@ -10,18 +10,18 @@ TQuery="ActorRolePersonQueryParameters" TRoleParent="MediaResponse" Id="@(Id)" - GetRolesAction="@(PersonsWebAPIService.GetPersonAllActorRoles)" + GetRolesAction="@(PersonsClientService.GetPersonAllActorRoles)" NameSource="@((_, parent) => parent.Title)" AdditionalInfoSource="@((item, _) => $" as {item.Name}")" - GetRoleParentMethod="@((id, action) => MediaWebAPIService.GetMedia(id, action))" + GetRoleParentMethod="@((id, action) => MediaClientService.GetMedia(id, action))" ParentItemIdSource="@(item => item.MediaId)" ParentUrlTemplate="/media/{0}" PosterPlaceholder="/assets/media_poster.png" - PosterDownloadingTask="@((id, action) => MediaWebAPIService.GetMediaPoster(id, action))" - GetGlobalRatingMethod="@((id, action) => RolesWebAPIService.GetActorRoleRating(id, action))" - GetUserRatingMethod="@((id, userId, actionSuccess, actionNotFound) => RolesWebAPIService.GetActorRoleRatingByUser(id, userId, actionSuccess, actionNotFound))" - PutRatingMethod="@((id, request) => RolesWebAPIService.PutActorRoleRating(id, request))" - DeleteRatingMethod="@(id => RolesWebAPIService.DeleteActorRoleRating(id))" + PosterDownloadingTask="@((id, action) => MediaClientService.GetMediaPoster(id, action))" + GetGlobalRatingMethod="@((id, action) => RolesClientService.GetActorRoleRating(id, action))" + GetUserRatingMethod="@((id, userId, actionSuccess, actionNotFound) => RolesClientService.GetActorRoleRatingByUser(id, userId, actionSuccess, actionNotFound))" + PutRatingMethod="@((id, request) => RolesClientService.PutActorRoleRating(id, request))" + DeleteRatingMethod="@(id => RolesClientService.DeleteActorRoleRating(id))" OnRatingChanged="@(OnRatingChanged)"/> \ No newline at end of file diff --git a/WatchIt.Website/WatchIt.Website/Components/Pages/PersonPage/Panels/PersonActorRolesPanelComponent.razor.cs b/WatchIt.Website/WatchIt.Website/Components/Pages/PersonPage/Panels/PersonActorRolesPanelComponent.razor.cs index 4b87639..20f6776 100644 --- a/WatchIt.Website/WatchIt.Website/Components/Pages/PersonPage/Panels/PersonActorRolesPanelComponent.razor.cs +++ b/WatchIt.Website/WatchIt.Website/Components/Pages/PersonPage/Panels/PersonActorRolesPanelComponent.razor.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Components; -using WatchIt.Website.Services.WebAPI.Media; -using WatchIt.Website.Services.WebAPI.Persons; -using WatchIt.Website.Services.WebAPI.Roles; +using WatchIt.Website.Services.Client.Media; +using WatchIt.Website.Services.Client.Persons; +using WatchIt.Website.Services.Client.Roles; namespace WatchIt.Website.Components.Pages.PersonPage.Panels; @@ -9,9 +9,9 @@ public partial class PersonActorRolesPanelComponent : ComponentBase { #region SERVICES - [Inject] private IMediaWebAPIService MediaWebAPIService { get; set; } = default!; - [Inject] private IPersonsWebAPIService PersonsWebAPIService { get; set; } = default!; - [Inject] private IRolesWebAPIService RolesWebAPIService { get; set; } = default!; + [Inject] private IMediaClientService MediaClientService { get; set; } = default!; + [Inject] private IPersonsClientService PersonsClientService { get; set; } = default!; + [Inject] private IRolesClientService RolesClientService { get; set; } = default!; #endregion diff --git a/WatchIt.Website/WatchIt.Website/Components/Pages/PersonPage/Panels/PersonCreatorRolesPanelComponent.razor b/WatchIt.Website/WatchIt.Website/Components/Pages/PersonPage/Panels/PersonCreatorRolesPanelComponent.razor index 609b18a..73173b9 100644 --- a/WatchIt.Website/WatchIt.Website/Components/Pages/PersonPage/Panels/PersonCreatorRolesPanelComponent.razor +++ b/WatchIt.Website/WatchIt.Website/Components/Pages/PersonPage/Panels/PersonCreatorRolesPanelComponent.razor @@ -22,17 +22,17 @@ TRoleParent="MediaResponse" Id="@(Id)" Query="@(_query)" - GetRolesAction="@(PersonsWebAPIService.GetPersonAllCreatorRoles)" + GetRolesAction="@(PersonsClientService.GetPersonAllCreatorRoles)" NameSource="@((_, parent) => parent.Title)" - GetRoleParentMethod="@((id, action) => MediaWebAPIService.GetMedia(id, action))" + GetRoleParentMethod="@((id, action) => MediaClientService.GetMedia(id, action))" ParentItemIdSource="@(item => item.MediaId)" ParentUrlTemplate="/media/{0}" PosterPlaceholder="/assets/media_poster.png" - PosterDownloadingTask="@((id, action) => MediaWebAPIService.GetMediaPoster(id, action))" - GetGlobalRatingMethod="@((id, action) => RolesWebAPIService.GetCreatorRoleRating(id, action))" - GetUserRatingMethod="@((id, userId, actionSuccess, actionNotFound) => RolesWebAPIService.GetCreatorRoleRatingByUser(id, userId, actionSuccess, actionNotFound))" - PutRatingMethod="@((id, request) => RolesWebAPIService.PutCreatorRoleRating(id, request))" - DeleteRatingMethod="@((id) => RolesWebAPIService.DeleteCreatorRoleRating(id))" + PosterDownloadingTask="@((id, action) => MediaClientService.GetMediaPoster(id, action))" + GetGlobalRatingMethod="@((id, action) => RolesClientService.GetCreatorRoleRating(id, action))" + GetUserRatingMethod="@((id, userId, actionSuccess, actionNotFound) => RolesClientService.GetCreatorRoleRatingByUser(id, userId, actionSuccess, actionNotFound))" + PutRatingMethod="@((id, request) => RolesClientService.PutCreatorRoleRating(id, request))" + DeleteRatingMethod="@((id) => RolesClientService.DeleteCreatorRoleRating(id))" OnRatingChanged="@(OnRatingChanged)"/> } diff --git a/WatchIt.Website/WatchIt.Website/Components/Pages/PersonPage/Panels/PersonCreatorRolesPanelComponent.razor.cs b/WatchIt.Website/WatchIt.Website/Components/Pages/PersonPage/Panels/PersonCreatorRolesPanelComponent.razor.cs index ac6f353..98fefb2 100644 --- a/WatchIt.Website/WatchIt.Website/Components/Pages/PersonPage/Panels/PersonCreatorRolesPanelComponent.razor.cs +++ b/WatchIt.Website/WatchIt.Website/Components/Pages/PersonPage/Panels/PersonCreatorRolesPanelComponent.razor.cs @@ -2,9 +2,9 @@ using Microsoft.AspNetCore.Components; using WatchIt.Common.Model.Media; using WatchIt.Common.Model.Roles; using WatchIt.Website.Components.Common.Subcomponents; -using WatchIt.Website.Services.WebAPI.Media; -using WatchIt.Website.Services.WebAPI.Persons; -using WatchIt.Website.Services.WebAPI.Roles; +using WatchIt.Website.Services.Client.Media; +using WatchIt.Website.Services.Client.Persons; +using WatchIt.Website.Services.Client.Roles; namespace WatchIt.Website.Components.Pages.PersonPage.Panels; @@ -12,9 +12,9 @@ public partial class PersonCreatorRolesPanelComponent : ComponentBase { #region SERVICES - [Inject] private IPersonsWebAPIService PersonsWebAPIService { get; set; } = default!; - [Inject] private IMediaWebAPIService MediaWebAPIService { get; set; } = default!; - [Inject] private IRolesWebAPIService RolesWebAPIService { get; set; } = default!; + [Inject] private IPersonsClientService PersonsClientService { get; set; } = default!; + [Inject] private IMediaClientService MediaClientService { get; set; } = default!; + [Inject] private IRolesClientService RolesClientService { get; set; } = default!; #endregion @@ -54,7 +54,7 @@ public partial class PersonCreatorRolesPanelComponent : ComponentBase // STEP 0 endTasks.AddRange( [ - RolesWebAPIService.GetAllCreatorRoleTypes(successAction: data => _roleTypes = data) + RolesClientService.GetAllCreatorRoleTypes(successAction: data => _roleTypes = data) ]); // END diff --git a/WatchIt.Website/WatchIt.Website/Components/Pages/PersonPage/Panels/PersonRatingPanel.razor.cs b/WatchIt.Website/WatchIt.Website/Components/Pages/PersonPage/Panels/PersonRatingPanel.razor.cs index 4e57c54..45d5b55 100644 --- a/WatchIt.Website/WatchIt.Website/Components/Pages/PersonPage/Panels/PersonRatingPanel.razor.cs +++ b/WatchIt.Website/WatchIt.Website/Components/Pages/PersonPage/Panels/PersonRatingPanel.razor.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Components; using WatchIt.Common.Model.Rating; -using WatchIt.Website.Services.Utility.Authentication; -using WatchIt.Website.Services.WebAPI.Persons; +using WatchIt.Website.Services.Authentication; +using WatchIt.Website.Services.Client.Persons; namespace WatchIt.Website.Components.Pages.PersonPage.Panels; @@ -10,7 +10,7 @@ public partial class PersonRatingPanel : ComponentBase #region SERVICES [Inject] private IAuthenticationService AuthenticationService { get; set; } = default!; - [Inject] private IPersonsWebAPIService PersonsWebAPIService { get; set; } = default!; + [Inject] private IPersonsClientService PersonsClientService { get; set; } = default!; #endregion @@ -83,13 +83,13 @@ public partial class PersonRatingPanel : ComponentBase } } - protected async Task UpdateGlobalRating() => await PersonsWebAPIService.GetPersonGlobalRating(Id, data => Rating = data); + protected async Task UpdateGlobalRating() => await PersonsClientService.GetPersonGlobalRating(Id, data => Rating = data); protected async Task UpdateUserRating() { if (_user is not null) { - await PersonsWebAPIService.GetPersonUserRating(Id, _user.Id, data => _userRating = data); + await PersonsClientService.GetPersonUserRating(Id, _user.Id, data => _userRating = data); } } diff --git a/WatchIt.Website/WatchIt.Website/Layout/MainLayout.razor b/WatchIt.Website/WatchIt.Website/Layout/MainLayout.razor index 63f25b6..deb1be0 100644 --- a/WatchIt.Website/WatchIt.Website/Layout/MainLayout.razor +++ b/WatchIt.Website/WatchIt.Website/Layout/MainLayout.razor @@ -1,6 +1,6 @@ @using System.Net @using WatchIt.Common.Model.Photos -@using WatchIt.Website.Services.WebAPI.Photos +@using WatchIt.Website.Services.Client.Photos @inherits LayoutComponentBase diff --git a/WatchIt.Website/WatchIt.Website/Layout/MainLayout.razor.cs b/WatchIt.Website/WatchIt.Website/Layout/MainLayout.razor.cs index db6a271..1f2f80b 100644 --- a/WatchIt.Website/WatchIt.Website/Layout/MainLayout.razor.cs +++ b/WatchIt.Website/WatchIt.Website/Layout/MainLayout.razor.cs @@ -2,11 +2,11 @@ using System.Net; using Microsoft.AspNetCore.Components; using WatchIt.Common.Model.Accounts; using WatchIt.Common.Model.Photos; -using WatchIt.Website.Services.Utility.Authentication; -using WatchIt.Website.Services.Utility.Tokens; -using WatchIt.Website.Services.WebAPI.Accounts; -using WatchIt.Website.Services.WebAPI.Media; -using WatchIt.Website.Services.WebAPI.Photos; +using WatchIt.Website.Services.Authentication; +using WatchIt.Website.Services.Tokens; +using WatchIt.Website.Services.Client.Accounts; +using WatchIt.Website.Services.Client.Media; +using WatchIt.Website.Services.Client.Photos; namespace WatchIt.Website.Layout; @@ -18,9 +18,9 @@ public partial class MainLayout : LayoutComponentBase [Inject] public NavigationManager NavigationManager { get; set; } = default!; [Inject] public ITokensService TokensService { get; set; } = default!; [Inject] public IAuthenticationService AuthenticationService { get; set; } = default!; - [Inject] public IAccountsWebAPIService AccountsWebAPIService { get; set; } = default!; - [Inject] public IMediaWebAPIService MediaWebAPIService { get; set; } = default!; - [Inject] public IPhotosWebAPIService PhotosWebAPIService { get; set; } = default!; + [Inject] public IAccountsClientService AccountsClientService { get; set; } = default!; + [Inject] public IMediaClientService MediaClientService { get; set; } = default!; + [Inject] public IPhotosClientService PhotosClientService { get; set; } = default!; #endregion @@ -76,7 +76,7 @@ public partial class MainLayout : LayoutComponentBase ]); endTasks.AddRange( [ - PhotosWebAPIService.GetPhotoRandomBackground(data => _defaultBackgroundPhoto = data) + PhotosClientService.GetPhotoRandomBackground(data => _defaultBackgroundPhoto = data) ]); // STEP 1 @@ -85,7 +85,7 @@ public partial class MainLayout : LayoutComponentBase { endTasks.AddRange( [ - AccountsWebAPIService.GetAccountProfilePicture(_user.Id, data => _userProfilePicture = data) + AccountsClientService.GetAccountProfilePicture(_user.Id, data => _userProfilePicture = data) ]); } diff --git a/WatchIt.Website/WatchIt.Website/Pages/AdminPage.razor.cs b/WatchIt.Website/WatchIt.Website/Pages/AdminPage.razor.cs index 3817611..b8993a8 100644 --- a/WatchIt.Website/WatchIt.Website/Pages/AdminPage.razor.cs +++ b/WatchIt.Website/WatchIt.Website/Pages/AdminPage.razor.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Components; using WatchIt.Website.Layout; -using WatchIt.Website.Services.Utility.Authentication; +using WatchIt.Website.Services.Authentication; namespace WatchIt.Website.Pages; diff --git a/WatchIt.Website/WatchIt.Website/Pages/AdminPage.razor.css b/WatchIt.Website/WatchIt.Website/Pages/AdminPage.razor.css deleted file mode 100644 index 5f28270..0000000 --- a/WatchIt.Website/WatchIt.Website/Pages/AdminPage.razor.css +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/WatchIt.Website/WatchIt.Website/Pages/AuthPage.razor.cs b/WatchIt.Website/WatchIt.Website/Pages/AuthPage.razor.cs index d646264..05f6be9 100644 --- a/WatchIt.Website/WatchIt.Website/Pages/AuthPage.razor.cs +++ b/WatchIt.Website/WatchIt.Website/Pages/AuthPage.razor.cs @@ -3,11 +3,11 @@ using Microsoft.AspNetCore.Components; using WatchIt.Common.Model.Accounts; using WatchIt.Common.Model.Media; using WatchIt.Common.Model.Photos; -using WatchIt.Website.Services.Utility.Authentication; -using WatchIt.Website.Services.Utility.Tokens; -using WatchIt.Website.Services.WebAPI.Accounts; -using WatchIt.Website.Services.WebAPI.Media; -using WatchIt.Website.Services.WebAPI.Photos; +using WatchIt.Website.Services.Authentication; +using WatchIt.Website.Services.Tokens; +using WatchIt.Website.Services.Client.Accounts; +using WatchIt.Website.Services.Client.Media; +using WatchIt.Website.Services.Client.Photos; namespace WatchIt.Website.Pages; @@ -18,9 +18,9 @@ public partial class AuthPage [Inject] public ILogger Logger { get; set; } = default!; [Inject] public IAuthenticationService AuthenticationService { get; set; } = default!; [Inject] public ITokensService TokensService { get; set; } = default!; - [Inject] public IMediaWebAPIService MediaWebAPIService { get; set; } = default!; - [Inject] public IAccountsWebAPIService AccountsWebAPIService { get; set; } = default!; - [Inject] public IPhotosWebAPIService PhotosWebAPIService { get; set; } = default!; + [Inject] public IMediaClientService MediaClientService { get; set; } = default!; + [Inject] public IAccountsClientService AccountsClientService { get; set; } = default!; + [Inject] public IPhotosClientService PhotosClientService { get; set; } = default!; [Inject] public NavigationManager NavigationManager { get; set; } = default!; #endregion @@ -80,7 +80,7 @@ public partial class AuthPage // STEP 0 endTasks.AddRange( [ - PhotosWebAPIService.GetPhotoRandomBackground(data => _background = data) + PhotosClientService.GetPhotoRandomBackground(data => _background = data) ]); // END @@ -112,7 +112,7 @@ public partial class AuthPage } - await AccountsWebAPIService.Authenticate(_loginModel, async (data) => await LoginSuccess(data), LoginBadRequest, LoginUnauthorized); + await AccountsClientService.Authenticate(_loginModel, async (data) => await LoginSuccess(data), LoginBadRequest, LoginUnauthorized); } private async Task Register() @@ -137,7 +137,7 @@ public partial class AuthPage _formMessage = "Password fields don't match"; return; } - await AccountsWebAPIService.Register(_registerModel, RegisterSuccess, RegisterBadRequest); + await AccountsClientService.Register(_registerModel, RegisterSuccess, RegisterBadRequest); } #endregion diff --git a/WatchIt.Website/WatchIt.Website/Pages/DatabasePage.razor b/WatchIt.Website/WatchIt.Website/Pages/DatabasePage.razor index 5740ae8..c1cbd6a 100644 --- a/WatchIt.Website/WatchIt.Website/Pages/DatabasePage.razor +++ b/WatchIt.Website/WatchIt.Website/Pages/DatabasePage.razor @@ -38,8 +38,8 @@ AdditionalNameInfoSource="@(item => item.ReleaseDate.HasValue ? $" ({item.ReleaseDate.Value.Year})" : null)" RatingSource="@(item => item.Rating)" UrlIdTemplate="/media/{0}" - PictureDownloadingTask="@((id, action) => MediaWebAPIService.GetMediaPoster(id, action))" - ItemDownloadingTask="@(MoviesWebAPIService.GetAllMovies)" + PictureDownloadingTask="@((id, action) => MediaClientService.GetMediaPoster(id, action))" + ItemDownloadingTask="@(MoviesClientService.GetAllMovies)" SortingOptions="@(new Dictionary { { "rating.count", "Number of ratings" }, @@ -48,10 +48,10 @@ { "release_date", "Release date" }, })" PosterPlaceholder="/assets/media_poster.png" - GetGlobalRatingMethod="@((id, action) => MediaWebAPIService.GetMediaRating(id, action))" - GetUserRatingMethod="@((id, userId, successAction, notfoundAction) => MediaWebAPIService.GetMediaRatingByUser(id, userId, successAction, notfoundAction))" - PutRatingMethod="@((id, request) => MediaWebAPIService.PutMediaRating(id, request))" - DeleteRatingMethod="@(id => MediaWebAPIService.DeleteMediaRating(id))"> + GetGlobalRatingMethod="@((id, action) => MediaClientService.GetMediaRating(id, action))" + GetUserRatingMethod="@((id, userId, successAction, notfoundAction) => MediaClientService.GetMediaRatingByUser(id, userId, successAction, notfoundAction))" + PutRatingMethod="@((id, request) => MediaClientService.PutMediaRating(id, request))" + DeleteRatingMethod="@(id => MediaClientService.DeleteMediaRating(id))"> break; @@ -64,8 +64,8 @@ AdditionalNameInfoSource="@(item => item.ReleaseDate.HasValue ? $" ({item.ReleaseDate.Value.Year})" : null)" RatingSource="@(item => item.Rating)" UrlIdTemplate="/media/{0}" - PictureDownloadingTask="@((id, action) => MediaWebAPIService.GetMediaPoster(id, action))" - ItemDownloadingTask="@(SeriesWebAPIService.GetAllSeries)" + PictureDownloadingTask="@((id, action) => MediaClientService.GetMediaPoster(id, action))" + ItemDownloadingTask="@(SeriesClientService.GetAllSeries)" SortingOptions="@(new Dictionary { { "rating.count", "Number of ratings" }, @@ -74,10 +74,10 @@ { "release_date", "Release date" }, })" PosterPlaceholder="/assets/media_poster.png" - GetGlobalRatingMethod="@((id, action) => MediaWebAPIService.GetMediaRating(id, action))" - GetUserRatingMethod="@((id, userId, successAction, notfoundAction) => MediaWebAPIService.GetMediaRatingByUser(id, userId, successAction, notfoundAction))" - PutRatingMethod="@((id, request) => MediaWebAPIService.PutMediaRating(id, request))" - DeleteRatingMethod="@(id => MediaWebAPIService.DeleteMediaRating(id))"> + GetGlobalRatingMethod="@((id, action) => MediaClientService.GetMediaRating(id, action))" + GetUserRatingMethod="@((id, userId, successAction, notfoundAction) => MediaClientService.GetMediaRatingByUser(id, userId, successAction, notfoundAction))" + PutRatingMethod="@((id, request) => MediaClientService.PutMediaRating(id, request))" + DeleteRatingMethod="@(id => MediaClientService.DeleteMediaRating(id))"> break; @@ -89,8 +89,8 @@ NameSource="@(item => item.Name)" RatingSource="@(item => item.Rating)" UrlIdTemplate="/person/{0}" - PictureDownloadingTask="@((id, action) => PersonsWebAPIService.GetPersonPhoto(id, action))" - ItemDownloadingTask="@(PersonsWebAPIService.GetAllPersons)" + PictureDownloadingTask="@((id, action) => PersonsClientService.GetPersonPhoto(id, action))" + ItemDownloadingTask="@(PersonsClientService.GetAllPersons)" SortingOptions="@(new Dictionary { { "rating.count", "Number of ratings" }, @@ -100,7 +100,7 @@ { "death_date", "Death date" }, })" PosterPlaceholder="/assets/person_poster.png" - GetGlobalRatingMethod="@((id, action) => PersonsWebAPIService.GetPersonGlobalRating(id, action))"> + GetGlobalRatingMethod="@((id, action) => PersonsClientService.GetPersonGlobalRating(id, action))"> break; diff --git a/WatchIt.Website/WatchIt.Website/Pages/DatabasePage.razor.cs b/WatchIt.Website/WatchIt.Website/Pages/DatabasePage.razor.cs index 179454a..48ae59b 100644 --- a/WatchIt.Website/WatchIt.Website/Pages/DatabasePage.razor.cs +++ b/WatchIt.Website/WatchIt.Website/Pages/DatabasePage.razor.cs @@ -1,9 +1,9 @@ using Microsoft.AspNetCore.Components; using WatchIt.Website.Layout; -using WatchIt.Website.Services.WebAPI.Media; -using WatchIt.Website.Services.WebAPI.Movies; -using WatchIt.Website.Services.WebAPI.Persons; -using WatchIt.Website.Services.WebAPI.Series; +using WatchIt.Website.Services.Client.Media; +using WatchIt.Website.Services.Client.Movies; +using WatchIt.Website.Services.Client.Persons; +using WatchIt.Website.Services.Client.Series; namespace WatchIt.Website.Pages; @@ -12,10 +12,10 @@ public partial class DatabasePage : ComponentBase #region SERVICES [Inject] private NavigationManager NavigationManager { get; set; } = default!; - [Inject] private IMediaWebAPIService MediaWebAPIService { get; set; } = default!; - [Inject] private IMoviesWebAPIService MoviesWebAPIService { get; set; } = default!; - [Inject] private ISeriesWebAPIService SeriesWebAPIService { get; set; } = default!; - [Inject] private IPersonsWebAPIService PersonsWebAPIService { get; set; } = default!; + [Inject] private IMediaClientService MediaClientService { get; set; } = default!; + [Inject] private IMoviesClientService MoviesClientService { get; set; } = default!; + [Inject] private ISeriesClientService SeriesClientService { get; set; } = default!; + [Inject] private IPersonsClientService PersonsClientService { get; set; } = default!; #endregion diff --git a/WatchIt.Website/WatchIt.Website/Pages/DatabasePage.razor.css b/WatchIt.Website/WatchIt.Website/Pages/DatabasePage.razor.css deleted file mode 100644 index e69de29..0000000 diff --git a/WatchIt.Website/WatchIt.Website/Pages/HomePage.razor b/WatchIt.Website/WatchIt.Website/Pages/HomePage.razor index f967910..7a43a22 100644 --- a/WatchIt.Website/WatchIt.Website/Pages/HomePage.razor +++ b/WatchIt.Website/WatchIt.Website/Pages/HomePage.razor @@ -12,26 +12,26 @@
+ GetPictureAction="@((id, action) => MediaClientService.GetMediaPoster(id, action))"/> + GetPictureAction="@((id, action) => MediaClientService.GetMediaPoster(id, action))"/> + GetPictureAction="@((id, action) => PersonsClientService.GetPersonPhoto(id, action))"/>
\ No newline at end of file diff --git a/WatchIt.Website/WatchIt.Website/Pages/HomePage.razor.cs b/WatchIt.Website/WatchIt.Website/Pages/HomePage.razor.cs index abed50c..b623573 100644 --- a/WatchIt.Website/WatchIt.Website/Pages/HomePage.razor.cs +++ b/WatchIt.Website/WatchIt.Website/Pages/HomePage.razor.cs @@ -3,10 +3,10 @@ using WatchIt.Common.Model.Media; using WatchIt.Common.Model.Movies; using WatchIt.Common.Model.Series; using WatchIt.Website.Layout; -using WatchIt.Website.Services.WebAPI.Media; -using WatchIt.Website.Services.WebAPI.Movies; -using WatchIt.Website.Services.WebAPI.Persons; -using WatchIt.Website.Services.WebAPI.Series; +using WatchIt.Website.Services.Client.Media; +using WatchIt.Website.Services.Client.Movies; +using WatchIt.Website.Services.Client.Persons; +using WatchIt.Website.Services.Client.Series; namespace WatchIt.Website.Pages; @@ -15,10 +15,10 @@ public partial class HomePage #region SERVICES [Inject] public NavigationManager NavigationManager { get; set; } = default!; - [Inject] public IMediaWebAPIService MediaWebAPIService { get; set; } = default!; - [Inject] public IMoviesWebAPIService MoviesWebAPIService { get; set; } = default!; - [Inject] public ISeriesWebAPIService SeriesWebAPIService { get; set; } = default!; - [Inject] public IPersonsWebAPIService PersonsWebAPIService { get; set; } = default!; + [Inject] public IMediaClientService MediaClientService { get; set; } = default!; + [Inject] public IMoviesClientService MoviesClientService { get; set; } = default!; + [Inject] public ISeriesClientService SeriesClientService { get; set; } = default!; + [Inject] public IPersonsClientService PersonsClientService { get; set; } = default!; #endregion diff --git a/WatchIt.Website/WatchIt.Website/Pages/HomePage.razor.css b/WatchIt.Website/WatchIt.Website/Pages/HomePage.razor.css deleted file mode 100644 index e69de29..0000000 diff --git a/WatchIt.Website/WatchIt.Website/Pages/MediaEditPage.razor b/WatchIt.Website/WatchIt.Website/Pages/MediaEditPage.razor index 58a4ef7..86a3d61 100644 --- a/WatchIt.Website/WatchIt.Website/Pages/MediaEditPage.razor +++ b/WatchIt.Website/WatchIt.Website/Pages/MediaEditPage.razor @@ -58,9 +58,9 @@
diff --git a/WatchIt.Website/WatchIt.Website/Pages/MediaEditPage.razor.cs b/WatchIt.Website/WatchIt.Website/Pages/MediaEditPage.razor.cs index d0dc6f5..ad6d54f 100644 --- a/WatchIt.Website/WatchIt.Website/Pages/MediaEditPage.razor.cs +++ b/WatchIt.Website/WatchIt.Website/Pages/MediaEditPage.razor.cs @@ -7,12 +7,12 @@ using WatchIt.Common.Model.Persons; using WatchIt.Common.Model.Photos; using WatchIt.Common.Model.Series; using WatchIt.Website.Layout; -using WatchIt.Website.Services.Utility.Authentication; -using WatchIt.Website.Services.WebAPI.Media; -using WatchIt.Website.Services.WebAPI.Movies; -using WatchIt.Website.Services.WebAPI.Persons; -using WatchIt.Website.Services.WebAPI.Photos; -using WatchIt.Website.Services.WebAPI.Series; +using WatchIt.Website.Services.Authentication; +using WatchIt.Website.Services.Client.Media; +using WatchIt.Website.Services.Client.Movies; +using WatchIt.Website.Services.Client.Persons; +using WatchIt.Website.Services.Client.Photos; +using WatchIt.Website.Services.Client.Series; namespace WatchIt.Website.Pages; @@ -22,11 +22,11 @@ public partial class MediaEditPage : ComponentBase [Inject] public NavigationManager NavigationManager { get; set; } = default!; [Inject] public IAuthenticationService AuthenticationService { get; set; } = default!; - [Inject] public IMediaWebAPIService MediaWebAPIService { get; set; } = default!; - [Inject] public IMoviesWebAPIService MoviesWebAPIService { get; set; } = default!; - [Inject] public ISeriesWebAPIService SeriesWebAPIService { get; set; } = default!; - [Inject] public IPhotosWebAPIService PhotosWebAPIService { get; set; } = default!; - [Inject] public IPersonsWebAPIService PersonsWebAPIService { get; set; } = default!; + [Inject] public IMediaClientService MediaClientService { get; set; } = default!; + [Inject] public IMoviesClientService MoviesClientService { get; set; } = default!; + [Inject] public ISeriesClientService SeriesClientService { get; set; } = default!; + [Inject] public IPhotosClientService PhotosClientService { get; set; } = default!; + [Inject] public IPersonsClientService PersonsClientService { get; set; } = default!; #endregion @@ -114,7 +114,7 @@ public partial class MediaEditPage : ComponentBase ]); endTasks.AddRange( [ - PersonsWebAPIService.GetAllPersons(successAction: data => _persons = data.ToDictionary(x => x.Id, x => x)) + PersonsClientService.GetAllPersons(successAction: data => _persons = data.ToDictionary(x => x.Id, x => x)) ]); } @@ -124,13 +124,13 @@ public partial class MediaEditPage : ComponentBase { endTasks.AddRange( [ - MediaWebAPIService.GetMediaPhotoRandomBackground(Id.Value, data => Layout.BackgroundPhoto = data), - MediaWebAPIService.GetMediaPoster(Id.Value, data => + MediaClientService.GetMediaPhotoRandomBackground(Id.Value, data => Layout.BackgroundPhoto = data), + MediaClientService.GetMediaPoster(Id.Value, data => { _mediaPosterSaved = data; _mediaPosterRequest = new MediaPosterRequest(data); }), - MediaWebAPIService.GetMediaPhotos(Id.Value, successAction: data => _photos = data) + MediaClientService.GetMediaPhotos(Id.Value, successAction: data => _photos = data) ]); } @@ -145,14 +145,14 @@ public partial class MediaEditPage : ComponentBase { if (Id.HasValue) { - await MediaWebAPIService.GetMedia(Id.Value, data => _media = data, () => NavigationManager.NavigateTo("/media/new/movie")); + await MediaClientService.GetMedia(Id.Value, data => _media = data, () => NavigationManager.NavigateTo("/media/new/movie")); if (_media.Type == MediaType.Movie) { - await MoviesWebAPIService.GetMovie(Id.Value, data => _movieRequest = new MovieRequest(data)); + await MoviesClientService.GetMovie(Id.Value, data => _movieRequest = new MovieRequest(data)); } else { - await SeriesWebAPIService.GetSeries(Id.Value, data => _seriesRequest = new SeriesRequest(data)); + await SeriesClientService.GetSeries(Id.Value, data => _seriesRequest = new SeriesRequest(data)); } } else @@ -210,7 +210,7 @@ public partial class MediaEditPage : ComponentBase } _mediaPosterSaving = true; - await MediaWebAPIService.PutMediaPoster(Id.Value, _mediaPosterRequest, Success); + await MediaClientService.PutMediaPoster(Id.Value, _mediaPosterRequest, Success); } private void CancelPoster() @@ -230,7 +230,7 @@ public partial class MediaEditPage : ComponentBase } _mediaPosterDeleting = true; - await MediaWebAPIService.DeleteMediaPoster(Id.Value, Success); + await MediaClientService.DeleteMediaPoster(Id.Value, Success); } #endregion @@ -259,22 +259,22 @@ public partial class MediaEditPage : ComponentBase { if (_movieRequest is not null) { - await MoviesWebAPIService.PostMovie(_movieRequest, data => SuccessPost(data.Id), BadRequest); + await MoviesClientService.PostMovie(_movieRequest, data => SuccessPost(data.Id), BadRequest); } else { - await SeriesWebAPIService.PostSeries(_seriesRequest, data => SuccessPost(data.Id), BadRequest); + await SeriesClientService.PostSeries(_seriesRequest, data => SuccessPost(data.Id), BadRequest); } } else { if (_movieRequest is not null) { - await MoviesWebAPIService.PutMovie(Id.Value, _movieRequest, () => _basicDataSaving = false, BadRequest); + await MoviesClientService.PutMovie(Id.Value, _movieRequest, () => _basicDataSaving = false, BadRequest); } else { - await SeriesWebAPIService.PutSeries(Id.Value, _seriesRequest, () => _basicDataSaving = false, BadRequest); + await SeriesClientService.PutSeries(Id.Value, _seriesRequest, () => _basicDataSaving = false, BadRequest); } } } @@ -291,7 +291,7 @@ public partial class MediaEditPage : ComponentBase } _photoDeleting.Add(id); - await PhotosWebAPIService.DeletePhoto(id, async () => await Success()); + await PhotosClientService.DeletePhoto(id, async () => await Success()); } private void InitEditPhoto(Guid? id) @@ -345,17 +345,17 @@ public partial class MediaEditPage : ComponentBase if (_photoEditId is null) { _photoEditRequest.Background = _photoEditIsBackground ? _photoEditBackgroundData : null; - await MediaWebAPIService.PostMediaPhoto(Id.Value, _photoEditRequest, Success, BadRequest); + await MediaClientService.PostMediaPhoto(Id.Value, _photoEditRequest, Success, BadRequest); } else { if (_photoEditIsBackground) { - await PhotosWebAPIService.PutPhotoBackgroundData(_photoEditId.Value, _photoEditBackgroundData, Success, BadRequest); + await PhotosClientService.PutPhotoBackgroundData(_photoEditId.Value, _photoEditBackgroundData, Success, BadRequest); } else { - await PhotosWebAPIService.DeletePhotoBackgroundData(_photoEditId.Value, Success); + await PhotosClientService.DeletePhotoBackgroundData(_photoEditId.Value, Success); } } } diff --git a/WatchIt.Website/WatchIt.Website/Pages/MediaPage.razor b/WatchIt.Website/WatchIt.Website/Pages/MediaPage.razor index 2dde4a8..34d068c 100644 --- a/WatchIt.Website/WatchIt.Website/Pages/MediaPage.razor +++ b/WatchIt.Website/WatchIt.Website/Pages/MediaPage.razor @@ -36,7 +36,7 @@ else Subname="@(_media.OriginalTitle)" Description="@(_media.Description)" PosterPlaceholder="/assets/media_poster.png" - GetPosterMethod="@(action => MediaWebAPIService.GetMediaPoster(_media.Id, action))"/> + GetPosterMethod="@(action => MediaClientService.GetMediaPoster(_media.Id, action))"/>
diff --git a/WatchIt.Website/WatchIt.Website/Pages/MediaPage.razor.cs b/WatchIt.Website/WatchIt.Website/Pages/MediaPage.razor.cs index e3321c9..047716f 100644 --- a/WatchIt.Website/WatchIt.Website/Pages/MediaPage.razor.cs +++ b/WatchIt.Website/WatchIt.Website/Pages/MediaPage.razor.cs @@ -7,10 +7,10 @@ using WatchIt.Common.Model.Photos; using WatchIt.Common.Model.Rating; using WatchIt.Common.Model.Series; using WatchIt.Website.Layout; -using WatchIt.Website.Services.Utility.Authentication; -using WatchIt.Website.Services.WebAPI.Media; -using WatchIt.Website.Services.WebAPI.Movies; -using WatchIt.Website.Services.WebAPI.Series; +using WatchIt.Website.Services.Authentication; +using WatchIt.Website.Services.Client.Media; +using WatchIt.Website.Services.Client.Movies; +using WatchIt.Website.Services.Client.Series; namespace WatchIt.Website.Pages; @@ -20,9 +20,9 @@ public partial class MediaPage : ComponentBase [Inject] public NavigationManager NavigationManager { get; set; } = default!; [Inject] public IAuthenticationService AuthenticationService { get; set; } = default!; - [Inject] public IMediaWebAPIService MediaWebAPIService { get; set; } = default!; - [Inject] public IMoviesWebAPIService MoviesWebAPIService { get; set; } = default!; - [Inject] public ISeriesWebAPIService SeriesWebAPIService { get; set; } = default!; + [Inject] public IMediaClientService MediaClientService { get; set; } = default!; + [Inject] public IMoviesClientService MoviesClientService { get; set; } = default!; + [Inject] public ISeriesClientService SeriesClientService { get; set; } = default!; #endregion @@ -74,7 +74,7 @@ public partial class MediaPage : ComponentBase // STEP 0 step1Tasks.AddRange( [ - MediaWebAPIService.GetMedia(Id, data => _media = data, () => _error = $"Media with id {Id} was not found") + MediaClientService.GetMedia(Id, data => _media = data, () => _error = $"Media with id {Id} was not found") ]); // STEP 1 @@ -88,11 +88,11 @@ public partial class MediaPage : ComponentBase endTasks.AddRange( [ - MediaWebAPIService.PostMediaView(Id), - MediaWebAPIService.GetMediaPhotoRandomBackground(Id, data => Layout.BackgroundPhoto = data), - MediaWebAPIService.GetMediaGenres(Id, data => _genres = data), - MediaWebAPIService.GetMediaRating(Id, data => _globalRating = data), - _media.Type == MediaType.Movie ? MoviesWebAPIService.GetMovie(Id, data => _movie = data) : SeriesWebAPIService.GetSeries(Id, data => _series = data), + MediaClientService.PostMediaView(Id), + MediaClientService.GetMediaPhotoRandomBackground(Id, data => Layout.BackgroundPhoto = data), + MediaClientService.GetMediaGenres(Id, data => _genres = data), + MediaClientService.GetMediaRating(Id, data => _globalRating = data), + _media.Type == MediaType.Movie ? MoviesClientService.GetMovie(Id, data => _movie = data) : SeriesClientService.GetSeries(Id, data => _series = data), ]); } @@ -102,7 +102,7 @@ public partial class MediaPage : ComponentBase { endTasks.AddRange( [ - MediaWebAPIService.GetMediaRatingByUser(Id, _user.Id, data => _userRating = data) + MediaClientService.GetMediaRatingByUser(Id, _user.Id, data => _userRating = data) ]); } @@ -118,15 +118,15 @@ public partial class MediaPage : ComponentBase { if (_userRating == rating) { - await MediaWebAPIService.DeleteMediaRating(Id); + await MediaClientService.DeleteMediaRating(Id); _userRating = null; } else { - await MediaWebAPIService.PutMediaRating(Id, new RatingRequest(rating)); + await MediaClientService.PutMediaRating(Id, new RatingRequest(rating)); _userRating = rating; } - await MediaWebAPIService.GetMediaRating(Id, data => _globalRating = data); + await MediaClientService.GetMediaRating(Id, data => _globalRating = data); } #endregion diff --git a/WatchIt.Website/WatchIt.Website/Pages/PersonEditPage.razor b/WatchIt.Website/WatchIt.Website/Pages/PersonEditPage.razor index 4e557d3..466d05d 100644 --- a/WatchIt.Website/WatchIt.Website/Pages/PersonEditPage.razor +++ b/WatchIt.Website/WatchIt.Website/Pages/PersonEditPage.razor @@ -49,9 +49,9 @@
diff --git a/WatchIt.Website/WatchIt.Website/Pages/PersonEditPage.razor.cs b/WatchIt.Website/WatchIt.Website/Pages/PersonEditPage.razor.cs index 242d128..77bd731 100644 --- a/WatchIt.Website/WatchIt.Website/Pages/PersonEditPage.razor.cs +++ b/WatchIt.Website/WatchIt.Website/Pages/PersonEditPage.razor.cs @@ -2,9 +2,9 @@ using Microsoft.AspNetCore.Components; using WatchIt.Common.Model.Media; using WatchIt.Common.Model.Persons; using WatchIt.Website.Layout; -using WatchIt.Website.Services.Utility.Authentication; -using WatchIt.Website.Services.WebAPI.Media; -using WatchIt.Website.Services.WebAPI.Persons; +using WatchIt.Website.Services.Authentication; +using WatchIt.Website.Services.Client.Media; +using WatchIt.Website.Services.Client.Persons; namespace WatchIt.Website.Pages; @@ -14,8 +14,8 @@ public partial class PersonEditPage : ComponentBase [Inject] private NavigationManager NavigationManager { get; set; } = default!; [Inject] private IAuthenticationService AuthenticationService { get; set; } = default!; - [Inject] private IPersonsWebAPIService PersonsWebAPIService { get; set; } = default!; - [Inject] private IMediaWebAPIService MediaWebAPIService { get; set; } = default!; + [Inject] private IPersonsClientService PersonsClientService { get; set; } = default!; + [Inject] private IMediaClientService MediaClientService { get; set; } = default!; #endregion @@ -66,8 +66,8 @@ public partial class PersonEditPage : ComponentBase { endTasks.AddRange( [ - PersonsWebAPIService.GetPerson(Id.Value, data => _person = data, () => NavigationManager.NavigateTo("/person/new", true)), - MediaWebAPIService.GetAllMedia(successAction: data => _media = data.ToDictionary(x => x.Id, x => x)), + PersonsClientService.GetPerson(Id.Value, data => _person = data, () => NavigationManager.NavigateTo("/person/new", true)), + MediaClientService.GetAllMedia(successAction: data => _media = data.ToDictionary(x => x.Id, x => x)), ]); } diff --git a/WatchIt.Website/WatchIt.Website/Pages/PersonEditPage.razor.css b/WatchIt.Website/WatchIt.Website/Pages/PersonEditPage.razor.css deleted file mode 100644 index e69de29..0000000 diff --git a/WatchIt.Website/WatchIt.Website/Pages/PersonPage.razor b/WatchIt.Website/WatchIt.Website/Pages/PersonPage.razor index d88eb16..c98324f 100644 --- a/WatchIt.Website/WatchIt.Website/Pages/PersonPage.razor +++ b/WatchIt.Website/WatchIt.Website/Pages/PersonPage.razor @@ -26,7 +26,7 @@ Subname="@(_person.FullName)" Description="@(_person.Description)" PosterPlaceholder="/assets/person_poster.png" - GetPosterMethod="@(action => PersonsWebAPIService.GetPersonPhoto(_person.Id, action))"/> + GetPosterMethod="@(action => PersonsClientService.GetPersonPhoto(_person.Id, action))"/>
diff --git a/WatchIt.Website/WatchIt.Website/Pages/PersonPage.razor.cs b/WatchIt.Website/WatchIt.Website/Pages/PersonPage.razor.cs index 12120a1..29307ce 100644 --- a/WatchIt.Website/WatchIt.Website/Pages/PersonPage.razor.cs +++ b/WatchIt.Website/WatchIt.Website/Pages/PersonPage.razor.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Components; using WatchIt.Common.Model.Persons; using WatchIt.Website.Components.Pages.PersonPage.Panels; using WatchIt.Website.Layout; -using WatchIt.Website.Services.WebAPI.Persons; +using WatchIt.Website.Services.Client.Persons; namespace WatchIt.Website.Pages; @@ -10,7 +10,7 @@ public partial class PersonPage : ComponentBase { #region SERVICES - [Inject] private IPersonsWebAPIService PersonsWebAPIService { get; set; } = default!; + [Inject] private IPersonsClientService PersonsClientService { get; set; } = default!; #endregion @@ -53,7 +53,7 @@ public partial class PersonPage : ComponentBase // STEP 0 step1Tasks.AddRange( [ - PersonsWebAPIService.GetPerson(Id, data => _person = data) + PersonsClientService.GetPerson(Id, data => _person = data) ]); // STEP 1 @@ -62,7 +62,7 @@ public partial class PersonPage : ComponentBase { endTasks.AddRange( [ - PersonsWebAPIService.PostPersonView(Id), + PersonsClientService.PostPersonView(Id), ]); } diff --git a/WatchIt.Website/WatchIt.Website/Pages/PersonPage.razor.css b/WatchIt.Website/WatchIt.Website/Pages/PersonPage.razor.css deleted file mode 100644 index e69de29..0000000 diff --git a/WatchIt.Website/WatchIt.Website/Pages/SearchPage.razor b/WatchIt.Website/WatchIt.Website/Pages/SearchPage.razor index a88e28e..7e30b8f 100644 --- a/WatchIt.Website/WatchIt.Website/Pages/SearchPage.razor +++ b/WatchIt.Website/WatchIt.Website/Pages/SearchPage.razor @@ -28,13 +28,13 @@ AdditionalNameInfoSource="@(item => item.ReleaseDate.HasValue ? $" ({item.ReleaseDate.Value.Year})" : null)" RatingSource="@(item => item.Rating)" Query="@(new MovieQueryParameters { Title = DecodedQuery, OrderBy = "rating.count" })" - ItemDownloadingTask="@(MoviesWebAPIService.GetAllMovies)" - PictureDownloadingTask="@((id, action) => MediaWebAPIService.GetMediaPoster(id, action))" + ItemDownloadingTask="@(MoviesClientService.GetAllMovies)" + PictureDownloadingTask="@((id, action) => MediaClientService.GetMediaPoster(id, action))" PosterPlaceholder="/assets/media_poster.png" - GetGlobalRatingMethod="@((id, action) => MediaWebAPIService.GetMediaRating(id, action))" - GetUserRatingMethod="@((id, userId, successAction, notfoundAction) => MediaWebAPIService.GetMediaRatingByUser(id, userId, successAction, notfoundAction))" - PutRatingMethod="@((id, request) => MediaWebAPIService.PutMediaRating(id, request))" - DeleteRatingMethod="@(id => MediaWebAPIService.DeleteMediaRating(id))"/> + GetGlobalRatingMethod="@((id, action) => MediaClientService.GetMediaRating(id, action))" + GetUserRatingMethod="@((id, userId, successAction, notfoundAction) => MediaClientService.GetMediaRatingByUser(id, userId, successAction, notfoundAction))" + PutRatingMethod="@((id, request) => MediaClientService.PutMediaRating(id, request))" + DeleteRatingMethod="@(id => MediaClientService.DeleteMediaRating(id))"/> + GetGlobalRatingMethod="@((id, action) => MediaClientService.GetMediaRating(id, action))" + GetUserRatingMethod="@((id, userId, successAction, notfoundAction) => MediaClientService.GetMediaRatingByUser(id, userId, successAction, notfoundAction))" + PutRatingMethod="@((id, request) => MediaClientService.PutMediaRating(id, request))" + DeleteRatingMethod="@(id => MediaClientService.DeleteMediaRating(id))"/> + GetGlobalRatingMethod="@((id, action) => PersonsClientService.GetPersonGlobalRating(id, action))"/>
\ No newline at end of file diff --git a/WatchIt.Website/WatchIt.Website/Pages/SearchPage.razor.cs b/WatchIt.Website/WatchIt.Website/Pages/SearchPage.razor.cs index 029a402..baaef95 100644 --- a/WatchIt.Website/WatchIt.Website/Pages/SearchPage.razor.cs +++ b/WatchIt.Website/WatchIt.Website/Pages/SearchPage.razor.cs @@ -1,10 +1,10 @@ using System.Net; using Microsoft.AspNetCore.Components; using WatchIt.Website.Layout; -using WatchIt.Website.Services.WebAPI.Media; -using WatchIt.Website.Services.WebAPI.Movies; -using WatchIt.Website.Services.WebAPI.Persons; -using WatchIt.Website.Services.WebAPI.Series; +using WatchIt.Website.Services.Client.Media; +using WatchIt.Website.Services.Client.Movies; +using WatchIt.Website.Services.Client.Persons; +using WatchIt.Website.Services.Client.Series; namespace WatchIt.Website.Pages; @@ -12,10 +12,10 @@ public partial class SearchPage : ComponentBase { #region SERVICES - [Inject] private IMoviesWebAPIService MoviesWebAPIService { get; set; } = default!; - [Inject] private ISeriesWebAPIService SeriesWebAPIService { get; set; } = default!; - [Inject] private IMediaWebAPIService MediaWebAPIService { get; set; } = default!; - [Inject] private IPersonsWebAPIService PersonsWebAPIService { get; set; } = default!; + [Inject] private IMoviesClientService MoviesClientService { get; set; } = default!; + [Inject] private ISeriesClientService SeriesClientService { get; set; } = default!; + [Inject] private IMediaClientService MediaClientService { get; set; } = default!; + [Inject] private IPersonsClientService PersonsClientService { get; set; } = default!; #endregion diff --git a/WatchIt.Website/WatchIt.Website/Pages/SearchPage.razor.css b/WatchIt.Website/WatchIt.Website/Pages/SearchPage.razor.css deleted file mode 100644 index e69de29..0000000 diff --git a/WatchIt.Website/WatchIt.Website/Pages/UserEditPage.razor b/WatchIt.Website/WatchIt.Website/Pages/UserEditPage.razor new file mode 100644 index 0000000..64a2378 --- /dev/null +++ b/WatchIt.Website/WatchIt.Website/Pages/UserEditPage.razor @@ -0,0 +1 @@ +@page "/user/edit" \ No newline at end of file diff --git a/WatchIt.Website/WatchIt.Website/Pages/UserEditPage.razor.cs b/WatchIt.Website/WatchIt.Website/Pages/UserEditPage.razor.cs new file mode 100644 index 0000000..d5a489f --- /dev/null +++ b/WatchIt.Website/WatchIt.Website/Pages/UserEditPage.razor.cs @@ -0,0 +1,7 @@ +using Microsoft.AspNetCore.Components; + +namespace WatchIt.Website.Pages; + +public partial class UserEditPage : ComponentBase +{ +} \ No newline at end of file diff --git a/WatchIt.Website/WatchIt.Website/Pages/UserPage.razor b/WatchIt.Website/WatchIt.Website/Pages/UserPage.razor new file mode 100644 index 0000000..74f46be --- /dev/null +++ b/WatchIt.Website/WatchIt.Website/Pages/UserPage.razor @@ -0,0 +1 @@ +@page "/user/{id:long}" \ No newline at end of file diff --git a/WatchIt.Website/WatchIt.Website/Pages/UserPage.razor.cs b/WatchIt.Website/WatchIt.Website/Pages/UserPage.razor.cs new file mode 100644 index 0000000..3af1678 --- /dev/null +++ b/WatchIt.Website/WatchIt.Website/Pages/UserPage.razor.cs @@ -0,0 +1,7 @@ +using Microsoft.AspNetCore.Components; + +namespace WatchIt.Website.Pages; + +public partial class UserPage : ComponentBase +{ +} \ No newline at end of file diff --git a/WatchIt.Website/WatchIt.Website/Program.cs b/WatchIt.Website/WatchIt.Website/Program.cs index 9f05d6f..fe0c437 100644 --- a/WatchIt.Website/WatchIt.Website/Program.cs +++ b/WatchIt.Website/WatchIt.Website/Program.cs @@ -5,17 +5,17 @@ using Blazorise.Bootstrap5; using Blazorise.Icons.FontAwesome; using Microsoft.AspNetCore.Components.Authorization; using WatchIt.Common.Services.HttpClient; -using WatchIt.Website.Services.Utility.Authentication; -using WatchIt.Website.Services.Utility.Configuration; -using WatchIt.Website.Services.Utility.Tokens; -using WatchIt.Website.Services.WebAPI.Accounts; -using WatchIt.Website.Services.WebAPI.Genders; -using WatchIt.Website.Services.WebAPI.Media; -using WatchIt.Website.Services.WebAPI.Movies; -using WatchIt.Website.Services.WebAPI.Persons; -using WatchIt.Website.Services.WebAPI.Photos; -using WatchIt.Website.Services.WebAPI.Roles; -using WatchIt.Website.Services.WebAPI.Series; +using WatchIt.Website.Services.Authentication; +using WatchIt.Website.Services.Configuration; +using WatchIt.Website.Services.Tokens; +using WatchIt.Website.Services.Client.Accounts; +using WatchIt.Website.Services.Client.Genders; +using WatchIt.Website.Services.Client.Media; +using WatchIt.Website.Services.Client.Movies; +using WatchIt.Website.Services.Client.Persons; +using WatchIt.Website.Services.Client.Photos; +using WatchIt.Website.Services.Client.Roles; +using WatchIt.Website.Services.Client.Series; namespace WatchIt.Website; @@ -73,14 +73,14 @@ public static class Program builder.Services.AddScoped(); // WebAPI - builder.Services.AddScoped(); - builder.Services.AddSingleton(); - builder.Services.AddSingleton(); - builder.Services.AddSingleton(); - builder.Services.AddSingleton(); - builder.Services.AddSingleton(); - builder.Services.AddSingleton(); - builder.Services.AddSingleton(); + builder.Services.AddScoped(); + builder.Services.AddSingleton(); + builder.Services.AddSingleton(); + builder.Services.AddSingleton(); + builder.Services.AddSingleton(); + builder.Services.AddSingleton(); + builder.Services.AddSingleton(); + builder.Services.AddSingleton(); return builder; } diff --git a/WatchIt.Website/WatchIt.Website/WatchIt.Website.csproj b/WatchIt.Website/WatchIt.Website/WatchIt.Website.csproj index 9601cf7..ec831bd 100644 --- a/WatchIt.Website/WatchIt.Website/WatchIt.Website.csproj +++ b/WatchIt.Website/WatchIt.Website/WatchIt.Website.csproj @@ -16,17 +16,8 @@ - - - - - - - - - - - + + diff --git a/WatchIt.Website/WatchIt.Website/_Imports.razor b/WatchIt.Website/WatchIt.Website/_Imports.razor index e95dbc3..a1fd28e 100644 --- a/WatchIt.Website/WatchIt.Website/_Imports.razor +++ b/WatchIt.Website/WatchIt.Website/_Imports.razor @@ -12,9 +12,9 @@ @using WatchIt.Website.Components.Common.Panels @using WatchIt.Common.Model.Accounts @using WatchIt.Common.Model.Media -@using WatchIt.Website.Services.Utility.Tokens -@using WatchIt.Website.Services.Utility.Authentication -@using WatchIt.Website.Services.WebAPI.Accounts -@using WatchIt.Website.Services.WebAPI.Media +@using WatchIt.Website.Services.Tokens +@using WatchIt.Website.Services.Authentication +@using WatchIt.Website.Services.Client.Accounts +@using WatchIt.Website.Services.Client.Media @using Blazorise @using Blazorise.Bootstrap5 \ No newline at end of file diff --git a/WatchIt.sln b/WatchIt.sln index 70d247e..9af8955 100644 --- a/WatchIt.sln +++ b/WatchIt.sln @@ -52,53 +52,31 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WatchIt.WebAPI.Services.Con EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WatchIt.Website.Services", "WatchIt.Website.Services", "{A82972D0-9A60-4B3F-AE46-9F304D79137F}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WatchIt.Website.Services.WebAPI", "WatchIt.Website.Services.WebAPI", "{46E3711F-18BD-4004-AF53-EA4D8643D92F}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WatchIt.Website.Services.WebAPI.Accounts", "WatchIt.Website\WatchIt.Website.Services\WatchIt.Website.Services.WebAPI\WatchIt.Website.Services.WebAPI.Accounts\WatchIt.Website.Services.WebAPI.Accounts.csproj", "{68B7E892-9074-4034-8AFC-2474D7D5BE29}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WatchIt.Website.Services.WebAPI.Genres", "WatchIt.Website\WatchIt.Website.Services\WatchIt.Website.Services.WebAPI\WatchIt.Website.Services.WebAPI.Genres\WatchIt.Website.Services.WebAPI.Genres.csproj", "{A98D06A6-9C95-4449-9F4E-1D31BBE1D9B1}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WatchIt.Website.Services.WebAPI.Movies", "WatchIt.Website\WatchIt.Website.Services\WatchIt.Website.Services.WebAPI\WatchIt.Website.Services.WebAPI.Movies\WatchIt.Website.Services.WebAPI.Movies.csproj", "{539404EB-BDFD-46F8-8F21-6A231ABED9B1}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WatchIt.Website.Services.Utility", "WatchIt.Website.Services.Utility", "{130BC8F5-82CE-4EDF-AECB-21594DD41849}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WatchIt.Common.Services", "WatchIt.Common.Services", "{882A9795-4AC0-4556-9750-6582B2701EFA}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WatchIt.Common.Query", "WatchIt.Common\WatchIt.Common.Query\WatchIt.Common.Query.csproj", "{6C3AE7B4-18C5-42D3-B254-460027E50143}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WatchIt.Common.Services.HttpClient", "WatchIt.Common\WatchIt.Common.Services\WatchIt.Common.Services.HttpClient\WatchIt.Common.Services.HttpClient.csproj", "{A4A75CCA-0DEE-4F1E-9816-60674CA807FA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WatchIt.Website.Services.Utility.Configuration", "WatchIt.Website\WatchIt.Website.Services\WatchIt.Website.Services.Utility\WatchIt.Website.Services.Utility.Configuration\WatchIt.Website.Services.Utility.Configuration.csproj", "{0DBBE7EA-05FE-481F-8814-6FA0BC9E571F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WatchIt.Website.Services.Configuration", "WatchIt.Website\WatchIt.Website.Services\WatchIt.Website.Services.Utility\WatchIt.Website.Services.Configuration\WatchIt.Website.Services.Configuration.csproj", "{0DBBE7EA-05FE-481F-8814-6FA0BC9E571F}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WatchIt.WebAPI.Services.Controllers.Media", "WatchIt.WebAPI\WatchIt.WebAPI.Services\WatchIt.WebAPI.Services.Controllers\WatchIt.WebAPI.Services.Controllers.Media\WatchIt.WebAPI.Services.Controllers.Media.csproj", "{3156AD7B-D6EC-4EB6-AEE8-4FBAF14C18E4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WatchIt.Website.Services.WebAPI.Media", "WatchIt.Website\WatchIt.Website.Services\WatchIt.Website.Services.WebAPI\WatchIt.Website.Services.WebAPI.Media\WatchIt.Website.Services.WebAPI.Media.csproj", "{1D64B7B5-650D-4AF3-AC33-A8D1F0999906}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WatchIt.Website.Services.WebAPI.Common", "WatchIt.Website\WatchIt.Website.Services\WatchIt.Website.Services.WebAPI\WatchIt.Website.Services.WebAPI.Common\WatchIt.Website.Services.WebAPI.Common.csproj", "{2D62ED42-489E-4888-9479-E5A50A0E7D70}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WatchIt.Website.Services.Utility.Tokens", "WatchIt.Website\WatchIt.Website.Services\WatchIt.Website.Services.Utility\WatchIt.Website.Services.Utility.Tokens\WatchIt.Website.Services.Utility.Tokens.csproj", "{77FDAFDD-E97E-4059-A935-B563B6B0D555}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WatchIt.Website.Services.Utility.Authentication", "WatchIt.Website\WatchIt.Website.Services\WatchIt.Website.Services.Utility\WatchIt.Website.Services.Utility.Authentication\WatchIt.Website.Services.Utility.Authentication.csproj", "{8720AECA-7084-429A-BA15-49B6622C1A32}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WatchIt.WebAPI.Services.Controllers.Series", "WatchIt.WebAPI\WatchIt.WebAPI.Services\WatchIt.WebAPI.Services.Controllers\WatchIt.WebAPI.Services.Controllers.Series\WatchIt.WebAPI.Services.Controllers.Series.csproj", "{F8FCEF7B-72EA-48BC-AC68-E11244B067DD}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WatchIt.Website.Services.WebAPI.Series", "WatchIt.Website\WatchIt.Website.Services\WatchIt.Website.Services.WebAPI\WatchIt.Website.Services.WebAPI.Series\WatchIt.Website.Services.WebAPI.Series.csproj", "{783C743A-85BF-4382-BFE5-7A90E3F3B8B6}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WatchIt.WebAPI.Services.Controllers.Photos", "WatchIt.WebAPI\WatchIt.WebAPI.Services\WatchIt.WebAPI.Services.Controllers\WatchIt.WebAPI.Services.Controllers.Photos\WatchIt.WebAPI.Services.Controllers.Photos.csproj", "{ABDF8471-2FAB-4930-B016-7DD3E48AE6B8}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WatchIt.Website.Services.WebAPI.Photos", "WatchIt.Website\WatchIt.Website.Services\WatchIt.Website.Services.WebAPI\WatchIt.Website.Services.WebAPI.Photos\WatchIt.Website.Services.WebAPI.Photos.csproj", "{960A833F-C195-4D1D-AD4F-D00B57067181}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WatchIt.WebAPI.Services.Controllers.Persons", "WatchIt.WebAPI\WatchIt.WebAPI.Services\WatchIt.WebAPI.Services.Controllers\WatchIt.WebAPI.Services.Controllers.Persons\WatchIt.WebAPI.Services.Controllers.Persons.csproj", "{335686F5-65B8-4D66-AAA8-C5032906451D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WatchIt.Website.Services.WebAPI.Persons", "WatchIt.Website\WatchIt.Website.Services\WatchIt.Website.Services.WebAPI\WatchIt.Website.Services.WebAPI.Persons\WatchIt.Website.Services.WebAPI.Persons.csproj", "{83D42D72-FF67-4577-8280-2ABD5B20F985}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WatchIt.WebAPI.Services.Controllers.Genders", "WatchIt.WebAPI\WatchIt.WebAPI.Services\WatchIt.WebAPI.Services.Controllers\WatchIt.WebAPI.Services.Controllers.Genders\WatchIt.WebAPI.Services.Controllers.Genders.csproj", "{13BE36AB-2120-4F1B-815A-6F5E3F589EE8}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WatchIt.Website.Services.WebAPI.Genders", "WatchIt.Website\WatchIt.Website.Services\WatchIt.Website.Services.WebAPI\WatchIt.Website.Services.WebAPI.Genders\WatchIt.Website.Services.WebAPI.Genders.csproj", "{B74144DE-EF62-430A-AB80-5D185DD03C05}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WatchIt.WebAPI.Services.Controllers.Roles", "WatchIt.WebAPI\WatchIt.WebAPI.Services\WatchIt.WebAPI.Services.Controllers\WatchIt.WebAPI.Services.Controllers.Roles\WatchIt.WebAPI.Services.Controllers.Roles.csproj", "{847D157A-E486-4FB6-9AA3-43931A60FB5F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WatchIt.Website.Services.WebAPI.Roles", "WatchIt.Website\WatchIt.Website.Services\WatchIt.Website.Services.WebAPI\WatchIt.Website.Services.WebAPI.Roles\WatchIt.Website.Services.WebAPI.Roles.csproj", "{3D8B7909-BAC2-42FD-8A72-D1DADDB3BC82}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WatchIt.Website.Services.Tokens", "WatchIt.Website\WatchIt.Website.Services\WatchIt.Website.Services.Tokens\WatchIt.Website.Services.Tokens.csproj", "{188CE560-A1DC-459D-BF41-1B62E5C0D7B5}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WatchIt.Website.Services.Authentication", "WatchIt.Website\WatchIt.Website.Services\WatchIt.Website.Services.Authentication\WatchIt.Website.Services.Authentication.csproj", "{B647BAB2-D261-40A0-95AF-95E8A2F00ED1}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WatchIt.Website.Services.Client", "WatchIt.Website\WatchIt.Website.Services\WatchIt.Website.Services.Client\WatchIt.Website.Services.Client.csproj", "{C9FCD231-3BC9-4453-8949-F521D2D71BCF}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -128,30 +106,19 @@ Global {46CE78A1-3EC3-4112-AAAD-26EEB8D8B194} = {4CB91BF6-87F1-4088-A943-62548CD1F9F4} {69BB6A9E-B673-42AB-A516-6B2513E21FDC} = {CEC468DB-CC49-47D3-9E3E-1CC9530C3CE7} {A82972D0-9A60-4B3F-AE46-9F304D79137F} = {4CB91BF6-87F1-4088-A943-62548CD1F9F4} - {46E3711F-18BD-4004-AF53-EA4D8643D92F} = {A82972D0-9A60-4B3F-AE46-9F304D79137F} - {68B7E892-9074-4034-8AFC-2474D7D5BE29} = {46E3711F-18BD-4004-AF53-EA4D8643D92F} - {A98D06A6-9C95-4449-9F4E-1D31BBE1D9B1} = {46E3711F-18BD-4004-AF53-EA4D8643D92F} - {539404EB-BDFD-46F8-8F21-6A231ABED9B1} = {46E3711F-18BD-4004-AF53-EA4D8643D92F} - {130BC8F5-82CE-4EDF-AECB-21594DD41849} = {A82972D0-9A60-4B3F-AE46-9F304D79137F} {882A9795-4AC0-4556-9750-6582B2701EFA} = {E98C42C1-26E5-4939-8C22-72C253DE874B} {6C3AE7B4-18C5-42D3-B254-460027E50143} = {E98C42C1-26E5-4939-8C22-72C253DE874B} {A4A75CCA-0DEE-4F1E-9816-60674CA807FA} = {882A9795-4AC0-4556-9750-6582B2701EFA} - {0DBBE7EA-05FE-481F-8814-6FA0BC9E571F} = {130BC8F5-82CE-4EDF-AECB-21594DD41849} {3156AD7B-D6EC-4EB6-AEE8-4FBAF14C18E4} = {CEC468DB-CC49-47D3-9E3E-1CC9530C3CE7} - {1D64B7B5-650D-4AF3-AC33-A8D1F0999906} = {46E3711F-18BD-4004-AF53-EA4D8643D92F} - {2D62ED42-489E-4888-9479-E5A50A0E7D70} = {46E3711F-18BD-4004-AF53-EA4D8643D92F} - {77FDAFDD-E97E-4059-A935-B563B6B0D555} = {130BC8F5-82CE-4EDF-AECB-21594DD41849} - {8720AECA-7084-429A-BA15-49B6622C1A32} = {130BC8F5-82CE-4EDF-AECB-21594DD41849} {F8FCEF7B-72EA-48BC-AC68-E11244B067DD} = {CEC468DB-CC49-47D3-9E3E-1CC9530C3CE7} - {783C743A-85BF-4382-BFE5-7A90E3F3B8B6} = {46E3711F-18BD-4004-AF53-EA4D8643D92F} {ABDF8471-2FAB-4930-B016-7DD3E48AE6B8} = {CEC468DB-CC49-47D3-9E3E-1CC9530C3CE7} - {960A833F-C195-4D1D-AD4F-D00B57067181} = {46E3711F-18BD-4004-AF53-EA4D8643D92F} {335686F5-65B8-4D66-AAA8-C5032906451D} = {CEC468DB-CC49-47D3-9E3E-1CC9530C3CE7} - {83D42D72-FF67-4577-8280-2ABD5B20F985} = {46E3711F-18BD-4004-AF53-EA4D8643D92F} {13BE36AB-2120-4F1B-815A-6F5E3F589EE8} = {CEC468DB-CC49-47D3-9E3E-1CC9530C3CE7} - {B74144DE-EF62-430A-AB80-5D185DD03C05} = {46E3711F-18BD-4004-AF53-EA4D8643D92F} {847D157A-E486-4FB6-9AA3-43931A60FB5F} = {CEC468DB-CC49-47D3-9E3E-1CC9530C3CE7} - {3D8B7909-BAC2-42FD-8A72-D1DADDB3BC82} = {46E3711F-18BD-4004-AF53-EA4D8643D92F} + {188CE560-A1DC-459D-BF41-1B62E5C0D7B5} = {A82972D0-9A60-4B3F-AE46-9F304D79137F} + {B647BAB2-D261-40A0-95AF-95E8A2F00ED1} = {A82972D0-9A60-4B3F-AE46-9F304D79137F} + {0DBBE7EA-05FE-481F-8814-6FA0BC9E571F} = {A82972D0-9A60-4B3F-AE46-9F304D79137F} + {C9FCD231-3BC9-4453-8949-F521D2D71BCF} = {A82972D0-9A60-4B3F-AE46-9F304D79137F} EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {23383776-1F27-4B5D-8C7C-57BFF75FA473}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -222,18 +189,6 @@ Global {69BB6A9E-B673-42AB-A516-6B2513E21FDC}.Debug|Any CPU.Build.0 = Debug|Any CPU {69BB6A9E-B673-42AB-A516-6B2513E21FDC}.Release|Any CPU.ActiveCfg = Release|Any CPU {69BB6A9E-B673-42AB-A516-6B2513E21FDC}.Release|Any CPU.Build.0 = Release|Any CPU - {68B7E892-9074-4034-8AFC-2474D7D5BE29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {68B7E892-9074-4034-8AFC-2474D7D5BE29}.Debug|Any CPU.Build.0 = Debug|Any CPU - {68B7E892-9074-4034-8AFC-2474D7D5BE29}.Release|Any CPU.ActiveCfg = Release|Any CPU - {68B7E892-9074-4034-8AFC-2474D7D5BE29}.Release|Any CPU.Build.0 = Release|Any CPU - {A98D06A6-9C95-4449-9F4E-1D31BBE1D9B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A98D06A6-9C95-4449-9F4E-1D31BBE1D9B1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A98D06A6-9C95-4449-9F4E-1D31BBE1D9B1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A98D06A6-9C95-4449-9F4E-1D31BBE1D9B1}.Release|Any CPU.Build.0 = Release|Any CPU - {539404EB-BDFD-46F8-8F21-6A231ABED9B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {539404EB-BDFD-46F8-8F21-6A231ABED9B1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {539404EB-BDFD-46F8-8F21-6A231ABED9B1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {539404EB-BDFD-46F8-8F21-6A231ABED9B1}.Release|Any CPU.Build.0 = Release|Any CPU {6C3AE7B4-18C5-42D3-B254-460027E50143}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6C3AE7B4-18C5-42D3-B254-460027E50143}.Debug|Any CPU.Build.0 = Debug|Any CPU {6C3AE7B4-18C5-42D3-B254-460027E50143}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -250,61 +205,37 @@ Global {3156AD7B-D6EC-4EB6-AEE8-4FBAF14C18E4}.Debug|Any CPU.Build.0 = Debug|Any CPU {3156AD7B-D6EC-4EB6-AEE8-4FBAF14C18E4}.Release|Any CPU.ActiveCfg = Release|Any CPU {3156AD7B-D6EC-4EB6-AEE8-4FBAF14C18E4}.Release|Any CPU.Build.0 = Release|Any CPU - {1D64B7B5-650D-4AF3-AC33-A8D1F0999906}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1D64B7B5-650D-4AF3-AC33-A8D1F0999906}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1D64B7B5-650D-4AF3-AC33-A8D1F0999906}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1D64B7B5-650D-4AF3-AC33-A8D1F0999906}.Release|Any CPU.Build.0 = Release|Any CPU - {2D62ED42-489E-4888-9479-E5A50A0E7D70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2D62ED42-489E-4888-9479-E5A50A0E7D70}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2D62ED42-489E-4888-9479-E5A50A0E7D70}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2D62ED42-489E-4888-9479-E5A50A0E7D70}.Release|Any CPU.Build.0 = Release|Any CPU - {77FDAFDD-E97E-4059-A935-B563B6B0D555}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {77FDAFDD-E97E-4059-A935-B563B6B0D555}.Debug|Any CPU.Build.0 = Debug|Any CPU - {77FDAFDD-E97E-4059-A935-B563B6B0D555}.Release|Any CPU.ActiveCfg = Release|Any CPU - {77FDAFDD-E97E-4059-A935-B563B6B0D555}.Release|Any CPU.Build.0 = Release|Any CPU - {8720AECA-7084-429A-BA15-49B6622C1A32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8720AECA-7084-429A-BA15-49B6622C1A32}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8720AECA-7084-429A-BA15-49B6622C1A32}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8720AECA-7084-429A-BA15-49B6622C1A32}.Release|Any CPU.Build.0 = Release|Any CPU {F8FCEF7B-72EA-48BC-AC68-E11244B067DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F8FCEF7B-72EA-48BC-AC68-E11244B067DD}.Debug|Any CPU.Build.0 = Debug|Any CPU {F8FCEF7B-72EA-48BC-AC68-E11244B067DD}.Release|Any CPU.ActiveCfg = Release|Any CPU {F8FCEF7B-72EA-48BC-AC68-E11244B067DD}.Release|Any CPU.Build.0 = Release|Any CPU - {783C743A-85BF-4382-BFE5-7A90E3F3B8B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {783C743A-85BF-4382-BFE5-7A90E3F3B8B6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {783C743A-85BF-4382-BFE5-7A90E3F3B8B6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {783C743A-85BF-4382-BFE5-7A90E3F3B8B6}.Release|Any CPU.Build.0 = Release|Any CPU {ABDF8471-2FAB-4930-B016-7DD3E48AE6B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {ABDF8471-2FAB-4930-B016-7DD3E48AE6B8}.Debug|Any CPU.Build.0 = Debug|Any CPU {ABDF8471-2FAB-4930-B016-7DD3E48AE6B8}.Release|Any CPU.ActiveCfg = Release|Any CPU {ABDF8471-2FAB-4930-B016-7DD3E48AE6B8}.Release|Any CPU.Build.0 = Release|Any CPU - {960A833F-C195-4D1D-AD4F-D00B57067181}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {960A833F-C195-4D1D-AD4F-D00B57067181}.Debug|Any CPU.Build.0 = Debug|Any CPU - {960A833F-C195-4D1D-AD4F-D00B57067181}.Release|Any CPU.ActiveCfg = Release|Any CPU - {960A833F-C195-4D1D-AD4F-D00B57067181}.Release|Any CPU.Build.0 = Release|Any CPU {335686F5-65B8-4D66-AAA8-C5032906451D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {335686F5-65B8-4D66-AAA8-C5032906451D}.Debug|Any CPU.Build.0 = Debug|Any CPU {335686F5-65B8-4D66-AAA8-C5032906451D}.Release|Any CPU.ActiveCfg = Release|Any CPU {335686F5-65B8-4D66-AAA8-C5032906451D}.Release|Any CPU.Build.0 = Release|Any CPU - {83D42D72-FF67-4577-8280-2ABD5B20F985}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {83D42D72-FF67-4577-8280-2ABD5B20F985}.Debug|Any CPU.Build.0 = Debug|Any CPU - {83D42D72-FF67-4577-8280-2ABD5B20F985}.Release|Any CPU.ActiveCfg = Release|Any CPU - {83D42D72-FF67-4577-8280-2ABD5B20F985}.Release|Any CPU.Build.0 = Release|Any CPU {13BE36AB-2120-4F1B-815A-6F5E3F589EE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {13BE36AB-2120-4F1B-815A-6F5E3F589EE8}.Debug|Any CPU.Build.0 = Debug|Any CPU {13BE36AB-2120-4F1B-815A-6F5E3F589EE8}.Release|Any CPU.ActiveCfg = Release|Any CPU {13BE36AB-2120-4F1B-815A-6F5E3F589EE8}.Release|Any CPU.Build.0 = Release|Any CPU - {B74144DE-EF62-430A-AB80-5D185DD03C05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B74144DE-EF62-430A-AB80-5D185DD03C05}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B74144DE-EF62-430A-AB80-5D185DD03C05}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B74144DE-EF62-430A-AB80-5D185DD03C05}.Release|Any CPU.Build.0 = Release|Any CPU {847D157A-E486-4FB6-9AA3-43931A60FB5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {847D157A-E486-4FB6-9AA3-43931A60FB5F}.Debug|Any CPU.Build.0 = Debug|Any CPU {847D157A-E486-4FB6-9AA3-43931A60FB5F}.Release|Any CPU.ActiveCfg = Release|Any CPU {847D157A-E486-4FB6-9AA3-43931A60FB5F}.Release|Any CPU.Build.0 = Release|Any CPU - {3D8B7909-BAC2-42FD-8A72-D1DADDB3BC82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3D8B7909-BAC2-42FD-8A72-D1DADDB3BC82}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3D8B7909-BAC2-42FD-8A72-D1DADDB3BC82}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3D8B7909-BAC2-42FD-8A72-D1DADDB3BC82}.Release|Any CPU.Build.0 = Release|Any CPU + {188CE560-A1DC-459D-BF41-1B62E5C0D7B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {188CE560-A1DC-459D-BF41-1B62E5C0D7B5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {188CE560-A1DC-459D-BF41-1B62E5C0D7B5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {188CE560-A1DC-459D-BF41-1B62E5C0D7B5}.Release|Any CPU.Build.0 = Release|Any CPU + {B647BAB2-D261-40A0-95AF-95E8A2F00ED1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B647BAB2-D261-40A0-95AF-95E8A2F00ED1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B647BAB2-D261-40A0-95AF-95E8A2F00ED1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B647BAB2-D261-40A0-95AF-95E8A2F00ED1}.Release|Any CPU.Build.0 = Release|Any CPU + {C9FCD231-3BC9-4453-8949-F521D2D71BCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C9FCD231-3BC9-4453-8949-F521D2D71BCF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C9FCD231-3BC9-4453-8949-F521D2D71BCF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C9FCD231-3BC9-4453-8949-F521D2D71BCF}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection EndGlobal