Merge pull request #149 from mateuszskoczek/features/website_services_refactor

Website services organized
This commit is contained in:
2024-10-27 22:11:52 +01:00
committed by GitHub
Unverified
105 changed files with 465 additions and 669 deletions

View File

@@ -1,10 +1,10 @@
using System.IdentityModel.Tokens.Jwt; using System.IdentityModel.Tokens.Jwt;
using System.Net.Http.Headers; using System.Net.Http.Headers;
using Microsoft.AspNetCore.Components.Authorization; using Microsoft.AspNetCore.Components.Authorization;
using WatchIt.Website.Services.Utility.Tokens; using WatchIt.Website.Services.Client.Accounts;
using WatchIt.Website.Services.WebAPI.Accounts; using WatchIt.Website.Services.Tokens;
namespace WatchIt.Website.Services.Utility.Authentication; namespace WatchIt.Website.Services.Authentication;
public class AuthenticationService : IAuthenticationService public class AuthenticationService : IAuthenticationService
{ {
@@ -13,7 +13,7 @@ public class AuthenticationService : IAuthenticationService
private readonly AuthenticationStateProvider _authenticationStateProvider; private readonly AuthenticationStateProvider _authenticationStateProvider;
private readonly HttpClient _httpClient; private readonly HttpClient _httpClient;
private readonly ITokensService _tokensService; private readonly ITokensService _tokensService;
private readonly IAccountsWebAPIService _accountsWebAPIService; private readonly IAccountsClientService _accountsClientService;
#endregion #endregion
@@ -21,12 +21,12 @@ public class AuthenticationService : IAuthenticationService
#region CONSTRUCTORS #region CONSTRUCTORS
public AuthenticationService(AuthenticationStateProvider authenticationStateProvider, HttpClient httpClient, ITokensService tokensService, IAccountsWebAPIService accountsWebAPIService) public AuthenticationService(AuthenticationStateProvider authenticationStateProvider, HttpClient httpClient, ITokensService tokensService, IAccountsClientService accountsClientService)
{ {
_authenticationStateProvider = authenticationStateProvider; _authenticationStateProvider = authenticationStateProvider;
_httpClient = httpClient; _httpClient = httpClient;
_tokensService = tokensService; _tokensService = tokensService;
_accountsWebAPIService = accountsWebAPIService; _accountsClientService = accountsClientService;
} }
#endregion #endregion
@@ -65,7 +65,7 @@ public class AuthenticationService : IAuthenticationService
if (refreshToken is not null) if (refreshToken is not null)
{ {
_httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("refresh", refreshToken.Replace("\"", "")); _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("refresh", refreshToken.Replace("\"", ""));
await _accountsWebAPIService.Logout(); await _accountsClientService.Logout();
_httpClient.DefaultRequestHeaders.Authorization = null; _httpClient.DefaultRequestHeaders.Authorization = null;
} }
} }

View File

@@ -1,4 +1,4 @@
namespace WatchIt.Website.Services.Utility.Authentication; namespace WatchIt.Website.Services.Authentication;
public interface IAuthenticationService public interface IAuthenticationService
{ {

View File

@@ -4,10 +4,10 @@ using System.Text.Json;
using Microsoft.AspNetCore.Components.Authorization; using Microsoft.AspNetCore.Components.Authorization;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using WatchIt.Common.Model.Accounts; using WatchIt.Common.Model.Accounts;
using WatchIt.Website.Services.Utility.Tokens; using WatchIt.Website.Services.Tokens;
using WatchIt.Website.Services.WebAPI.Accounts; using WatchIt.Website.Services.Client.Accounts;
namespace WatchIt.Website.Services.Utility.Authentication; namespace WatchIt.Website.Services.Authentication;
public class JWTAuthenticationStateProvider : AuthenticationStateProvider public class JWTAuthenticationStateProvider : AuthenticationStateProvider
{ {
@@ -18,7 +18,7 @@ public class JWTAuthenticationStateProvider : AuthenticationStateProvider
private readonly ILogger<JWTAuthenticationStateProvider> _logger; private readonly ILogger<JWTAuthenticationStateProvider> _logger;
private readonly ITokensService _tokensService; private readonly ITokensService _tokensService;
private readonly IAccountsWebAPIService _accountsService; private readonly IAccountsClientService _accountsService;
#endregion #endregion
@@ -26,7 +26,7 @@ public class JWTAuthenticationStateProvider : AuthenticationStateProvider
#region CONSTRUCTORS #region CONSTRUCTORS
public JWTAuthenticationStateProvider(HttpClient httpClient, ILogger<JWTAuthenticationStateProvider> logger, ITokensService tokensService, IAccountsWebAPIService accountsService) public JWTAuthenticationStateProvider(HttpClient httpClient, ILogger<JWTAuthenticationStateProvider> logger, ITokensService tokensService, IAccountsClientService accountsService)
{ {
_httpClient = httpClient; _httpClient = httpClient;

View File

@@ -1,4 +1,4 @@
namespace WatchIt.Website.Services.Utility.Authentication; namespace WatchIt.Website.Services.Authentication;
public class User public class User
{ {

View File

@@ -0,0 +1,24 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.AspNetCore.Components.Authorization">
<HintPath>..\..\..\..\..\..\..\Program Files\dotnet\shared\Microsoft.AspNetCore.App\8.0.10\Microsoft.AspNetCore.Components.Authorization.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\WatchIt.Website.Services.Client\WatchIt.Website.Services.Client.csproj" />
<ProjectReference Include="..\WatchIt.Website.Services.Tokens\WatchIt.Website.Services.Tokens.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.5.1" />
</ItemGroup>
</Project>

View File

@@ -1,13 +1,11 @@
using WatchIt.Common.Model.Accounts; using WatchIt.Common.Model.Accounts;
using WatchIt.Common.Services.HttpClient; using WatchIt.Common.Services.HttpClient;
using WatchIt.Website.Services.Utility.Configuration; using WatchIt.Website.Services.Configuration;
using WatchIt.Website.Services.Utility.Configuration.Model; using WatchIt.Website.Services.Tokens;
using WatchIt.Website.Services.Utility.Tokens;
using WatchIt.Website.Services.WebAPI.Common;
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 #region PUBLIC METHODS

View File

@@ -1,8 +1,8 @@
using WatchIt.Common.Model.Accounts; 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<RegisterResponse>? createdAction = null, Action<IDictionary<string, string[]>>? badRequestAction = null); Task Register(RegisterRequest data, Action<RegisterResponse>? createdAction = null, Action<IDictionary<string, string[]>>? badRequestAction = null);
Task Authenticate(AuthenticateRequest data, Action<AuthenticateResponse>? successAction = null, Action<IDictionary<string, string[]>>? badRequestAction = null, Action? unauthorizedAction = null); Task Authenticate(AuthenticateRequest data, Action<AuthenticateResponse>? successAction = null, Action<IDictionary<string, string[]>>? badRequestAction = null, Action? unauthorizedAction = null);

View File

@@ -1,4 +1,4 @@
namespace WatchIt.Website.Services.WebAPI.Common; namespace WatchIt.Website.Services.Client;
public enum AuthorizationType public enum AuthorizationType
{ {

View File

@@ -1,10 +1,9 @@
using WatchIt.Website.Services.Utility.Configuration; using WatchIt.Website.Services.Configuration;
using WatchIt.Website.Services.Utility.Configuration.Model; using WatchIt.Website.Services.Configuration.Model;
using WatchIt.Website.Services.Utility.Tokens;
namespace WatchIt.Website.Services.WebAPI.Common; namespace WatchIt.Website.Services.Client;
public abstract class BaseWebAPIService public abstract class BaseClientService
{ {
#region SERVICES #region SERVICES
@@ -24,7 +23,7 @@ public abstract class BaseWebAPIService
#region CONSTRUCTORS #region CONSTRUCTORS
protected BaseWebAPIService(IConfigurationService configurationService) protected BaseClientService(IConfigurationService configurationService)
{ {
_configurationService = configurationService; _configurationService = configurationService;
} }

View File

@@ -1,11 +1,10 @@
using WatchIt.Common.Model.Genders; using WatchIt.Common.Model.Genders;
using WatchIt.Common.Services.HttpClient; using WatchIt.Common.Services.HttpClient;
using WatchIt.Website.Services.Utility.Configuration; using WatchIt.Website.Services.Configuration;
using WatchIt.Website.Services.WebAPI.Common;
namespace WatchIt.Website.Services.WebAPI.Genders; namespace WatchIt.Website.Services.Client.Genders;
public class GendersWebAPIService : BaseWebAPIService, IGendersWebAPIService public class GendersClientService : BaseClientService, IGendersClientService
{ {
#region SERVICES #region SERVICES
@@ -18,7 +17,7 @@ public class GendersWebAPIService : BaseWebAPIService, IGendersWebAPIService
#region CONSTRUCTORS #region CONSTRUCTORS
public GendersWebAPIService(IHttpClientService httpClientService, IConfigurationService configurationService) : base(configurationService) public GendersClientService(IHttpClientService httpClientService, IConfigurationService configurationService) : base(configurationService)
{ {
_httpClientService = httpClientService; _httpClientService = httpClientService;
_configurationService = configurationService; _configurationService = configurationService;

View File

@@ -1,8 +1,8 @@
using WatchIt.Common.Model.Genders; 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<IEnumerable<GenderResponse>>? successAction = null); Task GetAllGenders(GenderQueryParameters? query = null, Action<IEnumerable<GenderResponse>>? successAction = null);
Task GetGender(long id, Action<GenderResponse>? successAction = null, Action? notFoundAction = null); Task GetGender(long id, Action<GenderResponse>? successAction = null, Action? notFoundAction = null);

View File

@@ -4,9 +4,9 @@ using WatchIt.Common.Model.Photos;
using WatchIt.Common.Model.Rating; using WatchIt.Common.Model.Rating;
using WatchIt.Common.Model.Roles; 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<IEnumerable<MediaResponse>>? successAction = null); Task GetAllMedia(MediaQueryParameters? query = null, Action<IEnumerable<MediaResponse>>? successAction = null);
Task GetMedia(long mediaId, Action<MediaResponse>? successAction = null, Action? notFoundAction = null); Task GetMedia(long mediaId, Action<MediaResponse>? successAction = null, Action? notFoundAction = null);

View File

@@ -4,13 +4,11 @@ using WatchIt.Common.Model.Photos;
using WatchIt.Common.Model.Rating; using WatchIt.Common.Model.Rating;
using WatchIt.Common.Model.Roles; using WatchIt.Common.Model.Roles;
using WatchIt.Common.Services.HttpClient; using WatchIt.Common.Services.HttpClient;
using WatchIt.Website.Services.Utility.Configuration; using WatchIt.Website.Services.Configuration;
using WatchIt.Website.Services.Utility.Configuration.Model;
using WatchIt.Website.Services.WebAPI.Common;
namespace WatchIt.Website.Services.WebAPI.Media; namespace WatchIt.Website.Services.Client.Media;
public class MediaWebAPIService : BaseWebAPIService, IMediaWebAPIService public class MediaClientService : BaseClientService, IMediaClientService
{ {
#region FIELDS #region FIELDS
@@ -22,7 +20,7 @@ public class MediaWebAPIService : BaseWebAPIService, IMediaWebAPIService
#region CONSTRUCTORS #region CONSTRUCTORS
public MediaWebAPIService(IHttpClientService httpClientService, IConfigurationService configurationService) : base(configurationService) public MediaClientService(IHttpClientService httpClientService, IConfigurationService configurationService) : base(configurationService)
{ {
_httpClientService = httpClientService; _httpClientService = httpClientService;
} }

View File

@@ -1,8 +1,8 @@
using WatchIt.Common.Model.Movies; 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<IEnumerable<MovieResponse>>? successAction = null); Task GetAllMovies(MovieQueryParameters? query = null, Action<IEnumerable<MovieResponse>>? successAction = null);
Task PostMovie(MovieRequest data, Action<MovieResponse>? successAction = null, Action<IDictionary<string, string[]>>? badRequestAction = null, Action? unauthorizedAction = null, Action? forbiddenAction = null); Task PostMovie(MovieRequest data, Action<MovieResponse>? successAction = null, Action<IDictionary<string, string[]>>? badRequestAction = null, Action? unauthorizedAction = null, Action? forbiddenAction = null);

View File

@@ -3,12 +3,11 @@ using Microsoft.AspNetCore.Components;
using Microsoft.Extensions.Primitives; using Microsoft.Extensions.Primitives;
using WatchIt.Common.Model.Movies; using WatchIt.Common.Model.Movies;
using WatchIt.Common.Services.HttpClient; using WatchIt.Common.Services.HttpClient;
using WatchIt.Website.Services.Utility.Configuration; using WatchIt.Website.Services.Configuration;
using WatchIt.Website.Services.WebAPI.Common;
namespace WatchIt.Website.Services.WebAPI.Movies; namespace WatchIt.Website.Services.Client.Movies;
public class MoviesWebAPIService : BaseWebAPIService, IMoviesWebAPIService public class MoviesClientService : BaseClientService, IMoviesClientService
{ {
#region SERVICES #region SERVICES
@@ -21,7 +20,7 @@ public class MoviesWebAPIService : BaseWebAPIService, IMoviesWebAPIService
#region CONSTRUCTORS #region CONSTRUCTORS
public MoviesWebAPIService(IHttpClientService httpClientService, IConfigurationService configurationService) : base(configurationService) public MoviesClientService(IHttpClientService httpClientService, IConfigurationService configurationService) : base(configurationService)
{ {
_httpClientService = httpClientService; _httpClientService = httpClientService;
_configurationService = configurationService; _configurationService = configurationService;

View File

@@ -2,9 +2,9 @@ using WatchIt.Common.Model.Persons;
using WatchIt.Common.Model.Rating; using WatchIt.Common.Model.Rating;
using WatchIt.Common.Model.Roles; 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<IEnumerable<PersonResponse>>? successAction = null); Task GetAllPersons(PersonQueryParameters? query = null, Action<IEnumerable<PersonResponse>>? successAction = null);
Task GetPerson(long id, Action<PersonResponse>? successAction = null, Action? notFoundAction = null); Task GetPerson(long id, Action<PersonResponse>? successAction = null, Action? notFoundAction = null);

View File

@@ -5,12 +5,11 @@ using WatchIt.Common.Model.Persons;
using WatchIt.Common.Model.Rating; using WatchIt.Common.Model.Rating;
using WatchIt.Common.Model.Roles; using WatchIt.Common.Model.Roles;
using WatchIt.Common.Services.HttpClient; using WatchIt.Common.Services.HttpClient;
using WatchIt.Website.Services.Utility.Configuration; using WatchIt.Website.Services.Configuration;
using WatchIt.Website.Services.WebAPI.Common;
namespace WatchIt.Website.Services.WebAPI.Persons; namespace WatchIt.Website.Services.Client.Persons;
public class PersonsWebAPIService : BaseWebAPIService, IPersonsWebAPIService public class PersonsClientService : BaseClientService, IPersonsClientService
{ {
#region SERVICES #region SERVICES
@@ -23,7 +22,7 @@ public class PersonsWebAPIService : BaseWebAPIService, IPersonsWebAPIService
#region CONSTRUCTORS #region CONSTRUCTORS
public PersonsWebAPIService(IHttpClientService httpClientService, IConfigurationService configurationService) : base(configurationService) public PersonsClientService(IHttpClientService httpClientService, IConfigurationService configurationService) : base(configurationService)
{ {
_httpClientService = httpClientService; _httpClientService = httpClientService;
_configurationService = configurationService; _configurationService = configurationService;

View File

@@ -1,8 +1,8 @@
using WatchIt.Common.Model.Photos; 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<PhotoResponse>? successAction = null, Action? notFoundAction = null); Task GetPhotoRandomBackground(Action<PhotoResponse>? successAction = null, Action? notFoundAction = null);
Task DeletePhoto(Guid id, Action? successAction = null, Action? unauthorizedAction = null, Action? forbiddenAction = null, Action? notFoundAction = null); Task DeletePhoto(Guid id, Action? successAction = null, Action? unauthorizedAction = null, Action? forbiddenAction = null, Action? notFoundAction = null);

View File

@@ -1,11 +1,10 @@
using WatchIt.Common.Model.Photos; using WatchIt.Common.Model.Photos;
using WatchIt.Common.Services.HttpClient; using WatchIt.Common.Services.HttpClient;
using WatchIt.Website.Services.Utility.Configuration; using WatchIt.Website.Services.Configuration;
using WatchIt.Website.Services.WebAPI.Common;
namespace WatchIt.Website.Services.WebAPI.Photos; namespace WatchIt.Website.Services.Client.Photos;
public class PhotosWebAPIService : BaseWebAPIService, IPhotosWebAPIService public class PhotosClientService : BaseClientService, IPhotosClientService
{ {
#region FIELDS #region FIELDS
@@ -17,7 +16,7 @@ public class PhotosWebAPIService : BaseWebAPIService, IPhotosWebAPIService
#region CONSTRUCTORS #region CONSTRUCTORS
public PhotosWebAPIService(IHttpClientService httpClientService, IConfigurationService configurationService) : base(configurationService) public PhotosClientService(IHttpClientService httpClientService, IConfigurationService configurationService) : base(configurationService)
{ {
_httpClientService = httpClientService; _httpClientService = httpClientService;
} }

View File

@@ -1,9 +1,9 @@
using WatchIt.Common.Model.Rating; using WatchIt.Common.Model.Rating;
using WatchIt.Common.Model.Roles; 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<ActorRoleResponse>? successAction = null, Action? notFoundAction = null); Task GetActorRole(Guid id, Action<ActorRoleResponse>? successAction = null, Action? notFoundAction = null);
Task PutActorRole(Guid id, ActorRoleUniversalRequest data, Action? successAction = null, Action<IDictionary<string, string[]>>? badRequestAction = null, Action? unauthorizedAction = null, Action? forbiddenAction = null, Action? notFoundAction = null); Task PutActorRole(Guid id, ActorRoleUniversalRequest data, Action? successAction = null, Action<IDictionary<string, string[]>>? badRequestAction = null, Action? unauthorizedAction = null, Action? forbiddenAction = null, Action? notFoundAction = null);

View File

@@ -1,12 +1,11 @@
using WatchIt.Common.Model.Rating; using WatchIt.Common.Model.Rating;
using WatchIt.Common.Model.Roles; using WatchIt.Common.Model.Roles;
using WatchIt.Common.Services.HttpClient; using WatchIt.Common.Services.HttpClient;
using WatchIt.Website.Services.Utility.Configuration; using WatchIt.Website.Services.Configuration;
using WatchIt.Website.Services.WebAPI.Common;
namespace WatchIt.Website.Services.WebAPI.Roles; namespace WatchIt.Website.Services.Client.Roles;
public class RolesWebAPIService : BaseWebAPIService, IRolesWebAPIService public class RolesClientService : BaseClientService, IRolesClientService
{ {
#region SERVICES #region SERVICES
@@ -18,7 +17,7 @@ public class RolesWebAPIService : BaseWebAPIService, IRolesWebAPIService
#region CONSTRUCTORS #region CONSTRUCTORS
public RolesWebAPIService(IHttpClientService httpClientService, IConfigurationService configurationService) : base(configurationService) public RolesClientService(IHttpClientService httpClientService, IConfigurationService configurationService) : base(configurationService)
{ {
_httpClientService = httpClientService; _httpClientService = httpClientService;
} }

View File

@@ -1,8 +1,8 @@
using WatchIt.Common.Model.Series; 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<IEnumerable<SeriesResponse>>? successAction = null); Task GetAllSeries(SeriesQueryParameters? query = null, Action<IEnumerable<SeriesResponse>>? successAction = null);
Task GetSeries(long id, Action<SeriesResponse>? successAction = null, Action? notFoundAction = null); Task GetSeries(long id, Action<SeriesResponse>? successAction = null, Action? notFoundAction = null);

View File

@@ -1,12 +1,11 @@
using System.Text; using System.Text;
using WatchIt.Common.Model.Series; using WatchIt.Common.Model.Series;
using WatchIt.Common.Services.HttpClient; using WatchIt.Common.Services.HttpClient;
using WatchIt.Website.Services.Utility.Configuration; using WatchIt.Website.Services.Configuration;
using WatchIt.Website.Services.WebAPI.Common;
namespace WatchIt.Website.Services.WebAPI.Series; namespace WatchIt.Website.Services.Client.Series;
public class SeriesWebAPIService : BaseWebAPIService, ISeriesWebAPIService public class SeriesClientService : BaseClientService, ISeriesClientService
{ {
#region SERVICES #region SERVICES
@@ -19,7 +18,7 @@ public class SeriesWebAPIService : BaseWebAPIService, ISeriesWebAPIService
#region CONSTRUCTORS #region CONSTRUCTORS
public SeriesWebAPIService(IHttpClientService httpClientService, IConfigurationService configurationService) : base(configurationService) public SeriesClientService(IHttpClientService httpClientService, IConfigurationService configurationService) : base(configurationService)
{ {
_httpClientService = httpClientService; _httpClientService = httpClientService;
_configurationService = configurationService; _configurationService = configurationService;

View File

@@ -0,0 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\WatchIt.Common\WatchIt.Common.Model\WatchIt.Common.Model.csproj" />
<ProjectReference Include="..\..\..\WatchIt.Common\WatchIt.Common.Services\WatchIt.Common.Services.HttpClient\WatchIt.Common.Services.HttpClient.csproj" />
<ProjectReference Include="..\WatchIt.Website.Services.Tokens\WatchIt.Website.Services.Tokens.csproj" />
<ProjectReference Include="..\WatchIt.Website.Services.Utility\WatchIt.Website.Services.Configuration\WatchIt.Website.Services.Configuration.csproj" />
</ItemGroup>
</Project>

View File

@@ -1,6 +1,6 @@
using WatchIt.Common.Model.Accounts; using WatchIt.Common.Model.Accounts;
namespace WatchIt.Website.Services.Utility.Tokens; namespace WatchIt.Website.Services.Tokens;
public interface ITokensService public interface ITokensService
{ {

View File

@@ -2,9 +2,9 @@
using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage; using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using WatchIt.Common.Model.Accounts; 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 public class TokensService : ITokensService
{ {

View File

@@ -4,12 +4,11 @@
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<RootNamespace>WatchIt.Website.Services.Utility.Token</RootNamespace>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\..\WatchIt.Common\WatchIt.Common.Model\WatchIt.Common.Model.csproj" /> <ProjectReference Include="..\..\..\WatchIt.Common\WatchIt.Common.Model\WatchIt.Common.Model.csproj" />
<ProjectReference Include="..\WatchIt.Website.Services.Utility.Configuration\WatchIt.Website.Services.Utility.Configuration.csproj" /> <ProjectReference Include="..\WatchIt.Website.Services.Utility\WatchIt.Website.Services.Configuration\WatchIt.Website.Services.Configuration.csproj" />
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@@ -1,7 +1,7 @@
using Microsoft.Extensions.Configuration; 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 public class ConfigurationService(IConfiguration configuration) : IConfigurationService
{ {

View File

@@ -0,0 +1,8 @@
using WatchIt.Website.Services.Configuration.Model;
namespace WatchIt.Website.Services.Configuration;
public interface IConfigurationService
{
ConfigurationData Data { get; }
}

View File

@@ -1,4 +1,4 @@
namespace WatchIt.Website.Services.Utility.Configuration.Model; namespace WatchIt.Website.Services.Configuration.Model;
public class Accounts public class Accounts
{ {

View File

@@ -1,4 +1,4 @@
namespace WatchIt.Website.Services.Utility.Configuration.Model; namespace WatchIt.Website.Services.Configuration.Model;
public class ConfigurationData public class ConfigurationData
{ {

View File

@@ -1,4 +1,4 @@
namespace WatchIt.Website.Services.Utility.Configuration.Model; namespace WatchIt.Website.Services.Configuration.Model;
public class Endpoints public class Endpoints
{ {

View File

@@ -1,4 +1,4 @@
namespace WatchIt.Website.Services.Utility.Configuration.Model; namespace WatchIt.Website.Services.Configuration.Model;
public class Genders public class Genders
{ {

View File

@@ -1,4 +1,4 @@
namespace WatchIt.Website.Services.Utility.Configuration.Model; namespace WatchIt.Website.Services.Configuration.Model;
public class Genres public class Genres
{ {

View File

@@ -1,4 +1,4 @@
namespace WatchIt.Website.Services.Utility.Configuration.Model; namespace WatchIt.Website.Services.Configuration.Model;
public class LogLevel public class LogLevel
{ {

View File

@@ -1,4 +1,4 @@
namespace WatchIt.Website.Services.Utility.Configuration.Model; namespace WatchIt.Website.Services.Configuration.Model;
public class Logging public class Logging
{ {

View File

@@ -1,4 +1,4 @@
namespace WatchIt.Website.Services.Utility.Configuration.Model; namespace WatchIt.Website.Services.Configuration.Model;
public class Media public class Media
{ {

View File

@@ -1,4 +1,4 @@
namespace WatchIt.Website.Services.Utility.Configuration.Model; namespace WatchIt.Website.Services.Configuration.Model;
public class Movies public class Movies
{ {

View File

@@ -1,4 +1,4 @@
namespace WatchIt.Website.Services.Utility.Configuration.Model; namespace WatchIt.Website.Services.Configuration.Model;
public class Persons public class Persons
{ {

View File

@@ -1,4 +1,4 @@
namespace WatchIt.Website.Services.Utility.Configuration.Model; namespace WatchIt.Website.Services.Configuration.Model;
public class Photos public class Photos
{ {

View File

@@ -1,4 +1,4 @@
namespace WatchIt.Website.Services.Utility.Configuration.Model; namespace WatchIt.Website.Services.Configuration.Model;
public class Roles public class Roles
{ {

View File

@@ -1,4 +1,4 @@
namespace WatchIt.Website.Services.Utility.Configuration.Model; namespace WatchIt.Website.Services.Configuration.Model;
public class Series public class Series
{ {

View File

@@ -1,4 +1,4 @@
namespace WatchIt.Website.Services.Utility.Configuration.Model; namespace WatchIt.Website.Services.Configuration.Model;
public class StorageKeys public class StorageKeys
{ {

View File

@@ -1,4 +1,4 @@
namespace WatchIt.Website.Services.Utility.Configuration.Model; namespace WatchIt.Website.Services.Configuration.Model;
public class Style public class Style
{ {

View File

@@ -1,19 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.5.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\WatchIt.Website.Services.WebAPI\WatchIt.Website.Services.WebAPI.Accounts\WatchIt.Website.Services.WebAPI.Accounts.csproj" />
<ProjectReference Include="..\WatchIt.Website.Services.Utility.Tokens\WatchIt.Website.Services.Utility.Tokens.csproj" />
</ItemGroup>
</Project>

View File

@@ -1,8 +0,0 @@
using WatchIt.Website.Services.Utility.Configuration.Model;
namespace WatchIt.Website.Services.Utility.Configuration;
public interface IConfigurationService
{
ConfigurationData Data { get; }
}

View File

@@ -1,16 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\WatchIt.Common\WatchIt.Common.Model\WatchIt.Common.Model.csproj" />
<ProjectReference Include="..\..\..\..\WatchIt.Common\WatchIt.Common.Services\WatchIt.Common.Services.HttpClient\WatchIt.Common.Services.HttpClient.csproj" />
<ProjectReference Include="..\..\WatchIt.Website.Services.Utility\WatchIt.Website.Services.Utility.Configuration\WatchIt.Website.Services.Utility.Configuration.csproj" />
<ProjectReference Include="..\WatchIt.Website.Services.WebAPI.Common\WatchIt.Website.Services.WebAPI.Common.csproj" />
</ItemGroup>
</Project>

View File

@@ -1,15 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\WatchIt.WebAPI\WatchIt.WebAPI.Services\WatchIt.WebAPI.Services.Utility\WatchIt.WebAPI.Services.Utility.Configuration\WatchIt.WebAPI.Services.Utility.Configuration.csproj" />
<ProjectReference Include="..\..\WatchIt.Website.Services.Utility\WatchIt.Website.Services.Utility.Configuration\WatchIt.Website.Services.Utility.Configuration.csproj" />
<ProjectReference Include="..\..\WatchIt.Website.Services.Utility\WatchIt.Website.Services.Utility.Tokens\WatchIt.Website.Services.Utility.Tokens.csproj" />
</ItemGroup>
</Project>

View File

@@ -1,14 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\WatchIt.Common\WatchIt.Common.Services\WatchIt.Common.Services.HttpClient\WatchIt.Common.Services.HttpClient.csproj" />
<ProjectReference Include="..\WatchIt.Website.Services.WebAPI.Common\WatchIt.Website.Services.WebAPI.Common.csproj" />
</ItemGroup>
</Project>

View File

@@ -1,9 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
</Project>

View File

@@ -1,16 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\WatchIt.Common\WatchIt.Common.Model\WatchIt.Common.Model.csproj" />
<ProjectReference Include="..\..\..\..\WatchIt.Common\WatchIt.Common.Services\WatchIt.Common.Services.HttpClient\WatchIt.Common.Services.HttpClient.csproj" />
<ProjectReference Include="..\..\WatchIt.Website.Services.Utility\WatchIt.Website.Services.Utility.Configuration\WatchIt.Website.Services.Utility.Configuration.csproj" />
<ProjectReference Include="..\WatchIt.Website.Services.WebAPI.Common\WatchIt.Website.Services.WebAPI.Common.csproj" />
</ItemGroup>
</Project>

View File

@@ -1,23 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.AspNetCore.Components">
<HintPath>..\..\..\..\..\..\..\..\Program Files\dotnet\shared\Microsoft.AspNetCore.App\8.0.2\Microsoft.AspNetCore.Components.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\WatchIt.Common\WatchIt.Common.Model\WatchIt.Common.Model.csproj" />
<ProjectReference Include="..\..\..\..\WatchIt.Common\WatchIt.Common.Services\WatchIt.Common.Services.HttpClient\WatchIt.Common.Services.HttpClient.csproj" />
<ProjectReference Include="..\..\..\..\WatchIt.WebAPI\WatchIt.WebAPI.Services\WatchIt.WebAPI.Services.Utility\WatchIt.WebAPI.Services.Utility.Configuration\WatchIt.WebAPI.Services.Utility.Configuration.csproj" />
<ProjectReference Include="..\..\WatchIt.Website.Services.Utility\WatchIt.Website.Services.Utility.Configuration\WatchIt.Website.Services.Utility.Configuration.csproj" />
<ProjectReference Include="..\WatchIt.Website.Services.WebAPI.Common\WatchIt.Website.Services.WebAPI.Common.csproj" />
</ItemGroup>
</Project>

View File

@@ -1,14 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\WatchIt.Common\WatchIt.Common.Services\WatchIt.Common.Services.HttpClient\WatchIt.Common.Services.HttpClient.csproj" />
<ProjectReference Include="..\WatchIt.Website.Services.WebAPI.Common\WatchIt.Website.Services.WebAPI.Common.csproj" />
</ItemGroup>
</Project>

View File

@@ -1,15 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\WatchIt.Common\WatchIt.Common.Services\WatchIt.Common.Services.HttpClient\WatchIt.Common.Services.HttpClient.csproj" />
<ProjectReference Include="..\..\WatchIt.Website.Services.Utility\WatchIt.Website.Services.Utility.Configuration\WatchIt.Website.Services.Utility.Configuration.csproj" />
<ProjectReference Include="..\WatchIt.Website.Services.WebAPI.Common\WatchIt.Website.Services.WebAPI.Common.csproj" />
</ItemGroup>
</Project>

View File

@@ -1,14 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\WatchIt.Common\WatchIt.Common.Services\WatchIt.Common.Services.HttpClient\WatchIt.Common.Services.HttpClient.csproj" />
<ProjectReference Include="..\WatchIt.Website.Services.WebAPI.Common\WatchIt.Website.Services.WebAPI.Common.csproj" />
</ItemGroup>
</Project>

View File

@@ -1,14 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\WatchIt.Common\WatchIt.Common.Services\WatchIt.Common.Services.HttpClient\WatchIt.Common.Services.HttpClient.csproj" />
<ProjectReference Include="..\WatchIt.Website.Services.WebAPI.Common\WatchIt.Website.Services.WebAPI.Common.csproj" />
</ItemGroup>
</Project>

View File

@@ -1,7 +1,7 @@
using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components;
using WatchIt.Common.Model; using WatchIt.Common.Model;
using WatchIt.Common.Model.Rating; using WatchIt.Common.Model.Rating;
using WatchIt.Website.Services.Utility.Authentication; using WatchIt.Website.Services.Authentication;
namespace WatchIt.Website.Components.Common.Subcomponents; namespace WatchIt.Website.Components.Common.Subcomponents;

View File

@@ -1,7 +1,7 @@
using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components;
using WatchIt.Common.Model.Genders; using WatchIt.Common.Model.Genders;
using WatchIt.Common.Model.Persons; using WatchIt.Common.Model.Persons;
using WatchIt.Website.Services.WebAPI.Genders; using WatchIt.Website.Services.Client.Genders;
namespace WatchIt.Website.Components.Pages.DatabasePage.Subcomponents; namespace WatchIt.Website.Components.Pages.DatabasePage.Subcomponents;
@@ -9,7 +9,7 @@ public partial class PersonsFilterFormComponent : FilterFormComponent<PersonResp
{ {
#region SERVICES #region SERVICES
[Inject] private IGendersWebAPIService GendersWebAPIService { get; set; } = default!; [Inject] private IGendersClientService GendersClientService { get; set; } = default!;
#endregion #endregion
@@ -34,7 +34,7 @@ public partial class PersonsFilterFormComponent : FilterFormComponent<PersonResp
// STEP 0 // STEP 0
endTasks.AddRange( endTasks.AddRange(
[ [
GendersWebAPIService.GetAllGenders(successAction: data => _genders = data) GendersClientService.GetAllGenders(successAction: data => _genders = data)
]); ]);
// END // END

View File

@@ -2,9 +2,9 @@ using Microsoft.AspNetCore.Components;
using WatchIt.Common.Model.Media; using WatchIt.Common.Model.Media;
using WatchIt.Common.Model.Persons; using WatchIt.Common.Model.Persons;
using WatchIt.Common.Model.Roles; using WatchIt.Common.Model.Roles;
using WatchIt.Website.Services.WebAPI.Media; using WatchIt.Website.Services.Client.Media;
using WatchIt.Website.Services.WebAPI.Persons; using WatchIt.Website.Services.Client.Persons;
using WatchIt.Website.Services.WebAPI.Roles; using WatchIt.Website.Services.Client.Roles;
namespace WatchIt.Website.Components.Pages.MediaEditPage.Panels; namespace WatchIt.Website.Components.Pages.MediaEditPage.Panels;
@@ -12,9 +12,9 @@ public partial class MediaActorRolesEditPanelComponent : ComponentBase
{ {
#region SERVICES #region SERVICES
[Inject] private IPersonsWebAPIService PersonsWebAPIService { get; set; } = default!; [Inject] private IPersonsClientService PersonsClientService { get; set; } = default!;
[Inject] private IMediaWebAPIService MediaWebAPIService { get; set; } = default!; [Inject] private IMediaClientService MediaClientService { get; set; } = default!;
[Inject] private IRolesWebAPIService RolesWebAPIService { get; set; } = default!; [Inject] private IRolesClientService RolesClientService { get; set; } = default!;
#endregion #endregion
@@ -62,8 +62,8 @@ public partial class MediaActorRolesEditPanelComponent : ComponentBase
{ {
endTasks.AddRange( endTasks.AddRange(
[ [
MediaWebAPIService.GetMediaAllActorRoles(Id.Value, successAction: data => _roles = data.ToDictionary(x => x.Id, x => (x, false))), MediaClientService.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)), RolesClientService.GetAllActorRoleTypes(successAction: data => _roleTypes = data.ToDictionary(x => x.Id, x => x.Name)),
]); ]);
} }
@@ -120,11 +120,11 @@ public partial class MediaActorRolesEditPanelComponent : ComponentBase
_saving = true; _saving = true;
if (_editedId.HasValue) 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 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) private async Task Delete(Guid id)
{ {
_roles[id] = (_roles[id].Data, true); _roles[id] = (_roles[id].Data, true);
await RolesWebAPIService.DeleteActorRole(id, () => _roles.Remove(id)); await RolesClientService.DeleteActorRole(id, () => _roles.Remove(id));
} }
#endregion #endregion

View File

@@ -2,9 +2,9 @@ using Microsoft.AspNetCore.Components;
using WatchIt.Common.Model.Media; using WatchIt.Common.Model.Media;
using WatchIt.Common.Model.Persons; using WatchIt.Common.Model.Persons;
using WatchIt.Common.Model.Roles; using WatchIt.Common.Model.Roles;
using WatchIt.Website.Services.WebAPI.Media; using WatchIt.Website.Services.Client.Media;
using WatchIt.Website.Services.WebAPI.Persons; using WatchIt.Website.Services.Client.Persons;
using WatchIt.Website.Services.WebAPI.Roles; using WatchIt.Website.Services.Client.Roles;
namespace WatchIt.Website.Components.Pages.MediaEditPage.Panels; namespace WatchIt.Website.Components.Pages.MediaEditPage.Panels;
@@ -12,9 +12,9 @@ public partial class MediaCreatorRolesEditPanelComponent : ComponentBase
{ {
#region SERVICES #region SERVICES
[Inject] private IPersonsWebAPIService PersonsWebAPIService { get; set; } = default!; [Inject] private IPersonsClientService PersonsClientService { get; set; } = default!;
[Inject] private IMediaWebAPIService MediaWebAPIService { get; set; } = default!; [Inject] private IMediaClientService MediaClientService { get; set; } = default!;
[Inject] private IRolesWebAPIService RolesWebAPIService { get; set; } = default!; [Inject] private IRolesClientService RolesClientService { get; set; } = default!;
#endregion #endregion
@@ -62,8 +62,8 @@ public partial class MediaCreatorRolesEditPanelComponent : ComponentBase
{ {
endTasks.AddRange( endTasks.AddRange(
[ [
MediaWebAPIService.GetMediaAllCreatorRoles(Id.Value, successAction: data => _roles = data.ToDictionary(x => x.Id, x => (x, false))), MediaClientService.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)), RolesClientService.GetAllCreatorRoleTypes(successAction: data => _roleTypes = data.ToDictionary(x => x.Id, x => x.Name)),
]); ]);
} }
@@ -119,11 +119,11 @@ public partial class MediaCreatorRolesEditPanelComponent : ComponentBase
_saving = true; _saving = true;
if (_editedId.HasValue) 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 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) private async Task Delete(Guid id)
{ {
_roles[id] = (_roles[id].Data, true); _roles[id] = (_roles[id].Data, true);
await RolesWebAPIService.DeleteCreatorRole(id, () => _roles.Remove(id)); await RolesClientService.DeleteCreatorRole(id, () => _roles.Remove(id));
} }
#endregion #endregion

View File

@@ -10,17 +10,17 @@
TQuery="ActorRoleMediaQueryParameters" TQuery="ActorRoleMediaQueryParameters"
TRoleParent="PersonResponse" TRoleParent="PersonResponse"
Id="@(Id)" Id="@(Id)"
GetRolesAction="@(MediaWebAPIService.GetMediaAllActorRoles)" GetRolesAction="@(MediaClientService.GetMediaAllActorRoles)"
NameSource="@((_, parent) => parent.Name)" NameSource="@((_, parent) => parent.Name)"
AdditionalInfoSource="@((item, _) => $" as {item.Name}")" AdditionalInfoSource="@((item, _) => $" as {item.Name}")"
GetRoleParentMethod="@((id, action) => PersonsWebAPIService.GetPerson(id, action))" GetRoleParentMethod="@((id, action) => PersonsClientService.GetPerson(id, action))"
ParentItemIdSource="@(item => item.PersonId)" ParentItemIdSource="@(item => item.PersonId)"
ParentUrlTemplate="/person/{0}" ParentUrlTemplate="/person/{0}"
PosterPlaceholder="/assets/person_poster.png" PosterPlaceholder="/assets/person_poster.png"
PosterDownloadingTask="@((id, action) => PersonsWebAPIService.GetPersonPhoto(id, action))" PosterDownloadingTask="@((id, action) => PersonsClientService.GetPersonPhoto(id, action))"
GetGlobalRatingMethod="@((id, action) => RolesWebAPIService.GetActorRoleRating(id, action))" GetGlobalRatingMethod="@((id, action) => RolesClientService.GetActorRoleRating(id, action))"
GetUserRatingMethod="@((id, userId, actionSuccess, actionNotFound) => RolesWebAPIService.GetActorRoleRatingByUser(id, userId, actionSuccess, actionNotFound))" GetUserRatingMethod="@((id, userId, actionSuccess, actionNotFound) => RolesClientService.GetActorRoleRatingByUser(id, userId, actionSuccess, actionNotFound))"
PutRatingMethod="@((id, request) => RolesWebAPIService.PutActorRoleRating(id, request))" PutRatingMethod="@((id, request) => RolesClientService.PutActorRoleRating(id, request))"
DeleteRatingMethod="@(id => RolesWebAPIService.DeleteActorRoleRating(id))"/> DeleteRatingMethod="@(id => RolesClientService.DeleteActorRoleRating(id))"/>
</div> </div>
</div> </div>

View File

@@ -1,8 +1,8 @@
using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components;
using WatchIt.Website.Services.Utility.Authentication; using WatchIt.Website.Services.Authentication;
using WatchIt.Website.Services.WebAPI.Media; using WatchIt.Website.Services.Client.Media;
using WatchIt.Website.Services.WebAPI.Persons; using WatchIt.Website.Services.Client.Persons;
using WatchIt.Website.Services.WebAPI.Roles; using WatchIt.Website.Services.Client.Roles;
namespace WatchIt.Website.Components.Pages.MediaPage.Panels; namespace WatchIt.Website.Components.Pages.MediaPage.Panels;
@@ -10,9 +10,9 @@ public partial class MediaActorRolesPanelComponent : ComponentBase
{ {
#region SERVICES #region SERVICES
[Inject] private IMediaWebAPIService MediaWebAPIService { get; set; } = default!; [Inject] private IMediaClientService MediaClientService { get; set; } = default!;
[Inject] private IPersonsWebAPIService PersonsWebAPIService { get; set; } = default!; [Inject] private IPersonsClientService PersonsClientService { get; set; } = default!;
[Inject] private IRolesWebAPIService RolesWebAPIService { get; set; } = default!; [Inject] private IRolesClientService RolesClientService { get; set; } = default!;
#endregion #endregion

View File

@@ -22,17 +22,17 @@
TRoleParent="PersonResponse" TRoleParent="PersonResponse"
Id="@(Id)" Id="@(Id)"
Query="@(_query)" Query="@(_query)"
GetRolesAction="@(MediaWebAPIService.GetMediaAllCreatorRoles)" GetRolesAction="@(MediaClientService.GetMediaAllCreatorRoles)"
NameSource="@((_, parent) => parent.Name)" NameSource="@((_, parent) => parent.Name)"
GetRoleParentMethod="@((id, action) => PersonsWebAPIService.GetPerson(id, action))" GetRoleParentMethod="@((id, action) => PersonsClientService.GetPerson(id, action))"
ParentItemIdSource="@(item => item.PersonId)" ParentItemIdSource="@(item => item.PersonId)"
ParentUrlTemplate="/person/{0}" ParentUrlTemplate="/person/{0}"
PosterPlaceholder="/assets/person_poster.png" PosterPlaceholder="/assets/person_poster.png"
PosterDownloadingTask="@((id, action) => PersonsWebAPIService.GetPersonPhoto(id, action))" PosterDownloadingTask="@((id, action) => PersonsClientService.GetPersonPhoto(id, action))"
GetGlobalRatingMethod="@((id, action) => RolesWebAPIService.GetCreatorRoleRating(id, action))" GetGlobalRatingMethod="@((id, action) => RolesClientService.GetCreatorRoleRating(id, action))"
GetUserRatingMethod="@((id, userId, actionSuccess, actionNotFound) => RolesWebAPIService.GetCreatorRoleRatingByUser(id, userId, actionSuccess, actionNotFound))" GetUserRatingMethod="@((id, userId, actionSuccess, actionNotFound) => RolesClientService.GetCreatorRoleRatingByUser(id, userId, actionSuccess, actionNotFound))"
PutRatingMethod="@((id, request) => RolesWebAPIService.PutCreatorRoleRating(id, request))" PutRatingMethod="@((id, request) => RolesClientService.PutCreatorRoleRating(id, request))"
DeleteRatingMethod="@((id) => RolesWebAPIService.DeleteCreatorRoleRating(id))"/> DeleteRatingMethod="@((id) => RolesClientService.DeleteCreatorRoleRating(id))"/>
</div> </div>
} }
else else

View File

@@ -2,10 +2,10 @@ using Microsoft.AspNetCore.Components;
using WatchIt.Common.Model.Persons; using WatchIt.Common.Model.Persons;
using WatchIt.Common.Model.Roles; using WatchIt.Common.Model.Roles;
using WatchIt.Website.Components.Common.Subcomponents; using WatchIt.Website.Components.Common.Subcomponents;
using WatchIt.Website.Services.Utility.Authentication; using WatchIt.Website.Services.Authentication;
using WatchIt.Website.Services.WebAPI.Media; using WatchIt.Website.Services.Client.Media;
using WatchIt.Website.Services.WebAPI.Persons; using WatchIt.Website.Services.Client.Persons;
using WatchIt.Website.Services.WebAPI.Roles; using WatchIt.Website.Services.Client.Roles;
namespace WatchIt.Website.Components.Pages.MediaPage.Panels; namespace WatchIt.Website.Components.Pages.MediaPage.Panels;
@@ -13,9 +13,9 @@ public partial class MediaCreatorRolesPanelComponent : ComponentBase
{ {
#region SERVICES #region SERVICES
[Inject] private IPersonsWebAPIService PersonsWebAPIService { get; set; } = default!; [Inject] private IPersonsClientService PersonsClientService { get; set; } = default!;
[Inject] private IMediaWebAPIService MediaWebAPIService { get; set; } = default!; [Inject] private IMediaClientService MediaClientService { get; set; } = default!;
[Inject] private IRolesWebAPIService RolesWebAPIService { get; set; } = default!; [Inject] private IRolesClientService RolesClientService { get; set; } = default!;
#endregion #endregion
@@ -54,7 +54,7 @@ public partial class MediaCreatorRolesPanelComponent : ComponentBase
// STEP 0 // STEP 0
endTasks.AddRange( endTasks.AddRange(
[ [
RolesWebAPIService.GetAllCreatorRoleTypes(successAction: data => _roleTypes = data) RolesClientService.GetAllCreatorRoleTypes(successAction: data => _roleTypes = data)
]); ]);
// END // END

View File

@@ -1,9 +1,9 @@
using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components;
using WatchIt.Common.Model.Media; using WatchIt.Common.Model.Media;
using WatchIt.Common.Model.Roles; using WatchIt.Common.Model.Roles;
using WatchIt.Website.Services.WebAPI.Media; using WatchIt.Website.Services.Client.Media;
using WatchIt.Website.Services.WebAPI.Persons; using WatchIt.Website.Services.Client.Persons;
using WatchIt.Website.Services.WebAPI.Roles; using WatchIt.Website.Services.Client.Roles;
namespace WatchIt.Website.Components.Pages.PersonEditPage.Panels; namespace WatchIt.Website.Components.Pages.PersonEditPage.Panels;
@@ -11,9 +11,9 @@ public partial class PersonActorRolesEditPanelComponent : ComponentBase
{ {
#region SERVICES #region SERVICES
[Inject] private IPersonsWebAPIService PersonsWebAPIService { get; set; } = default!; [Inject] private IPersonsClientService PersonsClientService { get; set; } = default!;
[Inject] private IMediaWebAPIService MediaWebAPIService { get; set; } = default!; [Inject] private IMediaClientService MediaClientService { get; set; } = default!;
[Inject] private IRolesWebAPIService RolesWebAPIService { get; set; } = default!; [Inject] private IRolesClientService RolesClientService { get; set; } = default!;
#endregion #endregion
@@ -61,8 +61,8 @@ public partial class PersonActorRolesEditPanelComponent : ComponentBase
{ {
endTasks.AddRange( endTasks.AddRange(
[ [
PersonsWebAPIService.GetPersonAllActorRoles(Id.Value, successAction: data => _roles = data.ToDictionary(x => x.Id, x => (x, false))), PersonsClientService.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)), RolesClientService.GetAllActorRoleTypes(successAction: data => _roleTypes = data.ToDictionary(x => x.Id, x => x.Name)),
]); ]);
} }
@@ -122,11 +122,11 @@ public partial class PersonActorRolesEditPanelComponent : ComponentBase
_saving = true; _saving = true;
if (_editedId.HasValue) 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 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) private async Task Delete(Guid id)
{ {
_roles[id] = (_roles[id].Data, true); _roles[id] = (_roles[id].Data, true);
await RolesWebAPIService.DeleteActorRole(id, () => _roles.Remove(id)); await RolesClientService.DeleteActorRole(id, () => _roles.Remove(id));
} }
#endregion #endregion

View File

@@ -1,9 +1,9 @@
using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components;
using WatchIt.Common.Model.Media; using WatchIt.Common.Model.Media;
using WatchIt.Common.Model.Roles; using WatchIt.Common.Model.Roles;
using WatchIt.Website.Services.WebAPI.Media; using WatchIt.Website.Services.Client.Media;
using WatchIt.Website.Services.WebAPI.Persons; using WatchIt.Website.Services.Client.Persons;
using WatchIt.Website.Services.WebAPI.Roles; using WatchIt.Website.Services.Client.Roles;
namespace WatchIt.Website.Components.Pages.PersonEditPage.Panels; namespace WatchIt.Website.Components.Pages.PersonEditPage.Panels;
@@ -11,9 +11,9 @@ public partial class PersonCreatorRolesEditPanelComponent : ComponentBase
{ {
#region SERVICES #region SERVICES
[Inject] private IPersonsWebAPIService PersonsWebAPIService { get; set; } = default!; [Inject] private IPersonsClientService PersonsClientService { get; set; } = default!;
[Inject] private IMediaWebAPIService MediaWebAPIService { get; set; } = default!; [Inject] private IMediaClientService MediaClientService { get; set; } = default!;
[Inject] private IRolesWebAPIService RolesWebAPIService { get; set; } = default!; [Inject] private IRolesClientService RolesClientService { get; set; } = default!;
#endregion #endregion
@@ -61,8 +61,8 @@ public partial class PersonCreatorRolesEditPanelComponent : ComponentBase
{ {
endTasks.AddRange( endTasks.AddRange(
[ [
PersonsWebAPIService.GetPersonAllCreatorRoles(Id.Value, successAction: data => _roles = data.ToDictionary(x => x.Id, x => (x, false))), PersonsClientService.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)), RolesClientService.GetAllCreatorRoleTypes(successAction: data => _roleTypes = data.ToDictionary(x => x.Id, x => x.Name)),
]); ]);
} }
@@ -121,11 +121,11 @@ public partial class PersonCreatorRolesEditPanelComponent : ComponentBase
_saving = true; _saving = true;
if (_editedId.HasValue) 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 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) private async Task Delete(Guid id)
{ {
_roles[id] = (_roles[id].Data, true); _roles[id] = (_roles[id].Data, true);
await RolesWebAPIService.DeleteCreatorRole(id, () => _roles.Remove(id)); await RolesClientService.DeleteCreatorRole(id, () => _roles.Remove(id));
} }
#endregion #endregion

View File

@@ -1,8 +1,8 @@
using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components;
using WatchIt.Common.Model.Genders; using WatchIt.Common.Model.Genders;
using WatchIt.Common.Model.Persons; using WatchIt.Common.Model.Persons;
using WatchIt.Website.Services.WebAPI.Genders; using WatchIt.Website.Services.Client.Genders;
using WatchIt.Website.Services.WebAPI.Persons; using WatchIt.Website.Services.Client.Persons;
namespace WatchIt.Website.Components.Pages.PersonEditPage.Panels; namespace WatchIt.Website.Components.Pages.PersonEditPage.Panels;
@@ -11,8 +11,8 @@ public partial class PersonEditFormPanelComponent : ComponentBase
#region SERVICES #region SERVICES
[Inject] private NavigationManager NavigationManager { get; set; } = default!; [Inject] private NavigationManager NavigationManager { get; set; } = default!;
[Inject] private IPersonsWebAPIService PersonsWebAPIService { get; set; } = default!; [Inject] private IPersonsClientService PersonsClientService { get; set; } = default!;
[Inject] private IGendersWebAPIService GendersWebAPIService { get; set; } = default!; [Inject] private IGendersClientService GendersClientService { get; set; } = default!;
#endregion #endregion
@@ -52,13 +52,13 @@ public partial class PersonEditFormPanelComponent : ComponentBase
// STEP 0 // STEP 0
endTasks.AddRange( endTasks.AddRange(
[ [
GendersWebAPIService.GetAllGenders(successAction: data => _genders = data) GendersClientService.GetAllGenders(successAction: data => _genders = data)
]); ]);
if (Id.HasValue) if (Id.HasValue)
{ {
endTasks.AddRange( 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; _saving = true;
if (Id.HasValue) if (Id.HasValue)
{ {
await PersonsWebAPIService.PutPerson(Id.Value, _person, PutSuccess, BadRequest, AuthError, AuthError); await PersonsClientService.PutPerson(Id.Value, _person, PutSuccess, BadRequest, AuthError, AuthError);
} }
else else
{ {
await PersonsWebAPIService.PostPerson(_person, PostSuccess, BadRequest, AuthError, AuthError); await PersonsClientService.PostPerson(_person, PostSuccess, BadRequest, AuthError, AuthError);
} }
} }

View File

@@ -10,18 +10,18 @@
TQuery="ActorRolePersonQueryParameters" TQuery="ActorRolePersonQueryParameters"
TRoleParent="MediaResponse" TRoleParent="MediaResponse"
Id="@(Id)" Id="@(Id)"
GetRolesAction="@(PersonsWebAPIService.GetPersonAllActorRoles)" GetRolesAction="@(PersonsClientService.GetPersonAllActorRoles)"
NameSource="@((_, parent) => parent.Title)" NameSource="@((_, parent) => parent.Title)"
AdditionalInfoSource="@((item, _) => $" as {item.Name}")" AdditionalInfoSource="@((item, _) => $" as {item.Name}")"
GetRoleParentMethod="@((id, action) => MediaWebAPIService.GetMedia(id, action))" GetRoleParentMethod="@((id, action) => MediaClientService.GetMedia(id, action))"
ParentItemIdSource="@(item => item.MediaId)" ParentItemIdSource="@(item => item.MediaId)"
ParentUrlTemplate="/media/{0}" ParentUrlTemplate="/media/{0}"
PosterPlaceholder="/assets/media_poster.png" PosterPlaceholder="/assets/media_poster.png"
PosterDownloadingTask="@((id, action) => MediaWebAPIService.GetMediaPoster(id, action))" PosterDownloadingTask="@((id, action) => MediaClientService.GetMediaPoster(id, action))"
GetGlobalRatingMethod="@((id, action) => RolesWebAPIService.GetActorRoleRating(id, action))" GetGlobalRatingMethod="@((id, action) => RolesClientService.GetActorRoleRating(id, action))"
GetUserRatingMethod="@((id, userId, actionSuccess, actionNotFound) => RolesWebAPIService.GetActorRoleRatingByUser(id, userId, actionSuccess, actionNotFound))" GetUserRatingMethod="@((id, userId, actionSuccess, actionNotFound) => RolesClientService.GetActorRoleRatingByUser(id, userId, actionSuccess, actionNotFound))"
PutRatingMethod="@((id, request) => RolesWebAPIService.PutActorRoleRating(id, request))" PutRatingMethod="@((id, request) => RolesClientService.PutActorRoleRating(id, request))"
DeleteRatingMethod="@(id => RolesWebAPIService.DeleteActorRoleRating(id))" DeleteRatingMethod="@(id => RolesClientService.DeleteActorRoleRating(id))"
OnRatingChanged="@(OnRatingChanged)"/> OnRatingChanged="@(OnRatingChanged)"/>
</div> </div>
</div> </div>

View File

@@ -1,7 +1,7 @@
using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components;
using WatchIt.Website.Services.WebAPI.Media; using WatchIt.Website.Services.Client.Media;
using WatchIt.Website.Services.WebAPI.Persons; using WatchIt.Website.Services.Client.Persons;
using WatchIt.Website.Services.WebAPI.Roles; using WatchIt.Website.Services.Client.Roles;
namespace WatchIt.Website.Components.Pages.PersonPage.Panels; namespace WatchIt.Website.Components.Pages.PersonPage.Panels;
@@ -9,9 +9,9 @@ public partial class PersonActorRolesPanelComponent : ComponentBase
{ {
#region SERVICES #region SERVICES
[Inject] private IMediaWebAPIService MediaWebAPIService { get; set; } = default!; [Inject] private IMediaClientService MediaClientService { get; set; } = default!;
[Inject] private IPersonsWebAPIService PersonsWebAPIService { get; set; } = default!; [Inject] private IPersonsClientService PersonsClientService { get; set; } = default!;
[Inject] private IRolesWebAPIService RolesWebAPIService { get; set; } = default!; [Inject] private IRolesClientService RolesClientService { get; set; } = default!;
#endregion #endregion

View File

@@ -22,17 +22,17 @@
TRoleParent="MediaResponse" TRoleParent="MediaResponse"
Id="@(Id)" Id="@(Id)"
Query="@(_query)" Query="@(_query)"
GetRolesAction="@(PersonsWebAPIService.GetPersonAllCreatorRoles)" GetRolesAction="@(PersonsClientService.GetPersonAllCreatorRoles)"
NameSource="@((_, parent) => parent.Title)" NameSource="@((_, parent) => parent.Title)"
GetRoleParentMethod="@((id, action) => MediaWebAPIService.GetMedia(id, action))" GetRoleParentMethod="@((id, action) => MediaClientService.GetMedia(id, action))"
ParentItemIdSource="@(item => item.MediaId)" ParentItemIdSource="@(item => item.MediaId)"
ParentUrlTemplate="/media/{0}" ParentUrlTemplate="/media/{0}"
PosterPlaceholder="/assets/media_poster.png" PosterPlaceholder="/assets/media_poster.png"
PosterDownloadingTask="@((id, action) => MediaWebAPIService.GetMediaPoster(id, action))" PosterDownloadingTask="@((id, action) => MediaClientService.GetMediaPoster(id, action))"
GetGlobalRatingMethod="@((id, action) => RolesWebAPIService.GetCreatorRoleRating(id, action))" GetGlobalRatingMethod="@((id, action) => RolesClientService.GetCreatorRoleRating(id, action))"
GetUserRatingMethod="@((id, userId, actionSuccess, actionNotFound) => RolesWebAPIService.GetCreatorRoleRatingByUser(id, userId, actionSuccess, actionNotFound))" GetUserRatingMethod="@((id, userId, actionSuccess, actionNotFound) => RolesClientService.GetCreatorRoleRatingByUser(id, userId, actionSuccess, actionNotFound))"
PutRatingMethod="@((id, request) => RolesWebAPIService.PutCreatorRoleRating(id, request))" PutRatingMethod="@((id, request) => RolesClientService.PutCreatorRoleRating(id, request))"
DeleteRatingMethod="@((id) => RolesWebAPIService.DeleteCreatorRoleRating(id))" DeleteRatingMethod="@((id) => RolesClientService.DeleteCreatorRoleRating(id))"
OnRatingChanged="@(OnRatingChanged)"/> OnRatingChanged="@(OnRatingChanged)"/>
</div> </div>
} }

View File

@@ -2,9 +2,9 @@ using Microsoft.AspNetCore.Components;
using WatchIt.Common.Model.Media; using WatchIt.Common.Model.Media;
using WatchIt.Common.Model.Roles; using WatchIt.Common.Model.Roles;
using WatchIt.Website.Components.Common.Subcomponents; using WatchIt.Website.Components.Common.Subcomponents;
using WatchIt.Website.Services.WebAPI.Media; using WatchIt.Website.Services.Client.Media;
using WatchIt.Website.Services.WebAPI.Persons; using WatchIt.Website.Services.Client.Persons;
using WatchIt.Website.Services.WebAPI.Roles; using WatchIt.Website.Services.Client.Roles;
namespace WatchIt.Website.Components.Pages.PersonPage.Panels; namespace WatchIt.Website.Components.Pages.PersonPage.Panels;
@@ -12,9 +12,9 @@ public partial class PersonCreatorRolesPanelComponent : ComponentBase
{ {
#region SERVICES #region SERVICES
[Inject] private IPersonsWebAPIService PersonsWebAPIService { get; set; } = default!; [Inject] private IPersonsClientService PersonsClientService { get; set; } = default!;
[Inject] private IMediaWebAPIService MediaWebAPIService { get; set; } = default!; [Inject] private IMediaClientService MediaClientService { get; set; } = default!;
[Inject] private IRolesWebAPIService RolesWebAPIService { get; set; } = default!; [Inject] private IRolesClientService RolesClientService { get; set; } = default!;
#endregion #endregion
@@ -54,7 +54,7 @@ public partial class PersonCreatorRolesPanelComponent : ComponentBase
// STEP 0 // STEP 0
endTasks.AddRange( endTasks.AddRange(
[ [
RolesWebAPIService.GetAllCreatorRoleTypes(successAction: data => _roleTypes = data) RolesClientService.GetAllCreatorRoleTypes(successAction: data => _roleTypes = data)
]); ]);
// END // END

View File

@@ -1,7 +1,7 @@
using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components;
using WatchIt.Common.Model.Rating; using WatchIt.Common.Model.Rating;
using WatchIt.Website.Services.Utility.Authentication; using WatchIt.Website.Services.Authentication;
using WatchIt.Website.Services.WebAPI.Persons; using WatchIt.Website.Services.Client.Persons;
namespace WatchIt.Website.Components.Pages.PersonPage.Panels; namespace WatchIt.Website.Components.Pages.PersonPage.Panels;
@@ -10,7 +10,7 @@ public partial class PersonRatingPanel : ComponentBase
#region SERVICES #region SERVICES
[Inject] private IAuthenticationService AuthenticationService { get; set; } = default!; [Inject] private IAuthenticationService AuthenticationService { get; set; } = default!;
[Inject] private IPersonsWebAPIService PersonsWebAPIService { get; set; } = default!; [Inject] private IPersonsClientService PersonsClientService { get; set; } = default!;
#endregion #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() protected async Task UpdateUserRating()
{ {
if (_user is not null) if (_user is not null)
{ {
await PersonsWebAPIService.GetPersonUserRating(Id, _user.Id, data => _userRating = data); await PersonsClientService.GetPersonUserRating(Id, _user.Id, data => _userRating = data);
} }
} }

View File

@@ -1,6 +1,6 @@
@using System.Net @using System.Net
@using WatchIt.Common.Model.Photos @using WatchIt.Common.Model.Photos
@using WatchIt.Website.Services.WebAPI.Photos @using WatchIt.Website.Services.Client.Photos
@inherits LayoutComponentBase @inherits LayoutComponentBase

View File

@@ -2,11 +2,11 @@ using System.Net;
using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components;
using WatchIt.Common.Model.Accounts; using WatchIt.Common.Model.Accounts;
using WatchIt.Common.Model.Photos; using WatchIt.Common.Model.Photos;
using WatchIt.Website.Services.Utility.Authentication; using WatchIt.Website.Services.Authentication;
using WatchIt.Website.Services.Utility.Tokens; using WatchIt.Website.Services.Tokens;
using WatchIt.Website.Services.WebAPI.Accounts; using WatchIt.Website.Services.Client.Accounts;
using WatchIt.Website.Services.WebAPI.Media; using WatchIt.Website.Services.Client.Media;
using WatchIt.Website.Services.WebAPI.Photos; using WatchIt.Website.Services.Client.Photos;
namespace WatchIt.Website.Layout; namespace WatchIt.Website.Layout;
@@ -18,9 +18,9 @@ public partial class MainLayout : LayoutComponentBase
[Inject] public NavigationManager NavigationManager { get; set; } = default!; [Inject] public NavigationManager NavigationManager { get; set; } = default!;
[Inject] public ITokensService TokensService { get; set; } = default!; [Inject] public ITokensService TokensService { get; set; } = default!;
[Inject] public IAuthenticationService AuthenticationService { get; set; } = default!; [Inject] public IAuthenticationService AuthenticationService { get; set; } = default!;
[Inject] public IAccountsWebAPIService AccountsWebAPIService { get; set; } = default!; [Inject] public IAccountsClientService AccountsClientService { get; set; } = default!;
[Inject] public IMediaWebAPIService MediaWebAPIService { get; set; } = default!; [Inject] public IMediaClientService MediaClientService { get; set; } = default!;
[Inject] public IPhotosWebAPIService PhotosWebAPIService { get; set; } = default!; [Inject] public IPhotosClientService PhotosClientService { get; set; } = default!;
#endregion #endregion
@@ -76,7 +76,7 @@ public partial class MainLayout : LayoutComponentBase
]); ]);
endTasks.AddRange( endTasks.AddRange(
[ [
PhotosWebAPIService.GetPhotoRandomBackground(data => _defaultBackgroundPhoto = data) PhotosClientService.GetPhotoRandomBackground(data => _defaultBackgroundPhoto = data)
]); ]);
// STEP 1 // STEP 1
@@ -85,7 +85,7 @@ public partial class MainLayout : LayoutComponentBase
{ {
endTasks.AddRange( endTasks.AddRange(
[ [
AccountsWebAPIService.GetAccountProfilePicture(_user.Id, data => _userProfilePicture = data) AccountsClientService.GetAccountProfilePicture(_user.Id, data => _userProfilePicture = data)
]); ]);
} }

View File

@@ -1,6 +1,6 @@
using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components;
using WatchIt.Website.Layout; using WatchIt.Website.Layout;
using WatchIt.Website.Services.Utility.Authentication; using WatchIt.Website.Services.Authentication;
namespace WatchIt.Website.Pages; namespace WatchIt.Website.Pages;

View File

@@ -3,11 +3,11 @@ using Microsoft.AspNetCore.Components;
using WatchIt.Common.Model.Accounts; using WatchIt.Common.Model.Accounts;
using WatchIt.Common.Model.Media; using WatchIt.Common.Model.Media;
using WatchIt.Common.Model.Photos; using WatchIt.Common.Model.Photos;
using WatchIt.Website.Services.Utility.Authentication; using WatchIt.Website.Services.Authentication;
using WatchIt.Website.Services.Utility.Tokens; using WatchIt.Website.Services.Tokens;
using WatchIt.Website.Services.WebAPI.Accounts; using WatchIt.Website.Services.Client.Accounts;
using WatchIt.Website.Services.WebAPI.Media; using WatchIt.Website.Services.Client.Media;
using WatchIt.Website.Services.WebAPI.Photos; using WatchIt.Website.Services.Client.Photos;
namespace WatchIt.Website.Pages; namespace WatchIt.Website.Pages;
@@ -18,9 +18,9 @@ public partial class AuthPage
[Inject] public ILogger<AuthPage> Logger { get; set; } = default!; [Inject] public ILogger<AuthPage> Logger { get; set; } = default!;
[Inject] public IAuthenticationService AuthenticationService { get; set; } = default!; [Inject] public IAuthenticationService AuthenticationService { get; set; } = default!;
[Inject] public ITokensService TokensService { get; set; } = default!; [Inject] public ITokensService TokensService { get; set; } = default!;
[Inject] public IMediaWebAPIService MediaWebAPIService { get; set; } = default!; [Inject] public IMediaClientService MediaClientService { get; set; } = default!;
[Inject] public IAccountsWebAPIService AccountsWebAPIService { get; set; } = default!; [Inject] public IAccountsClientService AccountsClientService { get; set; } = default!;
[Inject] public IPhotosWebAPIService PhotosWebAPIService { get; set; } = default!; [Inject] public IPhotosClientService PhotosClientService { get; set; } = default!;
[Inject] public NavigationManager NavigationManager { get; set; } = default!; [Inject] public NavigationManager NavigationManager { get; set; } = default!;
#endregion #endregion
@@ -80,7 +80,7 @@ public partial class AuthPage
// STEP 0 // STEP 0
endTasks.AddRange( endTasks.AddRange(
[ [
PhotosWebAPIService.GetPhotoRandomBackground(data => _background = data) PhotosClientService.GetPhotoRandomBackground(data => _background = data)
]); ]);
// END // 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() private async Task Register()
@@ -137,7 +137,7 @@ public partial class AuthPage
_formMessage = "Password fields don't match"; _formMessage = "Password fields don't match";
return; return;
} }
await AccountsWebAPIService.Register(_registerModel, RegisterSuccess, RegisterBadRequest); await AccountsClientService.Register(_registerModel, RegisterSuccess, RegisterBadRequest);
} }
#endregion #endregion

View File

@@ -38,8 +38,8 @@
AdditionalNameInfoSource="@(item => item.ReleaseDate.HasValue ? $" ({item.ReleaseDate.Value.Year})" : null)" AdditionalNameInfoSource="@(item => item.ReleaseDate.HasValue ? $" ({item.ReleaseDate.Value.Year})" : null)"
RatingSource="@(item => item.Rating)" RatingSource="@(item => item.Rating)"
UrlIdTemplate="/media/{0}" UrlIdTemplate="/media/{0}"
PictureDownloadingTask="@((id, action) => MediaWebAPIService.GetMediaPoster(id, action))" PictureDownloadingTask="@((id, action) => MediaClientService.GetMediaPoster(id, action))"
ItemDownloadingTask="@(MoviesWebAPIService.GetAllMovies)" ItemDownloadingTask="@(MoviesClientService.GetAllMovies)"
SortingOptions="@(new Dictionary<string, string> SortingOptions="@(new Dictionary<string, string>
{ {
{ "rating.count", "Number of ratings" }, { "rating.count", "Number of ratings" },
@@ -48,10 +48,10 @@
{ "release_date", "Release date" }, { "release_date", "Release date" },
})" })"
PosterPlaceholder="/assets/media_poster.png" PosterPlaceholder="/assets/media_poster.png"
GetGlobalRatingMethod="@((id, action) => MediaWebAPIService.GetMediaRating(id, action))" GetGlobalRatingMethod="@((id, action) => MediaClientService.GetMediaRating(id, action))"
GetUserRatingMethod="@((id, userId, successAction, notfoundAction) => MediaWebAPIService.GetMediaRatingByUser(id, userId, successAction, notfoundAction))" GetUserRatingMethod="@((id, userId, successAction, notfoundAction) => MediaClientService.GetMediaRatingByUser(id, userId, successAction, notfoundAction))"
PutRatingMethod="@((id, request) => MediaWebAPIService.PutMediaRating(id, request))" PutRatingMethod="@((id, request) => MediaClientService.PutMediaRating(id, request))"
DeleteRatingMethod="@(id => MediaWebAPIService.DeleteMediaRating(id))"> DeleteRatingMethod="@(id => MediaClientService.DeleteMediaRating(id))">
<MoviesFilterFormComponent/> <MoviesFilterFormComponent/>
</DatabasePageComponent> </DatabasePageComponent>
break; break;
@@ -64,8 +64,8 @@
AdditionalNameInfoSource="@(item => item.ReleaseDate.HasValue ? $" ({item.ReleaseDate.Value.Year})" : null)" AdditionalNameInfoSource="@(item => item.ReleaseDate.HasValue ? $" ({item.ReleaseDate.Value.Year})" : null)"
RatingSource="@(item => item.Rating)" RatingSource="@(item => item.Rating)"
UrlIdTemplate="/media/{0}" UrlIdTemplate="/media/{0}"
PictureDownloadingTask="@((id, action) => MediaWebAPIService.GetMediaPoster(id, action))" PictureDownloadingTask="@((id, action) => MediaClientService.GetMediaPoster(id, action))"
ItemDownloadingTask="@(SeriesWebAPIService.GetAllSeries)" ItemDownloadingTask="@(SeriesClientService.GetAllSeries)"
SortingOptions="@(new Dictionary<string, string> SortingOptions="@(new Dictionary<string, string>
{ {
{ "rating.count", "Number of ratings" }, { "rating.count", "Number of ratings" },
@@ -74,10 +74,10 @@
{ "release_date", "Release date" }, { "release_date", "Release date" },
})" })"
PosterPlaceholder="/assets/media_poster.png" PosterPlaceholder="/assets/media_poster.png"
GetGlobalRatingMethod="@((id, action) => MediaWebAPIService.GetMediaRating(id, action))" GetGlobalRatingMethod="@((id, action) => MediaClientService.GetMediaRating(id, action))"
GetUserRatingMethod="@((id, userId, successAction, notfoundAction) => MediaWebAPIService.GetMediaRatingByUser(id, userId, successAction, notfoundAction))" GetUserRatingMethod="@((id, userId, successAction, notfoundAction) => MediaClientService.GetMediaRatingByUser(id, userId, successAction, notfoundAction))"
PutRatingMethod="@((id, request) => MediaWebAPIService.PutMediaRating(id, request))" PutRatingMethod="@((id, request) => MediaClientService.PutMediaRating(id, request))"
DeleteRatingMethod="@(id => MediaWebAPIService.DeleteMediaRating(id))"> DeleteRatingMethod="@(id => MediaClientService.DeleteMediaRating(id))">
<SeriesFilterFormComponent/> <SeriesFilterFormComponent/>
</DatabasePageComponent> </DatabasePageComponent>
break; break;
@@ -89,8 +89,8 @@
NameSource="@(item => item.Name)" NameSource="@(item => item.Name)"
RatingSource="@(item => item.Rating)" RatingSource="@(item => item.Rating)"
UrlIdTemplate="/person/{0}" UrlIdTemplate="/person/{0}"
PictureDownloadingTask="@((id, action) => PersonsWebAPIService.GetPersonPhoto(id, action))" PictureDownloadingTask="@((id, action) => PersonsClientService.GetPersonPhoto(id, action))"
ItemDownloadingTask="@(PersonsWebAPIService.GetAllPersons)" ItemDownloadingTask="@(PersonsClientService.GetAllPersons)"
SortingOptions="@(new Dictionary<string, string> SortingOptions="@(new Dictionary<string, string>
{ {
{ "rating.count", "Number of ratings" }, { "rating.count", "Number of ratings" },
@@ -100,7 +100,7 @@
{ "death_date", "Death date" }, { "death_date", "Death date" },
})" })"
PosterPlaceholder="/assets/person_poster.png" PosterPlaceholder="/assets/person_poster.png"
GetGlobalRatingMethod="@((id, action) => PersonsWebAPIService.GetPersonGlobalRating(id, action))"> GetGlobalRatingMethod="@((id, action) => PersonsClientService.GetPersonGlobalRating(id, action))">
<PersonsFilterFormComponent/> <PersonsFilterFormComponent/>
</DatabasePageComponent> </DatabasePageComponent>
break; break;

View File

@@ -1,9 +1,9 @@
using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components;
using WatchIt.Website.Layout; using WatchIt.Website.Layout;
using WatchIt.Website.Services.WebAPI.Media; using WatchIt.Website.Services.Client.Media;
using WatchIt.Website.Services.WebAPI.Movies; using WatchIt.Website.Services.Client.Movies;
using WatchIt.Website.Services.WebAPI.Persons; using WatchIt.Website.Services.Client.Persons;
using WatchIt.Website.Services.WebAPI.Series; using WatchIt.Website.Services.Client.Series;
namespace WatchIt.Website.Pages; namespace WatchIt.Website.Pages;
@@ -12,10 +12,10 @@ public partial class DatabasePage : ComponentBase
#region SERVICES #region SERVICES
[Inject] private NavigationManager NavigationManager { get; set; } = default!; [Inject] private NavigationManager NavigationManager { get; set; } = default!;
[Inject] private IMediaWebAPIService MediaWebAPIService { get; set; } = default!; [Inject] private IMediaClientService MediaClientService { get; set; } = default!;
[Inject] private IMoviesWebAPIService MoviesWebAPIService { get; set; } = default!; [Inject] private IMoviesClientService MoviesClientService { get; set; } = default!;
[Inject] private ISeriesWebAPIService SeriesWebAPIService { get; set; } = default!; [Inject] private ISeriesClientService SeriesClientService { get; set; } = default!;
[Inject] private IPersonsWebAPIService PersonsWebAPIService { get; set; } = default!; [Inject] private IPersonsClientService PersonsClientService { get; set; } = default!;
#endregion #endregion

View File

@@ -12,26 +12,26 @@
<div class="vstack gap-default"> <div class="vstack gap-default">
<ViewRankPanelComponent TItem="MovieResponse" <ViewRankPanelComponent TItem="MovieResponse"
Name="movies" Name="movies"
GetViewRankAction="@((count, action) => MoviesWebAPIService.GetMoviesViewRank(count, successAction: action))" GetViewRankAction="@((count, action) => MoviesClientService.GetMoviesViewRank(count, successAction: action))"
ItemUrlFormatString="/media/{0}" ItemUrlFormatString="/media/{0}"
IdSource="@(item => item.Id)" IdSource="@(item => item.Id)"
NameSource="@(item => item.ReleaseDate.HasValue ? $"{item.Title} ({item.ReleaseDate.Value.Year})" : item.Title)" NameSource="@(item => item.ReleaseDate.HasValue ? $"{item.Title} ({item.ReleaseDate.Value.Year})" : item.Title)"
PosterPlaceholder="/assets/media_poster.png" PosterPlaceholder="/assets/media_poster.png"
GetPictureAction="@((id, action) => MediaWebAPIService.GetMediaPoster(id, action))"/> GetPictureAction="@((id, action) => MediaClientService.GetMediaPoster(id, action))"/>
<ViewRankPanelComponent TItem="SeriesResponse" <ViewRankPanelComponent TItem="SeriesResponse"
Name="TV series" Name="TV series"
GetViewRankAction="@((count, action) => SeriesWebAPIService.GetSeriesViewRank(count, successAction: action))" GetViewRankAction="@((count, action) => SeriesClientService.GetSeriesViewRank(count, successAction: action))"
ItemUrlFormatString="/media/{0}" ItemUrlFormatString="/media/{0}"
IdSource="@(item => item.Id)" IdSource="@(item => item.Id)"
NameSource="@(item => item.ReleaseDate.HasValue ? $"{item.Title} ({item.ReleaseDate.Value.Year})" : item.Title)" NameSource="@(item => item.ReleaseDate.HasValue ? $"{item.Title} ({item.ReleaseDate.Value.Year})" : item.Title)"
PosterPlaceholder="/assets/media_poster.png" PosterPlaceholder="/assets/media_poster.png"
GetPictureAction="@((id, action) => MediaWebAPIService.GetMediaPoster(id, action))"/> GetPictureAction="@((id, action) => MediaClientService.GetMediaPoster(id, action))"/>
<ViewRankPanelComponent TItem="PersonResponse" <ViewRankPanelComponent TItem="PersonResponse"
Name="people" Name="people"
GetViewRankAction="@((count, action) => PersonsWebAPIService.GetPersonsViewRank(count, successAction: action))" GetViewRankAction="@((count, action) => PersonsClientService.GetPersonsViewRank(count, successAction: action))"
ItemUrlFormatString="/person/{0}" ItemUrlFormatString="/person/{0}"
IdSource="@(item => item.Id)" IdSource="@(item => item.Id)"
NameSource="@(item => item.Name)" NameSource="@(item => item.Name)"
PosterPlaceholder="/assets/person_poster.png" PosterPlaceholder="/assets/person_poster.png"
GetPictureAction="@((id, action) => PersonsWebAPIService.GetPersonPhoto(id, action))"/> GetPictureAction="@((id, action) => PersonsClientService.GetPersonPhoto(id, action))"/>
</div> </div>

View File

@@ -3,10 +3,10 @@ using WatchIt.Common.Model.Media;
using WatchIt.Common.Model.Movies; using WatchIt.Common.Model.Movies;
using WatchIt.Common.Model.Series; using WatchIt.Common.Model.Series;
using WatchIt.Website.Layout; using WatchIt.Website.Layout;
using WatchIt.Website.Services.WebAPI.Media; using WatchIt.Website.Services.Client.Media;
using WatchIt.Website.Services.WebAPI.Movies; using WatchIt.Website.Services.Client.Movies;
using WatchIt.Website.Services.WebAPI.Persons; using WatchIt.Website.Services.Client.Persons;
using WatchIt.Website.Services.WebAPI.Series; using WatchIt.Website.Services.Client.Series;
namespace WatchIt.Website.Pages; namespace WatchIt.Website.Pages;
@@ -15,10 +15,10 @@ public partial class HomePage
#region SERVICES #region SERVICES
[Inject] public NavigationManager NavigationManager { get; set; } = default!; [Inject] public NavigationManager NavigationManager { get; set; } = default!;
[Inject] public IMediaWebAPIService MediaWebAPIService { get; set; } = default!; [Inject] public IMediaClientService MediaClientService { get; set; } = default!;
[Inject] public IMoviesWebAPIService MoviesWebAPIService { get; set; } = default!; [Inject] public IMoviesClientService MoviesClientService { get; set; } = default!;
[Inject] public ISeriesWebAPIService SeriesWebAPIService { get; set; } = default!; [Inject] public ISeriesClientService SeriesClientService { get; set; } = default!;
[Inject] public IPersonsWebAPIService PersonsWebAPIService { get; set; } = default!; [Inject] public IPersonsClientService PersonsClientService { get; set; } = default!;
#endregion #endregion

View File

@@ -58,9 +58,9 @@
<div class="row mt-3 gx-3"> <div class="row mt-3 gx-3">
<div class="col-auto"> <div class="col-auto">
<PictureEditorPanelComponent Id="@(Id)" <PictureEditorPanelComponent Id="@(Id)"
PictureGetTask="@(async (id, action) => await MediaWebAPIService.GetMediaPoster(id, action))" PictureGetTask="@(async (id, action) => await MediaClientService.GetMediaPoster(id, action))"
PicturePutTask="@(async (id, data, action) => await MediaWebAPIService.PutMediaPoster(id, new MediaPosterRequest(data), action))" PicturePutTask="@(async (id, data, action) => await MediaClientService.PutMediaPoster(id, new MediaPosterRequest(data), action))"
PictureDeleteTask="@(async (id, action) => await MediaWebAPIService.DeleteMediaPoster(id, action))" PictureDeleteTask="@(async (id, action) => await MediaClientService.DeleteMediaPoster(id, action))"
PicturePlaceholder="/assets/media_poster.png" PicturePlaceholder="/assets/media_poster.png"
Class="h-100"/> Class="h-100"/>
</div> </div>

View File

@@ -7,12 +7,12 @@ using WatchIt.Common.Model.Persons;
using WatchIt.Common.Model.Photos; using WatchIt.Common.Model.Photos;
using WatchIt.Common.Model.Series; using WatchIt.Common.Model.Series;
using WatchIt.Website.Layout; using WatchIt.Website.Layout;
using WatchIt.Website.Services.Utility.Authentication; using WatchIt.Website.Services.Authentication;
using WatchIt.Website.Services.WebAPI.Media; using WatchIt.Website.Services.Client.Media;
using WatchIt.Website.Services.WebAPI.Movies; using WatchIt.Website.Services.Client.Movies;
using WatchIt.Website.Services.WebAPI.Persons; using WatchIt.Website.Services.Client.Persons;
using WatchIt.Website.Services.WebAPI.Photos; using WatchIt.Website.Services.Client.Photos;
using WatchIt.Website.Services.WebAPI.Series; using WatchIt.Website.Services.Client.Series;
namespace WatchIt.Website.Pages; namespace WatchIt.Website.Pages;
@@ -22,11 +22,11 @@ public partial class MediaEditPage : ComponentBase
[Inject] public NavigationManager NavigationManager { get; set; } = default!; [Inject] public NavigationManager NavigationManager { get; set; } = default!;
[Inject] public IAuthenticationService AuthenticationService { get; set; } = default!; [Inject] public IAuthenticationService AuthenticationService { get; set; } = default!;
[Inject] public IMediaWebAPIService MediaWebAPIService { get; set; } = default!; [Inject] public IMediaClientService MediaClientService { get; set; } = default!;
[Inject] public IMoviesWebAPIService MoviesWebAPIService { get; set; } = default!; [Inject] public IMoviesClientService MoviesClientService { get; set; } = default!;
[Inject] public ISeriesWebAPIService SeriesWebAPIService { get; set; } = default!; [Inject] public ISeriesClientService SeriesClientService { get; set; } = default!;
[Inject] public IPhotosWebAPIService PhotosWebAPIService { get; set; } = default!; [Inject] public IPhotosClientService PhotosClientService { get; set; } = default!;
[Inject] public IPersonsWebAPIService PersonsWebAPIService { get; set; } = default!; [Inject] public IPersonsClientService PersonsClientService { get; set; } = default!;
#endregion #endregion
@@ -114,7 +114,7 @@ public partial class MediaEditPage : ComponentBase
]); ]);
endTasks.AddRange( 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( endTasks.AddRange(
[ [
MediaWebAPIService.GetMediaPhotoRandomBackground(Id.Value, data => Layout.BackgroundPhoto = data), MediaClientService.GetMediaPhotoRandomBackground(Id.Value, data => Layout.BackgroundPhoto = data),
MediaWebAPIService.GetMediaPoster(Id.Value, data => MediaClientService.GetMediaPoster(Id.Value, data =>
{ {
_mediaPosterSaved = data; _mediaPosterSaved = data;
_mediaPosterRequest = new MediaPosterRequest(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) 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) 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 else
{ {
await SeriesWebAPIService.GetSeries(Id.Value, data => _seriesRequest = new SeriesRequest(data)); await SeriesClientService.GetSeries(Id.Value, data => _seriesRequest = new SeriesRequest(data));
} }
} }
else else
@@ -210,7 +210,7 @@ public partial class MediaEditPage : ComponentBase
} }
_mediaPosterSaving = true; _mediaPosterSaving = true;
await MediaWebAPIService.PutMediaPoster(Id.Value, _mediaPosterRequest, Success); await MediaClientService.PutMediaPoster(Id.Value, _mediaPosterRequest, Success);
} }
private void CancelPoster() private void CancelPoster()
@@ -230,7 +230,7 @@ public partial class MediaEditPage : ComponentBase
} }
_mediaPosterDeleting = true; _mediaPosterDeleting = true;
await MediaWebAPIService.DeleteMediaPoster(Id.Value, Success); await MediaClientService.DeleteMediaPoster(Id.Value, Success);
} }
#endregion #endregion
@@ -259,22 +259,22 @@ public partial class MediaEditPage : ComponentBase
{ {
if (_movieRequest is not null) if (_movieRequest is not null)
{ {
await MoviesWebAPIService.PostMovie(_movieRequest, data => SuccessPost(data.Id), BadRequest); await MoviesClientService.PostMovie(_movieRequest, data => SuccessPost(data.Id), BadRequest);
} }
else else
{ {
await SeriesWebAPIService.PostSeries(_seriesRequest, data => SuccessPost(data.Id), BadRequest); await SeriesClientService.PostSeries(_seriesRequest, data => SuccessPost(data.Id), BadRequest);
} }
} }
else else
{ {
if (_movieRequest is not null) if (_movieRequest is not null)
{ {
await MoviesWebAPIService.PutMovie(Id.Value, _movieRequest, () => _basicDataSaving = false, BadRequest); await MoviesClientService.PutMovie(Id.Value, _movieRequest, () => _basicDataSaving = false, BadRequest);
} }
else 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); _photoDeleting.Add(id);
await PhotosWebAPIService.DeletePhoto(id, async () => await Success()); await PhotosClientService.DeletePhoto(id, async () => await Success());
} }
private void InitEditPhoto(Guid? id) private void InitEditPhoto(Guid? id)
@@ -345,17 +345,17 @@ public partial class MediaEditPage : ComponentBase
if (_photoEditId is null) if (_photoEditId is null)
{ {
_photoEditRequest.Background = _photoEditIsBackground ? _photoEditBackgroundData : null; _photoEditRequest.Background = _photoEditIsBackground ? _photoEditBackgroundData : null;
await MediaWebAPIService.PostMediaPhoto(Id.Value, _photoEditRequest, Success, BadRequest); await MediaClientService.PostMediaPhoto(Id.Value, _photoEditRequest, Success, BadRequest);
} }
else else
{ {
if (_photoEditIsBackground) if (_photoEditIsBackground)
{ {
await PhotosWebAPIService.PutPhotoBackgroundData(_photoEditId.Value, _photoEditBackgroundData, Success, BadRequest); await PhotosClientService.PutPhotoBackgroundData(_photoEditId.Value, _photoEditBackgroundData, Success, BadRequest);
} }
else else
{ {
await PhotosWebAPIService.DeletePhotoBackgroundData(_photoEditId.Value, Success); await PhotosClientService.DeletePhotoBackgroundData(_photoEditId.Value, Success);
} }
} }
} }

View File

@@ -36,7 +36,7 @@ else
Subname="@(_media.OriginalTitle)" Subname="@(_media.OriginalTitle)"
Description="@(_media.Description)" Description="@(_media.Description)"
PosterPlaceholder="/assets/media_poster.png" PosterPlaceholder="/assets/media_poster.png"
GetPosterMethod="@(action => MediaWebAPIService.GetMediaPoster(_media.Id, action))"/> GetPosterMethod="@(action => MediaClientService.GetMediaPoster(_media.Id, action))"/>
</div> </div>
</div> </div>
<div class="row mt-3 gx-3"> <div class="row mt-3 gx-3">

View File

@@ -7,10 +7,10 @@ using WatchIt.Common.Model.Photos;
using WatchIt.Common.Model.Rating; using WatchIt.Common.Model.Rating;
using WatchIt.Common.Model.Series; using WatchIt.Common.Model.Series;
using WatchIt.Website.Layout; using WatchIt.Website.Layout;
using WatchIt.Website.Services.Utility.Authentication; using WatchIt.Website.Services.Authentication;
using WatchIt.Website.Services.WebAPI.Media; using WatchIt.Website.Services.Client.Media;
using WatchIt.Website.Services.WebAPI.Movies; using WatchIt.Website.Services.Client.Movies;
using WatchIt.Website.Services.WebAPI.Series; using WatchIt.Website.Services.Client.Series;
namespace WatchIt.Website.Pages; namespace WatchIt.Website.Pages;
@@ -20,9 +20,9 @@ public partial class MediaPage : ComponentBase
[Inject] public NavigationManager NavigationManager { get; set; } = default!; [Inject] public NavigationManager NavigationManager { get; set; } = default!;
[Inject] public IAuthenticationService AuthenticationService { get; set; } = default!; [Inject] public IAuthenticationService AuthenticationService { get; set; } = default!;
[Inject] public IMediaWebAPIService MediaWebAPIService { get; set; } = default!; [Inject] public IMediaClientService MediaClientService { get; set; } = default!;
[Inject] public IMoviesWebAPIService MoviesWebAPIService { get; set; } = default!; [Inject] public IMoviesClientService MoviesClientService { get; set; } = default!;
[Inject] public ISeriesWebAPIService SeriesWebAPIService { get; set; } = default!; [Inject] public ISeriesClientService SeriesClientService { get; set; } = default!;
#endregion #endregion
@@ -74,7 +74,7 @@ public partial class MediaPage : ComponentBase
// STEP 0 // STEP 0
step1Tasks.AddRange( 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 // STEP 1
@@ -88,11 +88,11 @@ public partial class MediaPage : ComponentBase
endTasks.AddRange( endTasks.AddRange(
[ [
MediaWebAPIService.PostMediaView(Id), MediaClientService.PostMediaView(Id),
MediaWebAPIService.GetMediaPhotoRandomBackground(Id, data => Layout.BackgroundPhoto = data), MediaClientService.GetMediaPhotoRandomBackground(Id, data => Layout.BackgroundPhoto = data),
MediaWebAPIService.GetMediaGenres(Id, data => _genres = data), MediaClientService.GetMediaGenres(Id, data => _genres = data),
MediaWebAPIService.GetMediaRating(Id, data => _globalRating = data), MediaClientService.GetMediaRating(Id, data => _globalRating = data),
_media.Type == MediaType.Movie ? MoviesWebAPIService.GetMovie(Id, data => _movie = data) : SeriesWebAPIService.GetSeries(Id, data => _series = 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( 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) if (_userRating == rating)
{ {
await MediaWebAPIService.DeleteMediaRating(Id); await MediaClientService.DeleteMediaRating(Id);
_userRating = null; _userRating = null;
} }
else else
{ {
await MediaWebAPIService.PutMediaRating(Id, new RatingRequest(rating)); await MediaClientService.PutMediaRating(Id, new RatingRequest(rating));
_userRating = rating; _userRating = rating;
} }
await MediaWebAPIService.GetMediaRating(Id, data => _globalRating = data); await MediaClientService.GetMediaRating(Id, data => _globalRating = data);
} }
#endregion #endregion

View File

@@ -49,9 +49,9 @@
<div class="row mt-3 gx-3"> <div class="row mt-3 gx-3">
<div class="col-auto"> <div class="col-auto">
<PictureEditorPanelComponent Id="@(Id)" <PictureEditorPanelComponent Id="@(Id)"
PictureGetTask="@(async (id, action) => await PersonsWebAPIService.GetPersonPhoto(id, action))" PictureGetTask="@(async (id, action) => await PersonsClientService.GetPersonPhoto(id, action))"
PicturePutTask="@(async (id, data, action) => await PersonsWebAPIService.PutPersonPhoto(id, new PersonPhotoRequest(data), action))" PicturePutTask="@(async (id, data, action) => await PersonsClientService.PutPersonPhoto(id, new PersonPhotoRequest(data), action))"
PictureDeleteTask="@(async (id, action) => await PersonsWebAPIService.DeletePersonPhoto(id, action))" PictureDeleteTask="@(async (id, action) => await PersonsClientService.DeletePersonPhoto(id, action))"
PicturePlaceholder="/assets/person_poster.png" PicturePlaceholder="/assets/person_poster.png"
Class="h-100"/> Class="h-100"/>
</div> </div>

View File

@@ -2,9 +2,9 @@ using Microsoft.AspNetCore.Components;
using WatchIt.Common.Model.Media; using WatchIt.Common.Model.Media;
using WatchIt.Common.Model.Persons; using WatchIt.Common.Model.Persons;
using WatchIt.Website.Layout; using WatchIt.Website.Layout;
using WatchIt.Website.Services.Utility.Authentication; using WatchIt.Website.Services.Authentication;
using WatchIt.Website.Services.WebAPI.Media; using WatchIt.Website.Services.Client.Media;
using WatchIt.Website.Services.WebAPI.Persons; using WatchIt.Website.Services.Client.Persons;
namespace WatchIt.Website.Pages; namespace WatchIt.Website.Pages;
@@ -14,8 +14,8 @@ public partial class PersonEditPage : ComponentBase
[Inject] private NavigationManager NavigationManager { get; set; } = default!; [Inject] private NavigationManager NavigationManager { get; set; } = default!;
[Inject] private IAuthenticationService AuthenticationService { get; set; } = default!; [Inject] private IAuthenticationService AuthenticationService { get; set; } = default!;
[Inject] private IPersonsWebAPIService PersonsWebAPIService { get; set; } = default!; [Inject] private IPersonsClientService PersonsClientService { get; set; } = default!;
[Inject] private IMediaWebAPIService MediaWebAPIService { get; set; } = default!; [Inject] private IMediaClientService MediaClientService { get; set; } = default!;
#endregion #endregion
@@ -66,8 +66,8 @@ public partial class PersonEditPage : ComponentBase
{ {
endTasks.AddRange( endTasks.AddRange(
[ [
PersonsWebAPIService.GetPerson(Id.Value, data => _person = data, () => NavigationManager.NavigateTo("/person/new", true)), PersonsClientService.GetPerson(Id.Value, data => _person = data, () => NavigationManager.NavigateTo("/person/new", true)),
MediaWebAPIService.GetAllMedia(successAction: data => _media = data.ToDictionary(x => x.Id, x => x)), MediaClientService.GetAllMedia(successAction: data => _media = data.ToDictionary(x => x.Id, x => x)),
]); ]);
} }

View File

@@ -26,7 +26,7 @@
Subname="@(_person.FullName)" Subname="@(_person.FullName)"
Description="@(_person.Description)" Description="@(_person.Description)"
PosterPlaceholder="/assets/person_poster.png" PosterPlaceholder="/assets/person_poster.png"
GetPosterMethod="@(action => PersonsWebAPIService.GetPersonPhoto(_person.Id, action))"/> GetPosterMethod="@(action => PersonsClientService.GetPersonPhoto(_person.Id, action))"/>
</div> </div>
</div> </div>
<div class="row mt-default gx-default"> <div class="row mt-default gx-default">

View File

@@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Components;
using WatchIt.Common.Model.Persons; using WatchIt.Common.Model.Persons;
using WatchIt.Website.Components.Pages.PersonPage.Panels; using WatchIt.Website.Components.Pages.PersonPage.Panels;
using WatchIt.Website.Layout; using WatchIt.Website.Layout;
using WatchIt.Website.Services.WebAPI.Persons; using WatchIt.Website.Services.Client.Persons;
namespace WatchIt.Website.Pages; namespace WatchIt.Website.Pages;
@@ -10,7 +10,7 @@ public partial class PersonPage : ComponentBase
{ {
#region SERVICES #region SERVICES
[Inject] private IPersonsWebAPIService PersonsWebAPIService { get; set; } = default!; [Inject] private IPersonsClientService PersonsClientService { get; set; } = default!;
#endregion #endregion
@@ -53,7 +53,7 @@ public partial class PersonPage : ComponentBase
// STEP 0 // STEP 0
step1Tasks.AddRange( step1Tasks.AddRange(
[ [
PersonsWebAPIService.GetPerson(Id, data => _person = data) PersonsClientService.GetPerson(Id, data => _person = data)
]); ]);
// STEP 1 // STEP 1
@@ -62,7 +62,7 @@ public partial class PersonPage : ComponentBase
{ {
endTasks.AddRange( endTasks.AddRange(
[ [
PersonsWebAPIService.PostPersonView(Id), PersonsClientService.PostPersonView(Id),
]); ]);
} }

View File

@@ -28,13 +28,13 @@
AdditionalNameInfoSource="@(item => item.ReleaseDate.HasValue ? $" ({item.ReleaseDate.Value.Year})" : null)" AdditionalNameInfoSource="@(item => item.ReleaseDate.HasValue ? $" ({item.ReleaseDate.Value.Year})" : null)"
RatingSource="@(item => item.Rating)" RatingSource="@(item => item.Rating)"
Query="@(new MovieQueryParameters { Title = DecodedQuery, OrderBy = "rating.count" })" Query="@(new MovieQueryParameters { Title = DecodedQuery, OrderBy = "rating.count" })"
ItemDownloadingTask="@(MoviesWebAPIService.GetAllMovies)" ItemDownloadingTask="@(MoviesClientService.GetAllMovies)"
PictureDownloadingTask="@((id, action) => MediaWebAPIService.GetMediaPoster(id, action))" PictureDownloadingTask="@((id, action) => MediaClientService.GetMediaPoster(id, action))"
PosterPlaceholder="/assets/media_poster.png" PosterPlaceholder="/assets/media_poster.png"
GetGlobalRatingMethod="@((id, action) => MediaWebAPIService.GetMediaRating(id, action))" GetGlobalRatingMethod="@((id, action) => MediaClientService.GetMediaRating(id, action))"
GetUserRatingMethod="@((id, userId, successAction, notfoundAction) => MediaWebAPIService.GetMediaRatingByUser(id, userId, successAction, notfoundAction))" GetUserRatingMethod="@((id, userId, successAction, notfoundAction) => MediaClientService.GetMediaRatingByUser(id, userId, successAction, notfoundAction))"
PutRatingMethod="@((id, request) => MediaWebAPIService.PutMediaRating(id, request))" PutRatingMethod="@((id, request) => MediaClientService.PutMediaRating(id, request))"
DeleteRatingMethod="@(id => MediaWebAPIService.DeleteMediaRating(id))"/> DeleteRatingMethod="@(id => MediaClientService.DeleteMediaRating(id))"/>
<SearchResultPanelComponent TItem="SeriesResponse" <SearchResultPanelComponent TItem="SeriesResponse"
TQuery="SeriesQueryParameters" TQuery="SeriesQueryParameters"
Title="TV series" Title="TV series"
@@ -44,13 +44,13 @@
AdditionalNameInfoSource="@(item => item.ReleaseDate.HasValue ? $" ({item.ReleaseDate.Value.Year})" : null)" AdditionalNameInfoSource="@(item => item.ReleaseDate.HasValue ? $" ({item.ReleaseDate.Value.Year})" : null)"
RatingSource="@(item => item.Rating)" RatingSource="@(item => item.Rating)"
Query="@(new SeriesQueryParameters { Title = DecodedQuery, OrderBy = "rating.count" })" Query="@(new SeriesQueryParameters { Title = DecodedQuery, OrderBy = "rating.count" })"
ItemDownloadingTask="@(SeriesWebAPIService.GetAllSeries)" ItemDownloadingTask="@(SeriesClientService.GetAllSeries)"
PictureDownloadingTask="@((id, action) => MediaWebAPIService.GetMediaPoster(id, action))" PictureDownloadingTask="@((id, action) => MediaClientService.GetMediaPoster(id, action))"
PosterPlaceholder="/assets/media_poster.png" PosterPlaceholder="/assets/media_poster.png"
GetGlobalRatingMethod="@((id, action) => MediaWebAPIService.GetMediaRating(id, action))" GetGlobalRatingMethod="@((id, action) => MediaClientService.GetMediaRating(id, action))"
GetUserRatingMethod="@((id, userId, successAction, notfoundAction) => MediaWebAPIService.GetMediaRatingByUser(id, userId, successAction, notfoundAction))" GetUserRatingMethod="@((id, userId, successAction, notfoundAction) => MediaClientService.GetMediaRatingByUser(id, userId, successAction, notfoundAction))"
PutRatingMethod="@((id, request) => MediaWebAPIService.PutMediaRating(id, request))" PutRatingMethod="@((id, request) => MediaClientService.PutMediaRating(id, request))"
DeleteRatingMethod="@(id => MediaWebAPIService.DeleteMediaRating(id))"/> DeleteRatingMethod="@(id => MediaClientService.DeleteMediaRating(id))"/>
<SearchResultPanelComponent TItem="PersonResponse" <SearchResultPanelComponent TItem="PersonResponse"
TQuery="PersonQueryParameters" TQuery="PersonQueryParameters"
Title="People" Title="People"
@@ -59,8 +59,8 @@
NameSource="@(item => item.Name)" NameSource="@(item => item.Name)"
RatingSource="@(item => item.Rating)" RatingSource="@(item => item.Rating)"
Query="@(new PersonQueryParameters { Name = DecodedQuery, OrderBy = "rating.count" })" Query="@(new PersonQueryParameters { Name = DecodedQuery, OrderBy = "rating.count" })"
ItemDownloadingTask="@(PersonsWebAPIService.GetAllPersons)" ItemDownloadingTask="@(PersonsClientService.GetAllPersons)"
PictureDownloadingTask="@((id, action) => PersonsWebAPIService.GetPersonPhoto(id, action))" PictureDownloadingTask="@((id, action) => PersonsClientService.GetPersonPhoto(id, action))"
PosterPlaceholder="/assets/person_poster.png" PosterPlaceholder="/assets/person_poster.png"
GetGlobalRatingMethod="@((id, action) => PersonsWebAPIService.GetPersonGlobalRating(id, action))"/> GetGlobalRatingMethod="@((id, action) => PersonsClientService.GetPersonGlobalRating(id, action))"/>
</div> </div>

View File

@@ -1,10 +1,10 @@
using System.Net; using System.Net;
using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components;
using WatchIt.Website.Layout; using WatchIt.Website.Layout;
using WatchIt.Website.Services.WebAPI.Media; using WatchIt.Website.Services.Client.Media;
using WatchIt.Website.Services.WebAPI.Movies; using WatchIt.Website.Services.Client.Movies;
using WatchIt.Website.Services.WebAPI.Persons; using WatchIt.Website.Services.Client.Persons;
using WatchIt.Website.Services.WebAPI.Series; using WatchIt.Website.Services.Client.Series;
namespace WatchIt.Website.Pages; namespace WatchIt.Website.Pages;
@@ -12,10 +12,10 @@ public partial class SearchPage : ComponentBase
{ {
#region SERVICES #region SERVICES
[Inject] private IMoviesWebAPIService MoviesWebAPIService { get; set; } = default!; [Inject] private IMoviesClientService MoviesClientService { get; set; } = default!;
[Inject] private ISeriesWebAPIService SeriesWebAPIService { get; set; } = default!; [Inject] private ISeriesClientService SeriesClientService { get; set; } = default!;
[Inject] private IMediaWebAPIService MediaWebAPIService { get; set; } = default!; [Inject] private IMediaClientService MediaClientService { get; set; } = default!;
[Inject] private IPersonsWebAPIService PersonsWebAPIService { get; set; } = default!; [Inject] private IPersonsClientService PersonsClientService { get; set; } = default!;
#endregion #endregion

View File

@@ -0,0 +1 @@
@page "/user/edit"

View File

@@ -0,0 +1,7 @@
using Microsoft.AspNetCore.Components;
namespace WatchIt.Website.Pages;
public partial class UserEditPage : ComponentBase
{
}

View File

@@ -0,0 +1 @@
@page "/user/{id:long}"

Some files were not shown because too many files have changed in this diff Show More