diff --git a/hw7/Claudio_Maggioni/public/scripts/app.js b/hw7/Claudio_Maggioni/public/scripts/app.js index fd72d00..71a6c66 100644 --- a/hw7/Claudio_Maggioni/public/scripts/app.js +++ b/hw7/Claudio_Maggioni/public/scripts/app.js @@ -19,6 +19,7 @@ class App { const albumInput = imgurForm.querySelector('input[name=album]'); const oldNameInput = imgurForm.querySelector('input[name=old_name]'); const replacePanel = imgurForm.querySelector('.replace'); + const detailsPanel = imgurForm.querySelector('.details'); dom.querySelector('button.imgur').onclick = () => { imgurForm.classList.toggle('hidden'); @@ -39,9 +40,11 @@ class App { imgurForm.onsubmit = e => { imgurForm.classList.remove('ok'); imgurForm.classList.remove('err'); - e.preventDefault(); - const data = new FormData(imgurForm); + detailsPanel.innerHTML = ''; + e.preventDefault(); + + const data = new FormData(imgurForm); const obj = { dataURL: data.get('dataURL'), name: dom.querySelector('form.data input[name=name]').value, @@ -56,6 +59,15 @@ class App { .then(e => { if (e.ordealSuccess === true) { imgurForm.classList.add('ok'); + if (e.views) { + detailsPanel.innerHTML += + `Views: ${e.views}
`; + } + if (e.votes) { + detailsPanel.innerHTML += + `Upvotes: ${e.votes.ups}
+ Downvotes: ${e.votes.downs}
`; + } } else { imgurForm.classList.add('err'); } diff --git a/hw7/Claudio_Maggioni/routes/root/router.js b/hw7/Claudio_Maggioni/routes/root/router.js index 69174f4..cd6b7db 100644 --- a/hw7/Claudio_Maggioni/routes/root/router.js +++ b/hw7/Claudio_Maggioni/routes/root/router.js @@ -154,10 +154,12 @@ router.post('/imgur/ordeal', async (req, res) => { ordealResponse.views = result.image.views; ordealResponse.votes = await fetchImgur(req, res, 'GET', '/gallery/' - + result.album.id + '/votes'); + + result.image.id + '/votes'); if (!ordealResponse.votes) { return; + } else { + ordealResponse.votes = ordealResponse.votes.data; } console.log('votes', ordealResponse.votes); @@ -172,9 +174,8 @@ router.post('/imgur/ordeal', async (req, res) => { } } - if (!await fetchImgur(req, res, 'POST', '/gallery/album/' + - albumJson.data.id, { title: req.body.album ? req.body.album : - req.body.name })) { + if (!await fetchImgur(req, res, 'POST', '/gallery/image/' + + uploadJson.data.id, { title: req.body.name })) { return; } @@ -184,7 +185,7 @@ router.post('/imgur/ordeal', async (req, res) => { }; if (!await fetchImgur(req, res, 'POST', '/gallery/tags/' + - albumJson.data.id, tagsData)) { + uploadJson.data.id, tagsData)) { return; } diff --git a/hw7/Claudio_Maggioni/views/favourite_partial.dust b/hw7/Claudio_Maggioni/views/favourite_partial.dust index 92cc359..015948f 100644 --- a/hw7/Claudio_Maggioni/views/favourite_partial.dust +++ b/hw7/Claudio_Maggioni/views/favourite_partial.dust @@ -38,5 +38,6 @@ formaction="/favorites/{_id}/bookmarked?_method=PUT">Add bookmark
+
{/details}