Skip to content

bug-fix/pagination-display #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
josiaharkson wants to merge 1 commit into
base: main
Choose a base branch
from
Open

bug-fix/pagination-display #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
293 changes: 153 additions & 140 deletions src/Pages/Product.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,145 +1,164 @@
import React, { useState, useEffect } from 'react'
import { Link, useParams } from 'react-router-dom';
import { useSelector, useDispatch } from 'react-redux';
import { getProduct } from '../Redux/Actions/ProductAction';
import ReactStars from 'react-rating-stars-component';
import Pagination from 'react-js-pagination';
import React, { useState, useEffect } from "react";
import { Link, useParams } from "react-router-dom";
import { useSelector, useDispatch } from "react-redux";
import { getProduct } from "../Redux/Actions/ProductAction";
import ReactStars from "react-rating-stars-component";
import Pagination from "react-js-pagination";
import {
CategoryBody,
FilterContainer,
Img,
Item,
LoadingSection,
Map,
Name,
ProductContent,
ProductsListBody,
ProductsContainer,
RangeBody,
ReviewStar,
PaginationBody} from '../Stylesheets/Product.styled';
import Slider from '@mui/material/Slider';
CategoryBody,
FilterContainer,
Img,
Item,
LoadingSection,
Map,
Name,
ProductContent,
ProductsListBody,
ProductsContainer,
RangeBody,
ReviewStar,
PaginationBody,
} from "../Stylesheets/Product.styled";
import Slider from "@mui/material/Slider";

const Product = () => {
const dispatch = useDispatch();

const [currentPage, setCurrentPage] = useState(1)
const [price, setPrice] = useState([1000, 50000])
const { loading, error, products, productCount, resultPerPage, filteredProduct } = useSelector(state => state.products)


const [currentPage, setCurrentPage] = useState(1);
const [price, setPrice] = useState([1000, 50000]);
const {
loading,
error,
products,
productCount,
resultPerPage,
filteredProduct,
} = useSelector((state) => state.products);

// console.log('Filtered product', filteredProduct)
const { keyword } = useParams()

const { keyword } = useParams();

const setCurrentPageNo = (e) => {
setCurrentPage(e)
}
setCurrentPage(e);
};

const priceHandler = (event, newPrice) => {
setPrice(newPrice)
}
setPrice(newPrice);
};

useEffect(() => {
dispatch(getProduct(keyword, currentPage, price));
}, [dispatch, keyword, currentPage, price]);

const ratingChanged = () => {};

dispatch(getProduct(keyword, currentPage, price))
}, [dispatch, keyword, currentPage, price])

const ratingChanged = () => {

}

let count = filteredProduct;

return (
<>
<ProductsListBody>
<ProductsContainer>
<FilterContainer>
<RangeBody>
<p>Price</p>
<Slider
sx={{
height: 2,
margin: '0.5rem',
color: '#c5d86d'
}}
size= 'small'
className="slider"
value={price}
onChange={priceHandler}
valueLabelDisplay="auto"
aria-labelledby='range-slider'
min={1000}
max={50000}
/>

</RangeBody>

<CategoryBody>
<p>Category</p>
</CategoryBody>
<div>
Stella
</div>
</FilterContainer>

{loading ? (
<>
<LoadingSection>
<div class="loader"></div>
</LoadingSection>
</>
) : (
<>
<ProductContent>
{
products && products?.map((product) => {
return (
<Map key={product?._id}>
<Link to= {`/shop-now/shop/${product?._id}`} onClick={() => {window.scroll(0, 0)}}>
<Img src = {product?.images[0]?.url} alt=""/>
</Link>

<Name>
<Item>
<Link to= {`/shop-now/shop/${product?._id}`} onClick={() => {window.scroll(0, 0)}}>
<h3>{product?.name.length > 52 ? `${product?.name.substring(0, 50)}...` : product?.name}</h3>
</Link>
<ReviewStar>
<p>&#8358;{product?.price}</p>
<p >
<ReactStars
edit={false}
value={product?.ratings}
count={5}
onChange={ratingChanged}
size={window.innerWidth < 600 ? 15 : 20}
color="#260c1a"
activeColor="#f05d23"
/>
</p>
</ReviewStar>
<small>({product?.numOfReviews === 0 ? ' no' : product?.numOfReviews} {
product?.numOfReviews > 1 ? 'reviews' : 'review'
})</small>
</Item>
</Name>
</Map>
)
})
}

{error && 'An error occurred. Please try again'}
</ProductContent>

{resultPerPage > count && (
<ProductsContainer>
<FilterContainer>
<RangeBody>
<p>Price</p>
<Slider
sx={{
height: 2,
margin: "0.5rem",
color: "#c5d86d",
}}
size="small"
className="slider"
value={price}
onChange={priceHandler}
valueLabelDisplay="auto"
aria-labelledby="range-slider"
min={1000}
max={50000}
/>
</RangeBody>

<CategoryBody>
<p>Category</p>
</CategoryBody>
<div>Stella</div>
</FilterContainer>

{loading ? (
<>
<LoadingSection>
<div class="loader"></div>
</LoadingSection>
</>
) : (
<>
<ProductContent>
{products &&
products?.map((product) => {
return (
<Map key={product?._id}>
<Link
to={`/shop-now/shop/${product?._id}`}
onClick={() => {
window.scroll(0, 0);
}}
>
<Img src={product?.images[0]?.url} alt="" />
</Link>

<Name>
<Item>
<Link
to={`/shop-now/shop/${product?._id}`}
onClick={() => {
window.scroll(0, 0);
}}
>
<h3>
{product?.name.length > 52
? `${product?.name.substring(0, 50)}...`
: product?.name}
</h3>
</Link>
<ReviewStar>
<p>&#8358;{product?.price}</p>
<p>
<ReactStars
edit={false}
value={product?.ratings}
count={5}
onChange={ratingChanged}
size={window.innerWidth < 600 ? 15 : 20}
color="#260c1a"
activeColor="#f05d23"
/>
</p>
</ReviewStar>
<small>
(
{product?.numOfReviews === 0
? " no"
: product?.numOfReviews}{" "}
{product?.numOfReviews > 1 ? "reviews" : "review"}
)
</small>
</Item>
</Name>
</Map>
);
})}

{error && "An error occurred. Please try again"}
</ProductContent>

{/* {resultPerPage > count && ( */}
<PaginationBody>
<Pagination
activePage = {currentPage}
itemsCountPerPage = {resultPerPage}
totalItemsCount = {productCount}
onChange = {setCurrentPageNo}
activePage={currentPage}
itemsCountPerPage={resultPerPage}
totalItemsCount={productCount}
onChange={setCurrentPageNo}
nextPageText="Next"
prevPageText="Prev"
firstPageText="First"
Expand All @@ -150,19 +169,13 @@ const Product = () => {
activeLinkClass="pageLinkActive"
/>
</PaginationBody>
)}


</>
)}




</ProductsContainer>
{/* )} */}
</>
)}
</ProductsContainer>
</ProductsListBody>
</>
)
}
);
};

export default Product
export default Product;
8 changes: 4 additions & 4 deletions src/config/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const config = {
// BASE_URL: 'https://pattys-be.onrender.com'
BASE_URL: 'http://localhost:3500'
BASE_URL: "https://pattys-be.onrender.com",
// BASE_URL: 'http://localhost:3500'
};
export default config;

export default config;