diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md index e85525b..1189ed9 100644 --- a/PULL_REQUEST_TEMPLATE.md +++ b/PULL_REQUEST_TEMPLATE.md @@ -1,13 +1,13 @@ ## DESCRIPTION -Nombre: -Usuario Platzi: +Nombre: wilmar yoan malaver +Usuario Platzi: @wilmaryoanmalavermalaver ## Ciudad - [ ] Ciudad de México -- [ ] Bogotá +- [done] Bogotá # Retos: - - [ ] Primer problema - - [ ] Segundo problema - - [ ] Tercer problema + - [done] Primer problema + - [done] Segundo problema + - [done] Tercer problema diff --git a/package.json b/package.json index 65a8bf2..dbaa2f1 100644 --- a/package.json +++ b/package.json @@ -24,4 +24,4 @@ "dependencies": { "xmlhttprequest": "^1.8.0" } -} \ No newline at end of file +} diff --git a/src/index.js b/src/index.js index d6fa599..34b5fe1 100644 --- a/src/index.js +++ b/src/index.js @@ -1,32 +1,41 @@ -var XMLHttpRequest = require("xmlhttprequest").XMLHttpRequest; +const XMLHttpRequest = require("xmlhttprequest").XMLHttpRequest; -var API = 'https://rickandmortyapi.com/api/character/'; -var xhttp = new XMLHttpRequest(); +const API = 'https://rickandmortyapi.com/api/character/'; +const xhttp = new XMLHttpRequest(); -function fetchData(url_api, callback) { - xhttp.onreadystatechange = function (event) { - if (xhttp.readyState === '4') { - if (xhttp.status == 200) - callback(null, xhttp.responseText); - else return callback(url_api); +const fetchData = (url_api) => { + return new Promise((resolve, reject) => { + xhttp.open('GET', url_api, true); + xhttp.send(); + xhttp.onreadystatechange = event => { + if (xhttp.readyState === 4) { + if (xhttp.status === 200) + resolve(JSON.parse(xhttp.responseText)); + else { + return reject(`Ocurrió un error`); + } } }; - xhttp.open('GET', url_api, false); - xhttp.send(); -}; +}) +} -fetchData(API, function (error1, data1) { - if (error1) return console.error('Error' + ' ' + error1); - console.log('Primer Llamado...') - fetchData(API + data1.results[0].id, function (error2, data2) { - if (error2) return console.error(error1); - console.log('Segundo Llamado...') - fetchData(data2.origin.url, function (error3, data3) { - if (error3) return console.error(error3); - console.log('Tercero Llamado...') - console.log('Personajes:' + ' ' + data1.info.count); - console.log('Primer Personaje:' + ' ' + data2.name); - console.log('Dimensión:' + ' ' + data3.dimension); - }); - }); -}); \ No newline at end of file + +Promise + .all([fetchData(API)]) + .then(data1 => { + console.log(`'Personajes: ${data1[0].info.count}`); + return fetchData(`${API}${data1[0].results[0].id}`) + +}) + +.then(data2 => { + console.log(`Primer Personaje: ${data2.name}`); + return fetchData(data2.origin.url) +}) + +.then(data3 => { + console.log(`Dimensión: ${data3.dimension}`); +}) + +.catch(message => console.log(message)) + \ No newline at end of file