From 68427b434db06b53561d0ee9fcd0cf280000b911 Mon Sep 17 00:00:00 2001 From: Jay Justice Date: Sun, 18 Sep 2022 21:55:21 -0700 Subject: [PATCH] cleaned up musicplayer --- app.py | 16 +--------------- static/css/musicplayer.css | 6 ++++-- static/js/bitcoinchart.js | 26 -------------------------- static/js/googlemaps.js | 34 ---------------------------------- static/js/musicplayer.js | 24 +++++++++++------------- templates/musicplayer.html | 2 +- 6 files changed, 17 insertions(+), 91 deletions(-) delete mode 100644 static/js/bitcoinchart.js delete mode 100644 static/js/googlemaps.js diff --git a/app.py b/app.py index 8675bf7..03cf04b 100644 --- a/app.py +++ b/app.py @@ -107,7 +107,7 @@ class musicimages(db.Model): @app.route('/') def hello(): - return 'Hello, World!' + return redirect("vgmplayer") @app.route('/grvgm', methods=['GET']) def grvgm(): @@ -140,20 +140,6 @@ def grvgm(): @app.route('/vgmplayer') def vgmplayer(): return render_template("musicplayer.html") - - -# @app.route('/iplookup', methods=['POST']) -# def iplookup(): -# if request.method == 'POST': -# request_json = request.json -# iplocadata = requests.get("https://freegeoip.app/json/"+str(request_json["ipaddress"])+"?apikey=cf036630-351d-11ec-bd19-7d45ee7e599d").json() -# googlemaplink = "https://maps.google.com/maps?q=loc:"+str(iplocadata["latitude"])+"+"+str(iplocadata["longitude"])+"&t=&z=8&ie=UTF8&iwloc=&output=embed" -# print(googlemaplink) -# iplookupregion = { -# "mapinfo":googlemaplink -# } -# return iplookupregion - if __name__ == "__main__": diff --git a/static/css/musicplayer.css b/static/css/musicplayer.css index 2f20c5d..81d6dab 100644 --- a/static/css/musicplayer.css +++ b/static/css/musicplayer.css @@ -1,7 +1,6 @@ *{ margin: 0; padding: 0; - font-family: cursive; } body{ min-height: 100vh; @@ -150,12 +149,15 @@ input[type="range"]::-webkit-slider-thumb{ width: 80%; overflow: hidden; margin-bottom: 6.5em; -/* border: 1px solid #fff;*/ + color: #148f77; + letter-spacing: 1px; + font-family: Impact; } .song_detail #title{ text-transform: capitalize; color: #fff; font-size: 35px; + font-family: 1px; } .song_detail #artist{ text-transform: capitalize; diff --git a/static/js/bitcoinchart.js b/static/js/bitcoinchart.js deleted file mode 100644 index e1b90c6..0000000 --- a/static/js/bitcoinchart.js +++ /dev/null @@ -1,26 +0,0 @@ -const labels = [ - 'EUR', - 'GBP', - 'USD' - ]; - - console.log(parseInt(eurrate)) -const data = { -labels: labels, -datasets: [{ -label: 'Code Immersives Bitcoin chart', -backgroundColor: 'rgb(255, 99, 132)', -borderColor: 'rgb(255, 99, 132)', -data: [parseInt(eurrate),parseInt(gbprate),parseInt(usdrate)], -} ] - }; - const config = { - type: 'bar', - data: data, - options: {} - }; - - const myChart = new Chart( - document.getElementById('myChart'), - config - ); diff --git a/static/js/googlemaps.js b/static/js/googlemaps.js deleted file mode 100644 index fe296a1..0000000 --- a/static/js/googlemaps.js +++ /dev/null @@ -1,34 +0,0 @@ -fetch('https://api.ipify.org') -.then(response => response.text()) -.then(ipdata => { - ipdataobject = { - "ipaddress":ipdata - } -fetch("/iplookup", -{ - method: "POST", - body: JSON.stringify(ipdataobject), - headers: { - 'Content-Type': 'application/json' - }, - }) -.then(response => response.json()) -.then(data => { - emaildetailsoutput = document.getElementById("googlediv") - googlemapsiframe = document.createElement('iframe') - googlemapsiframe.setAttribute('width',"300") - googlemapsiframe.setAttribute('height',"250") - googlemapsiframe.setAttribute('id',"gmap_canvas") - googlemapsiframe.setAttribute('src',data["mapinfo"]) - googlemapsiframe.setAttribute('frameborder',"0") - googlemapsiframe.setAttribute('scrolling',"no") - googlemapsiframe.setAttribute('marginheight',"no") - googlemapsiframe.setAttribute('marginwidth',"no") - googlemapsiframe.style.cssText += "border-radius: 25px;border: 2px solid #73AD21;" - emaildetailsoutput.appendChild(googlemapsiframe); -} -) -}) - - - diff --git a/static/js/musicplayer.js b/static/js/musicplayer.js index 9b5a923..99ef865 100644 --- a/static/js/musicplayer.js +++ b/static/js/musicplayer.js @@ -98,14 +98,14 @@ function load_track(index_no,checker){ reset_slider(); track.src = All_song[index_no].path; - title.innerHTML = All_song[index_no].name; + title.innerHTML = "Title: "+All_song[index_no].name; track_image.src = All_song[index_no].img; track_image.style.cssText += "object-fit: contain;" - artist.innerHTML = All_song[index_no].artists; - album.innerHTML = All_song[index_no].album; - platform.innerHTML = All_song[index_no].platform; - year.innerHTML = All_song[index_no].year; - genre.innerHTML = All_song[index_no].genre; + artist.innerHTML = "Artists: "+All_song[index_no].artists; + album.innerHTML = "Game: "+All_song[index_no].album; + platform.innerHTML = "Console/Platform: "+All_song[index_no].platform; + year.innerHTML = "Year: "+All_song[index_no].year; + genre.innerHTML = "Genre: "+All_song[index_no].genre; track.load(); timer = setInterval(range_slider ,1000); @@ -222,12 +222,10 @@ function range_slider(){ // function will run when the song is over if(track.ended){ play.innerHTML = ''; - load_track(index_no); - playsong(); - // if(autoplay==1){ - // index_no += 1; - // load_track(index_no); - // playsong(); - // } + // load_track(index_no); + // playsong(); + if(autoplay==1){ + load_track(index_no,checker="next_song") + } } } \ No newline at end of file diff --git a/templates/musicplayer.html b/templates/musicplayer.html index 229ca9f..bdaad3b 100644 --- a/templates/musicplayer.html +++ b/templates/musicplayer.html @@ -12,7 +12,7 @@
- +