s-platform-landing-section 0.1.21 → 0.1.22

package/dist/index.modern.js

@@ -1,12 +1,12 @@
 import React__default, { useState, useRef, useEffect, forwardRef, useImperativeHandle, createElement, memo } from 'react';
 import { IoCartOutline, IoChevronDownOutline, IoPersonCircleOutline, IoLogOutOutline, IoInformationCircleOutline, IoBagOutline, IoSearchOutline, IoChevronBackOutline, IoChevronForwardOutline } from 'react-icons/io5';
-import { FaUserCircle, FaRegNewspaper, FaFacebookF, FaFacebookMessenger, FaBoxOpen, FaAngleUp, FaAngleDown, FaCheckCircle, FaArrowLeft, FaArrowRight } from 'react-icons/fa';
+import { FaUserCircle, FaRegNewspaper, FaFacebookF, FaFacebookMessenger, FaBoxOpen, FaAngleUp, FaAngleDown, FaCheckCircle, FaArrowLeft, FaArrowRight, FaPhoneAlt } from 'react-icons/fa';
 import { FiMenu, FiLogIn, FiHome, FiBox, FiPhoneCall, FiShoppingCart, FiSearch } from 'react-icons/fi';
 import { RxCross2 } from 'react-icons/rx';
 import { PiHandHeartBold } from 'react-icons/pi';
 import { TbCategory } from 'react-icons/tb';
 import { SiZalo, SiVisa } from 'react-icons/si';
-import { IoIosStar, IoIosArrowBack, IoIosArrowForward, IoMdCheckmark, IoIosHeartEmpty, IoMdQuote } from 'react-icons/io';
+import { IoIosStar, IoIosArrowBack, IoIosArrowForward, IoMdCheckmark, IoIosHeartEmpty } from 'react-icons/io';
 import { FaMinus, FaRegEyeSlash, FaPlus, FaArrowsRotate, FaStar, FaRegStarHalfStroke, FaRegStar } from 'react-icons/fa6';
 import 'react-icons/ci';
 import { BsCurrencyDollar } from 'react-icons/bs';
@@ -19,6 +19,7 @@ import 'slick-carousel/slick/slick-theme.css';
 import { AiOutlineShoppingCart, AiOutlinePhone } from 'react-icons/ai';
 import { GoCreditCard, GoClock } from 'react-icons/go';
 import { HiOutlineLocationMarker } from 'react-icons/hi';
+import { MdOutlineFormatQuote } from 'react-icons/md';
 import { RiDeleteBin7Line } from 'react-icons/ri';
 import { GiNewspaper } from 'react-icons/gi';
 
@@ -129,7 +130,7 @@ var getLinkNewsDetail = function getLinkNewsDetail(news) {
 };
 var getLinkNewsByCategory = function getLinkNewsByCategory(news) {
   var slug = genProductSlugVi(news === null || news === void 0 ? void 0 : news.catName, news === null || news === void 0 ? void 0 : news.catId);
-  return "/tin-tuc/" + slug;
+  return "/tin-tuc-theo-danh-muc/" + slug;
 };
 var getLinkProductsByCategory = function getLinkProductsByCategory(product) {
   if (product !== null && product !== void 0 && product.categoryName) {
@@ -536,7 +537,8 @@ var NavBar1 = function NavBar1(props) {
     _props$useSelector = props.useSelector,
     useSelector = _props$useSelector === void 0 ? null : _props$useSelector,
     _props$logout = props.logout,
-    logout = _props$logout === void 0 ? function () {} : _props$logout;
+    logout = _props$logout === void 0 ? function () {} : _props$logout,
+    data = props.data;
   var cartItems = useSelector === null || useSelector === void 0 ? void 0 : useSelector(function (state) {
     var _state$cart;
     return state === null || state === void 0 ? void 0 : (_state$cart = state.cart) === null || _state$cart === void 0 ? void 0 : _state$cart.items;
@@ -594,7 +596,11 @@ var NavBar1 = function NavBar1(props) {
       top: "-100px"
     }
   }, shopConfig === null || shopConfig === void 0 ? void 0 : shopConfig.defaultDomain, " | ", shopConfig === null || shopConfig === void 0 ? void 0 : shopConfig.shopName), /*#__PURE__*/React__default.createElement("div", {
-    className: "hidden lg:flex justify-end items-center gap-6 px-20 py-2 bg-primary"
+    className: "hidden lg:flex justify-between items-center px-20 py-2 bg-primary"
+  }, /*#__PURE__*/React__default.createElement("div", {
+    className: "text-background text-xl"
+  }, data === null || data === void 0 ? void 0 : data.title), /*#__PURE__*/React__default.createElement("div", {
+    className: "flex gap-6 "
   }, shopConfig !== null && shopConfig !== void 0 && shopConfig.shopPhone ? /*#__PURE__*/React__default.createElement("div", {
     className: "font-medium border-r pr-6 text-background"
   }, "Hotline: ", shopConfig === null || shopConfig === void 0 ? void 0 : shopConfig.shopPhone) : null, /*#__PURE__*/React__default.createElement("div", {
@@ -617,7 +623,7 @@ var NavBar1 = function NavBar1(props) {
   }, /*#__PURE__*/React__default.createElement(SiZalo, {
     size: 24,
     className: "p-1 rounded bg-background text-primary"
-  })))), /*#__PURE__*/React__default.createElement("div", {
+  }))))), /*#__PURE__*/React__default.createElement("div", {
     className: "hidden lg:flex gap-6 justify-between items-center py-2 px-4 xl:px-20 sticky top-0 z-50 bg-background shadow "
   }, /*#__PURE__*/React__default.createElement(LinkToPage, {
     Link: Link,
@@ -7580,6 +7586,11 @@ var ProductController = function ProductController(props) {
             var _res$data2, _res$data3;
             setProducts(res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.data);
             setPage(res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.page);
+            var url = new URL(window.location.href);
+            if (/^(\/(danh-muc))\/[^/]+-\d+$/.test(url.pathname)) {
+              url.pathname = url.pathname.replace(/\/[^/]+-\d+$/, "");
+              window.history.replaceState({}, '', url.pathname + url.search);
+            }
           }
           setLoading(false);
         });
@@ -7618,6 +7629,7 @@ var ProductController = function ProductController(props) {
   };
   return {
     products: products,
+    setProducts: setProducts,
     loading: loading,
     page: page,
     getProductListSearch: getProductListSearch
@@ -8897,7 +8909,9 @@ var BookingForm = function BookingForm(props) {
     _props$defaultValue = props.defaultValue,
     defaultValue = _props$defaultValue === void 0 ? [] : _props$defaultValue,
     _props$className = props.className,
-    className = _props$className === void 0 ? "" : _props$className;
+    className = _props$className === void 0 ? "" : _props$className,
+    _props$isModalBooking = props.isModalBooking,
+    isModalBooking = _props$isModalBooking === void 0 ? false : _props$isModalBooking;
   var _shopConfigStyle$colo = shopConfigStyle === null || shopConfigStyle === void 0 ? void 0 : shopConfigStyle.color,
     _shopConfigStyle$colo5 = _shopConfigStyle$colo.background,
     background = _shopConfigStyle$colo5 === void 0 ? "#fff" : _shopConfigStyle$colo5;
@@ -8924,9 +8938,9 @@ var BookingForm = function BookingForm(props) {
   var _useState7 = useState(false),
     isOpenPopup = _useState7[0],
     setIsOpenPopup = _useState7[1];
-  var _useState8 = useState({}),
-    dataBooking = _useState8[0],
-    setDataBooking = _useState8[1];
+  var _useState8 = useState(false),
+    isHiddenForm = _useState8[0],
+    setIsHiddenForm = _useState8[1];
   var _EmployeeController = EmployeeController(_extends({}, props)),
     _EmployeeController$l = _EmployeeController.listEmployment,
     listEmployment = _EmployeeController$l === void 0 ? [] : _EmployeeController$l;
@@ -9053,11 +9067,14 @@ var BookingForm = function BookingForm(props) {
           return Promise.resolve(createSchedule(customerName, customerPhone, scheduleDate, services, shopId)).then(function (response) {
             var _response$data, _response$data$status;
             if ((response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$status = _response$data.status) === null || _response$data$status === void 0 ? void 0 : _response$data$status.code) === '200') {
-              var _response$data2, _inputPhoneNumberRef$3, _inputNameRef$current3;
-              setDataBooking(response === null || response === void 0 ? void 0 : (_response$data2 = response.data) === null || _response$data2 === void 0 ? void 0 : _response$data2.data);
+              var _inputPhoneNumberRef$3, _inputNameRef$current3, _inputDateRef$current4;
+              if (isModalBooking) {
+                setIsHiddenForm(true);
+              }
               setIsOpenPopup(true);
               inputPhoneNumberRef === null || inputPhoneNumberRef === void 0 ? void 0 : (_inputPhoneNumberRef$3 = inputPhoneNumberRef.current) === null || _inputPhoneNumberRef$3 === void 0 ? void 0 : _inputPhoneNumberRef$3.setValue("");
               inputNameRef === null || inputNameRef === void 0 ? void 0 : (_inputNameRef$current3 = inputNameRef.current) === null || _inputNameRef$current3 === void 0 ? void 0 : _inputNameRef$current3.setValue("");
+              inputDateRef === null || inputDateRef === void 0 ? void 0 : (_inputDateRef$current4 = inputDateRef.current) === null || _inputDateRef$current4 === void 0 ? void 0 : _inputDateRef$current4.setValue(new Date());
               setListProductSelected([]);
             }
           });
@@ -9070,7 +9087,7 @@ var BookingForm = function BookingForm(props) {
   };
   var handleClosePopup = function handleClosePopup() {
     setIsOpenPopup(false);
-    setDataBooking({});
+    setIsHiddenForm(false);
   };
   var handleSearchProducts = function handleSearchProducts(value) {
     setProductsParams(function (prev) {
@@ -9079,7 +9096,7 @@ var BookingForm = function BookingForm(props) {
       });
     });
   };
-  return /*#__PURE__*/React__default.createElement("div", {
+  return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, !isHiddenForm ? /*#__PURE__*/React__default.createElement("div", {
     className: "grid gap-4 rounded-2xl p-6 border  " + className,
     style: {
       backgroundColor: background
@@ -9211,32 +9228,23 @@ var BookingForm = function BookingForm(props) {
     label: "Đặt lịch ngay",
     shopConfigStyle: shopConfigStyle,
     onClick: handleSubmit
-  })), isOpenPopup && /*#__PURE__*/React__default.createElement(ModalNotification, {
+  }))) : null, isOpenPopup && /*#__PURE__*/React__default.createElement(ModalNotification, {
     onCloseFormBooking: onCloseFormBooking,
     onClose: handleClosePopup
   }, /*#__PURE__*/React__default.createElement("div", {
-    className: "bg-white rounded-lg shadow-lg p-6 max-w-sm flex flex-col items-center justify-center min-w-[320px] md:min-w-[650px] min-h-[420px] md:min-h-[380px] lg:h-auto "
+    className: "bg-white rounded-lg shadow-lg p-6 lg:px-16 lg:pb-10 max-w-sm flex gap-4 flex-col items-center justify-center"
   }, /*#__PURE__*/React__default.createElement("div", {
-    className: "h-20 mb-4 flex items-center justify-center"
+    className: "flex items-center justify-center"
   }, /*#__PURE__*/React__default.createElement(FaCheckCircle, {
     className: "h-full text-green-500",
     style: {
-      fontSize: "150px"
+      fontSize: "56px"
     }
   })), /*#__PURE__*/React__default.createElement("div", {
-    className: "mb-2"
-  }, "Kh\xE1ch h\xE0ng: ", dataBooking === null || dataBooking === void 0 ? void 0 : dataBooking.customerName), /*#__PURE__*/React__default.createElement("div", {
-    className: "mb-2"
-  }, "S\u1ED1 \u0111i\u1EC7n tho\u1EA1i: ", dataBooking === null || dataBooking === void 0 ? void 0 : dataBooking.customerPhone), /*#__PURE__*/React__default.createElement("div", {
-    className: "mb-4"
-  }, "Th\u1EDDi gian: ", dayjs_min(dataBooking === null || dataBooking === void 0 ? void 0 : dataBooking.scheduleDate).format("DD/MM/YYYY")), token ? /*#__PURE__*/React__default.createElement("div", null) : /*#__PURE__*/React__default.createElement("div", {
-    className: "flex flex-col items-center"
-  }, /*#__PURE__*/React__default.createElement("p", {
-    className: "mb-4 text-center"
-  }, "B\u1EA1n \u0111\xE3 c\xF3 t\xE0i kho\u1EA3n, vui l\xF2ng \u0111\u0103ng nh\u1EADp \u0111\u1EC3 xem chi ti\u1EBFt c\xE1c s\u1EA3n ph\u1EA9m, d\u1ECBch v\u1EE5 li\u1EC7u tr\xECnh m\xE0 b\u1EA1n \u0111ang s\u1EDF h\u1EEFu"), /*#__PURE__*/React__default.createElement(Button, {
-    label: "Đăng nhập",
-    shopConfigStyle: shopConfigStyle
-  })))));
+    className: "font-medium text-2xl"
+  }, "\u0110\u1EB7t l\u1ECBch th\xE0nh c\xF4ng"), /*#__PURE__*/React__default.createElement("div", {
+    className: "text-center"
+  }, "Ch\xFAng t\xF4i \u0111\xE3 ghi nh\u1EADn th\xF4ng tin c\u1EE7a b\u1EA1n v\xE0 s\u1EBD li\xEAn h\u1EC7 l\u1EA1i ngay"))));
 };
 
 var TreatmentsList7 = function TreatmentsList7(props) {
@@ -9361,7 +9369,8 @@ var TreatmentsList7 = function TreatmentsList7(props) {
     onCloseFormBooking: handleCloseModal,
     defaultValue: dataBooking,
     shopConfig: shopConfig,
-    shopConfigStyle: shopConfigStyle
+    shopConfigStyle: shopConfigStyle,
+    isModalBooking: isOpenModal
   })) : null);
 };
 
@@ -10225,8 +10234,27 @@ var Products10 = function Products10(props) {
   })) : /*#__PURE__*/React__default.createElement(NotFoundProduct, null));
 };
 
+var listFilter = [{
+  label: "Khuyến mãi",
+  value: "discount",
+  filter: {
+    isDiscount: true
+  }
+}, {
+  label: "Nổi bật",
+  value: "isHighlight",
+  filter: {
+    isHighlight: true
+  }
+}, {
+  label: "Giá thấp đến cao",
+  value: "sortPriceDESC",
+  filter: {
+    isHighlight: true
+  }
+}];
 var Products11 = function Products11(props) {
-  var _products$slice;
+  var _productsFilter$slice;
   var _props$shopConfigStyl = props.shopConfigStyle,
     shopConfigStyle = _props$shopConfigStyl === void 0 ? {} : _props$shopConfigStyl,
     _props$Link = props.Link,
@@ -10248,6 +10276,9 @@ var Products11 = function Products11(props) {
   var _useState3 = useState({}),
     categorySelected = _useState3[0],
     setCategorySelected = _useState3[1];
+  var _useState4 = useState([]),
+    productsFilter = _useState4[0],
+    setProductsFilter = _useState4[1];
   var _CategoryController = CategoryController(_extends({}, props, {
       params: params
     })),
@@ -10281,36 +10312,66 @@ var Products11 = function Products11(props) {
   useEffect(function () {
     if ((categories === null || categories === void 0 ? void 0 : categories.length) > 0 && params !== null && params !== void 0 && params.categoryId) {
       var category = categories === null || categories === void 0 ? void 0 : categories.find(function (item) {
-        return (item === null || item === void 0 ? void 0 : item.categoryId) == categoryId;
+        return (item === null || item === void 0 ? void 0 : item.categoryId) == (params === null || params === void 0 ? void 0 : params.categoryId);
       });
       setCategorySelected(category);
     }
-  }, [params === null || params === void 0 ? void 0 : params.categoryId, categories]);
-  console.log("check page:::::::", page);
+  }, [categories]);
+  useEffect(function () {
+    if ((products === null || products === void 0 ? void 0 : products.length) > 0) {
+      setProductsFilter(products);
+    }
+  }, [products]);
+  var handleFilter = function handleFilter(item) {
+    if ((item === null || item === void 0 ? void 0 : item.value) === "sortPriceDESC") {
+      var productsCopy = [].concat(products);
+      productsCopy === null || productsCopy === void 0 ? void 0 : productsCopy.sort(function (a, b) {
+        var _b$productInfo, _a$productInfo;
+        return +(b === null || b === void 0 ? void 0 : (_b$productInfo = b.productInfo) === null || _b$productInfo === void 0 ? void 0 : _b$productInfo.price) - (a === null || a === void 0 ? void 0 : (_a$productInfo = a.productInfo) === null || _a$productInfo === void 0 ? void 0 : _a$productInfo.price);
+      });
+      setProductsFilter(productsCopy);
+    } else if ((item === null || item === void 0 ? void 0 : item.value) === "discount") {
+      var _productsCopy = [].concat(products);
+      _productsCopy === null || _productsCopy === void 0 ? void 0 : _productsCopy.filter(function (product) {
+        return (product === null || product === void 0 ? void 0 : product.priceBeforeDiscount) && (product === null || product === void 0 ? void 0 : product.priceBeforeDiscount) !== (product === null || product === void 0 ? void 0 : product.price);
+      });
+      setProductsFilter(_productsCopy);
+    } else if ((item === null || item === void 0 ? void 0 : item.value) === "isHighlight") {
+      var _productsCopy3;
+      var _productsCopy2 = [].concat(products);
+      _productsCopy2 = (_productsCopy3 = _productsCopy2) === null || _productsCopy3 === void 0 ? void 0 : _productsCopy3.filter(function (product) {
+        return (product === null || product === void 0 ? void 0 : product[item === null || item === void 0 ? void 0 : item.value]) === true;
+      });
+      setProductsFilter(_productsCopy2);
+    } else {
+      setProductsFilter(products);
+    }
+  };
   return /*#__PURE__*/React__default.createElement("div", {
     className: SECTION_CLASS + " grid grid-cols-1 md:grid-cols-4 gap-6"
   }, /*#__PURE__*/React__default.createElement("div", {
     className: "md:sticky top-20 self-start"
   }, /*#__PURE__*/React__default.createElement("div", {
-    className: "rounded-3xl bg-bgSecondary p-4"
+    className: " flex flex-col gap-2 rounded-3xl bg-bgSecondary p-4"
   }, categories === null || categories === void 0 ? void 0 : categories.map(function (item, index) {
-    return /*#__PURE__*/React__default.createElement(LinkToPage, {
-      href: getLinkProductsByCategory(item),
-      Link: Link
-    }, /*#__PURE__*/React__default.createElement("div", {
-      className: "px-6 py-3 hover:bg-gray-100 hover:text-primary cursor-pointer rounded-lg " + ((categorySelected === null || categorySelected === void 0 ? void 0 : categorySelected.categoryId) === (item === null || item === void 0 ? void 0 : item.categoryId) ? " bg-primary text-textButton" : ""),
+    return /*#__PURE__*/React__default.createElement("div", {
+      className: "px-6 py-2 hover:bg-gray-100 hover:text-primary cursor-pointer rounded-lg " + ((categorySelected === null || categorySelected === void 0 ? void 0 : categorySelected.categoryId) === (item === null || item === void 0 ? void 0 : item.categoryId) ? " bg-primary text-textButton" : ""),
       onClick: function onClick() {
         handleChooseCategory(item);
       },
       key: "sdjfdh-" + index
-    }, item === null || item === void 0 ? void 0 : item.cateName));
+    }, item === null || item === void 0 ? void 0 : item.cateName);
   }))), /*#__PURE__*/React__default.createElement("div", {
     className: "md:col-span-3 flex flex-col gap-8"
-  }, loading && firstLoading ? /*#__PURE__*/React__default.createElement("div", {
-    className: "w-full h-80 flex justify-center items-center"
-  }, /*#__PURE__*/React__default.createElement(Loading, null)) : /*#__PURE__*/React__default.createElement("div", {
+  }, /*#__PURE__*/React__default.createElement(CarouselItem, {
+    data: listFilter,
+    isNavigateButton: false,
+    onClick: handleFilter
+  }), loading && firstLoading ? /*#__PURE__*/React__default.createElement("div", {
+    className: "w-full h-96 mb-1 flex justify-center items-center"
+  }, /*#__PURE__*/React__default.createElement(Loading, null)) : /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement("div", {
     className: "grid grid-cols-2 md:grid-cols-2 lg:grid-cols-3 gap-3 md:gap-6 lg:gap-8"
-  }, (products === null || products === void 0 ? void 0 : products.length) > 0 ? products === null || products === void 0 ? void 0 : (_products$slice = products.slice(0, (params === null || params === void 0 ? void 0 : params.size) - 4)) === null || _products$slice === void 0 ? void 0 : _products$slice.map(function (product, index) {
+  }, (productsFilter === null || productsFilter === void 0 ? void 0 : productsFilter.length) > 0 ? productsFilter === null || productsFilter === void 0 ? void 0 : (_productsFilter$slice = productsFilter.slice(0, (params === null || params === void 0 ? void 0 : params.size) - 4)) === null || _productsFilter$slice === void 0 ? void 0 : _productsFilter$slice.map(function (product, index) {
     return /*#__PURE__*/React__default.createElement(LinkToPage, {
       href: getLinkProductDetail(product === null || product === void 0 ? void 0 : product.productInfo),
       Link: Link,
@@ -10323,7 +10384,7 @@ var Products11 = function Products11(props) {
     }));
   }) : /*#__PURE__*/React__default.createElement("div", {
     className: "md:col-span-2 lg:col-span-3 mt-20 m-auto"
-  }, /*#__PURE__*/React__default.createElement(NotFoundProduct, null))), /*#__PURE__*/React__default.createElement("div", {
+  }, /*#__PURE__*/React__default.createElement(NotFoundProduct, null)))), /*#__PURE__*/React__default.createElement("div", {
     className: "w-full m-auto"
   }, (page === null || page === void 0 ? void 0 : page.total_pages) > 1 ? /*#__PURE__*/React__default.createElement(Pagination, {
     total_pages: page === null || page === void 0 ? void 0 : page.total_pages,
@@ -10439,8 +10500,21 @@ var ProductSale2 = function ProductSale2(props) {
   })) : null;
 };
 
+var listFilter$1 = [{
+  label: "Khuyến mãi",
+  value: "discount",
+  filter: {
+    isDiscount: true
+  }
+}, {
+  label: "Nổi bật",
+  value: "isHighlight",
+  filter: {
+    isHighlight: true
+  }
+}];
 var ProductSearch1 = function ProductSearch1(props) {
-  var _window, _window$location;
+  var _window, _window$location, _productsFilter$slice;
   var _props$Link = props.Link,
     Link = _props$Link === void 0 ? null : _props$Link,
     _props$SectionTitle = props.SectionTitle,
@@ -10450,12 +10524,12 @@ var ProductSearch1 = function ProductSearch1(props) {
     shopConfigStyle = props.shopConfigStyle;
   var queryParams = new URLSearchParams((_window = window) === null || _window === void 0 ? void 0 : (_window$location = _window.location) === null || _window$location === void 0 ? void 0 : _window$location.search);
   var keywordValue = queryParams === null || queryParams === void 0 ? void 0 : queryParams.get('tu-khoa');
-  var _useState = useState(0),
-    length = _useState[0],
-    setLength = _useState[1];
+  var _useState = useState([]),
+    productsFilter = _useState[0],
+    setProductsFilter = _useState[1];
   var _useState2 = useState({
       productName: keywordValue,
-      size: 24
+      size: 12
     }),
     params = _useState2[0],
     setParams = _useState2[1];
@@ -10474,36 +10548,34 @@ var ProductSearch1 = function ProductSearch1(props) {
       });
     });
   }, [keywordValue]);
+  useEffect(function () {
+    if ((products === null || products === void 0 ? void 0 : products.length) > 0) setProductsFilter(products);
+  }, [products]);
   var handleGetMoreProducts = function handleGetMoreProducts() {
     setIsGetMore(false);
-    setLength(function (prev) {
-      return prev + 4;
+    setParams(function (prev) {
+      return _extends({}, prev, {
+        size: (prev === null || prev === void 0 ? void 0 : prev.size) + 4
+      });
     });
   };
-  var listFilter = [{
-    label: "Khuyến mãi",
-    value: "discount",
-    filter: {
-      isDiscount: true
-    }
-  }, {
-    label: "Nổi bật",
-    value: "highlight",
-    filter: {
-      isHighlight: true
-    }
-  }];
   var handleFilter = function handleFilter(item) {
-    setParams(function (prev) {
-      var _Object$keys;
-      var newParams = _extends({}, prev);
-      Object === null || Object === void 0 ? void 0 : (_Object$keys = Object.keys(newParams)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.forEach(function (key) {
-        if (key !== 'productName' && key !== 'size') {
-          delete newParams[key];
-        }
+    if ((item === null || item === void 0 ? void 0 : item.value) === "discount") {
+      var productsCopy = [].concat(products);
+      productsCopy === null || productsCopy === void 0 ? void 0 : productsCopy.filter(function (product) {
+        return (product === null || product === void 0 ? void 0 : product.priceBeforeDiscount) && (product === null || product === void 0 ? void 0 : product.priceBeforeDiscount) !== (product === null || product === void 0 ? void 0 : product.price);
       });
-      return _extends({}, newParams, item === null || item === void 0 ? void 0 : item.filter);
-    });
+      setProductsFilter(productsCopy);
+    } else if ((item === null || item === void 0 ? void 0 : item.value) === "isHighlight") {
+      var _productsCopy2;
+      var _productsCopy = [].concat(products);
+      _productsCopy = (_productsCopy2 = _productsCopy) === null || _productsCopy2 === void 0 ? void 0 : _productsCopy2.filter(function (product) {
+        return (product === null || product === void 0 ? void 0 : product[item === null || item === void 0 ? void 0 : item.value]) === true;
+      });
+      setProductsFilter(_productsCopy);
+    } else {
+      setProductsFilter(products);
+    }
   };
   return /*#__PURE__*/React__default.createElement("div", {
     className: SECTION_CLASS + " flex flex-col gap-4 md:gap-6 "
@@ -10515,20 +10587,20 @@ var ProductSearch1 = function ProductSearch1(props) {
   }), /*#__PURE__*/React__default.createElement("div", {
     className: "text-lg"
   }, "T\u1EEB kh\xF3a \"", keywordValue, "\" (", products === null || products === void 0 ? void 0 : products.length, " s\u1EA3n ph\u1EA9m)"), /*#__PURE__*/React__default.createElement(CarouselItem, {
-    data: listFilter,
+    data: listFilter$1,
     isNavigateButton: false,
     onClick: handleFilter
   }), loading && isGetMore ? /*#__PURE__*/React__default.createElement("div", {
     className: "m-auto mt-20 min-h-32"
-  }, /*#__PURE__*/React__default.createElement(Loading, null)) : (products === null || products === void 0 ? void 0 : products.length) > 0 ? /*#__PURE__*/React__default.createElement("div", {
+  }, /*#__PURE__*/React__default.createElement(Loading, null)) : (productsFilter === null || productsFilter === void 0 ? void 0 : productsFilter.length) > 0 ? /*#__PURE__*/React__default.createElement("div", {
     className: "grid grid-cols-2 sm:grid-cols-3 lg:grid-cols-4 gap-x-2 gap-y-4 md:gap-4 xl:gap-6"
-  }, products.slice(0, 8 + length).map(function (product, idx) {
+  }, productsFilter === null || productsFilter === void 0 ? void 0 : (_productsFilter$slice = productsFilter.slice(0, (params === null || params === void 0 ? void 0 : params.size) - 4)) === null || _productsFilter$slice === void 0 ? void 0 : _productsFilter$slice.map(function (product, idx) {
     return /*#__PURE__*/React__default.createElement(ProductItem, {
       Link: Link,
       product: product === null || product === void 0 ? void 0 : product.productInfo,
       key: "htrhr-" + idx
     });
-  })) : /*#__PURE__*/React__default.createElement(NotFoundProduct, null), !loading && (products === null || products === void 0 ? void 0 : products.length) > 8 + length ? /*#__PURE__*/React__default.createElement(Button, {
+  })) : /*#__PURE__*/React__default.createElement(NotFoundProduct, null), !loading && (productsFilter === null || productsFilter === void 0 ? void 0 : productsFilter.length) > (params === null || params === void 0 ? void 0 : params.size) - 4 ? /*#__PURE__*/React__default.createElement(Button, {
     label: "Xem thêm",
     onClick: handleGetMoreProducts,
     className: "mx-auto " + (shopConfigStyle === null || shopConfigStyle === void 0 ? void 0 : shopConfigStyle.buttonClass),
@@ -11022,7 +11094,7 @@ var ProductDetail10 = function ProductDetail10(props) {
 };
 
 var ProductDetail11 = function ProductDetail11(props) {
-  var _product$images2, _product$images3, _product$attributes, _product$attributes2;
+  var _product$images2, _product$images3, _product$images4, _product$images5, _product$attributes, _product$attributes2;
   var shopConfigStyle = props.shopConfigStyle,
     shopConfig = props.shopConfig,
     _props$handleRedirect = props.handleRedirect,
@@ -11144,7 +11216,7 @@ var ProductDetail11 = function ProductDetail11(props) {
     className: "grid grid-cols-5 gap-6"
   }, /*#__PURE__*/React__default.createElement("div", {
     className: "hidden lg:block col-span-1 lg:min-h-[240px] lg:max-h-[400px] xl:min-h-[400px] xl:max-h-[480px] overflow-y-auto overflow-hidden no-scrollbar"
-  }, product === null || product === void 0 ? void 0 : (_product$images2 = product.images) === null || _product$images2 === void 0 ? void 0 : _product$images2.map(function (item) {
+  }, (product === null || product === void 0 ? void 0 : (_product$images2 = product.images) === null || _product$images2 === void 0 ? void 0 : _product$images2.length) > 0 ? product === null || product === void 0 ? void 0 : (_product$images3 = product.images) === null || _product$images3 === void 0 ? void 0 : _product$images3.map(function (item) {
     return /*#__PURE__*/React__default.createElement("img", {
       src: item === null || item === void 0 ? void 0 : item.imageUrl,
       key: item === null || item === void 0 ? void 0 : item.imageId,
@@ -11154,7 +11226,13 @@ var ProductDetail11 = function ProductDetail11(props) {
         handleDisplayImage(item);
       }
     });
-  })), /*#__PURE__*/React__default.createElement("div", {
+  }) : /*#__PURE__*/React__default.createElement("div", {
+    className: "p-2 border rounded-lg"
+  }, /*#__PURE__*/React__default.createElement(SvgImageGallery, {
+    width: "100%",
+    height: "25%",
+    fill: "#D9D9D9"
+  }))), /*#__PURE__*/React__default.createElement("div", {
     className: "flex flex-col gap-4 col-span-5 lg:col-span-4 p-4 border border-stroke rounded-2xl"
   }, displayImage ? /*#__PURE__*/React__default.createElement("img", {
     src: displayImage === null || displayImage === void 0 ? void 0 : displayImage.imageUrl,
@@ -11170,7 +11248,7 @@ var ProductDetail11 = function ProductDetail11(props) {
     fill: "#D9D9D9"
   }))), /*#__PURE__*/React__default.createElement("div", {
     className: " block lg:hidden w-full flex gap-4 col-span-5 overflow-x-auto overflow-hidden no-scrollbar"
-  }, product === null || product === void 0 ? void 0 : (_product$images3 = product.images) === null || _product$images3 === void 0 ? void 0 : _product$images3.map(function (item) {
+  }, (product === null || product === void 0 ? void 0 : (_product$images4 = product.images) === null || _product$images4 === void 0 ? void 0 : _product$images4.length) > 0 ? product === null || product === void 0 ? void 0 : (_product$images5 = product.images) === null || _product$images5 === void 0 ? void 0 : _product$images5.map(function (item) {
     return /*#__PURE__*/React__default.createElement("img", {
       src: item === null || item === void 0 ? void 0 : item.imageUrl,
       key: item === null || item === void 0 ? void 0 : item.imageId,
@@ -11180,7 +11258,7 @@ var ProductDetail11 = function ProductDetail11(props) {
         handleDisplayImage(item);
       }
     });
-  }))), /*#__PURE__*/React__default.createElement("div", {
+  }) : null)), /*#__PURE__*/React__default.createElement("div", {
     className: "mt-2 md:ms-10"
   }, /*#__PURE__*/React__default.createElement("p", {
     className: "font-semibold text-2xl"
@@ -11265,8 +11343,8 @@ var ProductDetail11 = function ProductDetail11(props) {
       setIsSeeMore(!isSeeMore);
     }
   })) : null) : /*#__PURE__*/React__default.createElement("div", {
-    className: "text-gray3 bg-bgSecondary mt-2"
-  }, "Kh\xF4ng c\xF3 th\xF4ng tin")), (product === null || product === void 0 ? void 0 : (_product$attributes = product.attributes) === null || _product$attributes === void 0 ? void 0 : _product$attributes.length) > 0 ? /*#__PURE__*/React__default.createElement("div", {
+    className: "text-lg text-gray3 rounded-lg p-2"
+  }, "Kh\xF4ng c\xF3 th\xF4ng tin s\u1EA3n ph\u1EA9m")), (product === null || product === void 0 ? void 0 : (_product$attributes = product.attributes) === null || _product$attributes === void 0 ? void 0 : _product$attributes.length) > 0 ? /*#__PURE__*/React__default.createElement("div", {
     className: "lg:col-span-2"
   }, /*#__PURE__*/React__default.createElement("h2", {
     className: "text-3xl mb-8 font-semibold"
@@ -11673,7 +11751,7 @@ var Footer1 = function Footer1(props) {
   var genShopAddress = function genShopAddress() {
     try {
       var addressJson = JSON.parse(shopConfig === null || shopConfig === void 0 ? void 0 : shopConfig.shopAddress);
-      if (addressJson) {
+      if (Array.isArray(addressJson) && addressJson && (addressJson === null || addressJson === void 0 ? void 0 : addressJson.length) > 0) {
         setShopAddressList(addressJson);
       } else {
         setShopAddressList([{
@@ -11709,7 +11787,7 @@ var Footer1 = function Footer1(props) {
     className: " col-span-2 flex flex-col mb-10 leading-8  sm:mb-0 "
   }, /*#__PURE__*/React__default.createElement("div", {
     className: "mb-3 font-semibold text-md md:text-lg"
-  }, "Th\xF4ng tin li\xEAn h\u1EC7"), shopAddressList === null || shopAddressList === void 0 ? void 0 : shopAddressList.map(function (item, index) {
+  }, "Th\xF4ng tin li\xEAn h\u1EC7"), Array.isArray(shopAddressList) ? shopAddressList === null || shopAddressList === void 0 ? void 0 : shopAddressList.map(function (item, index) {
     return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement("div", null, "C\u01A1 s\u1EDF ", index + 1), /*#__PURE__*/React__default.createElement("div", {
       className: "flex gap-2 items-center"
     }, /*#__PURE__*/React__default.createElement(HiOutlineLocationMarker, {
@@ -11727,7 +11805,7 @@ var Footer1 = function Footer1(props) {
         color: primary
       }
     }), /*#__PURE__*/React__default.createElement("div", null, item === null || item === void 0 ? void 0 : item.phone)));
-  })), /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement("div", {
+  }) : null), /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement("div", {
     className: "mb-3 font-semibold text-lg"
   }, "Li\xEAn k\u1EBFt"), /*#__PURE__*/React__default.createElement("div", {
     className: "leading-10 flex flex-col "
@@ -11813,7 +11891,7 @@ var Footer7 = function Footer7(props) {
   var genShopAddress = function genShopAddress() {
     try {
       var addressJson = JSON.parse(shopConfig === null || shopConfig === void 0 ? void 0 : shopConfig.shopAddress);
-      if (addressJson) {
+      if (Array.isArray(addressJson) && addressJson && (addressJson === null || addressJson === void 0 ? void 0 : addressJson.length) > 0) {
         setShopAddressList(addressJson);
       } else {
         setShopAddressList([{
@@ -12062,7 +12140,7 @@ var CustomerRating6 = function CustomerRating6(props) {
     _props$SectionTitle = props.SectionTitle,
     SectionTitle = _props$SectionTitle === void 0 ? null : _props$SectionTitle;
   return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement("div", {
-    className: SECTION_CLASS + " !my-0 py-12 bg-bgSecondary"
+    className: SECTION_CLASS + " !my-0 py-12 bg-"
   }, /*#__PURE__*/React__default.createElement(SectionTitle, {
     data: data,
     shopConfigStyle: shopConfigStyle
@@ -12072,9 +12150,9 @@ var CustomerRating6 = function CustomerRating6(props) {
     return /*#__PURE__*/React__default.createElement("div", {
       key: index,
       className: "relative bg-primary rounded-lg text-textButton px-6 py-4"
-    }, /*#__PURE__*/React__default.createElement(IoMdQuote, {
-      size: 30,
-      className: "absolute text-textButton top-[-15px] right-8"
+    }, /*#__PURE__*/React__default.createElement(MdOutlineFormatQuote, {
+      size: 43,
+      className: "absolute text-black top-[-20px] right-8"
     }), /*#__PURE__*/React__default.createElement("div", {
       className: "flex items-end gap-2"
     }, /*#__PURE__*/React__default.createElement("img", {
@@ -12299,7 +12377,7 @@ var Contact1 = function Contact1(props) {
     className: "grid grid-cols-1 lg:grid-cols-2 gap-12 mt-6"
   }, /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement("p", null, "Trong qu\xE1 tr\xECnh gh\xE9 th\u0103m website, n\u1EBFu qu\xFD kh\xE1ch c\xF3 b\u1EA5t k\u1EF3 th\u1EAFc m\u1EAFc hay c\u1EA7n s\u1EF1 h\u1ED7 tr\u1EE3 n\xE0o, h\xE3y li\xEAn h\u1EC7 v\u1EDBi ch\xFAng t\xF4i theo c\xE1c k\xEAnh sau: "), shopConfig !== null && shopConfig !== void 0 && shopConfig.shopPhone ? /*#__PURE__*/React__default.createElement("div", {
     className: "flex items-center gap-2 rounded-lg overflow-hidden bg-white mt-6"
-  }, /*#__PURE__*/React__default.createElement(FaFacebookF, {
+  }, /*#__PURE__*/React__default.createElement(FaPhoneAlt, {
     size: 40,
     className: "p-2 text-textButton bg-primary"
   }), /*#__PURE__*/React__default.createElement("div", null, "S\u1ED1 \u0111i\u1EC7n tho\u1EA1i: ", shopConfig === null || shopConfig === void 0 ? void 0 : shopConfig.shopPhone)) : null, shopConfig !== null && shopConfig !== void 0 && shopConfig.shopZalo ? /*#__PURE__*/React__default.createElement("div", {
@@ -13711,6 +13789,11 @@ var NewsController = function NewsController(props) {
             var _response$data2, _response$data2$data, _response$data3, _response$data3$data;
             setNewsArticles(response === null || response === void 0 ? void 0 : (_response$data2 = response.data) === null || _response$data2 === void 0 ? void 0 : (_response$data2$data = _response$data2.data) === null || _response$data2$data === void 0 ? void 0 : _response$data2$data.content);
             setPage(response === null || response === void 0 ? void 0 : (_response$data3 = response.data) === null || _response$data3 === void 0 ? void 0 : (_response$data3$data = _response$data3.data) === null || _response$data3$data === void 0 ? void 0 : _response$data3$data.totalElements);
+            var url = new URL(window.location.href);
+            if (/^(\/(tin-tuc-theo-danh-muc))\/[^/]+-\d+$/.test(url.pathname)) {
+              url.pathname = url.pathname.replace(/\/[^/]+-\d+$/, "");
+              window.history.replaceState({}, '', url.pathname + url.search);
+            }
           }
           setLoading(false);
         });
@@ -13906,13 +13989,12 @@ var News1 = function News1(props) {
     shopConfigStyle = _props$shopConfigStyl === void 0 ? {} : _props$shopConfigStyl,
     _props$Link = props.Link,
     Link = _props$Link === void 0 ? null : _props$Link,
-    _props$catId = props.catId,
-    catId = _props$catId === void 0 ? "" : _props$catId;
+    catId = props.catId;
   var _useState = useState({
       page: 0,
       sort: "timeUpdate,DESC",
-      size: 10,
-      catId: catId
+      catId: catId,
+      size: 10
     }),
     params = _useState[0],
     setParams = _useState[1];
@@ -13942,11 +14024,11 @@ var News1 = function News1(props) {
   useEffect(function () {
     if ((newsCategories === null || newsCategories === void 0 ? void 0 : newsCategories.length) > 0 && params !== null && params !== void 0 && params.catId) {
       var category = newsCategories === null || newsCategories === void 0 ? void 0 : newsCategories.find(function (item) {
-        return (item === null || item === void 0 ? void 0 : item.catId) == catId;
+        return (item === null || item === void 0 ? void 0 : item.catId) == (params === null || params === void 0 ? void 0 : params.catId);
       });
       setCategorySelected(category);
     }
-  }, [params === null || params === void 0 ? void 0 : params.catId, newsCategories]);
+  }, [newsCategories]);
   return /*#__PURE__*/React__default.createElement("div", {
     className: SECTION_CLASS + " grid grid-cols-1 md:grid-cols-3 gap-6"
   }, /*#__PURE__*/React__default.createElement("div", {
@@ -13991,18 +14073,29 @@ var News1 = function News1(props) {
   }) : null)), /*#__PURE__*/React__default.createElement("div", {
     className: "sticky top-20 self-start"
   }, /*#__PURE__*/React__default.createElement("div", {
-    className: "px-6 py-3 bg-primary rounded-t-lg text-lg text-textButton text-center"
+    className: "px-6 py-3 bg-primary rounded-t-lg text-lg text-textButton text-center ",
+    onClick: function onClick() {
+      setParams({
+        page: 0,
+        sort: "timeUpdate,DESC",
+        size: 10
+      });
+    }
   }, "Chuy\xEAn m\u1EE5c"), /*#__PURE__*/React__default.createElement("div", {
     className: "rounded-b-lg bg-bgSecondary"
   }, newsCategories === null || newsCategories === void 0 ? void 0 : newsCategories.map(function (item, index) {
-    return /*#__PURE__*/React__default.createElement(LinkToPage, {
-      href: getLinkNewsByCategory(item),
-      Link: Link,
-      key: "fjhnfg-" + index
-    }, /*#__PURE__*/React__default.createElement("div", {
+    return /*#__PURE__*/React__default.createElement("div", {
       className: "px-6 py-3 hover:bg-gray-100 hover:text-primary cursor-pointer",
-      key: "sdjfdh-" + index
-    }, item === null || item === void 0 ? void 0 : item.catName));
+      key: "sdjfdh-" + index,
+      onClick: function onClick() {
+        setCategorySelected(item);
+        setParams(function (prev) {
+          return _extends({}, prev, {
+            catId: item === null || item === void 0 ? void 0 : item.catId
+          });
+        });
+      }
+    }, item === null || item === void 0 ? void 0 : item.catName);
   }))));
 };