@akinon/projectzero 1.104.0-rc.83 → 1.104.0

package/app-template/README.md

@@ -12,30 +12,6 @@ Run `cp .env.example .env && yarn` command at project root and all dependencies
 
 - `SITEMAP_S3_BUCKET_NAME`: S3 bucket name for XML sitemaps (e.g., "0fb534"). This is required for the sitemap route to function correctly.
 
-### Optional Environment Variables
-
-- `NEXT_PUBLIC_ENABLE_IMAGE_SEARCH`: Set to `true` to enable image search feature for all users. If not set or `false`, the feature will only be visible to users who have enabled it via localStorage.
-
-## Image Search Feature
-
-The image search functionality allows users to search for similar products by uploading images or cropping existing product images.
-
-### Feature Visibility Control
-
-The image search feature can be controlled in two ways:
-
-1. **Environment Variable (Global)**: Set `NEXT_PUBLIC_ENABLE_IMAGE_SEARCH=true` to enable for all users
-2. **localStorage (Individual Users)**: Users can enable it locally using browser developer tools
-
-````
-
-### Feature Locations
-
-When enabled, the image search feature appears in:
-
-- **Header Search**: Camera icon next to the search input
-- **Product Detail Page**: "View Similar Styles" button on product images
-
 ### Build
 
 To build the app, run the following command:
@@ -43,7 +19,7 @@ To build the app, run the following command:
 ```bash
 cd projectzeronext # Project root
 yarn build
-````
+```
 
 ### Develop
 

package/app-template/package.json

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

package/app-template/public/locales/en/checkout.json

@@ -37,7 +37,6 @@
     "subtotal": "Subtotal",
     "shipping": "Shipping",
     "discounts_total": "Discounts Total",
-    "loyalty_money_total": "Loyalty Money Total",
     "total": "Total",
     "delivery_info": "Delivery Info",
     "change": "change",
@@ -139,11 +138,6 @@
       "payments": "Payments",
       "per_month": "Per Month",
       "total": "Total"
-    },
-    "store_credit": {
-      "use_my_store_credits": "Use my pz-zero credits",
-      "available_balance": "Available Balance",
-      "insufficient_balance": "Your pz-zero credits are not sufficient to pay for the order, please select an additional payment method to cover the balance of <Amount/>"
     }
   },
   "agreement": {

package/app-template/public/locales/en/common.json

@@ -27,25 +27,7 @@
     "clean": "clean",
     "categories": "CATEGORIES",
     "view_all": "VIEW ALL",
-    "not_found": "Search Results Not Found",
-    "image_search": {
-      "title": "Search by Image",
-      "upload_image": "Upload an image to find similar products",
-      "select_image": "Select Image",
-      "crop_image": "Crop Image",
-      "cancel_crop": "Cancel Crop",
-      "apply_crop": "Apply Crop",
-      "try_another": "Try Another Image",
-      "search_image": "Search Image",
-      "similar_products": "Similar Products",
-      "loading_cropper": "Loading cropper...",
-      "no_products": "No similar products found",
-      "best_results": "For best results:",
-      "tip_1": "Upload clear images of products",
-      "tip_2": "Use images with simple backgrounds",
-      "tip_3": "Focus on the main product",
-      "tip_4": "Use the crop tool to focus on specific details"
-    }
+    "not_found": "Search Results Not Found"
   },
   "page_404": {
     "title": "Page not found.",
@@ -90,29 +72,6 @@
     "select_file": "Select File",
     "no_file": "No file selected"
   },
-  "product": {
-    "no_products": "No products found",
-    "new_image": "New Image",
-    "view_similar_styles": "View Similar Styles",
-    "clear_all_filters": "Clear All Filters",
-    "reset_to_original": "Reset to Original",
-    "similar_styles": "Similar Styles",
-    "filters": "Filters",
-    "active_filters": "Active Filters"
-  },
-  "similar_products": {
-    "errors": {
-      "file_size_too_large": "Image size should be less than 5MB",
-      "invalid_image_file": "The selected file is not a valid image",
-      "invalid_image_format": "Invalid image format detected",
-      "search_failed": "Search failed. Please try again later",
-      "connection_failed": "Image search failed. Please check your connection and try again",
-      "invalid_image_properties": "Invalid image properties detected",
-      "file_read_error": "Error reading the file",
-      "processing_error": "Error processing image",
-      "crop_processing_error": "Error processing cropped image"
-    }
-  },
   "forms": {
     "sending": "Sending...",
     "success": "Form submitted successfully!",

package/app-template/public/locales/tr/checkout.json

@@ -37,7 +37,6 @@
     "subtotal": "Ara toplam",
     "shipping": "Kargo",
     "discounts_total": "İndirimler Toplamı",
-    "loyalty_money_total": "Sadakat Parası Toplamı",
     "total": "Toplam",
     "delivery_info": "Teslimat Bilgileri",
     "change": "değiştir",
@@ -139,11 +138,6 @@
       "payments": "Ödemeler",
       "per_month": "Her ay",
       "total": "Toplam"
-    },
-    "store_credit": {
-      "use_my_store_credits": "pz-zero kredilerimi kullan",
-      "available_balance": "Mevcut Bakiyem",
-      "insufficient_balance": "pz-zero kredileriniz siparişi ödemek için yeterli değil, lütfen <Amount/> tutarını karşılamak için ek bir ödeme yöntemi seçin."
     }
   },
   "agreement": {

package/app-template/public/locales/tr/common.json

@@ -27,25 +27,7 @@
     "clean": "temizle",
     "categories": "KATEGORİLER",
     "view_all": "HEPSİNİ GÖSTER",
-    "not_found": "Arama Sonuçları Bulunamadı",
-    "image_search": {
-      "title": "Görsel ile Ara",
-      "upload_image": "Benzer ürünleri bulmak için bir görsel yükleyin",
-      "select_image": "Görsel Seç",
-      "crop_image": "Görsel Kırp",
-      "cancel_crop": "Kırpmayı İptal Et",
-      "apply_crop": "Kırpmayı Uygula",
-      "try_another": "Başka Görsel Dene",
-      "search_image": "Arama Görseli",
-      "similar_products": "Benzer Ürünler",
-      "loading_cropper": "Kırpıcı yükleniyor...",
-      "no_products": "Benzer ürün bulunamadı",
-      "best_results": "En iyi sonuçlar için:",
-      "tip_1": "Net ürün görselleri yükleyin",
-      "tip_2": "Basit arka planlı görseller kullanın",
-      "tip_3": "Ana ürüne odaklanın",
-      "tip_4": "Belirli detaylara odaklanmak için kırpma aracını kullanın"
-    }
+    "not_found": "Arama Sonuçları Bulunamadı"
   },
   "page_404": {
     "title": "Sayfa bulunamadı.",
@@ -90,29 +72,6 @@
     "select_file": "Dosya Seç",
     "no_file": "Dosya seçilmedi"
   },
-  "product": {
-    "no_products": "Ürün bulunamadı",
-    "new_image": "Yeni Görsel",
-    "view_similar_styles": "Benzer Stillere Göz At",
-    "clear_all_filters": "Tüm Filtreleri Temizle",
-    "reset_to_original": "Orjinale Dön",
-    "similar_styles": "Benzer Stillere Göz At",
-    "filters": "Filtreler",
-    "active_filters": "Aktif Filtreler"
-  },
-  "similar_products": {
-    "errors": {
-      "file_size_too_large": "Görsel boyutu 5MB'dan küçük olmalıdır",
-      "invalid_image_file": "Seçilen dosya geçerli bir görsel değil",
-      "invalid_image_format": "Geçersiz görsel formatı tespit edildi",
-      "search_failed": "Arama başarısız oldu. Lütfen daha sonra tekrar deneyin",
-      "connection_failed": "Görsel arama başarısız oldu. Lütfen bağlantınızı kontrol edip tekrar deneyin",
-      "invalid_image_properties": "Geçersiz görsel özellikleri tespit edildi",
-      "file_read_error": "Dosya okuma hatası",
-      "processing_error": "Görsel işleme hatası",
-      "crop_processing_error": "Kırpılan görsel işleme hatası"
-    }
-  },
   "forms": {
     "sending": "Gönderiliyor...",
     "success": "Form başarıyla gönderildi!",

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

@@ -1,14 +1,87 @@
-import { BasketContent } from '@theme/views/basket/basket-content';
-import { getBasketData } from '@akinon/next/data/server/basket';
+'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 settings from '@theme/settings';
 
-export default async function Page() {
-  const { basket } = await getBasketData();
+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>
 
-  const multiBasket: boolean =
-    typeof settings.plugins?.multiBasket === 'boolean'
-      ? settings.plugins.multiBasket
-      : false;
+            <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>
 
-  return <BasketContent initialBasket={basket} multiBasket={multiBasket} />;
+            <Link href={ROUTES.HOME} passHref>
+              <Button className="px-10 mt-2" appearance="filled">
+                {t('basket.empty.button')}
+              </Button>
+            </Link>
+          </div>
+        ))}
+    </div>
+  );
 }

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

@@ -1,20 +1,9 @@
 import { getLandingPageData } from '@akinon/next/data/server';
 import { withSegmentDefaults } from '@akinon/next/hocs/server';
 import { PageProps } from '@akinon/next/types';
-import { notFound } from 'next/navigation';
 
 async function Page({ params }: PageProps<{ pk: number }>) {
-  let data;
-
-  try {
-    data = await getLandingPageData({ pk: params.pk });
-  } catch (error) {
-    return notFound();
-  }
-
-  if (!data || !data.landing_page) {
-    return notFound();
-  }
+  const data = await getLandingPageData({ pk: params.pk });
 
   const content = data.landing_page;
 

package/app-template/src/assets/fonts/pz-icon.css

@@ -152,6 +152,3 @@ url("./pz-icon.svg?db4ba799c4ca72f4bb855458e0cd19ee#pz-icon") format("svg");
 .pz-icon-whatsapp:before {
   content: "\f12c";
 }
-.pz-icon-camera:before {
-  content: "\f12d";
-}

package/app-template/src/components/__tests__/link.test.tsx

@@ -30,8 +30,6 @@ describe('Link Component', () => {
     wrapper = container;
   });
 
-  wrapper;
-
   it('should render without error', () => {
     const link = screen.getByRole('link');
 

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

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

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/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/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