HW js12 done

js/12/index.js

@@ -1,5 +1,5 @@
 
-// fetchImprovedWrapp()
+fetchImprovedWrapp()
 function fetchImprovedWrapp() {
 
    fetch('https://swapi.dev/api/people/1/')
@@ -11,8 +11,8 @@ function fetchImprovedWrapp() {
       }   
    )
 
-   function renderTable(element, json, backup={}) {
-      let backObj = json
+   function renderTable(element, json, backup=[]) {
+      let backArr = backup
       element.innerHTML = ''      
       const table = document.createElement('table')
       element.append(table)
@@ -34,15 +34,18 @@ function fetchImprovedWrapp() {
             // console.log(reRes3)
             let reRes = re.test(string)
             if (reRes) {
+               let newString = string.replace(re, '')
                const btn = document.createElement('button')
-               btn.innerText = 'Перейти'
+               btn.innerText = 'Перейти на ' + newString
                td.append(btn)
                btn.onclick = () => {
                   fetch(string)
                   .then(res => res.json())
                   .then(obj => {
                      console.log(obj)
-                     renderTable(element, obj, backObj)
+                     backArr.push(json) 
+                     // console.log(backArr)
+                     renderTable(element, obj, backArr)
                   })
                }
             } else {
@@ -64,14 +67,18 @@ function fetchImprovedWrapp() {
       backBtn.innerText = 'Назад'
       element.append(backBtn)
       backBtn.onclick = () => {
-         renderTable(element, backup)
+         let lastObj = backArr.pop() 
+         // console.log(backArr)
+         if (lastObj) {
+            renderTable(element, lastObj, backArr)
+         }         
       }
    }
 
 }
 
 
-myFetchWrapp()
+// myFetchWrapp()
 function myFetchWrapp() {
 
    function myfetch(url){