diff --git a/web-src/src/components/CoverArtwork.vue b/web-src/src/components/CoverArtwork.vue index d1e07c77..f63513e3 100644 --- a/web-src/src/components/CoverArtwork.vue +++ b/web-src/src/components/CoverArtwork.vue @@ -34,13 +34,7 @@ export default { }, caption() { - if (this.album) { - return this.album.substring(0, 2) - } - if (this.artist) { - return this.artist.substring(0, 2) - } - return '' + return (this.album || this.artist || '').substring(0, 2) } }, diff --git a/web-src/src/components/LyricsPane.vue b/web-src/src/components/LyricsPane.vue index 579f870c..b9258700 100644 --- a/web-src/src/components/LyricsPane.vue +++ b/web-src/src/components/LyricsPane.vue @@ -172,13 +172,13 @@ export default { } const currentVerse = pane.children[this.verse_index] pane.scrollBy({ + behavior: 'smooth', + left: 0, top: currentVerse.offsetTop - (pane.offsetHeight >> 1) + (currentVerse.offsetHeight >> 1) - - pane.scrollTop, - left: 0, - behavior: 'smooth' + pane.scrollTop }) } } diff --git a/web-src/src/components/NavbarTop.vue b/web-src/src/components/NavbarTop.vue index b7ad30fa..4674d187 100644 --- a/web-src/src/components/NavbarTop.vue +++ b/web-src/src/components/NavbarTop.vue @@ -6,28 +6,25 @@ aria-label="main navigation" >
- + - + - + - + - + - + - +
= 3600000 ? 'h:mm:ss' : 'm:ss' - return Duration.fromMillis(value_ms).toFormat(format) + channels(value) { + if (value === 1) { + return t('filter.mono') + } + if (value === 2) { + return t('filter.stereo') + } + if (!value) { + return '' + } + return t('filter.channels', { value }) + }, + cursor(path, size = 20) { + const viewbox = 24 + const center = size / 2 + return `url("data:image/svg+xml,%3Csvg width='${size}' height='${size}' viewBox='0 0 ${viewbox} ${viewbox}' xmlns='http://www.w3.org/2000/svg' %3E%3Cpath d='${path}'/%3E%3C/svg%3E") ${center} ${center}, auto` + }, + date(value) { + return DateTime.fromISO(value) + .setLocale(locale.value) + .toLocaleString(DateTime.DATE_FULL) + }, + datetime(value) { + return DateTime.fromISO(value) + .setLocale(locale.value) + .toLocaleString(DateTime.DATETIME_MED) }, - durationInDays(value_ms) { const minutes = Math.floor(value_ms / 60000) if (minutes > 1440) { @@ -22,44 +44,15 @@ export const filters = { } return Duration.fromObject({ minutes }).shiftTo('minutes').toHuman() }, - - date(value) { - return DateTime.fromISO(value) - .setLocale(locale.value) - .toLocaleString(DateTime.DATE_FULL) + durationInHours(value_ms) { + const format = value_ms >= 3600000 ? 'h:mm:ss' : 'm:ss' + return Duration.fromMillis(value_ms).toFormat(format) }, - - datetime(value) { - return DateTime.fromISO(value) - .setLocale(locale.value) - .toLocaleString(DateTime.DATETIME_MED) - }, - - timeFromNow(value) { - const diff = DateTime.now().diff(DateTime.fromISO(value)) - return this.durationInDays(diff.as('milliseconds')) - }, - number(value) { return value.toLocaleString(locale.value) }, - - channels(value) { - if (value === 1) { - return t('filter.mono') - } - if (value === 2) { - return t('filter.stereo') - } - if (!value) { - return '' - } - return t('filter.channels', { value }) - }, - - cursor(path, size = 20) { - const viewbox = 24 - const center = size / 2 - return `url("data:image/svg+xml,%3Csvg width='${size}' height='${size}' viewBox='0 0 ${viewbox} ${viewbox}' xmlns='http://www.w3.org/2000/svg' %3E%3Cpath d='${path}'/%3E%3C/svg%3E") ${center} ${center}, auto` + timeFromNow(value) { + const diff = DateTime.now().diff(DateTime.fromISO(value)) + return this.durationInDays(diff.as('milliseconds')) } } diff --git a/web-src/src/lib/GroupedList.js b/web-src/src/lib/GroupedList.js index ab1e9c80..415f3735 100644 --- a/web-src/src/lib/GroupedList.js +++ b/web-src/src/lib/GroupedList.js @@ -103,18 +103,18 @@ export class GroupedList { for (const [index, items] of this.itemsGrouped.entries()) { if (index !== NO_INDEX) { yield { - index: index, - itemId: index, + index, isItem: false, - item: {} + item: {}, + itemId: index } } for (const item of items) { yield { - index: index, - itemId: item.id, + index, isItem: true, - item: item + item, + itemId: item.id } } } diff --git a/web-src/src/pages/PageAlbum.vue b/web-src/src/pages/PageAlbum.vue index 9708c294..0eace00d 100644 --- a/web-src/src/pages/PageAlbum.vue +++ b/web-src/src/pages/PageAlbum.vue @@ -67,7 +67,7 @@ const dataObject = { index: { field: 'disc_number', type: Number } }) if (vm.tracks.indices.length < 2) { - vm.tracks.group({ index: { type: undefined } }) + vm.tracks.group() } } } diff --git a/web-src/src/pages/PageArtist.vue b/web-src/src/pages/PageArtist.vue index 7b15420d..b71c1c7b 100644 --- a/web-src/src/pages/PageArtist.vue +++ b/web-src/src/pages/PageArtist.vue @@ -183,7 +183,7 @@ export default { }, play() { webapi.player_play_uri( - this.albums.items.map((a) => a.uri).join(','), + this.albums.items.map((item) => item.uri).join(), true ) } diff --git a/web-src/src/pages/PageArtistSpotify.vue b/web-src/src/pages/PageArtistSpotify.vue index 9ca30cc7..2a49cf00 100644 --- a/web-src/src/pages/PageArtistSpotify.vue +++ b/web-src/src/pages/PageArtistSpotify.vue @@ -62,10 +62,10 @@ const dataObject = { return Promise.all([ spotifyApi.getArtist(to.params.id), spotifyApi.getArtistAlbums(to.params.id, { - limit: PAGE_SIZE, - offset: 0, include_groups: 'album,single', - market: store.state.spotify.webapi_country + limit: PAGE_SIZE, + market: store.state.spotify.webapi_country, + offset: 0 }) ]) }, diff --git a/web-src/src/pages/PageArtistTracks.vue b/web-src/src/pages/PageArtistTracks.vue index 034d09b2..82d93eca 100644 --- a/web-src/src/pages/PageArtistTracks.vue +++ b/web-src/src/pages/PageArtistTracks.vue @@ -131,7 +131,7 @@ export default { id: 2, name: this.$t('page.artist.sort.rating'), options: { - criteria: [{ field: 'rating', type: Number, order: -1 }], + criteria: [{ field: 'rating', order: -1, type: Number }], index: { field: 'rating', type: 'Digits' } } } @@ -169,7 +169,7 @@ export default { return this.$store.state.spotify.webapi_token_valid }, track_uris() { - return this.tracks_list.items.map((a) => a.uri).join(',') + return this.tracks_list.items.map((item) => item.uri).join() }, tracks() { const grouping = this.grouping_options.find( @@ -193,7 +193,7 @@ export default { }, play() { webapi.player_play_uri( - this.tracks_list.items.map((a) => a.uri).join(','), + this.tracks_list.items.map((item) => item.uri).join(), true ) } diff --git a/web-src/src/pages/PageArtists.vue b/web-src/src/pages/PageArtists.vue index 31f74eb3..f3faab0c 100644 --- a/web-src/src/pages/PageArtists.vue +++ b/web-src/src/pages/PageArtists.vue @@ -119,7 +119,7 @@ export default { id: 2, name: this.$t('page.artists.sort.recently-added'), options: { - criteria: [{ field: 'time_added', type: Date, order: -1 }], + criteria: [{ field: 'time_added', order: -1, type: Date }], index: { field: 'time_added', type: Date } } } diff --git a/web-src/src/pages/PageAudiobooksArtist.vue b/web-src/src/pages/PageAudiobooksArtist.vue index 38ea0da0..bc0ff888 100644 --- a/web-src/src/pages/PageAudiobooksArtist.vue +++ b/web-src/src/pages/PageAudiobooksArtist.vue @@ -88,7 +88,7 @@ export default { methods: { play() { webapi.player_play_uri( - this.albums.items.map((a) => a.uri).join(','), + this.albums.items.map((item) => item.uri).join(), false ) } diff --git a/web-src/src/pages/PageComposerTracks.vue b/web-src/src/pages/PageComposerTracks.vue index b56add98..0ff967df 100644 --- a/web-src/src/pages/PageComposerTracks.vue +++ b/web-src/src/pages/PageComposerTracks.vue @@ -119,7 +119,7 @@ export default { id: 2, name: this.$t('page.composer.sort.rating'), options: { - criteria: [{ field: 'rating', type: Number, order: -1 }], + criteria: [{ field: 'rating', order: -1, type: Number }], index: { field: 'rating', type: 'Digits' } } } diff --git a/web-src/src/pages/PageGenreTracks.vue b/web-src/src/pages/PageGenreTracks.vue index e27615ba..c0f48284 100644 --- a/web-src/src/pages/PageGenreTracks.vue +++ b/web-src/src/pages/PageGenreTracks.vue @@ -114,7 +114,7 @@ export default { id: 2, name: this.$t('page.genre.sort.rating'), options: { - criteria: [{ field: 'rating', type: Number, order: -1 }], + criteria: [{ field: 'rating', order: -1, type: Number }], index: { field: 'rating', type: 'Digits' } } } diff --git a/web-src/src/pages/PageMusicRecentlyAdded.vue b/web-src/src/pages/PageMusicRecentlyAdded.vue index ff7a2ab5..49dde010 100644 --- a/web-src/src/pages/PageMusicRecentlyAdded.vue +++ b/web-src/src/pages/PageMusicRecentlyAdded.vue @@ -33,7 +33,7 @@ const dataObject = { set(vm, response) { vm.recently_added = new GroupedList(response.data.albums, { - criteria: [{ field: 'time_added', type: Date, order: -1 }], + criteria: [{ field: 'time_added', order: -1, type: Date }], index: { field: 'time_added', type: Date } }) } diff --git a/web-src/src/pages/PagePlaylistTracks.vue b/web-src/src/pages/PagePlaylistTracks.vue index b71da8c6..e5f777a4 100644 --- a/web-src/src/pages/PagePlaylistTracks.vue +++ b/web-src/src/pages/PagePlaylistTracks.vue @@ -84,7 +84,7 @@ export default { computed: { uris() { if (this.playlist.random) { - return this.tracks.map((a) => a.uri).join(',') + return this.tracks.map((item) => item.uri).join() } return this.playlist.uri } diff --git a/web-src/src/pages/PagePlaylistTracksSpotify.vue b/web-src/src/pages/PagePlaylistTracksSpotify.vue index 6d352d5d..5e472adf 100644 --- a/web-src/src/pages/PagePlaylistTracksSpotify.vue +++ b/web-src/src/pages/PagePlaylistTracksSpotify.vue @@ -65,8 +65,8 @@ const dataObject = { spotifyApi.getPlaylist(to.params.id), spotifyApi.getPlaylistTracks(to.params.id, { limit: PAGE_SIZE, - offset: 0, - market: store.state.spotify.webapi_country + market: store.state.spotify.webapi_country, + offset: 0 }) ]) },