@akinon/projectzero 2.0.0-beta.9 → 2.0.1

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

@@ -1,8 +1,8 @@
 'use client';
 
-import { signIn, SignInOptions } from 'next-auth/react';
+import { signIn } from 'next-auth/react';
 import { useState } from 'react';
-import { OtpLoginFormType } from '@theme/types';
+import { OtpLoginFormType, FormType, PzSignInOptions } from '@theme/types';
 import { Button, Input } from '@theme/components';
 import { SubmitHandler, useForm } from 'react-hook-form';
 import * as yup from 'yup';
@@ -47,11 +47,12 @@ export const OtpLogin = () => {
     const loginResponse = await signIn('default', {
       redirect: false,
       callbackUrl: '/',
-      ...data
-    } as SignInOptions);
+      ...data,
+      formType: FormType.otpLogin
+    } as PzSignInOptions & { redirect: false });
 
     if (loginResponse.error) {
-      const errors: AuthError[] = JSON.parse(loginResponse.error);
+      const errors: AuthError[] = JSON.parse(loginResponse.code);
 
       const fieldErrors = errors.find((error) => error.type === 'field_errors')
         ?.data as { name: string; value: string[] }[];
@@ -100,7 +101,11 @@ export const OtpLogin = () => {
         {t('auth.login.title_gsm')}
       </h2>
       <form onSubmit={handleSubmit(onSubmit)}>
-        <input type="hidden" value="otpLogin" {...register('formType')} />
+        <input
+          type="hidden"
+          value={FormType.otpLogin}
+          {...register('formType')}
+        />
         <input type="hidden" value={locale} {...register('locale')} />
 
         <div className="mb-4">

package/app-template/src/views/product/index.ts

@@ -1,6 +1,7 @@
 export { default as PriceWrapper } from './price-wrapper';
 export { default as Variant } from './variant';
 export { default as ProductInfo } from './product-info';
+export { ProductShare } from './product-share';
 export { default as ProductGroupInfo } from './product-group-info';
 export { default as MiscButtons } from './misc-buttons';
 export { default as ProductInfoSlider } from './slider';

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

@@ -1,7 +1,8 @@
 import Breadcrumb from '@theme/views/breadcrumb';
 import { ProductInfoSlider } from '@theme/views/product';
-
+import ThemePlaceholder from '@akinon/pz-theme/src/theme-placeholder';
 import { BreadcrumbResultType, ProductResult } from '@akinon/next/types';
+import { buildProductPageContext } from '@theme/utils/theme-page-context';
 
 interface DeliveryReturnItem {
   product_delivery_returns?: {
@@ -22,19 +23,38 @@ export default async function ProductLayout({
   breadcrumbData,
   children
 }: ProductPageProps) {
+  const productPageContext = buildProductPageContext(data);
+  const categoryIds = breadcrumbData
+    ?.map((item) => item.extra_context?.attributes?.category_id)
+    .filter(Boolean)
+    .join(',');
+
+  const categoryPaths = breadcrumbData
+    ?.map((item) => item.path)
+    .filter(Boolean)
+    .join(',');
+
   return (
-    <div className="container mx-auto">
-      <div className="max-w-5xl mx-auto my-5 px-7">
+    <div className="container mx-auto px-3 py-16 lg:px-0">
+      <div className="my-5">
         <Breadcrumb breadcrumbList={breadcrumbData} />
       </div>
-      <div className="grid max-w-5xl grid-cols-5 lg:gap-8 mx-auto px-7">
-        <div className="col-span-5 lg:col-span-3">
+      <div className="grid grid-cols-5 lg:gap-10 mx-auto">
+        <div className="mb-10 col-span-5 lg:col-span-3 lg:mb-0">
           <ProductInfoSlider product={data.product} />
         </div>
-        <div className="flex flex-col items-center col-span-5 lg:col-span-2">
+        <div
+          className="flex flex-col items-center col-span-5 lg:col-span-2"
+          data-category-ids={categoryIds}
+          data-category-paths={categoryPaths}
+        >
           <div className="w-full">{children}</div>
         </div>
       </div>
+      <ThemePlaceholder
+        slug="product-page-new"
+        pageContext={productPageContext}
+      />
     </div>
   );
 }

package/app-template/src/views/product/price-wrapper.tsx

@@ -2,7 +2,6 @@
 
 import React from 'react';
 import { Price } from '@theme/components';
-import { useLocalization } from '@akinon/next/hooks';
 import { Product } from '@akinon/next/types';
 
 export interface PriceProps {
@@ -11,31 +10,11 @@ export interface PriceProps {
 }
 
 export default function PriceWrapper(props: PriceProps) {
-  const { t } = useLocalization();
-  const { price, retailPrice } = props;
-  const hasRetailPrice = parseFloat(retailPrice) > parseFloat(price);
+  const { price } = props;
 
   return (
-    <div className="flex items-center gap-3 justify-center h-full">
-      <div className="flex flex-col items-end">
-        {hasRetailPrice && (
-          <div>
-            <Price value={retailPrice} className="text-xs line-through" />
-          </div>
-        )}
-        <div className="-mt-2">
-          <Price value={price} className="text-2xl" data-testid="price" />
-        </div>
-      </div>
-
-      {hasRetailPrice && (
-        <div className="flex flex-col items-center w-9 py-0.5 text-xs text-white bg-secondary">
-          <span className="font-bold">
-            {Math.round(100 - (parseInt(price) / parseInt(retailPrice)) * 100)}%
-          </span>
-          <span>{t('product.off')}</span>
-        </div>
-      )}
+    <div className="text-black-750 mb-4">
+      <Price value={price} className="text-[17px]" data-testid="price" />
     </div>
   );
 }

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

@@ -0,0 +1,165 @@
+import React from 'react';
+import clsx from 'clsx';
+import { Button, Icon, Modal } from '@theme/components';
+import { useLocalization } from '@akinon/next/hooks';
+import PluginModule, { Component } from '@akinon/next/components/plugin-module';
+import { validateVariantSelection } from '../../utils/variant-validation';
+import { VariantType } from '@akinon/next/types';
+
+interface Product {
+  pk: number;
+  name: string;
+  [key: string]: any;
+}
+
+interface ProductActionsProps {
+  product: Product;
+  variants: VariantType[];
+  inStock: boolean;
+  isVariantLoading: boolean;
+  onAddToCart: () => void;
+  onAddToStockAlert: () => void;
+  onClearError: () => void;
+  isAddToCartLoading: boolean;
+  isAddToStockAlertLoading: boolean;
+  productError: React.ReactNode | null;
+  isModalOpen: boolean;
+  stockAlertResponseMessage: React.ReactNode | null;
+  onCloseModal: () => void;
+}
+
+export const ProductActions: React.FC<ProductActionsProps> = ({
+  product,
+  variants,
+  inStock,
+  isVariantLoading,
+  onAddToCart,
+  onAddToStockAlert,
+  onClearError,
+  isAddToCartLoading,
+  isAddToStockAlertLoading,
+  productError,
+  isModalOpen,
+  stockAlertResponseMessage,
+  onCloseModal
+}) => {
+  const { t } = useLocalization();
+
+  const checkoutProviderProps = {
+    product,
+    clearBasket: true,
+    addBeforeClick: () => validateVariantSelection(variants).isValid,
+    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: any) => {
+      const formattedError = error?.data?.non_field_errors ||
+        Object.keys(error?.data || {}).map(
+          (key) => `${key}: ${error?.data[key].join(', ')}`
+        );
+      // This would need to be handled by parent component
+      console.error('Checkout error:', formattedError);
+    }
+  };
+
+  const handleMainActionClick = () => {
+    onClearError();
+    
+    if (inStock) {
+      onAddToCart();
+    } else {
+      onAddToStockAlert();
+    }
+  };
+
+  return (
+    <>
+      {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={handleMainActionClick}
+        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
+        }}
+      />
+
+      <PluginModule
+        component={Component.OneClickCheckoutButtons}
+        props={checkoutProviderProps}
+      />
+
+      <Modal
+        portalId="stock-alert-modal"
+        open={isModalOpen}
+        setOpen={onCloseModal}
+        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={onCloseModal}
+            appearance="outlined"
+            className="font-semibold px-10 h-12"
+          >
+            {t('product.stock_alert.close_button')}
+          </Button>
+        </div>
+      </Modal>
+    </>
+  );
+};

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

@@ -1,165 +1,81 @@
 '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';
+import PluginModule, { Component } from '@akinon/next/components/plugin-module';
 
 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(() => {
-    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 {
+    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();
   };
 
-  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;
-  };
+  useEffect(() => {
+    isVariantSelectionComplete(data.variants) && setIsVariantLoading(false);
+    !inStock && setIsVariantLoading(false);
+  }, [data, inStock]);
 
-  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);
+  useEffect(() => {
+    if (isVariantLoading) {
+      clearProductError();
     }
-  };
-
-  const handleModalClick = () => {
-    setIsModalOpen(false);
-  };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [isVariantLoading]);
 
-  const handleSuccess = () => {
-    setStockAlertResponseMessage(() => (
-      <Trans
-        i18nKey="product.stock_alert.success_description"
-        components={{
-          Email: <span>{session?.user?.email}</span>
-        }}
-      />
-    ));
-    setIsModalOpen(true);
-  };
+  useEffect(() => {
+    pushProductViewed(data?.product);
+  }, []); // eslint-disable-line react-hooks/exhaustive-deps
 
-  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 (
     <>
       <div
         className={clsx(
-          'fixed bottom-0 left-0 w-1/2 h-14 z-20 bg-white mt-0 border-t border-gray-500 items-center justify-center',
+          'fixed bottom-0 left-0 w-1/2 h-14 z-[20] bg-white mt-0 border-t border-gray-500 items-center justify-center',
           'sm:relative sm:flex sm:items-center sm:mt-5 sm:border-none'
         )}
       >
@@ -168,121 +84,43 @@ 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)}
-          />
-        ))}
-      </div>
-
-      {productError && (
-        <div className="mt-4 text-xs text-center text-error">
-          {productError}
-        </div>
-      )}
 
-      <Button
-        disabled={isAddToCartLoading || isAddToStockAlertLoading}
-        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);
+      <ProductVariants
+        variants={data.variants}
+        onVariantChange={handleVariantChange}
+      />
 
-          if (inStock) {
-            addProductToCart();
-          } else {
-            addProductToStockAlertList();
-          }
-        }}
-        data-testid="product-add-to-cart"
-      >
-        {inStock ? (
-          <span>{t('product.add_to_cart')}</span>
-        ) : (
-          <>
-            <Icon name="bell" size={20} className="mr-4" />
-            <span>{t('product.add_stock_alert')}</span>
-          </>
-        )}
-      </Button>
+      <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.AkifastCheckoutButton}
+        component={Component.VirtualTryOnPlugin}
         props={{
-          ...checkoutProviderProps,
-          isPdp: true
+          product: data.product,
+          className: 'hidden sm:flex'
         }}
       />
 
-      <PluginModule
-        component={Component.OneClickCheckoutButtons}
-        props={checkoutProviderProps}
-      />
-
       <MiscButtons
         productName={data.product.name}
         productPk={data.product.pk}
         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" />
     </>
   );
 }