Skip to content

Commit 4fef3e1

Browse files
committed
v1.1 everything safe now
1 parent 699855f commit 4fef3e1

File tree

1 file changed

+17
-10
lines changed

1 file changed

+17
-10
lines changed

window.js

+17-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const spotify = require('spotify-node-applescript')
2-
let base_api_url = "http://colorflyv1.herokuapp.com/v1/color/"
3-
const genius = require('genius-lyrics-api')
2+
let color_base_url = "http://colorflyv1.herokuapp.com/v1/color/"
3+
let lyrics_base_url = "http://colorflyv1.herokuapp.com/v1/lyrics/"
44

55
const getColor = (api_url) =>{
66
const xhr = new XMLHttpRequest()
@@ -17,25 +17,32 @@ const getColor = (api_url) =>{
1717
xhr.send()
1818
}
1919

20+
const getLyrics = (api_url, opt) =>{
21+
const xhr = new XMLHttpRequest()
22+
xhr.open('POST', api_url, true)
23+
xhr.setRequestHeader("Content-Type", "application/json; charset=UTF-8");
24+
xhr.onload = () => {
25+
const data = JSON.parse(xhr.response)
26+
document.getElementById('lyrics').textContent = data['lyrics']
27+
}
28+
xhr.send(JSON.stringify(opt))
29+
}
30+
2031
const renderPage = () =>{
2132
spotify.getTrack((err, track) =>{
2233
let temp_track = track['name']
2334

2435
if (temp_track !== track_name){
2536
let track_name = track['name']
2637
let image_url = track['artwork_url']
27-
let api_url = base_api_url + image_url
38+
let api_url = color_base_url + image_url
2839
let artist_name = track['artist']
29-
getColor(api_url)
3040
const options = {
31-
apiKey: '--insert api key here--',
32-
title: track['name'],
3341
artist: track['artist'],
34-
optimizeQuery: true
42+
song: track['name']
3543
}
36-
genius.getLyrics(options).then((lyrics) => {
37-
document.getElementById('lyrics').textContent = lyrics
38-
})
44+
getColor(api_url)
45+
getLyrics(lyrics_base_url, options)
3946
document.getElementById('cover_art').src = image_url
4047
document.getElementById('track_name').textContent = track_name
4148
document.getElementById('artist_name').textContent = artist_name

0 commit comments

Comments
 (0)