added history to queue, added see all to recently played to show all history, added .md-btn-small
This commit is contained in:
parent
405eac4216
commit
c7b0120326
3 changed files with 53 additions and 3 deletions
|
@ -2254,6 +2254,11 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
|
||||||
border-top: 1px solid rgb(220 53 69 / 50%);
|
border-top: 1px solid rgb(220 53 69 / 50%);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&.md-btn-small {
|
||||||
|
padding: 6px 8px;
|
||||||
|
font-size: 13px;
|
||||||
|
}
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
filter: brightness(125%);
|
filter: brightness(125%);
|
||||||
}
|
}
|
||||||
|
@ -2280,6 +2285,27 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.btn-group {
|
||||||
|
display:inline-flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
> .md-btn {
|
||||||
|
border-radius:0px;
|
||||||
|
width:100%;
|
||||||
|
}
|
||||||
|
> .md-btn:first-child {
|
||||||
|
border-top-left-radius: 6px;
|
||||||
|
border-bottom-left-radius: 6px;
|
||||||
|
}
|
||||||
|
> .md-btn:last-child {
|
||||||
|
border-top-right-radius: 6px;
|
||||||
|
border-bottom-right-radius: 6px;
|
||||||
|
}
|
||||||
|
> .md-btn:not(:first-child):not(:last-child) {
|
||||||
|
border-radius: 0px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.md-ico-play {
|
.md-ico-play {
|
||||||
content: url("./assets/play.svg");
|
content: url("./assets/play.svg");
|
||||||
width: 10px;
|
width: 10px;
|
||||||
|
|
|
@ -8,7 +8,10 @@
|
||||||
<button class="autoplay" :style="{'background': app.mk.autoplayEnabled ? 'var(--keyColor)' : ''}" @click="app.mk.autoplayEnabled = !app.mk.autoplayEnabled"> <img class="infinity"></button>
|
<button class="autoplay" :style="{'background': app.mk.autoplayEnabled ? 'var(--keyColor)' : ''}" @click="app.mk.autoplayEnabled = !app.mk.autoplayEnabled"> <img class="infinity"></button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="queue-body">
|
<div class="queue-body" v-if="page == 'history'">
|
||||||
|
<mediaitem-list-item v-for="item in history" :item="item"></mediaitem-list-item>
|
||||||
|
</div>
|
||||||
|
<div class="queue-body" v-if="page == 'queue'">
|
||||||
<draggable v-model="queueItems" @start="drag=true" @end="drag=false;move()">
|
<draggable v-model="queueItems" @start="drag=true" @end="drag=false;move()">
|
||||||
<template v-for="(queueItem, position) in queueItems">
|
<template v-for="(queueItem, position) in queueItems">
|
||||||
<div v-if="position <= queuePosition" style="display: none;">{{ position }}</div>
|
<div v-if="position <= queuePosition" style="display: none;">{{ position }}</div>
|
||||||
|
@ -33,7 +36,11 @@
|
||||||
</draggable>
|
</draggable>
|
||||||
</div>
|
</div>
|
||||||
<div class="queue-footer">
|
<div class="queue-footer">
|
||||||
<button class="md-btn" style="width:100%;" v-if="queueItems.length > 1" @click="app.mk.clearQueue();updateQueue()">{{app.getLz('term.clearAll')}}</button>
|
<div class="btn-group" style="width:100%;">
|
||||||
|
<button class="md-btn md-btn-small" :class="{'md-btn-primary': (page == 'queue')}" @click="page = 'queue'">Queue</button>
|
||||||
|
<button class="md-btn md-btn-small" :class="{'md-btn-primary': (page == 'history')}" @click="getHistory();page = 'history'">History</button>
|
||||||
|
</div>
|
||||||
|
<button class="md-btn md-btn-small" style="width:100%;margin-top:6px;" v-if="queueItems.length > 1" @click="app.mk.clearQueue();updateQueue()">{{app.getLz('term.clearAll')}}</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</script>
|
</script>
|
||||||
|
@ -49,6 +56,8 @@
|
||||||
queueItems: [],
|
queueItems: [],
|
||||||
selected: -1,
|
selected: -1,
|
||||||
selectedItems: [],
|
selectedItems: [],
|
||||||
|
history: [],
|
||||||
|
page: "queue",
|
||||||
app: this.$root
|
app: this.$root
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -56,6 +65,10 @@
|
||||||
this.updateQueue()
|
this.updateQueue()
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
async getHistory() {
|
||||||
|
let history = await app.mk.api.v3.music(`/v1/me/recent/played/tracks`)
|
||||||
|
this.history = history.data.data
|
||||||
|
},
|
||||||
select(e, position) {
|
select(e, position) {
|
||||||
if(e.ctrlKey || e.shiftKey) {
|
if(e.ctrlKey || e.shiftKey) {
|
||||||
if(this.selectedItems.indexOf(position) == -1) {
|
if(this.selectedItems.indexOf(position) == -1) {
|
||||||
|
|
|
@ -3,7 +3,14 @@
|
||||||
<div v-if="page == 'main'">
|
<div v-if="page == 'main'">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col">
|
<div class="col">
|
||||||
|
<div class="row nopadding">
|
||||||
|
<div class="col nopadding">
|
||||||
<h3>{{app.getLz('home.recentlyPlayed')}}</h3>
|
<h3>{{app.getLz('home.recentlyPlayed')}}</h3>
|
||||||
|
</div>
|
||||||
|
<div class="col-auto nopadding flex-center">
|
||||||
|
<button class="cd-btn-seeall" @click="seeAllHistory()">{{app.getLz('term.seeAll')}}</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="well artistfeed-well">
|
<div class="well artistfeed-well">
|
||||||
<template v-if="isSectionReady('recentlyPlayed')">
|
<template v-if="isSectionReady('recentlyPlayed')">
|
||||||
<mediaitem-list-item v-for="item in recentlyPlayed.limit(6)"
|
<mediaitem-list-item v-for="item in recentlyPlayed.limit(6)"
|
||||||
|
@ -104,6 +111,10 @@
|
||||||
await this.getFavorites()
|
await this.getFavorites()
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
async seeAllHistory() {
|
||||||
|
let hist = await app.mk.api.v3.music(`/v1/me/recent/played/tracks`)
|
||||||
|
app.showCollection(hist.data, "History")
|
||||||
|
},
|
||||||
isSectionReady(section) {
|
isSectionReady(section) {
|
||||||
return this.sectionsReady.includes(section)
|
return this.sectionsReady.includes(section)
|
||||||
},
|
},
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue