novaburst/funquail
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'develop' of ssh://code.eliotberriot.com:2222/funkwhale/funkwhale into develop

Browse source
This commit is contained in:
Eliot Berriot 2017-12-12 23:54:21 +01:00
commit 4d9dc77735
No known key found for this signature in database
GPG key ID: DD6965E2476E5C27
18 changed files with 77 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

1
front/package.json
View file

@ -19,6 +19,7 @@
"lodash": "^4.17.4",
"semantic-ui-css": "^2.2.10",
"vue": "^2.3.3",
"vue-lazyload": "^1.1.4",
"vue-resource": "^1.3.4",
"vue-router": "^2.3.1",
"vuedraggable": "^2.14.1"

6
front/src/components/audio/Player.vue
View file

@ -7,14 +7,14 @@
<img v-else src="../../assets/audio/default-cover.png">
</div>
<div class="middle aligned content">
<router-link class="small header discrete link track" :to="{name: 'library.track', params: {id: queue.currentTrack.id }}">
<router-link class="small header discrete link track" :to="{name: 'library.tracks.detail', params: {id: queue.currentTrack.id }}">
{{ queue.currentTrack.title }}
</router-link>
<div class="meta">
<router-link class="artist" :to="{name: 'library.artist', params: {id: queue.currentTrack.artist.id }}">
<router-link class="artist" :to="{name: 'library.artists.detail', params: {id: queue.currentTrack.artist.id }}">
{{ queue.currentTrack.artist.name }}
</router-link> /
<router-link class="album" :to="{name: 'library.album', params: {id: queue.currentTrack.album.id }}">
<router-link class="album" :to="{name: 'library.albums.detail', params: {id: queue.currentTrack.album.id }}">
{{ queue.currentTrack.album.title }}
</router-link>
</div>

6
front/src/components/audio/SearchBar.vue
View file

@ -35,7 +35,7 @@ export default {
let categories = [
{
code: 'artists',
route: 'library.artist',
route: 'library.artists.detail',
name: 'Artist',
getTitle (r) {
return r.name
@ -46,7 +46,7 @@ export default {
},
{
code: 'albums',
route: 'library.album',
route: 'library.albums.detail',
name: 'Album',
getTitle (r) {
return r.title
@ -57,7 +57,7 @@ export default {
},
{
code: 'tracks',
route: 'library.track',
route: 'library.tracks.detail',
name: 'Track',
getTitle (r) {
return r.title

8
front/src/components/audio/album/Card.vue
View file

@ -2,14 +2,14 @@
<div class="ui card">
<div class="content">
<div class="right floated tiny ui image">
<img v-if="album.cover" :src="backend.absoluteUrl(album.cover)">
<img v-if="album.cover" v-lazy="backend.absoluteUrl(album.cover)">
<img v-else src="../../../assets/audio/default-cover.png">
</div>
<div class="header">
<router-link class="discrete link" :to="{name: 'library.album', params: {id: album.id }}">{{ album.title }}</router-link>
<router-link class="discrete link" :to="{name: 'library.albums.detail', params: {id: album.id }}">{{ album.title }}</router-link>
</div>
<div class="meta">
By <router-link :to="{name: 'library.artist', params: {id: album.artist.id }}">
By <router-link :to="{name: 'library.artists.detail', params: {id: album.artist.id }}">
{{ album.artist.name }}
</router-link>
</div>
@ -21,7 +21,7 @@
<play-button class="basic icon" :track="track" :discrete="true"></play-button>
</td>
<td colspan="6">
<router-link class="track discrete link" :to="{name: 'library.track', params: {id: track.id }}">
<router-link class="track discrete link" :to="{name: 'library.tracks.detail', params: {id: track.id }}">
<template v-if="track.position">
{{ track.position }}.
</template>

4
front/src/components/audio/artist/Card.vue
View file

@ -2,7 +2,7 @@
<div class="ui card">
<div class="content">
<div class="header">
<router-link class="discrete link" :to="{name: 'library.artist', params: {id: artist.id }}">
<router-link class="discrete link" :to="{name: 'library.artists.detail', params: {id: artist.id }}">
{{ artist.name }}
</router-link>
</div>
@ -15,7 +15,7 @@
<img class="ui mini image" v-else src="../../../assets/audio/default-cover.png">
</td>
<td colspan="4">
<router-link class="discrete link":to="{name: 'library.album', params: {id: album.id }}">
<router-link class="discrete link":to="{name: 'library.albums.detail', params: {id: album.id }}">
<strong>{{ album.title }}</strong>
</router-link><br />
{{ album.tracks.length }} tracks

8
front/src/components/audio/track/Table.vue
View file

@ -16,11 +16,11 @@
<play-button class="basic icon" :discrete="true" :track="track"></play-button>
</td>
<td>
<img class="ui mini image" v-if="track.album.cover" :src="backend.absoluteUrl(track.album.cover)">
<img class="ui mini image" v-if="track.album.cover" v-lazy="backend.absoluteUrl(track.album.cover)">
<img class="ui mini image" v-else src="../../..//assets/audio/default-cover.png">
</td>
<td colspan="6">
<router-link class="track" :to="{name: 'library.track', params: {id: track.id }}">
<router-link class="track" :to="{name: 'library.tracks.detail', params: {id: track.id }}">
<template v-if="displayPosition && track.position">
{{ track.position }}.
</template>
@ -28,12 +28,12 @@
</router-link>
</td>
<td colspan="6">
<router-link class="artist discrete link" :to="{name: 'library.artist', params: {id: track.artist.id }}">
<router-link class="artist discrete link" :to="{name: 'library.artists.detail', params: {id: track.artist.id }}">
{{ track.artist.name }}
</router-link>
</td>
<td colspan="6">
<router-link class="album discrete link" :to="{name: 'library.album', params: {id: track.album.id }}">
<router-link class="album discrete link" :to="{name: 'library.albums.detail', params: {id: track.album.id }}">
{{ track.album.title }}
</router-link>
</td>

5
front/src/components/favorites/List.vue
View file

@ -18,6 +18,7 @@
v-if="results && results.count > 0"
@page-changed="selectPage"
:current="page"
:paginate-by="paginateBy"
:total="results.count"
></pagination>
</div>
@ -49,6 +50,7 @@ export default {
nextLink: null,
previousLink: null,
page: 1,
paginateBy: 25,
favoriteTracks
}
},
@ -61,7 +63,8 @@ export default {
this.isLoading = true
let params = {
favorites: 'true',
page: this.page
page: this.page,
page_size: this.paginateBy
}
logger.default.time('Loading user favorites')
this.$http.get(url, {params: params}).then((response) => {

2
front/src/components/library/Album.vue
View file

@ -12,7 +12,7 @@
{{ album.title }}
<div class="sub header">
Album containing {{ album.tracks.length }} tracks,
by <router-link :to="{name: 'library.artist', params: {id: album.artist.id }}">
by <router-link :to="{name: 'library.artists.detail', params: {id: album.artist.id }}">
{{ album.artist.name }}
</router-link>
</div>

7
front/src/components/library/Library.vue
View file

@ -2,8 +2,11 @@
<div class="main library pusher">
<div class="ui secondary pointing menu">
<router-link class="ui item" to="/library" exact>Browse</router-link>
<router-link v-if="auth.user.availablePermissions['import.launch']" class="ui item" to="/library/import/launch" exact>Import</router-link>
<router-link v-if="auth.user.availablePermissions['import.launch']" class="ui item" to="/library/import/batches">Import batches</router-link>
<router-link class="ui item" to="/library/artists" exact>Artists</router-link>
<div class="ui secondary right menu">
<router-link v-if="auth.user.availablePermissions['import.launch']" class="ui item" to="/library/import/launch" exact>Import</router-link>
<router-link v-if="auth.user.availablePermissions['import.launch']" class="ui item" to="/library/import/batches">Import batches</router-link>
</div>
</div>
<router-view></router-view>
</div>

4
front/src/components/library/Track.vue
View file

@ -12,10 +12,10 @@
{{ track.title }}
<div class="sub header">
From album
<router-link :to="{name: 'library.album', params: {id: track.album.id }}">
<router-link :to="{name: 'library.albums.detail', params: {id: track.album.id }}">
{{ track.album.title }}
</router-link>
by <router-link :to="{name: 'library.artist', params: {id: track.artist.id }}">
by <router-link :to="{name: 'library.artists.detail', params: {id: track.artist.id }}">
{{ track.artist.name }}
</router-link>
</div>

2
front/src/main.js
View file

@ -10,6 +10,7 @@ import App from './App'
import router from './router'
import VueResource from 'vue-resource'
import auth from './auth'
import VueLazyload from 'vue-lazyload'
window.$ = window.jQuery = require('jquery')
@ -19,6 +20,7 @@ window.$ = window.jQuery = require('jquery')
require('semantic-ui-css/semantic.js')
Vue.use(VueResource)
Vue.use(VueLazyload)
Vue.config.productionTip = false
Vue.http.interceptors.push(function (request, next) {

8
front/src/router/index.js
View file

@ -7,6 +7,7 @@ import Logout from '@/components/auth/Logout'
import Library from '@/components/library/Library'
import LibraryHome from '@/components/library/Home'
import LibraryArtist from '@/components/library/Artist'
import LibraryArtists from '@/components/library/Artists'
import LibraryAlbum from '@/components/library/Album'
import LibraryTrack from '@/components/library/Track'
import LibraryImport from '@/components/library/import/Main'
@ -51,9 +52,10 @@ export default new Router({
component: Library,
children: [
{ path: '', component: LibraryHome },
{ path: 'artist/:id', name: 'library.artist', component: LibraryArtist, props: true },
{ path: 'album/:id', name: 'library.album', component: LibraryAlbum, props: true },
{ path: 'track/:id', name: 'library.track', component: LibraryTrack, props: true },
{ path: 'artists/', name: 'library.artists.browse', component: LibraryArtists },
{ path: 'artists/:id', name: 'library.artists.detail', component: LibraryArtist, props: true },
{ path: 'albums/:id', name: 'library.albums.detail', component: LibraryAlbum, props: true },
{ path: 'tracks/:id', name: 'library.tracks.detail', component: LibraryTrack, props: true },
{
path: 'import/launch',
name: 'library.import.launch',