Merge pull request #10 from rasoirnoir/planets

Planets

scripts/planets.js

@@ -1,14 +1,14 @@
-import { api_call, API_URL } from "./util";
+import { api_call, API_URL, getPage } from "./util";
 
 const planetes = document.getElementById("resultats");
 
 console.log('planet.js loaded');
 
-api_call(API_URL + "/planets", console.log);
-
 
 function remplissage(results){
 
+    planetes.innerHTML = "";
+
     const previousUrl = results.previous;
     const nextUrl = results.next;
     const tabResults = results.results;
@@ -20,22 +20,64 @@ function remplissage(results){
         const terrain = resultPlanet.terrain;
         const population = resultPlanet.population;
 
-        // const tabResidents = resultPLanet.residents;
+        const tabResidents = resultPlanet.residents;
-        // const tabResidents = call_api(`people/`);
+        //Problème de requêtes asyncrones
-        const tabFilms = resultPLanet.films;
+        // let tabResidents = [];
+        // for(index in resultPlanet.residents){
+        //     api_call(resultPlanet.residents[index], (jsonresp)=>{
+        //         console.log(jsonresp.name);
+        //     });
+        // }
+        // console.log(`${nom} - résidents : ${resultPlanet.residents}`);
+        // console.log(`nom des résidents : ${tabResidents}`);
+        const tabFilms = resultPlanet.films;
 
+
+        planetes.innerHTML += 
+        `<section class="resultat">
+            <h1 class="titreAccordeon">${nom}</h1>
+            <div class="accordeon">
+                <div class="1">
+                    <p>${terrain}</p>
+                    <p>${climate}</p>
+                    <p>${diametre}Km</p>
+                </div>
+                <div class="2">${tabResidents}</div>
+                <div class="3">${tabFilms}</div>
+            </div>
+        </section>`;
     }
 
+    //Pagination
+    console.log("Url précédente : " + previousUrl);
+    console.group("Url suivante : " + nextUrl);
+    const currentPage = (previousUrl == null ? parseInt(getPage(nextUrl)) - 1 : parseInt(getPage(previousUrl)) + 1);
+    console.log("Page courante : " + currentPage);
 
-    planetes.innerHTML = 
+    let firstPage = false;
-    `<section class="resultat">
+    let lastPage = false;
-    <h1 class="titreAccordeon"></h1>
+    if(previousUrl == null) firstPage = true;
-    <div class="accordeon">
+    if(nextUrl == null) lastPage = true;
-        <div class="1">Prout 1</div>
+    let previousButton = `<button id="prevButton">Page précédente</button>`;
-        <div class="2">Prout 2</div>
+    let currentButton = `${currentPage}`;
-        <div class="3">Prout 3</div>
+    let nextButton = `<button id="nextButton">Page suivante</button>`;
-    </div>
+    if(!firstPage) {
-</section>`;
+        planetes.innerHTML += previousButton;
+        console.log(document.getElementById("prevButton"));
+        document.getElementById("prevButton").addEventListener("click", () => {
+            api_call(previousUrl, remplissage);
+        });
+    }
+    planetes.innerHTML += currentButton;
+    if(!lastPage) {
+        planetes.innerHTML += nextButton;
+        document.getElementById("nextButton").addEventListener("click", () => {
+            api_call(nextUrl, remplissage);
+        });
+    };
+
+    
+    
 }
 
-// api_call(API_URL + "/planets", remplissage);
+api_call(API_URL + "/planets", remplissage);

scripts/util.js

@@ -21,3 +21,16 @@ export const api_call = (url, callback) => {
         });
 }
 
+/**
+ * Récupère le numéro de la page courante
+ * @param {string} url l'url d'un résultat multipage (qui se termine par ?page=2 par exemple)
+ * @returns Le numéro de la page de l'url
+ */
+export const getPage = (url) => {
+    tabUrl = url.split('/');
+    pageEgal = tabUrl[tabUrl.length - 1];
+    tabPageEgal = pageEgal.split('=');
+    numeroPage = tabPageEgal[tabPageEgal.length - 1];
+
+    return numeroPage;
+}