@akinon/projectzero 1.104.0-rc.83 → 1.104.0

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/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'
   },

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) {

package/app-template/src/views/basket/basket-item.tsx

@@ -3,7 +3,7 @@ import {
   useUpdateQuantityMutation
 } from '@akinon/next/data/client/basket';
 import { useAppDispatch } from '@akinon/next/redux/hooks';
-import { Basket, BasketItem as BasketItemType } from '@akinon/next/types';
+import { BasketItem as BasketItemType } from '@akinon/next/types';
 import { Price, Button, Icon, Modal, Select, Link } from '@theme/components';
 import { useState } from 'react';
 import { useAddFavoriteMutation } from '@akinon/next/data/client/wishlist';
@@ -19,12 +19,11 @@ import { pushRemoveFromCart } from '@theme/utils/gtm';
 interface Props {
   basketItem?: BasketItemType;
   namespace?: string;
-  onBasketUpdate?: (basket: Basket) => void;
 }
 
 export const BasketItem = (props: Props) => {
   const { t } = useLocalization();
-  const { basketItem, namespace, onBasketUpdate } = props;
+  const { basketItem, namespace } = props;
   const [updateQuantityMutation] = useUpdateQuantityMutation();
   const dispatch = useAppDispatch();
   const [isRemoveBasketModalOpen, setRemoveBasketModalOpen] = useState(false);
@@ -40,12 +39,7 @@ export const BasketItem = (props: Props) => {
     quantity: number,
     attributes: object = {}
   ) => {
-    const requestParams: {
-      product: number;
-      quantity: number;
-      attributes: object;
-      namespace?: string;
-    } = {
+    const requestParams: any = {
       product: productPk,
       quantity,
       attributes
@@ -55,21 +49,19 @@ export const BasketItem = (props: Props) => {
       requestParams.namespace = namespace;
     }
 
-    try {
-      const response = await updateQuantityMutation(requestParams).unwrap();
-      dispatch(
-        basketApi.util.updateQueryData(
-          'getBasket',
-          undefined,
-          (draftBasket) => {
-            Object.assign(draftBasket, response.basket);
-          }
+    await updateQuantityMutation(requestParams)
+      .unwrap()
+      .then((data) =>
+        dispatch(
+          basketApi.util.updateQueryData(
+            'getBasket',
+            undefined,
+            (draftBasket) => {
+              Object.assign(draftBasket, data.basket);
+            }
+          )
         )
       );
-      onBasketUpdate?.(response.basket);
-    } catch (error) {
-      console.error('Error updating quantity:', error);
-    }
   };
 
   const deleteProduct = async (productPk?: number) => {

package/app-template/src/views/basket/summary.tsx

@@ -18,7 +18,6 @@ import clsx from 'clsx';
 
 interface Props {
   basket: Basket;
-  onBasketUpdate?: (basket: Basket) => void;
 }
 
 const voucherCodeFormSchema = (t) =>
@@ -28,7 +27,7 @@ const voucherCodeFormSchema = (t) =>
 
 export const Summary = (props: Props) => {
   const { t } = useLocalization();
-  const { basket, onBasketUpdate } = props;
+  const { basket } = props;
   const router = useRouter();
   const {
     register,
@@ -54,7 +53,7 @@ export const Summary = (props: Props) => {
   const removeVoucherCode = () => {
     removeVoucherCodeMutation()
       .unwrap()
-      .then((basket) => {
+      .then((basket) =>
         dispatch(
           basketApi.util.updateQueryData(
             'getBasket',
@@ -63,9 +62,8 @@ export const Summary = (props: Props) => {
               Object.assign(draftBasket, basket);
             }
           )
-        );
-        onBasketUpdate?.(basket);
-      })
+        )
+      )
       .catch((error: Error) => {
         setError('voucherCode', { message: error.data.non_field_errors });
       });
@@ -76,7 +74,7 @@ export const Summary = (props: Props) => {
       voucher_code: data.voucherCode
     })
       .unwrap()
-      .then((basket) => {
+      .then((basket) =>
         dispatch(
           basketApi.util.updateQueryData(
             'getBasket',
@@ -85,9 +83,8 @@ export const Summary = (props: Props) => {
               Object.assign(draftBasket, basket);
             }
           )
-        );
-        onBasketUpdate?.(basket);
-      })
+        )
+      )
       .catch((error: Error) => {
         setError('voucherCode', { message: error.data.non_field_errors });
       });

package/app-template/src/views/breadcrumb.tsx

@@ -12,7 +12,7 @@ export interface BreadcrumbProps {
 }
 
 export default function Breadcrumb(props: BreadcrumbProps) {
-  const { t, locale } = useLocalization();
+  const { t } = useLocalization();
   const { breadcrumbList = [] } = props;
 
   const list = [
@@ -28,7 +28,7 @@ export default function Breadcrumb(props: BreadcrumbProps) {
       {list.map((item, index) => (
         <Fragment key={index}>
           <Link href={item.url}>
-            {capitalize(item.text.toLocaleLowerCase(locale))}
+            {capitalize(item.text.toLocaleLowerCase())}
           </Link>
           {index !== list.length - 1 && <Icon name="chevron-end" size={8} />}
         </Fragment>

package/app-template/src/views/category/category-info.tsx

@@ -57,7 +57,6 @@ export default function ListPage(props: ListPageProps) {
       newUrl.searchParams.delete('page');
       router.push(newUrl.pathname + newUrl.search, undefined);
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [searchParams, data.products, page]);
 
   const { t } = useLocalization();

package/app-template/src/views/category/filters/index.tsx

@@ -6,7 +6,7 @@ import { useLocalization } from '@akinon/next/hooks';
 import { useAppDispatch, useAppSelector } from '@akinon/next/redux/hooks';
 import { resetSelectedFacets } from '@theme/redux/reducers/category';
 import CategoryActiveFilters from '@theme/views/category/category-active-filters';
-import { useMemo, useTransition } from 'react';
+import { useMemo, useState, useTransition } from 'react';
 import { FilterItem } from './filter-item';
 
 interface Props {

package/app-template/src/views/checkout/summary.tsx

@@ -8,7 +8,6 @@ import PluginModule, { Component } from '@akinon/next/components/plugin-module';
 import { twMerge } from 'tailwind-merge';
 import { Image } from '@akinon/next/components/image';
 import { Trans } from '@akinon/next/components/trans';
-import { StoreCredits } from './steps/payment/options/store-credit';
 
 export const Summary = () => {
   const { t } = useLocalization();
@@ -39,7 +38,6 @@ export const Summary = () => {
             'flex flex-col w-full mb-4 border border-solid border-gray-400'
         }}
       />
-      <StoreCredits />
       <div className="flex flex-col w-full border border-solid border-gray-400">
         <div className="flex justify-between items-center flex-row border-b border-solid border-gray-400 px-4 py-2 sm:px-5 sm:py-4 sm:min-h-15">
           <span className="text-black-800 text-xl font-light sm:text-2xl">
@@ -120,14 +118,6 @@ export const Summary = () => {
               <Price value={preOrder?.shipping_amount} />
             </span>
           </div>
-          {parseFloat(preOrder?.loyalty_money) > 0 && (
-            <div className="flex items-center justify-between w-full text-xs text-black-800 py-1 px-4 sm:px-5">
-              <span>{t('checkout.summary.loyalty_money_total')}</span>
-              <span>
-                <Price value={preOrder?.loyalty_money} />
-              </span>
-            </div>
-          )}
           <div className="flex items-center justify-between w-full text-xs text-black-800 py-1 px-4 sm:px-5">
             <span>{t('checkout.summary.discounts_total')}</span>
             <span>

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

@@ -51,14 +51,9 @@ const GuestLogin = () => {
       ).unwrap();
 
       Object.keys(response?.errors || {}).forEach((key) => {
-        const errorValue = response?.errors[key];
-        const message = Array.isArray(errorValue)
-          ? errorValue.join(', ')
-          : errorValue || '';
-
         setError(key as keyof GuestLoginFormParams, {
           type: 'custom',
-          message
+          message: response?.errors[key]?.join(', ')
         });
       });
     } catch (error) {

package/app-template/src/views/header/search/index.tsx

@@ -4,11 +4,11 @@ import { useEffect, useRef, useState } from 'react';
 import { useAppDispatch, useAppSelector } from '@akinon/next/redux/hooks';
 import { closeSearch } from '@akinon/next/redux/reducers/header';
 import clsx from 'clsx';
-import { Icon, Input } from '@theme/components';
+
+import { Icon } from '@theme/components';
 import Results from './results';
 import { ROUTES } from '@theme/routes';
 import { useLocalization, useRouter } from '@akinon/next/hooks';
-import PluginModule, { Component } from '@akinon/next/components/plugin-module';
 
 export default function Search() {
   const { t } = useLocalization();
@@ -41,14 +41,6 @@ export default function Search() {
     };
   }, [isSearchOpen, dispatch]);
 
-  const handleSearchTextChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    setSearchText(e.target.value);
-  };
-
-  const handleCloseSearch = () => {
-    dispatch(closeSearch());
-  };
-
   return (
     <>
       <div
@@ -74,9 +66,9 @@ export default function Search() {
               {t('common.search.results_for')}
             </span>
             <div className="flex items-center">
-              <Input
+              <input
                 value={searchText}
-                onChange={handleSearchTextChange}
+                onChange={(e) => setSearchText(e.target.value)}
                 onKeyDown={(e) => {
                   if (e.key === 'Enter' && searchText.trim() !== '') {
                     router.push(`${ROUTES.LIST}/?search_text=${searchText}`);
@@ -86,18 +78,14 @@ export default function Search() {
                 placeholder={t('common.search.placeholder')}
                 ref={inputRef}
               />
-
-              <PluginModule component={Component.HeaderImageSearchFeature} />
-
               <Icon
                 name="close"
                 size={14}
-                onClick={handleCloseSearch}
+                onClick={() => dispatch(closeSearch())}
                 className="cursor-pointer"
               />
             </div>
           </div>
-
           <Results searchText={searchText} />
         </div>
       </div>