MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '170-channels-explore' into 'develop' 

See #170: channels discovery in UI

See merge request funkwhale/funkwhale!1081
This commit is contained in:
Eliot Berriot 2020-04-08 14:06:42 +02:00
parent 51a44d6d5a 873bc54d92
commit 7b442bfcbc
4 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
front/src/components/Sidebar.vue
View File

@ -135,7 +135,7 @@
</div>
</div>
<router-link class="header item" :to="{name: 'subscriptions'}" v-if="$store.state.auth.authenticated">
<translate translate-context="*/*/*/Noun">Subscriptions</translate>
<translate translate-context="*/*/*">Channels</translate>
</router-link>
<div class="item">
<header class="header">

7
front/src/components/audio/ChannelsWidget.vue
View File

@ -15,12 +15,7 @@
</button>
</template>
<template v-if="!isLoading && objects.length === 0">
<div class="ui placeholder segment">
<div class="ui icon header">
<i class="compact disc icon"></i>
No results matching your query
</div>
</div>
<empty-state @refresh="fetchData('channels/')" :refresh="true"></empty-state>
</template>
</div>
</template>

12
front/src/components/library/Home.vue
View File

@ -26,6 +26,14 @@
</album-widget>
</div>
</div>
<template v-if="scope === 'all'">
<h3 class="ui header" >
<translate translate-context="*/*/*">New channels</translate>
</h3>
<channels-widget :show-modification-date="true" :limit="12" :filters="{ordering: '-creation_date'}"></channels-widget>
</template>
</section>
</main>
</template>
@ -34,6 +42,7 @@
import axios from "axios"
import Search from "@/components/audio/Search"
import logger from "@/logging"
import ChannelsWidget from "@/components/audio/ChannelsWidget"
import ArtistCard from "@/components/audio/artist/Card"
import TrackWidget from "@/components/audio/track/Widget"
import AlbumWidget from "@/components/audio/album/Widget"
@ -51,7 +60,8 @@ export default {
ArtistCard,
TrackWidget,
AlbumWidget,
PlaylistWidget
PlaylistWidget,
ChannelsWidget,
},
data() {
return {

15
front/src/components/library/TagDetail.vue
View File

@ -14,7 +14,7 @@
<div class="ui hidden divider"></div>
<div class="ui row">
<artist-widget :controls="false" :filters="{playable: true, ordering: '-creation_date', tag: id}">
<artist-widget :key="id" :controls="false" :filters="{playable: true, ordering: '-creation_date', tag: id, include_channels: 'false'}">
<template slot="title">
<router-link :to="{name: 'library.artists.browse', query: {tag: id}}">
<translate translate-context="*/*/*/Noun">Artists</translate>
@ -23,7 +23,13 @@
</artist-widget>
<div class="ui hidden divider"></div>
<div class="ui hidden divider"></div>
<album-widget :show-count="true" :controls="false" :filters="{playable: true, ordering: '-creation_date', tag: id}">
<h3 class="ui header">
<translate translate-context="*/*/*">Channels</translate>
</h3>
<channels-widget :key="id" :show-modification-date="true" :limit="12" :filters="{tag: id, ordering: '-creation_date'}"></channels-widget>
<div class="ui hidden divider"></div>
<div class="ui hidden divider"></div>
<album-widget :key="id" :show-count="true" :controls="false" :filters="{playable: true, ordering: '-creation_date', tag: id}">
<template slot="title">
<router-link :to="{name: 'library.albums.browse', query: {tag: id}}">
<translate translate-context="*/*/*">Albums</translate>
@ -32,7 +38,7 @@
</album-widget>
<div class="ui hidden divider"></div>
<div class="ui hidden divider"></div>
<track-widget :show-count="true" :limit="12" item-classes="track-item inline" :url="'/tracks/'" :is-activity="false" :filters="{playable: true, ordering: '-creation_date', tag: id}">
<track-widget :key="id" :show-count="true" :limit="12" item-classes="track-item inline" :url="'/tracks/'" :is-activity="false" :filters="{playable: true, ordering: '-creation_date', tag: id}">
<template slot="title">
<translate translate-context="*/*/*">Tracks</translate>
</template>
@ -44,7 +50,7 @@
</template>
<script>
import ChannelsWidget from "@/components/audio/ChannelsWidget"
import TrackWidget from "@/components/audio/track/Widget"
import AlbumWidget from "@/components/audio/album/Widget"
import ArtistWidget from "@/components/audio/artist/Widget"
@ -59,6 +65,7 @@ export default {
AlbumWidget,
TrackWidget,
RadioButton,
ChannelsWidget,
},
computed: {
labels() {