Merge pull request #366 from iKozay/Refactoring

Refactoring
iKozay · Apr 10, 2024 · a633633 · a633633
2 parents 28ef773 + 064a297
commit a633633
Show file tree

Hide file tree

Showing 7 changed files with 111 additions and 189 deletions.
diff --git a/src/frontend/src/components/browsingPage/SearchBox.jsx b/src/frontend/src/components/browsingPage/SearchBox.jsx
@@ -7,7 +7,7 @@ import { branchContext } from "../../Pages/BrowsingPage";
 
 export default function SearchBox() {
   const {branchName, setBranchName} = useContext(branchContext);
-  const [dateRange, setDateRange] = useState([new Date(), new Date()]);
+  const [dateRange, setDateRange] = useState([new Date(), new Date(new Date().setDate(new Date().getDate() + 7))]);
 
   const [expandMap, setExpandMap] = useState(false);
 

diff --git a/src/frontend/src/components/browsingPage/SortFilterButtons.jsx b/src/frontend/src/components/browsingPage/SortFilterButtons.jsx
@@ -1,6 +1,6 @@
 import React, { useState, useRef } from 'react';
 
-export default function SortFilterButtons({ setVehicles, vehicles }) {
+export default function SortFilterButtons({ allVehicles, sortedVehicles, setVehicles}) {
 
   const [isOpen1, setIsOpen1] = useState(false);
   const [selectedCategory1, setSelectedCategory1] = useState(null);
@@ -16,12 +16,48 @@ export default function SortFilterButtons({ setVehicles, vehicles }) {
 
   const buttonRef4 = useRef(null);
 
+  const [filter , setFilter] = useState({
+    numberOfSeats: null,
+    numberOfDoors: null,
+    price: null
+  });
+
   const resetAllFilters = () => {
-    setVehicles(vehicles);
-    handleCategoryClick1(null);
-    handleCategoryClick2(null);
-    handleCategoryClick3(null);
+    setSelectedCategory1(null);
+    setSelectedCategory2(null);
+    setSelectedCategory3(null);
+    setVehicles(allVehicles);
   }
+  const filterVehicles = (numberOfSeats, numberOfDoors, price) => {
+    setFilter({
+        numberOfSeats: numberOfSeats,
+        numberOfDoors: numberOfDoors,
+        price: price
+    });
+    let filteredVehicles = allVehicles;
+    if(numberOfSeats !== null){
+      filteredVehicles = filteredVehicles.filter((vehicle) => vehicle.numberOfSeats === numberOfSeats);
+    }
+    if(numberOfDoors !== null){
+      filteredVehicles = filteredVehicles.filter((vehicle) => vehicle.numberOfDoors === numberOfDoors);
+    }
+
+    // sort the filtered vehicles
+    sortVehicles(filter.price);
+
+    setVehicles(filteredVehicles);
+  }
+
+    const sortVehicles = (price) => {
+      if(price !== null){
+        if(price === 1){
+          setVehicles(sortedVehicles.sort((a, b) => a.price - b.price));
+        }
+        if(price === 2){
+          setVehicles(sortedVehicles.sort((a, b) => b.price - a.price));
+        }
+      }
+    }
 
   const toggleDropdown1 = () => {
     setIsOpen1(!isOpen1);
@@ -35,51 +71,48 @@ export default function SortFilterButtons({ setVehicles, vehicles }) {
     setIsOpen3(!isOpen3);
   }
 
-  const handleCategoryClick1 = (category) => {
+  const handleFilterBySeats = (category) => {
     if(category!==null){
-      const sortedVehicles = vehicles.filter((vehicle) => vehicle.numberOfSeats === category);
-      setVehicles(sortedVehicles);
+      // const sortedVehicles = vehicles.filter((vehicle) => vehicle.numberOfSeats === category);
+      // setVehicles(sortedVehicles);
       setSelectedCategory1(category + " seats");
-      setIsOpen1(false);
     }else{
-        setVehicles(vehicles);
-        setSelectedCategory1(category);
-        setIsOpen1(false);
+        // setVehicles(vehicles);
+        setSelectedCategory1(null);
     }
-
+    setIsOpen1(false);
+    filterVehicles(category, filter.numberOfDoors, filter.price);
   };
 
-  const handleCategoryClick2 = (category) => {
+  const handleFilterByDoors = (category) => {
     if(category!==null){
-      const sortedVehicles = vehicles.filter((vehicle) => vehicle.numberOfDoors === category);
-      setVehicles(sortedVehicles);
+      // const sortedVehicles = vehicles.filter((vehicle) => vehicle.numberOfDoors === category);
+      // setVehicles(sortedVehicles);
       setSelectedCategory2(category + " Doors");
-      setIsOpen2(false);
     }else{
-        setVehicles(vehicles);
-        setSelectedCategory2(category);
-        setIsOpen2(false);
+        // setVehicles(vehicles);
+        setSelectedCategory2(null);
     }
-
+    setIsOpen2(false);
+    filterVehicles(filter.numberOfSeats, category, filter.price);
   };
 
-  const handleCategoryClick3 = (category) => {
+  const handleSortByPrice = (category) => {
     if(category!==null){
-      const sortedVehicles = vehicles.filter((vehicle) => vehicle.price === category);
-      setVehicles(sortedVehicles);
+      // const sortedVehicles = vehicles.filter((vehicle) => vehicle.price === category);
+      // setVehicles(sortedVehicles);
       if(category === 1){
         setSelectedCategory3("Low to High");
       }
       if(category === 2){
         setSelectedCategory3("High to Low");
       }
-      setIsOpen3(false);
     }else{
-        setVehicles(vehicles);
-        setSelectedCategory3(category);
-        setIsOpen3(false);
+        // setVehicles(vehicles);
+        setSelectedCategory3(null);
     }
-
+    setIsOpen3(false);
+    filterVehicles(filter.numberOfSeats, filter.numberOfDoors, category);
   };
 
   return (
@@ -113,35 +146,35 @@ export default function SortFilterButtons({ setVehicles, vehicles }) {
               <li>
                 <div
                     className={`cursor-pointer ${selectedCategory1 === 'reset' ? 'font-medium text-neutral-900' : ''}`}
-                    onClick={() => handleCategoryClick1(null)}>
+                    onClick={() => handleFilterBySeats(null)}>
                   Reset
                 </div>
               </li>
               <li>
                 <div
                   className={`cursor-pointer ${selectedCategory1 === '2 seats' ? 'font-medium text-neutral-900' : ''}`}
-                  onClick={() => handleCategoryClick1(2)}>
+                  onClick={() => handleFilterBySeats(2)}>
                   2 seats
                 </div>
               </li>
               <li>
                 <div
                   className={`cursor-pointer ${selectedCategory1 === '4 seats' ? 'font-medium text-neutral-900' : ''}`}
-                  onClick={() => handleCategoryClick1(4)}>
+                  onClick={() => handleFilterBySeats(4)}>
                   4 seats
                 </div>
               </li>
               <li>
                 <div
                     className={`cursor-pointer ${selectedCategory1 === '5 seats' ? 'font-medium text-neutral-900' : ''}`}
-                    onClick={() => handleCategoryClick1(5)}>
+                    onClick={() => handleFilterBySeats(5)}>
                   5 seats
                 </div>
               </li>
               <li>
                 <div
                   className={`cursor-pointer ${selectedCategory1 === '6 seats' ? 'font-medium text-neutral-900' : ''}`}
-                  onClick={() => handleCategoryClick1(6)}>
+                  onClick={() => handleFilterBySeats(6)}>
                   6 seats
                 </div>
               </li>
@@ -174,29 +207,28 @@ export default function SortFilterButtons({ setVehicles, vehicles }) {
               <li>
                 <div
                     className={`cursor-pointer ${selectedCategory2 === 'Reset' ? 'font-medium text-neutral-900' : ''}`}
-                    onClick={() => handleCategoryClick2(null)}>
+                    onClick={() => handleFilterByDoors(null)}>
                   Reset
                 </div>
               </li>
               <li>
                 <div
                     className={`cursor-pointer ${selectedCategory2 === '2 Doors' ? 'font-medium text-neutral-900' : ''}`}
-                    onClick={() => handleCategoryClick2(2)}>
+                    onClick={() => handleFilterByDoors(2)}>
                   2 Doors
                 </div>
               </li>
               <li>
                 <div
                   className={`cursor-pointer ${selectedCategory2 === '4 Doors' ? 'font-medium text-neutral-900' : ''}`}
-                  onClick={() => handleCategoryClick2(4)}>
+                  onClick={() => handleFilterByDoors(4)}>
                   4 Doors
                 </div>
               </li>
             </ul>
           </div>
         )}
 
-        {/* Button 3
         <button ref={buttonRef3} onClick={toggleDropdown3} className="text-white bg-neutral-700 hover:bg-neutral-800 font-medium rounded-lg text-sm px-5 py-2.5 text-center inline-flex items-center mr-8 w-36"
           type="button">
           {selectedCategory3 || 'Sort by Price'}
@@ -207,7 +239,7 @@ export default function SortFilterButtons({ setVehicles, vehicles }) {
         </button>
 
         {isOpen3 && (
-          
+
           <div
             style={{
               position: 'absolute',
@@ -221,27 +253,27 @@ export default function SortFilterButtons({ setVehicles, vehicles }) {
               <li>
                 <div
                     className={`cursor-pointer ${selectedCategory3 === 'Reset' ? 'font-medium text-neutral-900' : ''}`}
-                    onClick={() => handleCategoryClick3(null)}>
+                    onClick={() => handleSortByPrice(null)}>
                   Reset
                 </div>
               </li>
               <li>
                 <div
                   className={`cursor-pointer ${selectedCategory3 === 'Low to High' ? 'font-medium text-neutral-900' : ''}`}
-                  onClick={() => handleCategoryClick3(1)}>
+                  onClick={() => handleSortByPrice(1)}>
                   Low to High
                 </div>
               </li>
               <li>
                 <div
                   className={`cursor-pointer ${selectedCategory3 === 'High to Low' ? 'font-medium text-neutral-900' : ''}`}
-                  onClick={() => handleCategoryClick3(2)}>
+                  onClick={() => handleSortByPrice(2)}>
                   High to Low
                 </div>
               </li>
             </ul>
           </div>
-        )} */}
+        )}
 
         {/* Button 4 */}
         <button ref={buttonRef4} onClick={resetAllFilters} className="text-white bg-neutral-700 hover:bg-neutral-800 font-medium rounded-lg text-sm px-5 py-2.5 text-center inline-flex mr-8"

diff --git a/src/frontend/src/components/browsingPage/VehicleList.jsx b/src/frontend/src/components/browsingPage/VehicleList.jsx
@@ -32,14 +32,10 @@ export default function VehicleList() {
     fetchVehicles();
   }, [branchName]);
 
-  const handleSortFilter = (sortedVehicles) => {
-    setSortedVehicles(sortedVehicles);
-  };
-
   return (
 
     <div className="bg-white">
-      <SortFilterButtons setVehicles={handleSortFilter} vehicles={vehicles} />
+      <SortFilterButtons allVehicles={vehicles} sortedVehicles={sortedVehicles} setVehicles={(v)=>{setSortedVehicles(v)}} />
       <div className="mx-auto max-w-2xl px-4 sm:px-6 lg:max-w-7xl lg:px-8">
         <hr className="my-8"/>
         <h2 className="sr-only">Vehicles</h2>

diff --git a/src/frontend/src/components/checkIn/RentalAgreement.jsx b/src/frontend/src/components/checkIn/RentalAgreement.jsx
@@ -136,24 +136,17 @@ useEffect(() => {
         <h2 className="text-lg font-bold mb-2">8. Signatures:</h2>
         <p className='font-bold my-1'>Rental company</p>
 
-        <Popup
-        modal
-        trigger={<button className='bg-transparent text-blue-500 hover:underline'>Electronic Signature: </button>}
-        closeOnDocumentClick={false}>
-        {close => (
+        {(
           <>
             <SignaturePad
               ref={sigCanvas}
               canvasProps={{
                 className: "signatureCanvas"
               }}
             />
-            <button className='mx-1' onClick={save1}>Save</button>
-            <button className='mx-1' onClick={clear}>Clear</button>
-            <button className='mx-1' onClick={close}>Close</button>
+            <button className='mx-1 float-right' onClick={clear}>Clear</button>
           </>
         )}
-      </Popup>
       {imageURL1 ? (
         <img
           src={imageURL1}
@@ -163,50 +156,41 @@ useEffect(() => {
       ) : null}
       <br/>
 
-        <label>Print Name: </label>
-        <input className="border-2 border-blue-200 rounded px-2 py-1 my-1"></input>
-        <br/>
-
-        <label>Date: </label>
-        <input className="border-2 border-blue-200 rounded px-2 py-1 my-1"></input>
-        <br/>
+        <div className={"flex justify-center"}>
+            <label className="mr-5 mt-2">Print Name: </label>
+            <input className="border-2 border-blue-200 rounded px-2 py-1 my-1"></input>
+            <label className="ml-5 mt-2">Date: {new Date().toLocaleDateString()}</label>
+            <br/>
+        </div>
 
         <p className='font-bold my-1'>Renter</p>
 
-        <Popup
-        modal
-        trigger={<button className='bg-transparent text-blue-500 hover:underline'>Electronic Signature: </button>}
-        closeOnDocumentClick={false}>
-        {close => (
-          <>
-            <SignaturePad
-              ref={sigCanvas}
-              canvasProps={{
-                className: "signatureCanvas"
-              }}
-            />
-            <button className='mx-1' onClick={save2}>Save</button>
-            <button className='mx-1' onClick={clear}>Clear</button>
-            <button className='mx-1' onClick={close}>Close</button>
-          </>
-        )}
-      </Popup>
-      {imageURL2 ? (
-        <img
-          src={imageURL2}
-          alt="my signature"
-          className='h-10 my-2'
-        />
-      ) : null}
-      <br/>
-
-        <label>Print Name: </label>
-        <input className="border-2 border-blue-200 rounded px-2 py-1 my-1"></input>
-        <br/>
-
-        <label>Date: </label>
-        <input className="border-2 border-blue-200 rounded px-2 py-1 my-1"></input>
-        <br/>
+          {(
+              <>
+                  <SignaturePad
+                      ref={sigCanvas}
+                      canvasProps={{
+                          className: "signatureCanvas"
+                      }}
+                  />
+                  <button className='mx-1 float-right' onClick={clear}>Clear</button>
+              </>
+          )}
+          {imageURL1 ? (
+              <img
+                  src={imageURL1}
+                  alt="signature"
+                  className='h-10 my-2'
+              />
+          ) : null}
+          <br/>
+
+          <div className={"flex justify-center"}>
+              <label className="mr-5 mt-2">Print Name: </label>
+              <input className="border-2 border-blue-200 rounded px-2 py-1 my-1"></input>
+              <label className="ml-5 mt-2">Date: {new Date().toLocaleDateString()}</label>
+              <br/>
+          </div>
 
       </div>
     </div>