Fixed some modilarize things

massam89 · massam89 · commit dc17db644684 · 2021-01-08T10:54:16.000+03:30
diff --git a/hackyourrepo-app/Masoud/week3/util/addContributersToDOM.js b/hackyourrepo-app/Masoud/week3/util/addContributersToDOM.js
@@ -3,6 +3,7 @@ import { showContributers } from './showContributers.js';
 import { addButtonsToDOM } from './addButtonsToDOM.js';
 import { changeArrayToIndex } from './changeArrayToIndex.js';
 import { addContributerToDOM } from './addContributerToDOM.js';
+
 export function addContributersToDOM(data, contributersSection, buttonArea) {
 
   buttonArea.innerHTML = '';
diff --git a/hackyourrepo-app/Masoud/week3/util/script.js b/hackyourrepo-app/Masoud/week3/util/script.js
@@ -2,43 +2,37 @@ import { addBasicsToDOM } from './addBasicsToDOM.js';
 import { fetchData } from './fetchData.js';
 import { displayError } from './displayError.js';
 import { addListToDOM } from './addListToDOM.js';
-import { addContributersToDOM } from './addContributersToDOM.js';
 import { addDescriptionToDOM } from './addDescriptionToDOM.js';
+import { secondFetchAndAddToDOM } from './secondFetchAndAddToDOM.js';
 
 window.onload = main;
 
-export function main() {
+async function main() {
+  try {
+    const elements = addBasicsToDOM();
+    const selectElement = elements.selectElement;
+    const contributersSection = elements.contributersSection;
+    const bodyTable = elements.bodyTable;
+    const buttonArea = elements.buttonArea;
 
-  const elements = addBasicsToDOM();
-  const selectElement = elements.selectElement;
-  const contributersSection = elements.contributersSection;
-  const bodyTable = elements.bodyTable;
-  const buttonArea = elements.buttonArea;
+    const url1 = 'https://api.github.com/orgs/HackYourFuture/repos?per_page=100';
 
-  const url = 'https://api.github.com/orgs/HackYourFuture/repos?per_page=100';
+    const myJson = await fetchData(url1);
 
-  fetchData(url).then(myJson => {
     addListToDOM(myJson, selectElement);
 
     selectElement.addEventListener('change', () => {
-
       myJson.forEach(element => {
         if (element.name == selectElement.value) {
           addDescriptionToDOM(bodyTable, element);
-
-          const url = element.contributors_url;
-
-          fetchData(url).then(myJson => {
-            addContributersToDOM(myJson, contributersSection, buttonArea);
-          })
-            .catch(error => {
-              displayError(error);
-            })
+          const url2 = element.contributors_url;
+          secondFetchAndAddToDOM(url2, contributersSection, buttonArea);
         }
       })
     })
-  })
-    .catch(error => {
-      displayError(error);
-    })
-};
+  }
+
+  catch (error) {
+    displayError(error);
+  }
+}
diff --git a/hackyourrepo-app/Masoud/week3/util/secondFetchAndAddToDOM.js b/hackyourrepo-app/Masoud/week3/util/secondFetchAndAddToDOM.js
@@ -0,0 +1,15 @@
+import { fetchData } from "./fetchData.js";
+import { addContributersToDOM } from './addContributersToDOM.js';
+import { displayError } from './displayError.js';
+
+export async function secondFetchAndAddToDOM(url, contributersSection, buttonArea) {
+  try {
+    const myJson = await fetchData(url);
+    addContributersToDOM(myJson, contributersSection, buttonArea);
+  }
+
+  catch (error) {
+    displayError(error);
+  }
+
+}
