Skip to content

Commit

Permalink
Merge branch 'develop' into ft-chat
Browse files Browse the repository at this point in the history
  • Loading branch information
sevelinCa authored Jul 18, 2024
2 parents 0d5759f + 5076f21 commit 20c9057
Show file tree
Hide file tree
Showing 8 changed files with 6 additions and 13 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed src/asset/images/Products/heart_.png
Binary file not shown.
Binary file removed src/asset/images/Products/star.png
Binary file not shown.
19 changes: 6 additions & 13 deletions src/pages/ProductsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ import { useSelector, useDispatch } from "react-redux";
import { setActiveCategory } from "../Redux/productsPage/categorySlice";
import { RootState } from "../Redux/store";
import Search from "../Components/ProductsPage/searchProduct";
import { useAllProductsQuery } from "../Redux/productsPage/productSlice";
import {useSelectProductsQuery } from "../Redux/productsPage/productSlice";
import ProductCard from "../Components/ProductsPage/productCard";
import Pagination from "../Components/ProductsPage/pagination";
import Footer from "../Components/Homepage/Homepage_footer";
import LoadingFrame from "../Constants/frameLoader";
import { useTranslation } from "react-i18next";
<<<<<<< HEAD

import NavBar from "../Components/navBar";
=======
>>>>>>> origin
import Header from "../Components/Homepage/Homepage_header";


interface Product {
productId: string;
Expand All @@ -28,12 +28,9 @@ const Products = () => {
const activeCategory: string | null = useSelector(
(state: RootState) => state.category.activeCategory
);
<<<<<<< HEAD
const { data: products, isLoading, isError } = useAllProductsQuery({});
// console.log(products)
=======

const { data: products, isLoading, isError } = useSelectProductsQuery({});
>>>>>>> origin

const productsPerPage = 9;
const currentPage = useSelector(
(state: RootState) => state.pagination.currentPage
Expand Down Expand Up @@ -138,11 +135,7 @@ const Products = () => {
</span>
<span className="text-black font-[800]">/</span>
<span className="text-base text-black font-[800] md:text-[18px]">
<<<<<<< HEAD
{t(activeCategory || "All Products")}
=======
{activeCategory || t("All Products")}
>>>>>>> origin
</span>
</div>
<Search />
Expand Down

0 comments on commit 20c9057

Please sign in to comment.