diff --git a/PlaylistShared.Pwa/Pages/Home.razor b/PlaylistShared.Pwa/Pages/Home.razor index c816713..603f832 100644 --- a/PlaylistShared.Pwa/Pages/Home.razor +++ b/PlaylistShared.Pwa/Pages/Home.razor @@ -6,7 +6,7 @@ - 🎡 PlaylistShared + 🎡 Playlist share Π”Π΅Π»ΠΈΡ‚Π΅ΡΡŒ плСйлистами ЯндСкс.ΠœΡƒΠ·Ρ‹ΠΊΠΈ с Π΄Ρ€ΡƒΠ·ΡŒΡΠΌΠΈ ΠΈ управляйтС Ρ‚Ρ€Π΅ΠΊΠ°ΠΌΠΈ вмСстС! @@ -20,7 +20,7 @@ 1️⃣ РСгистрация ΠΈ Π²Ρ…ΠΎΠ΄ β€’ НаТмитС «РСгистрация» ΠΈ создайтС Π°ΠΊΠΊΠ°ΡƒΠ½Ρ‚.
- β€’ Или Π²ΠΎΠΉΠ΄ΠΈΡ‚Π΅ Ρ‡Π΅Ρ€Π΅Π· Π²Ρ…ΠΎΠ΄, Ссли ΡƒΠΆΠ΅ зарСгистрированы. + β€’ Или Π²ΠΎΠΉΠ΄ΠΈΡ‚Π΅ Π² систСму, Ссли ΡƒΠΆΠ΅ зарСгистрированы.
diff --git a/PlaylistShared.Pwa/Pages/MyPlaylists.razor b/PlaylistShared.Pwa/Pages/MyPlaylists.razor index b7fff4a..c63b21b 100644 --- a/PlaylistShared.Pwa/Pages/MyPlaylists.razor +++ b/PlaylistShared.Pwa/Pages/MyPlaylists.razor @@ -29,7 +29,7 @@ } else { - + НазваниС Π’Ρ€Π΅ΠΊΠΎΠ² @@ -37,9 +37,9 @@ - @context.Title - @context.TrackCount - + @context.Title + @context.TrackCount + @if (context.IsShared) { diff --git a/PlaylistShared.Pwa/Pages/SharedPlaylistView.razor b/PlaylistShared.Pwa/Pages/SharedPlaylistView.razor index 97ce21e..b4aeb79 100644 --- a/PlaylistShared.Pwa/Pages/SharedPlaylistView.razor +++ b/PlaylistShared.Pwa/Pages/SharedPlaylistView.razor @@ -112,10 +112,11 @@ } -
- Π’Ρ€Π΅ΠΊΠΈ - +
+ Π’Ρ€Π΅ΠΊΠΈ +
+ @if (_tracksLoading) { @@ -126,7 +127,7 @@ } else { - + # ОблоТка @@ -139,50 +140,52 @@ } - @context.Index - + @context.Index + @if (!string.IsNullOrEmpty(context.CoverUri)) { } - - + + @context.Title - @string.Join(", ", context.Artists) - @FormatDuration(context.DurationMs) + @string.Join(", ", context.Artists) + @FormatDuration(context.DurationMs) @if (_canRemove) { - + } - } } + + +
+ +
- @code { + +@code { [Parameter] public string Token { get; set; } private AudioPlayer? _audioPlayer; private string? _currentTrackId { get; set; } private bool _isPlaying = false; + private bool _isPlayerVisible = false; private SharedPlaylistDto? _playlist; private bool _loading = true; @@ -436,6 +439,8 @@ await _audioPlayer.LoadAndPlayAsync(trackId); _isPlaying = true; } + + _isPlayerVisible = true; } private async Task OnTrackEnded() diff --git a/PlaylistShared.Pwa/wwwroot/css/app.css b/PlaylistShared.Pwa/wwwroot/css/app.css index ab073c4..46ae5d0 100644 --- a/PlaylistShared.Pwa/wwwroot/css/app.css +++ b/PlaylistShared.Pwa/wwwroot/css/app.css @@ -122,4 +122,28 @@ code { .play-overlay { transition: opacity 0.2s ease; cursor: pointer; +} + +/* Ѐиксированный ΠΏΠ»Π΅Π΅Ρ€ Π²Π½ΠΈΠ·Ρƒ */ +.fixed-player { + position: sticky; + display: flex; + bottom: 0; + width: 100%; + right: 0; + justify-content: center; + background-color: var(--mud-palette-background); + box-shadow: 0 -2px 8px rgba(0, 0, 0, 0.1); +} + +/* ΠžΡ‚ΡΡ‚ΡƒΠΏ снизу, ΠΊΠΎΠ³Π΄Π° ΠΏΠ»Π΅Π΅Ρ€ Π²ΠΈΠ΄Π΅Π½ */ +.page-with-player { + padding-bottom: 80px; /* Высота ΠΏΠ»Π΅Π΅Ρ€Π° (ΠΏΠΎΠ΄Π±Π΅Ρ€ΠΈΡ‚Π΅ ΠΏΠΎΠ΄ свою Ρ‚Π΅ΠΌΡƒ) */ +} + +/* На ΠΌΠΎΠ±ΠΈΠ»ΡŒΠ½Ρ‹Ρ… устройствах ΠΌΠΎΠΆΠ½ΠΎ ΡƒΠΌΠ΅Π½ΡŒΡˆΠΈΡ‚ΡŒ отступ */ +@media (max-width: 600px) { + .page-with-player { + padding-bottom: 100px; /* Ссли ΠΏΠ»Π΅Π΅Ρ€ Π²Ρ‹ΡˆΠ΅ Π½Π° ΠΌΠΎΠ±ΠΈΠ»ΡŒΠ½Ρ‹Ρ… */ + } } \ No newline at end of file diff --git a/PlaylistShared.Pwa/wwwroot/favicon.png b/PlaylistShared.Pwa/wwwroot/favicon.png index 8a4358c..48b0ed3 100644 Binary files a/PlaylistShared.Pwa/wwwroot/favicon.png and b/PlaylistShared.Pwa/wwwroot/favicon.png differ diff --git a/PlaylistShared.Pwa/wwwroot/icon-192.png b/PlaylistShared.Pwa/wwwroot/icon-192.png index f275437..86a4117 100644 Binary files a/PlaylistShared.Pwa/wwwroot/icon-192.png and b/PlaylistShared.Pwa/wwwroot/icon-192.png differ diff --git a/PlaylistShared.Pwa/wwwroot/icon-512.png b/PlaylistShared.Pwa/wwwroot/icon-512.png index 2326ede..b16ee38 100644 Binary files a/PlaylistShared.Pwa/wwwroot/icon-512.png and b/PlaylistShared.Pwa/wwwroot/icon-512.png differ diff --git a/PlaylistShared.Pwa/wwwroot/index.html b/PlaylistShared.Pwa/wwwroot/index.html index 2f0e307..4225d8a 100644 --- a/PlaylistShared.Pwa/wwwroot/index.html +++ b/PlaylistShared.Pwa/wwwroot/index.html @@ -4,7 +4,7 @@ - PlaylistShared.Pwa + Playlist Share diff --git a/PlaylistShared.Pwa/wwwroot/manifest.webmanifest b/PlaylistShared.Pwa/wwwroot/manifest.webmanifest index f08c7ec..7dce5a2 100644 --- a/PlaylistShared.Pwa/wwwroot/manifest.webmanifest +++ b/PlaylistShared.Pwa/wwwroot/manifest.webmanifest @@ -1,5 +1,5 @@ { - "name": "Playlist Shared", + "name": "Playlist Share", "short_name": "PlaylistShare", "id": "./", "start_url": "./",