@akinon/projectzero 1.106.0 → 1.107.0-rc.86

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

@@ -1,178 +1,73 @@
 'use client';
 
 import clsx from 'clsx';
-import { Button, Icon, Modal } from '@theme/components';
-import { useAddProductToBasket } from '../../hooks';
 import React, { useEffect, useState } from 'react';
-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 { PriceWrapper } from '@theme/views/product';
 import { ProductPageProps } from './layout';
 import MiscButtons from './misc-buttons';
-import { useLocalization } from '@akinon/next/hooks';
-import PluginModule, { Component } from '@akinon/next/components/plugin-module';
-import { Trans } from '@akinon/next/components/trans';
+import { pushProductViewed } from '@theme/utils/gtm';
 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;
 
-  useEffect(() => {
-    isVariantSelectionComplete() && setIsVariantLoading(false);
+  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);
     !inStock && setIsVariantLoading(false);
-  }, [data]); // eslint-disable-line react-hooks/exhaustive-deps
+  }, [data, inStock]);
 
   useEffect(() => {
     if (isVariantLoading) {
-      setProductError(null);
+      clearProductError();
     }
     // 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 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(', ')}`
-          )
-      )
+  const handleVariantChange = () => {
+    clearProductError();
+    setIsVariantLoading(true);
   };
 
   return (
@@ -188,72 +83,26 @@ 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>
-
-      {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
-        }}
+      <ProductVariants
+        variants={data.variants}
+        onVariantChange={handleVariantChange}
       />
 
-      <PluginModule
-        component={Component.OneClickCheckoutButtons}
-        props={checkoutProviderProps}
+      <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}
       />
 
       <MiscButtons
@@ -262,58 +111,7 @@ export default function ProductInfo({ data }: ProductPageProps) {
         variants={data.variants}
       />
 
-      <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>
+      <ProductShare productName={data.product.name} className="my-2 sm:mb-4" />
     </>
   );
 }

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

@@ -0,0 +1,56 @@
+import React, { useState, useEffect } from 'react';
+import Share from '@theme/views/share';
+import { useLocalization } from '@akinon/next/hooks';
+
+interface ProductShareProps {
+  productName: string;
+  className?: string;
+}
+
+export const ProductShare: React.FC<ProductShareProps> = ({
+  productName,
+  className
+}) => {
+  const { t } = useLocalization();
+  const [currentUrl, setCurrentUrl] = useState<string | null>(null);
+
+  useEffect(() => {
+    setCurrentUrl(window.location.href);
+  }, []);
+
+  if (!currentUrl) {
+    return null;
+  }
+
+  const shareItems = [
+    {
+      href: `https://www.facebook.com/sharer/sharer.php?u=${encodeURIComponent(
+        currentUrl
+      )}`,
+      iconName: 'facebook' as const,
+      iconSize: 22
+    },
+    {
+      href: `https://twitter.com/intent/tweet?text=${encodeURIComponent(
+        currentUrl
+      )}`,
+      iconName: 'twitter' as const,
+      iconSize: 22
+    },
+    {
+      href: `https://api.whatsapp.com/send?text=${productName}%20${encodeURIComponent(
+        currentUrl
+      )}`,
+      iconName: 'whatsapp' as const,
+      iconSize: 22
+    }
+  ];
+
+  return (
+    <Share
+      className={className}
+      buttonText={t('product.share')}
+      items={shareItems}
+    />
+  );
+};

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

@@ -0,0 +1,26 @@
+import React from 'react';
+import { Variant } from '@theme/views/product';
+import { VariantType } from '@akinon/next/types';
+
+interface ProductVariantsProps {
+  variants: VariantType[];
+  onVariantChange: () => void;
+}
+
+export const ProductVariants: React.FC<ProductVariantsProps> = ({
+  variants,
+  onVariantChange
+}) => {
+  return (
+    <div className="flex flex-col">
+      {variants.map((variant) => (
+        <Variant
+          key={variant.attribute_key}
+          {...variant}
+          className="items-center mt-8"
+          onChange={onVariantChange}
+        />
+      ))}
+    </div>
+  );
+};

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

@@ -7,6 +7,7 @@ import { Product } from '@akinon/next/types';
 import { Image } from '@akinon/next/components/image';
 import useFavButton from '../../hooks/use-fav-button';
 import { twMerge } from 'tailwind-merge';
+import PluginModule, { Component } from '@akinon/next/components/plugin-module';
 
 type ProductSliderItem = {
   product: Product;
@@ -35,90 +36,102 @@ export default function ProductInfoSlider({ product }: ProductSliderItem) {
     carouselRef.current?.next();
   };
 
-  const handleThumbnailClick = (index) => {
+  const handleThumbnailClick = (index: number) => {
     setActiveIndex(index);
     carouselRef.current?.goToSlide(index);
   };
 
   return (
-    <div className="lg:grid lg:grid-cols-6">
-      <div className="lg:col-span-1">
-        <div className="flex flex-col items-center justify-center md:mr-[6px]">
-          <button
-            onClick={goToPrev}
-            className={twMerge(
-              'hidden justify-center p-2 mb-3 border border-gray-100 rounded-full cursor-pointer lg:block',
-              [activeIndex === 0 && 'cursor-not-allowed opacity-45']
-            )}
-            disabled={activeIndex === 0}
+    <>
+      <div className="lg:grid lg:grid-cols-6">
+        <div className="lg:col-span-1">
+          <div className="flex flex-col items-center justify-center md:mr-[6px]">
+            <button
+              onClick={goToPrev}
+              className={twMerge(
+                'hidden justify-center p-2 mb-3 border border-gray-100 rounded-full cursor-pointer lg:block',
+                [activeIndex === 0 && 'cursor-not-allowed opacity-45']
+              )}
+              disabled={activeIndex === 0}
+            >
+              <Icon name="chevron-up" size={15} className="fill-[#000000]" />
+            </button>
+            <div className="hidden flex-col items-center overflow-scroll w-[80px] max-h-[620px] lg:block">
+              {product?.productimage_set?.map((item, index) => (
+                <Image
+                  key={index}
+                  src={item.image}
+                  alt={`Thumbnail ${index}`}
+                  width={80}
+                  height={128}
+                  aspectRatio={80 / 128}
+                  className={twMerge('cursor-pointer', [
+                    activeIndex === index && 'border-2 border-primary'
+                  ])}
+                  onClick={() => handleThumbnailClick(index)}
+                />
+              ))}
+            </div>
+            <button
+              onClick={goToNext}
+              className={twMerge(
+                'hidden justify-center p-2 mt-3 border border-gray-100 rounded-full cursor-pointer lg:block',
+                [
+                  activeIndex === product.productimage_set.length - 1 &&
+                    'cursor-not-allowed opacity-45'
+                ]
+              )}
+              disabled={activeIndex === product.productimage_set.length - 1}
+            >
+              <Icon name="chevron-down" size={15} className="fill-[#000000]" />
+            </button>
+          </div>
+        </div>
+
+        <div className="relative lg:col-span-5">
+          <FavButton className="absolute right-8 top-6 z-[20] sm:hidden" />
+
+          <PluginModule
+            component={Component.ProductImageSearchFeature}
+            props={{
+              product,
+              activeIndex,
+              showResetButton: true
+            }}
+          />
+
+          <CarouselCore
+            responsive={{
+              all: {
+                breakpoint: { max: 5000, min: 0 },
+                items: 1
+              }
+            }}
+            arrows={false}
+            swipeable={true}
+            ref={carouselRef}
+            afterChange={(previousSlide, { currentSlide }) => {
+              setActiveIndex(currentSlide);
+            }}
+            containerAspectRatio={{ mobile: 520 / 798, desktop: 484 / 726 }}
           >
-            <Icon name="chevron-up" size={15} className="fill-[#000000]" />
-          </button>
-          <div className="hidden flex-col items-center overflow-scroll w-[80px] max-h-[620px] lg:block">
-            {product?.productimage_set?.map((item, index) => (
+            {product?.productimage_set?.map((item, i) => (
               <Image
-                key={index}
+                key={i}
                 src={item.image}
-                alt={`Thumbnail ${index}`}
-                width={80}
-                height={128}
-                className={twMerge('cursor-pointer', [
-                  activeIndex === index && 'border-2 border-primary'
-                ])}
-                onClick={() => handleThumbnailClick(index)}
+                alt={product?.name || 'Product image'}
+                draggable={false}
+                aspectRatio={484 / 726}
+                sizes="(min-width: 425px) 512px,
+              (min-width: 601px) 576px,
+              (min-width: 768px) 336px,
+              (min-width: 1024px) 484px, 368px"
+                fill
               />
             ))}
-          </div>
-          <button
-            onClick={goToNext}
-            className={twMerge(
-              'hidden justify-center p-2 mt-3 border border-gray-100 rounded-full cursor-pointer lg:block',
-              [
-                activeIndex === product.productimage_set.length - 1 &&
-                  'cursor-not-allowed opacity-45'
-              ]
-            )}
-            disabled={activeIndex === product.productimage_set.length - 1}
-          >
-            <Icon name="chevron-down" size={15} className="fill-[#000000]" />
-          </button>
+          </CarouselCore>
         </div>
       </div>
-
-      <div className="relative lg:col-span-5">
-        <FavButton className="absolute right-8 top-6 z-[20] sm:hidden" />
-
-        <CarouselCore
-          responsive={{
-            all: {
-              breakpoint: { max: 5000, min: 0 },
-              items: 1
-            }
-          }}
-          arrows={false}
-          swipeable={true}
-          ref={carouselRef}
-          afterChange={(previousSlide, { currentSlide }) => {
-            setActiveIndex(currentSlide);
-          }}
-          containerAspectRatio={{ mobile: 520 / 798, desktop: 484 / 726 }}
-        >
-          {product?.productimage_set?.map((item, i) => (
-            <Image
-              key={i}
-              src={item.image}
-              alt={product.name}
-              draggable={false}
-              aspectRatio={484 / 726}
-              sizes="(min-width: 425px) 512px,
-            (min-width: 601px) 576px,
-            (min-width: 768px) 336px,
-            (min-width: 1024px) 484px, 368px"
-              fill
-            />
-          ))}
-        </CarouselCore>
-      </div>
-    </div>
+    </>
   );
 }

package/commands/plugins.ts

@@ -29,7 +29,14 @@ async function checkVersion(pkg: PackageJson) {
 
     if (!semver.satisfies(pkg.dependencies['@akinon/next'], latestVersion)) {
       console.warn(
-        `\x1b[43mWarning: The "${packageName}" package is currently at version ${pkg.dependencies['@akinon/next']}. Please upgrade it to the latest version (${latestVersion}) to ensure plugin compatibility.`,
+        `\x1b[43m Warning: The "${packageName}" package is currently at`,
+        `\x1b[41m version ${pkg.dependencies['@akinon/next']}`,
+        `\x1b[43m Please upgrade it to the latest version (${latestVersion}) to ensure plugin compatibility.`,
+        '\x1b[0m\n'
+      );
+    } else {
+      console.log(
+        `\x1b[42m Info: The package "${packageName}" is currently in the current version (${latestVersion}).`,
         '\x1b[0m\n'
       );
     }
@@ -54,7 +61,27 @@ export default async () => {
     }
   }
 
-  const pkg: PackageJson = require(path.resolve(rootDir, './package.json'));
+  function findPackageJson(): PackageJson {
+    const packageJsonPaths = [
+      path.resolve(rootDir, './package.json'),
+      path.resolve(rootDir, './apps/projectzeronext/package.json')
+    ];
+
+    for (const packageJsonPath of packageJsonPaths) {
+      try {
+        const pkg = require(packageJsonPath);
+        if (pkg.dependencies['@akinon/next']) {
+          return pkg;
+        }
+      } catch (error) {
+        continue;
+      }
+    }
+
+    throw new Error('Could not find package.json with @akinon/next dependency');
+  }
+
+  const pkg = findPackageJson();
   await checkVersion(pkg);
 
   const pluginsFilePath = findPluginsFilePath();