From a53703683b6d1dc181b7d12e7f899b56c765bd11 Mon Sep 17 00:00:00 2001 From: JorgeGutierrez Date: Sat, 15 Aug 2020 20:32:28 -0500 Subject: [PATCH 1/4] Solucion de errores --- PULL_REQUEST_TEMPLATE.md | 8 ++++---- package-lock.json | 13 +++++++++++++ package.json | 2 +- src/index.js | 8 +++++--- 4 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 package-lock.json diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md index e85525b..5823c15 100644 --- a/PULL_REQUEST_TEMPLATE.md +++ b/PULL_REQUEST_TEMPLATE.md @@ -1,13 +1,13 @@ ## DESCRIPTION -Nombre: -Usuario Platzi: +Nombre: Jorge Andres Gutierrez +Usuario Platzi: @Kucu ## Ciudad - [ ] Ciudad de México -- [ ] Bogotá +- [ * ] Bogotá # Retos: - - [ ] Primer problema + - [ * ] Primer problema - [ ] Segundo problema - [ ] Tercer problema diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..e8c8dbc --- /dev/null +++ b/package-lock.json @@ -0,0 +1,13 @@ +{ + "name": "escuelajs-reto-03", + "version": "1.0.0", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "xmlhttprequest": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz", + "integrity": "sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw=" + } + } +} 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..60feecc 100644 --- a/src/index.js +++ b/src/index.js @@ -4,14 +4,16 @@ var API = 'https://rickandmortyapi.com/api/character/'; var xhttp = new XMLHttpRequest(); function fetchData(url_api, callback) { + + xhttp.open('GET', url_api, false); + xhttp.onreadystatechange = function (event) { - if (xhttp.readyState === '4') { + if (xhttp.readyState == 4) { if (xhttp.status == 200) - callback(null, xhttp.responseText); + callback(null, JSON.parse(xhttp.responseText)); else return callback(url_api); } }; - xhttp.open('GET', url_api, false); xhttp.send(); }; From b6770db6b2ab5ab68fba1637f3b692829457984b Mon Sep 17 00:00:00 2001 From: JorgeGutierrez Date: Sat, 15 Aug 2020 22:55:11 -0500 Subject: [PATCH 2/4] Solucion errores segundo problema --- PULL_REQUEST_TEMPLATE.md | 4 ++-- src/index.js | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md index 5823c15..2078973 100644 --- a/PULL_REQUEST_TEMPLATE.md +++ b/PULL_REQUEST_TEMPLATE.md @@ -8,6 +8,6 @@ Usuario Platzi: @Kucu - [ * ] Bogotá # Retos: - - [ * ] Primer problema - - [ ] Segundo problema + - [ ] Primer problema + - [ * ] Segundo problema - [ ] Tercer problema diff --git a/src/index.js b/src/index.js index 60feecc..ef4addc 100644 --- a/src/index.js +++ b/src/index.js @@ -3,11 +3,11 @@ var XMLHttpRequest = require("xmlhttprequest").XMLHttpRequest; var API = 'https://rickandmortyapi.com/api/character/'; var xhttp = new XMLHttpRequest(); -function fetchData(url_api, callback) { +const fetchData = (url_api, callback) => { xhttp.open('GET', url_api, false); - xhttp.onreadystatechange = function (event) { + xhttp.onreadystatechange = (event) => { if (xhttp.readyState == 4) { if (xhttp.status == 200) callback(null, JSON.parse(xhttp.responseText)); @@ -17,18 +17,18 @@ function fetchData(url_api, callback) { xhttp.send(); }; -fetchData(API, function (error1, data1) { - if (error1) return console.error('Error' + ' ' + error1); +fetchData(API, (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); + fetchData(API + data1.results[0].id, (error2, data2) =>{ + if (error2) return console.error(`Error ${error1}`); console.log('Segundo Llamado...') - fetchData(data2.origin.url, function (error3, data3) { - if (error3) return console.error(error3); + fetchData(data2.origin.url, (error3, data3) => { + if (error3) return console.error(`Error ${error3}`); console.log('Tercero Llamado...') - console.log('Personajes:' + ' ' + data1.info.count); - console.log('Primer Personaje:' + ' ' + data2.name); - console.log('Dimensión:' + ' ' + data3.dimension); + console.log(`Personajes ${data1.info.count}`); + console.log(`Primer Personaje ${data2.name}`); + console.log(`Dimension ${data3.dimension}`); }); }); }); \ No newline at end of file From 9c7bba2b42f756457877fc0ff32b6db112f4d693 Mon Sep 17 00:00:00 2001 From: JorgeGutierrez Date: Sat, 15 Aug 2020 23:55:59 -0500 Subject: [PATCH 3/4] Solucion tercer ejercicio --- PULL_REQUEST_TEMPLATE.md | 4 ++-- src/index.js | 50 ++++++++++++++++++++++------------------ 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md index 2078973..884d037 100644 --- a/PULL_REQUEST_TEMPLATE.md +++ b/PULL_REQUEST_TEMPLATE.md @@ -9,5 +9,5 @@ Usuario Platzi: @Kucu # Retos: - [ ] Primer problema - - [ * ] Segundo problema - - [ ] Tercer problema + - [ ] Segundo problema + - [ * ] Tercer problema diff --git a/src/index.js b/src/index.js index ef4addc..5aa5b9f 100644 --- a/src/index.js +++ b/src/index.js @@ -3,32 +3,38 @@ var XMLHttpRequest = require("xmlhttprequest").XMLHttpRequest; var API = 'https://rickandmortyapi.com/api/character/'; var xhttp = new XMLHttpRequest(); -const fetchData = (url_api, callback) => { +const fetchData = (url_api) => { - xhttp.open('GET', url_api, false); + xhttp.responseType = 'json' + xhttp.open('GET', url_api, true); + xhttp.send(); - xhttp.onreadystatechange = (event) => { - if (xhttp.readyState == 4) { - if (xhttp.status == 200) - callback(null, JSON.parse(xhttp.responseText)); - else return callback(url_api); + return new Promise((resolve, reject) => { + xhttp.onreadystatechange = (event) => { + if(xhttp.readyState == 4){ + if (xhttp.status == 200){ + const response = JSON.parse(xhttp.responseText); + resolve(response) + } + else{ + reject(Error('Error al cargar resultados')) + } } - }; - xhttp.send(); + } + }) }; -fetchData(API, (error1, data1) => { - if (error1) return console.error(`Error ${error1}`); +fetchData(API).then(data1 => { console.log('Primer Llamado...') - fetchData(API + data1.results[0].id, (error2, data2) =>{ - if (error2) return console.error(`Error ${error1}`); - console.log('Segundo Llamado...') - fetchData(data2.origin.url, (error3, data3) => { - if (error3) return console.error(`Error ${error3}`); + console.log(`Personajes ${data1.info.count}`) + return fetchData(API + data1.results[0].id) }) + .then(data2 => { + console.log('Segundo Llamado...') + console.log(`Primer Personaje ${data2.name}`) + return fetchData(data2.origin.url) + }).then(data3 => { console.log('Tercero Llamado...') - console.log(`Personajes ${data1.info.count}`); - console.log(`Primer Personaje ${data2.name}`); - console.log(`Dimension ${data3.dimension}`); - }); - }); -}); \ No newline at end of file + console.log(`Dimension ${data3.dimension}`) + }).catch(error => { + console.log(error) + }) \ No newline at end of file From 660b5daf92673ff7de7db84e843e9c350ef3c3cd Mon Sep 17 00:00:00 2001 From: JorgeGutierrez Date: Sun, 16 Aug 2020 20:49:54 -0500 Subject: [PATCH 4/4] cambios finales --- PULL_REQUEST_TEMPLATE.md | 26 +++++++------- src/index.js | 78 ++++++++++++++++++++-------------------- 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md index 884d037..2b962fb 100644 --- a/PULL_REQUEST_TEMPLATE.md +++ b/PULL_REQUEST_TEMPLATE.md @@ -1,13 +1,13 @@ -## DESCRIPTION - -Nombre: Jorge Andres Gutierrez -Usuario Platzi: @Kucu - -## Ciudad -- [ ] Ciudad de México -- [ * ] Bogotá - -# Retos: - - [ ] Primer problema - - [ ] Segundo problema - - [ * ] Tercer problema +## DESCRIPTION + +Nombre: Jorge Andres Gutierrez +Usuario Platzi: @Kucu + +## Ciudad +- [ ] Ciudad de México +- [ * ] Bogotá + +# Retos: + - [ ] Primer problema + - [ ] Segundo problema + - [ * ] Tercer problema diff --git a/src/index.js b/src/index.js index 5aa5b9f..537fee4 100644 --- a/src/index.js +++ b/src/index.js @@ -1,40 +1,40 @@ -var XMLHttpRequest = require("xmlhttprequest").XMLHttpRequest; - -var API = 'https://rickandmortyapi.com/api/character/'; -var xhttp = new XMLHttpRequest(); - -const fetchData = (url_api) => { - - xhttp.responseType = 'json' - xhttp.open('GET', url_api, true); - xhttp.send(); - - return new Promise((resolve, reject) => { - xhttp.onreadystatechange = (event) => { - if(xhttp.readyState == 4){ - if (xhttp.status == 200){ - const response = JSON.parse(xhttp.responseText); - resolve(response) - } - else{ - reject(Error('Error al cargar resultados')) - } - } - } - }) -}; - -fetchData(API).then(data1 => { - console.log('Primer Llamado...') - console.log(`Personajes ${data1.info.count}`) - return fetchData(API + data1.results[0].id) }) - .then(data2 => { - console.log('Segundo Llamado...') - console.log(`Primer Personaje ${data2.name}`) - return fetchData(data2.origin.url) - }).then(data3 => { - console.log('Tercero Llamado...') - console.log(`Dimension ${data3.dimension}`) - }).catch(error => { - console.log(error) +var XMLHttpRequest = require("xmlhttprequest").XMLHttpRequest; + +var API = 'https://rickandmortyapi.com/api/character/'; +var xhttp = new XMLHttpRequest(); + +const fetchData = (url_api) => { + + xhttp.responseType = 'json' + xhttp.open('GET', url_api, true); + xhttp.send(); + + return new Promise((resolve, reject) => { + xhttp.onreadystatechange = (event) => { + if(xhttp.readyState == 4){ + if (xhttp.status == 200){ + const response = JSON.parse(xhttp.responseText); + resolve(response) + } + else{ + reject(Error('Error al cargar resultados')) + } + } + } + }) +}; + +fetchData(API).then(data1 => { + console.log('Primer Llamado...') + console.log(`Personajes ${data1.info.count}`) + return fetchData(API + data1.results[0].id) }) + .then(data2 => { + console.log('Segundo Llamado...') + console.log(`Primer Personaje ${data2.name}`) + return fetchData(data2.origin.url) + }).then(data3 => { + console.log('Tercero Llamado...') + console.log(`Dimension ${data3.dimension}`) + }).catch(error => { + console.log(error) }) \ No newline at end of file