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

some fixes

Browse Source
This commit is contained in:
Mateusz Skoczek
2024-11-03 14:21:30 +01:00
Unverified
parent d9f0e1585c
commit 88e8e330aa
8 changed files with 31 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WatchIt.Website/WatchIt.Website/Components/Common/Panels/HorizontalListPanelComponent.razor
View File

@@ -16,7 +16,7 @@
{
<a class="text-reset text-decoration-none" href="@(string.Format(ItemUrlFormatString, IdSource(_items.ElementAt(i))))">
@{int iCopy = i;}
<HorizontalListItemComponent Place="@(i + 1)"
<HorizontalListItemComponent Place="@(HidePlace ? null : i + 1)"
Name="@(NameSource(_items.ElementAt(iCopy)))"
PosterPlaceholder="@(PosterPlaceholder)"
GetPosterAction="@(action => GetPictureAction(IdSource(_items.ElementAt(iCopy)), action))"/>

1
WatchIt.Website/WatchIt.Website/Components/Common/Panels/HorizontalListPanelComponent.razor.cs
View File

@@ -17,6 +17,7 @@ public partial class HorizontalListPanelComponent<TItem> : ComponentBase
[Parameter] public required Func<TItem, string> NameSource { get; set; }
[Parameter] public required string PosterPlaceholder { get; set; }
[Parameter] public required Func<long, Action<Picture>, Task> GetPictureAction { get; set; }
[Parameter] public bool HidePlace { get; set; }
#endregion

7
WatchIt.Website/WatchIt.Website/Components/Common/Subcomponents/HorizontalListItemComponent.razor
View File

@@ -2,11 +2,16 @@
<PictureComponent Class="w-100" Picture="@(_poster)" Placeholder="@(PosterPlaceholder)" AlternativeText="poster"/>
<div class="container-grid">
<div class="row">
@if (Place.HasValue)
{
<div class="col-auto">
<div class="text-center border border-2 border-light rounded-circle place-circle fw-bold">@(Place)</div>
</div>
}
<div class="col">
<div class="text-end ms-auto pt-05">@(Name)</div>
<div class="d-flex justify-content-@(Place.HasValue ? "end" : "center")">
<div class="pt-05 @(Place.HasValue ? "text-end" : "text-center")">@(Name)</div>
</div>
</div>
</div>
</div>

2
WatchIt.Website/WatchIt.Website/Components/Common/Subcomponents/HorizontalListItemComponent.razor.cs
View File

@@ -7,7 +7,7 @@ public partial class HorizontalListItemComponent : ComponentBase
{
#region PARAMETERS
[Parameter] public required int Place { get; set; }
[Parameter] public int? Place { get; set; }
[Parameter] public required string Name { get; set; }
[Parameter] public required string PosterPlaceholder { get; set; }
[Parameter] public required Func<Action<Picture>, Task> GetPosterAction { get; set; }

1
WatchIt.Website/WatchIt.Website/Layout/MainLayout.razor
View File

@@ -62,6 +62,7 @@
<DropdownToggle Color="Color.Default" Split />
<DropdownMenu>
<DropdownItem Clicked="@(() => NavigationManager.NavigateTo("/user"))">Your profile</DropdownItem>
<DropdownItem Clicked="@(() => NavigationManager.NavigateTo("/user/edit"))">User settings</DropdownItem>
@if (_user.IsAdmin)
{
<DropdownDivider/>

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

@@ -51,7 +51,18 @@
<div class="row">
<div class="col">
<div class="rounded-3 panel panel-regular p-2">
<h3 class="m-0 mx-2 mb-1 p-0">@(_media is not null ? "Edit" : "Create new") @(_movieRequest is not null ? "movie" : "series")@(_media is not null ? $" \"{_media.Title}\"" : string.Empty)</h3>
<div class="m-0 mx-2 mb-1 p-0">
@if (_media is not null)
{
<a class="text-decoration-none text-reset" href="/media/@(_media.Id)">
<h3>Edit @(_movieRequest is not null ? "movie" : "series") "@(_media.Title)"</h3>
</a>
}
else
{
<h3>Create new @(_movieRequest is not null ? "movie" : "series")</h3>
}
</div>
</div>
</div>
</div>

9
WatchIt.Website/WatchIt.Website/Pages/UserPage.razor
View File

@@ -74,7 +74,8 @@
IdSource="@(item => item.Id)"
NameSource="@(item => item.ReleaseDate.HasValue ? $"{item.Title} ({item.ReleaseDate.Value.Year})" : item.Title)"
PosterPlaceholder="/assets/media_poster.png"
GetPictureAction="@((id, action) => MediaClientService.GetMediaPoster(id, action))"/>
GetPictureAction="@((id, action) => MediaClientService.GetMediaPoster(id, action))"
HidePlace="@(true)"/>
<HorizontalListPanelComponent TItem="SeriesRatedResponse"
Title="Recently rated TV series"
Count="6"
@@ -83,7 +84,8 @@
IdSource="@(item => item.Id)"
NameSource="@(item => item.ReleaseDate.HasValue ? $"{item.Title} ({item.ReleaseDate.Value.Year})" : item.Title)"
PosterPlaceholder="/assets/media_poster.png"
GetPictureAction="@((id, action) => MediaClientService.GetMediaPoster(id, action))"/>
GetPictureAction="@((id, action) => MediaClientService.GetMediaPoster(id, action))"
HidePlace="@(true)"/>
<HorizontalListPanelComponent TItem="PersonRatedResponse"
Title="Recently rated people"
Count="6"
@@ -92,7 +94,8 @@
IdSource="@(item => item.Id)"
NameSource="@(item => item.Name)"
PosterPlaceholder="/assets/person_poster.png"
GetPictureAction="@((id, action) => PersonsClientService.GetPersonPhoto(id, action))"/>
GetPictureAction="@((id, action) => PersonsClientService.GetPersonPhoto(id, action))"
HidePlace="@(true)"/>
</div>
</TabPanel>
<TabPanel Name="movies">

50
WatchIt.slnx
View File

@@ -1,50 +0,0 @@
<Solution>
<Folder Name="/WatchIt.Common/">
<Project Path="WatchIt.Common\WatchIt.Common.Model\WatchIt.Common.Model.csproj" Type="Classic C#" />
<Project Path="WatchIt.Common\WatchIt.Common.Query\WatchIt.Common.Query.csproj" Type="Classic C#" />
</Folder>
<Folder Name="/WatchIt.Common/WatchIt.Common.Services/">
<Project Path="WatchIt.Common\WatchIt.Common.Services\WatchIt.Common.Services.HttpClient\WatchIt.Common.Services.HttpClient.csproj" Type="Classic C#" />
</Folder>
<Folder Name="/WatchIt.Database/">
<Project Path="WatchIt.Database\WatchIt.Database\WatchIt.Database.csproj" Type="Classic C#" />
</Folder>
<Folder Name="/WatchIt.Database/WatchIt.Database.Model/">
<Project Path="WatchIt.Database\WatchIt.Database.Model\WatchIt.Database.Model.Configuration\WatchIt.Database.Model.Configuration.csproj" Type="Classic C#" />
<Project Path="WatchIt.Database\WatchIt.Database.Model\WatchIt.Database.Model.Seeding\WatchIt.Database.Model.Seeding.csproj" Type="Classic C#" />
<Project Path="WatchIt.Database\WatchIt.Database.Model\WatchIt.Database.Model\WatchIt.Database.Model.csproj" Type="Classic C#" />
</Folder>
<Folder Name="/WatchIt.WebAPI/">
<Project Path="WatchIt.WebAPI\WatchIt.WebAPI.Controllers\WatchIt.WebAPI.Controllers.csproj" Type="Classic C#" />
<Project Path="WatchIt.WebAPI\WatchIt.WebAPI.Validators\WatchIt.WebAPI.Validators.csproj" Type="Classic C#" />
<Project Path="WatchIt.WebAPI\WatchIt.WebAPI.WorkerServices\WatchIt.WebAPI.WorkerServices.csproj" Type="Classic C#" />
<Project Path="WatchIt.WebAPI\WatchIt.WebAPI\WatchIt.WebAPI.csproj" Type="Classic C#" />
</Folder>
<Folder Name="/WatchIt.WebAPI/WatchIt.WebAPI.Services/" />
<Folder Name="/WatchIt.WebAPI/WatchIt.WebAPI.Services/WatchIt.WebAPI.Services.Controllers/">
<Project Path="WatchIt.WebAPI\WatchIt.WebAPI.Services\WatchIt.WebAPI.Services.Controllers\WatchIt.WebAPI.Services.Controllers.Accounts\WatchIt.WebAPI.Services.Controllers.Accounts.csproj" Type="Classic C#" />
<Project Path="WatchIt.WebAPI\WatchIt.WebAPI.Services\WatchIt.WebAPI.Services.Controllers\WatchIt.WebAPI.Services.Controllers.Common\WatchIt.WebAPI.Services.Controllers.Common.csproj" Type="Classic C#" />
<Project Path="WatchIt.WebAPI\WatchIt.WebAPI.Services\WatchIt.WebAPI.Services.Controllers\WatchIt.WebAPI.Services.Controllers.Genders\WatchIt.WebAPI.Services.Controllers.Genders.csproj" Type="Classic C#" />
<Project Path="WatchIt.WebAPI\WatchIt.WebAPI.Services\WatchIt.WebAPI.Services.Controllers\WatchIt.WebAPI.Services.Controllers.Genres\WatchIt.WebAPI.Services.Controllers.Genres.csproj" Type="Classic C#" />
<Project Path="WatchIt.WebAPI\WatchIt.WebAPI.Services\WatchIt.WebAPI.Services.Controllers\WatchIt.WebAPI.Services.Controllers.Media\WatchIt.WebAPI.Services.Controllers.Media.csproj" Type="Classic C#" />
<Project Path="WatchIt.WebAPI\WatchIt.WebAPI.Services\WatchIt.WebAPI.Services.Controllers\WatchIt.WebAPI.Services.Controllers.Movies\WatchIt.WebAPI.Services.Controllers.Movies.csproj" Type="Classic C#" />
<Project Path="WatchIt.WebAPI\WatchIt.WebAPI.Services\WatchIt.WebAPI.Services.Controllers\WatchIt.WebAPI.Services.Controllers.Persons\WatchIt.WebAPI.Services.Controllers.Persons.csproj" Type="Classic C#" />
<Project Path="WatchIt.WebAPI\WatchIt.WebAPI.Services\WatchIt.WebAPI.Services.Controllers\WatchIt.WebAPI.Services.Controllers.Photos\WatchIt.WebAPI.Services.Controllers.Photos.csproj" Type="Classic C#" />
<Project Path="WatchIt.WebAPI\WatchIt.WebAPI.Services\WatchIt.WebAPI.Services.Controllers\WatchIt.WebAPI.Services.Controllers.Roles\WatchIt.WebAPI.Services.Controllers.Roles.csproj" Type="Classic C#" />
<Project Path="WatchIt.WebAPI\WatchIt.WebAPI.Services\WatchIt.WebAPI.Services.Controllers\WatchIt.WebAPI.Services.Controllers.Series\WatchIt.WebAPI.Services.Controllers.Series.csproj" Type="Classic C#" />
</Folder>
<Folder Name="/WatchIt.WebAPI/WatchIt.WebAPI.Services/WatchIt.WebAPI.Services.Utility/">
<Project Path="WatchIt.WebAPI\WatchIt.WebAPI.Services\WatchIt.WebAPI.Services.Utility\WatchIt.WebAPI.Services.Utility.Configuration\WatchIt.WebAPI.Services.Utility.Configuration.csproj" Type="Classic C#" />
<Project Path="WatchIt.WebAPI\WatchIt.WebAPI.Services\WatchIt.WebAPI.Services.Utility\WatchIt.WebAPI.Services.Utility.Tokens\WatchIt.WebAPI.Services.Utility.Tokens.csproj" Type="Classic C#" />
<Project Path="WatchIt.WebAPI\WatchIt.WebAPI.Services\WatchIt.WebAPI.Services.Utility\WatchIt.WebAPI.Services.Utility.User\WatchIt.WebAPI.Services.Utility.User.csproj" Type="Classic C#" />
</Folder>
<Folder Name="/WatchIt.Website/">
<Project Path="WatchIt.Website\WatchIt.Website\WatchIt.Website.csproj" Type="Classic C#" />
</Folder>
<Folder Name="/WatchIt.Website/WatchIt.Website.Services/">
<Project Path="WatchIt.Website\WatchIt.Website.Services\WatchIt.Website.Services.Authentication\WatchIt.Website.Services.Authentication.csproj" Type="Classic C#" />
<Project Path="WatchIt.Website\WatchIt.Website.Services\WatchIt.Website.Services.Client\WatchIt.Website.Services.Client.csproj" Type="Classic C#" />
<Project Path="WatchIt.Website\WatchIt.Website.Services\WatchIt.Website.Services.Configuration\WatchIt.Website.Services.Configuration.csproj" Type="Classic C#" />
<Project Path="WatchIt.Website\WatchIt.Website.Services\WatchIt.Website.Services.Tokens\WatchIt.Website.Services.Tokens.csproj" Type="Classic C#" />
</Folder>
</Solution>