@akinon/projectzero 1.100.0-rc.71 → 1.100.0

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

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

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

@@ -7,7 +7,6 @@ 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,
@@ -15,7 +14,6 @@ import {
   FormPropertiesType,
   Schema
 } from '@akinon/next/types';
-import { useLocalization } from '@akinon/next/hooks';
 
 export function GenerateFormFields({
   schema,
@@ -30,14 +28,8 @@ 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 = {};
@@ -88,7 +80,6 @@ export function GenerateFormFields({
   const {
     handleSubmit,
     register,
-    reset,
     formState: { errors }
   } = useForm<FormField>({
     resolver: yupResolver(generateValidationSchema())
@@ -117,10 +108,6 @@ export function GenerateFormFields({
   }, [schema, fieldProperties]);
 
   const onSubmit = async (data) => {
-    setIsSubmitting(true);
-    setSubmitStatus('idle');
-    setSubmitMessage('');
-
     try {
       const formData = new FormData();
 
@@ -128,25 +115,12 @@ export function GenerateFormFields({
         formData.append(key, data[key]);
       });
 
-      const response = await fetch(formProperties.actionUrl, {
+      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(t('common.forms.submit_error'), error);
-      setSubmitStatus('error');
-      setSubmitMessage(t('common.forms.error'));
-    } finally {
-      setIsSubmitting(false);
+      console.error('Form submit error:', error);
     }
   };
 
@@ -363,22 +337,9 @@ 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" disabled={isSubmitting}>
-              {isSubmitting ? t('common.forms.sending') : submitButtonText}
+            <Button type="submit" className="w-full">
+              {submitButtonText}
             </Button>
           </>
         )}

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

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

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

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

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

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

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

@@ -14,18 +14,14 @@ const Select = forwardRef<HTMLSelectElement, SelectProps>((props, ref) => {
     error,
     label,
     required = false,
-    labelClassName,
     ...rest
   } = props;
 
   return (
     <label
-      className={twMerge(
-        clsx('flex flex-col relative text-xs text-gray-800', {
-          'pl-7': icon
-        }),
-        labelClassName
-      )}
+      className={clsx('flex flex-col relative text-xs text-gray-800', {
+        'pl-7': icon
+      })}
     >
       {icon && (
         <Icon
@@ -36,40 +32,32 @@ const Select = forwardRef<HTMLSelectElement, SelectProps>((props, ref) => {
       )}
 
       {label && (
-        <span className={twMerge('mb-1', labelClassName)}>
+        <span className="mb-1">
           {label} {required && <span className="text-secondary">*</span>}
         </span>
       )}
-      <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>
+      <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>
       {error && (
         <span className="mt-1 text-sm text-error">{error.message}</span>
       )}

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

@@ -29,13 +29,7 @@ export interface PaginationProps {
   isLoading?: boolean;
 }
 
-export interface FileInputProps extends React.HTMLProps<HTMLInputElement> {
-  fileClassName?: string;
-  fileNameWrapperClassName?: string;
-  fileInputClassName?: string;
-  onChange?: (event: React.ChangeEvent<HTMLInputElement>) => void;
-  buttonClassName?: string;
-}
+export type FileInputProps = React.HTMLProps<HTMLInputElement>;
 
 export type RadioProps = React.HTMLProps<HTMLInputElement>;
 
@@ -64,7 +58,6 @@ 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;
@@ -98,20 +91,3 @@ 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,3 +1 @@
-export * from './use-contract';
-export * from './use-fav-button';
 export * from './use-add-product-to-basket';

package/app-template/src/plugins.js

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

package/app-template/src/redux/store.ts

@@ -14,6 +14,11 @@ import {
 import categoryReducer from '@theme/redux/reducers/category';
 import categoryMiddleware from '@theme/redux/middlewares/category';
 
+// Import all action creators from akinon-next
+import * as defaultActions from '@akinon/next/redux/actions';
+import { rtkApiActionCreators } from '@akinon/next/redux/actions';
+import * as categorySlice from './reducers/category';
+
 const _middlewares: Middleware[] = [...middlewares, categoryMiddleware];
 
 const _reducers = {
@@ -21,13 +26,28 @@ const _reducers = {
   category: categoryReducer
 };
 
+const actionCreators = {
+  // Slice actions (automatically extracted from akinon-next)
+  ...defaultActions,
+  // RTK Query API endpoints from akinon-next
+  ...rtkApiActionCreators,
+  // Local category slice actions
+  ...categorySlice
+};
+
 export const makeStore = (): Store<{
   [key in keyof typeof _reducers]: ReturnType<typeof _reducers[key]>;
 }> =>
   configureStore({
     reducer: _reducers,
     middleware: (getDefaultMiddleware) =>
-      getDefaultMiddleware().concat(_middlewares)
+      getDefaultMiddleware().concat(_middlewares),
+    devTools:
+      process.env.NODE_ENV !== 'production'
+        ? {
+            actionCreators
+          }
+        : false
   });
 
 export type AppStore = ReturnType<typeof makeStore>;

package/app-template/src/settings.js

@@ -1,10 +1,6 @@
 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} */
@@ -18,7 +14,6 @@ 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',
@@ -46,7 +41,7 @@ module.exports = {
       }
     ],
     defaultLocaleValue: 'en',
-    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.
+    localeUrlStrategy: LocaleUrlStrategy.HideDefaultLocale,
     redirectToDefaultLocale: true,
     defaultCurrencyCode: 'usd'
   },
@@ -67,6 +62,5 @@ module.exports = {
   redis: {
     defaultExpirationTime: 900 // 15 min
   },
-  customNotFoundEnabled: false,
-  commerceRedirectionIgnoreList: ['/users/reset']
+  customNotFoundEnabled: false
 };

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

@@ -125,20 +125,3 @@ 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/views/account/address-form.tsx

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

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

@@ -111,7 +111,7 @@ const ContactForm = () => {
     resolver: yupResolver(contactFormSchema(t))
   });
 
-  const onSubmit: SubmitHandler<ContactFormType> = (data) => {
+  const onSubmit: SubmitHandler<ContactFormType> = (data, event) => {
     const formData = new FormData();
 
     Object.keys(data ?? {}).forEach((key) => {

package/app-template/src/views/account/content-header.tsx

@@ -31,13 +31,13 @@ export const ContentHeader = (props: Props) => {
       </h3>
       <Select
         onChange={handleChange}
-        className="w-full mb-4 md:mb-0 md:w-56 text-xs"
+        className="w-full mb-4 md:mb-0 md:w-56 md:mr-4 text-xs"
         options={orders}
         data-testid="account-orders-header-select"
       ></Select>
       <Button
         className={clsx(
-          'w-full md:w-56 md:ms-4',
+          'w-full md:w-56',
           isButtonDisabled &&
             'hover:bg-black hover:text-white disabled:opacity-75'
         )}

package/app-template/src/views/account/faq/faq-tabs.tsx

@@ -3,7 +3,6 @@
 import { Accordion, LoaderSpinner, TabPanel, Tabs } from '@theme/components';
 import React from 'react';
 import { useGetWidgetQuery } from '@akinon/next/data/client/misc';
-import { useLocalization } from '@akinon/next/hooks';
 
 interface Props {
   searchKey?: string;
@@ -12,7 +11,6 @@ interface Props {
 export function FaqTabs(props: Props) {
   const { searchKey } = props;
   const { data, isLoading } = useGetWidgetQuery('faq');
-  const { locale } = useLocalization();
 
   if (isLoading) {
     return <LoaderSpinner className="mt-4" />;
@@ -31,12 +29,8 @@ export function FaqTabs(props: Props) {
               {data?.attributes?.faq_contents
                 ?.filter(
                   (faq) =>
-                    faq.value.content
-                      .toLocaleLowerCase(locale)
-                      .includes(searchKey) ||
-                    faq.value.title
-                      .toLocaleLowerCase(locale)
-                      .includes(searchKey)
+                    faq.value.content.toLocaleLowerCase().includes(searchKey) ||
+                    faq.value.title.toLocaleLowerCase().includes(searchKey)
                 )
                 .map((faq, index) => {
                   if (faq.value.category == item.value.category_id) {