Skip to content

Commit 36cffc1

Browse files
kurotsmilekurotsmile
committed
add album
1 parent 230dfea commit 36cffc1

File tree

8 files changed

+99
-22
lines changed

8 files changed

+99
-22
lines changed

‎Carrot-Framework-Web

‎index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ <h1 class="mb-4">
9090
<button class="btn btn-sm btn-m animate__animated animate__flipInX animate__fadeInDownBig animate__delay-2s" onclick="m.show_list_artist()" id="m-artist"><i class="fas fa-user-tie"></i> Artist</button>
9191
<button class="btn btn-sm btn-m animate__animated animate__flipInX animate__fadeInDownBig animate__delay-2s" onclick="m.show_list_year()" id="m-year"><i class="far fa-calendar-alt"></i> Year</button>
9292
<button class="btn btn-sm btn-m animate__animated animate__flipInX animate__fadeInDownBig animate__delay-2s" onclick="m.show_list_genre()" id="m-genre"><i class="fas fa-guitar"></i> Genre</button>
93+
<button class="btn btn-sm btn-m animate__animated animate__flipInX animate__fadeInDownBig animate__delay-2s" onclick="m.show_list_album()" id="m-album"><i class="fas fa-compact-disc"></i> Album</button>
9394
<button class="btn btn-sm btn-m animate__animated animate__flipInX animate__fadeInDownBig animate__delay-2s" onclick="m.show_search()" id="m-search"><i class="fas fa-search"></i> Search</button>
9495
<button class="btn btn-sm btn-m animate__animated animate__flipInX animate__fadeInDownBig animate__delay-2s" onclick="m.show_about()" id="m-about"><i class="fas fa-dove"></i> About</button>
9596
<button class="btn btn-sm animate__animated animate__flipInX animate__fadeInDownBig animate__delay-2s" onclick="cr.show_contact()"><i class="fas fa-phone"></i> Contact</button>

‎js/music.js

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ class Music{
22
list_artist=[];
33
list_year=[];
44
list_genre=[];
5+
list_album=[];
56
lang="en";
67

78
m_menu="";
@@ -53,6 +54,11 @@ class Music{
5354
cr.loadJs("js/songs_genre.js","song_genre","show");
5455
}
5556

57+
show_list_album(){
58+
cr.loadJs("js/songs_album.js","song_album","show");
59+
}
60+
61+
5662
act_menu(id){
5763
$(".btn-m").removeClass("text-white");
5864
$("#"+id).addClass("text-white");
@@ -189,27 +195,12 @@ class Music{
189195
});
190196
}
191197

192-
getCurrentDateFormatted() {
193-
const date = new Date();
194-
const year = date.getFullYear();
195-
const month = String(date.getMonth() + 1).padStart(2, '0');
196-
const day = String(date.getDate()).padStart(2, '0');
197-
return `${year}-${month}-${day}`;
198-
}
199-
200198
download_site_map(){
201-
var xml='<?xml version="1.0" encoding="UTF-8"?>';
202-
xml+='<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">';
203-
$(m.song.list_song).each(function(index,s){
204-
xml+='<url>';
205-
xml+='<loc>'+cr.site_url+'/?song='+s.name.trim()+'</loc>';
206-
xml+='<lastmod>'+m.getCurrentDateFormatted()+'</lastmod>';
207-
xml+='<changefreq>monthly</changefreq>';
208-
xml+='<priority>0.8</priority>';
209-
xml+='</url>';
210-
})
211-
xml+='</urlset>';
212-
cr.download(xml,'sitemap.xml','application/xml');
199+
var list_link=[];
200+
$(m.song.list_song).each(function(index,s){
201+
list_link.push(cr.site_url+'/?song='+s.name.trim());
202+
});
203+
cr.download_sitemap(list_link);
213204
}
214205

215206
show_pay_unlock_all_mp3(){

‎js/songs.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ class Songs {
3636
var obj_lang = { "name": song.lang, "lang": song.lang };
3737
m.addOrUpdateObjectToList(m.song.list_lang, obj_lang);
3838

39+
var obj_album = { "name": song.album, "lang": song.lang };
40+
m.addOrUpdateObjectToList(m.list_album, obj_album);
41+
3942
song['index']=index;
4043
m.song.list_song.push(song);
4144

‎js/songs_album.js

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
class Songs_Album{
2+
3+
lang="all";
4+
5+
show(){
6+
this.lang=m.lang;
7+
m.loading();
8+
if(this.lang=="all")
9+
this.loadListByData(m.list_album);
10+
else{
11+
var l_new=m.song_album.getListByLang(this.lang);
12+
m.song_album.loadListByData(l_new);
13+
}
14+
}
15+
16+
loadListByData(data){
17+
m.act_menu("m-album");
18+
m.clear();
19+
$.each(data,function(index,a){
20+
var albumItem=m.box_item("type_car.png",a.name,'<i class="fas fa-music"></i> '+a.amount+' song (<i class="fas fa-globe-asia"></i> '+a.lang+')');
21+
$(albumItem).click(function(){
22+
m.song.showListSongByMeta('album',a.name,m.song_album.lang);
23+
});
24+
m.add_item(albumItem);
25+
});
26+
this.showListCountry();
27+
}
28+
29+
showListCountry(){
30+
$('#sub_title').html('');
31+
32+
var btn_all_l=$(`<button class="btn btn-sm ${(m.song_album.lang === "all" ? "active" : "all")} m-1 btn-c btn_l"><i class="fas fa-globe"></i></button>`);
33+
$(btn_all_l).click(()=>{
34+
m.song_album.lang="all";
35+
m.song_album.loadListByData(m.list_album);
36+
});
37+
$('#sub_title').append(btn_all_l);
38+
39+
$.each(m.song.list_lang,function(index,l){
40+
var btn_l=$(`<button class="btn btn-sm ${(m.song_album.lang === l.name ? "active" : l.name)} m-1 btn-c btn_l">${l.name}</button>`);
41+
$(btn_l).click(()=>{
42+
m.song_album.lang=l.name;
43+
var l_new=m.song_album.getListByLang(l.name);
44+
m.song_album.loadListByData(l_new);
45+
});
46+
$('#sub_title').append(btn_l);
47+
});
48+
49+
var btn_download=$(`<button class="btn btn-sm m-1 btn-c btn_l"><i class="fas fa-arrow-alt-circle-down"></i></button>`);
50+
$(btn_download).click(()=>{
51+
cr.download(m.list_album,"song_album.json");
52+
});
53+
$('#sub_title').append(btn_download);
54+
}
55+
56+
getListByLang(lang){
57+
var list_album_query=[];
58+
$.each(m.list_album,function(index,a){
59+
if(a.lang==lang) list_album_query.push(a);
60+
});
61+
return list_album_query;
62+
}
63+
}
64+
var song_album=new Songs_Album();
65+
m.song_album=song_album;

‎js/songs_artist.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,12 @@ class Songs_Artist{
4545
});
4646
$('#sub_title').append(btn_l);
4747
});
48+
49+
var btn_download=$(`<button class="btn btn-sm m-1 btn-c btn_l"><i class="fas fa-arrow-alt-circle-down"></i></button>`);
50+
$(btn_download).click(()=>{
51+
cr.download(m.list_artist,"song_artist.json");
52+
});
53+
$('#sub_title').append(btn_download);
4854
}
4955

5056
getListByLang(lang){
@@ -54,7 +60,6 @@ class Songs_Artist{
5460
});
5561
return list_art_query;
5662
}
57-
5863
}
5964
var song_artist=new Songs_Artist();
6065
m.song_artist=song_artist;

‎js/songs_genre.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@ class Songs_Genre{
3333
});
3434
$('#sub_title').append(btn_l);
3535
});
36+
37+
var btn_download=$(`<button class="btn btn-sm m-1 btn-c btn_l"><i class="fas fa-arrow-alt-circle-down"></i></button>`);
38+
$(btn_download).click(()=>{
39+
cr.download(m.list_genre,"song_genre.json");
40+
});
41+
$('#sub_title').append(btn_download);
3642
}
3743

3844
getListByLang(lang){

‎js/songs_year.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@ class Songs_year{
3232
});
3333
$('#sub_title').append(btn_l);
3434
});
35+
36+
var btn_download=$(`<button class="btn btn-sm m-1 btn-c btn_l"><i class="fas fa-arrow-alt-circle-down"></i></button>`);
37+
$(btn_download).click(()=>{
38+
cr.download(m.list_year,"song_year.json");
39+
});
40+
$('#sub_title').append(btn_download);
3541
}
3642

3743
getListByLang(lang){

0 commit comments

Comments
 (0)