@akinon/projectzero 1.107.0-rc.86 → 1.107.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.107.0-rc.86",
+  "version": "1.107.0",
   "private": true,
   "license": "MIT",
   "scripts": {
@@ -24,23 +24,23 @@
     "test:middleware": "jest middleware-matcher.test.ts --bail"
   },
   "dependencies": {
-    "@akinon/next": "1.107.0-rc.86",
-    "@akinon/pz-akifast": "1.107.0-rc.86",
-    "@akinon/pz-b2b": "1.107.0-rc.86",
-    "@akinon/pz-basket-gift-pack": "1.107.0-rc.86",
-    "@akinon/pz-bkm": "1.107.0-rc.86",
-    "@akinon/pz-checkout-gift-pack": "1.107.0-rc.86",
-    "@akinon/pz-click-collect": "1.107.0-rc.86",
-    "@akinon/pz-credit-payment": "1.107.0-rc.86",
-    "@akinon/pz-gpay": "1.107.0-rc.86",
-    "@akinon/pz-hepsipay": "1.107.0-rc.86",
-    "@akinon/pz-masterpass": "1.107.0-rc.86",
-    "@akinon/pz-one-click-checkout": "1.107.0-rc.86",
-    "@akinon/pz-otp": "1.107.0-rc.86",
-    "@akinon/pz-pay-on-delivery": "1.107.0-rc.86",
-    "@akinon/pz-saved-card": "1.107.0-rc.86",
-    "@akinon/pz-tabby-extension": "1.107.0-rc.86",
-    "@akinon/pz-tamara-extension": "1.107.0-rc.86",
+    "@akinon/next": "1.107.0",
+    "@akinon/pz-akifast": "1.107.0",
+    "@akinon/pz-b2b": "1.107.0",
+    "@akinon/pz-basket-gift-pack": "1.107.0",
+    "@akinon/pz-bkm": "1.107.0",
+    "@akinon/pz-checkout-gift-pack": "1.107.0",
+    "@akinon/pz-click-collect": "1.107.0",
+    "@akinon/pz-credit-payment": "1.107.0",
+    "@akinon/pz-gpay": "1.107.0",
+    "@akinon/pz-hepsipay": "1.107.0",
+    "@akinon/pz-masterpass": "1.107.0",
+    "@akinon/pz-one-click-checkout": "1.107.0",
+    "@akinon/pz-otp": "1.107.0",
+    "@akinon/pz-pay-on-delivery": "1.107.0",
+    "@akinon/pz-saved-card": "1.107.0",
+    "@akinon/pz-tabby-extension": "1.107.0",
+    "@akinon/pz-tamara-extension": "1.107.0",
     "@hookform/resolvers": "2.9.0",
     "@next/third-parties": "14.1.0",
     "@react-google-maps/api": "2.17.1",
@@ -63,7 +63,7 @@
     "yup": "0.32.11"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.107.0-rc.86",
+    "@akinon/eslint-plugin-projectzero": "1.107.0",
     "@semantic-release/changelog": "6.0.2",
     "@semantic-release/exec": "6.0.3",
     "@semantic-release/git": "10.0.1",
@@ -91,7 +91,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/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/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/input.tsx

@@ -78,8 +78,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/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

@@ -15,6 +15,6 @@ module.exports = [
   'pz-saved-card',
   'pz-tabby-extension',
   'pz-tamara-extension',
-  'pz-hepsipay',
-  'pz-similar-products'
+  'pz-cybersource-uc',
+  'pz-hepsipay'
 ];

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/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);
@@ -55,21 +54,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/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>