@akinon/projectzero 2.0.0-beta.2 → 2.0.0-beta.21

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';
@@ -10,9 +10,10 @@ import { yupResolver } from '@hookform/resolvers/yup';
 import clsx from 'clsx';
 import { useLocalization } from '@akinon/next/hooks';
 import { useOtpLoginMutation } from '@akinon/next/data/client/user';
-import { useAppSelector } from '@akinon/next/redux/hooks';
+import { useAppDispatch, useAppSelector } from '@akinon/next/redux/hooks';
 import PluginModule, { Component } from '@akinon/next/components/plugin-module';
 import { AuthError } from '@akinon/next/types';
+import { showPopup } from '@akinon/pz-otp/src/redux/reducer';
 
 const loginFormSchema = (t) =>
   yup.object().shape({
@@ -25,9 +26,9 @@ const loginFormSchema = (t) =>
   });
 
 export const OtpLogin = () => {
+  const dispatch = useAppDispatch();
   const { user_phone_format } = useAppSelector((state) => state.config);
   const { t, locale } = useLocalization();
-  const [showOtpModal, setShowOtpModal] = useState(false);
   const [otpLoginMutation] = useOtpLoginMutation();
 
   const {
@@ -46,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[] }[];
@@ -79,7 +81,7 @@ export const OtpLogin = () => {
     })
       .unwrap()
       .then(() => {
-        setShowOtpModal(true);
+        dispatch(showPopup());
       })
       .catch((error) => {
         if (error.status === 429) {
@@ -99,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">
@@ -136,17 +142,14 @@ export const OtpLogin = () => {
         </Button>
       </form>
 
-      {showOtpModal && (
-        <PluginModule
-          component={Component.Otp}
-          props={{
-            setShowPopup: setShowOtpModal,
-            data: getValues(),
-            submitAction: loginHandler,
-            error: formError
-          }}
-        />
-      )}
+      <PluginModule
+        component={Component.Otp}
+        props={{
+          data: getValues(),
+          submitAction: loginHandler,
+          error: formError
+        }}
+      />
     </section>
   );
 };

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>
+    </>
+  );
+};