@bonlineza/luxity-lib 2.36.1-beta.0 → 2.36.1-beta.2

package/GraphQLDropdownSelector.js

@@ -9718,11 +9718,12 @@
         var _data$data$user = data.data.user,
             email_interest_send_schedule = _data$data$user.email_interest_send_schedule,
             whatsapp_interest_send_schedule = _data$data$user.whatsapp_interest_send_schedule,
-            vip = _data$data$user.vip;
+            isEarlyAccess = _data$data$user.isEarlyAccess,
+            isExclusive = _data$data$user.isExclusive;
 
         _this.setState({
           options: options,
-          isVip: vip,
+          canReceiveWhatsAppNotifications: isEarlyAccess || isExclusive,
           emailSelectedOption: options.find(function (item) {
             return item.value === email_interest_send_schedule;
           }),
@@ -9737,7 +9738,7 @@
             options = _this$state.options,
             emailSelectedOption = _this$state.emailSelectedOption,
             whatsappSelectedOption = _this$state.whatsappSelectedOption,
-            isVip = _this$state.isVip,
+            canReceiveWhatsAppNotifications = _this$state.canReceiveWhatsAppNotifications,
             updating = _this$state.request.fetching;
         return /*#__PURE__*/React__default.createElement(NotifyContainer, null, /*#__PURE__*/React__default.createElement(LuxityNotifications, null), /*#__PURE__*/React__default.createElement(LuxityPageReady, {
           getRequestPromise: _this.props.getSchedule,
@@ -9746,7 +9747,7 @@
           }
         }, /*#__PURE__*/React__default.createElement(React.Fragment, null, /*#__PURE__*/React__default.createElement("div", {
           className: "notification-settings"
-        }, isVip && /*#__PURE__*/React__default.createElement("div", {
+        }, canReceiveWhatsAppNotifications && /*#__PURE__*/React__default.createElement("div", {
           className: "notification-row-wrapper"
         }, /*#__PURE__*/React__default.createElement("div", {
           className: "notification-dropdown-label"
@@ -9791,7 +9792,7 @@
         options: [],
         emailSelectedOption: null,
         whatsappSelectedOption: null,
-        isVip: false,
+        canReceiveWhatsAppNotifications: false,
         request: _objectSpread2({}, request)
       };
       return _this;

package/Interests.js

@@ -7624,11 +7624,12 @@
         var _data$data$user = data.data.user,
             email_interest_send_schedule = _data$data$user.email_interest_send_schedule,
             whatsapp_interest_send_schedule = _data$data$user.whatsapp_interest_send_schedule,
-            vip = _data$data$user.vip;
+            isEarlyAccess = _data$data$user.isEarlyAccess,
+            isExclusive = _data$data$user.isExclusive;
 
         _this.setState({
           options: options,
-          isVip: vip,
+          canReceiveWhatsAppNotifications: isEarlyAccess || isExclusive,
           emailSelectedOption: options.find(function (item) {
             return item.value === email_interest_send_schedule;
           }),
@@ -7643,7 +7644,7 @@
             options = _this$state.options,
             emailSelectedOption = _this$state.emailSelectedOption,
             whatsappSelectedOption = _this$state.whatsappSelectedOption,
-            isVip = _this$state.isVip,
+            canReceiveWhatsAppNotifications = _this$state.canReceiveWhatsAppNotifications,
             updating = _this$state.request.fetching;
         return /*#__PURE__*/React__default.createElement(NotifyContainer, null, /*#__PURE__*/React__default.createElement(LuxityNotifications, null), /*#__PURE__*/React__default.createElement(LuxityPageReady, {
           getRequestPromise: _this.props.getSchedule,
@@ -7652,7 +7653,7 @@
           }
         }, /*#__PURE__*/React__default.createElement(React.Fragment, null, /*#__PURE__*/React__default.createElement("div", {
           className: "notification-settings"
-        }, isVip && /*#__PURE__*/React__default.createElement("div", {
+        }, canReceiveWhatsAppNotifications && /*#__PURE__*/React__default.createElement("div", {
           className: "notification-row-wrapper"
         }, /*#__PURE__*/React__default.createElement("div", {
           className: "notification-dropdown-label"
@@ -7697,7 +7698,7 @@
         options: [],
         emailSelectedOption: null,
         whatsappSelectedOption: null,
-        isVip: false,
+        canReceiveWhatsAppNotifications: false,
         request: _objectSpread2({}, request)
       };
       return _this;

package/LuxityDesktopHeader.js

@@ -434,6 +434,37 @@
     }, contactNumber)));
   };
 
+  var categories = {
+    shoes: {
+      name: 'Shoes',
+      slug: 'shoes'
+    },
+    bags: {
+      name: 'Bags',
+      slug: 'bags'
+    },
+    clothing: {
+      name: 'Clothing',
+      slug: 'apparel'
+    },
+    watches: {
+      name: 'Watches',
+      slug: 'watches'
+    },
+    accessories: {
+      name: 'Accessories',
+      slug: 'accessories'
+    }
+  };
+
+  var removeCategoryByName = function removeCategoryByName(categories, name) {
+    var _categories$filter;
+
+    return (_categories$filter = categories === null || categories === void 0 ? void 0 : categories.filter(function (category) {
+      return category.name !== name;
+    })) !== null && _categories$filter !== void 0 ? _categories$filter : [];
+  };
+
   var SearchResults = function SearchResults(_ref) {
     var searchValue = _ref.searchValue,
         searchResults = _ref.searchResults,
@@ -690,14 +721,6 @@
     }))));
   };
 
-  var removeCategoryByName = function removeCategoryByName(categories, name) {
-    var _categories$filter;
-
-    return (_categories$filter = categories === null || categories === void 0 ? void 0 : categories.filter(function (category) {
-      return category.name.toLowerCase() !== name.toLowerCase();
-    })) !== null && _categories$filter !== void 0 ? _categories$filter : [];
-  };
-
   var LuxityDesktopHeader = function LuxityDesktopHeader(_ref) {
     var accountIcon = _ref.accountIcon,
         cartIcon = _ref.cartIcon,
@@ -705,6 +728,12 @@
         cartCount = _ref.cartCount,
         logoSrc = _ref.logoSrc,
         categoryElements = _ref.categoryElements,
+        newBrandsImage = _ref.newBrandsImage,
+        bagsImage = _ref.bagsImage,
+        shoesImage = _ref.shoesImage,
+        clothingImage = _ref.clothingImage,
+        accessoriesImage = _ref.accessoriesImage,
+        watchesImage = _ref.watchesImage,
         stores = _ref.stores,
         contactNumber = _ref.contactNumber,
         productsUrl = _ref.productsUrl,
@@ -719,6 +748,7 @@
         ourStoryLink = _ref.ourStoryLink,
         onLogoClick = _ref.onLogoClick,
         endpoint = _ref.endpoint,
+        menuData = _ref.menuData,
         onSearchSubmit = _ref.onSearchSubmit,
         onProductIdsReceived = _ref.onProductIdsReceived,
         currency = _ref.currency,
@@ -726,12 +756,13 @@
         onCurrencyChange = _ref.onCurrencyChange,
         isCurrencySelectionDisabled = _ref.isCurrencySelectionDisabled,
         tooltipContent = _ref.tooltipContent,
-        vipIcon = _ref.vipIcon,
+        earlyAccessIcon = _ref.earlyAccessIcon,
+        exclusiveIcon = _ref.exclusiveIcon,
         name = _ref.name,
-        isVip = _ref.isVip,
+        isEarlyAccess = _ref.isEarlyAccess,
+        isExclusive = _ref.isExclusive,
         shop = _ref.shop,
-        app = _ref.app,
-        categoryConfig = _ref.categoryConfig;
+        app = _ref.app;
 
     var _useState = React.useState(''),
         _useState2 = _slicedToArray(_useState, 2),
@@ -743,7 +774,16 @@
         loading = _useState4[0],
         setLoading = _useState4[1];
 
-    var _useState5 = React.useState({}),
+    var _useState5 = React.useState({
+      latestArrivals: [],
+      bags: [],
+      shoes: [],
+      clothing: [],
+      accessories: [],
+      watches: [],
+      accessoriesCategories: [],
+      apparelStyles: []
+    }),
         _useState6 = _slicedToArray(_useState5, 2),
         dropdownData = _useState6[0],
         setDropdownData = _useState6[1];
@@ -844,63 +884,38 @@
       }
     };
 
-    React.useMemo(function () {
-      setLoading(true);
-      axios.get("".concat(categoryConfig.menuData)).then(function (_ref2) {
-        var data = _ref2.data;
-        setLoading(false);
-        setDropdownData(data);
-      }).catch(function () {
-        return setHasError(true);
-      });
-    }, [categoryConfig.menuData]);
-
-    var addCategoryToElements = function addCategoryToElements(elements, categoryName) {
+    function addCategoryToElements(elements, categoryName) {
       return elements.map(function (element) {
         return _objectSpread2(_objectSpread2({}, element), {}, {
           category: categoryName
         });
       });
-    };
-
-    var renderDropdownLinks = function renderDropdownLinks() {
-      return categoryConfig.categories.map(function (category) {
-        var title = category.title,
-            imageSrc = category.imageSrc,
-            categorySlug = category.categorySlug,
-            categoryName = category.categoryName,
-            elementsKey = category.elementsKey,
-            subCategoryElementsKey = category.subCategoryElementsKey,
-            styleElementsKey = category.styleElementsKey;
-        var categoryElementsProcessed = categoryElements;
-
-        if (subCategoryElementsKey && dropdownData[subCategoryElementsKey]) {
-          // show subcategory elements
-          categoryElementsProcessed = removeCategoryByName(dropdownData[subCategoryElementsKey], categoryName);
-        } else if (styleElementsKey && dropdownData[styleElementsKey]) {
-          categoryElementsProcessed = addCategoryToElements(dropdownData[styleElementsKey], categorySlug);
-        } else {
-          categoryElementsProcessed = addCategoryToElements(categoryElementsProcessed, categorySlug);
-        }
+    }
 
-        return /*#__PURE__*/React__default.createElement(DropdownLink, {
-          key: categorySlug,
-          title: title,
-          imageSrc: imageSrc,
-          categoryElements: categoryElementsProcessed,
-          brandElements: dropdownData[elementsKey] || [],
-          productsUrl: productsUrl,
-          categorySlug: categorySlug,
-          categoryTitle: categoryName,
-          isLoading: loading,
-          hasError: hasError,
-          LinkComponent: LinkComponent
+    React.useMemo(function () {
+      setLoading(true);
+      axios.get("".concat(menuData)).then(function (_ref2) {
+        var data = _ref2.data;
+        setLoading(false);
+        setDropdownData(function (prev) {
+          return _objectSpread2(_objectSpread2({}, prev), {}, {
+            latestArrivals: data.latest_arrivals,
+            bags: data.bags,
+            shoes: data.shoes,
+            apparel: data.apparel,
+            accessories: data.accessories,
+            watches: data.watches,
+            accessoriesCategories: data.accessories_categories,
+            apparelStyles: data.apparel_styles
+          });
         });
+      }).catch(function () {
+        return setHasError(true);
       });
-    };
+    }, [menuData]);
 
-    var getMarginRight = function getMarginRight(userIsVip, userName) {
-      if (userIsVip) return '15px';
+    var getMarginRight = function getMarginRight(showLoyaltyIcon, userName) {
+      if (showLoyaltyIcon) return '15px';
       if (userName) return '5px';
       return '18px';
     };
@@ -954,9 +969,74 @@
       setSearchValue: setSearchValue
     }), /*#__PURE__*/React__default.createElement("nav", {
       className: "navbar__nav-links navbar__nav-links--wrap"
-    }, renderDropdownLinks(), !!stores.length && /*#__PURE__*/React__default.createElement("li", {
-      className: "navbar__link",
-      key: "Stores"
+    }, /*#__PURE__*/React__default.createElement(DropdownLink, {
+      title: "New",
+      imageSrc: newBrandsImage,
+      categoryElements: categoryElements,
+      brandElements: dropdownData.latestArrivals,
+      productsUrl: productsUrl,
+      categorySlug: "brands",
+      categoryTitle: "Brands",
+      isLoading: loading,
+      hasError: hasError,
+      LinkComponent: LinkComponent
+    }), /*#__PURE__*/React__default.createElement(DropdownLink, {
+      title: "Bags",
+      imageSrc: bagsImage,
+      categoryElements: addCategoryToElements(categoryElements, categories.bags.slug),
+      brandElements: dropdownData.bags,
+      productsUrl: productsUrl,
+      categorySlug: categories.bags.slug,
+      categoryTitle: categories.bags.name,
+      isLoading: loading,
+      hasError: hasError,
+      LinkComponent: LinkComponent
+    }), /*#__PURE__*/React__default.createElement(DropdownLink, {
+      title: "Shoes",
+      imageSrc: shoesImage,
+      categoryElements: addCategoryToElements(categoryElements, categories.shoes.slug),
+      brandElements: dropdownData.shoes,
+      productsUrl: productsUrl,
+      categorySlug: categories.shoes.slug,
+      categoryTitle: categories.shoes.name,
+      isLoading: loading,
+      hasError: hasError,
+      LinkComponent: LinkComponent
+    }), /*#__PURE__*/React__default.createElement(DropdownLink, {
+      title: "Clothing",
+      imageSrc: clothingImage,
+      categoryElements: addCategoryToElements(dropdownData.apparelStyles, categories.clothing.slug),
+      brandElements: dropdownData.apparel,
+      productsUrl: productsUrl,
+      categorySlug: categories.clothing.slug,
+      categoryTitle: categories.clothing.name,
+      isLoading: loading,
+      hasError: hasError,
+      LinkComponent: LinkComponent
+    }), /*#__PURE__*/React__default.createElement(DropdownLink, {
+      title: "Accessories",
+      imageSrc: accessoriesImage,
+      categoryElements: removeCategoryByName(dropdownData.accessoriesCategories, 'ACCESSORIES'),
+      brandElements: dropdownData.accessories,
+      productsUrl: productsUrl,
+      categorySlug: categories.accessories.slug,
+      categoryTitle: categories.accessories.name,
+      isLoading: loading,
+      hasError: hasError,
+      LinkComponent: LinkComponent
+    }), /*#__PURE__*/React__default.createElement(DropdownLink, {
+      title: "Watches",
+      imageSrc: watchesImage,
+      categoryElements: addCategoryToElements(categoryElements, categories.watches.slug),
+      brandElements: dropdownData.watches,
+      productsUrl: productsUrl,
+      categorySlug: categories.watches.slug,
+      categoryTitle: categories.watches.name,
+      isLoading: loading,
+      hasError: hasError,
+      LinkComponent: LinkComponent
+    }), /*#__PURE__*/React__default.createElement("li", {
+      className: "navbar__link"
     }, /*#__PURE__*/React__default.createElement(LinkComponent, {
       href: contactUsLink,
       className: "navbar__link-item navbar__link-item--desktop"
@@ -980,17 +1060,23 @@
       className: "navbar__icon relative flex",
       onClick: onAccountClick,
       style: {
-        marginRight: getMarginRight(isVip, name)
+        marginRight: getMarginRight(isEarlyAccess || isExclusive, name)
       }
     }, /*#__PURE__*/React__default.createElement("img", {
       src: accountIcon,
       alt: "account-icon",
       width: 20,
       height: 20
-    }), isVip && /*#__PURE__*/React__default.createElement("img", {
-      src: vipIcon,
-      alt: "vip-icon",
-      className: "navbar__vip-icon",
+    }), isEarlyAccess && /*#__PURE__*/React__default.createElement("img", {
+      src: earlyAccessIcon,
+      alt: "loyalty-icon",
+      className: "navbar__loyalty-icon",
+      width: 16,
+      height: 16
+    }), isExclusive && /*#__PURE__*/React__default.createElement("img", {
+      src: exclusiveIcon,
+      alt: "loyalty-icon",
+      className: "navbar__loyalty-icon",
       width: 16,
       height: 16
     })), name && /*#__PURE__*/React__default.createElement("button", {

package/LuxityFooter.js

@@ -2102,13 +2102,13 @@
         setError = _useForm.setError;
 
     var renderLinks = function renderLinks(links, title) {
-      return !!links.length && /*#__PURE__*/React__default.createElement("div", {
+      return /*#__PURE__*/React__default.createElement("div", {
         className: "footer__link-container"
       }, /*#__PURE__*/React__default.createElement("div", {
         className: "footer__link-title"
       }, title), /*#__PURE__*/React__default.createElement("div", {
         className: "footer__links"
-      }, links.map(function (link) {
+      }, !!links.length && links.map(function (link) {
         return /*#__PURE__*/React__default.createElement("div", {
           className: "footer__link-wrapper",
           key: link.label
@@ -2277,7 +2277,7 @@
       height: 100
     })), /*#__PURE__*/React__default.createElement("p", {
       className: "footer__copyright"
-    }, "Copyright ", currentYear, " | Luxity (Pty) LTD | All Rights Reserved | Website Developed by B Online"))), /*#__PURE__*/React__default.createElement("div", {
+    }, "Copyright ", currentYear, " | Luxity (Pty) LTD | All Rights Reserved"))), /*#__PURE__*/React__default.createElement("div", {
       className: "footer__wrapper footer__wrapper--mobile"
     }, /*#__PURE__*/React__default.createElement(CurrencySelect, {
       currency: currency,
@@ -2291,20 +2291,20 @@
     }), /*#__PURE__*/React__default.createElement(AccordionSection, {
       title: "POPULAR",
       links: popularLinks
-    }), !!sellLinks.length && /*#__PURE__*/React__default.createElement(AccordionSection, {
+    }), /*#__PURE__*/React__default.createElement(AccordionSection, {
       title: "SELL",
       links: sellLinks
     }), /*#__PURE__*/React__default.createElement(AccordionSection, {
       title: "COMPANY",
       links: companyLinks
-    }), !!storeLinks.length && /*#__PURE__*/React__default.createElement(AccordionSection, {
+    }), /*#__PURE__*/React__default.createElement(AccordionSection, {
       title: "CONNECT",
       links: storeLinks
     }), /*#__PURE__*/React__default.createElement("div", {
       className: "mt-5"
     }, renderSocialLinks(socialLinks)), /*#__PURE__*/React__default.createElement("p", {
       className: "footer__copyright footer__copyright--mobile"
-    }, "Copyright ", currentYear, " | Luxity (Pty) LTD | All Rights Reserved | Website Developed by B Online")));
+    }, "Copyright ", currentYear, " | Luxity (Pty) LTD | All Rights Reserved")));
   };
 
   var index = themed(LuxityFooter);

package/LuxityGraphQLDropdownSelector.js

@@ -9718,11 +9718,12 @@
         var _data$data$user = data.data.user,
             email_interest_send_schedule = _data$data$user.email_interest_send_schedule,
             whatsapp_interest_send_schedule = _data$data$user.whatsapp_interest_send_schedule,
-            vip = _data$data$user.vip;
+            isEarlyAccess = _data$data$user.isEarlyAccess,
+            isExclusive = _data$data$user.isExclusive;
 
         _this.setState({
           options: options,
-          isVip: vip,
+          canReceiveWhatsAppNotifications: isEarlyAccess || isExclusive,
           emailSelectedOption: options.find(function (item) {
             return item.value === email_interest_send_schedule;
           }),
@@ -9737,7 +9738,7 @@
             options = _this$state.options,
             emailSelectedOption = _this$state.emailSelectedOption,
             whatsappSelectedOption = _this$state.whatsappSelectedOption,
-            isVip = _this$state.isVip,
+            canReceiveWhatsAppNotifications = _this$state.canReceiveWhatsAppNotifications,
             updating = _this$state.request.fetching;
         return /*#__PURE__*/React__default.createElement(NotifyContainer, null, /*#__PURE__*/React__default.createElement(LuxityNotifications, null), /*#__PURE__*/React__default.createElement(LuxityPageReady, {
           getRequestPromise: _this.props.getSchedule,
@@ -9746,7 +9747,7 @@
           }
         }, /*#__PURE__*/React__default.createElement(React.Fragment, null, /*#__PURE__*/React__default.createElement("div", {
           className: "notification-settings"
-        }, isVip && /*#__PURE__*/React__default.createElement("div", {
+        }, canReceiveWhatsAppNotifications && /*#__PURE__*/React__default.createElement("div", {
           className: "notification-row-wrapper"
         }, /*#__PURE__*/React__default.createElement("div", {
           className: "notification-dropdown-label"
@@ -9791,7 +9792,7 @@
         options: [],
         emailSelectedOption: null,
         whatsappSelectedOption: null,
-        isVip: false,
+        canReceiveWhatsAppNotifications: false,
         request: _objectSpread2({}, request)
       };
       return _this;