@akinon/projectzero 1.100.0-rc.72 → 1.100.0

package/app-template/src/views/basket/basket-item.tsx

@@ -3,7 +3,7 @@ import {
   useUpdateQuantityMutation
 } from '@akinon/next/data/client/basket';
 import { useAppDispatch } from '@akinon/next/redux/hooks';
-import { Basket, BasketItem as BasketItemType } from '@akinon/next/types';
+import { BasketItem as BasketItemType } from '@akinon/next/types';
 import { Price, Button, Icon, Modal, Select, Link } from '@theme/components';
 import { useState } from 'react';
 import { useAddFavoriteMutation } from '@akinon/next/data/client/wishlist';
@@ -19,12 +19,11 @@ import { pushRemoveFromCart } from '@theme/utils/gtm';
 interface Props {
   basketItem?: BasketItemType;
   namespace?: string;
-  onBasketUpdate?: (basket: Basket) => void;
 }
 
 export const BasketItem = (props: Props) => {
   const { t } = useLocalization();
-  const { basketItem, namespace, onBasketUpdate } = props;
+  const { basketItem, namespace } = props;
   const [updateQuantityMutation] = useUpdateQuantityMutation();
   const dispatch = useAppDispatch();
   const [isRemoveBasketModalOpen, setRemoveBasketModalOpen] = useState(false);
@@ -40,12 +39,7 @@ export const BasketItem = (props: Props) => {
     quantity: number,
     attributes: object = {}
   ) => {
-    const requestParams: {
-      product: number;
-      quantity: number;
-      attributes: object;
-      namespace?: string;
-    } = {
+    const requestParams: any = {
       product: productPk,
       quantity,
       attributes
@@ -55,21 +49,19 @@ export const BasketItem = (props: Props) => {
       requestParams.namespace = namespace;
     }
 
-    try {
-      const response = await updateQuantityMutation(requestParams).unwrap();
-      dispatch(
-        basketApi.util.updateQueryData(
-          'getBasket',
-          undefined,
-          (draftBasket) => {
-            Object.assign(draftBasket, response.basket);
-          }
+    await updateQuantityMutation(requestParams)
+      .unwrap()
+      .then((data) =>
+        dispatch(
+          basketApi.util.updateQueryData(
+            'getBasket',
+            undefined,
+            (draftBasket) => {
+              Object.assign(draftBasket, data.basket);
+            }
+          )
         )
       );
-      onBasketUpdate?.(response.basket);
-    } catch (error) {
-      console.error('Error updating quantity:', error);
-    }
   };
 
   const deleteProduct = async (productPk?: number) => {

package/app-template/src/views/basket/summary.tsx

@@ -18,7 +18,6 @@ import clsx from 'clsx';
 
 interface Props {
   basket: Basket;
-  onBasketUpdate?: (basket: Basket) => void;
 }
 
 const voucherCodeFormSchema = (t) =>
@@ -28,7 +27,7 @@ const voucherCodeFormSchema = (t) =>
 
 export const Summary = (props: Props) => {
   const { t } = useLocalization();
-  const { basket, onBasketUpdate } = props;
+  const { basket } = props;
   const router = useRouter();
   const {
     register,
@@ -54,7 +53,7 @@ export const Summary = (props: Props) => {
   const removeVoucherCode = () => {
     removeVoucherCodeMutation()
       .unwrap()
-      .then((basket) => {
+      .then((basket) =>
         dispatch(
           basketApi.util.updateQueryData(
             'getBasket',
@@ -63,9 +62,8 @@ export const Summary = (props: Props) => {
               Object.assign(draftBasket, basket);
             }
           )
-        );
-        onBasketUpdate?.(basket);
-      })
+        )
+      )
       .catch((error: Error) => {
         setError('voucherCode', { message: error.data.non_field_errors });
       });
@@ -76,7 +74,7 @@ export const Summary = (props: Props) => {
       voucher_code: data.voucherCode
     })
       .unwrap()
-      .then((basket) => {
+      .then((basket) =>
         dispatch(
           basketApi.util.updateQueryData(
             'getBasket',
@@ -85,9 +83,8 @@ export const Summary = (props: Props) => {
               Object.assign(draftBasket, basket);
             }
           )
-        );
-        onBasketUpdate?.(basket);
-      })
+        )
+      )
       .catch((error: Error) => {
         setError('voucherCode', { message: error.data.non_field_errors });
       });

package/app-template/src/views/breadcrumb.tsx

@@ -12,7 +12,7 @@ export interface BreadcrumbProps {
 }
 
 export default function Breadcrumb(props: BreadcrumbProps) {
-  const { t, locale } = useLocalization();
+  const { t } = useLocalization();
   const { breadcrumbList = [] } = props;
 
   const list = [
@@ -28,7 +28,7 @@ export default function Breadcrumb(props: BreadcrumbProps) {
       {list.map((item, index) => (
         <Fragment key={index}>
           <Link href={item.url}>
-            {capitalize(item.text.toLocaleLowerCase(locale))}
+            {capitalize(item.text.toLocaleLowerCase())}
           </Link>
           {index !== list.length - 1 && <Icon name="chevron-end" size={8} />}
         </Fragment>

package/app-template/src/views/category/category-info.tsx

@@ -57,7 +57,6 @@ export default function ListPage(props: ListPageProps) {
       newUrl.searchParams.delete('page');
       router.push(newUrl.pathname + newUrl.search, undefined);
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [searchParams, data.products, page]);
 
   const { t } = useLocalization();

package/app-template/src/views/category/filters/index.tsx

@@ -6,7 +6,7 @@ import { useLocalization } from '@akinon/next/hooks';
 import { useAppDispatch, useAppSelector } from '@akinon/next/redux/hooks';
 import { resetSelectedFacets } from '@theme/redux/reducers/category';
 import CategoryActiveFilters from '@theme/views/category/category-active-filters';
-import { useMemo, useTransition } from 'react';
+import { useMemo, useState, useTransition } from 'react';
 import { FilterItem } from './filter-item';
 
 interface Props {

package/app-template/src/views/guest-login/index.tsx

@@ -51,14 +51,9 @@ const GuestLogin = () => {
       ).unwrap();
 
       Object.keys(response?.errors || {}).forEach((key) => {
-        const errorValue = response?.errors[key];
-        const message = Array.isArray(errorValue)
-          ? errorValue.join(', ')
-          : errorValue || '';
-
         setError(key as keyof GuestLoginFormParams, {
           type: 'custom',
-          message
+          message: response?.errors[key]?.join(', ')
         });
       });
     } catch (error) {

package/app-template/src/views/header/action-menu.tsx

@@ -76,7 +76,7 @@ export default function ActionMenu() {
               : 'bg-secondary-500 text-white'
           )}
         >
-          <span data-testid="header-basket-count">{totalQuantity}</span>
+          {totalQuantity}
         </Badge>
       ),
       miniBasket: <MiniBasket />

package/app-template/src/views/header/search/index.tsx

@@ -4,11 +4,11 @@ import { useEffect, useRef, useState } from 'react';
 import { useAppDispatch, useAppSelector } from '@akinon/next/redux/hooks';
 import { closeSearch } from '@akinon/next/redux/reducers/header';
 import clsx from 'clsx';
-import { Icon, Input } from '@theme/components';
+
+import { Icon } from '@theme/components';
 import Results from './results';
 import { ROUTES } from '@theme/routes';
 import { useLocalization, useRouter } from '@akinon/next/hooks';
-import PluginModule, { Component } from '@akinon/next/components/plugin-module';
 
 export default function Search() {
   const { t } = useLocalization();
@@ -41,14 +41,6 @@ export default function Search() {
     };
   }, [isSearchOpen, dispatch]);
 
-  const handleSearchTextChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    setSearchText(e.target.value);
-  };
-
-  const handleCloseSearch = () => {
-    dispatch(closeSearch());
-  };
-
   return (
     <>
       <div
@@ -74,9 +66,9 @@ export default function Search() {
               {t('common.search.results_for')}
             </span>
             <div className="flex items-center">
-              <Input
+              <input
                 value={searchText}
-                onChange={handleSearchTextChange}
+                onChange={(e) => setSearchText(e.target.value)}
                 onKeyDown={(e) => {
                   if (e.key === 'Enter' && searchText.trim() !== '') {
                     router.push(`${ROUTES.LIST}/?search_text=${searchText}`);
@@ -86,18 +78,14 @@ export default function Search() {
                 placeholder={t('common.search.placeholder')}
                 ref={inputRef}
               />
-
-              <PluginModule component={Component.HeaderImageSearchFeature} />
-
               <Icon
                 name="close"
                 size={14}
-                onClick={handleCloseSearch}
+                onClick={() => dispatch(closeSearch())}
                 className="cursor-pointer"
               />
             </div>
           </div>
-
           <Results searchText={searchText} />
         </div>
       </div>

package/app-template/src/views/product/product-info.tsx

@@ -1,73 +1,177 @@
 'use client';
 
 import clsx from 'clsx';
+import { Button, Icon, Modal } from '@theme/components';
+import { useAddProductToBasket } from '../../hooks';
 import React, { useEffect, useState } from 'react';
-import { PriceWrapper } from '@theme/views/product';
+import { useAddStockAlertMutation } from '@akinon/next/data/client/wishlist';
+import { pushAddToCart, pushProductViewed } from '@theme/utils/gtm';
+import { PriceWrapper, Variant } from '@theme/views/product';
+import Share from '@theme/views/share';
 import { ProductPageProps } from './layout';
 import MiscButtons from './misc-buttons';
-import { pushProductViewed } from '@theme/utils/gtm';
+import { useLocalization } from '@akinon/next/hooks';
+import PluginModule, { Component } from '@akinon/next/components/plugin-module';
+import { Trans } from '@akinon/next/components/trans';
 import { useSession } from 'next-auth/react';
-import { isVariantSelectionComplete } from '../../utils/variant-validation';
-import { useProductCart } from '../../hooks/use-product-cart';
-import { useStockAlert } from '../../hooks/use-stock-alert';
-import { ProductVariants } from './product-variants';
-import { ProductActions } from './product-actions';
-import { ProductShare } from './product-share';
 
 export default function ProductInfo({ data }: ProductPageProps) {
+  const { t } = useLocalization();
   const { data: session } = useSession();
+  const [currentUrl, setCurrentUrl] = useState(null);
+  const [productError, setProductError] = useState(null);
+  const [isModalOpen, setIsModalOpen] = useState(false);
+  const [stockAlertResponseMessage, setStockAlertResponseMessage] =
+    useState(null);
   const [isVariantLoading, setIsVariantLoading] = useState(false);
 
+  const [addProduct, { isLoading: isAddToCartLoading }] =
+    useAddProductToBasket();
+  const [addStockAlert, { isLoading: isAddToStockAlertLoading }] =
+    useAddStockAlertMutation();
   const inStock = data.selected_variant !== null || data.product.in_stock;
 
-  const {
-    addProductToCart,
-    productError: cartError,
-    clearProductError: clearCartError,
-    isAddToCartLoading
-  } = useProductCart({
-    product: data.product,
-    variants: data.variants
-  });
-
-  const {
-    addProductToStockAlertList,
-    isModalOpen,
-    stockAlertResponseMessage,
-    productError: stockError,
-    isAddToStockAlertLoading,
-    closeModal,
-    clearError: clearStockError
-  } = useStockAlert({
-    productPk: data.product.pk,
-    userEmail: session?.user?.email
-  });
-
-  const productError = cartError || stockError;
-  const clearProductError = () => {
-    clearCartError();
-    clearStockError();
-  };
-
   useEffect(() => {
-    isVariantSelectionComplete(data.variants) && setIsVariantLoading(false);
+    isVariantSelectionComplete() && setIsVariantLoading(false);
+
     !inStock && setIsVariantLoading(false);
-  }, [data, inStock]);
+  }, [data]); // eslint-disable-line react-hooks/exhaustive-deps
 
   useEffect(() => {
     if (isVariantLoading) {
-      clearProductError();
+      setProductError(null);
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isVariantLoading]);
 
+  useEffect(() => {
+    setCurrentUrl(window.location.href);
+  }, [currentUrl]);
+
   useEffect(() => {
     pushProductViewed(data?.product);
   }, []); // eslint-disable-line react-hooks/exhaustive-deps
 
-  const handleVariantChange = () => {
-    clearProductError();
-    setIsVariantLoading(true);
+  const addProductToCart = async () => {
+    if (!variantsSelectionCheck()) {
+      return;
+    }
+
+    try {
+      await addProduct({
+        product: data.product.pk,
+        quantity: 1,
+        attributes: {}
+      });
+
+      pushAddToCart(data?.product);
+    } catch (error) {
+      setProductError(
+        error?.data?.non_field_errors ||
+          Object.keys(error?.data).map(
+            (key) => `${key}: ${error?.data[key].join(', ')}`
+          )
+      );
+    }
+  };
+
+  const variantsSelectionCheck = () => {
+    const unselectedVariant = data.variants.find((variant) =>
+      variant.options.every((opt) => !opt.is_selected)
+    );
+
+    if (unselectedVariant) {
+      setProductError(() => (
+        <Trans
+          i18nKey="product.please_select_variant"
+          components={{
+            VariantName: <span>{unselectedVariant.attribute_name}</span>
+          }}
+        />
+      ));
+
+      return false;
+    }
+
+    return true;
+  };
+
+  const isVariantSelectionComplete = () => {
+    return data?.variants.every((variant) =>
+      variant?.options.some((opt) => opt.is_selected)
+    );
+  };
+
+  const addProductToStockAlertList = async () => {
+    try {
+      await addStockAlert({
+        productPk: data.product.pk,
+        email: session?.user?.email
+      })
+        .unwrap()
+        .then(handleSuccess)
+        .catch((err) => handleError(err));
+    } catch (error) {
+      setProductError(error?.data?.non_field_errors || null);
+    }
+  };
+
+  const handleModalClick = () => {
+    setIsModalOpen(false);
+  };
+
+  const handleSuccess = () => {
+    setStockAlertResponseMessage(() => (
+      <Trans
+        i18nKey="product.stock_alert.success_description"
+        components={{
+          Email: <span>{session?.user?.email}</span>
+        }}
+      />
+    ));
+    setIsModalOpen(true);
+  };
+
+  const handleError = (err) => {
+    if (err.status !== 401) {
+      setStockAlertResponseMessage(
+        t('product.stock_alert.error_description').toString()
+      );
+      setIsModalOpen(true);
+    }
+  };
+
+  const checkoutProviderProps = {
+    product: data.product,
+    clearBasket: true,
+    addBeforeClick: variantsSelectionCheck,
+    openMiniBasket: false,
+    className: clsx([
+      'py-2.5',
+      'bg-black',
+      'relative',
+      'hover:bg-black',
+      'before:content-[""]',
+      'before:w-6',
+      'before:h-6',
+      'before:bg-white',
+      'before:absolute',
+      'before:rounded-r-[18px]',
+      'before:left-0',
+      'after:content-[""]',
+      'after:absolute',
+      'after:w-3',
+      'after:h-3',
+      'after:bg-[#d02c2f]',
+      'after:rounded-xl',
+      'after:left-1'
+    ]),
+    onError: (error) =>
+      setProductError(
+        error?.data?.non_field_errors ||
+          Object.keys(error?.data).map(
+            (key) => `${key}: ${error?.data[key].join(', ')}`
+          )
+      )
   };
 
   return (
@@ -83,26 +187,72 @@ export default function ProductInfo({ data }: ProductPageProps) {
           retailPrice={data.product.retail_price}
         />
       </div>
+      <div className="flex flex-col">
+        {data.variants.map((variant) => (
+          <Variant
+            key={variant.attribute_key}
+            {...variant}
+            className="items-center mt-8"
+            onChange={() => {
+              setProductError(null);
+              setIsVariantLoading(true);
+            }}
+          />
+        ))}
+      </div>
 
-      <ProductVariants
-        variants={data.variants}
-        onVariantChange={handleVariantChange}
+      {productError && (
+        <div className="mt-4 text-xs text-center text-error">
+          {productError}
+        </div>
+      )}
+
+      <Button
+        disabled={
+          isAddToCartLoading || isAddToStockAlertLoading || isVariantLoading
+        }
+        className={clsx(
+          'fixed bottom-0 right-0 w-1/2 h-14 z-[20] flex items-center justify-center fill-primary-foreground',
+          'hover:fill-primary sm:relative sm:w-full sm:mt-3 sm:font-semibold sm:h-12'
+        )}
+        onClick={() => {
+          setProductError(null);
+
+          if (inStock) {
+            addProductToCart();
+          } else {
+            addProductToStockAlertList();
+          }
+        }}
+        data-testid="product-add-to-cart"
+      >
+        {isVariantLoading ? (
+          <Icon
+            name="spinner"
+            size={20}
+            className="animate-spin mr-4 fill-primary"
+          />
+        ) : inStock ? (
+          <span>{t('product.add_to_cart')}</span>
+        ) : (
+          <>
+            <Icon name="bell" size={20} className="mr-4" />
+            <span>{t('product.add_stock_alert')}</span>
+          </>
+        )}
+      </Button>
+
+      <PluginModule
+        component={Component.AkifastCheckoutButton}
+        props={{
+          ...checkoutProviderProps,
+          isPdp: true
+        }}
       />
 
-      <ProductActions
-        product={data.product}
-        variants={data.variants}
-        inStock={inStock}
-        isVariantLoading={isVariantLoading}
-        onAddToCart={addProductToCart}
-        onAddToStockAlert={addProductToStockAlertList}
-        onClearError={clearProductError}
-        isAddToCartLoading={isAddToCartLoading}
-        isAddToStockAlertLoading={isAddToStockAlertLoading}
-        productError={productError}
-        isModalOpen={isModalOpen}
-        stockAlertResponseMessage={stockAlertResponseMessage}
-        onCloseModal={closeModal}
+      <PluginModule
+        component={Component.OneClickCheckoutButtons}
+        props={checkoutProviderProps}
       />
 
       <MiscButtons
@@ -111,7 +261,58 @@ export default function ProductInfo({ data }: ProductPageProps) {
         variants={data.variants}
       />
 
-      <ProductShare productName={data.product.name} className="my-2 sm:mb-4" />
+      <Share
+        className="my-2 sm:mb-4"
+        buttonText={t('product.share')}
+        items={[
+          {
+            href: `https://www.facebook.com/sharer/sharer.php?u=${encodeURIComponent(
+              currentUrl
+            )}`,
+            iconName: 'facebook',
+            iconSize: 22
+          },
+          {
+            href: `https://twitter.com/intent/tweet?text=${encodeURIComponent(
+              currentUrl
+            )}`,
+            iconName: 'twitter',
+            iconSize: 22
+          },
+          {
+            href: `https://api.whatsapp.com/send?text=${
+              data.product.name
+            }%20${encodeURIComponent(currentUrl)}`,
+            iconName: 'whatsapp',
+            iconSize: 22
+          }
+        ]}
+      />
+
+      <Modal
+        portalId="stock-alert-modal"
+        open={isModalOpen}
+        setOpen={setIsModalOpen}
+        showCloseButton={false}
+        className="w-5/6 md:max-w-md"
+      >
+        <div className="flex flex-col items-center justify-center gap-4 px-6 py-9">
+          <Icon name="bell" size={48} />
+          <h2 className="text-xl font-semibold">
+            {t('product.stock_alert.title')}
+          </h2>
+          <div className="max-w-40 text-xs text-center leading-4">
+            <p>{stockAlertResponseMessage}</p>
+          </div>
+          <Button
+            onClick={handleModalClick}
+            appearance="outlined"
+            className="font-semibold px-10 h-12"
+          >
+            {t('product.stock_alert.close_button')}
+          </Button>
+        </div>
+      </Modal>
     </>
   );
 }