Compare commits
15 Commits
45b8a168a1
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
38af6174fa | ||
|
|
2fe20c804a | ||
|
|
3c83a83396 | ||
|
|
14fcd7dff9 | ||
|
|
ecb12a7d4a | ||
|
|
2cd80c8082 | ||
|
|
78808ea525 | ||
|
|
d6da8460cc | ||
|
|
362762a813 | ||
|
|
7c05940dbf | ||
|
|
b3f19045fa | ||
|
|
b1febfc9dc | ||
|
|
0f2755281e | ||
|
|
d17ed30175 | ||
|
|
0f9dd1a8d8 |
@@ -28,13 +28,13 @@ public class YandexSearchController : ControllerBase
|
|||||||
|
|
||||||
[HttpGet("search")]
|
[HttpGet("search")]
|
||||||
public async Task<ActionResult<ApiResponse<YandexSearchResult>>> SearchQuery(
|
public async Task<ActionResult<ApiResponse<YandexSearchResult>>> SearchQuery(
|
||||||
[FromQuery] string query,
|
[FromQuery] string query = "",
|
||||||
[FromQuery] int limit = 20,
|
[FromQuery] int limit = 40,
|
||||||
[FromQuery] TrackSearchType searchType = TrackSearchType.All,
|
[FromQuery] TrackSearchType searchType = TrackSearchType.All,
|
||||||
[FromQuery] bool byId = false,
|
[FromQuery] bool byId = false,
|
||||||
[FromQuery] string? shared_id = null)
|
[FromQuery] string? shared_id = null)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrWhiteSpace(query))
|
if (string.IsNullOrWhiteSpace(query) && searchType != TrackSearchType.MyPlaylists)
|
||||||
return BadRequest(ApiResponse<YandexSearchResult>.Fail(new ErrorResponse
|
return BadRequest(ApiResponse<YandexSearchResult>.Fail(new ErrorResponse
|
||||||
{
|
{
|
||||||
StatusCode = 400,
|
StatusCode = 400,
|
||||||
@@ -46,6 +46,8 @@ public class YandexSearchController : ControllerBase
|
|||||||
if (userId.HasValue)
|
if (userId.HasValue)
|
||||||
user = await _userManager.FindByIdAsync(userId.Value.ToString());
|
user = await _userManager.FindByIdAsync(userId.Value.ToString());
|
||||||
|
|
||||||
|
var byShareId = false;
|
||||||
|
|
||||||
// Если нет пользователя или у него нет токена, пробуем через shared_id
|
// Если нет пользователя или у него нет токена, пробуем через shared_id
|
||||||
if (user == null || string.IsNullOrEmpty(user.YandexAccessToken))
|
if (user == null || string.IsNullOrEmpty(user.YandexAccessToken))
|
||||||
{
|
{
|
||||||
@@ -61,6 +63,8 @@ public class YandexSearchController : ControllerBase
|
|||||||
var owner = await _userManager.FindByIdAsync(playlist.CreatorUserId.ToString());
|
var owner = await _userManager.FindByIdAsync(playlist.CreatorUserId.ToString());
|
||||||
if (owner == null) return StatusCode(500, "Не удалось найти владельца плейлиста.");
|
if (owner == null) return StatusCode(500, "Не удалось найти владельца плейлиста.");
|
||||||
user = owner;
|
user = owner;
|
||||||
|
|
||||||
|
byShareId = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (string.IsNullOrEmpty(user.YandexAccessToken))
|
if (string.IsNullOrEmpty(user.YandexAccessToken))
|
||||||
@@ -74,7 +78,16 @@ public class YandexSearchController : ControllerBase
|
|||||||
|
|
||||||
if (byId)
|
if (byId)
|
||||||
{
|
{
|
||||||
results = await _yandexService.SearchTracksByIdAsync(user, query, searchType, limit);
|
results = await _yandexService.SearchTracksByIdAsync(user, query, searchType);
|
||||||
|
}
|
||||||
|
else if (searchType == TrackSearchType.MyPlaylists)
|
||||||
|
{
|
||||||
|
if (byShareId)
|
||||||
|
{
|
||||||
|
return Unauthorized("Необходимо подключение профиля к яндекс музыке.");
|
||||||
|
}
|
||||||
|
|
||||||
|
results = await _yandexService.SearchMyPlaylists(user);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -10,24 +10,24 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.6" />
|
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.7" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.6" />
|
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.7" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="10.0.6" />
|
<PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="10.0.7" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.6" />
|
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.7" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="10.0.6" />
|
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="10.0.7" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.6" />
|
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.7" />
|
||||||
<PackageReference Include="AspNet.Security.OAuth.Yandex" Version="10.0.0" />
|
<PackageReference Include="AspNet.Security.OAuth.Yandex" Version="10.0.0" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.6">
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.7">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.6" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.7" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="10.0.6" />
|
<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="10.0.7" />
|
||||||
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0" />
|
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0" />
|
||||||
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.7" />
|
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.7" />
|
||||||
<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="10.1.7" />
|
<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="10.1.7" />
|
||||||
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="10.1.7" />
|
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="10.1.7" />
|
||||||
<PackageReference Include="YandexMusic" Version="0.0.15" />
|
<PackageReference Include="YandexMusic" Version="0.0.16" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -161,11 +161,56 @@ public class YandexMusicService
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async Task<YandexSearchResult> SearchMyPlaylists(ApplicationUser user)
|
||||||
|
{
|
||||||
|
YandexSearchResult result = new();
|
||||||
|
|
||||||
|
await AuthorizeIfNot(user);
|
||||||
|
|
||||||
|
|
||||||
|
var favoritesPlaylist = await Api.Playlist.FavoritesAsync();
|
||||||
|
result.Playlists = favoritesPlaylist?.Select(t => new YandexPlaylist
|
||||||
|
{
|
||||||
|
Uuid = t.PlaylistUuid,
|
||||||
|
Kind = t.Kind,
|
||||||
|
OwnerUid = t.Owner?.Uid ?? string.Empty,
|
||||||
|
Title = t.Title,
|
||||||
|
Description = t.Description,
|
||||||
|
CoverUrl = t.Cover.GetUrl(),
|
||||||
|
TrackCount = t.TrackCount,
|
||||||
|
}).ToList();
|
||||||
|
|
||||||
|
var personalPlaylists = await Api.Playlist.GetPersonalPlaylistsAsync();
|
||||||
|
result.PersonalPlaylists = personalPlaylists?.Select(t => new YandexPlaylist
|
||||||
|
{
|
||||||
|
Uuid = t.PlaylistUuid,
|
||||||
|
Kind = t.Kind,
|
||||||
|
OwnerUid = t.Owner?.Uid ?? string.Empty,
|
||||||
|
Title = t.Title,
|
||||||
|
Description = t.Description,
|
||||||
|
CoverUrl = t.Cover.GetUrl(),
|
||||||
|
TrackCount = t.TrackCount,
|
||||||
|
}).ToList();
|
||||||
|
|
||||||
|
var likedPlaylists = (await Api.Library.GetLikedPlaylistsAsync())?.Select(t => t.Playlist).ToList();
|
||||||
|
result.LikedPlaylists = likedPlaylists?.Select(t => new YandexPlaylist
|
||||||
|
{
|
||||||
|
Uuid = t.PlaylistUuid,
|
||||||
|
Kind = t.Kind,
|
||||||
|
OwnerUid = t.Owner?.Uid ?? string.Empty,
|
||||||
|
Title = t.Title,
|
||||||
|
Description = t.Description,
|
||||||
|
CoverUrl = t.Cover.GetUrl(),
|
||||||
|
TrackCount = t.TrackCount,
|
||||||
|
}).ToList();
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
public async Task<YandexSearchResult> SearchTracksByIdAsync(
|
public async Task<YandexSearchResult> SearchTracksByIdAsync(
|
||||||
ApplicationUser user,
|
ApplicationUser user,
|
||||||
string id,
|
string id,
|
||||||
TrackSearchType searchType,
|
TrackSearchType searchType
|
||||||
int limit = 20
|
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
YandexSearchResult result = new();
|
YandexSearchResult result = new();
|
||||||
@@ -254,8 +299,8 @@ public class YandexMusicService
|
|||||||
TrackCount = p.TrackCount,
|
TrackCount = p.TrackCount,
|
||||||
}).ToList();
|
}).ToList();
|
||||||
|
|
||||||
|
var allTraks = await artist.Artist.GetAllTracksAsync();
|
||||||
result.Tracks = artist.PopularTracks.Select(t => new YandexTrack
|
result.Tracks = allTraks?.Select(t => new YandexTrack
|
||||||
{
|
{
|
||||||
TrackId = t.Id,
|
TrackId = t.Id,
|
||||||
Title = t.Title,
|
Title = t.Title,
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
<p role="alert">You are not authorized to access this resource.</p>
|
<p role="alert">У вас нет прав доступа к этому ресурсу.</p>
|
||||||
}
|
}
|
||||||
</NotAuthorized>
|
</NotAuthorized>
|
||||||
</AuthorizeRouteView>
|
</AuthorizeRouteView>
|
||||||
|
|||||||
45
PlaylistShared.Pwa/Components/Common/ShareDialog.razor
Normal file
45
PlaylistShared.Pwa/Components/Common/ShareDialog.razor
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
@inject IJSRuntime JS
|
||||||
|
@inject ISnackbar Snackbar
|
||||||
|
|
||||||
|
<MudDialog>
|
||||||
|
<TitleContent>
|
||||||
|
<MudText Typo="Typo.h6">Поделиться плейлистом</MudText>
|
||||||
|
</TitleContent>
|
||||||
|
<DialogContent>
|
||||||
|
<MudStack Spacing="2">
|
||||||
|
<MudText>Скопируйте ссылку и отправьте её друзьям:</MudText>
|
||||||
|
<MudTextField @bind-Value="ShareUrl"
|
||||||
|
Variant="Variant.Outlined"
|
||||||
|
ReadOnly="true"
|
||||||
|
Margin="Margin.Dense"
|
||||||
|
Class="mt-2" />
|
||||||
|
</MudStack>
|
||||||
|
</DialogContent>
|
||||||
|
<DialogActions>
|
||||||
|
<MudButton Variant="Variant.Filled" Color="Color.Primary"
|
||||||
|
OnClick="CopyToClipboard">
|
||||||
|
Скопировать ссылку
|
||||||
|
</MudButton>
|
||||||
|
<MudButton Variant="Variant.Text" Color="Color.Default"
|
||||||
|
OnClick="Close">
|
||||||
|
Закрыть
|
||||||
|
</MudButton>
|
||||||
|
</DialogActions>
|
||||||
|
</MudDialog>
|
||||||
|
|
||||||
|
@code {
|
||||||
|
[CascadingParameter]
|
||||||
|
private IMudDialogInstance MudDialog { get; set; } = default!;
|
||||||
|
|
||||||
|
[Parameter]
|
||||||
|
public string ShareUrl { get; set; } = string.Empty;
|
||||||
|
|
||||||
|
private async Task CopyToClipboard()
|
||||||
|
{
|
||||||
|
await JS.InvokeVoidAsync("navigator.clipboard.writeText", ShareUrl);
|
||||||
|
Snackbar.Add("Ссылка скопирована в буфер обмена!", Severity.Success);
|
||||||
|
MudDialog.Close(DialogResult.Ok(true));
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Close() => MudDialog.Cancel();
|
||||||
|
}
|
||||||
@@ -6,22 +6,23 @@
|
|||||||
@inject AuthenticationStateProvider AuthProvider
|
@inject AuthenticationStateProvider AuthProvider
|
||||||
@inject ISnackbar Snackbar
|
@inject ISnackbar Snackbar
|
||||||
@inject HttpClient Http
|
@inject HttpClient Http
|
||||||
|
@implements IDisposable
|
||||||
|
@implements IAsyncDisposable
|
||||||
|
|
||||||
<MudPaper Class="pa-2 rounded" Elevation="0" Width="100%" Style="background-color: rgba(0,0,0,0.05);">
|
<MudStack Spacing="1" Row AlignItems="AlignItems.Center" Wrap="Wrap.NoWrap">
|
||||||
<MudStack Row AlignItems="AlignItems.Center" Wrap="Wrap.Wrap">
|
|
||||||
<!-- Кнопки управления -->
|
<!-- Кнопки управления -->
|
||||||
<MudItem @onmouseenter="() => { _isPlayHovered = true; }"
|
<MudItem @onmouseenter="() => { _isPlayHovered = true; }"
|
||||||
@onmouseleave="() => { _isPlayHovered = false; }"
|
@onmouseleave="() => { _isPlayHovered = false; }"
|
||||||
Class="relative d-inline-block rounded-sm overflow-hidden"
|
Class="relative d-inline-block rounded overflow-hidden cursor-pointer"
|
||||||
style="cursor: pointer; width: 50px; height: 50px;">
|
Style="width: 50px; height: 50px;">
|
||||||
|
|
||||||
@if (!string.IsNullOrEmpty(AudioPlayerService.CurrentTrack?.CoverUri))
|
@if (!string.IsNullOrEmpty(AudioPlayerService.CurrentTrack?.CoverUri))
|
||||||
{
|
{
|
||||||
<MudImage Src="@AudioPlayerService.CurrentTrack.CoverUri.FormatCoverUrl(50, 50)" Height="50" Width="50" Class="rounded d-block" />
|
<MudImage Src="@AudioPlayerService.CurrentTrack.CoverUri.FormatCoverUrl(50, 50)" Height="50" Width="50" Class="rounded d-block" />
|
||||||
}
|
}
|
||||||
|
|
||||||
<MudItem class="absolute d-flex align-center justify-center rounded"
|
<MudItem Class="absolute d-flex align-center justify-center rounded"
|
||||||
style="top: 0; left: 0; right: 0; bottom: 0; background: transparent;">
|
Style="top: 0; left: 0; right: 0; bottom: 0; background: transparent;">
|
||||||
<MudToggleIconButton Toggled="@AudioPlayerService.IsPlaying"
|
<MudToggleIconButton Toggled="@AudioPlayerService.IsPlaying"
|
||||||
Icon="@Icons.Material.Filled.PlayArrow"
|
Icon="@Icons.Material.Filled.PlayArrow"
|
||||||
Color="@Color.Primary"
|
Color="@Color.Primary"
|
||||||
@@ -35,7 +36,7 @@
|
|||||||
<!-- Название и прогресс -->
|
<!-- Название и прогресс -->
|
||||||
@if (AudioPlayerService.CurrentTrack != null)
|
@if (AudioPlayerService.CurrentTrack != null)
|
||||||
{
|
{
|
||||||
<MudStack AlignItems="AlignItems.Stretch" Class="d-flex flex-grow-1 relative overflow-hidden align-center rounded-sm" Style="height: 50px;">
|
<MudStack Spacing="0" AlignItems="AlignItems.Stretch" Class="d-flex flex-grow-1 relative overflow-hidden align-center rounded" Style="height: 50px;">
|
||||||
<MudItem Class="absolute" style="top: 0; left: 0; right: 0; bottom: 0; z-index: 1;">
|
<MudItem Class="absolute" style="top: 0; left: 0; right: 0; bottom: 0; z-index: 1;">
|
||||||
<TrackProgress Value="@AudioPlayerService.CurrentTime"
|
<TrackProgress Value="@AudioPlayerService.CurrentTime"
|
||||||
Min="0" Max="@AudioPlayerService.TotalTime"
|
Min="0" Max="@AudioPlayerService.TotalTime"
|
||||||
@@ -48,21 +49,21 @@
|
|||||||
Buffer
|
Buffer
|
||||||
ValueChanged="SeekTo" />
|
ValueChanged="SeekTo" />
|
||||||
</MudItem>
|
</MudItem>
|
||||||
<MudStack Row AlignItems="AlignItems.Center" Class="px-3 relative pointer-events-none" Style="z-index: 2; width: 100%; height: 100%;">
|
<MudStack Spacing="0" Row AlignItems="AlignItems.Center" Class="px-3 relative pointer-events-none" Style="z-index: 2; width: 100%; height: 100%;">
|
||||||
<MudStack AlignItems="AlignItems.Start" Spacing="0">
|
<MudStack AlignItems="AlignItems.Start" Spacing="0" Style="min-width: 0; width: 100%;">
|
||||||
<MudText Typo="Typo.body2" Color="Color.Default" Style="font-weight: 600;">
|
<MudText Typo="Typo.body2" Inline Color="Color.Default" Style="font-weight: 600; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; max-width: 100%;">
|
||||||
@AudioPlayerService.CurrentTrack.Title
|
@AudioPlayerService.CurrentTrack.Title
|
||||||
</MudText>
|
</MudText>
|
||||||
|
|
||||||
<MudText Typo="Typo.body2" Style="font-weight: 600;">
|
<MudText Typo="Typo.body2" Inline Color="Color.Default" Style="font-weight: 600; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; max-width: 100%;">
|
||||||
@string.Join(", ", AudioPlayerService.CurrentTrack.Artists.Select(a => a.Name))
|
@string.Join(", ", AudioPlayerService.CurrentTrack.Artists.Select(a => a.Name))
|
||||||
</MudText>
|
</MudText>
|
||||||
</MudStack>
|
</MudStack>
|
||||||
|
|
||||||
<MudSpacer />
|
<MudSpacer />
|
||||||
|
|
||||||
<MudText Typo="Typo.body2" Style="font-family: monospace; font-weight: 600;">
|
<MudText Typo="Typo.body2">
|
||||||
@AudioPlayerService.CurrentTimeString / @AudioPlayerService.TotalTimeString
|
@AudioPlayerService.CurrentTimeString
|
||||||
</MudText>
|
</MudText>
|
||||||
</MudStack>
|
</MudStack>
|
||||||
</MudStack>
|
</MudStack>
|
||||||
@@ -72,6 +73,7 @@
|
|||||||
<MudSpacer />
|
<MudSpacer />
|
||||||
}
|
}
|
||||||
|
|
||||||
|
<MudHidden Breakpoint="Breakpoint.SmAndDown">
|
||||||
<!-- Громкость -->
|
<!-- Громкость -->
|
||||||
<MudItem @onmouseenter="() => _volumeIsOpen = true"
|
<MudItem @onmouseenter="() => _volumeIsOpen = true"
|
||||||
@onmouseleave="() => _volumeIsOpen = false"
|
@onmouseleave="() => _volumeIsOpen = false"
|
||||||
@@ -93,8 +95,8 @@
|
|||||||
|
|
||||||
</MudPopover>
|
</MudPopover>
|
||||||
</MudItem>
|
</MudItem>
|
||||||
|
</MudHidden>
|
||||||
</MudStack>
|
</MudStack>
|
||||||
</MudPaper>
|
|
||||||
|
|
||||||
<audio id="@_audioId" style="display: none;"></audio>
|
<audio id="@_audioId" style="display: none;"></audio>
|
||||||
|
|
||||||
@@ -123,6 +125,11 @@
|
|||||||
AudioPlayerService.OnStateChanged += OnServiceStateChanged;
|
AudioPlayerService.OnStateChanged += OnServiceStateChanged;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected override void OnParametersSet()
|
||||||
|
{
|
||||||
|
StateHasChanged();
|
||||||
|
}
|
||||||
|
|
||||||
protected override async Task OnAfterRenderAsync(bool firstRender)
|
protected override async Task OnAfterRenderAsync(bool firstRender)
|
||||||
{
|
{
|
||||||
if (firstRender)
|
if (firstRender)
|
||||||
@@ -286,6 +293,13 @@
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
AudioPlayerService.OnLoadAndPlayRequested -= OnServiceLoadAndPlay;
|
||||||
|
AudioPlayerService.OnPlayRequested -= OnServicePlay;
|
||||||
|
AudioPlayerService.OnPauseRequested -= OnServicePause;
|
||||||
|
AudioPlayerService.OnSeekRequested -= OnServiceSeek;
|
||||||
|
AudioPlayerService.OnVolumeChangeRequested -= OnServiceVolumeChange;
|
||||||
|
AudioPlayerService.OnStateChanged -= OnServiceStateChanged;
|
||||||
|
|
||||||
if (_audioElement != null)
|
if (_audioElement != null)
|
||||||
await _audioElement.DisposeAsync();
|
await _audioElement.DisposeAsync();
|
||||||
if (_audioModule != null)
|
if (_audioModule != null)
|
||||||
@@ -293,4 +307,9 @@
|
|||||||
}
|
}
|
||||||
catch { }
|
catch { }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void Dispose()
|
||||||
|
{
|
||||||
|
DisposeAsync().AsTask().Wait();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
30
PlaylistShared.Pwa/Components/Global/ContextualBarContent.cs
Normal file
30
PlaylistShared.Pwa/Components/Global/ContextualBarContent.cs
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
using Microsoft.AspNetCore.Components;
|
||||||
|
using PlaylistShared.Pwa.Services;
|
||||||
|
|
||||||
|
namespace PlaylistShared.Pwa.Components.Global;
|
||||||
|
|
||||||
|
public class ContextualBarContent : ComponentBase, IDisposable
|
||||||
|
{
|
||||||
|
[Inject]
|
||||||
|
public ContextualActionBarService ContextualActionBarService { get; set; } = default!;
|
||||||
|
|
||||||
|
[Parameter]
|
||||||
|
public ContextualActionBarPosition Position { get; set; } = ContextualActionBarPosition.Default;
|
||||||
|
|
||||||
|
[Parameter]
|
||||||
|
public RenderFragment? ChildContent { get; set; }
|
||||||
|
|
||||||
|
protected override void OnParametersSet()
|
||||||
|
{
|
||||||
|
ContextualActionBarService.Content = ChildContent;
|
||||||
|
ContextualActionBarService.Position = Position;
|
||||||
|
ContextualActionBarService.ChangeParameters();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Dispose()
|
||||||
|
{
|
||||||
|
ContextualActionBarService.Content = null;
|
||||||
|
ContextualActionBarService.Position = ContextualActionBarPosition.Default;
|
||||||
|
ContextualActionBarService.ChangeParameters();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -82,7 +82,6 @@
|
|||||||
width: 100%;
|
width: 100%;
|
||||||
height: var(--track-height);
|
height: var(--track-height);
|
||||||
background-color: var(--mud-palette-action-disabled-background, rgba(0,0,0,0.1));
|
background-color: var(--mud-palette-action-disabled-background, rgba(0,0,0,0.1));
|
||||||
border-radius: 4px;
|
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,165 +0,0 @@
|
|||||||
@using PlaylistShared.Pwa.Components.Common
|
|
||||||
@using PlaylistShared.Shared.Enums
|
|
||||||
@using System.Security.Claims
|
|
||||||
@using PlaylistShared.Shared.SharedPlaylist
|
|
||||||
@inject HttpClient Http
|
|
||||||
@inject NavigationManager Navigation
|
|
||||||
@inject AuthenticationStateProvider AuthProvider
|
|
||||||
@inject ISnackbar Snackbar
|
|
||||||
@inject IDialogService DialogService
|
|
||||||
|
|
||||||
<MudStack Row AlignItems="AlignItems.Center" Spacing="2">
|
|
||||||
@if (!string.IsNullOrEmpty(Playlist?.CoverUrl))
|
|
||||||
{
|
|
||||||
<MudImage Src="@Playlist.CoverUrl.FormatCoverUrl(60, 60)" Height="60" Width="60" Class="rounded shadow-sm" />
|
|
||||||
}
|
|
||||||
|
|
||||||
<MudStack Spacing="0" Class="flex-grow-1">
|
|
||||||
<MudLink Href="@($"https://music.yandex.ru/playlists/{Playlist?.YandexPlaylistUuid}")"
|
|
||||||
Typo="Typo.h6" Target="_blank" Underline="Underline.Hover" Class="d-flex align-center">
|
|
||||||
@Playlist?.Title
|
|
||||||
<MudIcon Icon="@Icons.Material.Filled.OpenInNew" Size="Size.Small" Class="ml-1" />
|
|
||||||
</MudLink>
|
|
||||||
</MudStack>
|
|
||||||
|
|
||||||
<MudStack Row AlignItems="AlignItems.Center" Spacing="0">
|
|
||||||
@* ПК ВЕРСИЯ: Показываем все кнопки *@
|
|
||||||
<MudHidden Breakpoint="Breakpoint.MdAndUp" Invert>
|
|
||||||
<MudIconButton Icon="@(_isFavorite? Icons.Material.Filled.Star : Icons.Material.Outlined.StarBorder)"
|
|
||||||
Color="Color.Warning" OnClick="ToggleFavorite" Disabled="_favoriteLoading" Size="Size.Medium" />
|
|
||||||
<ShareButton />
|
|
||||||
@if (_isCreator && _isAuthenticated)
|
|
||||||
{
|
|
||||||
<MudIconButton Icon="@Icons.Material.Filled.Settings" OnClick="OpenPermissionsDialog" Size="Size.Medium" />
|
|
||||||
}
|
|
||||||
</MudHidden>
|
|
||||||
|
|
||||||
@* МОБИЛЬНАЯ ВЕРСИЯ: Уводим в многоточие *@
|
|
||||||
<MudHidden Breakpoint="Breakpoint.SmAndDown" Invert>
|
|
||||||
<MudMenu Icon="@Icons.Material.Filled.MoreVert" AnchorOrigin="Origin.BottomRight" TransformOrigin="Origin.TopRight">
|
|
||||||
<MudMenuItem>
|
|
||||||
<MudIconButton Icon="@(_isFavorite? Icons.Material.Filled.Star : Icons.Material.Outlined.StarBorder)"
|
|
||||||
Color="Color.Warning" OnClick="ToggleFavorite" Disabled="_favoriteLoading" Size="Size.Medium" />
|
|
||||||
</MudMenuItem>
|
|
||||||
<MudMenuItem>
|
|
||||||
<ShareButton />
|
|
||||||
</MudMenuItem>
|
|
||||||
@if (_isCreator && _isAuthenticated)
|
|
||||||
{
|
|
||||||
<MudMenuItem Icon="@Icons.Material.Filled.Settings" OnClick="OpenPermissionsDialog">
|
|
||||||
</MudMenuItem>
|
|
||||||
}
|
|
||||||
</MudMenu>
|
|
||||||
</MudHidden>
|
|
||||||
</MudStack>
|
|
||||||
</MudStack>
|
|
||||||
|
|
||||||
|
|
||||||
@code {
|
|
||||||
[Parameter] public SharedPlaylistDto? Playlist { get; set; }
|
|
||||||
[Parameter] public EventCallback OnPermissionsChanged { get; set; }
|
|
||||||
|
|
||||||
private bool _isAuthenticated;
|
|
||||||
private bool _isCreator;
|
|
||||||
private string? _currentUserId;
|
|
||||||
private bool _isFavorite;
|
|
||||||
private bool _favoriteLoading;
|
|
||||||
|
|
||||||
protected override async Task OnInitializedAsync()
|
|
||||||
{
|
|
||||||
var authState = await AuthProvider.GetAuthenticationStateAsync();
|
|
||||||
_isAuthenticated = authState.User.Identity?.IsAuthenticated == true;
|
|
||||||
_currentUserId = authState.User.FindFirst(ClaimTypes.NameIdentifier)?.Value;
|
|
||||||
_isCreator = Playlist?.CreatorUserId.ToString() == _currentUserId;
|
|
||||||
if (_isAuthenticated)
|
|
||||||
{
|
|
||||||
await CheckFavoriteStatus();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task CheckFavoriteStatus()
|
|
||||||
{
|
|
||||||
if (Playlist == null) return;
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var response = await Http.GetFromJsonAsync<ApiResponse<bool>>($"/api/favorites/{Playlist.ShareToken}/check");
|
|
||||||
if (response?.Success == true)
|
|
||||||
_isFavorite = response.Data;
|
|
||||||
}
|
|
||||||
catch { }
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task ToggleFavorite()
|
|
||||||
{
|
|
||||||
if (Playlist == null) return;
|
|
||||||
|
|
||||||
if (!_isAuthenticated)
|
|
||||||
{
|
|
||||||
Snackbar.Add("Добавление в избранное только авторизованным пользователям", Severity.Warning);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
_favoriteLoading = true;
|
|
||||||
try
|
|
||||||
{
|
|
||||||
if (_isFavorite)
|
|
||||||
{
|
|
||||||
var response = await Http.DeleteAsync($"/api/favorites/{Playlist.ShareToken}");
|
|
||||||
if (response.IsSuccessStatusCode)
|
|
||||||
{
|
|
||||||
_isFavorite = false;
|
|
||||||
Snackbar.Add("Плейлист удалён из избранного", Severity.Success);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
Snackbar.Add("Ошибка удаления из избранного", Severity.Error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
var response = await Http.PostAsync($"/api/favorites/{Playlist.ShareToken}", null);
|
|
||||||
if (response.IsSuccessStatusCode)
|
|
||||||
{
|
|
||||||
_isFavorite = true;
|
|
||||||
Snackbar.Add("Плейлист добавлен в избранное", Severity.Success);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
Snackbar.Add("Ошибка добавления в избранное", Severity.Error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
Snackbar.Add($"Ошибка: {ex.Message}", Severity.Error);
|
|
||||||
}
|
|
||||||
finally
|
|
||||||
{
|
|
||||||
_favoriteLoading = false;
|
|
||||||
StateHasChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task OpenPermissionsDialog()
|
|
||||||
{
|
|
||||||
if (Playlist == null) return;
|
|
||||||
var initialPermissions = new UpdatePermissionsDto
|
|
||||||
{
|
|
||||||
ViewPermission = Playlist.ViewPermission,
|
|
||||||
PlayPermission = Playlist.PlayPermission,
|
|
||||||
AddPermission = Playlist.AddPermission,
|
|
||||||
RemovePermission = Playlist.RemovePermission
|
|
||||||
};
|
|
||||||
var parameters = new DialogParameters
|
|
||||||
{
|
|
||||||
{ nameof(PermissionsDialog.ShareToken), Playlist.ShareToken },
|
|
||||||
{ nameof(PermissionsDialog.InitialPermissions), initialPermissions }
|
|
||||||
};
|
|
||||||
var dialog = await DialogService.ShowAsync<PermissionsDialog>("Настройки доступа", parameters);
|
|
||||||
var result = await dialog.Result;
|
|
||||||
if (!result.Canceled)
|
|
||||||
{
|
|
||||||
await OnPermissionsChanged.InvokeAsync();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -5,11 +5,33 @@ public static class LongExtensions
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Преобразует миллисекунды в формат Минуты:Секунды
|
/// Преобразует миллисекунды в формат Минуты:Секунды
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static string FormatDuration(this long ms)
|
public static string FormatDuration(this long ms, FormatDurationType format = FormatDurationType.mmss)
|
||||||
{
|
{
|
||||||
var seconds = ms / 1000;
|
var seconds = ms / 1000;
|
||||||
var mins = seconds / 60;
|
|
||||||
var secs = seconds % 60;
|
var mm = seconds / 60;
|
||||||
return $"{mins}:{secs:D2}";
|
var ss = seconds % 60;
|
||||||
|
|
||||||
|
if (format == FormatDurationType.mmss || mm < 60)
|
||||||
|
{
|
||||||
|
return $"{mm}:{ss:D2}";
|
||||||
|
}
|
||||||
|
else if (format == FormatDurationType.hhmmss)
|
||||||
|
{
|
||||||
|
var hh = mm / 60;
|
||||||
|
mm = mm / 60;
|
||||||
|
|
||||||
|
return $"{hh}:{mm:D2}:{ss:D2}";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return $"{mm}:{ss:D2}";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public enum FormatDurationType
|
||||||
|
{
|
||||||
|
mmss,
|
||||||
|
hhmmss,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2,7 +2,6 @@
|
|||||||
|
|
||||||
public static class CustomIcons
|
public static class CustomIcons
|
||||||
{
|
{
|
||||||
// SVG путь для логотипа Яндекса (буква Я в круге или просто Я)
|
public const string Yandex = @"<path d='M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm.72 15.79h-2.14v-1.58c-.37.49-.87.89-1.48 1.18-.61.29-1.29.44-2.03.44-1.2 0-2.13-.34-2.8-.1-1.02-.66-1.52-1.61-1.52-2.84 0-1.25.43-2.22 1.28-2.91.85-.69 2.05-1.04 3.59-1.04h1.1v-.84c0-.62-.15-1.07-.46-1.34-.31-.27-.79-.41-1.44-.41-.53 0-1.02.08-1.48.24-.46.16-.9.41-1.32.74v-1.8c.48-.25 1.01-.45 1.58-.59.57-.14 1.15-.21 1.74-.21 1.45 0 2.53.33 3.23 1 .7.67 1.05 1.66 1.05 2.97v6.29zm-2.14-5.18h-.9c-.8 0-1.4.15-1.8.44-.4.29-.6.74-.6 1.34 0 .55.16.96.48 1.23.32.27.76.41 1.32.41.51 0 .97-.13 1.37-.39.4-.26.6-.64.6-1.14v-1.89z'/>";
|
||||||
public const string Yandex = "M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm.72 15.79h-2.14v-1.58c-.37.49-.87.89-1.48 1.18-.61.29-1.29.44-2.03.44-1.2 0-2.13-.34-2.8-.1-1.02-.66-1.52-1.61-1.52-2.84 0-1.25.43-2.22 1.28-2.91.85-.69 2.05-1.04 3.59-1.04h1.1v-.84c0-.62-.15-1.07-.46-1.34-.31-.27-.79-.41-1.44-.41-.53 0-1.02.08-1.48.24-.46.16-.9.41-1.32.74v-1.8c.48-.25 1.01-.45 1.58-.59.57-.14 1.15-.21 1.74-.21 1.45 0 2.53.33 3.23 1 .7.67 1.05 1.66 1.05 2.97v6.29zm-2.14-5.18h-.9c-.8 0-1.4.15-1.8.44-.4.29-.6.74-.6 1.34 0 .55.16.96.48 1.23.32.27.76.41 1.32.41.51 0 .97-.13 1.37-.39.4-.26.6-.64.6-1.14v-1.89z";
|
public const string YandexMusic = "<path d='M23.8 9.4l-.1-.5-3.9-.9 2-3-.2-.3-3.1 1.5.3-4.2-.3-.2-2 3.4L14.3 0h-.4l.6 4.9-5.7-4.5-.5.1 4.4 5.5-8.7-2.9-.4.4 7.8 4.4-10.7.9-.1.7 11.2 1.2-9.3 7.6.4.6 11.1-6.1-2.2 10.6h.7l4.3-10 2.6 7.8.4-.3-.9-7.8 3.9 4.5.2-.4-2.9-5.5 4.2 1.5.1-.5-3.5-2.8 3.3-.7z'/>";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,11 @@
|
|||||||
|
@using MudBlazor.Services
|
||||||
@using PlaylistShared.Pwa.Components.Global
|
@using PlaylistShared.Pwa.Components.Global
|
||||||
@inherits LayoutComponentBase
|
@inherits LayoutComponentBase
|
||||||
@inject PwaUpdateService PwaUpdateService
|
@inject PwaUpdateService PwaUpdateService
|
||||||
@inject IJSRuntime JSRuntime
|
@inject IJSRuntime JSRuntime
|
||||||
|
@inject ContextualActionBarService ContextualActionBarService
|
||||||
|
@inject IBrowserViewportService BrowserViewportService
|
||||||
|
@implements IBrowserViewportObserver
|
||||||
|
|
||||||
<MudThemeProvider Theme="@_theme" IsDarkMode="_isDarkMode" />
|
<MudThemeProvider Theme="@_theme" IsDarkMode="_isDarkMode" />
|
||||||
<MudPopoverProvider />
|
<MudPopoverProvider />
|
||||||
@@ -9,32 +13,43 @@
|
|||||||
<MudSnackbarProvider />
|
<MudSnackbarProvider />
|
||||||
|
|
||||||
<MudLayout>
|
<MudLayout>
|
||||||
<MudAppBar Elevation="1">
|
<MudAppBar Elevation="1" Contextual Bottom = "@_actionBarBottom" Fixed>
|
||||||
<MudIconButton Icon="@Icons.Material.Filled.Menu" Color="Color.Inherit" Edge="Edge.Start" OnClick="@DrawerToggle" />
|
<MudIconButton Icon="@Icons.Material.Filled.Menu" Color="Color.Inherit" Edge="Edge.Start" OnClick="@DrawerToggle" />
|
||||||
|
@if (_actionBarContent != null)
|
||||||
|
{
|
||||||
|
@_actionBarContent
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
<MudSpacer />
|
<MudSpacer />
|
||||||
<LoginDisplay />
|
<LoginDisplay />
|
||||||
<MudIconButton Icon="@(DarkLightModeButtonIcon)" Color="Color.Inherit" OnClick="@DarkModeToggle" Class="ml-2" />
|
<MudIconButton Icon="@(DarkLightModeButtonIcon)" Color="Color.Inherit" OnClick="@DarkModeToggle" Class="ml-2" />
|
||||||
<MudLink Href="https://git.frigat.duckdns.org/FrigaT/PlaylistShared" Target="_blank" Color="Color.Inherit" Underline="Underline.None" Class="ml-4">
|
<MudLink Href="https://git.frigat.duckdns.org/FrigaT/PlaylistShared" Target="_blank" Color="Color.Inherit" Underline="Underline.None" Class="ml-4">
|
||||||
<MudIcon Icon="@Icons.Custom.Brands.GitHub" Size="Size.Small" Class="mr-1" /> Git
|
<MudIcon Icon="@Icons.Custom.Brands.GitHub" Size="Size.Small" Class="mr-1" /> Git
|
||||||
</MudLink>
|
</MudLink>
|
||||||
|
}
|
||||||
</MudAppBar>
|
</MudAppBar>
|
||||||
|
|
||||||
<MudDrawer @bind-Open="_drawerOpen" ClipMode="DrawerClipMode.Always" Elevation="2">
|
<MudDrawer @bind-Open="_drawerOpen" Class="@(_actionBarBottom ? " pt-0 pb-16" : "")" ClipMode="DrawerClipMode.Always" Elevation="2">
|
||||||
<NavMenu />
|
<NavMenu />
|
||||||
</MudDrawer>
|
</MudDrawer>
|
||||||
|
|
||||||
<MudMainContent Class="pt-16 d-flex flex-column" Style="height: 100vh;">
|
<MudMainContent Class="@("d-flex flex-column" + (_actionBarBottom ? " pt-0 pb-16" : ""))" Style="height: 100dvh;">
|
||||||
<MudItem Class="flex-grow-1 overflow-y-auto">
|
|
||||||
@Body
|
@Body
|
||||||
</MudItem>
|
|
||||||
|
|
||||||
<MudItem>
|
|
||||||
<AudioPlayer />
|
|
||||||
</MudItem>
|
|
||||||
</MudMainContent>
|
</MudMainContent>
|
||||||
</MudLayout>
|
</MudLayout>
|
||||||
|
|
||||||
@code {
|
@code {
|
||||||
|
private RenderFragment? _actionBarContent;
|
||||||
|
private bool _actionBarBottom => _contextualPosition switch
|
||||||
|
{
|
||||||
|
ContextualActionBarPosition.Bottom => true,
|
||||||
|
ContextualActionBarPosition.Top => false,
|
||||||
|
_ => _isMobile,
|
||||||
|
};
|
||||||
|
private bool _isMobile = false;
|
||||||
|
private ContextualActionBarPosition _contextualPosition = ContextualActionBarPosition.Default;
|
||||||
|
|
||||||
private bool _drawerOpen = true;
|
private bool _drawerOpen = true;
|
||||||
private bool _isDarkMode = true;
|
private bool _isDarkMode = true;
|
||||||
private MudTheme? _theme;
|
private MudTheme? _theme;
|
||||||
@@ -51,6 +66,8 @@
|
|||||||
PaletteDark = _darkPalette,
|
PaletteDark = _darkPalette,
|
||||||
LayoutProperties = new LayoutProperties()
|
LayoutProperties = new LayoutProperties()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
ContextualActionBarService.OnChanged += OnContextualChangedHandler;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override async Task OnAfterRenderAsync(bool firstRender)
|
protected override async Task OnAfterRenderAsync(bool firstRender)
|
||||||
@@ -59,9 +76,17 @@
|
|||||||
{
|
{
|
||||||
_dotNetRef = DotNetObjectReference.Create(PwaUpdateService);
|
_dotNetRef = DotNetObjectReference.Create(PwaUpdateService);
|
||||||
await JSRuntime.InvokeVoidAsync("registerSWMessageHandler", _dotNetRef);
|
await JSRuntime.InvokeVoidAsync("registerSWMessageHandler", _dotNetRef);
|
||||||
|
await BrowserViewportService.SubscribeAsync(this, fireImmediately: true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void OnContextualChangedHandler()
|
||||||
|
{
|
||||||
|
_actionBarContent = ContextualActionBarService.Content;
|
||||||
|
_contextualPosition = ContextualActionBarService.Position;
|
||||||
|
StateHasChanged();
|
||||||
|
}
|
||||||
|
|
||||||
private void DrawerToggle()
|
private void DrawerToggle()
|
||||||
{
|
{
|
||||||
_drawerOpen = !_drawerOpen;
|
_drawerOpen = !_drawerOpen;
|
||||||
@@ -116,4 +141,21 @@
|
|||||||
true => Icons.Material.Rounded.AutoMode,
|
true => Icons.Material.Rounded.AutoMode,
|
||||||
false => Icons.Material.Outlined.DarkMode,
|
false => Icons.Material.Outlined.DarkMode,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Guid IBrowserViewportObserver.Id { get; } = Guid.NewGuid();
|
||||||
|
|
||||||
|
ResizeOptions IBrowserViewportObserver.ResizeOptions { get; } = new()
|
||||||
|
{
|
||||||
|
ReportRate = 250,
|
||||||
|
NotifyOnBreakpointOnly = true
|
||||||
|
};
|
||||||
|
|
||||||
|
Task IBrowserViewportObserver.NotifyBrowserViewportChangeAsync(BrowserViewportEventArgs browserViewportEventArgs)
|
||||||
|
{
|
||||||
|
_isMobile = browserViewportEventArgs.Breakpoint <= Breakpoint.Sm;
|
||||||
|
|
||||||
|
return InvokeAsync(StateHasChanged);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
<MudCard>
|
<MudCard>
|
||||||
<MudCardContent Class="text-center">
|
<MudCardContent Class="text-center">
|
||||||
<MudText Typo="Typo.h5" Class="mb-4">Вход в PlaylistShared</MudText>
|
<MudText Typo="Typo.h5" Class="mb-4">Вход в PlaylistShared</MudText>
|
||||||
|
@*
|
||||||
<MudText Typo="Typo.body2" Class="mb-6">
|
<MudText Typo="Typo.body2" Class="mb-6">
|
||||||
Войдите через учётную запись Keycloak или используйте локальный аккаунт.
|
Войдите через учётную запись Keycloak или используйте локальный аккаунт.
|
||||||
</MudText>
|
</MudText>
|
||||||
@@ -22,7 +22,7 @@
|
|||||||
</MudButton>
|
</MudButton>
|
||||||
|
|
||||||
<MudDivider Class="my-4">или</MudDivider>
|
<MudDivider Class="my-4">или</MudDivider>
|
||||||
|
*@
|
||||||
<!-- Локальная форма входа -->
|
<!-- Локальная форма входа -->
|
||||||
<MudTextField @bind-Value="_loginModel.Username" Label="Имя пользователя" Variant="Variant.Outlined" FullWidth="true" Class="mb-3" />
|
<MudTextField @bind-Value="_loginModel.Username" Label="Имя пользователя" Variant="Variant.Outlined" FullWidth="true" Class="mb-3" />
|
||||||
<MudTextField @bind-Value="_loginModel.Password" Label="Пароль" Variant="Variant.Outlined" FullWidth="true" InputType="InputType.Password" @bind-Value:after="LocalLogin" />
|
<MudTextField @bind-Value="_loginModel.Password" Label="Пароль" Variant="Variant.Outlined" FullWidth="true" InputType="InputType.Password" @bind-Value:after="LocalLogin" />
|
||||||
|
|||||||
@@ -2,11 +2,13 @@
|
|||||||
<PageTitle>@_playlist?.Title - Playlist Share</PageTitle>
|
<PageTitle>@_playlist?.Title - Playlist Share</PageTitle>
|
||||||
|
|
||||||
@using PlaylistShared.Pwa.Components.Common
|
@using PlaylistShared.Pwa.Components.Common
|
||||||
|
@using PlaylistShared.Pwa.Components.Global
|
||||||
@using PlaylistShared.Pwa.Components.SharedPlaylist
|
@using PlaylistShared.Pwa.Components.SharedPlaylist
|
||||||
@using PlaylistShared.Pwa.Components.SharedPlaylist.Cards
|
@using PlaylistShared.Pwa.Components.SharedPlaylist.Cards
|
||||||
@using PlaylistShared.Shared.DTO
|
@using PlaylistShared.Shared.DTO
|
||||||
@using PlaylistShared.Shared.Enums
|
@using PlaylistShared.Shared.Enums
|
||||||
@using PlaylistShared.Pwa.Services
|
@using PlaylistShared.Pwa.Services
|
||||||
|
@using PlaylistShared.Shared.Profile
|
||||||
@using PlaylistShared.Shared.SharedPlaylist
|
@using PlaylistShared.Shared.SharedPlaylist
|
||||||
@using PlaylistShared.Shared.Yandex
|
@using PlaylistShared.Shared.Yandex
|
||||||
@inject HttpClient Http
|
@inject HttpClient Http
|
||||||
@@ -14,22 +16,63 @@
|
|||||||
@inject NavigationManager Navigation
|
@inject NavigationManager Navigation
|
||||||
@inject AuthenticationStateProvider AuthProvider
|
@inject AuthenticationStateProvider AuthProvider
|
||||||
@inject IDialogService DialogService
|
@inject IDialogService DialogService
|
||||||
|
@inject IAudioPlayerService AudioPlayerService
|
||||||
|
@inject IJSRuntime JS
|
||||||
|
@implements IDisposable
|
||||||
|
|
||||||
|
<MudContainer MaxWidth="MaxWidth.ExtraLarge" Class="py-1 px-1" Style="height: 100%;">
|
||||||
|
<MudStack Style="height: 100%;" StretchItems="StretchItems.Start" Spacing="0">
|
||||||
|
@*Первый элемент растянется на всю высоту*@
|
||||||
|
<MudItem Style="min-height: 0; height: 100%;">
|
||||||
|
|
||||||
<MudContainer MaxWidth="MaxWidth.ExtraLarge" Class="pa-1" Style="height: 100%;">
|
|
||||||
@* --- ВЕРСИЯ ДЛЯ ПК (сетка) --- *@
|
@* --- ВЕРСИЯ ДЛЯ ПК (сетка) --- *@
|
||||||
<MudHidden Breakpoint="Breakpoint.MdAndUp" Invert>
|
<MudHidden Breakpoint="Breakpoint.MdAndUp" Invert>
|
||||||
<MudGrid Spacing="2" Class="flex-grow-1 pt-2" Style="height: 100%;">
|
<MudGrid Spacing="2" Class="flex-grow-1 pb-2 mb-2" Style="height: 100%;">
|
||||||
<MudItem xs="12" md="6" Style="height: 100%;">
|
<MudItem xs="12" md="6" Style="height: 100%; overflow-y: auto;">
|
||||||
@PlaylistCardContent
|
<MudCard Elevation="0" Class="d-flex flex-column" Style="height: 100%;">
|
||||||
|
<MudCardHeader Class="pb-0">
|
||||||
|
<CardHeaderContent>
|
||||||
|
@PlaylistCardHeaderContent
|
||||||
|
</CardHeaderContent>
|
||||||
|
|
||||||
|
<CardHeaderActions>
|
||||||
|
<MudIconButton Icon="@(_isFavorite? Icons.Material.Filled.Star : Icons.Material.Outlined.StarBorder)"
|
||||||
|
Color="Color.Warning"
|
||||||
|
OnClick="ToggleFavorite"
|
||||||
|
Disabled="_favoriteLoading"
|
||||||
|
Size="Size.Medium" />
|
||||||
|
|
||||||
|
<MudIconButton Icon="@Icons.Material.Filled.Share"
|
||||||
|
OnClick="SharePlaylist"
|
||||||
|
Size="Size.Medium" />
|
||||||
|
|
||||||
|
<MudIconButton Icon="@CustomIcons.YandexMusic"
|
||||||
|
Href="@($"https://music.yandex.ru/playlists/{_playlist?.YandexPlaylistUuid}")"
|
||||||
|
Target="_blank"
|
||||||
|
Size="Size.Medium" />
|
||||||
|
|
||||||
|
@if (_isCreator && _isAuthenticated)
|
||||||
|
{
|
||||||
|
<MudIconButton Icon="@Icons.Material.Filled.Settings" OnClick="OpenPermissionsDialog" Size="Size.Medium" />
|
||||||
|
}
|
||||||
|
<MudIconButton Icon="@Icons.Material.Filled.Refresh" OnClick="LoadTracks" Disabled="@_tracksLoading" Size="Size.Medium" />
|
||||||
|
</CardHeaderActions>
|
||||||
|
</MudCardHeader>
|
||||||
|
|
||||||
|
<MudCardContent Class="flex-grow-1 overflow-auto flex-column py-0">
|
||||||
|
@PlaylistCardBodyContent
|
||||||
|
</MudCardContent>
|
||||||
|
</MudCard>
|
||||||
</MudItem>
|
</MudItem>
|
||||||
|
|
||||||
@if (_canAdd)
|
@if (_canAdd)
|
||||||
{
|
{
|
||||||
<MudItem xs="12" md="6" Style="height: 100%;">
|
<MudItem xs="12" md="6" Style="height: 100%; overflow-y: auto;">
|
||||||
@AddTrackCardContent
|
@AddTrackCardContent
|
||||||
</MudItem>
|
</MudItem>
|
||||||
}
|
}
|
||||||
</MudGrid>
|
</MudGrid>
|
||||||
|
<ContextualBarContent />
|
||||||
</MudHidden>
|
</MudHidden>
|
||||||
|
|
||||||
@* --- ВЕРСИЯ ДЛЯ МОБИЛОК (вкладки внизу) --- *@
|
@* --- ВЕРСИЯ ДЛЯ МОБИЛОК (вкладки внизу) --- *@
|
||||||
@@ -40,7 +83,17 @@
|
|||||||
<div class="flex-grow-1 relative pa-0" style="min-height: 0;">
|
<div class="flex-grow-1 relative pa-0" style="min-height: 0;">
|
||||||
<div class="@(_activeMobileTab == 0 ? "d-flex" : "d-none") flex-column" style="height: 100%;">
|
<div class="@(_activeMobileTab == 0 ? "d-flex" : "d-none") flex-column" style="height: 100%;">
|
||||||
<div class="flex-grow-1 overflow-auto pb-1">
|
<div class="flex-grow-1 overflow-auto pb-1">
|
||||||
@PlaylistCardContent
|
<MudCard Elevation="0" Class="d-flex flex-column" Style="height: 100%;">
|
||||||
|
<MudCardHeader Class="pb-0">
|
||||||
|
<CardHeaderContent>
|
||||||
|
@PlaylistCardHeaderContent
|
||||||
|
</CardHeaderContent>
|
||||||
|
</MudCardHeader>
|
||||||
|
|
||||||
|
<MudCardContent Class="flex-grow-1 overflow-auto flex-column py-0">
|
||||||
|
@PlaylistCardBodyContent
|
||||||
|
</MudCardContent>
|
||||||
|
</MudCard>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -55,21 +108,53 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
@* Кастомная панель навигации внизу *@
|
@* Кастомная панель навигации внизу *@
|
||||||
@if (_canAdd)
|
<ContextualBarContent>
|
||||||
{
|
|
||||||
<MudPaper Elevation="0" Class="py-1">
|
|
||||||
<MudNavMenu Margin="Margin.None" Class="d-flex flex-row justify-space-around">
|
|
||||||
<MudIconButton Icon="@Icons.Material.Filled.LibraryMusic"
|
<MudIconButton Icon="@Icons.Material.Filled.LibraryMusic"
|
||||||
Color="@(_activeMobileTab == 0 ? Color.Primary : Color.Default)"
|
Color="@(_activeMobileTab == 0 ? Color.Primary : Color.Default)"
|
||||||
OnClick="() => _activeMobileTab = 0" />
|
OnClick="() => _activeMobileTab = 0" />
|
||||||
|
|
||||||
<MudIconButton Icon="@Icons.Material.Filled.AddCircle"
|
<MudIconButton Icon="@Icons.Material.Filled.AddCircle"
|
||||||
Color="@(_activeMobileTab == 1 ? Color.Primary : Color.Default)"
|
Color="@(_activeMobileTab == 1 ? Color.Primary : Color.Default)"
|
||||||
OnClick="() => _activeMobileTab = 1" />
|
OnClick="() => _activeMobileTab = 1" />
|
||||||
</MudNavMenu>
|
|
||||||
</MudPaper>
|
<MudSpacer />
|
||||||
|
<MudMenu Icon="@Icons.Material.Filled.MoreVert"
|
||||||
|
AnchorOrigin="Origin.TopRight"
|
||||||
|
TransformOrigin="Origin.TopRight">
|
||||||
|
|
||||||
|
<MudMenuItem Icon="@(_isFavorite? Icons.Material.Filled.Star : Icons.Material.Outlined.StarBorder)"
|
||||||
|
IconColor="Color.Warning"
|
||||||
|
Label="Избранное"
|
||||||
|
OnClick="ToggleFavorite"
|
||||||
|
Disabled="@_favoriteLoading"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<MudMenuItem Icon="@Icons.Material.Filled.Share"
|
||||||
|
OnClick="SharePlaylist"
|
||||||
|
Label="Поделиться" />
|
||||||
|
|
||||||
|
<MudMenuItem Icon="@CustomIcons.YandexMusic"
|
||||||
|
Href="@($"https://music.yandex.ru/playlists/{_playlist?.YandexPlaylistUuid}")"
|
||||||
|
Label="Открыть в ЯМ"
|
||||||
|
Target="_blank" />
|
||||||
|
|
||||||
|
@if (_isCreator && _isAuthenticated)
|
||||||
|
{
|
||||||
|
<MudMenuItem Icon="@Icons.Material.Filled.Settings"
|
||||||
|
OnClick="OpenPermissionsDialog"
|
||||||
|
Label="Настройки" />
|
||||||
}
|
}
|
||||||
|
</MudMenu>
|
||||||
|
</ContextualBarContent>
|
||||||
</div>
|
</div>
|
||||||
</MudHidden>
|
</MudHidden>
|
||||||
|
</MudItem>
|
||||||
|
|
||||||
|
@*Второй элемент - плеер. Привязан к нижней части контейнера*@
|
||||||
|
<MudCollapse Expanded="@(AudioPlayerService.CurrentTrackId != null)" >
|
||||||
|
<AudioPlayer />
|
||||||
|
</MudCollapse>
|
||||||
|
</MudStack>
|
||||||
</MudContainer>
|
</MudContainer>
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
@@ -85,6 +170,7 @@
|
|||||||
scroll-snap-align: start;
|
scroll-snap-align: start;
|
||||||
flex: 0 0 auto; /* Запрещает карточкам сжиматься */
|
flex: 0 0 auto; /* Запрещает карточкам сжиматься */
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Скрываем скроллбар для эстетики */
|
/* Скрываем скроллбар для эстетики */
|
||||||
.horizontal-scroll-container::-webkit-scrollbar { display: none; }
|
.horizontal-scroll-container::-webkit-scrollbar { display: none; }
|
||||||
.horizontal-scroll-container { -ms-overflow-style: none; scrollbar-width: none; }
|
.horizontal-scroll-container { -ms-overflow-style: none; scrollbar-width: none; }
|
||||||
@@ -94,26 +180,53 @@
|
|||||||
/// <summary>Токен расшаренного плейлиста</summary>
|
/// <summary>Токен расшаренного плейлиста</summary>
|
||||||
[Parameter] public required string Token { get; set; }
|
[Parameter] public required string Token { get; set; }
|
||||||
|
|
||||||
private RenderFragment PlaylistCardContent => __builder =>
|
|
||||||
|
/// <summary>Элемент: заголовок плейлиста</summary>
|
||||||
|
private RenderFragment PlaylistCardHeaderContent => __builder =>
|
||||||
{
|
{
|
||||||
<MudCard Elevation="0" Class="d-flex flex-column" Style="height: 100%;">
|
@if (_loading)
|
||||||
<MudCardHeader>
|
|
||||||
<CardHeaderContent>
|
|
||||||
@if(_loading)
|
|
||||||
{
|
{
|
||||||
<MudSkeleton Width="200px" Height="32px" SkeletonType="SkeletonType.Text" />
|
<MudSkeleton Width="200px" Height="32px" SkeletonType="SkeletonType.Text" />
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
<PlaylistHeader Playlist="@_playlist" />
|
|
||||||
}
|
|
||||||
</CardHeaderContent>
|
|
||||||
<CardHeaderActions>
|
|
||||||
<MudIconButton Icon="@Icons.Material.Filled.Refresh" OnClick="LoadTracks" Disabled="@_tracksLoading" />
|
|
||||||
</CardHeaderActions>
|
|
||||||
</MudCardHeader>
|
|
||||||
|
|
||||||
<MudCardContent Class="flex-grow-1 overflow-auto flex-column">
|
<MudStack Row AlignItems="AlignItems.Center">
|
||||||
|
@if (!string.IsNullOrEmpty(_playlist?.CoverUrl))
|
||||||
|
{
|
||||||
|
<MudImage Src="@_playlist.CoverUrl.FormatCoverUrl(60, 60)" Height="60" Width="60" Class="rounded shadow-sm" />
|
||||||
|
}
|
||||||
|
|
||||||
|
<MudStack Spacing="0" Class="pb-1">
|
||||||
|
<MudText Typo="Typo.h6" Color="Color.Primary">
|
||||||
|
@_playlist?.Title
|
||||||
|
</MudText>
|
||||||
|
|
||||||
|
@if (_tracksLoading)
|
||||||
|
{
|
||||||
|
<MudSkeleton Width="200px" Height="20px" SkeletonType="SkeletonType.Text" />
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
<MudText Typo="Typo.caption" Color="Color.Secondary">
|
||||||
|
@($"Треков: {_playlistTrackCount} • Продолжительность: {_playlistDurationMs.FormatDuration(LongExtensions.FormatDurationType.hhmmss)}")
|
||||||
|
</MudText>
|
||||||
|
}
|
||||||
|
</MudStack>
|
||||||
|
</MudStack>
|
||||||
|
<MudTextField @bind-Value="_playlistFilterText"
|
||||||
|
Placeholder="Фильтр треков..."
|
||||||
|
Adornment="Adornment.Start"
|
||||||
|
AdornmentIcon="@Icons.Material.Filled.Search"
|
||||||
|
Variant="Variant.Text"
|
||||||
|
FullWidth
|
||||||
|
Class="mb-2" />
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
/// <summary>Элемент: треки плейлиста</summary>
|
||||||
|
private RenderFragment PlaylistCardBodyContent => __builder =>
|
||||||
|
{
|
||||||
@if (_loading || _tracksLoading)
|
@if (_loading || _tracksLoading)
|
||||||
{
|
{
|
||||||
<TrackItemSkeleton />
|
<TrackItemSkeleton />
|
||||||
@@ -125,7 +238,7 @@
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
<MudTable Items="@_tracks"
|
<MudTable Items="@FilteredPlaylistTracks"
|
||||||
Hover
|
Hover
|
||||||
Elevation="0"
|
Elevation="0"
|
||||||
Breakpoint="Breakpoint.None"
|
Breakpoint="Breakpoint.None"
|
||||||
@@ -143,14 +256,13 @@
|
|||||||
</RowTemplate>
|
</RowTemplate>
|
||||||
</MudTable>
|
</MudTable>
|
||||||
}
|
}
|
||||||
</MudCardContent>
|
|
||||||
</MudCard>
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/// <summary>Элемент: блок добавления треков</summary>
|
||||||
private RenderFragment AddTrackCardContent => __builder =>
|
private RenderFragment AddTrackCardContent => __builder =>
|
||||||
{
|
{
|
||||||
<MudCard Class="d-flex flex-column" Elevation="0" Style="height: 100%;">
|
<MudCard Class="d-flex flex-column" Elevation="0" Style="height: 100%;">
|
||||||
<MudCardHeader>
|
<MudCardHeader Class="pb-0">
|
||||||
<MudStack Style="width: 100%;">
|
<MudStack Style="width: 100%;">
|
||||||
<MudText Typo="Typo.h6" Color="Color.Primary" Class="mb-4">Добавление треков</MudText>
|
<MudText Typo="Typo.h6" Color="Color.Primary" Class="mb-4">Добавление треков</MudText>
|
||||||
<MudTextField @bind-Value="_searchQuery"
|
<MudTextField @bind-Value="_searchQuery"
|
||||||
@@ -161,23 +273,27 @@
|
|||||||
Label="Название или ссылка на трек"
|
Label="Название или ссылка на трек"
|
||||||
Disabled="@_isSearching"
|
Disabled="@_isSearching"
|
||||||
Adornment="Adornment.End" AdornmentIcon="@Icons.Material.Filled.Search" AdornmentColor="Color.Secondary" />
|
Adornment="Adornment.End" AdornmentIcon="@Icons.Material.Filled.Search" AdornmentColor="Color.Secondary" />
|
||||||
|
<div class="horizontal-scroll-container">
|
||||||
<MudToggleGroup T="TrackSearchType"
|
<MudToggleGroup T="TrackSearchType"
|
||||||
@bind-Value="_searchType"
|
@bind-Value="_searchType"
|
||||||
@bind-Value:after="OnSearchTypeChanged"
|
@bind-Value:after="OnSearchTypeChanged"
|
||||||
Size="Size.Small"
|
Size="Size.Small"
|
||||||
Color="Color.Primary"
|
Color="Color.Primary"
|
||||||
Disabled="@(_isSearching)">
|
Disabled="@(_isSearching)"
|
||||||
<MudToggleItem Value="TrackSearchType.All" Text="Все" />
|
Class="mt-2"
|
||||||
<MudToggleItem Value="TrackSearchType.Track" Text="Треки" />
|
Style="display: inline-flex; flex-wrap: nowrap;">
|
||||||
<MudToggleItem Value="TrackSearchType.Album" Text="Альбомы" />
|
<MudToggleItem Value="TrackSearchType.All" Class="px-2" Text="Все" />
|
||||||
<MudToggleItem Value="TrackSearchType.Playlist" Text="Плейлисты" />
|
<MudToggleItem Value="TrackSearchType.Track" Class="px-2" Text="Треки" />
|
||||||
<MudToggleItem Value="TrackSearchType.Artist" Text="Исполнители" />
|
<MudToggleItem Value="TrackSearchType.Album" Class="px-2" Text="Альбомы" />
|
||||||
|
<MudToggleItem Value="TrackSearchType.Playlist" Class="px-2" Text="Плейлисты" />
|
||||||
|
<MudToggleItem Value="TrackSearchType.Artist" Class="px-2" Text="Исполнители" />
|
||||||
|
<MudToggleItem Value="TrackSearchType.MyPlaylists" Class="px-2" Text="Мои плейлисты" />
|
||||||
</MudToggleGroup>
|
</MudToggleGroup>
|
||||||
|
</div>
|
||||||
</MudStack>
|
</MudStack>
|
||||||
</MudCardHeader>
|
</MudCardHeader>
|
||||||
|
|
||||||
<MudCardContent Class="flex-grow-1 overflow-auto flex-column">
|
<MudCardContent Class="flex-grow-1 overflow-auto flex-column py-0">
|
||||||
@if (_isSearching)
|
@if (_isSearching)
|
||||||
{
|
{
|
||||||
|
|
||||||
@@ -247,11 +363,46 @@
|
|||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@* Секция персональных плейлистов *@
|
||||||
|
@if (_searchResult?.PersonalPlaylists?.Any() == true)
|
||||||
|
{
|
||||||
|
<MudText Typo="Typo.h6" Class="mt-4 mb-2 ml-2">Плейлисты (персональные)</MudText>
|
||||||
|
<div class="horizontal-scroll-container px-2">
|
||||||
|
@foreach (var playlist in _searchResult.PersonalPlaylists)
|
||||||
|
{
|
||||||
|
<div style="width: 70px;">
|
||||||
|
<PlaylistCard Item="playlist" OnClick="() => SearchTracksByEntity(playlist.Uuid, playlist.Title, TrackSearchType.Playlist)" />
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
|
||||||
|
@* Секция лайкнутых плейлистов *@
|
||||||
|
@if (_searchResult?.LikedPlaylists?.Any() == true)
|
||||||
|
{
|
||||||
|
<MudText Typo="Typo.h6" Class="mt-4 mb-2 ml-2">Плейлисты (лайки)</MudText>
|
||||||
|
<div class="horizontal-scroll-container px-2">
|
||||||
|
@foreach (var playlist in _searchResult.LikedPlaylists)
|
||||||
|
{
|
||||||
|
<div style="width: 70px;">
|
||||||
|
<PlaylistCard Item="playlist" OnClick="() => SearchTracksByEntity(playlist.Uuid, playlist.Title, TrackSearchType.Playlist)" />
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
|
||||||
@* Секция треков *@
|
@* Секция треков *@
|
||||||
@if (_searchResult?.Tracks != null)
|
@if (_searchResult?.Tracks != null)
|
||||||
{
|
{
|
||||||
<MudText Typo="Typo.h6" Class="mt-4 mb-2 ml-2">Треки</MudText>
|
<MudText Typo="Typo.h6" Class="mt-4 mb-2 ml-2">Треки</MudText>
|
||||||
<MudTable Items="@_searchResult.Tracks"
|
<MudTextField @bind-Value="_searchFilterText"
|
||||||
|
Placeholder="Фильтр треков..."
|
||||||
|
Adornment="Adornment.Start"
|
||||||
|
AdornmentIcon="@Icons.Material.Filled.Search"
|
||||||
|
Variant="Variant.Text"
|
||||||
|
FullWidth
|
||||||
|
Class="mb-2" />
|
||||||
|
<MudTable Items="@FilteredSearchTracks"
|
||||||
Hover
|
Hover
|
||||||
Elevation="0"
|
Elevation="0"
|
||||||
Style="min-height: 0;"
|
Style="min-height: 0;"
|
||||||
@@ -292,6 +443,14 @@
|
|||||||
/// Список добавленных в плейлист треков.
|
/// Список добавленных в плейлист треков.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private List<YandexTrack> _tracks = new();
|
private List<YandexTrack> _tracks = new();
|
||||||
|
/// <summary>
|
||||||
|
/// Продолжительность плейлиста.
|
||||||
|
/// </summary>
|
||||||
|
long _playlistDurationMs;
|
||||||
|
/// <summary>
|
||||||
|
/// Кол-во треков в ПЛ.
|
||||||
|
/// </summary>
|
||||||
|
int _playlistTrackCount;
|
||||||
|
|
||||||
/// <summary>Свойства плейлиста.</summary>
|
/// <summary>Свойства плейлиста.</summary>
|
||||||
private SharedPlaylistDto? _playlist;
|
private SharedPlaylistDto? _playlist;
|
||||||
@@ -313,6 +472,16 @@
|
|||||||
/// <summary>Состояние: Происходит загрузка треков плейлиста.</summary>
|
/// <summary>Состояние: Происходит загрузка треков плейлиста.</summary>
|
||||||
private bool _tracksLoading = true;
|
private bool _tracksLoading = true;
|
||||||
|
|
||||||
|
/// <summary>Текст фильтра для треков плейлиста</summary>
|
||||||
|
private string _playlistFilterText = "";
|
||||||
|
private List<YandexTrack> FilteredPlaylistTracks =>
|
||||||
|
string.IsNullOrWhiteSpace(_playlistFilterText)
|
||||||
|
? _tracks
|
||||||
|
: _tracks.Where(t => t.Title.Contains(_playlistFilterText, StringComparison.InvariantCultureIgnoreCase) ||
|
||||||
|
t.Artists.Any(a => a.Name.Contains(_playlistFilterText, StringComparison.InvariantCultureIgnoreCase)))
|
||||||
|
.ToList();
|
||||||
|
|
||||||
|
|
||||||
/********************************
|
/********************************
|
||||||
* Вкладка добавления треков
|
* Вкладка добавления треков
|
||||||
*********************************/
|
*********************************/
|
||||||
@@ -324,9 +493,30 @@
|
|||||||
private bool _isSearching = false;
|
private bool _isSearching = false;
|
||||||
/// <summary>Ссылка на поле ввода</summary>
|
/// <summary>Ссылка на поле ввода</summary>
|
||||||
private MudTextField<string> _searchField;
|
private MudTextField<string> _searchField;
|
||||||
|
|
||||||
/// <summary>Результат поиска.</summary>
|
/// <summary>Результат поиска.</summary>
|
||||||
private YandexSearchResult? _searchResult = null;
|
private YandexSearchResult? _searchResult = null;
|
||||||
|
/// <summary>Текст фильтра для результатов поиска</summary>
|
||||||
|
private string _searchFilterText = "";
|
||||||
|
private List<YandexTrack> FilteredSearchTracks =>
|
||||||
|
string.IsNullOrWhiteSpace(_searchFilterText) || _searchResult?.Tracks == null
|
||||||
|
? _searchResult?.Tracks ?? new List<YandexTrack>()
|
||||||
|
: _searchResult.Tracks.Where(t => t.Title.Contains(_searchFilterText, StringComparison.InvariantCultureIgnoreCase) ||
|
||||||
|
t.Artists.Any(a => a.Name.Contains(_searchFilterText, StringComparison.InvariantCultureIgnoreCase)))
|
||||||
|
.ToList();
|
||||||
|
|
||||||
|
/********************************
|
||||||
|
* Контекстные кнопки
|
||||||
|
*********************************/
|
||||||
|
/// <summary>Признак, что альбом в фаворитах.</summary>
|
||||||
|
private bool _isFavorite;
|
||||||
|
/// <summary>Загрузка признака "фаворит".</summary>
|
||||||
|
private bool _favoriteLoading;
|
||||||
|
|
||||||
|
/********************************
|
||||||
|
* Поделиться ссылкой
|
||||||
|
*********************************/
|
||||||
|
private IJSObjectReference? _shareModule;
|
||||||
|
private bool _isWebShareSupported = false;
|
||||||
|
|
||||||
protected override async Task OnInitializedAsync()
|
protected override async Task OnInitializedAsync()
|
||||||
{
|
{
|
||||||
@@ -335,6 +525,25 @@
|
|||||||
_currentUserId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
|
_currentUserId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
|
||||||
await LoadPlaylist();
|
await LoadPlaylist();
|
||||||
await LoadTracks();
|
await LoadTracks();
|
||||||
|
AudioPlayerService.OnStartedTrack += OnPlayerStateChanged;
|
||||||
|
AudioPlayerService.OnEndedTrack += OnPlayerStateChanged;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override async Task OnAfterRenderAsync(bool firstRender)
|
||||||
|
{
|
||||||
|
if (firstRender)
|
||||||
|
{
|
||||||
|
// Загружаем JS-модуль
|
||||||
|
_shareModule = await JS.InvokeAsync<IJSObjectReference>("import", "/js/shareUtils.js");
|
||||||
|
// Проверяем поддержку Web Share API
|
||||||
|
_isWebShareSupported = await _shareModule.InvokeAsync<bool>("isSupported");
|
||||||
|
StateHasChanged();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnPlayerStateChanged()
|
||||||
|
{
|
||||||
|
InvokeAsync(StateHasChanged);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>Установка разрешений.</summary>
|
/// <summary>Установка разрешений.</summary>
|
||||||
@@ -378,6 +587,7 @@
|
|||||||
_activeMobileTab = 0;
|
_activeMobileTab = 0;
|
||||||
|
|
||||||
await ConfigurePermissions();
|
await ConfigurePermissions();
|
||||||
|
await CheckFavoriteStatus();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -408,7 +618,9 @@
|
|||||||
if (response?.Success == true && response.Data != null)
|
if (response?.Success == true && response.Data != null)
|
||||||
{
|
{
|
||||||
_tracks = response.Data.Tracks;
|
_tracks = response.Data.Tracks;
|
||||||
await GenerateUniqTrackIds();
|
_existingTrackIds = _tracks.Select(t => t.TrackId).ToHashSet();
|
||||||
|
_playlistDurationMs = _tracks.Sum(t => t.DurationMs);
|
||||||
|
_playlistTrackCount = _tracks.Count();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -427,11 +639,6 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task GenerateUniqTrackIds()
|
|
||||||
{
|
|
||||||
_existingTrackIds = _tracks.Select(t => t.TrackId).ToHashSet();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>Удаление трека из списка плейлиста</summary>
|
/// <summary>Удаление трека из списка плейлиста</summary>
|
||||||
private async Task OnRemoveTrack(YandexTrack track)
|
private async Task OnRemoveTrack(YandexTrack track)
|
||||||
{
|
{
|
||||||
@@ -446,7 +653,6 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#region Добавление/удаление трека
|
#region Добавление/удаление трека
|
||||||
/// <summary>Добавление трека.</summary>
|
/// <summary>Добавление трека.</summary>
|
||||||
private async Task AddTrack(YandexTrack track)
|
private async Task AddTrack(YandexTrack track)
|
||||||
@@ -460,8 +666,10 @@
|
|||||||
if (response.IsSuccessStatusCode)
|
if (response.IsSuccessStatusCode)
|
||||||
{
|
{
|
||||||
Snackbar.Add($"Трек \"{track.Title}\" добавлен", Severity.Success, c => c.SnackbarVariant = Variant.Outlined);
|
Snackbar.Add($"Трек \"{track.Title}\" добавлен", Severity.Success, c => c.SnackbarVariant = Variant.Outlined);
|
||||||
_tracks.Add(track);
|
_tracks.Insert(0, track);
|
||||||
await GenerateUniqTrackIds();
|
_existingTrackIds.Add(track.TrackId);
|
||||||
|
_playlistDurationMs += track.DurationMs;
|
||||||
|
_playlistTrackCount += 1;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -490,7 +698,9 @@
|
|||||||
{
|
{
|
||||||
Snackbar.Add("Трек удалён", Severity.Success);
|
Snackbar.Add("Трек удалён", Severity.Success);
|
||||||
_tracks.Remove(track);
|
_tracks.Remove(track);
|
||||||
await GenerateUniqTrackIds();
|
_existingTrackIds.Remove(track.TrackId);
|
||||||
|
_playlistDurationMs -= track.DurationMs;
|
||||||
|
_playlistTrackCount -= 1;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -526,13 +736,50 @@
|
|||||||
private async Task SearchTracks(bool byId = false, string? forcedQuery = null)
|
private async Task SearchTracks(bool byId = false, string? forcedQuery = null)
|
||||||
{
|
{
|
||||||
var query = forcedQuery ?? _searchQuery;
|
var query = forcedQuery ?? _searchQuery;
|
||||||
if (string.IsNullOrWhiteSpace(query))
|
var type = _searchType;
|
||||||
|
|
||||||
|
|
||||||
|
//Если поиск в моих плейлистах
|
||||||
|
if (type == TrackSearchType.MyPlaylists)
|
||||||
|
{
|
||||||
|
var showMessage = true;
|
||||||
|
|
||||||
|
if (_isAuthenticated)
|
||||||
|
{
|
||||||
|
var response = await Http.GetFromJsonAsync<ApiResponse<YandexTokenStatus>>("/api/yandexaccount/status");
|
||||||
|
if (response?.Success == true)
|
||||||
|
{
|
||||||
|
var hasToken = response?.Data?.HasToken ?? false;
|
||||||
|
|
||||||
|
if (hasToken) showMessage = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (showMessage)
|
||||||
|
{
|
||||||
|
var response = await DialogService.ShowMessageBoxAsync(new()
|
||||||
|
{
|
||||||
|
Title = "Необходимо авторизация",
|
||||||
|
Message = "Для использования \"Мои плейлисты\" необходима авторизация в яндекс музыке.",
|
||||||
|
YesText = "Авторизоваться",
|
||||||
|
CancelText = "Отмена",
|
||||||
|
});
|
||||||
|
|
||||||
|
if (response == true)
|
||||||
|
{
|
||||||
|
Navigation.NavigateTo("/login");
|
||||||
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
//Если обычный поиск, нужен текст
|
||||||
|
else if (string.IsNullOrWhiteSpace(query))
|
||||||
{
|
{
|
||||||
_searchResult = null;
|
_searchResult = null;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
var type = _searchType;
|
|
||||||
|
|
||||||
// Распознавание ссылки Яндекс.Музыки
|
// Распознавание ссылки Яндекс.Музыки
|
||||||
if (!byId && Uri.TryCreate(query, UriKind.Absolute, out var uri) && uri.Host == "music.yandex.ru")
|
if (!byId && Uri.TryCreate(query, UriKind.Absolute, out var uri) && uri.Host == "music.yandex.ru")
|
||||||
@@ -557,7 +804,7 @@
|
|||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var url = $"/api/yandexsearch/search?query={Uri.EscapeDataString(query)}&searchType={Uri.EscapeDataString(type.ToString())}&limit=20";
|
var url = $"/api/yandexsearch/search?query={Uri.EscapeDataString(query)}&searchType={Uri.EscapeDataString(type.ToString())}";
|
||||||
if (byId)
|
if (byId)
|
||||||
url += "&byId=true";
|
url += "&byId=true";
|
||||||
if (!string.IsNullOrEmpty(Token))
|
if (!string.IsNullOrEmpty(Token))
|
||||||
@@ -629,4 +876,146 @@
|
|||||||
throw new ArgumentException("Unsupported URL pattern");
|
throw new ArgumentException("Unsupported URL pattern");
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
#region Избранное / Фаворит
|
||||||
|
/// <summary>Установка галочки "избранное"</summary>
|
||||||
|
private async Task CheckFavoriteStatus()
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(Token)) return;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var response = await Http.GetFromJsonAsync<ApiResponse<bool>>($"/api/favorites/{Token}/check");
|
||||||
|
if (response?.Success == true)
|
||||||
|
_isFavorite = response.Data;
|
||||||
|
}
|
||||||
|
catch { }
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task ToggleFavorite()
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(Token)) return;
|
||||||
|
|
||||||
|
if (!_isAuthenticated)
|
||||||
|
{
|
||||||
|
Snackbar.Add("Добавление в избранное только авторизованным пользователям", Severity.Warning);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
_favoriteLoading = true;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (_isFavorite)
|
||||||
|
{
|
||||||
|
var response = await Http.DeleteAsync($"/api/favorites/{Token}");
|
||||||
|
if (response.IsSuccessStatusCode)
|
||||||
|
{
|
||||||
|
_isFavorite = false;
|
||||||
|
Snackbar.Add("Плейлист удалён из избранного", Severity.Success);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Snackbar.Add("Ошибка удаления из избранного", Severity.Error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
var response = await Http.PostAsync($"/api/favorites/{Token}", null);
|
||||||
|
if (response.IsSuccessStatusCode)
|
||||||
|
{
|
||||||
|
_isFavorite = true;
|
||||||
|
Snackbar.Add("Плейлист добавлен в избранное", Severity.Success);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Snackbar.Add("Ошибка добавления в избранное", Severity.Error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Snackbar.Add($"Ошибка: {ex.Message}", Severity.Error);
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
_favoriteLoading = false;
|
||||||
|
StateHasChanged();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region Настройка доступов к плейлисту
|
||||||
|
private async Task OpenPermissionsDialog()
|
||||||
|
{
|
||||||
|
if (_playlist == null) return;
|
||||||
|
var initialPermissions = new UpdatePermissionsDto
|
||||||
|
{
|
||||||
|
ViewPermission = _playlist.ViewPermission,
|
||||||
|
PlayPermission = _playlist.PlayPermission,
|
||||||
|
AddPermission = _playlist.AddPermission,
|
||||||
|
RemovePermission = _playlist.RemovePermission
|
||||||
|
};
|
||||||
|
var parameters = new DialogParameters
|
||||||
|
{
|
||||||
|
{ nameof(PermissionsDialog.ShareToken), Token },
|
||||||
|
{ nameof(PermissionsDialog.InitialPermissions), initialPermissions }
|
||||||
|
};
|
||||||
|
var dialog = await DialogService.ShowAsync<PermissionsDialog>("Настройки доступа", parameters);
|
||||||
|
var result = await dialog.Result;
|
||||||
|
}
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region Поделиться ссылкой
|
||||||
|
/// <summary> Поделиться ссылкой </summary>
|
||||||
|
private async Task SharePlaylist()
|
||||||
|
{
|
||||||
|
if (_shareModule == null) return;
|
||||||
|
|
||||||
|
var shareUrl = Navigation.Uri;
|
||||||
|
var shareTitle = "🎵 Поделиться плейлистом";
|
||||||
|
var shareText = _playlist?.Title != null
|
||||||
|
? $"Послушайте плейлист '{_playlist.Title}'!"
|
||||||
|
: "Послушайте этот плейлист!";
|
||||||
|
|
||||||
|
if (_isWebShareSupported)
|
||||||
|
{
|
||||||
|
var result = await _shareModule.InvokeAsync<ShareResult>("shareLink", shareTitle, shareText, shareUrl);
|
||||||
|
if (result?.Success == false && !string.IsNullOrEmpty(result.Error) && !result.Cancelled)
|
||||||
|
{
|
||||||
|
Snackbar.Add($"Не удалось поделиться: {result.Error}", Severity.Warning);
|
||||||
|
await ShowShareDialog(shareUrl);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
await ShowShareDialog(shareUrl);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary> Модальное окно, чтобы поделиться ссылкой </summary>
|
||||||
|
private async Task ShowShareDialog(string url)
|
||||||
|
{
|
||||||
|
var parameters = new DialogParameters<ShareDialog>
|
||||||
|
{
|
||||||
|
{ x => x.ShareUrl, url }
|
||||||
|
};
|
||||||
|
var options = new DialogOptions { CloseButton = true, MaxWidth = MaxWidth.Small, FullWidth = true };
|
||||||
|
await DialogService.ShowAsync<ShareDialog>("Поделиться", parameters, options);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Вспомогательный класс для результата
|
||||||
|
private class ShareResult
|
||||||
|
{
|
||||||
|
public bool Success { get; set; }
|
||||||
|
public string? Error { get; set; }
|
||||||
|
public bool Cancelled { get; set; }
|
||||||
|
}
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
public void Dispose()
|
||||||
|
{
|
||||||
|
AudioPlayerService.OnStartedTrack -= OnPlayerStateChanged;
|
||||||
|
AudioPlayerService.OnEndedTrack -= OnPlayerStateChanged;
|
||||||
|
|
||||||
|
_shareModule?.DisposeAsync();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -28,6 +28,9 @@
|
|||||||
<Content Update="wwwroot\js\AudioPlayer.js">
|
<Content Update="wwwroot\js\AudioPlayer.js">
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
|
<Content Update="wwwroot\js\shareUtils.js">
|
||||||
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
|
</Content>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ internal class Program
|
|||||||
builder.Services.AddScoped<PlayerStorage>();
|
builder.Services.AddScoped<PlayerStorage>();
|
||||||
builder.Services.AddScoped<AuthStateProvider>();
|
builder.Services.AddScoped<AuthStateProvider>();
|
||||||
builder.Services.AddScoped<AuthenticationStateProvider>(sp => sp.GetRequiredService<AuthStateProvider>());
|
builder.Services.AddScoped<AuthenticationStateProvider>(sp => sp.GetRequiredService<AuthStateProvider>());
|
||||||
|
builder.Services.AddScoped<ContextualActionBarService>();
|
||||||
builder.Services.AddScoped<ApiClient>();
|
builder.Services.AddScoped<ApiClient>();
|
||||||
builder.Services.AddScoped<IAudioPlayerService, AudioPlayerService>();
|
builder.Services.AddScoped<IAudioPlayerService, AudioPlayerService>();
|
||||||
|
|
||||||
|
|||||||
@@ -12,6 +12,15 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
"https (silent)": {
|
||||||
|
"commandName": "Project",
|
||||||
|
"dotnetRunMessages": true,
|
||||||
|
"applicationUrl": "https://localhost:7225;http://localhost:5181",
|
||||||
|
"environmentVariables": {
|
||||||
|
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
"https (prod)": {
|
"https (prod)": {
|
||||||
"commandName": "Project",
|
"commandName": "Project",
|
||||||
"dotnetRunMessages": true,
|
"dotnetRunMessages": true,
|
||||||
|
|||||||
@@ -41,6 +41,8 @@ public class AudioPlayerService : IAudioPlayerService
|
|||||||
public string TotalTimeString => _totalTimeString;
|
public string TotalTimeString => _totalTimeString;
|
||||||
|
|
||||||
public event Action? OnStateChanged;
|
public event Action? OnStateChanged;
|
||||||
|
public event Action? OnStartedTrack;
|
||||||
|
public event Action? OnEndedTrack;
|
||||||
|
|
||||||
public AudioPlayerService(TokenStorage tokenStorage, ISnackbar snackbar, HttpClient httpClient, PlayerStorage playerStorage)
|
public AudioPlayerService(TokenStorage tokenStorage, ISnackbar snackbar, HttpClient httpClient, PlayerStorage playerStorage)
|
||||||
{
|
{
|
||||||
@@ -105,6 +107,7 @@ public class AudioPlayerService : IAudioPlayerService
|
|||||||
_isPlaying = true;
|
_isPlaying = true;
|
||||||
OnStateChanged?.Invoke();
|
OnStateChanged?.Invoke();
|
||||||
OnLoadAndPlayRequested?.Invoke(trackId, accessToken, playlistShareToken);
|
OnLoadAndPlayRequested?.Invoke(trackId, accessToken, playlistShareToken);
|
||||||
|
OnStartedTrack?.Invoke();
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task PlayAsync()
|
public async Task PlayAsync()
|
||||||
@@ -112,6 +115,7 @@ public class AudioPlayerService : IAudioPlayerService
|
|||||||
_isPlaying = true;
|
_isPlaying = true;
|
||||||
OnStateChanged?.Invoke();
|
OnStateChanged?.Invoke();
|
||||||
OnPlayRequested?.Invoke();
|
OnPlayRequested?.Invoke();
|
||||||
|
OnStartedTrack?.Invoke();
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task PauseAsync()
|
public async Task PauseAsync()
|
||||||
@@ -175,6 +179,7 @@ public class AudioPlayerService : IAudioPlayerService
|
|||||||
_totalTime = 0;
|
_totalTime = 0;
|
||||||
_currentTimeString = "0:00";
|
_currentTimeString = "0:00";
|
||||||
OnStateChanged?.Invoke();
|
OnStateChanged?.Invoke();
|
||||||
|
OnEndedTrack?.Invoke();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
25
PlaylistShared.Pwa/Services/ContextualActionBarService.cs
Normal file
25
PlaylistShared.Pwa/Services/ContextualActionBarService.cs
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
using Microsoft.AspNetCore.Components;
|
||||||
|
|
||||||
|
namespace PlaylistShared.Pwa.Services;
|
||||||
|
|
||||||
|
public class ContextualActionBarService
|
||||||
|
{
|
||||||
|
// Событие, которое будет вызываться при изменении содержимого панели
|
||||||
|
public event Action? OnChanged;
|
||||||
|
|
||||||
|
public RenderFragment? Content { get; set; } = null;
|
||||||
|
|
||||||
|
public ContextualActionBarPosition Position { get; set; } = ContextualActionBarPosition.Default;
|
||||||
|
|
||||||
|
public void ChangeParameters()
|
||||||
|
{
|
||||||
|
OnChanged?.Invoke();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public enum ContextualActionBarPosition
|
||||||
|
{
|
||||||
|
Default,
|
||||||
|
Top,
|
||||||
|
Bottom,
|
||||||
|
}
|
||||||
@@ -66,6 +66,10 @@ public interface IAudioPlayerService
|
|||||||
/// Подписывайтесь на него, чтобы перерисовывать UI (например, иконку "пауза/плей").
|
/// Подписывайтесь на него, чтобы перерисовывать UI (например, иконку "пауза/плей").
|
||||||
/// </summary>
|
/// </summary>
|
||||||
event Action? OnStateChanged;
|
event Action? OnStateChanged;
|
||||||
|
|
||||||
|
event Action? OnStartedTrack;
|
||||||
|
|
||||||
|
event Action? OnEndedTrack;
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region События для связи с реальным компонентом AudioPlayer (Эти события вызываются сервисом)
|
#region События для связи с реальным компонентом AudioPlayer (Эти события вызываются сервисом)
|
||||||
|
|||||||
19
PlaylistShared.Pwa/wwwroot/js/shareUtils.js
Normal file
19
PlaylistShared.Pwa/wwwroot/js/shareUtils.js
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
export function isSupported() {
|
||||||
|
return !!navigator.share;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function shareLink(title, text, url) {
|
||||||
|
if (!navigator.share) {
|
||||||
|
return { success: false, error: 'Web Share API не поддерживается' };
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
await navigator.share({ title, text, url });
|
||||||
|
return { success: true };
|
||||||
|
} catch (error) {
|
||||||
|
if (error.name === 'AbortError') {
|
||||||
|
return { success: false, cancelled: true };
|
||||||
|
}
|
||||||
|
console.error('Ошибка при шеринге:', error);
|
||||||
|
return { success: false, error: error.message };
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -3,11 +3,15 @@
|
|||||||
"short_name": "PlaylistShare",
|
"short_name": "PlaylistShare",
|
||||||
"id": "./",
|
"id": "./",
|
||||||
"start_url": "./",
|
"start_url": "./",
|
||||||
"scope": "./",
|
"scope": "/",
|
||||||
"handle_links": "preferred",
|
"handle_links": "preferred",
|
||||||
"display": "standalone",
|
"display": "standalone",
|
||||||
"background_color": "#1a1a27",
|
"background_color": "#1a1a27",
|
||||||
"theme_color": "#7e6fff",
|
"theme_color": "#1a1a27",
|
||||||
|
"launch_handler": {
|
||||||
|
"client_mode": "focus-existing"
|
||||||
|
},
|
||||||
|
|
||||||
"prefer_related_applications": false,
|
"prefer_related_applications": false,
|
||||||
"icons": [
|
"icons": [
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -13,4 +13,5 @@ public enum TrackSearchType
|
|||||||
Album,
|
Album,
|
||||||
Playlist,
|
Playlist,
|
||||||
Track,
|
Track,
|
||||||
|
MyPlaylists,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,6 +17,18 @@ public class YandexSearchResult
|
|||||||
[JsonPropertyName("playlists")]
|
[JsonPropertyName("playlists")]
|
||||||
public List<YandexPlaylist>? Playlists { get; set; } = null;
|
public List<YandexPlaylist>? Playlists { get; set; } = null;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Персональные плейлисты.
|
||||||
|
/// </summary>
|
||||||
|
[JsonPropertyName("personalPlaylists")]
|
||||||
|
public List<YandexPlaylist>? PersonalPlaylists { get; set; } = null;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Плейлисты, которые понравились.
|
||||||
|
/// </summary>
|
||||||
|
[JsonPropertyName("likedPlaylists")]
|
||||||
|
public List<YandexPlaylist>? LikedPlaylists { get; set; } = null;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Найденные исполнители.
|
/// Найденные исполнители.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
Reference in New Issue
Block a user