diff --git a/api/funkwhale_api/music/management/commands/import_files.py b/api/funkwhale_api/music/management/commands/import_files.py index 541b60886..33f8ed2d1 100644 --- a/api/funkwhale_api/music/management/commands/import_files.py +++ b/api/funkwhale_api/music/management/commands/import_files.py @@ -226,7 +226,7 @@ class Command(BaseCommand): urllib.parse.urlencode([("import", reference)]), ) self.stdout.write( - "For details, please refer to import refrence '{}' or URL {}".format( + "For details, please refer to import reference '{}' or URL {}".format( reference, import_url ) ) @@ -246,7 +246,7 @@ class Command(BaseCommand): self.stderr.write("- {}: {}".format(path, error)) self.stdout.write( - "For details, please refer to import refrence '{}' or URL {}".format( + "For details, please refer to import reference '{}' or URL {}".format( reference, import_url ) ) diff --git a/changes/changelog.d/368.enhancement b/changes/changelog.d/368.enhancement new file mode 100644 index 000000000..7e8f78c0a --- /dev/null +++ b/changes/changelog.d/368.enhancement @@ -0,0 +1 @@ +Added button to search for objects on Discogs (#368) diff --git a/changes/changelog.d/419.enhancement b/changes/changelog.d/419.enhancement new file mode 100644 index 000000000..f4716b53e --- /dev/null +++ b/changes/changelog.d/419.enhancement @@ -0,0 +1 @@ +Favorites radio will not be visible if the user does not have any favorites (#419) \ No newline at end of file diff --git a/changes/changelog.d/708.enhancement b/changes/changelog.d/708.enhancement new file mode 100644 index 000000000..f3217e5a9 --- /dev/null +++ b/changes/changelog.d/708.enhancement @@ -0,0 +1 @@ +Aligned search headers with search results in the sidebar (#708) \ No newline at end of file diff --git a/changes/changelog.d/807.enhancement b/changes/changelog.d/807.enhancement new file mode 100644 index 000000000..bab8f9647 --- /dev/null +++ b/changes/changelog.d/807.enhancement @@ -0,0 +1 @@ +Clicking on the currently selected playlist in the Playlist popup will now close the popup (#807) \ No newline at end of file diff --git a/changes/changelog.d/832.enhancement b/changes/changelog.d/832.enhancement new file mode 100644 index 000000000..1a270b88e --- /dev/null +++ b/changes/changelog.d/832.enhancement @@ -0,0 +1 @@ +The currently playing track is now highlighted with an orange play icon (#832) \ No newline at end of file diff --git a/changes/changelog.d/864.enhancement b/changes/changelog.d/864.enhancement new file mode 100644 index 000000000..f903ac850 --- /dev/null +++ b/changes/changelog.d/864.enhancement @@ -0,0 +1 @@ +Redirect from / to /library when user is logged in (#864) diff --git a/front/src/components/Home.vue b/front/src/components/Home.vue index 9393d9b78..bbcc9a8f9 100644 --- a/front/src/components/Home.vue +++ b/front/src/components/Home.vue @@ -147,7 +147,19 @@ export default { let msg = this.$pgettext('Content/Home/List item/Verb', 'Get quality metadata about your music thanks to MusicBrainz') return this.$gettextInterpolate(msg, {url: this.musicbrainzUrl}) } + }, + watch: { + '$store.state.auth.authenticated': { + handler (v) { + if (v) { + console.log('Authenticated, redirecting to /library…') + this.$router.push('/library') + } + }, + immediate: true + } } + } diff --git a/front/src/components/Sidebar.vue b/front/src/components/Sidebar.vue index 8b183b215..0f2809064 100644 --- a/front/src/components/Sidebar.vue +++ b/front/src/components/Sidebar.vue @@ -466,6 +466,12 @@ $sidebar-color: #3d3e3f; border-radius: 0; } } + .ui.search .results { + vertical-align: middle; + } + .ui.search .name { + vertical-align: middle; + } } .ui.tiny.avatar.image { position: relative; diff --git a/front/src/components/audio/album/Card.vue b/front/src/components/audio/album/Card.vue index bdc0dd6cb..db6e8de6b 100644 --- a/front/src/components/audio/album/Card.vue +++ b/front/src/components/audio/album/Card.vue @@ -20,7 +20,7 @@ - + @@ -57,6 +57,7 @@ diff --git a/front/src/components/favorites/List.vue b/front/src/components/favorites/List.vue index d1bde0935..6402d417f 100644 --- a/front/src/components/favorites/List.vue +++ b/front/src/components/favorites/List.vue @@ -16,7 +16,7 @@ 1 favorite - +
@@ -115,7 +115,10 @@ export default { return { title: this.$pgettext('Head/Favorites/Title', 'Your Favorites') } - } + }, + hasFavorites () { + return this.$store.state.favorites.count > 0 + }, }, methods: { updateQueryString: function() { diff --git a/front/src/components/library/AlbumBase.vue b/front/src/components/library/AlbumBase.vue index 1f89bef88..2b3c978bc 100644 --- a/front/src/components/library/AlbumBase.vue +++ b/front/src/components/library/AlbumBase.vue @@ -61,7 +61,11 @@ View on MusicBrainz - + + Search on Discogs + + @@ -168,6 +172,13 @@ export default { return "https://musicbrainz.org/release/" + this.object.mbid } }, + discogsUrl() { + return ( + "https://discogs.com/search/?type=release&title=" + + encodeURI(this.object.title) + "&artist=" + + encodeURI(this.object.artist.name) + ) + }, headerStyle() { if (!this.object.cover.original) { return "" diff --git a/front/src/components/library/ArtistBase.vue b/front/src/components/library/ArtistBase.vue index 5da7370ba..3c21f603f 100644 --- a/front/src/components/library/ArtistBase.vue +++ b/front/src/components/library/ArtistBase.vue @@ -72,6 +72,10 @@ View on MusicBrainz + + + Search on Discogs + { diff --git a/front/src/components/library/Radios.vue b/front/src/components/library/Radios.vue index 9b2f7bf82..9f59db514 100644 --- a/front/src/components/library/Radios.vue +++ b/front/src/components/library/Radios.vue @@ -10,7 +10,7 @@ Instance radios
- +
@@ -144,7 +144,13 @@ export default { searchPlaceholder, title } - } + }, + isAuthenticated () { + return this.$store.state.auth.authenticated + }, + hasFavorites () { + return this.$store.state.favorites.count > 0 + }, }, methods: { updateQueryString: _.debounce(function() { diff --git a/front/src/components/library/TrackBase.vue b/front/src/components/library/TrackBase.vue index 4d396bd1a..4edd00c5d 100644 --- a/front/src/components/library/TrackBase.vue +++ b/front/src/components/library/TrackBase.vue @@ -76,6 +76,10 @@ View on MusicBrainz + + + Search on Discogs + - {{ playlist.name }} + {{ playlist.name }} {{ playlist.tracks_count }}