okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

improve item navigation

Browse source
This commit is contained in:
vapormusic 2021-12-09 15:34:59 +07:00
parent e9b9b5087c
commit 0ec69875d5
4 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
resources/cider-ui-tests/index.js
View file

@ -274,6 +274,7 @@ const app = new Vue({
"include[library-playlists]": "catalog,tracks", "include[library-playlists]": "catalog,tracks",
"fields[playlists]": "curatorName,playlistType,name,artwork,url", "fields[playlists]": "curatorName,playlistType,name,artwork,url",
"include[library-songs]": "catalog,artists,albums", "include[library-songs]": "catalog,artists,albums",
"fields[catalog]": "artistUrl,albumUrl",
"fields[songs]": "artistUrl,albumUrl"} "fields[songs]": "artistUrl,albumUrl"}
try { try {
this.showingPlaylist = await app.mk.api.library.playlist(id,params) this.showingPlaylist = await app.mk.api.library.playlist(id,params)
@ -395,8 +396,8 @@ const app = new Vue({
catch (_) { } catch (_) { }
if (albumId == "") { if (albumId == "") {
let albumQuery = await app.mk.api.search(item.attributes.albumName, { limit: 1, types: 'albums' })
try { try {
let albumQuery = await app.mk.api.search(item.attributes.albumName +" "+ (item.attributes.artistName ?? ""), { limit: 1, types: 'albums' })
if (albumQuery.albums.data.length > 0) { if (albumQuery.albums.data.length > 0) {
albumId = albumQuery.albums.data[0].id; albumId = albumQuery.albums.data[0].id;
console.log(albumId) console.log(albumId)
@ -446,6 +447,9 @@ const app = new Vue({
}, },
async getTypeFromID(kind, id, isLibrary = false, params = {}) { async getTypeFromID(kind, id, isLibrary = false, params = {}) {
var a; var a;
if ("kind" == "album" | "kind" == "albums") {
params["include"] = "tracks,artists,record-labels"
}
try { try {
a = await this.mkapi(kind.toString(), isLibrary, id.toString(), params); a = await this.mkapi(kind.toString(), isLibrary, id.toString(), params);
} catch (e) { } catch (e) {

2
resources/cider-ui-tests/views/components/mediaitem-square-large.ejs
View file

@ -26,7 +26,7 @@
<div class="title text-overflow-elipsis" @click='app.routeView(item)'> <div class="title text-overflow-elipsis" @click='app.routeView(item)'>
{{ item.attributes.name ?? '' }} {{ item.attributes.name ?? '' }}
</div> </div>
<div class="subtitle text-overflow-elipsis" v-if="item.attributes.artistName"> <div class="subtitle text-overflow-elipsis item-navigate" v-if="item.attributes.artistName" :style = "{'z-index': ((item.attributes.editorialNotes == null) && item.attributes.artistName) ? '4' : ''}" @click="if(item.attributes.artistName)app.searchAndNavigate(item,'artist')">
{{ item.attributes.artistName ?? '' }} {{ item.attributes.artistName ?? '' }}
</div> </div>

5
resources/cider-ui-tests/views/components/mediaitem-square-sp.ejs
View file

@ -28,7 +28,10 @@
{{ item.attributes.name }} {{ item.attributes.name }}
</div> </div>
<div class="subtitle text-overflow-elipsis " <div class="subtitle text-overflow-elipsis "
:style="{'color' : (item.attributes.artwork.textColor1 != null) ? ('#'+item.attributes.artwork.textColor1) : `#eee`}" style="padding-left: 4px;padding-right: 4px; display: -webkit-box;-webkit-box-orient: vertical; -webkit-line-clamp: 2;white-space: normal;"> :class="{'item-navigate': ((item.attributes.editorialNotes == null) && item.attributes.artistName)}"
:style="{ 'z-index': ((item.attributes.editorialNotes == null) && item.attributes.artistName) ? '4' : '' ,'color' : (item.attributes.artwork.textColor1 != null) ? ('#'+item.attributes.artwork.textColor1) : `#eee`}" style="padding-left: 4px;padding-right: 4px; display: -webkit-box;-webkit-box-orient: vertical; -webkit-line-clamp: 2;white-space: normal;"
@click="if((item.attributes.editorialNotes == null) && item.attributes.artistName)app.searchAndNavigate(item,'artist')"
>
{{ (item.attributes.editorialNotes != null) ? item.attributes.editorialNotes.short {{ (item.attributes.editorialNotes != null) ? item.attributes.editorialNotes.short
:(item.attributes.artistName ?? '') }} :(item.attributes.artistName ?? '') }}
</div> </div>

2
resources/cider-ui-tests/views/pages/cider-playlist.ejs
View file

@ -21,7 +21,7 @@
<div class="playlist-name">{{data.attributes ? (data.attributes.name ?? <div class="playlist-name">{{data.attributes ? (data.attributes.name ??
(data.attributes.title ?? '') ?? '') : ''}} (data.attributes.title ?? '') ?? '') : ''}}
</div> </div>
<div class="playlist-artist" v-if="data.attributes && data.attributes.artistName"> <div class="playlist-artist item-navigate" v-if="data.attributes && data.attributes.artistName" @click="if(data.attributes && data.attributes.artistName){ app.searchAndNavigate(data,'artist')}">
{{data.attributes ? (data.attributes.artistName ?? '') :''}} {{data.attributes ? (data.attributes.artistName ?? '') :''}}
</div> </div>
<div class="playlist-desc" v-if="data.attributes.editorialNotes"> <div class="playlist-desc" v-if="data.attributes.editorialNotes">