@akinon/projectzero 1.102.0 → 1.103.0-rc.81

package/app-template/src/components/generate-form-fields.tsx

@@ -7,6 +7,7 @@ import { useForm } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import * as yup from 'yup';
 import DynamicForm from './dynamic-form';
+
 import {
   AllFieldClassesType,
   FieldPropertiesType,
@@ -14,6 +15,7 @@ import {
   FormPropertiesType,
   Schema
 } from '@akinon/next/types';
+import { useLocalization } from '@akinon/next/hooks';
 
 export function GenerateFormFields({
   schema,
@@ -28,8 +30,14 @@ export function GenerateFormFields({
   formProperties: FormPropertiesType;
   submitButtonText: string;
 }) {
+  const { t } = useLocalization();
   const [fields, setFields] = useState([]);
   const [loading, setIsLoading] = useState(true);
+  const [isSubmitting, setIsSubmitting] = useState(false);
+  const [submitStatus, setSubmitStatus] = useState<
+    'idle' | 'success' | 'error'
+  >('idle');
+  const [submitMessage, setSubmitMessage] = useState('');
 
   const generateValidationSchema = () => {
     const schemaObject = {};
@@ -80,6 +88,7 @@ export function GenerateFormFields({
   const {
     handleSubmit,
     register,
+    reset,
     formState: { errors }
   } = useForm<FormField>({
     resolver: yupResolver(generateValidationSchema())
@@ -108,6 +117,10 @@ export function GenerateFormFields({
   }, [schema, fieldProperties]);
 
   const onSubmit = async (data) => {
+    setIsSubmitting(true);
+    setSubmitStatus('idle');
+    setSubmitMessage('');
+
     try {
       const formData = new FormData();
 
@@ -115,12 +128,25 @@ export function GenerateFormFields({
         formData.append(key, data[key]);
       });
 
-      fetch(formProperties.actionUrl, {
+      const response = await fetch(formProperties.actionUrl, {
         method: 'POST',
         body: formData
       });
+
+      if (response.ok) {
+        setSubmitStatus('success');
+        setSubmitMessage(t('common.forms.success'));
+        reset();
+      } else {
+        setSubmitStatus('error');
+        setSubmitMessage(t('common.forms.error'));
+      }
     } catch (error) {
-      console.error('Form submit error:', error);
+      console.error(t('common.forms.submit_error'), error);
+      setSubmitStatus('error');
+      setSubmitMessage(t('common.forms.error'));
+    } finally {
+      setIsSubmitting(false);
     }
   };
 
@@ -337,9 +363,22 @@ export function GenerateFormFields({
           <LoaderSpinner />
         ) : (
           <>
+            {submitStatus === 'success' && (
+              <div className="mb-4 p-3 bg-green-100 border border-green-400 text-green-700 rounded">
+                {submitMessage}
+              </div>
+            )}
+
+            {submitStatus === 'error' && (
+              <div className="mb-4 p-3 bg-red-100 border border-red-400 text-red-700 rounded">
+                {submitMessage}
+              </div>
+            )}
+
             {fields.map((field: FormField) => generateField(field))}
-            <Button type="submit" className="w-full">
-              {submitButtonText}
+
+            <Button type="submit" className="w-full" disabled={isSubmitting}>
+              {isSubmitting ? t('common.forms.sending') : submitButtonText}
             </Button>
           </>
         )}

package/app-template/src/components/input.tsx

@@ -48,7 +48,13 @@ export const Input = forwardRef<
     props.className
   );
 
-  const inputProps: any = {
+  const inputProps: {
+    id?: string;
+    ref?: Ref<HTMLInputElement>;
+    className?: string;
+    onFocus?: () => void;
+    onBlur?: (event: FocusEvent<HTMLInputElement>) => void;
+  } = {
     id,
     ref,
     className: inputClass,
@@ -72,7 +78,8 @@ export const Input = forwardRef<
               hasFloatingLabel,
             'mb-2': !hasFloatingLabel,
             '-translate-y-2 bg-white inline-flex h-auto':
-              hasFloatingLabel && (focused || hasValue)
+              hasFloatingLabel &&
+              (focused || hasValue || props.value || props.format)
           })
         )}
       >

package/app-template/src/components/modal.tsx

@@ -4,16 +4,7 @@ import ReactPortal from './react-portal';
 import { Icon } from './icon';
 import { twMerge } from 'tailwind-merge';
 import { useEffect } from 'react';
-
-export interface ModalProps {
-  portalId: string;
-  children?: React.ReactNode;
-  open?: boolean;
-  setOpen?: (open: boolean) => void;
-  title?: React.ReactNode;
-  showCloseButton?: React.ReactNode;
-  className?: string;
-}
+import { ModalProps } from '@theme/types';
 
 export const Modal = (props: ModalProps) => {
   const {
@@ -23,7 +14,14 @@ export const Modal = (props: ModalProps) => {
     setOpen,
     title = '',
     showCloseButton = true,
-    className
+    className,
+    overlayClassName,
+    headerWrapperClassName,
+    titleClassName,
+    closeButtonClassName,
+    iconName = 'close',
+    iconSize = 16,
+    iconClassName
   } = props;
 
   useEffect(() => {
@@ -38,7 +36,12 @@ export const Modal = (props: ModalProps) => {
 
   return (
     <ReactPortal wrapperId={portalId}>
-      <div className="fixed top-0 left-0 w-screen h-screen bg-primary bg-opacity-60 z-50" />
+      <div
+        className={twMerge(
+          'fixed top-0 left-0 w-screen h-screen bg-primary bg-opacity-60 z-50',
+          overlayClassName
+        )}
+      />
       <section
         className={twMerge(
           'fixed top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 z-50 bg-white',
@@ -46,15 +49,28 @@ export const Modal = (props: ModalProps) => {
         )}
       >
         {(showCloseButton || title) && (
-          <div className="flex px-6 py-4 border-b border-gray-400">
-            {title && <h3 className="text-lg font-light">{title}</h3>}
+          <div
+            className={twMerge(
+              'flex px-6 py-4 border-b border-gray-400',
+              headerWrapperClassName
+            )}
+          >
+            {title && (
+              <h3 className={twMerge('text-lg font-light', titleClassName)}>
+                {title}
+              </h3>
+            )}
             {showCloseButton && (
               <button
                 type="button"
                 onClick={() => setOpen(false)}
-                className="ml-auto"
+                className={twMerge('ml-auto', closeButtonClassName)}
               >
-                <Icon name="close" size={16} />
+                <Icon
+                  name={iconName}
+                  size={iconSize}
+                  className={iconClassName}
+                />
               </button>
             )}
           </div>

package/app-template/src/components/pagination.tsx

@@ -125,6 +125,7 @@ export const Pagination = (props: PaginationProps) => {
       setPrevPage(1);
       setNextPage(1);
     }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [page]);
 
   useEffect(() => {

package/app-template/src/components/price.tsx

@@ -56,7 +56,7 @@ export const Price = (props: NumericFormatProps & PriceProps) => {
 
   const currentCurrencyDecimalScale = Settings.localization.currencies.find(
     (currency) => currency.code === currencyCode_
-  ).decimalScale;
+  )?.decimalScale;
 
   return (
     <NumericFormat

package/app-template/src/components/select.tsx

@@ -14,14 +14,18 @@ const Select = forwardRef<HTMLSelectElement, SelectProps>((props, ref) => {
     error,
     label,
     required = false,
+    labelClassName,
     ...rest
   } = props;
 
   return (
     <label
-      className={clsx('flex flex-col relative text-xs text-gray-800', {
-        'pl-7': icon
-      })}
+      className={twMerge(
+        clsx('flex flex-col relative text-xs text-gray-800', {
+          'pl-7': icon
+        }),
+        labelClassName
+      )}
     >
       {icon && (
         <Icon
@@ -32,32 +36,40 @@ const Select = forwardRef<HTMLSelectElement, SelectProps>((props, ref) => {
       )}
 
       {label && (
-        <span className="mb-1">
+        <span className={twMerge('mb-1', labelClassName)}>
           {label} {required && <span className="text-secondary">*</span>}
         </span>
       )}
-      <select
-        {...rest}
-        ref={ref}
-        className={twMerge(
-          clsx(
-            'cursor-pointer truncate h-10 w-40 px-2.5 shrink-0 outline-none',
-            !borderless &&
-              'border border-gray-200 transition-all duration-150 hover:border-primary'
-          ),
-          className
-        )}
-      >
-        {options?.map((option) => (
-          <option
-            key={option.value}
-            value={option.value}
-            className={option.class}
-          >
-            {option.label}
-          </option>
-        ))}
-      </select>
+      <div className="relative">
+        <select
+          {...rest}
+          ref={ref}
+          className={twMerge(
+            clsx(
+              'cursor-pointer truncate h-10 w-40 px-2.5 shrink-0 outline-none',
+              !borderless &&
+                'border border-gray-200 transition-all duration-150 hover:border-primary',
+              'appearance-none bg-transparent'
+            ),
+            className
+          )}
+        >
+          {options?.map((option) => (
+            <option
+              key={option.value}
+              value={option.value}
+              className={option.class}
+            >
+              {option.label}
+            </option>
+          ))}
+        </select>
+        <div className="pointer-events-none absolute inset-y-0 right-0 flex items-center px-2 text-gray-700">
+          <svg className="h-4 w-4 fill-current" viewBox="0 0 20 20">
+            <path d="M9.293 12.95l.707.707L15.657 8l-1.414-1.414L10 10.828 5.757 6.586 4.343 8z" />
+          </svg>
+        </div>
+      </div>
       {error && (
         <span className="mt-1 text-sm text-error">{error.message}</span>
       )}

package/app-template/src/components/types/index.ts

@@ -29,7 +29,13 @@ export interface PaginationProps {
   isLoading?: boolean;
 }
 
-export type FileInputProps = React.HTMLProps<HTMLInputElement>;
+export interface FileInputProps extends React.HTMLProps<HTMLInputElement> {
+  fileClassName?: string;
+  fileNameWrapperClassName?: string;
+  fileInputClassName?: string;
+  onChange?: (event: React.ChangeEvent<HTMLInputElement>) => void;
+  buttonClassName?: string;
+}
 
 export type RadioProps = React.HTMLProps<HTMLInputElement>;
 
@@ -58,6 +64,7 @@ export interface SelectProps extends React.HTMLProps<HTMLSelectElement> {
   iconSize?: number;
   error?: FieldError | undefined;
   required?: boolean;
+  labelClassName?: string;
 }
 export interface IconProps extends React.ComponentPropsWithRef<'i'> {
   name: string;
@@ -91,3 +98,20 @@ export interface BadgeProps {
   children: ReactNode;
   className?: string;
 }
+
+export type AccordionProps = {
+  isCollapse?: boolean;
+  collapseClassName?: string;
+  title?: string;
+  subTitle?: string;
+  icons?: string[];
+  iconSize?: number;
+  iconColor?: string;
+  children?: ReactNode;
+  headerClassName?: string;
+  className?: string;
+  titleClassName?: string;
+  subTitleClassName?: string;
+  dataTestId?: string;
+  contentClassName?: string;
+};

package/app-template/src/hooks/index.ts

@@ -1 +1,3 @@
+export * from './use-contract';
+export * from './use-fav-button';
 export * from './use-add-product-to-basket';

package/app-template/src/hooks/use-product-cart.ts

@@ -0,0 +1,77 @@
+import { useState } from 'react';
+import { useAddProductToBasket } from './index';
+import { pushAddToCart } from '@theme/utils/gtm';
+import { validateVariantSelection } from '../utils/variant-validation';
+import { VariantType } from '@akinon/next/types';
+
+interface Product {
+  pk: number;
+  [key: string]: any;
+}
+
+interface UseProductCartProps {
+  product: Product;
+  variants: VariantType[];
+}
+
+interface AddToCartError {
+  data?: {
+    non_field_errors?: string[];
+    [key: string]: string[];
+  };
+}
+
+export const useProductCart = ({ product, variants }: UseProductCartProps) => {
+  const [productError, setProductError] = useState<React.ReactNode | null>(null);
+  const [addProduct, { isLoading: isAddToCartLoading }] = useAddProductToBasket();
+
+  const formatError = (error: AddToCartError) => {
+    if (error?.data?.non_field_errors) {
+      return error.data.non_field_errors;
+    }
+    
+    if (error?.data) {
+      return Object.keys(error.data).map(
+        (key) => `${key}: ${error.data[key].join(', ')}`
+      );
+    }
+    
+    return 'An error occurred';
+  };
+
+  const addProductToCart = async () => {
+    const validation = validateVariantSelection(variants);
+    
+    if (!validation.isValid) {
+      setProductError(validation.errorMessage);
+      return false;
+    }
+
+    try {
+      await addProduct({
+        product: product.pk,
+        quantity: 1,
+        attributes: {}
+      });
+
+      pushAddToCart(product);
+      setProductError(null);
+      return true;
+    } catch (error) {
+      const formattedError = formatError(error as AddToCartError);
+      setProductError(formattedError);
+      return false;
+    }
+  };
+
+  const clearProductError = () => {
+    setProductError(null);
+  };
+
+  return {
+    addProductToCart,
+    productError,
+    clearProductError,
+    isAddToCartLoading
+  };
+};

package/app-template/src/hooks/use-stock-alert.ts

@@ -0,0 +1,74 @@
+import React, { useState } from 'react';
+import { useAddStockAlertMutation } from '@akinon/next/data/client/wishlist';
+import { Trans } from '@akinon/next/components/trans';
+import { useLocalization } from '@akinon/next/hooks';
+
+interface UseStockAlertProps {
+  productPk: number;
+  userEmail?: string;
+}
+
+export const useStockAlert = ({ productPk, userEmail }: UseStockAlertProps) => {
+  const { t } = useLocalization();
+  const [isModalOpen, setIsModalOpen] = useState(false);
+  const [stockAlertResponseMessage, setStockAlertResponseMessage] = useState<React.ReactNode | null>(null);
+  const [productError, setProductError] = useState<React.ReactNode | null>(null);
+  
+  const [addStockAlert, { isLoading: isAddToStockAlertLoading }] = useAddStockAlertMutation();
+
+  const handleSuccess = () => {
+    setStockAlertResponseMessage(React.createElement(
+      Trans,
+      {
+        i18nKey: "product.stock_alert.success_description",
+        components: {
+          Email: React.createElement('span', {}, userEmail)
+        }
+      }
+    ));
+    setIsModalOpen(true);
+    setProductError(null);
+  };
+
+  const handleError = (err: any) => {
+    if (err.status !== 401) {
+      setStockAlertResponseMessage(
+        t('product.stock_alert.error_description').toString()
+      );
+      setIsModalOpen(true);
+    }
+  };
+
+  const addProductToStockAlertList = async () => {
+    try {
+      await addStockAlert({
+        productPk,
+        email: userEmail
+      })
+        .unwrap()
+        .then(handleSuccess)
+        .catch(handleError);
+    } catch (error: any) {
+      setProductError(error?.data?.non_field_errors || null);
+    }
+  };
+
+  const closeModal = () => {
+    setIsModalOpen(false);
+  };
+
+  const clearError = () => {
+    setProductError(null);
+  };
+
+  return {
+    addProductToStockAlertList,
+    isModalOpen,
+    setIsModalOpen,
+    stockAlertResponseMessage,
+    productError,
+    isAddToStockAlertLoading,
+    closeModal,
+    clearError
+  };
+};

package/app-template/src/plugins.js

@@ -14,5 +14,7 @@ module.exports = [
   'pz-akifast',
   'pz-saved-card',
   'pz-tabby-extension',
-  'pz-tamara-extension'
+  'pz-tamara-extension',
+  'pz-hepsipay',
+  'pz-similar-products'
 ];

package/app-template/src/settings.js

@@ -1,6 +1,10 @@
 const { LocaleUrlStrategy } = require('@akinon/next/localization');
 const { ROUTES } = require('@theme/routes');
 
+/* IMPORTANT *
+ * In order to use one locale in the locales array and hide the default locale in the URL, you need to set the localeUrlStrategy to LocaleUrlStrategy.ShowAllLocales.
+ */
+
 const commerceUrl = encodeURI(process.env.SERVICE_BACKEND_URL ?? 'default');
 
 /** @type {import('@akinon/next/types').Settings} */
@@ -14,6 +18,7 @@ module.exports = {
     { translationKey: 'size', key: 'size' }
   ],
   localization: {
+    // If there is one locale in the locales array, the default locale will be hidden in the URL.
     locales: [
       {
         label: 'EN',
@@ -41,7 +46,7 @@ module.exports = {
       }
     ],
     defaultLocaleValue: 'en',
-    localeUrlStrategy: LocaleUrlStrategy.HideDefaultLocale,
+    localeUrlStrategy: LocaleUrlStrategy.HideDefaultLocale, // If there is one locale in the locales array, the default locale will be hidden in the URL and localeUrlStrategy should be set to LocaleUrlStrategy.ShowAllLocales.
     redirectToDefaultLocale: true,
     defaultCurrencyCode: 'usd'
   },
@@ -62,5 +67,6 @@ module.exports = {
   redis: {
     defaultExpirationTime: 900 // 15 min
   },
-  customNotFoundEnabled: false
+  customNotFoundEnabled: false,
+  commerceRedirectionIgnoreList: ['/users/reset']
 };

package/app-template/src/types/index.ts

@@ -125,3 +125,20 @@ export interface SeoProps {
   ogPriceAmount?: string;
   ogPriceCurrency?: string;
 }
+
+export interface ModalProps {
+  portalId: string;
+  children?: React.ReactNode;
+  open?: boolean;
+  setOpen?: (open: boolean) => void;
+  title?: React.ReactNode;
+  showCloseButton?: React.ReactNode;
+  className?: string;
+  overlayClassName?: string;
+  headerWrapperClassName?: string;
+  titleClassName?: string;
+  closeButtonClassName?: string;
+  iconName?: string;
+  iconSize?: number;
+  iconClassName?: string;
+}

package/app-template/src/utils/variant-validation.ts

@@ -0,0 +1,41 @@
+import React from 'react';
+import { Trans } from '@akinon/next/components/trans';
+import { VariantType } from '@akinon/next/types';
+
+export const isVariantSelectionComplete = (variants: VariantType[]): boolean => {
+  return variants?.every((variant) =>
+    variant?.options.some((opt) => opt.is_selected)
+  );
+};
+
+export const getUnselectedVariant = (variants: VariantType[]): VariantType | undefined => {
+  return variants.find((variant) =>
+    variant.options.every((opt) => !opt.is_selected)
+  );
+};
+
+export const createVariantErrorMessage = (unselectedVariant: VariantType) => {
+  const TransComponent = Trans as any;
+  return React.createElement(
+    TransComponent,
+    {
+      i18nKey: "product.please_select_variant",
+      components: {
+        VariantName: React.createElement('span', {}, unselectedVariant.attribute_name)
+      }
+    }
+  );
+};
+
+export const validateVariantSelection = (variants: VariantType[]) => {
+  const unselectedVariant = getUnselectedVariant(variants);
+  
+  if (unselectedVariant) {
+    return {
+      isValid: false,
+      errorMessage: createVariantErrorMessage(unselectedVariant)
+    };
+  }
+
+  return { isValid: true, errorMessage: null };
+};

package/app-template/src/views/account/address-form.tsx

@@ -259,23 +259,25 @@ export const AddressForm = (props: Props) => {
       {/* TODO: Fix select and textarea components */}
 
       <Select
-        className="w-full border-gray-500 text-sm mt-2"
+        className="w-full border-gray-500 text-sm"
         options={countryOptions}
         {...register('country')}
         error={errors.country}
         data-testid="address-form-country"
         label={t('account.address_book.form.country.title')}
+        labelClassName="mb-3"
         required
       />
 
       {city && (
         <Select
-          className="w-full border-gray-500 text-sm mt-2"
+          className="w-full border-gray-500 text-sm"
           options={cityOptions}
           {...register('city')}
           error={errors.city}
           data-testid="address-form-city"
           label={t('account.address_book.form.province.title')}
+          labelClassName="mb-3"
           required
         />
       )}
@@ -283,24 +285,26 @@ export const AddressForm = (props: Props) => {
         <div className="flex gap-4">
           <div className="flex-1">
             <Select
-              className="w-full border-gray-500 text-sm mt-2"
+              className="w-full border-gray-500 text-sm"
               options={townshipOptions}
               {...register('township')}
               error={errors.township}
               data-testid="address-form-township"
               label={t('account.address_book.form.township.title')}
+              labelClassName="mb-3"
               required
             />
           </div>
           {district && (
             <div className="flex-1">
               <Select
-                className="w-full border-gray-500 text-sm mt-2"
+                className="w-full border-gray-500 text-sm"
                 options={districtOptions}
                 {...register('district')}
                 error={errors.district}
                 data-testid="address-form-district"
                 label={t('account.address_book.form.district.title')}
+                labelClassName="mb-3"
                 required
               />
             </div>