Added division by search tab
This commit is contained in:
RemixDev
parent
6eca5aaf59
commit
880c257005
|
|
@ -85,6 +85,14 @@ div#middle_section {
|
|||
}
|
||||
}
|
||||
|
||||
/* Search Tab */
|
||||
.search_tabcontent {
|
||||
display: none;
|
||||
}
|
||||
#search_tab{
|
||||
display: none;
|
||||
}
|
||||
|
||||
/* Main Search Tab */
|
||||
|
||||
#main_search > .search_section{
|
||||
|
|
@ -158,6 +166,10 @@ img.rounded {
|
|||
img.circle {
|
||||
border-radius: 50%;
|
||||
}
|
||||
|
||||
.coverart{
|
||||
background-color: #eee;
|
||||
}
|
||||
span.tag {
|
||||
background-color: #222324;
|
||||
border-radius: 2px;
|
||||
|
|
|
|||
|
|
@ -23,42 +23,117 @@
|
|||
<header id="search"><input id="searchbar" type="text" name="searchbar" value="" placeholder="Search..."></header>
|
||||
<section id="content"><div id="container">
|
||||
|
||||
<!-- ### Main Search Tab ### -->
|
||||
<div id="main_search">
|
||||
<template v-for="section in results.ORDER">
|
||||
<div v-if="(section != 'TOP_RESULT' && results[section].data.length > 0) || (results[section].length > 0)" class="search_section">
|
||||
<h1>{{ names[section] }}</h1>
|
||||
<!-- Top result -->
|
||||
<div v-if="section == 'TOP_RESULT'" class="top_result">
|
||||
<img v-bind:src="(results.TOP_RESULT[0].__TYPE__ == 'artist' ? 'https://e-cdns-images.dzcdn.net/images/artist/' + results.TOP_RESULT[0].ART_PICTURE : results.TOP_RESULT[0].__TYPE__ == 'album' ? 'https://e-cdns-images.dzcdn.net/images/cover/' + results.TOP_RESULT[0].ALB_PICTURE : 'https://e-cdns-images.dzcdn.net/images/cover/') + '/156x156-000000-80-0-0.jpg'"
|
||||
v-bind:class="results.TOP_RESULT[0].__TYPE__ == 'artist' ? 'circle' : 'rounded'"></img>
|
||||
<div class="info_box">
|
||||
<p class="title">{{ results.TOP_RESULT[0].__TYPE__ == 'artist' ? results.TOP_RESULT[0].ART_NAME : results.TOP_RESULT[0].__TYPE__ == 'album' ? results.TOP_RESULT[0].ALB_TITLE : '' }}</p>
|
||||
<p class="subtitle">{{ results.TOP_RESULT[0].__TYPE__ == 'artist' ? results.TOP_RESULT[0].NB_FAN + ' fans' : results.TOP_RESULT[0].__TYPE__ == 'album' ? 'by '+results.TOP_RESULT[0].ART_NAME+' - '+results.TOP_RESULT[0].NUMBER_TRACK+' tracks' : '' }}</p>
|
||||
<span class="tag">{{ results.TOP_RESULT[0].__TYPE__.charAt(0).toUpperCase() + results.TOP_RESULT[0].__TYPE__.substring(1)}}</span>
|
||||
<div id="search_tab">
|
||||
<div class="tab">
|
||||
<button class="search_tablinks" id="search_defaultopen" onclick="searchTab(event, 'main_search')">All</button>
|
||||
<button class="search_tablinks" onclick="searchTab(event, 'track_search')">Tracks</button>
|
||||
<button class="search_tablinks" onclick="searchTab(event, 'album_search')">Album</button>
|
||||
<button class="search_tablinks" onclick="searchTab(event, 'artist_search')">Artist</button>
|
||||
<button class="search_tablinks" onclick="searchTab(event, 'playlist_search')">Playlist</button>
|
||||
</div>
|
||||
<!-- ### Main Search Tab ### -->
|
||||
<div id="main_search" class="search_tabcontent">
|
||||
<template v-for="section in results.ORDER">
|
||||
<div v-if="(section != 'TOP_RESULT' && results[section].data.length > 0) || (results[section].length > 0)" class="search_section">
|
||||
<h1>{{ names[section] }}</h1>
|
||||
<!-- Top result -->
|
||||
<div v-if="section == 'TOP_RESULT'" class="top_result">
|
||||
<img v-bind:src="(results.TOP_RESULT[0].__TYPE__ == 'artist' ? 'https://e-cdns-images.dzcdn.net/images/artist/' + results.TOP_RESULT[0].ART_PICTURE : results.TOP_RESULT[0].__TYPE__ == 'album' ? 'https://e-cdns-images.dzcdn.net/images/cover/' + results.TOP_RESULT[0].ALB_PICTURE : 'https://e-cdns-images.dzcdn.net/images/cover/') + '/156x156-000000-80-0-0.jpg'"
|
||||
v-bind:class="(results.TOP_RESULT[0].__TYPE__ == 'artist' ? 'circle' : 'rounded') + ' coverart'"></img>
|
||||
<div class="info_box">
|
||||
<p class="title">{{ results.TOP_RESULT[0].__TYPE__ == 'artist' ? results.TOP_RESULT[0].ART_NAME : results.TOP_RESULT[0].__TYPE__ == 'album' ? results.TOP_RESULT[0].ALB_TITLE : '' }}</p>
|
||||
<p class="subtitle">{{ results.TOP_RESULT[0].__TYPE__ == 'artist' ? numberWithDots(results.TOP_RESULT[0].NB_FAN) + ' fans' : results.TOP_RESULT[0].__TYPE__ == 'album' ? 'by '+results.TOP_RESULT[0].ART_NAME+' - '+results.TOP_RESULT[0].NUMBER_TRACK+' tracks' : '' }}</p>
|
||||
<span class="tag">{{ results.TOP_RESULT[0].__TYPE__.charAt(0).toUpperCase() + results.TOP_RESULT[0].__TYPE__.substring(1)}}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div v-if="section == 'TRACK'">
|
||||
<table class="tracks_table">
|
||||
<tr v-for="track in results.TRACK.data.slice(0, 6)">
|
||||
<td style="width: 48px;"><img class="rounded coverart" v-bind:src="'https://e-cdns-images.dzcdn.net/images/cover/'+track.ALB_PICTURE+'/32x32-000000-80-0-0.jpg'"></td>
|
||||
<td>{{track.SNG_TITLE + (track.VERSION ? ' '+track.VERSION : '')}}</td>
|
||||
<td><span v-for="artist in track.ARTISTS">{{artist.ART_NAME}} </span></td>
|
||||
<td>{{track.ALB_TITLE}}</td>
|
||||
<td>{{convertDuration(track.DURATION)}}</td>
|
||||
<td style="width: 56px;"><i class="material-icons">get_app</i></td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
<div v-if="section != 'TRACK' && section != 'TOP_RESULT'" class="release_grid">
|
||||
<div v-for="release in results[section].data.slice(0, 6)" class="release">
|
||||
<img v-bind:class="(section == 'ARTIST' ? 'circle' : 'rounded') + ' coverart'" v-bind:src="(section == 'ARTIST' ? 'https://e-cdns-images.dzcdn.net/images/artist/' + release.ART_PICTURE : section == 'ALBUM' ? 'https://e-cdns-images.dzcdn.net/images/cover/' + release.ALB_PICTURE : section == 'PLAYLIST' ? 'https://e-cdns-images.dzcdn.net/images/'+ release.PICTURE_TYPE +'/' + release.PLAYLIST_PICTURE : 'https://e-cdns-images.dzcdn.net/images/cover/' ) + '/156x156-000000-80-0-0.jpg'">
|
||||
<p class="title">{{ section == 'ARTIST' ? release.ART_NAME : section == 'ALBUM' ? release.ALB_TITLE : section == 'PLAYLIST' ? release.TITLE : '' }}</p>
|
||||
<p class="subtitle">{{ section == 'ARTIST' ? numberWithDots(release.NB_FAN) + ' fans' : section == 'ALBUM' ? release.ART_NAME+' - '+release.NUMBER_TRACK+' tracks' : section == 'PLAYLIST' ? release.NB_SONG+' tracks' : '' }}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div v-if="section == 'TRACK'">
|
||||
<table class="tracks_table">
|
||||
<tr v-for="track in results.TRACK.data.slice(0, 6)">
|
||||
<td><img class="rounded" v-bind:src="'https://e-cdns-images.dzcdn.net/images/cover/'+track.ALB_PICTURE+'/32x32-000000-80-0-0.jpg'"></td>
|
||||
<td>{{track.SNG_TITLE + (track.VERSION ? ' '+track.VERSION : '')}}</td>
|
||||
<td><span v-for="artist in track.ARTISTS">{{artist.ART_NAME}} </span></td>
|
||||
<td>{{track.ALB_TITLE}}</td>
|
||||
<td>{{track.DURATION}}</td>
|
||||
<td><i class="material-icons">get_app</i></td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
<div v-if="section != 'TRACK' && section != 'TOP_RESULT'" class="release_grid">
|
||||
<div v-for="release in results[section].data.slice(0, 6)" class="release">
|
||||
<img v-bind:class="section == 'ARTIST' ? 'circle' : 'rounded'" v-bind:src="(section == 'ARTIST' ? 'https://e-cdns-images.dzcdn.net/images/artist/' + release.ART_PICTURE : section == 'ALBUM' ? 'https://e-cdns-images.dzcdn.net/images/cover/' + release.ALB_PICTURE : section == 'PLAYLIST' ? 'https://e-cdns-images.dzcdn.net/images/'+ release.PICTURE_TYPE +'/' + release.PLAYLIST_PICTURE : 'https://e-cdns-images.dzcdn.net/images/cover/' ) + '/156x156-000000-80-0-0.jpg'">
|
||||
<p class="title">{{ section == 'ARTIST' ? release.ART_NAME : section == 'ALBUM' ? release.ALB_TITLE : section == 'PLAYLIST' ? release.TITLE : '' }}</p>
|
||||
<p class="subtitle">{{ section == 'ARTIST' ? release.NB_FAN + ' fans' : section == 'ALBUM' ? release.ART_NAME+' - '+release.NUMBER_TRACK+' tracks' : section == 'PLAYLIST' ? release.NB_SONG+' tracks' : '' }}</p>
|
||||
</div>
|
||||
</template>
|
||||
<div v-if="results.ORDER.every(section => section == 'TOP_RESULT' ? results[section].length == 0 : results[section].data.length == 0)">
|
||||
<h1>No results</h1>
|
||||
</div>
|
||||
</div>
|
||||
<!-- ### Track Search Tab ### -->
|
||||
<div id="track_search" class="search_tabcontent">
|
||||
<div v-if="results.data.length == 0">
|
||||
<h1>No Tracks found</h1>
|
||||
</div>
|
||||
<table class="tracks_table" v-if="results.data.length > 0">
|
||||
<tr>
|
||||
<th style="width: 48px;"></th>
|
||||
<th>Title</th>
|
||||
<th>Artists</th>
|
||||
<th>Album</th>
|
||||
<th><i class="material-icons">timer</i></th>
|
||||
<th style="width: 56px;"></th>
|
||||
</tr>
|
||||
<tr v-for="track in results.data">
|
||||
<td><img class="rounded coverart" v-bind:src="'https://e-cdns-images.dzcdn.net/images/cover/'+track.ALB_PICTURE+'/32x32-000000-80-0-0.jpg'"></td>
|
||||
<td>{{track.SNG_TITLE + (track.VERSION ? ' '+track.VERSION : '')}}</td>
|
||||
<td><span v-for="artist in track.ARTISTS">{{artist.ART_NAME}} </span></td>
|
||||
<td>{{track.ALB_TITLE}}</td>
|
||||
<td>{{convertDuration(track.DURATION)}}</td>
|
||||
<td><i class="material-icons">get_app</i></td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
<!-- ### Album Search Tab ### -->
|
||||
<div id="album_search" class="search_tabcontent">
|
||||
<div v-if="results.data.length == 0">
|
||||
<h1>No Albums found</h1>
|
||||
</div>
|
||||
<div class="release_grid" v-if="results.data.length > 0">
|
||||
<div v-for="release in results.data" class="release">
|
||||
<img class="rounded coverart" v-bind:src="'https://e-cdns-images.dzcdn.net/images/cover/' + release.ALB_PICTURE + '/156x156-000000-80-0-0.jpg'">
|
||||
<p class="title">{{ release.ALB_TITLE }}</p>
|
||||
<p class="subtitle">{{ release.ART_NAME+' - '+release.NUMBER_TRACK+' tracks' }}</p>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
<!-- ### Artist Search Tab ### -->
|
||||
<div id="artist_search" class="search_tabcontent">
|
||||
<div v-if="results.data.length == 0">
|
||||
<h1>No Artists found</h1>
|
||||
</div>
|
||||
<div class="release_grid" v-if="results.data.length > 0">
|
||||
<div v-for="release in results.data" class="release">
|
||||
<img class="circle coverart" v-bind:src="'https://e-cdns-images.dzcdn.net/images/artist/' + release.ART_PICTURE + '/156x156-000000-80-0-0.jpg'">
|
||||
<p class="title">{{ release.ART_NAME }}</p>
|
||||
<p class="subtitle">{{ numberWithDots(release.NB_FAN) + ' fans' }}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- ### Playlist Search Tab ### -->
|
||||
<div id="playlist_search" class="search_tabcontent">
|
||||
<div v-if="results.data.length == 0">
|
||||
<h1>No Playlists found</h1>
|
||||
</div>
|
||||
<div class="release_grid" v-if="results.data.length > 0">
|
||||
<div v-for="release in results.data" class="release">
|
||||
<img class="rounded coverart" v-bind:src="'https://e-cdns-images.dzcdn.net/images/'+ release.PICTURE_TYPE +'/' + release.PLAYLIST_PICTURE + '/156x156-000000-80-0-0.jpg'">
|
||||
<p class="title">{{ release.TITLE }}</p>
|
||||
<p class="subtitle">{{ release.NB_SONG+' tracks' }}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div></section>
|
||||
|
|
|
|||
|
|
@ -53,6 +53,22 @@ document.querySelector("#hide_download_tab").onclick = (ev)=>{
|
|||
document.querySelector("#download_tab").style.display = "none";
|
||||
}
|
||||
|
||||
// searchTab
|
||||
|
||||
function searchTab(evt, tabName) {
|
||||
var i, tabcontent, tablinks;
|
||||
tabcontent = document.getElementsByClassName("search_tabcontent");
|
||||
for (i = 0; i < tabcontent.length; i++) {
|
||||
tabcontent[i].style.display = "none";
|
||||
}
|
||||
tablinks = document.getElementsByClassName("search_tablinks");
|
||||
for (i = 0; i < tablinks.length; i++) {
|
||||
tablinks[i].className = tablinks[i].className.replace(" active", "");
|
||||
}
|
||||
document.getElementById(tabName).style.display = "block";
|
||||
evt.currentTarget.className += " active";
|
||||
}
|
||||
|
||||
var mainSearch = new Vue({
|
||||
el: '#main_search',
|
||||
data: {
|
||||
|
|
@ -74,6 +90,42 @@ var mainSearch = new Vue({
|
|||
}
|
||||
})
|
||||
|
||||
var trackSearch = new Vue({
|
||||
el: '#track_search',
|
||||
data: {
|
||||
results: {
|
||||
data: []
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
var albumSearch = new Vue({
|
||||
el: '#album_search',
|
||||
data: {
|
||||
results: {
|
||||
data: []
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
var artistSearch = new Vue({
|
||||
el: '#artist_search',
|
||||
data: {
|
||||
results: {
|
||||
data: []
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
var playlistSearch = new Vue({
|
||||
el: '#playlist_search',
|
||||
data: {
|
||||
results: {
|
||||
data: []
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
// Search section
|
||||
$("#searchbar").keyup(function(e){
|
||||
if(e.keyCode == 13){
|
||||
|
|
@ -81,12 +133,20 @@ $("#searchbar").keyup(function(e){
|
|||
console.log(term)
|
||||
if (isValidURL(term))
|
||||
doAjax("/download", "POST", null, {url: term});
|
||||
else
|
||||
else{
|
||||
document.getElementById("search_tab").style.display = "none";
|
||||
doAjax("/search", "POST", searchHandler, {term: term});
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
function searchHandler(result){
|
||||
console.log(result)
|
||||
mainSearch.results = result
|
||||
trackSearch.results = result.TRACK
|
||||
albumSearch.results = result.ALBUM
|
||||
artistSearch.results = result.ARTIST
|
||||
playlistSearch.results = result.PLAYLIST
|
||||
document.getElementById("search_defaultopen").click();
|
||||
document.getElementById("search_tab").style.display = "block";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,3 +6,27 @@ function isValidURL(text){
|
|||
return true
|
||||
return false
|
||||
}
|
||||
function convertDuration(duration) {
|
||||
//convert from seconds only to mm:ss format
|
||||
var mm, ss
|
||||
mm = Math.floor(duration / 60)
|
||||
ss = duration - (mm * 60)
|
||||
//add leading zero if ss < 0
|
||||
if (ss < 10) {
|
||||
ss = "0" + ss
|
||||
}
|
||||
return mm + ":" + ss
|
||||
}
|
||||
|
||||
function convertDurationSeparated(duration){
|
||||
var hh, mm, ss
|
||||
mm = Math.floor(duration / 60)
|
||||
hh = Math.floor(mm / 60)
|
||||
ss = duration - (mm * 60)
|
||||
mm -= hh*60
|
||||
return [hh, mm, ss]
|
||||
}
|
||||
|
||||
function numberWithDots(x) {
|
||||
return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ".");
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue