pre commit avant de fix

UTT-GL03 · Dec 17, 2024 · 871df93 · 871df93
1 parent 0ec4918
commit 871df93
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -19,10 +19,10 @@ services:
       test: curl -f http://localhost:5984/_up || exit 1
       interval: 2s
       timeout: 3s
-    
+
   accessible_backend:
     image: curlimages/curl
-    entrypoint: ["/bin/sh","-c"]
+    entrypoint: [ "/bin/sh", "-c" ]
     command:
       - |
         alias put="curl -X PUT -u '${COUCHDB_USER}:${COUCHDB_PASSWORD}'"
@@ -33,10 +33,10 @@ services:
     depends_on:
       backend:
         condition: service_healthy
-    
+
   updated_samples:
     image: curlimages/curl
-    entrypoint: ["/bin/sh","-c"]
+    entrypoint: [ "/bin/sh", "-c" ]
     volumes:
       - ./frontend/public/sample_data.json:/sample_data.json
     command:
@@ -45,15 +45,15 @@ services:
     depends_on:
       accessible_backend:
         condition: service_completed_successfully
-  
+
   index:
     image: curlimages/curl
-    entrypoint: ["/bin/sh","-c"]
+    entrypoint: [ "/bin/sh", "-c" ]
     volumes:
       - ./backend/bydate.json:/bydate.json
     command:
       - |
         curl -X POST http://backend:5984/database_joblinker_prot3/_index -H "Content-Type: application/json" -d @/bydate.json -u '${COUCHDB_USER}:${COUCHDB_PASSWORD}'
     depends_on:
       accessible_backend:
-        condition: service_completed_successfully
+        condition: service_completed_successfully
diff --git a/frontend/src/Headlines.jsx b/frontend/src/Headlines.jsx
@@ -25,6 +25,7 @@ function Headlines({ searchTerm, setSearchTerm, contractType, setContractType, r
 
   const handleSearch = (e) => {
     e.preventDefault();
+    console.log(e);
     onSearchClick(); // Appel de la fonction pour déclencher le filtrage
   };
 

diff --git a/frontend/src/Offer.jsx b/frontend/src/Offer.jsx
@@ -7,8 +7,10 @@ function Offer({ searchTerm, contractType, region, isSearchClicked, setIsSearchC
   const [filteredOffers, setFilteredOffers] = useState([]);
   const [nextBookmark, setNextBookmark] = useState()
   const [requestedBookmark, setRequestedBookmark] = useState()
+  const [hasMoreOffers, setHasMoreOffers] = useState(true)
 
   useEffect(() => {
+    //mettre ça dans une nouvelle fonction et dans le useeffect t'appele cette fonction
     // fetch('http://localhost:5984/qvotidie/_all_docs?include_docs=true ')
     fetch("http://localhost:5984/database_joblinker_prot3/_find", {
       method: "POST",
@@ -23,7 +25,7 @@ function Offer({ searchTerm, contractType, region, isSearchClicked, setIsSearchC
               issued: "desc"
             }
           ],
-          limit: 100,
+          limit: 25,
         bookmark: requestedBookmark
       })
     })
@@ -33,6 +35,11 @@ function Offer({ searchTerm, contractType, region, isSearchClicked, setIsSearchC
         setAllOffers([...allOffers, ...allDocs]);
         setNextBookmark(data.bookmark); 
         setFilteredOffers((prev) => [...prev, ...allDocs]);
+
+        if (allDocs.length === 0) {
+          setHasMoreOffers(false);
+        }
+
       })
       .catch((error) =>
         console.error("Erreur lors du chargement des données :", error)
@@ -43,14 +50,14 @@ function Offer({ searchTerm, contractType, region, isSearchClicked, setIsSearchC
 
   useEffect(() => {
     if (isSearchClicked) {
-      const offers = allOffers.filter((doc) => {
+      const offers = allOffers.filter((doc) => {   //enlever jusque
         const matchesSearchTerm = doc.title?.toLowerCase().includes(searchTerm.toLowerCase());
         const matchesContractType = contractType === "" || doc.type === contractType;
         const matchesRegion = region === "" || doc.location === region;
 
         return matchesSearchTerm && matchesContractType && matchesRegion;
       });
-      setFilteredOffers(offers);  
+      setFilteredOffers(offers);  //la //ajouter l'appel a la future fonction que on vas faire avec un tab vide
       setIsSearchClicked(false); 
     }
   }, [isSearchClicked, searchTerm, contractType, region, setIsSearchClicked, allOffers]);
@@ -65,7 +72,7 @@ function Offer({ searchTerm, contractType, region, isSearchClicked, setIsSearchC
           <OfferCard key={index} doc={doc} />
         ))}
       </div>
-      { nextBookmark && (
+      {nextBookmark && (
   <button 
     onClick={() => {
       setRequestedBookmark(nextBookmark); // Charge les offres suivantes