@akinon/projectzero 2.0.0-beta.12 → 2.0.0-beta.14

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

@@ -36,9 +36,7 @@ export const UserMenu = (props: UserMenuProps) => {
     <ul
       className={clsx(
         'items-center divide-x divide-black',
-        isMobile
-          ? 'flex pt-2 text-sm pb-6 border-b border-gray-200 mx-8'
-          : 'hidden sm:flex'
+        isMobile ? 'flex pt-2 text-sm pb-6 border-b mx-8' : 'hidden sm:flex'
       )}
       id="user-menu"
     >

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

@@ -1,10 +1,10 @@
 'use client';
 
-import { signIn, SignInOptions } from 'next-auth/react';
+import { signIn } from 'next-auth/react';
 import { useSearchParams } from 'next/navigation';
 import { useState } from 'react';
 import { ROUTES } from '@theme/routes';
-import { LoginFormType } from '@theme/types';
+import { LoginFormType, FormType, PzSignInOptions } from '@theme/types';
 import { Button, Input, Link } from '@theme/components';
 import { SubmitHandler, useForm } from 'react-hook-form';
 import * as yup from 'yup';
@@ -79,11 +79,12 @@ export const Login = () => {
       redirect: false,
       callbackUrl: searchParams.get('callbackUrl') ?? '/',
       captchaValidated,
-      ...data
-    } as SignInOptions);
+      ...data,
+      formType: FormType.login
+    } as PzSignInOptions & { redirect: false });
 
     if (loginResponse.error) {
-      const errors: AuthError[] = JSON.parse(loginResponse.error);
+      const errors: AuthError[] = JSON.parse(loginResponse.code);
 
       if (errors.find((error) => error.type === 'captcha')) {
         if (await validateCaptcha()) {
@@ -109,25 +110,25 @@ export const Login = () => {
           try {
             parsedValue = JSON.parse(item.value);
           } catch {
-            parsedValue = [item.value]; 
+            parsedValue = [item.value];
           }
         } else {
-          parsedValue = item.value; 
+          parsedValue = item.value;
         }
 
         if (Array.isArray(parsedValue)) {
           setError(item.name as keyof LoginFormType, {
             type: 'custom',
-            message: parsedValue.join(', '),
+            message: parsedValue.join(', ')
           });
         } else {
           Object.keys(parsedValue).forEach((key) => {
             const fieldName = key as keyof LoginFormType;
             const errorMessages = parsedValue[key] as string[];
-    
+
             setError(fieldName, {
               type: 'custom',
-              message: errorMessages.join(', '),
+              message: errorMessages.join(', ')
             });
           });
         }
@@ -161,7 +162,7 @@ export const Login = () => {
         method="post"
         onSubmit={handleSubmit(onSubmit)}
       >
-        <input type="hidden" value="login" {...register('formType')} />
+        <input type="hidden" value={FormType.login} {...register('formType')} />
         <input type="hidden" value={locale} {...register('locale')} />
 
         <div className={clsx(errors.email ? 'mb-8' : 'mb-4')}>
@@ -219,7 +220,7 @@ export const Login = () => {
           {t('auth.login.form.submit')}
         </Button>
 
-        <p className="relative text-gray-600 text-center my-4 before:absolute before:h-[1px] before:w-5/12 before:bg-gray-600/25 before:top-1/2 before:left-0 after:absolute after:h-[1px] after:w-5/12 after:bg-gray-600/25 after:top-1/2 after:right-0">
+        <p className="relative text-gray-600 text-center my-4 before:absolute before:h-[1px] before:w-5/12 before:bg-gray-600 before:bg-opacity-25 before:top-1/2 before:left-0 after:absolute after:h-[1px] after:w-5/12 after:bg-gray-600 after:bg-opacity-25 after:top-1/2 after:right-0">
           {t('auth.login.form.or')}
         </p>
 
@@ -248,7 +249,7 @@ export const Login = () => {
                 alt={provider.label}
                 width={provider.label === 'Facebook' ? 10 : 18}
                 height={18}
-                className="shrink-0"
+                className="flex-shrink-0"
               />
             )}
 

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/layout.tsx

@@ -22,6 +22,16 @@ export default async function ProductLayout({
   breadcrumbData,
   children
 }: ProductPageProps) {
+  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">
@@ -31,7 +41,11 @@ export default async function ProductLayout({
         <div className="col-span-5 lg:col-span-3">
           <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>

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