added quality selection in context menu and removed the quality modal, except for one case; translated cut, copy, ecc in italian
This commit is contained in:
parent
830f28b795
commit
76f354e3de
11
README.md
11
README.md
@ -7,8 +7,10 @@ This is just the WebUI for deemix, it should be used with deemix-pyweb or someth
|
|||||||
- Use Vue as much as possible
|
- Use Vue as much as possible
|
||||||
- First step: rewrite the app in Single File Components way ✅
|
- First step: rewrite the app in Single File Components way ✅
|
||||||
- Second step: Implement custom contextmenu ⚒
|
- Second step: Implement custom contextmenu ⚒
|
||||||
- Implemented a first version
|
- Copy and paste functions ✅
|
||||||
- Need heavy testing and more features
|
- Copy Link where possible ✅
|
||||||
|
- Copy Image URL where possible
|
||||||
|
- Define cases
|
||||||
- Third step: Implement routing for the whole app using Vue Router
|
- Third step: Implement routing for the whole app using Vue Router
|
||||||
- Fourth step: Remove jQuery
|
- Fourth step: Remove jQuery
|
||||||
- Make i18n async (https://kazupon.github.io/vue-i18n/guide/lazy-loading.html)
|
- Make i18n async (https://kazupon.github.io/vue-i18n/guide/lazy-loading.html)
|
||||||
@ -25,11 +27,6 @@ This is just the WebUI for deemix, it should be used with deemix-pyweb or someth
|
|||||||
- Maybe tabbing the section for easy navigation
|
- Maybe tabbing the section for easy navigation
|
||||||
- Could use a carousel, but it's not worth adding a new dep
|
- Could use a carousel, but it's not worth adding a new dep
|
||||||
- Variable selector near template inputs
|
- Variable selector near template inputs
|
||||||
- Add Custom Context menu to objects
|
|
||||||
- Copy Link where possible
|
|
||||||
- Copy Image URL where possible
|
|
||||||
- Context menu for pywebview (Context menu is blocked in pywebview)
|
|
||||||
- Copy and paste functions
|
|
||||||
- Block selection where it's not needed (keep only titles artists albums labels and useful data)
|
- Block selection where it's not needed (keep only titles artists albums labels and useful data)
|
||||||
- There's a SASS mixin for this. Need to use it in the proper classes
|
- There's a SASS mixin for this. Need to use it in the proper classes
|
||||||
- Better feedback for socket.io possible errors
|
- Better feedback for socket.io possible errors
|
||||||
|
File diff suppressed because one or more lines are too long
@ -8,14 +8,7 @@
|
|||||||
}"
|
}"
|
||||||
>
|
>
|
||||||
<h1>{{ title }}</h1>
|
<h1>{{ title }}</h1>
|
||||||
<div
|
<div role="button" aria-label="download" @click.stop="addToQueue" :data-link="link" class="fab right">
|
||||||
role="button"
|
|
||||||
aria-label="download"
|
|
||||||
@contextmenu.prevent="openQualityModal"
|
|
||||||
@click.stop="addToQueue"
|
|
||||||
:data-link="link"
|
|
||||||
class="fab right"
|
|
||||||
>
|
|
||||||
<i class="material-icons" :title="$t('globals.download_hint')">get_app</i>
|
<i class="material-icons" :title="$t('globals.download_hint')">get_app</i>
|
||||||
</div>
|
</div>
|
||||||
</header>
|
</header>
|
||||||
@ -64,18 +57,13 @@
|
|||||||
explicit
|
explicit
|
||||||
</i>
|
</i>
|
||||||
{{ release.title }}
|
{{ release.title }}
|
||||||
<i v-if="checkNewRelease(release.release_date)" class="material-icons" style="color:#FF7300;">
|
<i v-if="checkNewRelease(release.release_date)" class="material-icons" style="color: #ff7300;">
|
||||||
fiber_new
|
fiber_new
|
||||||
</i>
|
</i>
|
||||||
</td>
|
</td>
|
||||||
<td>{{ release.release_date }}</td>
|
<td>{{ release.release_date }}</td>
|
||||||
<td>{{ release.nb_song }}</td>
|
<td>{{ release.nb_song }}</td>
|
||||||
<td
|
<td @click.stop="addToQueue" :data-link="release.link" class="clickable">
|
||||||
@click.stop="addToQueue"
|
|
||||||
@contextmenu.prevent="openQualityModal"
|
|
||||||
:data-link="release.link"
|
|
||||||
class="clickable"
|
|
||||||
>
|
|
||||||
<i class="material-icons" :title="$t('globals.download_hint')">
|
<i class="material-icons" :title="$t('globals.download_hint')">
|
||||||
file_download
|
file_download
|
||||||
</i>
|
</i>
|
||||||
@ -129,9 +117,6 @@ export default {
|
|||||||
e.stopPropagation()
|
e.stopPropagation()
|
||||||
Downloads.sendAddToQueue(e.currentTarget.dataset.link)
|
Downloads.sendAddToQueue(e.currentTarget.dataset.link)
|
||||||
},
|
},
|
||||||
openQualityModal(e) {
|
|
||||||
this.$root.$emit('QualityModal:open', e.currentTarget.dataset.link)
|
|
||||||
},
|
|
||||||
sortBy(key) {
|
sortBy(key) {
|
||||||
if (key == this.sortKey) {
|
if (key == this.sortKey) {
|
||||||
this.sortOrder = this.sortOrder == 'asc' ? 'desc' : 'asc'
|
this.sortOrder = this.sortOrder == 'asc' ? 'desc' : 'asc'
|
||||||
@ -168,7 +153,7 @@ export default {
|
|||||||
this.sortKey = 'release_date'
|
this.sortKey = 'release_date'
|
||||||
this.sortOrder = 'desc'
|
this.sortOrder = 'desc'
|
||||||
this.head = [
|
this.head = [
|
||||||
{ title: this.$tc('globals.listTabs.title',1), sortKey: 'title' },
|
{ title: this.$tc('globals.listTabs.title', 1), sortKey: 'title' },
|
||||||
{ title: this.$t('globals.listTabs.releaseDate'), sortKey: 'release_date' },
|
{ title: this.$t('globals.listTabs.releaseDate'), sortKey: 'release_date' },
|
||||||
{ title: this.$tc('globals.listTabs.track', 2), sortKey: 'nb_song' },
|
{ title: this.$tc('globals.listTabs.track', 2), sortKey: 'nb_song' },
|
||||||
{ title: '', width: '32px' }
|
{ title: '', width: '32px' }
|
||||||
@ -182,13 +167,17 @@ export default {
|
|||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
showTable() {
|
showTable() {
|
||||||
if (this.body){
|
if (this.body) {
|
||||||
if (this.sortKey=='nb_song')
|
if (this.sortKey == 'nb_song')
|
||||||
return orderBy(this.body[this.currentTab], function (o) { return new Number(o.nb_song); }, this.sortOrder)
|
return orderBy(
|
||||||
else
|
this.body[this.currentTab],
|
||||||
return orderBy(this.body[this.currentTab], this.sortKey, this.sortOrder)
|
function (o) {
|
||||||
}
|
return new Number(o.nb_song)
|
||||||
else return []
|
},
|
||||||
|
this.sortOrder
|
||||||
|
)
|
||||||
|
else return orderBy(this.body[this.currentTab], this.sortKey, this.sortOrder)
|
||||||
|
} else return []
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
|
@ -36,11 +36,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div v-else id="charts_table">
|
<div v-else id="charts_table">
|
||||||
<button @click="changeCountry">{{ $t('charts.changeCountry') }}</button>
|
<button @click="changeCountry">{{ $t('charts.changeCountry') }}</button>
|
||||||
<button
|
<button @click.stop="addToQueue" :data-link="'https://www.deezer.com/playlist/' + id">
|
||||||
@contextmenu.prevent="openQualityModal"
|
|
||||||
@click.stop="addToQueue"
|
|
||||||
:data-link="'https://www.deezer.com/playlist/' + id"
|
|
||||||
>
|
|
||||||
{{ $t('charts.download') }}
|
{{ $t('charts.download') }}
|
||||||
</button>
|
</button>
|
||||||
<table class="table table--charts">
|
<table class="table table--charts">
|
||||||
@ -72,9 +68,7 @@
|
|||||||
<td class="table__cell--large breakline">
|
<td class="table__cell--large breakline">
|
||||||
{{
|
{{
|
||||||
track.title +
|
track.title +
|
||||||
(track.title_version && track.title.indexOf(track.title_version) == -1
|
(track.title_version && track.title.indexOf(track.title_version) == -1 ? ' ' + track.title_version : '')
|
||||||
? ' ' + track.title_version
|
|
||||||
: '')
|
|
||||||
}}
|
}}
|
||||||
</td>
|
</td>
|
||||||
<td
|
<td
|
||||||
@ -96,7 +90,6 @@
|
|||||||
</td>
|
</td>
|
||||||
<td
|
<td
|
||||||
class="table__cell--download"
|
class="table__cell--download"
|
||||||
@contextmenu.prevent="openQualityModal"
|
|
||||||
@click.stop="addToQueue"
|
@click.stop="addToQueue"
|
||||||
:data-link="track.link"
|
:data-link="track.link"
|
||||||
role="button"
|
role="button"
|
||||||
@ -146,9 +139,6 @@ export default {
|
|||||||
e.stopPropagation()
|
e.stopPropagation()
|
||||||
Downloads.sendAddToQueue(e.currentTarget.dataset.link)
|
Downloads.sendAddToQueue(e.currentTarget.dataset.link)
|
||||||
},
|
},
|
||||||
openQualityModal(e) {
|
|
||||||
this.$root.$emit('QualityModal:open', e.currentTarget.dataset.link)
|
|
||||||
},
|
|
||||||
getTrackList(event) {
|
getTrackList(event) {
|
||||||
document.getElementById('content').scrollTo(0, 0)
|
document.getElementById('content').scrollTo(0, 0)
|
||||||
|
|
||||||
|
@ -13,62 +13,86 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
import Downloads from '@/utils/downloads'
|
||||||
|
import downloadQualities from '@js/qualities'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
data: () => ({
|
data() {
|
||||||
menuOpen: false,
|
return {
|
||||||
xPos: 0,
|
menuOpen: false,
|
||||||
yPos: 0,
|
xPos: 0,
|
||||||
currentHref: '',
|
yPos: 0,
|
||||||
options: [
|
deezerHref: '',
|
||||||
{
|
generalHref: ''
|
||||||
label: 'Cut',
|
}
|
||||||
show: true,
|
},
|
||||||
// Use arrow functions to keep the Vue instance in 'this'
|
computed: {
|
||||||
// Use normal functions to keep the object instance in 'this'
|
options() {
|
||||||
action: () => {
|
// In the action property:
|
||||||
document.execCommand('Cut')
|
// Use arrow functions to keep the Vue instance in 'this'
|
||||||
|
// Use normal functions to keep the object instance in 'this'
|
||||||
|
|
||||||
|
const options = [
|
||||||
|
{
|
||||||
|
label: this.$t('globals.cut'),
|
||||||
|
show: true,
|
||||||
|
action: () => {
|
||||||
|
document.execCommand('Cut')
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: this.$t('globals.copy'),
|
||||||
|
show: true,
|
||||||
|
action: () => {
|
||||||
|
document.execCommand('Copy')
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: this.$t('globals.copyLink'),
|
||||||
|
show: false,
|
||||||
|
action: () => {
|
||||||
|
navigator.clipboard.writeText(this.generalHref).catch(err => {
|
||||||
|
console.error('Link copying failed', err)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: this.$t('globals.copyDeezerLink'),
|
||||||
|
show: false,
|
||||||
|
action: () => {
|
||||||
|
navigator.clipboard.writeText(this.deezerHref).catch(err => {
|
||||||
|
console.error('Download link copying failed', err)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: this.$t('globals.paste'),
|
||||||
|
show: true,
|
||||||
|
action: () => {
|
||||||
|
navigator.clipboard.readText().then(text => {
|
||||||
|
document.execCommand('insertText', undefined, text)
|
||||||
|
})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
]
|
||||||
{
|
|
||||||
label: 'Copy',
|
downloadQualities.forEach(quality => {
|
||||||
show: true,
|
options.push({
|
||||||
action: () => {
|
label: `${this.$t('globals.download', [quality.label])}`,
|
||||||
document.execCommand('Copy')
|
show: false,
|
||||||
}
|
action: this.tryToDownloadTrack.bind(null, quality.value)
|
||||||
},
|
})
|
||||||
{
|
})
|
||||||
label: 'Copy Link',
|
|
||||||
show: false,
|
return options
|
||||||
action: null
|
},
|
||||||
},
|
qualities() {
|
||||||
{
|
return downloadQualities
|
||||||
label: 'Copy Deezer Link',
|
}
|
||||||
show: false,
|
},
|
||||||
action: null
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: 'Paste',
|
|
||||||
show: true,
|
|
||||||
action: () => {
|
|
||||||
navigator.clipboard.readText().then(text => {
|
|
||||||
document.execCommand('insertText', undefined, text)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}),
|
|
||||||
mounted() {
|
mounted() {
|
||||||
document.body.addEventListener('contextmenu', this.showMenu)
|
document.body.addEventListener('contextmenu', this.showMenu)
|
||||||
|
document.body.addEventListener('click', this.hideMenu)
|
||||||
document.body.addEventListener('click', () => {
|
|
||||||
// Finish all operations before closing (may be not necessary)
|
|
||||||
this.$nextTick().then(() => {
|
|
||||||
this.menuOpen = false
|
|
||||||
|
|
||||||
this.options[2].show = false
|
|
||||||
this.options[3].show = false
|
|
||||||
})
|
|
||||||
})
|
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
showMenu(contextMenuEvent) {
|
showMenu(contextMenuEvent) {
|
||||||
@ -85,7 +109,8 @@ export default {
|
|||||||
|
|
||||||
// Show 'Copy Link' option
|
// Show 'Copy Link' option
|
||||||
if (elementClicked.matches('a')) {
|
if (elementClicked.matches('a')) {
|
||||||
this.showCopyLink(elementClicked.href)
|
this.generalHref = elementClicked.href
|
||||||
|
this.showCopyLinkOption()
|
||||||
}
|
}
|
||||||
|
|
||||||
let link = null
|
let link = null
|
||||||
@ -101,30 +126,43 @@ export default {
|
|||||||
|
|
||||||
// Show 'Copy Deezer Link' option
|
// Show 'Copy Deezer Link' option
|
||||||
if (link) {
|
if (link) {
|
||||||
this.showCopyDeezerLink(link)
|
this.deezerHref = link
|
||||||
|
this.showDeezerOptions(link)
|
||||||
}
|
}
|
||||||
|
|
||||||
this.menuOpen = true
|
this.menuOpen = true
|
||||||
},
|
},
|
||||||
|
hideMenu() {
|
||||||
|
if (!this.menuOpen) return
|
||||||
|
|
||||||
|
// Finish all operations before closing (may be not necessary)
|
||||||
|
this.$nextTick().then(() => {
|
||||||
|
this.menuOpen = false
|
||||||
|
|
||||||
|
this.options[2].show = false
|
||||||
|
this.options[3].show = false
|
||||||
|
|
||||||
|
for (i = 5; i <= 10; i++) {
|
||||||
|
this.options[i].show = false
|
||||||
|
}
|
||||||
|
})
|
||||||
|
},
|
||||||
positionMenu(newX, newY) {
|
positionMenu(newX, newY) {
|
||||||
this.xPos = `${newX}px`
|
this.xPos = `${newX}px`
|
||||||
this.yPos = `${newY}px`
|
this.yPos = `${newY}px`
|
||||||
},
|
},
|
||||||
showCopyLink(href) {
|
showCopyLinkOption() {
|
||||||
this.options[2].show = true
|
this.options[2].show = true
|
||||||
this.options[2].action = () => {
|
},
|
||||||
navigator.clipboard.writeText(href).catch(err => {
|
showDeezerOptions() {
|
||||||
console.error('Link copying failed', err)
|
this.options[3].show = true
|
||||||
})
|
|
||||||
|
for (i = 5; i <= 10; i++) {
|
||||||
|
this.options[i].show = true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
showCopyDeezerLink(link) {
|
tryToDownloadTrack(qualityValue) {
|
||||||
this.options[3].show = true
|
Downloads.sendAddToQueue(this.deezerHref, qualityValue)
|
||||||
this.options[3].action = () => {
|
|
||||||
navigator.clipboard.writeText(link).catch(err => {
|
|
||||||
console.error('Download link copying failed', err)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -164,6 +202,10 @@ export default {
|
|||||||
background: var(--table-highlight);
|
background: var(--table-highlight);
|
||||||
filter: brightness(150%);
|
filter: brightness(150%);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&__text {
|
||||||
|
text-transform: capitalize;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Resetting buttons only for this component (because the style is scoped)
|
// Resetting buttons only for this component (because the style is scoped)
|
||||||
|
@ -38,7 +38,6 @@
|
|||||||
<div
|
<div
|
||||||
role="button"
|
role="button"
|
||||||
aria-label="download"
|
aria-label="download"
|
||||||
@contextmenu.prevent="openQualityModal"
|
|
||||||
@click.stop="addToQueue"
|
@click.stop="addToQueue"
|
||||||
:data-link="release.link"
|
:data-link="release.link"
|
||||||
class="download_overlay"
|
class="download_overlay"
|
||||||
@ -48,9 +47,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<p class="primary-text">{{ release.title }}</p>
|
<p class="primary-text">{{ release.title }}</p>
|
||||||
<p class="secondary-text">
|
<p class="secondary-text">
|
||||||
{{
|
{{ `${$t('globals.by', [release.creator.name])} - ${$tc('globals.listTabs.trackN', release.nb_tracks)}` }}
|
||||||
`${$t('globals.by', [release.creator.name])} - ${$tc('globals.listTabs.trackN', release.nb_tracks)}`
|
|
||||||
}}
|
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
@ -64,7 +61,6 @@
|
|||||||
<div
|
<div
|
||||||
role="button"
|
role="button"
|
||||||
aria-label="download"
|
aria-label="download"
|
||||||
@contextmenu.prevent="openQualityModal"
|
|
||||||
@click.stop="addToQueue"
|
@click.stop="addToQueue"
|
||||||
:data-link="release.link"
|
:data-link="release.link"
|
||||||
class="download_overlay"
|
class="download_overlay"
|
||||||
@ -74,12 +70,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<p class="primary-text">{{ release.title }}</p>
|
<p class="primary-text">{{ release.title }}</p>
|
||||||
<p class="secondary-text">
|
<p class="secondary-text">
|
||||||
{{
|
{{ `${$t('globals.by', [release.creator.name])} - ${$tc('globals.listTabs.trackN', release.nb_tracks)}` }}
|
||||||
`${$t('globals.by', [release.creator.name])} - ${$tc(
|
|
||||||
'globals.listTabs.trackN',
|
|
||||||
release.nb_tracks
|
|
||||||
)}`
|
|
||||||
}}
|
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -95,7 +86,6 @@
|
|||||||
<div
|
<div
|
||||||
role="button"
|
role="button"
|
||||||
aria-label="download"
|
aria-label="download"
|
||||||
@contextmenu.prevent="openQualityModal"
|
|
||||||
@click.stop="addToQueue"
|
@click.stop="addToQueue"
|
||||||
:data-link="release.link"
|
:data-link="release.link"
|
||||||
class="download_overlay"
|
class="download_overlay"
|
||||||
@ -119,7 +109,6 @@
|
|||||||
<div
|
<div
|
||||||
role="button"
|
role="button"
|
||||||
aria-label="download"
|
aria-label="download"
|
||||||
@contextmenu.prevent="openQualityModal"
|
|
||||||
@click.stop="addToQueue"
|
@click.stop="addToQueue"
|
||||||
:data-link="release.link"
|
:data-link="release.link"
|
||||||
class="download_overlay"
|
class="download_overlay"
|
||||||
@ -163,7 +152,7 @@
|
|||||||
<td class="table__cell--large breakline">
|
<td class="table__cell--large breakline">
|
||||||
{{
|
{{
|
||||||
track.title +
|
track.title +
|
||||||
(track.title_version && track.title.indexOf(track.title_version) == -1 ? ' ' + track.title_version : '')
|
(track.title_version && track.title.indexOf(track.title_version) == -1 ? ' ' + track.title_version : '')
|
||||||
}}
|
}}
|
||||||
</td>
|
</td>
|
||||||
<td
|
<td
|
||||||
@ -185,7 +174,6 @@
|
|||||||
</td>
|
</td>
|
||||||
<td
|
<td
|
||||||
class="table__cell--download clickable"
|
class="table__cell--download clickable"
|
||||||
@contextmenu.prevent="openQualityModal"
|
|
||||||
@click.stop="addToQueue"
|
@click.stop="addToQueue"
|
||||||
:data-link="track.link"
|
:data-link="track.link"
|
||||||
role="button"
|
role="button"
|
||||||
@ -267,9 +255,6 @@ export default {
|
|||||||
e.stopPropagation()
|
e.stopPropagation()
|
||||||
Downloads.sendAddToQueue(e.currentTarget.dataset.link)
|
Downloads.sendAddToQueue(e.currentTarget.dataset.link)
|
||||||
},
|
},
|
||||||
openQualityModal(e) {
|
|
||||||
this.$root.$emit('QualityModal:open', e.currentTarget.dataset.link)
|
|
||||||
},
|
|
||||||
updated_userSpotifyPlaylists(data) {
|
updated_userSpotifyPlaylists(data) {
|
||||||
this.spotifyPlaylists = data
|
this.spotifyPlaylists = data
|
||||||
},
|
},
|
||||||
|
@ -20,7 +20,6 @@
|
|||||||
<div
|
<div
|
||||||
role="button"
|
role="button"
|
||||||
aria-label="download"
|
aria-label="download"
|
||||||
@contextmenu.prevent="openQualityModal"
|
|
||||||
@click.stop="addToQueue"
|
@click.stop="addToQueue"
|
||||||
:data-link="release.link"
|
:data-link="release.link"
|
||||||
class="download_overlay"
|
class="download_overlay"
|
||||||
@ -50,7 +49,6 @@
|
|||||||
<div
|
<div
|
||||||
role="button"
|
role="button"
|
||||||
aria-label="download"
|
aria-label="download"
|
||||||
@contextmenu.prevent="openQualityModal"
|
|
||||||
@click.stop="addToQueue"
|
@click.stop="addToQueue"
|
||||||
:data-link="release.link"
|
:data-link="release.link"
|
||||||
class="download_overlay"
|
class="download_overlay"
|
||||||
@ -89,9 +87,6 @@ export default {
|
|||||||
addToQueue(e) {
|
addToQueue(e) {
|
||||||
Downloads.sendAddToQueue(e.currentTarget.dataset.link)
|
Downloads.sendAddToQueue(e.currentTarget.dataset.link)
|
||||||
},
|
},
|
||||||
openQualityModal(e) {
|
|
||||||
this.$root.$emit('QualityModal:open', e.currentTarget.dataset.link)
|
|
||||||
},
|
|
||||||
initHome(data) {
|
initHome(data) {
|
||||||
const {
|
const {
|
||||||
playlists: { data: playlistData },
|
playlists: { data: playlistData },
|
||||||
|
@ -9,8 +9,12 @@
|
|||||||
<li class="section-tabs__tab search_tablinks" id="search_all_tab">{{ $t('globals.listTabs.all') }}</li>
|
<li class="section-tabs__tab search_tablinks" id="search_all_tab">{{ $t('globals.listTabs.all') }}</li>
|
||||||
<li class="section-tabs__tab search_tablinks" id="search_track_tab">{{ $tc('globals.listTabs.track', 2) }}</li>
|
<li class="section-tabs__tab search_tablinks" id="search_track_tab">{{ $tc('globals.listTabs.track', 2) }}</li>
|
||||||
<li class="section-tabs__tab search_tablinks" id="search_album_tab">{{ $tc('globals.listTabs.album', 2) }}</li>
|
<li class="section-tabs__tab search_tablinks" id="search_album_tab">{{ $tc('globals.listTabs.album', 2) }}</li>
|
||||||
<li class="section-tabs__tab search_tablinks" id="search_artist_tab">{{ $tc('globals.listTabs.artist', 2) }}</li>
|
<li class="section-tabs__tab search_tablinks" id="search_artist_tab">
|
||||||
<li class="section-tabs__tab search_tablinks" id="search_playlist_tab">{{ $tc('globals.listTabs.playlist', 2) }}</li>
|
{{ $tc('globals.listTabs.artist', 2) }}
|
||||||
|
</li>
|
||||||
|
<li class="section-tabs__tab search_tablinks" id="search_playlist_tab">
|
||||||
|
{{ $tc('globals.listTabs.playlist', 2) }}
|
||||||
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<div id="search_tab_content">
|
<div id="search_tab_content">
|
||||||
<!-- ### Main Search Tab ### -->
|
<!-- ### Main Search Tab ### -->
|
||||||
@ -19,7 +23,7 @@
|
|||||||
<section
|
<section
|
||||||
v-if="
|
v-if="
|
||||||
(section != 'TOP_RESULT' && results.allTab[section].data.length > 0) ||
|
(section != 'TOP_RESULT' && results.allTab[section].data.length > 0) ||
|
||||||
results.allTab[section].length > 0
|
results.allTab[section].length > 0
|
||||||
"
|
"
|
||||||
class="search_section"
|
class="search_section"
|
||||||
>
|
>
|
||||||
@ -46,7 +50,6 @@
|
|||||||
<div
|
<div
|
||||||
role="button"
|
role="button"
|
||||||
aria-label="download"
|
aria-label="download"
|
||||||
@contextmenu.prevent="openQualityModal"
|
|
||||||
@click.stop="addToQueue"
|
@click.stop="addToQueue"
|
||||||
:data-link="results.allTab.TOP_RESULT[0].link"
|
:data-link="results.allTab.TOP_RESULT[0].link"
|
||||||
class="download_overlay"
|
class="download_overlay"
|
||||||
@ -61,13 +64,11 @@
|
|||||||
results.allTab.TOP_RESULT[0].type == 'artist'
|
results.allTab.TOP_RESULT[0].type == 'artist'
|
||||||
? $t('search.fans', [$n(results.allTab.TOP_RESULT[0].nb_fan)])
|
? $t('search.fans', [$n(results.allTab.TOP_RESULT[0].nb_fan)])
|
||||||
: $t('globals.by', [results.allTab.TOP_RESULT[0].artist]) +
|
: $t('globals.by', [results.allTab.TOP_RESULT[0].artist]) +
|
||||||
' - ' +
|
' - ' +
|
||||||
$tc('globals.listTabs.trackN', results.allTab.TOP_RESULT[0].nb_song)
|
$tc('globals.listTabs.trackN', results.allTab.TOP_RESULT[0].nb_song)
|
||||||
}}
|
}}
|
||||||
</p>
|
</p>
|
||||||
<span class="tag">{{
|
<span class="tag">{{ $tc(`globals.listTabs.${results.allTab.TOP_RESULT[0].type}`, 1) }}</span>
|
||||||
$tc(`globals.listTabs.${results.allTab.TOP_RESULT[0].type}`, 1)
|
|
||||||
}}</span>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div v-else-if="section == 'TRACK'">
|
<div v-else-if="section == 'TRACK'">
|
||||||
@ -79,8 +80,8 @@
|
|||||||
class="rounded coverart"
|
class="rounded coverart"
|
||||||
:src="
|
:src="
|
||||||
'https://e-cdns-images.dzcdn.net/images/cover/' +
|
'https://e-cdns-images.dzcdn.net/images/cover/' +
|
||||||
track.ALB_PICTURE +
|
track.ALB_PICTURE +
|
||||||
'/32x32-000000-80-0-0.jpg'
|
'/32x32-000000-80-0-0.jpg'
|
||||||
"
|
"
|
||||||
/>
|
/>
|
||||||
</td>
|
</td>
|
||||||
@ -113,7 +114,6 @@
|
|||||||
</td>
|
</td>
|
||||||
<td
|
<td
|
||||||
class="table__cell--download table__cell--center clickable"
|
class="table__cell--download table__cell--center clickable"
|
||||||
@contextmenu.prevent="openQualityModal"
|
|
||||||
@click.stop="addToQueue"
|
@click.stop="addToQueue"
|
||||||
:data-link="'https://www.deezer.com/track/' + track.SNG_ID"
|
:data-link="'https://www.deezer.com/track/' + track.SNG_ID"
|
||||||
role="button"
|
role="button"
|
||||||
@ -140,14 +140,13 @@
|
|||||||
class="circle coverart"
|
class="circle coverart"
|
||||||
:src="
|
:src="
|
||||||
'https://e-cdns-images.dzcdn.net/images/artist/' +
|
'https://e-cdns-images.dzcdn.net/images/artist/' +
|
||||||
release.ART_PICTURE +
|
release.ART_PICTURE +
|
||||||
'/156x156-000000-80-0-0.jpg'
|
'/156x156-000000-80-0-0.jpg'
|
||||||
"
|
"
|
||||||
/>
|
/>
|
||||||
<div
|
<div
|
||||||
role="button"
|
role="button"
|
||||||
aria-label="download"
|
aria-label="download"
|
||||||
@contextmenu.prevent="openQualityModal"
|
|
||||||
@click.stop="addToQueue"
|
@click.stop="addToQueue"
|
||||||
:data-link="'https://deezer.com/artist/' + release.ART_ID"
|
:data-link="'https://deezer.com/artist/' + release.ART_ID"
|
||||||
class="download_overlay"
|
class="download_overlay"
|
||||||
@ -172,14 +171,13 @@
|
|||||||
class="rounded coverart"
|
class="rounded coverart"
|
||||||
:src="
|
:src="
|
||||||
'https://e-cdns-images.dzcdn.net/images/cover/' +
|
'https://e-cdns-images.dzcdn.net/images/cover/' +
|
||||||
release.ALB_PICTURE +
|
release.ALB_PICTURE +
|
||||||
'/156x156-000000-80-0-0.jpg'
|
'/156x156-000000-80-0-0.jpg'
|
||||||
"
|
"
|
||||||
/>
|
/>
|
||||||
<div
|
<div
|
||||||
role="button"
|
role="button"
|
||||||
aria-label="download"
|
aria-label="download"
|
||||||
@contextmenu.prevent="openQualityModal"
|
|
||||||
@click.stop="addToQueue"
|
@click.stop="addToQueue"
|
||||||
:data-link="'https://deezer.com/album/' + release.ALB_ID"
|
:data-link="'https://deezer.com/album/' + release.ALB_ID"
|
||||||
class="download_overlay"
|
class="download_overlay"
|
||||||
@ -195,7 +193,9 @@
|
|||||||
>
|
>
|
||||||
{{ release.ALB_TITLE }}
|
{{ release.ALB_TITLE }}
|
||||||
</p>
|
</p>
|
||||||
<p class="secondary-text">{{ release.ART_NAME + ' - ' + $tc('globals.listTabs.trackN', release.NUMBER_TRACK) }}</p>
|
<p class="secondary-text">
|
||||||
|
{{ release.ART_NAME + ' - ' + $tc('globals.listTabs.trackN', release.NUMBER_TRACK) }}
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div v-else-if="section == 'PLAYLIST'" class="release_grid firstrow_only">
|
<div v-else-if="section == 'PLAYLIST'" class="release_grid firstrow_only">
|
||||||
@ -211,16 +211,15 @@
|
|||||||
class="rounded coverart"
|
class="rounded coverart"
|
||||||
:src="
|
:src="
|
||||||
'https://e-cdns-images.dzcdn.net/images/' +
|
'https://e-cdns-images.dzcdn.net/images/' +
|
||||||
release.PICTURE_TYPE +
|
release.PICTURE_TYPE +
|
||||||
'/' +
|
'/' +
|
||||||
release.PLAYLIST_PICTURE +
|
release.PLAYLIST_PICTURE +
|
||||||
'/156x156-000000-80-0-0.jpg'
|
'/156x156-000000-80-0-0.jpg'
|
||||||
"
|
"
|
||||||
/>
|
/>
|
||||||
<div
|
<div
|
||||||
role="button"
|
role="button"
|
||||||
aria-label="download"
|
aria-label="download"
|
||||||
@contextmenu.prevent="openQualityModal"
|
|
||||||
@click.stop="addToQueue"
|
@click.stop="addToQueue"
|
||||||
:data-link="'https://deezer.com/playlist/' + release.PLAYLIST_ID"
|
:data-link="'https://deezer.com/playlist/' + release.PLAYLIST_ID"
|
||||||
class="download_overlay"
|
class="download_overlay"
|
||||||
@ -292,9 +291,9 @@
|
|||||||
</i>
|
</i>
|
||||||
{{
|
{{
|
||||||
track.title +
|
track.title +
|
||||||
(track.title_version && track.title.indexOf(track.title_version) == -1
|
(track.title_version && track.title.indexOf(track.title_version) == -1
|
||||||
? ' ' + track.title_version
|
? ' ' + track.title_version
|
||||||
: '')
|
: '')
|
||||||
}}
|
}}
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
@ -317,7 +316,6 @@
|
|||||||
</td>
|
</td>
|
||||||
<td
|
<td
|
||||||
class="table__cell--download table__cell--center clickable"
|
class="table__cell--download table__cell--center clickable"
|
||||||
@contextmenu.prevent="openQualityModal"
|
|
||||||
@click.stop="addToQueue"
|
@click.stop="addToQueue"
|
||||||
:data-link="track.link"
|
:data-link="track.link"
|
||||||
role="button"
|
role="button"
|
||||||
@ -349,7 +347,6 @@
|
|||||||
<div
|
<div
|
||||||
role="button"
|
role="button"
|
||||||
aria-label="download"
|
aria-label="download"
|
||||||
@contextmenu.prevent="openQualityModal"
|
|
||||||
@click.stop="addToQueue"
|
@click.stop="addToQueue"
|
||||||
:data-link="release.link"
|
:data-link="release.link"
|
||||||
class="download_overlay"
|
class="download_overlay"
|
||||||
@ -361,7 +358,11 @@
|
|||||||
<i v-if="release.explicit_lyrics" class="material-icons explicit_icon">explicit</i>
|
<i v-if="release.explicit_lyrics" class="material-icons explicit_icon">explicit</i>
|
||||||
{{ release.title }}
|
{{ release.title }}
|
||||||
</p>
|
</p>
|
||||||
<p class="secondary-text">{{ $t('globals.by', [release.artist.name]) + ' - ' + $tc('globals.listTabs.trackN', release.nb_tracks) }}</p>
|
<p class="secondary-text">
|
||||||
|
{{
|
||||||
|
$t('globals.by', [release.artist.name]) + ' - ' + $tc('globals.listTabs.trackN', release.nb_tracks)
|
||||||
|
}}
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -383,7 +384,6 @@
|
|||||||
<div
|
<div
|
||||||
role="button"
|
role="button"
|
||||||
aria-label="download"
|
aria-label="download"
|
||||||
@contextmenu.prevent="openQualityModal"
|
|
||||||
@click.stop="addToQueue"
|
@click.stop="addToQueue"
|
||||||
:data-link="release.link"
|
:data-link="release.link"
|
||||||
class="download_overlay"
|
class="download_overlay"
|
||||||
@ -414,7 +414,6 @@
|
|||||||
<div
|
<div
|
||||||
role="button"
|
role="button"
|
||||||
aria-label="download"
|
aria-label="download"
|
||||||
@contextmenu.prevent="openQualityModal"
|
|
||||||
@click.stop="addToQueue"
|
@click.stop="addToQueue"
|
||||||
:data-link="release.link"
|
:data-link="release.link"
|
||||||
class="download_overlay"
|
class="download_overlay"
|
||||||
@ -424,9 +423,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<p class="primary-text">{{ release.title }}</p>
|
<p class="primary-text">{{ release.title }}</p>
|
||||||
<p class="secondary-text">
|
<p class="secondary-text">
|
||||||
{{
|
{{ `${$t('globals.by', [release.user.name])} - ${$tc('globals.listTabs.trackN', release.nb_tracks)}` }}
|
||||||
`${$t('globals.by', [release.user.name])} - ${$tc('globals.listTabs.trackN', release.nb_tracks)}`
|
|
||||||
}}
|
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -613,9 +610,6 @@ export default {
|
|||||||
addToQueue(e) {
|
addToQueue(e) {
|
||||||
Downloads.sendAddToQueue(e.currentTarget.dataset.link)
|
Downloads.sendAddToQueue(e.currentTarget.dataset.link)
|
||||||
},
|
},
|
||||||
openQualityModal(e) {
|
|
||||||
this.$root.$emit('QualityModal:open', e.currentTarget.dataset.link)
|
|
||||||
},
|
|
||||||
numberWithDots: Utils.numberWithDots,
|
numberWithDots: Utils.numberWithDots,
|
||||||
convertDuration: Utils.convertDuration,
|
convertDuration: Utils.convertDuration,
|
||||||
search(type) {
|
search(type) {
|
||||||
|
@ -53,7 +53,6 @@ export default {
|
|||||||
}),
|
}),
|
||||||
mounted() {
|
mounted() {
|
||||||
this.$root.$on('QualityModal:open', this.openModal)
|
this.$root.$on('QualityModal:open', this.openModal)
|
||||||
|
|
||||||
this.$refs.modal.addEventListener('webkitAnimationEnd', this.handleAnimationEnd)
|
this.$refs.modal.addEventListener('webkitAnimationEnd', this.handleAnimationEnd)
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
@ -133,15 +133,10 @@
|
|||||||
</table>
|
</table>
|
||||||
<span v-if="label" style="opacity: 0.4; margin-top: 8px; display: inline-block; font-size: 13px;">{{ label }}</span>
|
<span v-if="label" style="opacity: 0.4; margin-top: 8px; display: inline-block; font-size: 13px;">{{ label }}</span>
|
||||||
<footer>
|
<footer>
|
||||||
<button @contextmenu.prevent="openQualityModal" @click.stop="addToQueue" :data-link="link">
|
<button @click.stop="addToQueue" :data-link="link">
|
||||||
{{ `${$t('globals.download', [$tc(`globals.listTabs.${type}`, 1)])}` }}
|
{{ `${$t('globals.download', [$tc(`globals.listTabs.${type}`, 1)])}` }}
|
||||||
</button>
|
</button>
|
||||||
<button
|
<button class="with_icon" @click.stop="addToQueue" :data-link="selectedLinks()">
|
||||||
class="with_icon"
|
|
||||||
@contextmenu.prevent="openQualityModal"
|
|
||||||
@click.stop="addToQueue"
|
|
||||||
:data-link="selectedLinks()"
|
|
||||||
>
|
|
||||||
{{ $t('tracklist.downloadSelection') }}<i class="material-icons">file_download</i>
|
{{ $t('tracklist.downloadSelection') }}<i class="material-icons">file_download</i>
|
||||||
</button>
|
</button>
|
||||||
<button class="back-button">{{ $t('globals.back') }}</button>
|
<button class="back-button">{{ $t('globals.back') }}</button>
|
||||||
@ -189,9 +184,6 @@ export default {
|
|||||||
addToQueue(e) {
|
addToQueue(e) {
|
||||||
Downloads.sendAddToQueue(e.currentTarget.dataset.link)
|
Downloads.sendAddToQueue(e.currentTarget.dataset.link)
|
||||||
},
|
},
|
||||||
openQualityModal(e) {
|
|
||||||
this.$root.$emit('QualityModal:open', e.currentTarget.dataset.link)
|
|
||||||
},
|
|
||||||
toggleAll(e) {
|
toggleAll(e) {
|
||||||
this.body.forEach(item => {
|
this.body.forEach(item => {
|
||||||
if (item.type == 'track') {
|
if (item.type == 'track') {
|
||||||
|
26
src/js/qualities.js
Normal file
26
src/js/qualities.js
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
export default [
|
||||||
|
{
|
||||||
|
label: 'FLAC',
|
||||||
|
value: 9
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: 'MP3 320kbps',
|
||||||
|
value: 3
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: 'MP3 128kbps',
|
||||||
|
value: 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '360 Reality Audio [HQ]',
|
||||||
|
value: 15
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '360 Reality Audio [MQ]',
|
||||||
|
value: 14
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '360 Reality Audio [LQ]',
|
||||||
|
value: 13
|
||||||
|
}
|
||||||
|
]
|
@ -11,6 +11,11 @@ const en = {
|
|||||||
toggle_download_tab_hint: 'Expand/Collapse',
|
toggle_download_tab_hint: 'Expand/Collapse',
|
||||||
clean_queue_hint: 'Clear Finished',
|
clean_queue_hint: 'Clear Finished',
|
||||||
cancel_queue_hint: 'Cancel All',
|
cancel_queue_hint: 'Cancel All',
|
||||||
|
cut: 'cut',
|
||||||
|
copy: 'copy',
|
||||||
|
copyLink: 'copy link',
|
||||||
|
copyDeezerLink: 'copy deezer link',
|
||||||
|
paste: 'paste',
|
||||||
listTabs: {
|
listTabs: {
|
||||||
empty: '',
|
empty: '',
|
||||||
all: 'all',
|
all: 'all',
|
||||||
|
@ -11,6 +11,11 @@ const it = {
|
|||||||
toggle_download_tab_hint: 'Espandi/Riduci',
|
toggle_download_tab_hint: 'Espandi/Riduci',
|
||||||
clean_queue_hint: 'Pulisci Lista',
|
clean_queue_hint: 'Pulisci Lista',
|
||||||
cancel_queue_hint: 'Cancella tutti i download',
|
cancel_queue_hint: 'Cancella tutti i download',
|
||||||
|
cut: 'taglia',
|
||||||
|
copy: 'copia',
|
||||||
|
copyLink: 'copia link',
|
||||||
|
copyDeezerLink: 'copia link deezer',
|
||||||
|
paste: 'incolla',
|
||||||
listTabs: {
|
listTabs: {
|
||||||
all: 'tutto',
|
all: 'tutto',
|
||||||
top_result: 'miglior risultato',
|
top_result: 'miglior risultato',
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
import { socket } from '@/utils/socket'
|
import { socket } from '@/utils/socket'
|
||||||
|
|
||||||
function sendAddToQueue(url, bitrate = null) {
|
function sendAddToQueue(url, bitrate = null) {
|
||||||
if (url != '') {
|
if (!url) return
|
||||||
socket.emit('addToQueue', { url: url, bitrate: bitrate }, () => {})
|
|
||||||
}
|
socket.emit('addToQueue', { url, bitrate }, () => {})
|
||||||
}
|
}
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
|
Loading…
Reference in New Issue
Block a user