diff --git a/controllers/api.js b/controllers/api.js index 0f25664512..dc51cab4da 100644 --- a/controllers/api.js +++ b/controllers/api.js @@ -194,68 +194,25 @@ exports.getLastfm = function(req, res) { artist: 'Epica', handlers: { success: function(data) { - console.log(data); - var artist = { name: data.artist.name, image: data.artist.image.slice(-1)[0]['#text'], tags: data.artist.tags.tag, bio: data.artist.bio.summary, - stats: data.artist.stats + stats: data.artist.stats, + similar: data.artist.similar.artist }; - +// res.render('api/lastfm', { title: 'Last.fm API', artist: artist }); - //return res.send(data.artist); }, error: function(error) { - console.log(error.message); - return error.message; + res.send(error.message); } } }); - - -}; - -/** - * POST /api/lastfm - * Form submission to retrieve artist/track information - * Accessed via AJAX - */ -exports.postLastfm = function(req, res) { - if (req.body.track) { - lastfm.request("track.getInfo", { - artist: 'Evanescence', - track: 'My Immortal', - handlers: { - success: function(data) { - console.log(data); - return data; - }, - error: function(error) { - console.log(error.message); - return error.message; - } - } - }); - } - - if (req.body.artist) { - lastfm.request("artist.getInfo", { - artist: 'Evanescence', - handlers: { - success: function(data) { - console.log(data); - }, - error: function(error) { - console.log(error.message); - } - } - }); - } }; /** diff --git a/views/api/lastfm.jade b/views/api/lastfm.jade index c159005112..05a1ff676d 100644 --- a/views/api/lastfm.jade +++ b/views/api/lastfm.jade @@ -19,12 +19,17 @@ block content h3.text-primary Artist Information h4= artist.name - .btn.btn-sm.btn-primary-outline - i.fa.fa-users - | Listeners: #{artist.stats.listeners} - .btn.btn-sm.btn-primary-outline - i.fa.fa-headphones - | Scrobbles #{artist.stats.playcount} + ul.list-inline + li + small.text-primary + i.fa.fa-users + strong Listeners: + | #{artist.stats.listeners} + li + small.text-primary + i.fa.fa-headphones + strong Scrobbles: + | #{artist.stats.playcount} p img(src='#{artist.image}') p @@ -34,16 +39,9 @@ block content | #{tag.name} |  p!= artist.bio - - - - - h3.text-primary Song Information - form.form-horizontal(role='form', method='POST') - .form-group - label(class='col-sm-2 control-label', for='artist') Song - .col-sm-4 - input.form-control(type='text', name='artist', id='artist') - .form-group - .col-sm-offset-2.col-sm-4 - button.btn.btn-primary-outline(type='submit') Submit + strong Similar Artists + ul.list + for similarArtist in artist.similar + li + != '' + a(href='#{similarArtist.url}') #{similarArtist.name} \ No newline at end of file