@akinon/projectzero 1.91.0 → 1.92.0-rc.8

package/app-template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "projectzeronext",
-  "version": "1.91.0",
+  "version": "1.92.0-rc.8",
   "private": true,
   "license": "MIT",
   "scripts": {
@@ -24,22 +24,23 @@
     "test:middleware": "jest middleware-matcher.test.ts --bail"
   },
   "dependencies": {
-    "@akinon/next": "1.91.0",
-    "@akinon/pz-akifast": "1.91.0",
-    "@akinon/pz-b2b": "1.91.0",
-    "@akinon/pz-basket-gift-pack": "1.91.0",
-    "@akinon/pz-bkm": "1.91.0",
-    "@akinon/pz-checkout-gift-pack": "1.91.0",
-    "@akinon/pz-click-collect": "1.91.0",
-    "@akinon/pz-credit-payment": "1.91.0",
-    "@akinon/pz-gpay": "1.91.0",
-    "@akinon/pz-masterpass": "1.91.0",
-    "@akinon/pz-one-click-checkout": "1.91.0",
-    "@akinon/pz-otp": "1.91.0",
-    "@akinon/pz-pay-on-delivery": "1.91.0",
-    "@akinon/pz-saved-card": "1.91.0",
-    "@akinon/pz-tabby-extension": "1.91.0",
-    "@akinon/pz-tamara-extension": "1.91.0",
+    "@akinon/next": "1.92.0-rc.8",
+    "@akinon/pz-akifast": "1.92.0-rc.8",
+    "@akinon/pz-b2b": "1.92.0-rc.8",
+    "@akinon/pz-basket-gift-pack": "1.92.0-rc.8",
+    "@akinon/pz-bkm": "1.92.0-rc.8",
+    "@akinon/pz-checkout-gift-pack": "1.92.0-rc.8",
+    "@akinon/pz-click-collect": "1.92.0-rc.8",
+    "@akinon/pz-credit-payment": "1.92.0-rc.8",
+    "@akinon/pz-gpay": "1.92.0-rc.8",
+    "@akinon/pz-hepsipay": "1.92.0-rc.8",
+    "@akinon/pz-masterpass": "1.92.0-rc.8",
+    "@akinon/pz-one-click-checkout": "1.92.0-rc.8",
+    "@akinon/pz-otp": "1.92.0-rc.8",
+    "@akinon/pz-pay-on-delivery": "1.92.0-rc.8",
+    "@akinon/pz-saved-card": "1.92.0-rc.8",
+    "@akinon/pz-tabby-extension": "1.92.0-rc.8",
+    "@akinon/pz-tamara-extension": "1.92.0-rc.8",
     "@hookform/resolvers": "2.9.0",
     "@next/third-parties": "14.1.0",
     "@react-google-maps/api": "2.17.1",
@@ -62,7 +63,7 @@
     "yup": "0.32.11"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.91.0",
+    "@akinon/eslint-plugin-projectzero": "1.92.0-rc.8",
     "@semantic-release/changelog": "6.0.2",
     "@semantic-release/exec": "6.0.3",
     "@semantic-release/git": "10.0.1",
@@ -90,7 +91,7 @@
     "jest-environment-jsdom": "29.7.0",
     "lint-staged": "13.1.0",
     "prettier": "2.6.2",
-    "react-number-format": "5.3.4",
+    "react-number-format": "5.4.3",
     "sass": "1.49.9",
     "semantic-release": "19.0.5",
     "server-only": "0.0.1",

package/app-template/src/app/[commerce]/[locale]/[currency]/basket/page.tsx

@@ -1,87 +1,14 @@
-'use client';
-
-import { useEffect } from 'react';
-import { ROUTES } from '@theme/routes';
-import { useGetBasketQuery } from '@akinon/next/data/client/basket';
-import { pushCartView } from '@theme/utils/gtm';
-import { Button, LoaderSpinner, Link } from '@theme/components';
-import { BasketItem, Summary } from '@theme/views/basket';
-import { useLocalization } from '@akinon/next/hooks';
-import PluginModule, { Component } from '@akinon/next/components/plugin-module';
+import { BasketContent } from '@theme/views/basket/basket-content';
+import { getBasketData } from '@akinon/next/data/server/basket';
 import settings from '@theme/settings';
 
-export default function Page() {
-  const { data: basket, isLoading, isSuccess } = useGetBasketQuery();
-  const { t } = useLocalization();
-  const multiBasket = settings.plugins?.multiBasket ?? false;
-
-  useEffect(() => {
-    if (isSuccess) {
-      const products = basket.basketitem_set.map((basketItem) => ({
-        ...basketItem.product
-      }));
-      pushCartView(products);
-    }
-  }, [basket, isSuccess]);
-
-  return (
-    <div className="max-w-screen-xl p-4 flex flex-col text-primary-800 lg:p-8 xl:flex-row xl:mx-auto">
-      {isLoading && (
-        <div className="flex justify-center w-full">
-          <LoaderSpinner />
-        </div>
-      )}
-      {isSuccess &&
-        (basket && basket.basketitem_set && basket.basketitem_set.length > 0 ? (
-          <>
-            <div className="flex-1 xl:mr-16">
-              <div className="flex items-center justify-between py-2 border-b border-gray-200 lg:py-3">
-                <h2 className="text-xl lg:text-2xl font-light">
-                  {t('basket.my_cart')}
-                </h2>
-                <Link
-                  href={ROUTES.HOME}
-                  className="text-xs hover:text-secondary-500"
-                >
-                  {t('basket.back_to_shopping')}
-                </Link>
-              </div>
-              <ul>
-                {multiBasket ? (
-                  <PluginModule
-                    component={Component.MultiBasket}
-                    props={{ BasketItem }}
-                  />
-                ) : (
-                  basket.basketitem_set.map((basketItem, index) => (
-                    <BasketItem basketItem={basketItem} key={index} />
-                  ))
-                )}
-              </ul>
-            </div>
-            <Summary basket={basket} />
-          </>
-        ) : (
-          <div className="flex flex-col items-center container max-w-screen-sm py-4 px-4 xs:py-6 xs:px-6 sm:py-8 sm:px-8 lg:max-w-screen-xl">
-            <h1
-              className="w-full text-xl font-light text-secondary text-center sm:text-2xl"
-              data-testid="basket-empty"
-            >
-              {t('basket.empty.title')}
-            </h1>
+export default async function Page() {
+  const { basket } = await getBasketData();
 
-            <div className="w-full text-sm text-black-800 text-center my-4 mb-2 sm:text-base">
-              <p>{t('basket.empty.content_first')}</p>
-              <p>{t('basket.empty.content_second')}.</p>
-            </div>
+  const multiBasket: boolean =
+    typeof settings.plugins?.multiBasket === 'boolean'
+      ? settings.plugins.multiBasket
+      : false;
 
-            <Link href={ROUTES.HOME} passHref>
-              <Button className="px-10 mt-2" appearance="filled">
-                {t('basket.empty.button')}
-              </Button>
-            </Link>
-          </div>
-        ))}
-    </div>
-  );
+  return <BasketContent initialBasket={basket} multiBasket={multiBasket} />;
 }

package/app-template/src/app/[commerce]/[locale]/[currency]/product/[pk]/loading.tsx

@@ -0,0 +1,67 @@
+import { Skeleton, SkeletonWrapper } from 'components';
+
+export default function Loading() {
+  return (
+    <div className="container mx-auto">
+      <div className="max-w-5xl mx-auto my-5 px-7">
+        <SkeletonWrapper className="md:mb-7">
+          <Skeleton className="w-[17.25rem] h-4 lg:w-64" />
+        </SkeletonWrapper>
+      </div>
+      <div className="grid max-w-5xl grid-cols-2 lg:gap-8 mx-auto px-7">
+        <div className="col-span-2 mb-7 md:mb-0 lg:col-span-1">
+          <div className="flex gap-1">
+            <SkeletonWrapper className="hidden md:block md:mb-7">
+              {Array(5)
+                .fill(null)
+                .map((_, index) => (
+                  <Skeleton key={index} className="w-20	h-24 mb-2" />
+                ))}
+            </SkeletonWrapper>
+
+            <div className="flex-1">
+              <SkeletonWrapper className="md:mb-7">
+                <Skeleton className="w-full h-[30.375rem] md:h-[36.375rem]" />
+              </SkeletonWrapper>
+            </div>
+          </div>
+        </div>
+        <div className="flex flex-col items-center col-span-2 lg:col-span-1">
+          <div className="w-full">
+            <SkeletonWrapper className="w-full md:mb-7 flex justify-center items-center">
+              <Skeleton className="w-96 h-16 mb-9" />
+              <Skeleton className="hidden w-36	h-14 mb-9 md:block" />
+
+              <div className="flex flex-col justify-center items-center mb-9">
+                <Skeleton className="w-36 h-4 mb-2" />
+                <div className="flex items-center gap-2">
+                  {Array(3)
+                    .fill(null)
+                    .map((_, index) => (
+                      <Skeleton key={index} className="w-24	h-10" />
+                    ))}
+                </div>
+              </div>
+
+              <div className="flex flex-col justify-center items-center mb-4">
+                <Skeleton className="w-36 h-4 mb-2" />
+                <div className="flex items-center gap-2">
+                  {Array(5)
+                    .fill(null)
+                    .map((_, index) => (
+                      <Skeleton key={index} className="w-11 h-11" />
+                    ))}
+                </div>
+              </div>
+
+              <Skeleton className="hidden w-full h-14 mb-6 md:block" />
+              <Skeleton className="w-40 h-10 mb-9 md:w-72" />
+              <Skeleton className="w-24 h-10 mb-7" />
+              <Skeleton className="w-full h-36" />
+            </SkeletonWrapper>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}

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

@@ -1,33 +1,25 @@
 'use client';
 
-import { ReactNode, useState } from 'react';
+import { useState } from 'react';
 import { Icon } from './icon';
 import { twMerge } from 'tailwind-merge';
-
-type AccordionProps = {
-  isCollapse?: boolean;
-  title?: string;
-  subTitle?: string;
-  icons?: string[];
-  iconSize?: number;
-  iconColor?: string;
-  children?: ReactNode;
-  className?: string;
-  titleClassName?: string;
-  dataTestId?: string;
-};
+import { AccordionProps } from './types';
 
 export const Accordion = ({
   isCollapse = false,
+  collapseClassName,
   title,
   subTitle,
   icons = ['chevron-up', 'chevron-down'],
   iconSize = 16,
   iconColor = 'fill-[#000000]',
   children,
+  headerClassName,
   className,
   titleClassName,
-  dataTestId
+  subTitleClassName,
+  dataTestId,
+  contentClassName
 }: AccordionProps) => {
   const [collapse, setCollapse] = useState(isCollapse);
 
@@ -39,15 +31,22 @@ export const Accordion = ({
       )}
     >
       <div
-        className="flex items-center justify-between cursor-pointer"
+        className={twMerge(
+          'flex items-center justify-between cursor-pointer',
+          headerClassName
+        )}
         onClick={() => setCollapse(!collapse)}
         data-testid={dataTestId}
       >
-        <div className="flex flex-col">
+        <div className={twMerge('flex flex-col', contentClassName)}>
           {title && (
             <h3 className={twMerge('text-sm', titleClassName)}>{title}</h3>
           )}
-          {subTitle && <h4 className="text-xs text-gray-700">{subTitle}</h4>}
+          {subTitle && (
+            <h4 className={twMerge('text-xs text-gray-700', subTitleClassName)}>
+              {subTitle}
+            </h4>
+          )}
         </div>
 
         {icons && (
@@ -58,7 +57,11 @@ export const Accordion = ({
           />
         )}
       </div>
-      {collapse && <div className="mt-3 text-sm">{children}</div>}
+      {collapse && (
+        <div className={twMerge('mt-3 text-sm', collapseClassName)}>
+          {children}
+        </div>
+      )}
     </div>
   );
 };

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

@@ -70,6 +70,7 @@ export const CurrencySelect = (props: CurrencySelectProps) => {
               onClick={confirmModalHandleClick}
               appearance="filled"
               className="font-medium px-10 py-4 h-12"
+              data-testid="currency-modal-confirm"
             >
               {t('common.currency_modal.continue')}
             </Button>

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

@@ -72,7 +72,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/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/plugins.js

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

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

@@ -71,3 +71,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;
+}