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

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

@@ -1,11 +1,21 @@
 import { useState } from 'react';
 import { forwardRef } from 'react';
 import { FileInputProps } from '@theme/components/types';
-import clsx from 'clsx';
 import { useLocalization } from '@akinon/next/hooks';
+import { twMerge } from 'tailwind-merge';
 
 export const FileInput = forwardRef<HTMLInputElement, FileInputProps>(
-  function FileInput({ className, onChange, ...props }, ref) {
+  function FileInput(
+    {
+      buttonClassName,
+      onChange,
+      fileClassName,
+      fileNameWrapperClassName,
+      fileInputClassName,
+      ...props
+    },
+    ref
+  ) {
     const { t } = useLocalization();
     const [fileNames, setFileNames] = useState<string[]>([]);
 
@@ -24,24 +34,34 @@ export const FileInput = forwardRef<HTMLInputElement, FileInputProps>(
           type="file"
           {...props}
           ref={ref}
-          className="absolute inset-0 w-full h-full opacity-0 cursor-pointer"
+          className={twMerge(
+            'absolute inset-0 w-full h-full opacity-0 cursor-pointer',
+            fileInputClassName
+          )}
           onChange={handleFileChange}
         />
         <button
           type="button"
-          className={clsx('bg-primary text-white py-2 px-4 text-sm', className)}
+          className={twMerge(
+            'bg-primary text-white py-2 px-4 text-sm',
+            buttonClassName
+          )}
         >
           {t('common.file_input.select_file')}
         </button>
-        <div className="mt-1 text-gray-500">
+        <div
+          className={twMerge('mt-1 text-gray-500', fileNameWrapperClassName)}
+        >
           {fileNames.length > 0 ? (
-            <ul className="list-disc pl-4 text-xs">
+            <ul className={twMerge('list-disc pl-4 text-xs', fileClassName)}>
               {fileNames.map((name, index) => (
                 <li key={index}>{name}</li>
               ))}
             </ul>
           ) : (
-            <span className="text-xs">{t('common.file_input.no_file')}</span>
+            <span className={twMerge('text-xs', fileClassName)}>
+              {t('common.file_input.no_file')}
+            </span>
           )}
         </div>
       </div>

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);
     }
   };
 
@@ -157,7 +183,7 @@ export function GenerateFormFields({
               className={twMerge(allFieldClasses?.className, field.class)}
               name={field.key}
               {...field.attributes}
-              error={errors[field.key]}
+              error={errors[field.key] as any}
               {...register(field.key)}
             />
           </div>
@@ -187,7 +213,7 @@ export function GenerateFormFields({
               className={twMerge(allFieldClasses?.className, field?.class)}
               name={field.key}
               {...field.attributes}
-              error={errors[field.key]}
+              error={errors[field.key] as any}
               {...register(field.key, { valueAsNumber: true })}
             />
           </div>
@@ -220,7 +246,7 @@ export function GenerateFormFields({
             />
             {errors[field.key] && (
               <span className="mt-1 text-sm text-error">
-                {errors[field.key].message}
+                {String(errors[field.key].message)}
               </span>
             )}
           </div>
@@ -251,7 +277,7 @@ export function GenerateFormFields({
               className={twMerge(allFieldClasses?.className, field?.class)}
               name={field.key}
               {...field.attributes}
-              error={errors[field.key]}
+              error={errors[field.key] as any}
               {...register(field.key)}
             />
           </div>
@@ -285,7 +311,7 @@ export function GenerateFormFields({
                 label: choice
               }))}
               {...field.attributes}
-              error={errors[field.key]}
+              error={errors[field.key] as any}
               {...register(field.key)}
             />
           </div>
@@ -316,7 +342,7 @@ export function GenerateFormFields({
               className={twMerge(allFieldClasses?.className, field?.class)}
               name={field.key}
               {...field.attributes}
-              error={errors[field.key]}
+              error={errors[field.key] as any}
               {...register(field.key)}
             />
           </div>
@@ -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

@@ -39,8 +39,8 @@ export const Input = forwardRef<
   const hasFloatingLabel = label && labelStyle === 'floating';
   const inputClass = twMerge(
     clsx(
-      'text-xs border px-2.5 h-10 placeholder:text-gray-600 peer disabled:bg-gray-50',
-      'focus-visible:outline-hidden', // disable outline on focus
+      'text-xs border px-2.5 h-10 placeholder:text-gray-600 peer',
+      'focus-visible:outline-none', // disable outline on focus
       error
         ? 'border-error focus:border-error'
         : 'border-gray-500 hover:border-black focus:border-black'
@@ -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,
@@ -68,7 +74,7 @@ export const Input = forwardRef<
         className={twMerge(
           'text-xs text-gray-800 transition-all',
           clsx({
-            'absolute left-2.5 pointer-events-none transform flex items-center h-full top-0!  peer-placeholder-shown:-translate-y-2 peer-placeholder-shown:bg-white peer-placeholder-shown:inline-flex peer-placeholder-shown:h-auto':
+            'absolute left-2.5 pointer-events-none transform flex items-center h-full !top-0  peer-placeholder-shown:-translate-y-2 peer-placeholder-shown:bg-white peer-placeholder-shown:inline-flex peer-placeholder-shown:h-auto':
               hasFloatingLabel,
             'mb-2': !hasFloatingLabel,
             '-translate-y-2 bg-white inline-flex h-auto':
@@ -112,7 +118,7 @@ export const Input = forwardRef<
         )}
       </div>
       {error && (
-        <span className="mt-1 text-sm text-error">{error.message}</span>
+        <span className="mt-1 text-sm text-error">{String(error.message)}</span>
       )}
     </div>
   );

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/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/pwa-tags.tsx

@@ -2,6 +2,7 @@ import { Metadata } from '@akinon/next/types';
 
 const pwaTags: Metadata = {
   manifest: '/manifest.json',
+  themeColor: '#FFFFFF',
   formatDetection: {
     telephone: false
   },

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,34 +36,42 @@ 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-hidden',
-            !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>
+        <span className="mt-1 text-sm text-error">{String(error.message)}</span>
       )}
     </label>
   );

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

@@ -12,7 +12,7 @@ export const Shimmer: React.FC<ShimmerProps> = ({ className }) => {
     >
       <div
         className={twMerge(
-          'w-full h-full bg-black/20 shadow-[0 0 30px 30px rgba(255,255,255,0.2)]',
+          'w-full h-full bg-black bg-opacity-20 shadow-[0 0 30px 30px rgba(255,255,255,0.2)]',
           className
         )}
       ></div>

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/use-fav-button.tsx

@@ -35,7 +35,7 @@ const useFavButton = (productPk: number) => {
     [favorites, productPk]
   );
 
-  const [isActive, setIsActive] = useState(Boolean(favoriteItem));
+  const isActive = Boolean(favoriteItem);
   const [isPushed, setIsPushed] = useState<boolean>(false);
 
   const [addFavorite] = useAddFavoriteMutation();
@@ -55,20 +55,16 @@ const useFavButton = (productPk: number) => {
   }, [favoriteItem, productPk, addFavorite, removeFavorite]);
 
   useEffect(() => {
-    setIsActive(Boolean(favoriteItem));
-  }, [favoriteItem]);
-
-  useEffect(() => {
-    if (favoriteItem && !isActive && isPushed) {
-      setIsActive(true);
+    if (favoriteItem && isPushed) {
       pushAddToWishlist({
         base_code: favoriteItem?.product?.base_code,
         name: favoriteItem?.product?.name,
         price: favoriteItem?.product?.price,
         currency_type: favoriteItem?.product?.currency_type
       });
+      setIsPushed(false);
     }
-  }, [favoriteItem, isActive, isPushed]);
+  }, [favoriteItem, isPushed]);
 
   const FavButton = useMemo(() => {
     const View = (props: FavButtonProps) => (

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