MateuszSkoczek/WatchIt
1
0
Fork 0
Code Issues Pull Requests Actions Projects Wiki Activity

LoadingComponent improvement, SearchResultComponent added, some fixes

Browse Source
This commit is contained in:
Mateusz Skoczek
2024-09-28 00:18:04 +02:00
Unverified
parent d87f4f9d83
commit 0994edb983
13 changed files with 258 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
WatchIt.WebAPI/WatchIt.WebAPI.Services/WatchIt.WebAPI.Services.Controllers/WatchIt.WebAPI.Services.Controllers.Movies/MoviesControllerService.cs
View File

@@ -38,7 +38,8 @@ public class MoviesControllerService : IMoviesControllerService
public async Task<RequestResult> GetAllMovies(MovieQueryParameters query)
{
IEnumerable<MovieResponse> data = await _database.MediaMovies.Select(x => new MovieResponse(x)).ToListAsync();
IEnumerable<MediaMovie> rawData = await _database.MediaMovies.ToListAsync();
IEnumerable<MovieResponse> data = rawData.Select(x => new MovieResponse(x));
data = query.PrepareData(data);
return RequestResult.Ok(data);
}

3
WatchIt.WebAPI/WatchIt.WebAPI.Services/WatchIt.WebAPI.Services.Controllers/WatchIt.WebAPI.Services.Controllers.Series/SeriesControllerService.cs
View File

@@ -38,7 +38,8 @@ public class SeriesControllerService : ISeriesControllerService
public async Task<RequestResult> GetAllSeries(SeriesQueryParameters query)
{
IEnumerable<SeriesResponse> data = await _database.MediaSeries.Select(x => new SeriesResponse(x)).ToListAsync();
IEnumerable<MediaSeries> rawData = await _database.MediaSeries.ToListAsync();
IEnumerable<SeriesResponse> data = rawData.Select(x => new SeriesResponse(x));
data = query.PrepareData(data);
return RequestResult.Ok(data);
}

6
WatchIt.Website/WatchIt.Website/Components/LoadingComponent.razor
View File

@@ -1,8 +1,8 @@
<div class="d-flex flex-column m-5">
<div class="d-flex flex-column">
<div class="d-flex justify-content-center">
<div id="spinner" class="spinner-border text-dark"></div>
<div id="spinner" class="spinner-border text-@(Color)"></div>
</div>
<div class="d-flex justify-content-center">
<p id="text" class="text-dark">Loading...</p>
<p id="text" class="text-@(Color)" m-0>Loading...</p>
</div>
</div>

12
WatchIt.Website/WatchIt.Website/Components/LoadingComponent.razor.cs Normal file
View File

@@ -0,0 +1,12 @@
using Microsoft.AspNetCore.Components;
namespace WatchIt.Website.Components;
public partial class LoadingComponent : ComponentBase
{
#region PARAMETERS
[Parameter] public string Color { get; set; } = "dark";
#endregion
}

55
WatchIt.Website/WatchIt.Website/Components/SearchPage/SearchResultComponent.razor Normal file
View File

@@ -0,0 +1,55 @@
@typeparam TItem
@using Microsoft.IdentityModel.Tokens
@typeparam TQuery where TQuery : WatchIt.Common.Query.QueryParameters
<div class="rounded-3 panel panel-regular p-4">
<div class="container-fluid p-0 m-0">
<div class="row mb-4">
<div class="col">
<h4 class="m-0"><strong>@(Title)</strong></h4>
</div>
</div>
@if (_loaded)
{
if (!_items.IsNullOrEmpty())
{
for (int i = 0; i < _items.Count; i++)
{
if (i > 0)
{
<div class="row">
<div class="col">
<hr/>
</div>
</div>
}
<div class="row">
<div class="col">
test
</div>
</div>
}
}
else
{
<div class="row">
<div class="col">
<div class="d-flex justify-content-center">
No items found
</div>
</div>
</div>
}
}
else
{
<div class="row">
<div class="col">
<LoadingComponent Color="light"/>
</div>
</div>
}
</div>
</div>

56
WatchIt.Website/WatchIt.Website/Components/SearchPage/SearchResultComponent.razor.cs Normal file
View File

@@ -0,0 +1,56 @@
using Microsoft.AspNetCore.Components;
using WatchIt.Common.Query;
namespace WatchIt.Website.Components.SearchPage;
public partial class SearchResultComponent<TItem, TQuery> : ComponentBase where TQuery : QueryParameters
{
#region PARAMETERS
[Parameter] public required string Title { get; set; }
[Parameter] public required TQuery Query { get; set; }
[Parameter] public Func<TQuery, Action<IEnumerable<TItem>>, Task> DownloadingTask { get; set; }
#endregion
#region FIELDS
private bool _loaded;
private List<TItem> _items = [];
private bool _allItemsLoaded;
#endregion
#region PRIVATE METHODS
protected override async Task OnAfterRenderAsync(bool firstRender)
{
if (firstRender)
{
// INIT
Query.First = 5;
List<Task> endTasks = new List<Task>();
// STEP 0
endTasks.AddRange(
[
DownloadingTask(Query, data => _items.AddRange(data))
]);
// END
await Task.WhenAll(endTasks);
_loaded = true;
StateHasChanged();
}
}
#endregion
}

0
WatchIt.Website/WatchIt.Website/Components/SearchPage/SearchResultComponent.razor.css Normal file
View File

4
WatchIt.Website/WatchIt.Website/Pages/AdminPage.razor
View File

@@ -37,7 +37,9 @@
{
<div class="row">
<div class="col">
<LoadingComponent/>
<div class="m-5">
<LoadingComponent/>
</div>
</div>
</div>
}

5
WatchIt.Website/WatchIt.Website/Pages/HomePage.razor
View File

@@ -1,5 +1,4 @@
@page "/"
@using WatchIt.Common.Model.Movies
<PageTitle>WatchIt</PageTitle>
@@ -98,7 +97,9 @@
{
<div class="row">
<div class="col">
<LoadingComponent/>
<div class="m-5">
<LoadingComponent/>
</div>
</div>
</div>
}

4
WatchIt.Website/WatchIt.Website/Pages/MediaEditPage.razor
View File

@@ -382,7 +382,9 @@
{
<div class="row">
<div class="col">
<LoadingComponent/>
<div class="m-5">
<LoadingComponent/>
</div>
</div>
</div>
}

4
WatchIt.Website/WatchIt.Website/Pages/MediaPage.razor
View File

@@ -204,7 +204,9 @@ else
{
<div class="row">
<div class="col">
<LoadingComponent/>
<div class="m-5">
<LoadingComponent/>
</div>
</div>
</div>
}

66
WatchIt.Website/WatchIt.Website/Pages/SearchPage.razor
View File

@@ -1,5 +1,67 @@
@page "/search"
@using WatchIt.Common.Model.Movies
@using WatchIt.Common.Model.Series
@using WatchIt.Common.Query
@using WatchIt.Website.Components.SearchPage
@using WatchIt.Website.Services.WebAPI.Movies
@layout MainLayout
@page "/search/{query}"
<PageTitle>WatchIt - Searching "@(Query)"</PageTitle>
<h3>SearchPage</h3>
<div class="container-fluid">
@if (_loaded)
{
if (string.IsNullOrWhiteSpace(_error))
{
<div class="row">
<div class="col">
<div class="rounded-3 panel panel-regular p-3">
<div class="d-flex justify-content-center">
<h3 class="m-0">
<strong>Search results for phrase:</strong> "@(DecodedQuery)"
</h3>
</div>
</div>
</div>
</div>
<div class="row mt-3">
<div class="col">
<SearchResultComponent TItem="MovieResponse"
TQuery="MovieQueryParameters"
Title="Movies"
Query="@(new MovieQueryParameters { Title = DecodedQuery })"
DownloadingTask="MoviesWebAPIService.GetAllMovies"/>
</div>
</div>
<div class="row mt-3">
<div class="col">
<SearchResultComponent TItem="SeriesResponse"
TQuery="SeriesQueryParameters"
Title="TV series"
Query="@(new SeriesQueryParameters { Title = DecodedQuery })"
DownloadingTask="SeriesWebAPIService.GetAllSeries"/>
</div>
</div>
}
else
{
<div class="row">
<div class="col">
<ErrorComponent ErrorMessage="@(_error)"/>
</div>
</div>
}
}
else
{
<div class="row">
<div class="col">
<LoadingComponent/>
</div>
</div>
}
</div>

52
WatchIt.Website/WatchIt.Website/Pages/SearchPage.razor.cs
View File

@@ -1,7 +1,59 @@
using System.Net;
using Microsoft.AspNetCore.Components;
using WatchIt.Website.Layout;
using WatchIt.Website.Services.WebAPI.Movies;
using WatchIt.Website.Services.WebAPI.Series;
namespace WatchIt.Website.Pages;
public partial class SearchPage : ComponentBase
{
#region SERVICES
[Inject] private IMoviesWebAPIService MoviesWebAPIService { get; set; } = default!;
[Inject] private ISeriesWebAPIService SeriesWebAPIService { get; set; } = default!;
#endregion
#region FIELDS
private bool _loaded;
private string? _error;
#endregion
#region PARAMETERS
[Parameter] public string Query { get; set; }
[CascadingParameter] public MainLayout Layout { get; set; }
#endregion
#region PROPERTIES
public string DecodedQuery => WebUtility.UrlDecode(Query);
#endregion
#region PRIVATE METHODS
protected override async Task OnAfterRenderAsync(bool firstRender)
{
if (firstRender)
{
_loaded = true;
StateHasChanged();
}
}
#endregion
}