Merge pull request #48 from danial117/client_dev_26

initla commit
danial117 · Sep 21, 2024 · e43b387 · e43b387
2 parents e6259f5 + 20d1ef9
commit e43b387
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 18 deletions.
diff --git a/src/components/MainPageProducts.jsx b/src/components/MainPageProducts.jsx
@@ -56,7 +56,7 @@ const MainPageProducts=()=>{
      const RequestProducts=async()=>{
 
 
-           await fetch(`${process.env.REACT_APP_API_URL}/products?page=${page}&limit=6`,{
+           await fetch(`${process.env.REACT_APP_API_URL}/products?page=${page}&limit=28`,{
         method:'GET'
          }).then((response)=>response.json()).then((result)=>{products.push(...result);setPage(page+1); })
 
@@ -72,7 +72,7 @@ const MainPageProducts=()=>{
 
         const FetchProduct=async()=>{
 
-         await  fetch(`${process.env.REACT_APP_API_URL}/products?page=${page}&limit=6`,{
+         await  fetch(`${process.env.REACT_APP_API_URL}/products?page=${page}&limit=40`,{
              method:'GET'
             }).then((response)=>response.json()).then((result)=>{setProducts(result);  setPage(page+1)})
 
@@ -121,7 +121,7 @@ const MainPageProducts=()=>{
           { 
 
 
-             fetch(`${process.env.REACT_APP_API_URL}/products?type=${search}&page=${searchPage}&limit=6`,{
+             fetch(`${process.env.REACT_APP_API_URL}/products?type=${search}&page=${searchPage}&limit=16`,{
                 method:'GET'
                  }).then((response)=>response.json()).then((result)=>{setProducts(result);    })
                 }

diff --git a/src/components/MainProductCarousal.jsx b/src/components/MainProductCarousal.jsx
@@ -44,7 +44,7 @@ const MainProductCarousal=()=>{
      const FetchCarousalProduct=async()=>{
 
 
-       await fetch(`${process.env.REACT_APP_API_URL}/products?page=1&limit=4`,{
+       await fetch(`${process.env.REACT_APP_API_URL}/products?page=1&limit=16`,{
          method:'GET'
         }).then((response)=>response.json()).then((result)=>{setProducts(result)})
 

diff --git a/src/components/SearchComponent.jsx b/src/components/SearchComponent.jsx
@@ -41,7 +41,7 @@ const SearchComponent = ({ isMobile }) => {
 
 
 
-      await  fetch(`${process.env.REACT_APP_API_URL}/products/search?product=${search.product}`, {
+      await  fetch(`${process.env.REACT_APP_API_URL}/products/search?product=${search.product}&limit=20`, {
             method: 'GET',
           })
             .then((response) => response.json())

diff --git a/src/scenes/BrandPage.jsx b/src/scenes/BrandPage.jsx
@@ -84,9 +84,8 @@ const BrandPage = () => {
         <div className="container w-full flex flex-col mx-auto p-4 pb-24">
             <p className="font-Abel py-6 text-[1.7rem]">Results:</p>
           <div className="grid w-full grid-cols-1 md:grid-cols-3 gap-6">
-          {isLoading ? (
-  <RenderSkeletons /> // Capitalized to make it a valid React component
-) : (
+         {
+
   typeof products === 'object' && products.map((data, index) => {
     const carted = cartItemIds.includes(data._id);
 
@@ -136,7 +135,11 @@ const BrandPage = () => {
       </div>
     );
   })
-)}
+}
+
+{isLoading && 
+  <RenderSkeletons /> // Capitalized to make it a valid React component
+}
 
           </div>
           <div onClick={refetch} className="border-2 mx-auto cursor-pointer  xs:max-sm:w-[80%]  sm:max-md:w-[30%] py-4   w-[20%] mt-24 border-emerald-500  rounded-md">

diff --git a/src/scenes/ProductPage.jsx b/src/scenes/ProductPage.jsx
@@ -140,7 +140,7 @@ if (foundItem) {
 
                 <TruncateText 
                          text={product.name}
-                         maxLength={50}
+                         maxLength={60}
                          className="font-Abel text-[2rem] xs:max-md:text-[1.4rem] font-bold"
                    />
 
@@ -453,12 +453,11 @@ if (foundItem) {
 
 
         </div>
-
-
-
-
-        <SimiliarProducts />
+
+{ product &&
 
+        <SimiliarProducts productName={product.name} category={product.category} brand={product.brand} />
+}
         <Footer />
 
         {cart && <Cart/>}

diff --git a/src/widget/SimiliarProducts.jsx b/src/widget/SimiliarProducts.jsx
@@ -6,15 +6,15 @@ import { useNavigate } from 'react-router-dom';
 import { TruncateText } from '../utility functions/TranctuateText';
 
 
-const SimiliarProducts=()=>{
-
+const SimiliarProducts=({productName,category,brand})=>{
+ 
     const [products,setProducts]=useState([]);
     const navigate=useNavigate()
 
     useEffect(()=>{
 
 
-        fetch(`${process.env.REACT_APP_API_URL}/products?page=1&limit=3`,{
+        fetch(`${process.env.REACT_APP_API_URL}/products?name=${productName}&category=${category}&brand=${brand}&limit=6`,{
          method:'GET'
         }).then((response)=>response.json()).then((result)=>{setProducts(result)})